Ticket #52257: patch-allow-setuid.diff

dbus-sysdeps-unix.c

@@ -3836 +3836 @@
 
   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
 
-  if (_dbus_check_setuid ())
-    {
-      dbus_set_error_const (error, DBUS_ERROR_NOT_SUPPORTED,
-                            "Unable to find launchd socket when setuid");
-      return FALSE;
-    }
+//   if (_dbus_check_setuid ())
+//     {
+//       dbus_set_error_const (error, DBUS_ERROR_NOT_SUPPORTED,
+//                             "Unable to find launchd socket when setuid");
+//       return FALSE;
+//     }
 
   i = 0;
   argv[i] = "launchctl";
@@ -3857 +3857 @@
 
   if (!_read_subprocess_line_argv(argv[0], TRUE, argv, socket_path, error))
     {
-      return FALSE;
+         const char *c = _dbus_getenv (launchd_env_var);
+      if (*c)
+        {
+          _dbus_string_init_const (&socket_path, c);
+        }
+      else
+        {
+          return FALSE;
+        }
     }
 
   /* no error, but no result either */
@@ -3883 +3891 @@
   dbus_bool_t valid_socket;
   DBusString socket_path;
 
-  if (_dbus_check_setuid ())
-    {
-      dbus_set_error_const (error, DBUS_ERROR_NOT_SUPPORTED,
-                            "Unable to find launchd socket when setuid");
-      return FALSE;
-    }
+//   if (_dbus_check_setuid ())
+//     {
+//       dbus_set_error_const (error, DBUS_ERROR_NOT_SUPPORTED,
+//                             "Unable to find launchd socket when setuid");
+//       return FALSE;
+//     }
 
   if (!_dbus_string_init (&socket_path))
     {