michael@12: Index: dbus/dbus-internals.c
michael@12: --- dbus/dbus-internals.c.orig	2006-11-17 20:12:18 +0100
michael@12: +++ dbus/dbus-internals.c	2006-11-18 12:35:56 +0100
michael@76: @@ -516,6 +516,14 @@
michael@12:    uuid->as_uint32s[DBUS_UUID_LENGTH_WORDS - 1] = DBUS_UINT32_TO_BE (now);
michael@12:    
michael@12:    _dbus_generate_random_bytes_buffer (uuid->as_bytes, DBUS_UUID_LENGTH_BYTES - 4);
michael@12: +
michael@12: +  /* brand UUID as variant DCE 1.1 */
michael@12: +  uuid->as_bytes[8] &= ~0xc0;
michael@12: +  uuid->as_bytes[8] |= (0x02 << 6);
michael@12: +
michael@12: +  /* brand UUID as version 4 */
michael@12: +  uuid->as_bytes[6] &= ~0xf0;
michael@12: +  uuid->as_bytes[6] |= (0x04 << 4);
michael@12:  }
michael@12:  
michael@12:  /**
michael@12: Index: dbus/dbus-sysdeps-util-unix.c
michael@12: --- dbus/dbus-sysdeps-util-unix.c.orig	2006-11-02 20:19:08 +0100
michael@12: +++ dbus/dbus-sysdeps-util-unix.c	2006-11-18 12:33:22 +0100
michael@12: @@ -31,6 +31,7 @@
michael@12:  #include "dbus-test.h"
michael@12:  
michael@12:  #include <sys/types.h>
michael@12: +#include <sys/param.h>
michael@12:  #include <stdlib.h>
michael@12:  #include <string.h>
michael@12:  #include <signal.h>
michael@76: @@ -728,6 +729,8 @@
michael@12:  #   else
michael@12:  #       if defined(NAME_MAX)
michael@12:  	 name_max = NAME_MAX;
michael@12: +#       elif defined(MAXPATHLEN)
michael@12: +	 name_max = MAXPATHLEN;
michael@12:  #       else
michael@12:  #           error "buffer size for readdir_r cannot be determined"
michael@12:  #       endif
michael@76: @@ -1233,4 +1236,4 @@
michael@76:    _dbus_string_free (&cmdline);
michael@76:    _dbus_string_free (&path);
michael@76:    return FALSE;
michael@76: -}
michael@76: \ No newline at end of file
michael@76: +}
michael@76: Index: bus/config-parser-trivial.c
michael@76: --- bus/config-parser-trivial.c.orig	2009-01-13 16:12:32.838078473 +0100
michael@76: +++ bus/config-parser-trivial.c	2009-01-13 16:11:58.375810360 +0100
michael@76: @@ -131,6 +131,25 @@
michael@76:  }
michael@76:  
michael@76:  dbus_bool_t
michael@76: +bus_config_parser_check_doctype (BusConfigParser   *parser,
michael@76: +                                 const char        *doctype,
michael@76: +                                 DBusError         *error)
michael@76: +{
michael@76: +  _DBUS_ASSERT_ERROR_IS_CLEAR (error);
michael@76: +
michael@76: +  if (strcmp (doctype, "busconfig") != 0)
michael@76: +    {
michael@76: +      dbus_set_error (error,
michael@76: +                      DBUS_ERROR_FAILED,
michael@76: +                      "Configuration file has the wrong document type %s",
michael@76: +                      doctype);
michael@76: +      return FALSE;
michael@76: +    }
michael@76: +  else
michael@76: +    return TRUE;
michael@76: +}
michael@76: +
michael@76: +dbus_bool_t
michael@76:  bus_config_parser_start_element (BusConfigParser   *parser,
michael@76:                                   const char        *element_name,
michael@76:                                   const char       **attribute_names,