* dbus-win.patch: dbus-connection.c (dbus_connection_get_unix_user,

dbus_connection_get_unix_process_id): Let return them valid user id's,
otherwise bus-test fails. How to replace on win32 ?.
* dbus/dbus-sysdeps-win.c (fill_win_user_info_homedir): fix memory leak.

diff --git a/ChangeLog b/ChangeLog
index f5cf2042a96286de93f3664d7f0656fdea67d00b..2222e872a25ae4170f863f52473eb82285a6fe95 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-03-08  Ralf Habacker  <ralf.habacker@freenet.de>
+
+       * dbus-win.patch: dbus-connection.c (dbus_connection_get_unix_user,
+       dbus_connection_get_unix_process_id): Let return them valid user id's, 
+       otherwise bus-test fails. How to replace on win32 ?.
+       
+       * dbus/dbus-sysdeps-win.c (fill_win_user_info_homedir):
+       fix memory leak.
+
 2007-03-08  Ralf Habacker  <ralf.habacker@freenet.de>
 
        * dbus/dbus-sysdeps-win.c (_dbus_win_set_error_from_win_error):

diff --git a/dbus-win.patch b/dbus-win.patch
index 03c47cd3328a67c7ffeae79d83ce011750870378..a907b33d77ba1f0bd74fd34c42aa71238300bfa4 100644 (file)
--- a/dbus-win.patch
+++ b/dbus-win.patch
@@ -1,3 +1,35 @@
+--- dbus/dbus-connection.c Wed Nov 15 04:07:59 2006
++++ dbus/dbus-connection.c Thu Mar 08 14:22:09 2007
+@@ -4790,14 +4790,6 @@
+   _dbus_return_val_if_fail (connection != NULL, FALSE);
+   _dbus_return_val_if_fail (uid != NULL, FALSE);
+ 
+-#ifdef DBUS_WIN
+-  /* FIXME this should be done at a lower level, but it's kind of hard,
+-   * just want to be sure we don't ship with this API returning
+-   * some weird internal fake uid for 1.0
+-   */
+-  return FALSE;
+-#endif
+-  
+   CONNECTION_LOCK (connection);
+ 
+   if (!_dbus_transport_get_is_authenticated (connection->transport))
+@@ -4829,14 +4821,6 @@
+   _dbus_return_val_if_fail (connection != NULL, FALSE);
+   _dbus_return_val_if_fail (pid != NULL, FALSE);
+ 
+-#ifdef DBUS_WIN
+-  /* FIXME this should be done at a lower level, but it's kind of hard,
+-   * just want to be sure we don't ship with this API returning
+-   * some weird internal fake uid for 1.0
+-   */
+-  return FALSE;
+-#endif
+-  
+   CONNECTION_LOCK (connection);
+ 
+   if (!_dbus_transport_get_is_authenticated (connection->transport))
 Index: bus/bus.c
 ===================================================================
 RCS file: /cvs/dbus/dbus/bus/bus.c,v

diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index 8fc74ea09745800fffe671bc39589dd2b73ae041..32243d0943a0114847e66ae415488a2e0b210b74 100644 (file)
--- a/dbus/dbus-sysdeps-win.c
+++ b/dbus/dbus-sysdeps-win.c
@@ -1304,7 +1304,9 @@ fill_win_user_info_homedir (wchar_t        *wname,
   else
     {
       char *dc_string = _dbus_win_utf16_to_utf8(dc,error);
-      _dbus_warn("NetUserGetInfo() for user '%s' failed with errorcode %d '%s', %s\n",_dbus_win_utf16_to_utf8(wname,error), ret,_dbus_lm_strerror(ret),dc_string);
+         char *user_name = _dbus_win_utf16_to_utf8(wname,error);
+      _dbus_warn("NetUserGetInfo() for user '%s' failed with errorcode %d '%s', %s\n",user_name, ret,_dbus_lm_strerror(ret),dc_string);
+      dbus_free(user_name);
       dbus_free(dc_string);
       /* Not set, so use something random. */
       info->homedir = _dbus_strdup ("\\");