From 55919d2d1479c05d5becfe050316c5fc3d392805 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Thu, 8 Mar 2007 13:40:16 +0000 Subject: * 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. --- dbus-win.patch | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'dbus-win.patch') diff --git a/dbus-win.patch b/dbus-win.patch index 03c47cd3..a907b33d 100644 --- 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 -- cgit