diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | bus/system.conf.in | 2 | ||||
| -rw-r--r-- | configure.in | 11 |
3 files changed, 21 insertions, 2 deletions
@@ -1,4 +1,12 @@ -2005-07-14 John (J5) Palmieri <johnp@redhat.com> +2005-07-15 John (J5) Palmieri <johnp@redhat.com> + + * ChangeLog: fix date in last entry + + * configure.in, bus/system.conf.in: add the ability to configure + the system bus user at compiletime with the --with-dbus-user flag + (patch from Kristof Vansant) + +2005-07-15 John (J5) Palmieri <johnp@redhat.com> * bus/dispatch.c, test/test-service.c: Add testcase for sending messages to oneself (TODO item). diff --git a/bus/system.conf.in b/bus/system.conf.in index 7b008978..ee85ecc4 100644 --- a/bus/system.conf.in +++ b/bus/system.conf.in @@ -15,7 +15,7 @@ <type>system</type> <!-- Run as special user --> - <user>messagebus</user> + <user>@DBUS_USER@</user> <!-- Fork into daemon mode --> <fork/> diff --git a/configure.in b/configure.in index 66fae85b..e0f4fa96 100644 --- a/configure.in +++ b/configure.in @@ -71,6 +71,7 @@ AC_ARG_WITH(test-socket-dir, [ --with-test-socket-dir=[dirname] Where to AC_ARG_WITH(system-pid-file, [ --with-system-pid-file=[pidfile] PID file for systemwide daemon]) AC_ARG_WITH(system-socket, [ --with-system-socket=[filename] UNIX domain socket for systemwide daemon]) AC_ARG_WITH(console-auth-dir, [ --with-console-auth-dir=[dirname] directory to check for console ownerhip]) +AC_ARG_WITH(dbus_user, [ --with-dbus-user=<user> User for running the DBUS daemon (messagebus)]) dnl DBUS_BUILD_TESTS controls unit tests built in to .c files dnl and also some stuff in the test/ subdir @@ -1178,6 +1179,15 @@ fi AC_SUBST(DBUS_CONSOLE_AUTH_DIR) AC_DEFINE_UNQUOTED(DBUS_CONSOLE_AUTH_DIR, "$DBUS_CONSOLE_AUTH_DIR", [Directory to check for console ownerhip]) +#### User to start the system bus as +if test -z "$with_dbus_user" ; then + DBUS_USER=messagebus +else + DBUS_USER=$with_dbus_user +fi +AC_SUBST(DBUS_USER) +AC_DEFINE_UNQUOTED(DBUS_USER,"$DBUS_USER", [User for running the system BUS daemon]) + #### Tell tests where to find certain stuff in builddir ABSOLUTE_TOP_BUILDDIR=`cd ${ac_top_builddir}. && pwd` @@ -1376,6 +1386,7 @@ echo " System bus PID file: ${DBUS_SYSTEM_PID_FILE} Session bus socket dir: ${DBUS_SESSION_SOCKET_DIR} Console auth dir: ${DBUS_CONSOLE_AUTH_DIR} + System bus user: ${DBUS_USER} 'make check' socket dir: ${TEST_SOCKET_DIR} " |