Merge lp:~jamesodhunt/upstart/upstream-add-session-bus-support into lp:upstart

[James Hunt]

Add D-Bus session support to initctl.

* Changelog: Updated.
* util/initctl.c:
  - Added "--session" command-line option.
  - dbus_bus_type_setter(): New function used by option parser to
    distinguish system/session D-Bus bus type.
  - system_bus variable now replaced by two others: use_dbus (boolean)
    and dbus_bus_type.
  - upstart_open(): Updated to handle multiple D-Bus bus types.
* util/man/initctl.8: Update for "--session" option.
* util/tests/test_initctl.c: Updated to make use of use_dbus and
  dbus_bus_type rather than system_bus.

Add command-line option to use D-Bus session bus (for testing).

* init/control.c:
  - Added new boolean use_session_bus.
  - Updated comments.
  - control_handle_bus_type(): New function to allow selection of
    session bus via env var "UPSTART_USE_SESSION_BUS".
    Also logs use of session bus if use_session_bus set.
  - control_bus_open(): Now connects to either D-Bus system bus or session bus.
* init/control.h: New define for USE_SESSION_BUS_ENV.
* init/main.c: Addition of "--session" command-line option.
* init/man/init.8: Update for new "--session" command-line option.

=== modified file 'ChangeLog'
--- ChangeLog	2011-05-12 20:42:28 +0000
+++ ChangeLog	2011-06-03 09:21:18 +0000
@@ -1,3 +1,34 @@
[phone]  James Hunt  <[e-mail]>
+
+	Add D-Bus session support to initctl.
+	
+	* util/initctl.c:
+	  - Added "--session" command-line option.
+	  - dbus_bus_type_setter(): New function used by option parser to
+	    distinguish system/session D-Bus bus type.
+	  - system_bus variable now replaced by two others: use_dbus (boolean)
+	    and dbus_bus_type.
+	  - upstart_open(): Updated to handle multiple D-Bus bus types.
+	* util/man/initctl.8: Update for "--session" option.
+	* util/tests/test_initctl.c: Updated to make use of use_dbus and
+	  dbus_bus_type rather than system_bus.
+
[phone]  James Hunt  <[e-mail]>
+
+	Add command-line option to use D-Bus session bus (for testing).
+	
+	* init/control.c:
+	  - Added new boolean use_session_bus.
+	  - Updated comments.
+	  - control_handle_bus_type(): New function to allow selection of
+	    session bus via env var "UPSTART_USE_SESSION_BUS".
+	    Also logs use of session bus if use_session_bus set.
+	  - control_bus_open(): Now connects to either D-Bus system bus or session bus.
+	* init/control.h: New define for USE_SESSION_BUS_ENV.
+	* init/main.c: Addition of "--session" command-line option.
+	* init/man/init.8: Update for new "--session" command-line option.
+	* Corrected copyright notices.
+
 2011-05-12  Marc - A. Dahlhaus  <[e-mail]>
 
 	* init/job_class.h (JobClass): Add kill signal member
 
=== modified file 'configure.ac'
--- configure.ac	2011-03-22 17:53:17 +0000
+++ configure.ac	2011-06-03 09:21:18 +0000
@@ -2,7 +2,7 @@
 
 AC_PREREQ(2.61)
 AC_INIT([upstart], [1.3], [[e-mail]])
-NIH_COPYRIGHT([[Copyright © 2011 Scott James Remnant, Google Inc., Canonical Ltd.]])
+NIH_COPYRIGHT([[Copyright © 2011 Scott James Remnant, Canonical Ltd.]])
 AC_CONFIG_SRCDIR([init/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
 
=== modified file 'init/conf.c'
--- init/conf.c	2011-03-15 18:44:09 +0000
+++ init/conf.c	2011-06-03 09:21:18 +0000
@@ -2,7 +2,6 @@
  *
  * conf.c - configuration management
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2009 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
 
=== modified file 'init/control.c'
--- init/control.c	2009-07-11 11:47:12 +0000
+++ init/control.c	2011-06-03 09:21:18 +0000
@@ -2,7 +2,7 @@
  *
  * control.c - D-Bus connections, objects and methods
  *
- * Copyright © 2009 Canonical Ltd.
+ * Copyright © 2009-2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -54,12 +54,19 @@
 
 #include "com.ubuntu.Upstart.h"
 
-
 /* Prototypes for static functions */
 static int   control_server_connect (DBusServer *server, DBusConnection *conn);
 static void  control_disconnected   (DBusConnection *conn);
 static void  control_register_all   (DBusConnection *conn);
 
+/**
+ * use_session_bus:
+ *
+ * If TRUE, connect to the D-Bus sessio bus rather than the system bus.
+ *
+ * Used for testing.
+ **/
+int use_session_bus = FALSE;
 
 /**
  * control_server_address:
@@ -78,7 +85,7 @@
 /**
  * control_bus:
  *
- * Open connection to D-Bus system bus.  The connection may be opened with
+ * Open connection to a D-Bus bus.  The connection may be opened with
  * control_bus_open() and if lost will become NULL.
  **/
 DBusConnection *control_bus = NULL;
@@ -86,7 +93,7 @@
 /**
  * control_conns:
  *
- * Open control connections, including the connection to the D-Bus system
+ * Open control connections, including the connection to a D-Bus
  * bus and any private client connections.
  **/
 NihList *control_conns = NULL;
@@ -190,8 +197,9 @@
 /**
  * control_bus_open:
  *
- * Open a connection to the D-Bus system bus and store it in the control_bus
- * global.  The connection is handled automatically in the main loop.
+ * Open a connection to the appropriate D-Bus bus and store it in the
+ * control_bus global. The connection is handled automatically
+ * in the main loop.
  *
  * Returns: zero on success, negative value on raised error.
  **/
@@ -207,10 +215,13 @@
 
 	control_init ();
 
+	control_handle_bus_type ();
+
 	/* Connect to the D-Bus System Bus and hook everything up into
 	 * our own main loop automatically.
 	 */
-	conn = nih_dbus_bus (DBUS_BUS_SYSTEM, control_disconnected);
+	conn = nih_dbus_bus (use_session_bus ? DBUS_BUS_SESSION : DBUS_BUS_SYSTEM,
+			     control_disconnected);
 	if (! conn)
 		return -1;
 
@@ -669,3 +680,18 @@
 
 	return 0;
 }
+
+/**
+ * control_handle_bus_type:
+ *
+ * Determine D-Bus bus type to connect to.
+ **/
+void
+control_handle_bus_type (void)
+{
+	if (getenv (USE_SESSION_BUS_ENV))
+		use_session_bus = TRUE;
+
+	if (use_session_bus)
+		nih_debug ("Using session bus");
+}
 
=== modified file 'init/control.h'
--- init/control.h	2009-07-09 08:36:52 +0000
+++ init/control.h	2011-06-03 09:21:18 +0000
@@ -1,6 +1,6 @@
 /* upstart
  *
- * Copyright © 2009 Canonical Ltd.
+ * Copyright © 2009-2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -27,6 +27,18 @@
 #include <nih-dbus/dbus_connection.h>
 #include <nih-dbus/dbus_message.h>
 
+/**
+ * USE_SESSION_BUS_ENV:
+ *
+ * If this environment variable is set to any value, connect to
+ * D-Bus session bus rather than the system bus.
+ *
+ * Used for testing.
+ **/
+#ifndef USE_SESSION_BUS_ENV
+#define USE_SESSION_BUS_ENV "UPSTART_USE_SESSION_BUS"
+#endif
+
 
 NIH_BEGIN_EXTERN
 
@@ -72,6 +84,8 @@
 				   const char *log_priority)
 	__attribute__ ((warn_unused_result));
 
