Remove references to dbus-daemon-launch-helper

Essentially revert the last commit, and remove the reference altogether, as
it is meant for the system bus and may cause applications to fail to start when
run by a user without the required permissions.

diff --git a/bus/accessibility.conf b/bus/accessibility.conf
new file mode 100644 (file)
index 0000000..d0128a0
--- /dev/null
+++ b/bus/accessibility.conf
@@ -0,0 +1,38 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+  <type>accessibility</type>
+
+  <fork/>
+
+  <standard_session_servicedirs/>
+
+  <auth>EXTERNAL</auth>
+
+  <listen>unix:tmpdir=/tmp</listen>
+
+  <policy context="default">
+    <!-- All users can connect to system bus -->
+    <allow user="*"/>
+    <!-- Allow everything to be sent -->
+    <allow send_destination="*" eavesdrop="true"/>
+    <!-- Allow everything to be received -->
+    <allow eavesdrop="true"/>
+    <!-- Allow anyone to own anything -->
+    <allow own="*"/>
+  </policy>
+
+  <limit name="max_incoming_bytes">1000000000</limit>
+  <limit name="max_outgoing_bytes">1000000000</limit>
+  <limit name="max_message_size">1000000000</limit>
+  <limit name="service_start_timeout">120000</limit>  
+  <limit name="auth_timeout">240000</limit>
+  <limit name="max_completed_connections">100000</limit>  
+  <limit name="max_incomplete_connections">10000</limit>
+  <limit name="max_connections_per_user">100000</limit>
+  <limit name="max_pending_service_starts">10000</limit>
+  <limit name="max_names_per_connection">50000</limit>
+  <limit name="max_match_rules_per_connection">50000</limit>
+  <limit name="max_replies_per_connection">50000</limit>
+  <limit name="reply_timeout">300000</limit>
+</busconfig>

diff --git a/bus/accessibility.conf.in b/bus/accessibility.conf.in
deleted file mode 100644 (file)
index 5e3988a..0000000
--- a/bus/accessibility.conf.in
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-
-  <type>accessibility</type>
-
-  <fork/>
-
-  <standard_system_servicedirs/>
-
-  <servicehelper>@DBUS_DAEMON_LAUNCH_HELPER@</servicehelper>
-
-  <auth>EXTERNAL</auth>
-
-  <listen>unix:tmpdir=/tmp</listen>
-
-  <policy context="default">
-    <!-- All users can connect to system bus -->
-    <allow user="*"/>
-    <!-- Allow everything to be sent -->
-    <allow send_destination="*" eavesdrop="true"/>
-    <!-- Allow everything to be received -->
-    <allow eavesdrop="true"/>
-    <!-- Allow anyone to own anything -->
-    <allow own="*"/>
-  </policy>
-
-  <limit name="max_incoming_bytes">1000000000</limit>
-  <limit name="max_outgoing_bytes">1000000000</limit>
-  <limit name="max_message_size">1000000000</limit>
-  <limit name="service_start_timeout">120000</limit>  
-  <limit name="auth_timeout">240000</limit>
-  <limit name="max_completed_connections">100000</limit>  
-  <limit name="max_incomplete_connections">10000</limit>
-  <limit name="max_connections_per_user">100000</limit>
-  <limit name="max_pending_service_starts">10000</limit>
-  <limit name="max_names_per_connection">50000</limit>
-  <limit name="max_match_rules_per_connection">50000</limit>
-  <limit name="max_replies_per_connection">50000</limit>
-  <limit name="reply_timeout">300000</limit>
-</busconfig>

diff --git a/configure.ac b/configure.ac
index b9e8bf4e99c3fa9d33cb54b6d517d965179115e4..b935b084460280fc2dd85a59cda88d2d476080ee 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -150,27 +150,6 @@ if test "$DBUS_DAEMON" = "XXXDBUSDAEMONNOTFOUND"; then
 fi
 AC_SUBST(DBUS_DAEMON)
 
-AC_ARG_WITH([dbus_daemon_launch_helperdir],
-       [AS_HELP_STRING([--with-dbus-daemon-launch-helperdir=<directory>],
-               [Directory where dbus-daemon-launch-helper is installed])],
-    [DBUS_DAEMON_LAUNCH_HELPER="$with_dbus_daemon_launch_helperdir/dbus-daemon-launch-helper"]
-       )
-dnl Can't use AC_PATH_PROG since it will fail if we don't have read access
-if test "x$DBUS_DAEMON_LAUNCH_HELPER" == "x"; then
-       if test "-f /lib/dbus-1/dbus-daemon-launch-helper"; then
-               DBUS_DAEMON_LAUNCH_HELPER=/lib/dbus-1/dbus-daemon-launch-helper
-       elif test "-f /lib/dbus-1.0/dbus-daemon-launch-helper"; then
-               DBUS_DAEMON_LAUNCH_HELPER=/lib/dbus-1.0/dbus-daemon-launch-helper
-       elif test "-f $libexecdir/dbus-daemon-launch-helper"; then
-               DBUS_DAEMON_LAUNCH_HELPER=$libexecdir/dbus-daemon-launch-helper
-       else
-               DBUS_DAEMON_LAUNCH_HELPER="$libexecdir/dbus-daemon-launch-helper"
-               AC_MSG_WARN([at-spi2 relies on dbus, and dbus-daemon-launch-helper was not found])
-               AC_MSG_WARN([we assume that it will be installed in "$libexecdir"])
-       fi
-fi
-AC_SUBST(DBUS_DAEMON_LAUNCH_HELPER)
-
 AC_ARG_WITH(dbus-services,
            [AS_HELP_STRING([--with-dbus-services=<directory>],
            [where D-BUS services directory is])])
@@ -196,7 +175,6 @@ AM_CONDITIONAL(RELOCATE, test x$enable_relocate = xyes)
 AC_CONFIG_FILES([Makefile
        xml/Makefile
        registryd/Makefile
-       bus/accessibility.conf
        bus/Makefile])
 
 AC_OUTPUT