2003-05-03 Colin Walters <walters@verbum.org>

	* dbus/dbus-sysdeps.c (fill_user_info): Test against
	DBUS_UID_UNSET to determine whether to do a uid lookup or not.

	* Makefile.am: Update to use new .pc versioning scheme.

diff --git a/ChangeLog b/ChangeLog
index 38eb591..31417b9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-05-03  Colin Walters  <walters@verbum.org>
+
+       * dbus/dbus-sysdeps.c (fill_user_info): Test against
+       DBUS_UID_UNSET to determine whether to do a uid lookup or not.
+
+       * Makefile.am: Update to use new .pc versioning scheme.
+
 2003-05-02  Havoc Pennington  <hp@redhat.com>
 
        * bus/system.conf.in: allow send/receive to/from message bus

diff --git a/Makefile.am b/Makefile.am
index 91c976e..628b69e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 
 if HAVE_GLIB
     GLIB_SUBDIR=glib
-    GLIB_PC=dbus-glib-1.0.pc
+    GLIB_PC=dbus-glib-1.pc
 endif
 
 if HAVE_QT
@@ -11,16 +11,16 @@ endif
 SUBDIRS=dbus bus test doc $(GLIB_SUBDIR) $(QT_SUBDIR) tools
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = dbus-1.0.pc $(GLIB_PC)
+pkgconfig_DATA = dbus-1.pc $(GLIB_PC)
 
 DISTCLEANFILES =               \
-       dbus-1.0.pc             \
+       dbus-1.pc               \
        $(GLIB_PC)
 
 EXTRA_DIST =                   \
        HACKING                 \
-       dbus-1.0.pc.in          \
-       dbus-glib-1.0.pc.in
+       dbus-1.pc.in            \
+       dbus-glib-1.pc.in
 
 all-local: Doxyfile
 
@@ -61,4 +61,4 @@ coverage-report.txt:
 check-coverage:
        echo "Need to reconfigure with --enable-gcov"
 
-endif
\ No newline at end of file
+endif

diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c
index 7673085..d59498b 100644 (file)
--- a/dbus/dbus-sysdeps.c
+++ b/dbus/dbus-sysdeps.c
@@ -1378,7 +1378,7 @@ fill_user_info (DBusUserInfo       *info,
       result = getpwnam_r (username_c, &p_str, buf, sizeof (buf),
                            &p);
 #else
-    if (uid >= 0)
+    if (uid != DBUS_UID_UNSET)
       p = getpwuid_r (uid, &p_str, buf, sizeof (buf));
     else
       p = getpwnam_r (username_c, &p_str, buf, sizeof (buf));
@@ -1403,7 +1403,7 @@ fill_user_info (DBusUserInfo       *info,
     /* I guess we're screwed on thread safety here */
     struct passwd *p;
 
-    if (uid >= 0)
+    if (uid != DBUS_UID_UNSET)
       p = getpwuid (uid);
     else
       p = getpwnam (username_c);
@@ -3047,6 +3047,12 @@ _dbus_become_daemon (const DBusString *pidfile,
       break;
 
     case 0:
+
+
+      s = _dbus_getenv ("DBUS_DEBUG_DAEMONIZE");
+      if (s != NULL)
+             kill (_dbus_getpid (), SIGSTOP);
+      
       s = _dbus_getenv ("DBUS_DEBUG_OUTPUT");
       if (s == NULL || *s == '\0')
         {