+void control_handle_bus_type      (void);
+
 NIH_END_EXTERN
 
 #endif /* INIT_CONTROL_H */
 
=== modified file 'init/environ.c'
--- init/environ.c	2011-03-16 22:42:48 +0000
+++ init/environ.c	2011-06-03 09:21:18 +0000
@@ -2,7 +2,6 @@
  *
  * environ.c - environment table utilities
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2009 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
 
=== modified file 'init/environ.h'
--- init/environ.h	2011-03-16 22:42:48 +0000
+++ init/environ.h	2011-06-03 09:21:18 +0000
@@ -1,6 +1,5 @@
 /* upstart
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2009 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
 
=== modified file 'init/job_process.c'
--- init/job_process.c	2011-05-12 20:42:28 +0000
+++ init/job_process.c	2011-06-03 09:21:18 +0000
@@ -2,7 +2,6 @@
  *
  * job_process.c - job process handling
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
 
=== modified file 'init/job_process.h'
--- init/job_process.h	2011-05-12 19:21:16 +0000
+++ init/job_process.h	2011-06-03 09:21:18 +0000
@@ -1,6 +1,5 @@
 /* upstart
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2009 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
 
=== modified file 'init/main.c'
--- init/main.c	2011-03-16 22:54:56 +0000
+++ init/main.c	2011-06-03 09:21:18 +0000
@@ -1,7 +1,6 @@
 /* upstart
  *
- * Copyright © 2011 Google Inc.
- * Copyright © 2010 Canonical Ltd.
+ * Copyright © 2009-2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -88,6 +87,7 @@
  **/
 static int restart = FALSE;
 
+extern int use_session_bus;
 
 /**
  * options:
@@ -97,6 +97,9 @@
 static NihOption options[] = {
 	{ 0, "restart", NULL, NULL, NULL, &restart, NULL },
 
+	{ 0, "session", N_("use D-Bus session bus rather than system bus (for testing)"),
+		NULL, NULL, &use_session_bus, NULL },
+
 	/* Ignore invalid options */
 	{ '-', "--", NULL, NULL, NULL, NULL, NULL },
 
@@ -124,94 +127,104 @@
 	if (! args)
 		exit (1);
 
+	control_handle_bus_type ();
+
 #ifndef DEBUG
-	/* Check we're root */
-	if (getuid ()) {
-		nih_fatal (_("Need to be root"));
-		exit (1);
-	}
-
-	/* Check we're process #1 */
-	if (getpid () > 1) {
-		execv (TELINIT, argv);
-		/* Ignore failure, probably just that telinit doesn't exist */
-
-		nih_fatal (_("Not being executed as init"));
-		exit (1);
-	}
-
-	/* Clear our arguments from the command-line, so that we show up in
-	 * ps or top output as /sbin/init, with no extra flags.
-	 *
-	 * This is a very Linux-specific trick; by deleting the NULL
-	 * terminator at the end of the last argument, we fool the kernel
-	 * into believing we used a setproctitle()-a-like to extend the
-	 * argument space into the environment space, and thus make it use
-	 * strlen() instead of its own assumed length.  In fact, we've done
-	 * the exact opposite, and shrunk the command line length to just that
-	 * of whatever is in argv[0].
-	 *
-	 * If we don't do this, and just write \0 over the rest of argv, for
-	 * example; the command-line length still includes those \0s, and ps
-	 * will show whitespace in their place.
-	 */
-	if (argc > 1) {
-		char *arg_end;
-
-		arg_end = argv[argc-1] + strlen (argv[argc-1]);
-		*arg_end = ' ';
-	}
-
-
-	/* Become the leader of a new session and process group, shedding
-	 * any controlling tty (which we shouldn't have had anyway - but
-	 * you never know what initramfs did).
-	 */
-	setsid ();
-
-	/* Set the standard file descriptors to the ordinary console device,
-	 * resetting it to sane defaults unless we're inheriting from another
-	 * init process which we know left it in a sane state.
-	 */
-	if (system_setup_console (CONSOLE_OUTPUT, (! restart)) < 0)
-		nih_free (nih_error_get ());
-
-	/* Set the PATH environment variable */
-	setenv ("PATH", PATH, TRUE);
-
-	/* Switch to the root directory in case we were started from some
-	 * strange place, or worse, some directory in the initramfs that's
-	 * going to go away soon.
-	 */
-	if (chdir ("/"))
-		nih_warn ("%s: %s", _("Unable to set root directory"),
-			  strerror (errno));
-
-	/* Mount the /proc and /sys filesystems, which are pretty much
-	 * essential for any Linux system; not to mention used by
-	 * ourselves.
-	 */
-	if (system_mount ("proc", "/proc") < 0) {
-		NihError *err;
-
-		err = nih_error_get ();
-		nih_warn ("%s: %s", _("Unable to mount /proc filesystem"),
-			  err->message);
-		nih_free (err);
-	}
-
-	if (system_mount ("sysfs", "/sys") < 0) {
-		NihError *err;
-
-		err = nih_error_get ();
-		nih_warn ("%s: %s", _("Unable to mount /sys filesystem"),
-			  err->message);
-		nih_free (err);
-	}
+	if (use_session_bus == FALSE) {
+
+		/* Check we're root */
+		if (getuid ()) {
+			nih_fatal (_("Need to be root"));
+			exit (1);
+		}
+
+		/* Check we're process #1 */
+		if (getpid () > 1) {
+			execv (TELINIT, argv);
+			/* Ignore failure, probably just that telinit doesn't exist */
+
+			nih_fatal (_("Not being executed as init"));
+			exit (1);
+		}
+
+		/* Clear our arguments from the command-line, so that we show up in
+		 * ps or top output as /sbin/init, with no extra flags.
+		 *
+		 * This is a very Linux-specific trick; by deleting the NULL
+		 * terminator at the end of the last argument, we fool the kernel
+		 * into believing we used a setproctitle()-a-like to extend the
+		 * argument space into the environment space, and thus make it use
+		 * strlen() instead of its own assumed length.  In fact, we've done
+		 * the exact opposite, and shrunk the command line length to just that
+		 * of whatever is in argv[0].
+		 *
+		 * If we don't do this, and just write \0 over the rest of argv, for
+		 * example; the command-line length still includes those \0s, and ps
+		 * will show whitespace in their place.
+		 */
+		if (argc > 1) {
+			char *arg_end;
+
+			arg_end = argv[argc-1] + strlen (argv[argc-1]);
+			*arg_end = ' ';
+		}
+
+
+		/* Become the leader of a new session and process group, shedding
+		 * any controlling tty (which we shouldn't have had anyway - but
+		 * you never know what initramfs did).
+		 */
+		setsid ();
+
+		/* Set the standard file descriptors to the ordinary console device,
+		 * resetting it to sane defaults unless we're inheriting from another
+		 * init process which we know left it in a sane state.
+		 */
+		if (system_setup_console (CONSOLE_OUTPUT, (! restart)) < 0)
+			nih_free (nih_error_get ());
+
+		/* Set the PATH environment variable */
+		setenv ("PATH", PATH, TRUE);
+
+		/* Switch to the root directory in case we were started from some
+		 * strange place, or worse, some directory in the initramfs that's
+		 * going to go away soon.
+		 */
+		if (chdir ("/"))
+			nih_warn ("%s: %s", _("Unable to set root directory"),
+				strerror (errno));
+
+		/* Mount the /proc and /sys filesystems, which are pretty much
+		 * essential for any Linux system; not to mention used by
+		 * ourselves.
+		 */
+		if (system_mount ("proc", "/proc") < 0) {
+			NihError *err;
+
+			err = nih_error_get ();
+			nih_warn ("%s: %s", _("Unable to mount /proc filesystem"),
+				err->message);
+			nih_free (err);
+		}
+
+		if (system_mount ("sysfs", "/sys") < 0) {
+			NihError *err;
+
+			err = nih_error_get ();
+			nih_warn ("%s: %s", _("Unable to mount /sys filesystem"),
+				err->message);
+			nih_free (err);
+		}
+	} else {
+		nih_log_set_priority (NIH_LOG_DEBUG);
+		nih_debug ("Running with UID %d as PID %d (PPID %d)",
+				(int)getuid (), (int)getpid (), (int)getppid ());
+	}
+
 #else /* DEBUG */
 	nih_log_set_priority (NIH_LOG_DEBUG);
