Attachment 2692 Details for Bug 16255 – Early dropPrivileges

[patch] Early dropPrivileges

ivman.manager.c.patch (text/plain), 1.42 KB, created by Lenar Shakirov on 2008-07-03 21:31:50 MSD

(hide)

Description:

Filename:

MIME Type:

Creator: Lenar Shakirov

Created: 2008-07-03 21:31:50 MSD

Size: 1.42 KB

patch

obsolete

>--- /home/manager.c	2007-01-29 14:52:31 +0300
>+++ manager.c	2008-07-03 21:13:07 +0400
>@@ -1430,25 +1430,6 @@
> 
>     /* Setup DBus */
>     ivm_dbus_init();
>-    if (dbus_connection != NULL) {
>-	    /* If Hal is around */
>-	    if ((ivm_dbus_get_name_owner("org.freedesktop.Hal")))
>-		    hal_init();
>-    } else {
>-	    /* Try connecting to dbus */
>-	    do {
>-		    g_usleep (G_USEC_PER_SEC * 3);
>-		    ivm_dbus_init();
>-	    } while (dbus_connection == NULL);
>-    }
>-
>-    DEBUG("%s, http:/ivman.sourceforge.net\n", PACKAGE_STRING);
>-
>-#ifdef HAL_0_4
>-    DEBUG(_("Compiled against HAL 0.4.x or earlier\n"));
>-#else
>-    DEBUG(_("Compiled against HAL 0.5.x or later\n"));
>-#endif
> 
>     if ( !usermode ) {
>         DEBUG(_("Running in system mode.\n"));
>@@ -1475,6 +1456,26 @@
>               cfg_base->user, cfg_base->group);
>         return 1;
>     }
>+    
>+    if (dbus_connection != NULL) {
>+	    /* If Hal is around */
>+	    if ((ivm_dbus_get_name_owner("org.freedesktop.Hal")))
>+		    hal_init();
>+    } else {
>+	    /* Try connecting to dbus */
>+	    do {
>+		    g_usleep (G_USEC_PER_SEC * 3);
>+		    ivm_dbus_init();
>+	    } while (dbus_connection == NULL);
>+    }
>+
>+    DEBUG("%s, http:/ivman.sourceforge.net\n", PACKAGE_STRING);
>+
>+#ifdef HAL_0_4
>+    DEBUG(_("Compiled against HAL 0.4.x or earlier\n"));
>+#else
>+    DEBUG(_("Compiled against HAL 0.5.x or later\n"));
>+#endif
> 
>     loop = g_main_loop_new(NULL, FALSE);
>     if ( !loop ) {

Actions: View | Diff

Attachments on bug 16255: 2692