[maemo-commits] [maemo-commits] r14616 - in projects/haf/trunk/dbus/debian: . patches

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-10-25 14:23:25 +0300 (Thu, 25 Oct 2007)
New Revision: 14616

Added:
   projects/haf/trunk/dbus/debian/patches/25-fix-uid-gid-checks.patch
Modified:
   projects/haf/trunk/dbus/debian/changelog
Log:
added patch for UID and GID checking


Modified: projects/haf/trunk/dbus/debian/changelog
===================================================================
--- projects/haf/trunk/dbus/debian/changelog	2007-10-25 11:20:34 UTC (rev 14615)
+++ projects/haf/trunk/dbus/debian/changelog	2007-10-25 11:23:25 UTC (rev 14616)
@@ -9,6 +9,8 @@
   * Use ssize_t instead of size_t to store read(2) return value.
   * Added a missing NULL check to _dbus_spawn_async_with_babysitter.
   * Added a check for failing allocation to bus.c:setup_server.
+  * Use DBUS_UID_UNSET and DBUS_GID_UNSET instead of checking if an unsigned
+    variable is smaller than zero.
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Thu, 18 Oct 2007 11:21:11 +0300
 

Added: projects/haf/trunk/dbus/debian/patches/25-fix-uid-gid-checks.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/25-fix-uid-gid-checks.patch	2007-10-25 11:20:34 UTC (rev 14615)
+++ projects/haf/trunk/dbus/debian/patches/25-fix-uid-gid-checks.patch	2007-10-25 11:23:25 UTC (rev 14616)
@@ -0,0 +1,14 @@
+diff -pur dbus-1.0.2/bus/bus.c dbus-1.0.2.new/bus/bus.c
+--- dbus-1.0.2/bus/bus.c	2006-12-11 21:21:23.000000000 +0200
++++ dbus-1.0.2.new/bus/bus.c	2007-10-25 14:19:48.172681920 +0300
+@@ -667,8 +667,8 @@ bus_context_new (const DBusString *confi
+       _dbus_string_init_const (&u, context->user);
+ 
+       if (!_dbus_credentials_from_username (&u, &creds) ||
+-          creds.uid < 0 ||
+-          creds.gid < 0)
++          creds.uid == DBUS_UID_UNSET ||
++          creds.gid == DBUS_GID_UNSET)
+         {
+           dbus_set_error (error, DBUS_ERROR_FAILED,
+                           "Could not get UID and GID for username \"%s\"",