Attachment 126778 Details for Bug 97927 – patch against the master branch, #1e43857

[patch] patch against the master branch, #1e43857

combined-patch.diff (text/plain), 10.42 KB, created by René J.V. Bertin on 2016-09-25 18:18:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: René J.V. Bertin

Created: 2016-09-25 18:18:31 UTC

Size: 10.42 KB

patch

obsolete

>diff --git a/bus/.gitignore b/bus/.gitignore
>index 37b0477..bfd7853 100644
>--- a/bus/.gitignore
>+++ b/bus/.gitignore
>@@ -24,5 +24,6 @@ test-bus-system
> dbus.service
> dbus.socket
> org.freedesktop.dbus-session.plist
>+org.freedesktop.dbus-system.plist
> example-session-disable-stats.conf
> example-system-enable-stats.conf
>diff --git a/bus/Makefile.am b/bus/Makefile.am
>index 268c6f0..a50ce77 100644
>--- a/bus/Makefile.am
>+++ b/bus/Makefile.am
>@@ -44,6 +44,7 @@ CONFIG_IN_FILES=				\
> 	legacy-config/session.conf.in		\
> 	legacy-config/system.conf.in		\
> 	org.freedesktop.dbus-session.plist.in	\
>+	org.freedesktop.dbus-system.plist.in	\
> 	example-system-enable-stats.conf.in	\
> 	example-session-disable-stats.conf.in	\
> 	$(NULL)
>@@ -65,6 +66,8 @@ examples_DATA = \
> if DBUS_ENABLE_LAUNCHD
> agentdir=$(LAUNCHD_AGENT_DIR)
> agent_DATA=org.freedesktop.dbus-session.plist
>+daemondir=$(LAUNCHD_DAEMON_DIR)
>+daemon_DATA=org.freedesktop.dbus-system.plist
> endif
> 
> XML_SOURCES=config-loader-expat.c
>diff --git a/configure.ac b/configure.ac
>index 460b32b..6b77aea 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -93,6 +93,7 @@ LT_LANG([Windows Resource])
> # Set some internal variables depending on the platform for later use.
> dbus_win=no
> dbus_cygwin=no
>+dbus_darwin=no
> dbus_unix=no
> case "${host}" in
>     *-mingw32ce*)
>@@ -106,6 +107,10 @@ case "${host}" in
>         dbus_cygwin=yes
>         dbus_unix=yes
>         ;;
>+    *darwin*)
>+        dbus_darwin=yes
>+        dbus_unix=yes
>+        ;;
>     *)
>         dbus_unix=yes
>        ;;
>@@ -139,7 +144,7 @@ fi
> 
> # For best security, assume that all non-Windows platforms can do
> # credentials-passing.
>-AS_IF([test "$dbus_win" = yes],
>+AS_IF([test "$dbus_win" = yes || test "$dbus_darwin" = yes],
>     [DBUS_SESSION_CONF_MAYBE_AUTH_EXTERNAL=""],
>     [DBUS_SESSION_CONF_MAYBE_AUTH_EXTERNAL="<auth>EXTERNAL</auth>"])
> AC_SUBST([DBUS_SESSION_CONF_MAYBE_AUTH_EXTERNAL])
>@@ -196,7 +201,8 @@ AC_ARG_WITH(system-pid-file, AS_HELP_STRING([--with-system-pid-file=[pidfile]],[
> AC_ARG_WITH(system-socket, AS_HELP_STRING([--with-system-socket=[filename]],[UNIX domain socket for systemwide daemon]))
> AC_ARG_WITH(console-auth-dir, AS_HELP_STRING([--with-console-auth-dir=[dirname]],[directory to check for console ownerhip]))
> AC_ARG_WITH(console-owner-file, AS_HELP_STRING([--with-console-owner-file=[filename]],[file whose owner determines current console owner]))
>-AC_ARG_WITH(launchd-agent-dir, AS_HELP_STRING([--with-launchd-agent-dir=[dirname]],[directory to put the launchd agent (default: /Library/LaunchAgents)]))
>+AC_ARG_WITH(launchd-agent-dir, AS_HELP_STRING([--with-launchd-agent-dir=[dirname]],[directory to put the launchd agent (session bus) (default: /Library/LaunchAgents)]))
>+AC_ARG_WITH(launchd-daemon-dir, AS_HELP_STRING([--with-launchd-daemon-dir=[dirname]],[directory to put the launchd daemon (system bus) (default: /Library/LaunchDaemons)]))
> AC_ARG_WITH(dbus_user, AS_HELP_STRING([--with-dbus-user=<user>],[User for running the DBUS daemon (messagebus)]))
> AC_ARG_WITH([test_user],
>   [AS_HELP_STRING([--with-test-user=<user>],
>@@ -1139,6 +1145,15 @@ fi
> 
> AC_SUBST(LAUNCHD_AGENT_DIR)
> 
>+#### Directory to place launchd daemon file
>+if test "x$with_launchd_daemon_dir" = "x"; then
>+   LAUNCHD_DAEMON_DIR="/Library/LaunchDaemons"
>+else
>+   LAUNCHD_DAEMON_DIR="$with_launchd_daemon_dir"
>+fi
>+
>+AC_SUBST(LAUNCHD_DAEMON_DIR)
>+
> dnl console owner file
> if test x$enable_console_owner_file = xno ; then
>     have_console_owner_file=no;
>@@ -1796,10 +1811,13 @@ elif test x$dbus_win = xyes; then
>         # branch of the conditional because the default might conceivably
>         # change (see #38201)
>         DBUS_SESSION_BUS_CONNECT_ADDRESS="autolaunch:"
>+elif test x$dbus_darwin = xyes; then
>+        # Mac OS X autolaunching is a bit different too
>+        # in that it relies on launchd
>+        DBUS_SESSION_BUS_CONNECT_ADDRESS="launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET"
> else
>         # The default on all other Unix platforms (notably Linux)
>-        # is to use auto-launching - this works a bit differently on Mac OS X
>-        # but comes out basically the same in the end
>+        # is to use auto-launching.
>         DBUS_SESSION_BUS_CONNECT_ADDRESS="autolaunch:"
> fi
> AC_SUBST([DBUS_SESSION_BUS_CONNECT_ADDRESS])
>@@ -1849,6 +1867,7 @@ bus/example-session-disable-stats.conf
> bus/messagebus
> bus/messagebus-config
> bus/org.freedesktop.dbus-session.plist
>+bus/org.freedesktop.dbus-system.plist
> bus/rc.messagebus
> bus/dbus.service
> bus/dbus.socket
>@@ -1938,6 +1957,7 @@ echo "
> "
> if test x$have_launchd = xyes; then
>         echo "        launchd agent dir:        ${LAUNCHD_AGENT_DIR}"
>+        echo "        launchd daemon dir:       ${LAUNCHD_DAEMON_DIR}"
> fi
> echo
> 
>diff --git a/dbus/dbus-bus.c b/dbus/dbus-bus.c
>index 0fd4831..e518104 100644
>--- a/dbus/dbus-bus.c
>+++ b/dbus/dbus-bus.c
>@@ -518,6 +518,10 @@ out:
>     _DBUS_ASSERT_ERROR_IS_SET (error);
> 
>   _DBUS_UNLOCK (bus);
>+#ifdef DBUS_ENABLE_LAUNCHD
>+  _dbus_verbose ("internal_bus_get(type=%d,private=%d) : found and registered connection to %s",
>+         type, private, address);
>+#endif
>   return connection;
> }
> 
>diff --git a/dbus/dbus-server-unix.c b/dbus/dbus-server-unix.c
>index 92664a8..2ef949c 100644
>--- a/dbus/dbus-server-unix.c
>+++ b/dbus/dbus-server-unix.c
>@@ -262,23 +262,46 @@ _dbus_server_listen_platform_specific (DBusAddressEntry *entry,
>       const char *launchd_env_var = dbus_address_entry_get_value (entry, "env");
>       if (launchd_env_var == NULL)
>         {
>+#if 0
>           _dbus_set_bad_address (error, "launchd", "env", NULL);
>           return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
>+#endif
>         }
>-      *server_p = _dbus_server_new_for_launchd (launchd_env_var, error);
>-
>-      if (*server_p != NULL)
>-        {
>-          _DBUS_ASSERT_ERROR_IS_CLEAR(error);
>-          return DBUS_SERVER_LISTEN_OK;
>-        }
>-      else
>+      if (launchd_env_var)
>         {
>-          _DBUS_ASSERT_ERROR_IS_SET(error);
>-          return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
>+          *server_p = _dbus_server_new_for_launchd (launchd_env_var, error);
>+
>+          if (*server_p != NULL)
>+            {
>+              _DBUS_ASSERT_ERROR_IS_CLEAR(error);
>+              return DBUS_SERVER_LISTEN_OK;
>+            }
>+#if 0
>+          else
>+            {
>+              _DBUS_ASSERT_ERROR_IS_SET(error);
>+              return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
>+            }
>+#endif
>         }
>-    }
>+      // try a hardcoded traditional address as a fallback
>+      {
>+        DBusAddressEntry **altEntry;
>+        int altLen;
>+        DBusServerListenResult retval;
>+        if (dbus_parse_address ("unix:tmpdir="DBUS_SESSION_SOCKET_DIR, &altEntry, &altLen, error) && altLen > 0)
>+          {
>+            retval = _dbus_server_listen_platform_specific (altEntry[0], server_p, error);
>+            dbus_address_entries_free (altEntry);
>+          }
>+        else
>+          {
>+            retval = DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
>+          }
>+        return retval;
>+      }
> #endif
>+    }
>   else
>     {
>       /* If we don't handle the method, we return NULL with the
>diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
>index 1f964b5..4e76ca5 100644
>--- a/dbus/dbus-sysdeps-unix.c
>+++ b/dbus/dbus-sysdeps-unix.c
>@@ -3928,28 +3928,45 @@ _dbus_lookup_launchd_socket (DBusString *socket_path,
> 
>   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
> 
>+  const char *fromEnv = getenv (launchd_env_var);
>+  dbus_bool_t hasEnvVar = (fromEnv && *fromEnv);
>+
>   if (_dbus_check_setuid ())
>     {
>-      dbus_set_error_const (error, DBUS_ERROR_NOT_SUPPORTED,
>-                            "Unable to find launchd socket when setuid");
>-      return FALSE;
>-    }
>+      if (!hasEnvVar)
>+        {
>+          dbus_set_error_const (error, DBUS_ERROR_NOT_SUPPORTED,
>+                                "Unable to find launchd socket when setuid");
>+          return FALSE;
>+        }
> 
>-  i = 0;
>-  argv[i] = "launchctl";
>-  ++i;
>-  argv[i] = "getenv";
>-  ++i;
>-  argv[i] = (char*)launchd_env_var;
>-  ++i;
>-  argv[i] = NULL;
>-  ++i;
>+      i = 0;
>+      argv[i] = "launchctl";
>+      ++i;
>+      argv[i] = "getenv";
>+      ++i;
>+      argv[i] = (char*)launchd_env_var;
>+      ++i;
>+      argv[i] = NULL;
>+      ++i;
> 
>-  _dbus_assert (i == _DBUS_N_ELEMENTS (argv));
>+      _dbus_assert (i == _DBUS_N_ELEMENTS (argv));
>+
>+      if (!_read_subprocess_line_argv(argv[0], TRUE, argv, socket_path, error) && !hasEnvVar)
>+        {
>+          return FALSE;
>+        }
>+      else
>+        {
>+          // prefer the value obtained from launchctl
>+          hasEnvVar = FALSE;
>+        }
>+    }
> 
>-  if (!_read_subprocess_line_argv(argv[0], TRUE, argv, socket_path, error))
>+  if (hasEnvVar)
>     {
>-      return FALSE;
>+      _dbus_string_append (socket_path, fromEnv);
>+      return TRUE;
>     }
> 
>   /* no error, but no result either */
>@@ -3975,13 +3992,6 @@ _dbus_lookup_session_address_launchd (DBusString *address, DBusError  *error)
>   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_string_init (&socket_path))
>     {
>       _DBUS_SET_OOM (error);
>@@ -4120,22 +4130,35 @@ _dbus_lookup_session_address (dbus_bool_t *supported,
> {
> #ifdef DBUS_ENABLE_LAUNCHD
>   *supported = TRUE;
>-  return _dbus_lookup_session_address_launchd (address, error);
>-#else
>+  if (_dbus_lookup_session_address_launchd (address, error))
>+    {
>+      // success, no need to attempt anything else
>+      return TRUE;
>+    }
>+// dbus can function without launchd like it does on other Unix versions, even when
>+// it will use launchd by default (on Mac). So there is no need to disable the
>+// non-launchd code path below.
>+#endif
>   *supported = FALSE;
> 
>   if (!_dbus_lookup_user_bus (supported, address, error))
>     return FALSE;
>-  else if (*supported)
>+#ifdef DBUS_ENABLE_LAUNCHD
>+  {
>+    const char *c = _dbus_string_get_const_data (address);
>+    _dbus_verbose ("traditional session bus lookup yielded address \"%s\"",
>+              c ? c : "NULL");
>+  }
>+#endif
>+  if (*supported)
>     return TRUE;
> 
>-  /* On non-Mac Unix platforms, if the session address isn't already
>+  /* On Unix platforms, if the session address isn't already
>    * set in DBUS_SESSION_BUS_ADDRESS environment variable and the
>    * $XDG_RUNTIME_DIR/bus can't be used, we punt and fall back to the
>    * autolaunch: global default; see init_session_address in
>    * dbus/dbus-bus.c. */
>   return TRUE;
>-#endif
> }
> 
> /**

Actions: View | Splinter Review

Attachments on bug 97927: 126778

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.