-	nih_debug ("Running as PID %d (PPID %d)",
-		(int)getpid (), (int)getppid ());
+	nih_debug ("Running with UID %d as PID %d (PPID %d)",
+		(int)getuid (), (int)getpid (), (int)getppid ());
 #endif /* DEBUG */
 
 
@@ -223,11 +236,13 @@
 		nih_signal_reset ();
 
 #ifndef DEBUG
-	/* Catch fatal errors immediately rather than waiting for a new
-	 * iteration through the main loop.
-	 */
-	nih_signal_set_handler (SIGSEGV, crash_handler);
-	nih_signal_set_handler (SIGABRT, crash_handler);
+	if (use_session_bus == FALSE) {
+		/* Catch fatal errors immediately rather than waiting for a new
+		 * iteration through the main loop.
+		 */
+		nih_signal_set_handler (SIGSEGV, crash_handler);
+		nih_signal_set_handler (SIGABRT, crash_handler);
+	}
 #endif /* DEBUG */
 
 	/* Don't ignore SIGCHLD or SIGALRM, but don't respond to them
@@ -238,33 +253,35 @@
 	nih_signal_set_handler (SIGALRM, nih_signal_handler);
 
 #ifndef DEBUG
-	/* Ask the kernel to send us SIGINT when control-alt-delete is
-	 * pressed; generate an event with the same name.
-	 */
-	reboot (RB_DISABLE_CAD);
-	nih_signal_set_handler (SIGINT, nih_signal_handler);
-	NIH_MUST (nih_signal_add_handler (NULL, SIGINT, cad_handler, NULL));
-
-	/* Ask the kernel to send us SIGWINCH when alt-uparrow is pressed;
-	 * generate a keyboard-request event.
-	 */
-	if (ioctl (0, KDSIGACCEPT, SIGWINCH) == 0) {
-		nih_signal_set_handler (SIGWINCH, nih_signal_handler);
-		NIH_MUST (nih_signal_add_handler (NULL, SIGWINCH,
-						  kbd_handler, NULL));
+	if (use_session_bus == FALSE) {
+		/* Ask the kernel to send us SIGINT when control-alt-delete is
+		 * pressed; generate an event with the same name.
+		 */
+		reboot (RB_DISABLE_CAD);
+		nih_signal_set_handler (SIGINT, nih_signal_handler);
+		NIH_MUST (nih_signal_add_handler (NULL, SIGINT, cad_handler, NULL));
+
+		/* Ask the kernel to send us SIGWINCH when alt-uparrow is pressed;
+		 * generate a keyboard-request event.
+		 */
+		if (ioctl (0, KDSIGACCEPT, SIGWINCH) == 0) {
+			nih_signal_set_handler (SIGWINCH, nih_signal_handler);
+			NIH_MUST (nih_signal_add_handler (NULL, SIGWINCH,
+						kbd_handler, NULL));
+		}
+
+		/* powstatd sends us SIGPWR when it changes /etc/powerstatus */
+		nih_signal_set_handler (SIGPWR, nih_signal_handler);
+		NIH_MUST (nih_signal_add_handler (NULL, SIGPWR, pwr_handler, NULL));
+
+		/* SIGHUP instructs us to re-load our configuration */
+		nih_signal_set_handler (SIGHUP, nih_signal_handler);
+		NIH_MUST (nih_signal_add_handler (NULL, SIGHUP, hup_handler, NULL));
+
+		/* SIGUSR1 instructs us to reconnect to D-Bus */
+		nih_signal_set_handler (SIGUSR1, nih_signal_handler);
+		NIH_MUST (nih_signal_add_handler (NULL, SIGUSR1, usr1_handler, NULL));
 	}
-
-	/* powstatd sends us SIGPWR when it changes /etc/powerstatus */
-	nih_signal_set_handler (SIGPWR, nih_signal_handler);
-	NIH_MUST (nih_signal_add_handler (NULL, SIGPWR, pwr_handler, NULL));
-
-	/* SIGHUP instructs us to re-load our configuration */
-	nih_signal_set_handler (SIGHUP, nih_signal_handler);
-	NIH_MUST (nih_signal_add_handler (NULL, SIGHUP, hup_handler, NULL));
-
-	/* SIGUSR1 instructs us to reconnect to D-Bus */
-	nih_signal_set_handler (SIGUSR1, nih_signal_handler);
-	NIH_MUST (nih_signal_add_handler (NULL, SIGUSR1, usr1_handler, NULL));
 #endif /* DEBUG */
 
 
@@ -284,20 +301,22 @@
 	conf_reload ();
 
 	/* Create a listening server for private connections. */
-	while (control_server_open () < 0) {
-		NihError *err;
+	if (use_session_bus == FALSE) {
+		while (control_server_open () < 0) {
+			NihError *err;
 
-		err = nih_error_get ();
-		if (err->number != ENOMEM) {
-			nih_warn ("%s: %s", _("Unable to listen for private connections"),
-				  err->message);
+			err = nih_error_get ();
+			if (err->number != ENOMEM) {
+				nih_warn ("%s: %s", _("Unable to listen for private connections"),
+					err->message);
+				nih_free (err);
+				break;
+			}
 			nih_free (err);
-			break;
 		}
-		nih_free (err);
 	}
 
-	/* Open connection to the system bus; we normally expect this to
+	/* Open connection to the appropriate D-Bus bus; we normally expect this to
 	 * fail and will try again later - don't let ENOMEM stop us though.
 	 */
 	while (control_bus_open () < 0) {
@@ -313,13 +332,15 @@
 	}
 
 #ifndef DEBUG
-	/* Now that the startup is complete, send all further logging output
-	 * to kmsg instead of to the console.
-	 */
-	if (system_setup_console (CONSOLE_NONE, FALSE) < 0)
-		nih_free (nih_error_get ());
+	if (use_session_bus == FALSE) {
+		/* Now that the startup is complete, send all further logging output
+		 * to kmsg instead of to the console.
+		 */
+		if (system_setup_console (CONSOLE_NONE, FALSE) < 0)
+			nih_free (nih_error_get ());
 
-	nih_log_set_logger (logger_kmsg);
+		nih_log_set_logger (logger_kmsg);
+	}
 #endif /* DEBUG */
 
 
 
=== modified file 'init/man/init.8'
--- init/man/init.8	2010-02-04 19:26:17 +0000
+++ init/man/init.8	2011-06-03 09:21:18 +0000
@@ -1,4 +1,4 @@
-.TH init 8 2010-02-04 "Upstart"
+.TH init 8 2011-05-31 "Upstart"
 .\"
 .SH NAME
 init \- Upstart process management daemon
@@ -64,6 +64,10 @@
 by placing them on the kernel command-line.
 .\"
 .TP
+.B \-\-session
+Connect to the D\-Bus session bus. This should only be used for testing.
+.\"
+.TP
 .B --verbose
 Outputs verbose messages about job state changes and event emissions to the
 system console or log, useful for debugging boot.
@@ -90,7 +94,7 @@
 .RB < https://launchpad.net/upstart/+bugs >
 .\"
 .SH COPYRIGHT
-Copyright \(co 2010 Canonical Ltd.
+Copyright \(co 2009-2011 Canonical Ltd.
 .br
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
=== modified file 'init/tests/test_conf.c'
--- init/tests/test_conf.c	2011-02-17 23:38:17 +0000
+++ init/tests/test_conf.c	2011-06-03 09:21:18 +0000
@@ -2,7 +2,6 @@
  *
  * test_conf.c - test suite for init/conf.c
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2009 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
 
=== modified file 'init/tests/test_control.c'
--- init/tests/test_control.c	2011-03-16 22:42:48 +0000
+++ init/tests/test_control.c	2011-06-03 09:21:18 +0000
@@ -2,7 +2,6 @@
  *
  * test_dbus.c - test suite for init/dbus.c
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2010 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
 
=== modified file 'init/tests/test_environ.c'
--- init/tests/test_environ.c	2011-03-16 22:42:48 +0000
+++ init/tests/test_environ.c	2011-06-03 09:21:18 +0000
@@ -2,7 +2,6 @@
  *
  * test_environ.c - test suite for init/environ.c
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2009 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
 
=== modified file 'init/tests/test_job_class.c'
--- init/tests/test_job_class.c	2011-05-12 20:42:28 +0000
+++ init/tests/test_job_class.c	2011-06-03 09:21:18 +0000
@@ -2,7 +2,6 @@
  *
  * test_job_class.c - test suite for init/job_class.c
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2010 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
 
=== modified file 'init/tests/test_job_process.c'
--- init/tests/test_job_process.c	2011-05-12 19:21:16 +0000
+++ init/tests/test_job_process.c	2011-06-03 09:21:18 +0000
@@ -2,7 +2,6 @@
  *
  * test_job_process.c - test suite for init/job_process.c
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
 
=== modified file 'po/upstart.pot'
--- po/upstart.pot	2011-03-22 17:52:25 +0000
+++ po/upstart.pot	2011-06-03 09:21:18 +0000
@@ -6,76 +6,141 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: upstart 1.2\n"
+"Project-Id-Version: upstart 1.3\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-03-22 10:52-0700\n"
+"POT-Creation-Date: 2011-05-31 17:52+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: init/conf.c:238
+#: init/conf.c:237
 msgid "Unable to load configuration"
 msgstr ""
 
-#: init/conf.c:271
+#: init/conf.c:270
 #, c-format
 msgid "Loading configuration from %s"
 msgstr ""
 
-#: init/conf.c:308
+#: init/conf.c:307
 #, c-format
 msgid "Handling deletion of %s"
 msgstr ""
 
-#: init/conf.c:379
+#: init/conf.c:378
 msgid "Unable to watch configuration file"
 msgstr ""
 
-#: init/conf.c:457
+#: init/conf.c:456
 msgid "Unable to watch configuration directory"
 msgstr ""
 
-#: init/conf.c:569 init/conf.c:653
+#: init/conf.c:568 init/conf.c:652
 msgid "Error while loading configuration file"
 msgstr ""
 
-#: init/conf.c:609
+#: init/conf.c:608
 msgid "Configuration directory deleted"
 msgstr ""
 
-#: init/control.c:155
+#: init/control.c:162
 msgid "Connection from private client"
 msgstr ""
 
-#: init/control.c:290
+#: init/control.c:301
 msgid "Disconnected from system bus"
 msgstr ""
 
-#: init/control.c:356 init/main.c:546
+#: init/control.c:367 init/main.c:567
 msgid "Reloading configuration"
 msgstr ""
 
-#: init/control.c:396 init/control.c:507
+#: init/control.c:407 init/control.c:518
 msgid "Name may not be empty string"
 msgstr ""
 
-#: init/control.c:405
+#: init/control.c:416
 #, c-format
 msgid "Unknown job: %s"
 msgstr ""
 
-#: init/control.c:514 init/job_class.c:522 init/job_class.c:710
-#: init/job_class.c:829 init/job_class.c:953
+#: init/control.c:525 init/job_class.c:524 init/job_class.c:712
+#: init/job_class.c:831 init/job_class.c:955
 msgid "Env must be KEY=VALUE pairs"
 msgstr ""
 
-#: init/control.c:666
+#: init/control.c:677
 msgid "The log priority given was not recognised"
 msgstr ""
 
+#: init/errors.h:58
+msgid "Illegal parameter"
+msgstr ""
+
+#: init/errors.h:59
+msgid "Unknown parameter"
+msgstr ""
+
+#: init/errors.h:60 init/errors.h:71
+msgid "Expected operator"
+msgstr ""
+
+#: init/errors.h:61
+msgid "Mismatched braces"
+msgstr ""
+
+#: init/errors.h:62
+msgid "Illegal interval, expected number of seconds"
+msgstr ""
+
+#: init/errors.h:63
+msgid "Illegal exit status, expected integer"
+msgstr ""
+
+#: init/errors.h:64
+msgid "Illegal signal status, expected integer"
+msgstr ""
+
+#: init/errors.h:65
+msgid "Illegal file creation mask, expected octal integer"
+msgstr ""
+
+#: init/errors.h:66
+msgid "Illegal nice value, expected -20 to 19"
+msgstr ""
+
+#: init/errors.h:67
+msgid "Illegal oom adjustment, expected -16 to 15 or 'never'"
+msgstr ""
+
+#: init/errors.h:68
+msgid "Illegal oom score adjustment, expected -999 to 1000 or 'never'"
+msgstr ""
+
+#: init/errors.h:69
+msgid "Illegal limit, expected 'unlimited' or integer"
+msgstr ""
+
+#: init/errors.h:70
+msgid "Expected event"
+msgstr ""
+
+#: init/errors.h:72
+msgid "Expected variable name before value"
+msgstr ""
+
+#: init/errors.h:73
+msgid "Mismatched parentheses"
+msgstr ""
+
+#: init/errors.h:74
+msgid "Name already taken"
+msgstr ""
+
 #: init/event.c:273
 #, c-format
 msgid "Handling %s event"
@@ -164,241 +229,240 @@
 msgid "post-stop"
 msgstr ""
 
-#: init/job.c:1113 init/job_class.c:756
+#: init/job.c:1113 init/job_class.c:758
 #, c-format
 msgid "Job is already running: %s"
 msgstr ""
 
-#: init/job.c:1177 init/job.c:1242 init/job_class.c:875 init/job_class.c:998
+#: init/job.c:1177 init/job.c:1242 init/job_class.c:877 init/job_class.c:1000
 #, c-format
 msgid "Job has already been stopped: %s"
 msgstr ""
 
-#: init/job_class.c:559 init/job_class.c:604 init/job_class.c:867
-#: init/job_class.c:990
+#: init/job_class.c:561 init/job_class.c:606 init/job_class.c:869
+#: init/job_class.c:992
 #, c-format
 msgid "Unknown instance: %s"
 msgstr ""
 
-#: init/job_process.c:279
+#: init/job_process.c:276
 #, c-format
 msgid "Failed to spawn %s %s process: %s"
 msgstr ""
 
-#: init/job_process.c:285
+#: init/job_process.c:282
 msgid "Temporary process spawn error"
 msgstr ""
 
-#: init/job_process.c:292
+#: init/job_process.c:289
 #, c-format
 msgid "%s %s process (%d)"
 msgstr ""
 
-#: init/job_process.c:399
+#: init/job_process.c:402
 #, c-format
 msgid "Pausing %s (%d) [pre-exec] for debug"
 msgstr ""
 
-#: init/job_process.c:453
+#: init/job_process.c:472
 #, c-format
 msgid "Failed to open system console: %s"
 msgstr ""
 
-#: init/job_process.c:669
+#: init/job_process.c:696
+#, c-format
+msgid "unable to move script fd: %s"
+msgstr ""
+
+#: init/job_process.c:701
 #, c-format
 msgid "unable to open console: %s"
 msgstr ""
 
-#: init/job_process.c:724
+#: init/job_process.c:756
 #, c-format
 msgid "unable to set \"%s\" resource limit: %s"
 msgstr ""
 
-#: init/job_process.c:729
+#: init/job_process.c:761
 #, c-format
 msgid "unable to set priority: %s"
 msgstr ""
 
-#: init/job_process.c:734
+#: init/job_process.c:766
 #, c-format
 msgid "unable to set oom adjustment: %s"
 msgstr ""
 
-#: init/job_process.c:739
+#: init/job_process.c:771
 #, c-format
 msgid "unable to change root directory: %s"
 msgstr ""
 
-#: init/job_process.c:744
+#: init/job_process.c:776
 #, c-format
 msgid "unable to change working directory: %s"
 msgstr ""
 
-#: init/job_process.c:749
+#: init/job_process.c:781
 #, c-format
 msgid "unable to set trace: %s"
 msgstr ""
 
-#: init/job_process.c:754
+#: init/job_process.c:786
 #, c-format
 msgid "unable to execute: %s"
 msgstr ""
 
-#: init/job_process.c:785
-#, c-format
-msgid "Sending TERM signal to %s %s process (%d)"
-msgstr ""
-
-#: init/job_process.c:793
-#, c-format
-msgid "Failed to send TERM signal to %s %s process (%d): %s"
-msgstr ""
-
-#: init/job_process.c:833
-#, c-format
-msgid "Sending KILL signal to %s %s process (%d)"
-msgstr ""
-
-#: init/job_process.c:841
-#, c-format
-msgid "Failed to send KILL signal to %s %s process (%d): %s"
-msgstr ""
-
-#: init/job_process.c:901
+#: init/job_process.c:817 init/job_process.c:867
+#, c-format
+msgid "Sending %s signal to %s %s process (%d)"
+msgstr ""
+
+#: init/job_process.c:826 init/job_process.c:876
+#, c-format
+msgid "Failed to send %s signal to %s %s process (%d): %s"
+msgstr ""
+
+#: init/job_process.c:937
 #, c-format
 msgid "%s %s process (%d) terminated with status %d"
 msgstr ""
 
-#: init/job_process.c:906
+#: init/job_process.c:942
 #, c-format
 msgid "%s %s process (%d) exited normally"
 msgstr ""
 
-#: init/job_process.c:921
+#: init/job_process.c:957
 #, c-format
 msgid "%s %s process (%d) killed by %s signal"
 msgstr ""
 
-#: init/job_process.c:925
+#: init/job_process.c:961
 #, c-format
 msgid "%s %s process (%d) killed by signal %d"
 msgstr ""
 
-#: init/job_process.c:939
+#: init/job_process.c:975
 #, c-format
 msgid "%s %s process (%d) stopped by %s signal"
 msgstr ""
 
-#: init/job_process.c:943
+#: init/job_process.c:979
 #, c-format
 msgid "%s %s process (%d) stopped by signal %d"
 msgstr ""
 
-#: init/job_process.c:957
+#: init/job_process.c:993
 #, c-format
 msgid "%s %s process (%d) continued by %s signal"
 msgstr ""
 
-#: init/job_process.c:961
+#: init/job_process.c:997
 #, c-format
 msgid "%s %s process (%d) continued by signal %d"
 msgstr ""
 
-#: init/job_process.c:1096
+#: init/job_process.c:1132
 #, c-format
 msgid "%s respawning too fast, stopped"
 msgstr ""
 
-#: init/job_process.c:1102
+#: init/job_process.c:1138
 #, c-format
 msgid "%s %s process ended, respawning"
 msgstr ""
 
-#: init/job_process.c:1342
+#: init/job_process.c:1378
 #, c-format
 msgid "Failed to set ptrace options for %s %s process (%d): %s"
 msgstr ""
 
-#: init/job_process.c:1355 init/job_process.c:1550
+#: init/job_process.c:1391 init/job_process.c:1586
 #, c-format
 msgid "Failed to continue traced %s %s process (%d): %s"
 msgstr ""
 
-#: init/job_process.c:1395 init/job_process.c:1486 init/job_process.c:1541
+#: init/job_process.c:1431 init/job_process.c:1522 init/job_process.c:1577
 #, c-format
 msgid "Failed to detach traced %s %s process (%d): %s"
 msgstr ""
 
-#: init/job_process.c:1435
+#: init/job_process.c:1471
 #, c-format
 msgid "Failed to deliver signal to traced %s %s process (%d): %s"
 msgstr ""
 
-#: init/job_process.c:1470
+#: init/job_process.c:1506
 #, c-format
 msgid "Failed to obtain child process id for %s %s process (%d): %s"
 msgstr ""
 
-#: init/job_process.c:1477
+#: init/job_process.c:1513
 #, c-format
 msgid "%s %s process (%d) became new process (%d)"
 msgstr ""
 
-#: init/job_process.c:1536
+#: init/job_process.c:1572
 #, c-format
 msgid "%s %s process (%d) executable changed"
 msgstr ""
 
-#: init/main.c:117
+#: init/main.c:100
+msgid "use D-Bus session bus rather than system bus (for testing)"
+msgstr ""
+
+#: init/main.c:120
 msgid "Process management daemon."
 msgstr ""
 
-#: init/main.c:119
+#: init/main.c:122
 msgid ""
 "This daemon is normally executed by the kernel and given process id 1 to "
 "denote its special status.  When executed by a user process, it will "
 "actually run /sbin/telinit."
 msgstr ""
 
-#: init/main.c:130 util/reboot.c:167 util/shutdown.c:363 util/telinit.c:148
+#: init/main.c:137 util/reboot.c:166 util/shutdown.c:363 util/telinit.c:148
 msgid "Need to be root"
 msgstr ""
 
-#: init/main.c:139
+#: init/main.c:146
 msgid "Not being executed as init"
 msgstr ""
 
-#: init/main.c:187 init/main.c:456
+#: init/main.c:194 init/main.c:477
 msgid "Unable to set root directory"
 msgstr ""
 
-#: init/main.c:198
+#: init/main.c:205
 msgid "Unable to mount /proc filesystem"
 msgstr ""
 
-#: init/main.c:207
+#: init/main.c:214
 msgid "Unable to mount /sys filesystem"
 msgstr ""
 
-#: init/main.c:292
+#: init/main.c:310
 msgid "Unable to listen for private connections"
 msgstr ""
 
-#: init/main.c:473
+#: init/main.c:494
 #, c-format
 msgid "Caught %s, core dumped"
 msgstr ""
 
-#: init/main.c:477
+#: init/main.c:498
 #, c-format
 msgid "Caught %s, unable to dump core"
 msgstr ""
 
-#: init/main.c:563
+#: init/main.c:584
 msgid "Reconnecting to system bus"
 msgstr ""
 
-#: init/main.c:569
+#: init/main.c:590
 msgid "Unable to connect to the system bus"
 msgstr ""
 
@@ -406,76 +470,84 @@
 msgid "main"
 msgstr ""
 
-#: util/initctl.c:145
+#: util/initctl.c:185
 msgid "Unable to connect to system bus"
 msgstr ""
 
-#: util/initctl.c:154
+#: util/initctl.c:186
+msgid "Unable to connect to session bus"
+msgstr ""
+
+#: util/initctl.c:195
 #, c-format
 msgid "%s: --dest given without --system\n"
 msgstr ""
 
-#: util/initctl.c:162
+#: util/initctl.c:203
 msgid "Unable to connect to Upstart"
 msgstr ""
 
-#: util/initctl.c:348 util/initctl.c:483 util/initctl.c:611 util/initctl.c:745
-#: util/initctl.c:850
+#: util/initctl.c:389 util/initctl.c:524 util/initctl.c:652 util/initctl.c:786
+#: util/initctl.c:891
 #, c-format
 msgid "%s: missing job name\n"
 msgstr ""
 
-#: util/initctl.c:796
+#: util/initctl.c:837
 msgid "Not running"
 msgstr ""
 
-#: util/initctl.c:1065
+#: util/initctl.c:1106
 #, c-format
 msgid "%s: missing event name\n"
 msgstr ""
 
-#: util/initctl.c:1261
+#: util/initctl.c:1302
+msgid "use D-Bus session bus to connect to init daemon (for testing)"
+msgstr ""
+
+#: util/initctl.c:1304
 msgid "use D-Bus system bus to connect to init daemon"
 msgstr ""
 
-#: util/initctl.c:1263
-msgid "destination well-known name on system bus"
+#: util/initctl.c:1306
+msgid "destination well-known name on D-Bus bus"
 msgstr ""
 
-#: util/initctl.c:1276
+#: util/initctl.c:1319
 msgid "do not wait for job to start before exiting"
 msgstr ""
 
-#: util/initctl.c:1288
+#: util/initctl.c:1331
 msgid "do not wait for job to stop before exiting"
 msgstr ""
 
-#: util/initctl.c:1300
+#: util/initctl.c:1343
 msgid "do not wait for job to restart before exiting"
 msgstr ""
 
-#: util/initctl.c:1339
+#: util/initctl.c:1382
 msgid "do not wait for event to finish before exiting"
 msgstr ""
 
-#: util/initctl.c:1378
+#: util/initctl.c:1421
 msgid "Job"
 msgstr ""
 
-#: util/initctl.c:1385
+#: util/initctl.c:1428
 msgid "Event"
 msgstr ""
 
-#: util/initctl.c:1393 util/initctl.c:1405 util/initctl.c:1416
-#: util/initctl.c:1427 util/initctl.c:1434
+#: util/initctl.c:1436 util/initctl.c:1448 util/initctl.c:1459
+#: util/initctl.c:1470 util/initctl.c:1477
 msgid "JOB [KEY=VALUE]..."
 msgstr ""
 
-#: util/initctl.c:1394
+#: util/initctl.c:1437
 msgid "Start job."
 msgstr ""
 
-#: util/initctl.c:1395
+#: util/initctl.c:1438
 msgid ""
 "JOB is the name of the job that is to be started, this may be followed by "
 "zero or more environment variables to be defined in the new job.\n"
@@ -485,11 +557,11 @@
 "an existing instance is already running."
 msgstr ""
 
-#: util/initctl.c:1406
+#: util/initctl.c:1449
 msgid "Stop job."
 msgstr ""
 
-#: util/initctl.c:1407
+#: util/initctl.c:1450
 msgid ""
 "JOB is the name of the job that is to be stopped, this may be followed by "
 "zero or more environment variables to be passed to the job's pre-stop and "
@@ -499,11 +571,11 @@
 "decide which of multiple instances will be stopped."
 msgstr ""
 
-#: util/initctl.c:1417
+#: util/initctl.c:1460
 msgid "Restart job."
 msgstr ""
 
-#: util/initctl.c:1418
+#: util/initctl.c:1461
 msgid ""
 "JOB is the name of the job that is to be restarted, this may be followed by "
 "zero or more environment variables to be defined in the job after "
@@ -513,66 +585,66 @@
 "decide which of multiple instances will be restarted."
 msgstr ""
 
-#: util/initctl.c:1428
+#: util/initctl.c:1471
 msgid "Send HUP signal to job."
 msgstr ""
 
-#: util/initctl.c:1429
+#: util/initctl.c:1472
 msgid ""
 "JOB is the name of the job that is to be sent the signal, this may be "
 "followed by zero or more environment variables to distinguish between job "
 "instances.\n"
 msgstr ""
 
-#: util/initctl.c:1435
+#: util/initctl.c:1478
 msgid "Query status of job."
 msgstr ""
 
-#: util/initctl.c:1436
+#: util/initctl.c:1479
 msgid ""
 "JOB is the name of the job that is to be queried, this may be followed by "
 "zero or more environment variables to distguish between job instances.\n"
 msgstr ""
 
-#: util/initctl.c:1442
+#: util/initctl.c:1485
 msgid "List known jobs."
 msgstr ""
 
-#: util/initctl.c:1443
+#: util/initctl.c:1486
 msgid "The known jobs and their current status will be output."
 msgstr ""
 
-#: util/initctl.c:1446
+#: util/initctl.c:1489
 msgid "EVENT [KEY=VALUE]..."
 msgstr ""
 
-#: util/initctl.c:1447
+#: util/initctl.c:1490
 msgid "Emit an event."
 msgstr ""
 
-#: util/initctl.c:1448
+#: util/initctl.c:1491
 msgid ""
 "EVENT is the name of an event the init daemon should emit, this may be "
 "followed by zero or more environment variables to be included in the event.\n"
 msgstr ""
 
-#: util/initctl.c:1454
+#: util/initctl.c:1497
 msgid "Reload the configuration of the init daemon."
 msgstr ""
 
-#: util/initctl.c:1458
+#: util/initctl.c:1501
 msgid "Request the version of the init daemon."
 msgstr ""
 
-#: util/initctl.c:1461
+#: util/initctl.c:1504
 msgid "[PRIORITY]"
 msgstr ""
 
-#: util/initctl.c:1462
+#: util/initctl.c:1505
 msgid "Change the minimum priority of log messages from the init daemon"
 msgstr ""
 
-#: util/initctl.c:1464
+#: util/initctl.c:1507
 msgid ""
 "PRIORITY may be one of:\n"
 "  `debug' (messages useful for debugging upstart are logged, equivalent to --"
@@ -589,59 +661,59 @@
 "Without arguments, this outputs the current log priority."
 msgstr ""
 
-#: util/reboot.c:114
+#: util/reboot.c:113
 msgid "don't sync before reboot or halt"
 msgstr ""
 
-#: util/reboot.c:116
+#: util/reboot.c:115
 msgid "force reboot or halt, don't call shutdown(8)"
 msgstr ""
 
-#: util/reboot.c:118
+#: util/reboot.c:117
 msgid "switch off the power when called as halt"
 msgstr ""
 
-#: util/reboot.c:120
+#: util/reboot.c:119
 msgid "don't actually reboot or halt, just write wtmp record"
 msgstr ""
 
-#: util/reboot.c:145
+#: util/reboot.c:144
 msgid "Halt the system."
 msgstr ""
 
-#: util/reboot.c:148
+#: util/reboot.c:147
 msgid "Power off the system."
 msgstr ""
 
-#: util/reboot.c:151
+#: util/reboot.c:150
 msgid "Reboot the system."
 msgstr ""
 
-#: util/reboot.c:155
+#: util/reboot.c:154
 msgid ""
 "This command is intended to instruct the kernel to reboot or halt the "
 "system; when run without the -f option, or when in a system runlevel other "
 "than 0 or 6, it will actually execute /sbin/shutdown.\n"
 msgstr ""
 
-#: util/reboot.c:211
+#: util/reboot.c:210
 msgid "Calling shutdown"
 msgstr ""
 
-#: util/reboot.c:214
+#: util/reboot.c:213
 #, c-format
 msgid "Unable to execute shutdown: %s"
 msgstr ""
 
-#: util/reboot.c:235
+#: util/reboot.c:234
 msgid "Rebooting"
 msgstr ""
 
-#: util/reboot.c:239
+#: util/reboot.c:238
 msgid "Halting"
 msgstr ""
 
-#: util/reboot.c:243
+#: util/reboot.c:242
 msgid "Powering off"
 msgstr ""
 
 
=== modified file 'util/initctl.c'
--- util/initctl.c	2010-02-04 19:08:07 +0000
+++ util/initctl.c	2011-06-03 09:21:18 +0000
@@ -63,6 +63,11 @@
 static void   reply_handler       (int *ret, NihDBusMessage *message);
 static void   error_handler       (void *data, NihDBusMessage *message);
 
+#ifndef TEST
+
+static int    dbus_bus_type_setter  (NihOption *option, const char *arg);
+
+#endif
 
 /* Prototypes for option and command functions */
 int start_action                (NihCommand *command, char * const *args);
@@ -78,12 +83,21 @@
 
 
 /**
- * system_bus:
- *
- * Whether to connect to the init daemon on the D-Bus system bus or
- * privately.
- **/
-int system_bus = -1;
+ * use_dbus:
+ *
+ * If  1, connect using a D-Bus bus.
+ * If  0, connect using private connection.
+ * If -1, determine appropriate connection based on UID.
+ */
+int use_dbus = -1;
+
+/**
+ * dbus_bus_type:
+ *
+ * D-Bus bus to connect to (DBUS_BUS_SYSTEM or DBUS_BUS_SESSION), or -1
+ * to have an appropriate bus selected.
+ */
+int dbus_bus_type = -1;
 
 /**
  * dest_name:
@@ -107,6 +121,28 @@
  **/
 int no_wait = FALSE;
 
+/**
+ * NihOption setter function to handle selection of appropriate D-Bus
+ * bus.
+ *
+ * Always returns 1 denoting success.
+ **/
+int
+dbus_bus_type_setter (NihOption *option, const char *arg)
+{
+	nih_assert (option);
+
+	if (! strcmp (option->long_option, "system")) {
+		use_dbus      = TRUE;
+		dbus_bus_type = DBUS_BUS_SYSTEM;
+	}
+	else if (! strcmp (option->long_option, "session")) {
+		use_dbus      = TRUE;
+		dbus_bus_type = DBUS_BUS_SESSION;
+	}
+
+	return 1;
+}
 
 /**
  * upstart_open:
@@ -132,17 +168,22 @@
 	DBusConnection *connection;
 	NihDBusProxy *  upstart;
 
-	if (system_bus < 0)
-		system_bus = getuid () ? TRUE : FALSE;
+	if (use_dbus < 0)
+		use_dbus = getuid () ? TRUE : FALSE;
+	if (use_dbus >= 0 && dbus_bus_type < 0)
+		dbus_bus_type = DBUS_BUS_SYSTEM;
 
 	dbus_error_init (&dbus_error);
-	if (system_bus) {
+	if (use_dbus) {
 		if (! dest_name)
 			dest_name = DBUS_SERVICE_UPSTART;
 
-		connection = dbus_bus_get (DBUS_BUS_SYSTEM, &dbus_error);
+		connection = dbus_bus_get (dbus_bus_type, &dbus_error);
 		if (! connection) {
-			nih_error ("%s: %s", _("Unable to connect to system bus"),
+			nih_error ("%s: %s",
+				dbus_bus_type == DBUS_BUS_SYSTEM
+				? _("Unable to connect to system bus")
+				: _("Unable to connect to session bus"),
 				   dbus_error.message);
 			dbus_error_free (&dbus_error);
 			return NULL;
@@ -1258,9 +1299,11 @@
  * Command-line options accepted for all arguments.
  **/
 static NihOption options[] = {
+	{ 0, "session", N_("use D-Bus session bus to connect to init daemon (for testing)"),
+	  NULL, NULL, NULL, dbus_bus_type_setter },
 	{ 0, "system", N_("use D-Bus system bus to connect to init daemon"),
-	  NULL, NULL, &system_bus, NULL },
-	{ 0, "dest", N_("destination well-known name on system bus"),
+	  NULL, NULL, NULL, dbus_bus_type_setter },
+	{ 0, "dest", N_("destination well-known name on D-Bus bus"),
 	  NULL, "NAME", &dest_name, NULL },
 
 	NIH_OPTION_LAST
 
=== modified file 'util/man/initctl.8'
--- util/man/initctl.8	2010-02-04 19:08:07 +0000
+++ util/man/initctl.8	2011-06-03 09:21:18 +0000
@@ -1,4 +1,4 @@
-.TH initctl 8 2010-02-04 "Upstart"
+.TH initctl 8 2011-06-01 "Upstart"
 .\"
 .SH NAME
 initctl \- init daemon control tool
@@ -33,6 +33,12 @@
 .\"
 .SH OPTIONS
 .TP
+.B --session
+Connect to
+.BR init (8)
+daemon using the D-Bus session bus (for testing purposes only).
+.\"
+.TP
 .B --system
 Communication with the
 .BR init (8)
@@ -348,7 +354,7 @@
 .RB < https://launchpad.net/upstart/+bugs >
 .\"
 .SH COPYRIGHT
-Copyright \(co 2010 Canonical Ltd.
+Copyright \(co 2010-2011 Canonical Ltd.
 .br
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
=== modified file 'util/reboot.c'
--- util/reboot.c	2011-03-16 22:18:22 +0000
+++ util/reboot.c	2011-06-03 09:21:18 +0000
@@ -1,6 +1,5 @@
 /* upstart
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2010 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
 
=== modified file 'util/tests/test_initctl.c'
--- util/tests/test_initctl.c	2010-02-04 20:43:33 +0000
+++ util/tests/test_initctl.c	2011-06-03 09:21:18 +0000
@@ -44,7 +44,8 @@
 #include "dbus/upstart.h"
 
 
-extern int system_bus;
+extern int use_dbus;
+extern int dbus_bus_type;
 extern char *dest_name;
 extern const char *dest_address;
 extern int no_wait;
@@ -103,7 +104,7 @@
 	 */
 	TEST_FEATURE ("with private connection");
 	TEST_ALLOC_FAIL {
-		system_bus = FALSE;
+		use_dbus = FALSE;
 		dest_name = NULL;
 		dest_address = "unix:abstract=/com/ubuntu/upstart/test";
 
@@ -179,7 +180,8 @@
 	 */
 	TEST_FEATURE ("with system bus connection");
 	TEST_ALLOC_FAIL {
-		system_bus = TRUE;
+		use_dbus = TRUE;
+		dbus_bus_type = DBUS_BUS_SYSTEM;
 		dest_name = NULL;
 		dest_address = DBUS_ADDRESS_UPSTART;
 
@@ -240,7 +242,8 @@
 	 */
 	TEST_FEATURE ("with system bus connection and different name");
 	TEST_ALLOC_FAIL {
-		system_bus = TRUE;
+		use_dbus = TRUE;
+		dbus_bus_type = DBUS_BUS_SYSTEM;
 		dest_name = "com.ubuntu.UpstartTest";
 		dest_address = DBUS_ADDRESS_UPSTART;
 
@@ -302,7 +305,7 @@
 	 */
 	TEST_FEATURE ("with non-listening private connection");
 	TEST_ALLOC_FAIL {
-		system_bus = FALSE;
+		use_dbus = FALSE;
 		dest_name = NULL;
 		dest_address = "unix:abstract=/com/ubuntu/upstart/test";
 
@@ -328,7 +331,8 @@
 	 */
 	TEST_FEATURE ("with non-listening system bus");
 	TEST_ALLOC_FAIL {
-		system_bus = TRUE;
+		use_dbus = TRUE;
+		dbus_bus_type = DBUS_BUS_SYSTEM;
 		dest_name = NULL;
 		dest_address = DBUS_ADDRESS_UPSTART;
 
@@ -360,7 +364,7 @@
 	 */
 	TEST_FEATURE ("with --dest but without --system");
 	TEST_ALLOC_FAIL {
-		system_bus = FALSE;
+		use_dbus = FALSE;
 		dest_name = "com.ubuntu.Upstart";
 		dest_address = DBUS_ADDRESS_UPSTART;
 
@@ -3229,7 +3233,8 @@
 					"NameAcquired"));
 	dbus_message_unref (method_call);
 
-	system_bus = TRUE;
+	use_dbus = TRUE;
+	dbus_bus_type = DBUS_BUS_SYSTEM;
 	dest_name = DBUS_SERVICE_UPSTART;
 	dest_address = DBUS_ADDRESS_UPSTART;
 
@@ -4999,7 +5004,8 @@
 					"NameAcquired"));
 	dbus_message_unref (method_call);
 
-	system_bus = TRUE;
+	use_dbus = TRUE;
+	dbus_bus_type = DBUS_BUS_SYSTEM;
 	dest_name = DBUS_SERVICE_UPSTART;
 	dest_address = DBUS_ADDRESS_UPSTART;
 
@@ -6584,7 +6590,8 @@
 					"NameAcquired"));
 	dbus_message_unref (method_call);
 
-	system_bus = TRUE;
+	use_dbus = TRUE;
+	dbus_bus_type = DBUS_BUS_SYSTEM;
 	dest_name = DBUS_SERVICE_UPSTART;
 	dest_address = DBUS_ADDRESS_UPSTART;
 
@@ -8357,7 +8364,8 @@
 					"NameAcquired"));
 	dbus_message_unref (method_call);
 
-	system_bus = TRUE;
+	use_dbus = TRUE;
+	dbus_bus_type = DBUS_BUS_SYSTEM;
 	dest_name = DBUS_SERVICE_UPSTART;
 	dest_address = DBUS_ADDRESS_UPSTART;
 
@@ -9239,7 +9247,8 @@
 					"NameAcquired"));
 	dbus_message_unref (method_call);
 
-	system_bus = TRUE;
+	use_dbus = TRUE;
+	dbus_bus_type = DBUS_BUS_SYSTEM;
 	dest_name = DBUS_SERVICE_UPSTART;
 	dest_address = DBUS_ADDRESS_UPSTART;
 
@@ -10769,7 +10778,7 @@
 					"NameAcquired"));
 	dbus_message_unref (method_call);
 
-	system_bus = TRUE;
+	dbus_bus_type = DBUS_BUS_SYSTEM;
 	dest_name = DBUS_SERVICE_UPSTART;
 	dest_address = DBUS_ADDRESS_UPSTART;
 
@@ -12060,7 +12069,7 @@
 					"NameAcquired"));
 	dbus_message_unref (method_call);
 
-	system_bus = TRUE;
+	dbus_bus_type = DBUS_BUS_SYSTEM;
 	dest_name = DBUS_SERVICE_UPSTART;
 	dest_address = DBUS_ADDRESS_UPSTART;
 
@@ -12494,7 +12503,7 @@
 					"NameAcquired"));
 	dbus_message_unref (method_call);
 
-	system_bus = TRUE;
+	dbus_bus_type = DBUS_BUS_SYSTEM;
 	dest_name = DBUS_SERVICE_UPSTART;
 	dest_address = DBUS_ADDRESS_UPSTART;
 
@@ -12684,7 +12693,7 @@
 					"NameAcquired"));
 	dbus_message_unref (method_call);
 
-	system_bus = TRUE;
+	dbus_bus_type = DBUS_BUS_SYSTEM;
 	dest_name = DBUS_SERVICE_UPSTART;
 	dest_address = DBUS_ADDRESS_UPSTART;
 
@@ -12904,7 +12913,7 @@
 					"NameAcquired"));
 	dbus_message_unref (method_call);
 
-	system_bus = TRUE;
+	dbus_bus_type = DBUS_BUS_SYSTEM;
 	dest_name = DBUS_SERVICE_UPSTART;
 	dest_address = DBUS_ADDRESS_UPSTART;