Merge lp:~jamesodhunt/ubuntu/natty/upstart/fix-chroot-sessions into lp:ubuntu/natty/upstart

[James Hunt]

* Important fixes for user sessions (currently disabled in Ubuntu) and chroot sessions (which previously could cause an out-of-memory condition).

* Clints fix for bug 707479.

[Clint Byrum (clint-fewbar)]

I've been testing this for over a week on two natty machines kept up to date on a daily basis. I've seen no breakage, and this fixes a critical bug. The change to upstart-job is a bit late, and could be removed, but at this point I feel its better having the package as it has been tested by some of us uploaded rather than something with only half the fixes.

Approved, and uploading to natty for release team approval.

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2011-03-24 14:33:36 +0000
+++ ChangeLog	2011-04-19 09:27:29 +0000
@@ -1,3 +1,65 @@
[phone]  James Hunt  <[e-mail]>
+
+	* init/conf.c:
+	  - conf_source_reload_file(): Added missing error return if override
+	    doesn't parse (code path currently unused).
+	  - Documentation updates.
+	* init/job.c: job_new(): Fix for nasty OOM scenario when an attempt is made
+	  to start a chroot job with same name as running single-instance non-chroot
+	  job. Previously, the path for a chrooted Job was set from the (nul) instance
+	  name of its parent JobClass. However, since that job instance name already
+	  existed outside the chroot and was already D-Bus registered,
+	  nih_dbus_object_new() (which allocates storage and is called by
+	  job_register()) returned NULL and kept doing so due to being called
+	  within NIH_MUST(). This resulted in OOM due to an as-yet unidentified
+	  D-Bus bug (possibly a leak in find_subtree_recurse()).
+	* init/session.h: Documentation updates.
+	* util/test_initctl.c: Cleaned up variable names
+	  in RUN_COMMAND macro.
+	* init/parse_job.c: Documentation updates.
+
[phone]  James Hunt  <[e-mail]>
+
+	* init/conf.c: conf_select_job(): Added Session parameter.
+	* init/control.c: control_get_job_by_name(): Handle multiple jobs with same
+	  name (but different session) in job_classes hash.
+	* init/job_class.c:
+	  - job_class_remove(): Added Session parameter.
+	  - job_class_consider(): Handle multiple jobs with same name
+	    (but different session) in job_classes hash.
+	  - job_class_reconsider(): Handle multiple jobs with same name
+	    (but different session) in job_classes hash.
+	  - job_class_remove(): Handle incorrect session.
+	* init/job_process.c: job_process_spawn(): Updated for sessions and
+	  chroots.
+	* init/job_process.h: New enums for: 
+	  - JOB_PROCESS_ERROR_SETUID
+	  - JOB_PROCESS_ERROR_SETGID
+	* init/session.c:
+	  - session_from_dbus(): Added ability to disable sessions.
+	  - Added disable_sessions variable, set via main().
+	* init/session.h: Added tabular comment summarising Session object
+	  contents for different environments.
+	* init/Makefile.am: Reverted special-casing for session.c.
+	* init/main.c: Addition of new command-line option "--no-sessions" to
+	  disable chroot+user sessions (providing a "traditional" Upstart
+	  environment. The primary use for this option is the test suite.
+	* init/man/init.8: Updates for "--no-sessions".
+	* init/tests/test_*.c: Replaced explicit Sessions with NULL
+	  session since tests are not yet session-aware (with the exception of
+	  test_job_process.c, all main() functions now set the
+	  UPSTART_NO_SESSIONS variable to disable sessions).
+	* util/tests/test_initctl.c:
+	  - START_UPSTART now specifies "--no-sessions"
+	  - test_check_config(): Added test for "--warn".
+	* scripts/init-checkconf.sh: Script now also checks any script
+	  sections found unless the new "--noscript" option is specified.
+	  Added required "--no-sessions" option to upstart_cmd to ensure Upstart
+	  treats clients requests in traditional manner.
+	* scripts/man/init-checkconf.8: Update for "--noscript".
+	* util/initctl.c: Added "--warn" option for check-config command to
+	  warn if any events or jobs are not known.
+
 2011-03-24  James Hunt  <[e-mail]>
 
 	* init/tests/test_control.c: Added comment.
 
=== modified file 'NEWS'
--- NEWS	2011-03-24 14:33:36 +0000
+++ NEWS	2011-04-19 09:27:29 +0000
@@ -1,3 +1,24 @@
+0.9.6  2011-04-15
+
+	* Fix for nasty OOM scenario when an attempt is made to start
+	  a chroot job with same name as running single-instance
+	  non-chroot job. Previously, the path for a chrooted Job
+	  was set from the (nul) instance name of its parent JobClass.
+	  However, since that job instance name already existed
+	  outside the chroot and was already D-Bus registered,
+	  nih_dbus_object_new() (which allocates storage and is
+	  called by job_register()) returned NULL and kept doing so
+	  due to being called within NIH_MUST(). This resulted in
+	  OOM due to an as-yet unidentified D-Bus bug (possibly a
+	  leak in find_subtree_recurse()).
+
+0.9.5  2011-04-06
+
+	* Important fixes for user and chroot sessions.
+	* scripts/init-checkconf.sh: Now checks script sections too.
+	* util/initctl.c: Added "--warn" option for check-config command
+	  to warn if any events or jobs are not known.
+
 0.9.4  2011-03-24
 
 	* scripts/initctl2dot.py: Fix to handle 'emits' glob syntax
 
=== modified file 'configure.ac'
--- configure.ac	2011-03-24 14:33:36 +0000
+++ configure.ac	2011-04-19 09:27:29 +0000
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT([upstart], [0.9.4], [[e-mail]])
+AC_INIT([upstart], [0.9.6], [[e-mail]])
 NIH_COPYRIGHT([[Copyright © 2011 Canonical Ltd.]])
 AC_CONFIG_SRCDIR([init/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-03-24 14:35:14 +0000
+++ debian/changelog	2011-04-19 09:27:29 +0000
@@ -1,3 +1,31 @@
+upstart (0.9.6-1ubuntu1) natty; urgency=low
+
+  * init/man/init.5: Remove mention of user jobs since facility is
+  disabled.
+
+ -- James Hunt <[e-mail]>  Fri, 15 Apr 2011 15:37:57 +0100
+
+upstart (0.9.6-1) natty; urgency=low
+
+  * New upstream release 0.9.6: Important session+chroot fixes.
+
+ -- James Hunt <[e-mail]>  Fri, 15 Apr 2011 15:36:40 +0100
+
+upstart (0.9.5-1ubuntu1) natty; urgency=low
+
+  [ Clint Byrum ]
+  * debian/upstart-job: change behavior to reload job configuration on
+    restart, which more closely matches expected sysvinit script
+    behavior. (LP: #707479)
+
+ -- James Hunt <[e-mail]>  Wed, 06 Apr 2011 17:50:53 +0100
+
+upstart (0.9.5-1) natty; urgency=low
+
+  * New upstream release 0.9.5.
+
+ -- James Hunt <[e-mail]>  Wed, 06 Apr 2011 17:45:38 +0100
+
 upstart (0.9.4-1ubuntu1) natty; urgency=low
 
   * debian/manpages/upstart-events.7:
 
=== modified file 'debian/upstart-job'
--- debian/upstart-job	2011-01-26 21:52:39 +0000
+++ debian/upstart-job	2011-04-19 09:27:29 +0000
@@ -44,7 +44,7 @@
     $ECHO "Upstart job, you may also use the $COMMAND(8) utility, e.g. $COMMAND $JOB"
     $COMMAND "$JOB"
     ;;
-start|stop|restart)
+start|stop)
     $ECHO
     $ECHO "Since the script you are attempting to invoke has been converted to an"
     $ECHO "Upstart job, you may also use the $COMMAND(8) utility, e.g. $COMMAND $JOB"
@@ -55,12 +55,22 @@
         exit 0
     elif [ -n "$RUNNING" ] && [ "$COMMAND" = "start" ]; then
         exit 0
-    elif [ -z "$RUNNING" ] && [ "$COMMAND" = "restart" ]; then
-        start "$JOB"
-        exit 0
     fi
     $COMMAND "$JOB"
     ;;
+restart)
+    $ECHO
+    $ECHO "Since the script you are attempting to invoke has been converted to an"
+    $ECHO "Upstart job, you may also use the stop(8) and then start(8) utilities,"
+    $ECHO "e.g. stop $JOB ; start $JOB. The restart(8) utility is also available."
+    if status "$JOB" 2>/dev/null | grep -q ' start/'; then
+        RUNNING=1
+    fi
+    if [ -n "$RUNNING" ] ; then
+        stop "$JOB"
+    fi
+    start "$JOB"
+    ;;
 reload|force-reload)
     $ECHO
     $ECHO "Since the script you are attempting to invoke has been converted to an"
 
=== modified file 'init/Makefile.am'
--- init/Makefile.am	2011-02-24 15:41:04 +0000
+++ init/Makefile.am	2011-04-19 09:27:29 +0000
@@ -273,24 +273,26 @@
 	$(NIH_DBUS_LIBS) \
 	$(DBUS_LIBS)
 
-test_conf_SOURCES = tests/test_conf.c session.c
+test_conf_SOURCES = tests/test_conf.c
 test_conf_CFLAGS = $(AM_CFLAGS) -DTEST
 test_conf_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
 	parse_job.o parse_conf.o conf.o control.o \
+	session.o \
 	com.ubuntu.Upstart.o \
 	com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
 	$(NIH_LIBS) \
 	$(NIH_DBUS_LIBS) \
 	$(DBUS_LIBS)
 
-test_control_SOURCES = tests/test_control.c session.c
+test_control_SOURCES = tests/test_control.c
 test_control_CFLAGS = $(AM_CFLAGS) -DTEST
 test_control_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
 	parse_job.o parse_conf.o conf.o control.o \
+	session.o \
 	com.ubuntu.Upstart.o \
 	com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
 	$(NIH_LIBS) \
 
=== modified file 'init/conf.c'
--- init/conf.c	2011-02-23 11:04:27 +0000
+++ init/conf.c	2011-04-19 09:27:29 +0000
@@ -517,13 +517,10 @@
 	nih_debug ("Updating configuration for %s from %s",
 		  source->path, override_path);
 	if (conf_reload_path (source, source->path, override_path) < 0) {
-		NihError *err;
+		if (err)
+			nih_free (err);
 
-		err = nih_error_get ();
-		nih_error ("%s: %s: %s", override_path,
-				_("Error while reloading configuration file"),
-				err->message);
-		nih_free (err);
+		return -1;
 	}
 
 	return 0;
@@ -935,7 +932,7 @@
  * conf_reload_path:
  * @source: configuration source,
  * @path: path of conf file to be reloaded.
- * @override_path: if TRUE and @path refers to a path associated with @source,
+ * @override_path: if not NULL and @path refers to a path associated with @source,
  * overlay the contents of @path into the existing @source entry for
  * @path. If FALSE, discard any existing knowledge of @path.
  *
@@ -946,7 +943,8 @@
  *
  * If the file has been parsed before, then the existing item is deleted and
  * freed if the file fails to load, or after the new item has been parsed.
- * Items are not reused between reloads.
+ * Items are only reused between reloads if @override_path is
+ * non-NULL.
  *
  * Physical errors are returned, parse errors are not.
  *
@@ -968,12 +966,16 @@
 	nih_assert (source != NULL);
 	nih_assert (path != NULL);
 
-	path_to_load = ( override_path ? override_path : path);
+	path_to_load = (override_path ? override_path : path);
 
 	/* If there is no corresponding override file, look up the old
 	 * conf file in memory, and then free it.  In cases of failure,
 	 * we discard it anyway, so there's no particular reason
 	 * to keep it around anymore.
+	 *
+	 * Note: if @override_path has been specified, do not
+	 * free the file if found, since we want to _update_ the
+	 * existing entry.
 	 */
 	file = (ConfFile *)nih_hash_lookup (source->files, path);
 	if (! override_path && file)
@@ -987,7 +989,7 @@
 	if (! buf)
 		return -1;
 
-	/* Create a new ConfFile structure (if no override_path was specified) */
+	/* Create a new ConfFile structure (if no @override_path specified) */
 	file = (ConfFile *)nih_hash_lookup (source->files, path);
 	if (! file)
 		file = NIH_MUST (conf_file_new (source, path));
@@ -1144,7 +1146,8 @@
 
 /**
  * conf_select_job:
- * @name: name of job class to locate.
+ * @name: name of job class to locate,
+ * @session: session class name belongs to.
  *
  * Select the best available class of a job named @name from the registered
  * configuration sources.
@@ -1152,7 +1155,7 @@
  * Returns: Best available job class or NULL if none available.
  **/
 JobClass *
-conf_select_job (const char *name)
+conf_select_job (const char *name, const Session *session)
 {
 	nih_assert (name != NULL);
 
@@ -1164,6 +1167,9 @@
 		if (source->type != CONF_JOB_DIR)
 			continue;
 
+		if (source->session != session)
+			continue;
+
 		NIH_HASH_FOREACH (source->files, file_iter) {
 			ConfFile *file = (ConfFile *)file_iter;
 
 
=== modified file 'init/conf.h'
--- init/conf.h	2011-02-23 11:04:27 +0000
+++ init/conf.h	2011-04-19 09:27:29 +0000
@@ -125,7 +125,7 @@
 
 int         conf_file_destroy  (ConfFile *file);
 
-JobClass *  conf_select_job    (const char *name);
+JobClass *  conf_select_job    (const char *name, const Session *session);
 
 char *toggle_conf_name         (const void *parent, const char *path)
 	__attribute__ ((warn_unused_result, malloc));
 
=== modified file 'init/control.c'
--- init/control.c	2011-03-10 14:06:37 +0000
+++ init/control.c	2011-04-19 09:27:29 +0000
@@ -417,7 +417,11 @@
 	session = session_from_dbus (NULL, message);
 
 	/* Lookup the job */
-	class = (JobClass *)nih_hash_lookup (job_classes, name);
+	class = (JobClass *)nih_hash_search (job_classes, name, NULL);
+
+	while (class && class->session != session) {
+		class = (JobClass *)nih_hash_search (job_classes, name, &class->entry);
+	}
 
 	if (class && ! session)
 		class->session = session;
 
=== modified file 'init/job.c'
--- init/job.c	2011-02-23 10:38:33 +0000
+++ init/job.c	2011-04-19 09:27:29 +0000
@@ -100,8 +100,14 @@
 
 	job->class = class;
 
-	job->path = nih_dbus_path (job, DBUS_PATH_UPSTART, "jobs",
-				   class->name, job->name, NULL);
+	if (job->class->session && job->class->session->chroot) {
+		/* JobClass already contains a valid D-Bus path prefix for the job */
+		job->path = nih_dbus_path (job, class->path, job->name, NULL);
+	} else {
+		job->path = nih_dbus_path (job, DBUS_PATH_UPSTART, "jobs",
+				class->name, job->name, NULL);
+	}
+
 	if (! job->path)
 		goto error;
 
 
=== modified file 'init/job_class.c'
--- init/job_class.c	2011-02-23 11:04:27 +0000
+++ init/job_class.c	2011-04-19 09:27:29 +0000
@@ -100,7 +100,7 @@
 
 /* Prototypes for static functions */
 static void job_class_add    (JobClass *class);
-static int  job_class_remove (JobClass *class);
+static int  job_class_remove (JobClass *class, const Session *session);
 
 
 /**
@@ -280,19 +280,27 @@
 int
 job_class_consider (JobClass *class)
 {
-	JobClass *registered, *best;
+	JobClass *registered = NULL, *best = NULL;
 
 	nih_assert (class != NULL);
 
 	job_class_init ();
 
-	best = conf_select_job (class->name);
+	best = conf_select_job (class->name, class->session);
 	nih_assert (best != NULL);
-
-	registered = (JobClass *)nih_hash_lookup (job_classes, class->name);
+	nih_assert (best->session == class->session);
+
+	registered = (JobClass *)nih_hash_search (job_classes, class->name, NULL);
+
+	/* If we found an entry, ensure we only consider the appropriate session */
+	while (registered && registered->session != class->session)
+	{
+		registered = (JobClass *)nih_hash_search (job_classes, class->name, &registered->entry);
+	}
+
 	if (registered != best) {
 		if (registered)
-			if (! job_class_remove (registered))
+			if (! job_class_remove (registered, class->session))
 				return FALSE;
 
 		job_class_add (best);
@@ -317,18 +325,25 @@
 int
 job_class_reconsider (JobClass *class)
 {
-	JobClass *registered, *best;
+	JobClass *registered = NULL, *best = NULL;
 
 	nih_assert (class != NULL);
 
 	job_class_init ();
 
-	best = conf_select_job (class->name);
-
-	registered = (JobClass *)nih_hash_lookup (job_classes, class->name);
+	best = conf_select_job (class->name, class->session);
+
+	registered = (JobClass *)nih_hash_search (job_classes, class->name, NULL);
+
+	/* If we found an entry, ensure we only consider the appropriate session */
+	while (registered && registered->session != class->session)
+	{
+		registered = (JobClass *)nih_hash_search (job_classes, class->name, &registered->entry);
+	}
+
 	if (registered == class) {
 		if (class != best) {
-			if (! job_class_remove (class))
+			if (! job_class_remove (class, class->session))
 				return FALSE;
 
 			job_class_add (best);
@@ -369,19 +384,24 @@
 
 /**
  * job_class_remove:
- * @class: class to remove.
+ * @class: class to remove,
+ * @session: Session of @class.
  *
  * Removes @class from the hash table and unregisters it from all current
  * D-Bus connections.
  *
  * Returns: TRUE if class could be unregistered, FALSE if there are
- * active instances that prevent unregistration.
+ * active instances that prevent unregistration, or if @session
+ * does not match the session associated with @class.
  **/
 static int
-job_class_remove (JobClass *class)
+job_class_remove (JobClass *class, const Session *session)
 {
 	nih_assert (class != NULL);
 
+	if (class->session != session)
+		return FALSE;
+
 	control_init ();
 
 	/* Return if we have any active instances */
 
=== modified file 'init/job_process.c'
--- init/job_process.c	2011-02-24 15:41:04 +0000
+++ init/job_process.c	2011-04-19 09:27:29 +0000
@@ -40,6 +40,7 @@
 #include <unistd.h>
 #include <utmp.h>
 #include <utmpx.h>
+#include <pwd.h>
 
 #include <nih/macros.h>
 #include <nih/alloc.h>
@@ -503,6 +504,16 @@
 		}
 	}
 
+	/* Handle changing a chroot session job prior to dealing with
+	 * the 'chroot' stanza.
+	 */
+	if (class->session && class->session->chroot) {
+		if (chroot (class->session->chroot) < 0) {
+			nih_error_raise_system ();
+			job_process_error_abort (fds[1], JOB_PROCESS_ERROR_CHROOT, 0);
+		}
+	}
+
 	/* Change the root directory, confining path resolution within it;
 	 * we do this before the working directory call so that is always
 	 * relative to the new root.
@@ -558,6 +569,54 @@
 		}
 	}
 
+	/* Handle unprivileged user job by dropping privileges to
+	 * their level.
+	 */
+	if (class->session && class->session->user) {
+		uid_t uid = class->session->user;
+		struct passwd *pw = NULL;
+
+		/* D-Bus does not expose a public API call to allow
+		 * us to query a users primary group.
+		 * _dbus_user_info_fill_uid () seems to exist for this
+		 * purpose, but is a "secret" API. It is unclear why
+		 * D-Bus neglects the gid when it allows the uid
+		 * to be queried directly.
+		 *
+		 * Our only recourse is to disallow user sessions in a
+		 * chroot and assume that all other user sessions
+		 * originate from the local system. In this way, we can
+		 * bypass D-Bus and use getpwuid ().
+		 */
+
+		if (class->session->chroot) {
+			/* We cannot determine the group id of the user
+			 * session in the chroot via D-Bus, so disallow
+			 * all jobs in such an environment.
+			 */
+			_nih_error_raise (__FILE__, __LINE__, __FUNCTION__,
+					EPERM, strerror (EPERM));
+		}
+
+		pw = getpwuid (uid);
+
+		if (!pw)
+			nih_return_system_error (-1);
+
+		nih_assert (pw->pw_uid == uid);
+
+		if (uid && setuid (uid) < 0) {
+			nih_error_raise_system ();
+			job_process_error_abort (fds[1], JOB_PROCESS_ERROR_SETUID, 0);
+		}
+
+		if (pw->pw_gid && setgid (pw->pw_gid) < 0) {
+			nih_error_raise_system ();
+			job_process_error_abort (fds[1], JOB_PROCESS_ERROR_SETGID, 0);
+		}
+	}
+
+
 	/* Execute the process, if we escape from here it failed */
 	if (execvp (argv[0], argv) < 0) {
 		nih_error_raise_system ();
 
=== modified file 'init/job_process.h'
--- init/job_process.h	2009-07-09 11:01:53 +0000
+++ init/job_process.h	2011-04-19 09:27:29 +0000
@@ -45,7 +45,9 @@
 	JOB_PROCESS_ERROR_CHROOT,
 	JOB_PROCESS_ERROR_CHDIR,
 	JOB_PROCESS_ERROR_PTRACE,
-	JOB_PROCESS_ERROR_EXEC
+	JOB_PROCESS_ERROR_EXEC,
+	JOB_PROCESS_ERROR_SETUID,
+	JOB_PROCESS_ERROR_SETGID,
 } JobProcessErrorType;
 
 /**
 
=== modified file 'init/main.c'
--- init/main.c	2011-03-10 14:23:57 +0000
+++ init/main.c	2011-04-19 09:27:29 +0000
@@ -117,6 +117,8 @@
 
 extern int use_session_bus;
 
+extern int disable_sessions;
+
 /**
  * options:
  *
@@ -132,6 +134,9 @@
 	{ 0, "no-startup-event", N_("do not emit any startup event (for testing)"),
 		NULL, NULL, &disable_startup_event, NULL },
 
+	{ 0, "no-sessions", N_("Disable user and chroot sessions"),
+		NULL, NULL, &disable_sessions, NULL },
+
 	{ 0, "restart", NULL, NULL, NULL, &restart, NULL },
 	
 	{ 0, "session", N_("use D-Bus session bus rather than system bus (for testing)"),
@@ -459,6 +464,9 @@
 		sigprocmask (SIG_SETMASK, &mask, NULL);
 	}
 
+	if (disable_sessions)
+		nih_debug ("Sessions disabled");
+
 	/* Run through the loop at least once to deal with signals that were
 	 * delivered to the previous process while the mask was set or to
 	 * process the startup event we emitted.
 
=== modified file 'init/man/init.5'
--- init/man/init.5	2011-03-15 12:15:28 +0000
+++ init/man/init.5	2011-04-19 09:27:29 +0000
@@ -5,8 +5,6 @@
 .\"
 .SH SYNOPSIS
 .B /etc/init/
-
-.B $HOME/.init/
 .\"
 .SH DESCRIPTION
 On startup, the Upstart
@@ -16,11 +14,6 @@
 directory, and watches for future changes to these files using
 .BR inotify (7).
 
-If D\-Bus has been configured to allow non\-privileged users to invoke all
-Upstart D\-Bus methods, Upstart is also able to manage User Jobs. See
-.B User Jobs
-for further details.
-
 To be considered by Upstart, files in this directory must have a
 recognized suffix and may also be present in sub\-directories.  There are
 two recognized suffixes:
@@ -72,37 +65,6 @@
 
 Configuration files are plain text and should not be executable.
 .\"
-.SS User Jobs
-
-A User Job is a job configuration file created by a non\-privileged user
-in the
-.B $HOME/.init/
-directory. Job configuration files in this directory have
-the same syntax as system job configuration files.
-
-Any user can create user jobs, but that user can control
-.I only
-jobs they create.
-
-Users are able to manage their jobs using the standard
-.BR initctl (8)
-facility.
-
-Note that a user job configuration file cannot have the same name as a
-system job configuration file.
-
-.\"
-.SS Chroot Support
-
-Upstart is able to manage jobs within a \fBchroot\fP(2). To control jobs
-within the chroot environment, use the standard
-.BR initctl (8)
-facility. Note that it is not necessary to install D\-Bus within the
-chroot (in fact it is not recommended).
-
-Note that User Jobs can be created within a chroot environment.
-
-.\"
 .SS Configuration File Format
 Each line begins with a configuration stanza and continues until either
 the end of the line or a line containing a closing stanza.  Line breaks
 
=== modified file 'init/man/init.8'
--- init/man/init.8	2011-03-10 14:23:57 +0000
+++ init/man/init.8	2011-04-19 09:27:29 +0000
@@ -1,4 +1,4 @@
-.TH init 8 2011-03-03 "Upstart"
+.TH init 8 2011-04-06 "Upstart"
 .\"
 .SH NAME
 init \- Upstart process management daemon
@@ -68,28 +68,32 @@
 by placing them on the kernel command-line.
 .\"
 .TP
-.B --confdir \fIdirectory\fP
+.B \-\-confdir \fIdirectory\fP
 Read job configuration files from a directory other than
 \fI/etc/init\fP.
 .\"
 .TP
-.B --no-startup-event
+.B \-\-no\-sessions
+Disable user and chroot sessions.
+.\"
+.TP
+.B \-\-no\-startup\-event
 Suppress emission of the initial startup event. This option should only
 be used for testing since it will stop the 
 .BR init (8)
 daemon from starting \fBany\fP jobs automatically.
 .\"
 .TP
-.B --session
+.B \-\-session
 Connect to the D-Bus session bus. This should only be used for testing.
 .\"
 .TP
-.B --startup-event \fIevent\fP
+.B \-\-startup-event \fIevent\fP
 Specify a different initial startup event from the standard
 .BR startup (7) .
 .\"
 .TP
-.B --verbose
+.B \-\-verbose
 Outputs verbose messages about job state changes and event emissions to the
 system console or log, useful for debugging boot.
 .\"
@@ -123,7 +127,7 @@
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .\"
 .SH SEE ALSO
-.BR control-alt-delete (7)
+.BR control\-alt\-delete (7)
 .BR init (5)
 .BR initctl (8)
 .BR runlevel (7)
 
=== modified file 'init/parse_job.c'
--- init/parse_job.c	2011-02-24 15:41:04 +0000
+++ init/parse_job.c	2011-04-19 09:27:29 +0000
@@ -280,8 +280,8 @@
  * of the returned job are freed, the returned job will also be
  * freed.
  *
- * Returns: if @update is NULL, returns new JobClass structure on success, NULL on raised error.
- * If @update is not NULL, returns @update or NULL on error.
+ * Returns: If @update is NULL, returns new JobClass structure on success, NULL on raised error.
+ * If @update is not NULL, returns @update on success, or NULL on error.
  **/
 JobClass *
 parse_job (const void *parent,
 
=== modified file 'init/session.c'
--- init/session.c	2011-02-23 09:35:03 +0000
+++ init/session.c	2011-04-19 09:27:29 +0000
@@ -56,6 +56,14 @@
  **/
 NihList *sessions = NULL;
 
+/**
+ * disable_sessions:
+ *
+ * If TRUE, disable user and chroot sessions, resulting in a
+ * "traditional" (pre-session support) system.
+ **/
+int disable_sessions = FALSE;
+
 
 /* Prototypes for static functions */
 static void session_create_conf_source (Session *sesson);
@@ -113,22 +121,23 @@
 }
 
 Session *
-session_from_dbus (const void *    parent,
+session_from_dbus (const void     *parent,
 		   NihDBusMessage *message)
 {
-	const char *  sender;
+	const char   *sender;
 	DBusError     dbus_error;
 	unsigned long unix_user;
 	unsigned long unix_process_id;
 	char          root[PATH_MAX];
-	Session *     session;
+	Session      *session;
 
 	nih_assert (message != NULL);
 
-#ifdef TEST
-	/* Return "NULL session" for testing framework. */
-	return NULL;
-#endif
+	/* Handle explicit command-line request and alternative request
+	 * method (primarily for test framework) to disable session support.
+	 */
+	if (disable_sessions || getenv ("UPSTART_NO_SESSIONS"))
+		return NULL;
 
 	session_init ();
 
@@ -160,7 +169,7 @@
 	}
 
 	/* If we retrieved a process id, look up the root path for it;
-	 * if it's just / don't worry so much about it.
+	 * if it's just '/' don't worry so much about it.
 	 */
 	if (unix_process_id) {
 		nih_local char *symlink = NULL;
@@ -193,15 +202,19 @@
 		if (unix_process_id) {
 			if (! session->chroot)
 				continue;
+
+			/* ignore sessions relating to other chroots */
 			if (strcmp (session->chroot, root))
 				continue;
 		}
 
+		/* ignore sessions relating to other users */
 		if (unix_user != session->user)
 			continue;
 
 		if (! session->conf_path)
 			session_create_conf_source (session);
+
 		return session;
 	}
 
 
=== modified file 'init/session.h'
--- init/session.h	2010-12-10 03:17:53 +0000
+++ init/session.h	2011-04-19 09:27:29 +0000
@@ -35,8 +35,33 @@
  * @user: uid all jobs are switched to,
  * @conf_path: configuration path.
  *
- * This structure is used to identify collections of jobs that share either
- * a common @chroot and/or common @user.
+ * This structure is used to identify collections of jobs
+ * that share either a common @chroot and/or common @user.
+ *
+ * Summary of Session values for different environments:
+ *
+ * +-------------+---------------------------------------+
+ * |    D-Bus    |             Session                   |
+ * +------+------+--------+-----+------------------------+
+ * | user | PID  | chroot | uid | Object contents        |
+ * +------+------+--------+-----+------------------------+
+ * | 0    | >0   | no     | 0   | NULL (*1)              |
+ * | >0   | "0"  | no     | >0  | only uid set.          |
+ * | 0    | >0   | yes    | 0   | chroot + conf_path set |
+ * | >0   | ??   | yes    | >0  | XXX: fails (*2)        |
+ * +------+------+--------+-----+------------------------+
+ *
+ * Notes:
+ *
+ * (*1) - The "NULL session" represents the "traditional" environment
+ * before sessions were introduced (namely a non-chroot environment
+ * where all job and event operations were handled by uid 0 (root)).
+ *
+ * (*2) - error is:
+ *
+ *   initctl: Unable to connect to system bus: Failed to connect to socket
+ *   /var/run/dbus/system_bus_socket: No such file or directory
+ * 
  **/
 typedef struct session {
 	NihList entry;
 
=== modified file 'init/tests/test_blocked.c'
--- init/tests/test_blocked.c	2011-02-23 09:35:03 +0000
+++ init/tests/test_blocked.c	2011-04-19 09:27:29 +0000
@@ -38,10 +38,6 @@
 	Job            *job;
 	Event          *event;
 	NihDBusMessage *message = NULL;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("blocked_new");
 
@@ -50,7 +46,7 @@
 	 * in a list.
 	 */
 	TEST_FEATURE ("with job");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	TEST_ALLOC_FAIL {
@@ -361,7 +357,6 @@
 		nih_free (blocked);
 		TEST_FREE (message);
 	}
-	nih_free (session);
 }
 
 
@@ -369,6 +364,9 @@
 main (int   argc,
       char *argv[])
 {
+	/* run tests in legacy (pre-session support) mode */
+	setenv ("UPSTART_NO_SESSIONS", "1", 1);
+
 	test_new ();
 
 	return 0;
 
=== modified file 'init/tests/test_conf.c'
--- init/tests/test_conf.c	2011-02-23 11:04:27 +0000
+++ init/tests/test_conf.c	2011-04-19 09:27:29 +0000
@@ -4443,22 +4443,18 @@
 	ConfFile   *file;
 	JobClass   *job, *other, *ptr;
 	Job        *instance;
-	Session    *session;
 
 	TEST_FUNCTION ("conf_file_destroy");
 	source = conf_source_new (NULL, "/path", CONF_JOB_DIR);
 
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
-
 	/* Check that when a ConfFile for a job is freed, the attached
 	 * job is also freed if it is not the current job.
 	 */
 	TEST_FEATURE ("with not-current job");
 	file = conf_file_new (source, "/path/to/file");
-	job = file->job = job_class_new (NULL, "foo", session);
+	job = file->job = job_class_new (NULL, "foo", NULL);
 
-	other = job_class_new (NULL, "foo", session);
+	other = job_class_new (NULL, "foo", NULL);
 	nih_hash_add (job_classes, &other->entry);
 
 	TEST_FREE_TAG (job);
@@ -4478,7 +4474,7 @@
 	 */
 	TEST_FEATURE ("with stopped job");
 	file = conf_file_new (source, "/path/to/file");
-	job = file->job = job_class_new (NULL, "foo", session);
+	job = file->job = job_class_new (NULL, "foo", NULL);
 
 	nih_hash_add (job_classes, &job->entry);
 
@@ -4498,7 +4494,7 @@
 	 */
 	TEST_FEATURE ("with running job");
 	file = conf_file_new (source, "/path/to/file");
-	job = file->job = job_class_new (NULL, "foo", session);
+	job = file->job = job_class_new (NULL, "foo", NULL);
 
 	nih_hash_add (job_classes, &job->entry);
 
@@ -4522,7 +4518,6 @@
 	nih_free (job);
 
 	nih_free (source);
-	nih_free (session);
 }
 
 
@@ -4532,10 +4527,6 @@
 	ConfSource *source1, *source2, *source3;
 	ConfFile   *file1, *file2, *file3, *file4, *file5;
 	JobClass   *class1, *class2, *class3, *class4, *ptr;
-	Session    *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("conf_select_job");
 	source1 = conf_source_new (NULL, "/tmp/foo", CONF_DIR);
@@ -4543,26 +4534,26 @@
 	source2 = conf_source_new (NULL, "/tmp/bar", CONF_JOB_DIR);
 
 	file1 = conf_file_new (source2, "/tmp/bar/frodo");
-	class1 = file1->job = job_class_new (NULL, "frodo", session);
+	class1 = file1->job = job_class_new (NULL, "frodo", NULL);
 
 	file2 = conf_file_new (source2, "/tmp/bar/bilbo");
 
 	file3 = conf_file_new (source2, "/tmp/bar/drogo");
-	class2 = file3->job = job_class_new (NULL, "drogo", session);
+	class2 = file3->job = job_class_new (NULL, "drogo", NULL);
 
 	source3 = conf_source_new (NULL, "/tmp/baz", CONF_JOB_DIR);
 
 	file4 = conf_file_new (source3, "/tmp/baz/frodo");
-	class3 = file4->job = job_class_new (NULL, "frodo", session);
+	class3 = file4->job = job_class_new (NULL, "frodo", NULL);
 
 	file5 = conf_file_new (source2, "/tmp/bar/bilbo");
-	class4 = file5->job = job_class_new (NULL, "bilbo", session);
+	class4 = file5->job = job_class_new (NULL, "bilbo", NULL);
 
 
 	/* Check that a job with only one file is returned.
 	 */
 	TEST_FEATURE ("with one file");
-	ptr = conf_select_job ("drogo");
+	ptr = conf_select_job ("drogo", NULL);
 
 	TEST_EQ_P (ptr, class2);
 
@@ -4571,7 +4562,7 @@
 	 * returned.
 	 */
 	TEST_FEATURE ("with multiple files");
-	ptr = conf_select_job ("frodo");
+	ptr = conf_select_job ("frodo", NULL);
 
 	TEST_EQ_P (ptr, class1);
 
@@ -4579,7 +4570,7 @@
 	/* Check that files with no attached job are ignored.
 	 */
 	TEST_FEATURE ("with file but no attached job");
-	ptr = conf_select_job ("bilbo");
+	ptr = conf_select_job ("bilbo", NULL);
 
 	TEST_EQ_P (ptr, class4);
 
@@ -4587,7 +4578,7 @@
 	/* Check that when there is no match, NULL is returned.
 	 */
 	TEST_FEATURE ("with no match");
-	ptr = conf_select_job ("meep");
+	ptr = conf_select_job ("meep", NULL);
 
 	TEST_EQ_P (ptr, NULL);
 
@@ -4595,7 +4586,6 @@
 	nih_free (source3);
 	nih_free (source2);
 	nih_free (source1);
-	nih_free (session);
 }
 
 
@@ -4603,6 +4593,9 @@
 main (int   argc,
       char *argv[])
 {
+	/* run tests in legacy (pre-session support) mode */
+	setenv ("UPSTART_NO_SESSIONS", "1", 1);
+
 	test_source_new ();
 	test_file_new ();
 	test_source_reload_job_dir ();
 
=== modified file 'init/tests/test_control.c'
--- init/tests/test_control.c	2011-03-24 13:11:53 +0000
+++ init/tests/test_control.c	2011-04-19 09:27:29 +0000
@@ -154,7 +154,6 @@
 	Job            *job1, *job2;
 	pid_t           pid;
 	int             fd, wait_fd, status;
-	Session        *session = NULL;
 
 	TEST_FUNCTION ("control_server_connect");
 	program_name = "test";
@@ -234,10 +233,10 @@
 	 * new connection has them automatically registered.
 	 */
 	TEST_FEATURE ("with existing jobs");
-	class1 = job_class_new (NULL, "foo", session);
+	class1 = job_class_new (NULL, "foo", NULL);
 	nih_hash_add (job_classes, &class1->entry);
 
-	class2 = job_class_new (NULL, "bar", session);
+	class2 = job_class_new (NULL, "bar", NULL);
 	job1 = job_new (class2, "test1");
 	job2 = job_new (class2, "test2");
 	nih_hash_add (job_classes, &class2->entry);
@@ -439,7 +438,6 @@
 	NihDBusObject *object;
 	pid_t          pid;
 	int            ret, wait_fd, fd, status;
-	Session       *session = NULL;
 
 	TEST_FUNCTION ("control_bus_open");
 	program_name = "test";
@@ -535,10 +533,10 @@
 	refuse_registration = FALSE;
 	server_conn = NULL;
 
-	class1 = job_class_new (NULL, "foo", session);
+	class1 = job_class_new (NULL, "foo", NULL);
 	nih_hash_add (job_classes, &class1->entry);
 
-	class2 = job_class_new (NULL, "bar", session);
+	class2 = job_class_new (NULL, "bar", NULL);
 	job1 = job_new (class2, "test1");
 	job2 = job_new (class2, "test2");
 	nih_hash_add (job_classes, &class2->entry);
@@ -985,13 +983,12 @@
 	NihError       *error;
 	NihDBusError   *dbus_error;
 	int             ret;
-	Session        *session = NULL;
 
 	TEST_FUNCTION ("control_get_job_by_name");
 	nih_error_init ();
 	job_class_init ();
 
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	nih_hash_add (job_classes, &class->entry);
 
 
@@ -1096,7 +1093,6 @@
 	NihError        *error;
 	char           **paths;
 	int              ret;
-	Session         *session = NULL;
 
 	TEST_FUNCTION ("control_get_all_jobs");
 	nih_error_init ();
@@ -1107,13 +1103,13 @@
 	 * in an array allocated as a child of the message structure.
 	 */
 	TEST_FEATURE ("with registered jobs");
-	class1 = job_class_new (NULL, "frodo", session);
+	class1 = job_class_new (NULL, "frodo", NULL);
 	nih_hash_add (job_classes, &class1->entry);
 
-	class2 = job_class_new (NULL, "bilbo", session);
+	class2 = job_class_new (NULL, "bilbo", NULL);
 	nih_hash_add (job_classes, &class2->entry);
 
-	class3 = job_class_new (NULL, "sauron", session);
+	class3 = job_class_new (NULL, "sauron", NULL);
 	nih_hash_add (job_classes, &class3->entry);
 
 	TEST_ALLOC_FAIL {
@@ -2223,6 +2219,9 @@
 main (int   argc,
       char *argv[])
 {
+	/* run tests in legacy (pre-session support) mode */
+	setenv ("UPSTART_NO_SESSIONS", "1", 1);
+
 	test_server_open ();
 	test_server_connect ();
 	test_server_close ();
 
=== modified file 'init/tests/test_environ.c'
--- init/tests/test_environ.c	2009-06-23 09:29:35 +0000
+++ init/tests/test_environ.c	2011-04-19 09:27:29 +0000
@@ -1692,6 +1692,9 @@
 main (int   argc,
       char *argv[])
 {
+	/* run tests in legacy (pre-session support) mode */
+	setenv ("UPSTART_NO_SESSIONS", "1", 1);
+
 	test_add ();
 	test_append ();
 	test_set ();
 
=== modified file 'init/tests/test_event.c'
--- init/tests/test_event.c	2011-02-23 09:35:03 +0000
+++ init/tests/test_event.c	2011-04-19 09:27:29 +0000
@@ -222,10 +222,6 @@
 	JobClass *class = NULL;
 	Job      *job;
 	Event    *event = NULL;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	/* Check that a pending event in the queue results in jobs being
 	 * started and/or stopped and gets moved into the handling state.
@@ -237,7 +233,7 @@
 		TEST_ALLOC_SAFE {
 			event = event_new (NULL, "test", NULL);
 
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->task = TRUE;
 			class->process[PROCESS_MAIN] = process_new (class->process);
 			class->process[PROCESS_MAIN]->command = "echo";
@@ -266,7 +262,6 @@
 		nih_free (class);
 		nih_free (event);
 	}
-	nih_free (session);
 }
 
 void
@@ -280,10 +275,6 @@
 	EventOperator  *oper;
 	Blocked        *blocked = NULL, *blocked1 = NULL, *blocked2 = NULL;
 	char          **env1 = NULL, **env2 = NULL;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("event_pending_handle_jobs");
 	program_name = "test";
@@ -301,7 +292,7 @@
 
 			TEST_FREE_TAG (event1);
 
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->task = TRUE;
 
 			class->start_on = event_operator_new (
@@ -336,7 +327,7 @@
 
 			TEST_FREE_TAG (event1);
 
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->task = TRUE;
 
 			class->start_on = event_operator_new (
@@ -395,7 +386,7 @@
 			TEST_FREE_TAG (event1);
 			TEST_FREE_TAG (event2);
 
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->task = TRUE;
 
 			assert (nih_str_array_add (&(class->env), class,
@@ -511,7 +502,7 @@
 
 			TEST_FREE_TAG (event2);
 
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->task = TRUE;
 
 			assert (nih_str_array_add (&(class->env), class,
@@ -637,7 +628,7 @@
 
 			TEST_FREE_TAG (event2);
 
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->task = TRUE;
 
 			assert (nih_str_array_add (&(class->env), class,
@@ -805,7 +796,7 @@
 
 			TEST_FREE_TAG (event2);
 
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->task = TRUE;
 
 			assert (nih_str_array_add (&(class->env), class,
@@ -930,7 +921,7 @@
 
 			TEST_FREE_TAG (event1);
 
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->instance = "$FRODO";
 			class->task = TRUE;
 
@@ -1009,7 +1000,7 @@
 
 			TEST_FREE_TAG (event1);
 
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->instance = "$FRODO";
 			class->task = TRUE;
 
@@ -1093,7 +1084,7 @@
 
 			TEST_FREE_TAG (event1);
 
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->instance = "$TIPPLE";
 			class->task = TRUE;
 
@@ -1136,7 +1127,7 @@
 
 			TEST_FREE_TAG (event1);
 
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->task = TRUE;
 
 			class->process[PROCESS_POST_STOP] = process_new (class);
@@ -1184,7 +1175,7 @@
 
 			TEST_FREE_TAG (event1);
 
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->task = TRUE;
 
 			class->process[PROCESS_POST_STOP] = process_new (class);
@@ -1259,7 +1250,7 @@
 
 			TEST_FREE_TAG (event1);
 
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->task = TRUE;
 
 			class->process[PROCESS_POST_STOP] = process_new (class);
@@ -1338,7 +1329,7 @@
 
 			TEST_FREE_TAG (event1);
 
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->task = TRUE;
 
 			class->process[PROCESS_POST_STOP] = process_new (class);
@@ -1448,7 +1439,7 @@
 
 			TEST_FREE_TAG (event1);
 
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->task = TRUE;
 
 			class->process[PROCESS_POST_STOP] = process_new (class);
@@ -1536,7 +1527,7 @@
 
 			TEST_FREE_TAG (event1);
 
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->task = TRUE;
 
 			class->process[PROCESS_POST_STOP] = process_new (class);
@@ -1607,7 +1598,6 @@
 	}
 
 	fclose (output);
-	nih_free (session);
 }
 
 
@@ -1619,10 +1609,6 @@
 	Event         *event = NULL, *bevent = NULL;
 	Blocked       *blocked = NULL;
 	EventOperator *oper;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("event_finished");
 
@@ -1637,7 +1623,7 @@
 
 			TEST_FREE_TAG (event);
 
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->process[PROCESS_MAIN] = process_new (class->process);
 			class->process[PROCESS_MAIN]->command = "echo";
 
@@ -1671,7 +1657,7 @@
 
 			TEST_FREE_TAG (event);
 
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->process[PROCESS_MAIN] = process_new (class->process);
 			class->process[PROCESS_MAIN]->command = "echo";
 
@@ -1713,7 +1699,7 @@
 
 			TEST_FREE_TAG (event);
 
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->process[PROCESS_MAIN] = process_new (class->process);
 			class->process[PROCESS_MAIN]->command = "echo";
 
@@ -1754,7 +1740,7 @@
 
 			TEST_FREE_TAG (event);
 
-			class = job_class_new (NULL, "foo", session);
+			class = job_class_new (NULL, "foo", NULL);
 
 			job = job_new (class, "");
 			job->goal = JOB_STOP;
@@ -1787,7 +1773,7 @@
 
 			TEST_FREE_TAG (event);
 
-			class = job_class_new (NULL, "foo", session);
+			class = job_class_new (NULL, "foo", NULL);
 
 			job = job_new (class, "");
 			job->goal = JOB_START;
@@ -1818,7 +1804,7 @@
 
 			TEST_FREE_TAG (event);
 
-			class = job_class_new (NULL, "foo", session);
+			class = job_class_new (NULL, "foo", NULL);
 
 			job = job_new (class, "");
 			job->goal = JOB_STOP;
@@ -1860,7 +1846,7 @@
 
 			TEST_FREE_TAG (event);
 
-			class = job_class_new (NULL, "foo", session);
+			class = job_class_new (NULL, "foo", NULL);
 
 			job = job_new (class, "");
 			job->goal = JOB_START;
@@ -1903,7 +1889,7 @@
 
 			TEST_FREE_TAG (event);
 
-			class = job_class_new (NULL, "foo", session);
+			class = job_class_new (NULL, "foo", NULL);
 			class->process[PROCESS_POST_STOP] = process_new (class);
 			class->process[PROCESS_POST_STOP]->command = "echo";
 
@@ -1948,7 +1934,7 @@
 
 			TEST_FREE_TAG (event);
 
-			class = job_class_new (NULL, "foo", session);
+			class = job_class_new (NULL, "foo", NULL);
 			class->process[PROCESS_PRE_START] = process_new (class);
 			class->process[PROCESS_PRE_START]->command = "echo";
 
@@ -1981,7 +1967,6 @@
 
 		nih_free (class);
 	}
-	nih_free (session);
 }
 
 
@@ -1989,6 +1974,9 @@
 main (int   argc,
       char *argv[])
 {
+	/* run tests in legacy (pre-session support) mode */
+	setenv ("UPSTART_NO_SESSIONS", "1", 1);
+
 	test_new ();
 	test_block ();
 	test_unblock ();
 
=== modified file 'init/tests/test_event_operator.c'
--- init/tests/test_event_operator.c	2010-02-04 20:08:59 +0000
+++ init/tests/test_event_operator.c	2011-04-19 09:27:29 +0000
@@ -1325,6 +1325,9 @@
 main (int   argc,
       char *argv[])
 {
+	/* run tests in legacy (pre-session support) mode */
+	setenv ("UPSTART_NO_SESSIONS", "1", 1);
+
 	test_operator_new ();
 	test_operator_copy ();
 	test_operator_destroy ();
 
=== modified file 'init/tests/test_job.c'
--- init/tests/test_job.c	2011-02-23 09:35:03 +0000
+++ init/tests/test_job.c	2011-04-19 09:27:29 +0000
@@ -72,10 +72,6 @@
 	NihDBusObject  *object;
 	char           *path;
 	int             i;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("job_new");
 	nih_error_init ();
@@ -90,7 +86,7 @@
 	 * list of the class and have sensible defaults.
 	 */
 	TEST_FEATURE ("with no name");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	class->stop_on = event_operator_new (class, EVENT_MATCH, "baz", NULL);
 
 	TEST_ALLOC_FAIL {
@@ -259,7 +255,6 @@
 	event_operator_reset (class->stop_on);
 
 	nih_free (class);
-	nih_free (session);
 }
 
 void
@@ -273,10 +268,6 @@
 	Job            *job;
 	NihDBusObject  *object;
 	char           *path;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("job_register");
 	dbus_error_init (&dbus_error);
@@ -293,7 +284,7 @@
 	 * using its path, and have a InstanceAdded signal emitted.
 	 */
 	TEST_FEATURE ("with signal emission");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "fred");
 
 	assert (dbus_connection_get_object_path_data (conn, job->path,
@@ -333,7 +324,7 @@
 	 * is still registered.
 	 */
 	TEST_FEATURE ("without signal emission");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "fred");
 
 	assert (dbus_connection_get_object_path_data (conn, job->path,
@@ -367,7 +358,6 @@
 	dbus_message_unref (message);
 
 	nih_free (class);
-	nih_free (session);
 
 	TEST_DBUS_CLOSE (conn);
 	TEST_DBUS_CLOSE (client_conn);
@@ -389,17 +379,13 @@
 	NihListEntry    *entry = NULL;
 	DBusMessage     *message;
 	char            *job_path = NULL, *goal, *state;
-	Session         *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("job_change_goal");
 	event_init ();
 
 	program_name = "test";
 
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	class->process[PROCESS_MAIN] = process_new (class);
 	class->process[PROCESS_MAIN]->command = "echo";
 	class->process[PROCESS_PRE_START] = process_new (class);
@@ -671,7 +657,6 @@
 
 
 	nih_free (class);
-	nih_free (session);
 	event_poll ();
 }
 
@@ -697,10 +682,6 @@
 	DBusMessage     *message;
 	char            *path, *job_path = NULL, *state;
 	int              status;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("job_change_state");
 	program_name = "test";
@@ -709,7 +690,7 @@
 	TEST_FILENAME (dirname);
 	mkdir (dirname, 0700);
 
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	class->process[PROCESS_MAIN] = process_new (class);
 	class->process[PROCESS_MAIN]->command = nih_sprintf (
 		class->process[PROCESS_MAIN], "touch %s/run", dirname);
@@ -3754,7 +3735,7 @@
 		TEST_ALLOC_SAFE {
 			source = conf_source_new (NULL, "/tmp", CONF_JOB_DIR);
 			file = conf_file_new (source, "/tmp/test");
-			file->job = job_class_new (NULL, "test", session);
+			file->job = job_class_new (NULL, "test", NULL);
 			replacement = file->job;
 
 			job = job_new (class, "");
@@ -3823,7 +3804,7 @@
 		TEST_ALLOC_SAFE {
 			source = conf_source_new (NULL, "/tmp", CONF_JOB_DIR);
 			file = conf_file_new (source, "/tmp/test");
-			file->job = job_class_new (NULL, "test", session);
+			file->job = job_class_new (NULL, "test", NULL);
 			replacement = file->job;
 
 			job = job_new (class, "");
@@ -3900,7 +3881,7 @@
 	TEST_FEATURE ("post-stop to waiting for deleted job");
 	source = conf_source_new (NULL, "/tmp", CONF_JOB_DIR);
 	file = conf_file_new (source, "/tmp/test");
-	file->job = job_class_new (NULL, "test", session);
+	file->job = job_class_new (NULL, "test", NULL);
 	replacement = file->job;
 
 	class->deleted = TRUE;
@@ -3963,7 +3944,6 @@
 	rmdir (dirname);
 
 	nih_free (cause);
-	nih_free (session);
 	event_poll ();
 }
 
@@ -3972,13 +3952,9 @@
 {
 	JobClass  *class;
 	Job       *job;
-	Session   *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("job_next_state");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	class->process[PROCESS_MAIN] = process_new (class);
 	class->process[PROCESS_MAIN]->command = "echo";
 
@@ -4215,7 +4191,6 @@
 
 
 	nih_free (class);
-	nih_free (session);
 }
 
 
@@ -4226,10 +4201,6 @@
 	Job      *job;
 	Blocked  *blocked1, *blocked2;
 	Event    *event1, *event2;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("job_failed");
 
@@ -4238,7 +4209,7 @@
 	 * as failed before freeing the blocking list.
 	 */
 	TEST_FEATURE ("with no current failure");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	event1 = event_new (NULL, "foo", NULL);
@@ -4279,7 +4250,7 @@
 	 * since these were added after the first failure.
 	 */
 	TEST_FEATURE ("with previous failure");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 	job->failed = TRUE;
 	job->failed_process = PROCESS_PRE_START;
@@ -4316,7 +4287,6 @@
 	TEST_FALSE (event2->failed);
 
 	nih_free (class);
-	nih_free (session);
 
 	event_poll ();
 }
@@ -4328,10 +4298,6 @@
 	Job       *job;
 	Blocked   *blocked1, *blocked2;
 	Event     *event1, *event2;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("job_finished");
 
@@ -4339,7 +4305,7 @@
 	 * is unblocked and the list itself is then freed.
 	 */
 	TEST_FEATURE ("with blocked events");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	event1 = event_new (NULL, "foo", NULL);
@@ -4375,7 +4341,7 @@
 	 * unblocked and marked as failed.
 	 */
 	TEST_FEATURE ("with blocked events and failure");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	event1 = event_new (NULL, "foo", NULL);
@@ -4411,7 +4377,7 @@
 	 * still works (and just does nothing).
 	 */
 	TEST_FEATURE ("without blocked events");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job_finished (job, TRUE);
@@ -4419,7 +4385,6 @@
 	TEST_LIST_EMPTY (&job->blocking);
 
 	nih_free (class);
-	nih_free (session);
 
 	event_poll ();
 }
@@ -4432,10 +4397,6 @@
 	Job      *job;
 	Event    *event;
 	Blocked  *blocked;
-	Session  *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("job_emit_event");
 
@@ -4443,7 +4404,7 @@
 	 * event event emitted with the job name set.
 	 */
 	TEST_FEATURE ("with singleton in starting state");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 	job = job_new (class, "");
 	job->goal = JOB_START;
@@ -4482,7 +4443,7 @@
 	 * instance name set.
 	 */
 	TEST_FEATURE ("with instance in starting state");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "foo");
@@ -4522,7 +4483,7 @@
 	 * event emitted with the job name set.
 	 */
 	TEST_FEATURE ("with singleton in running state");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 	job = job_new (class, "");
 	job->goal = JOB_START;
@@ -4552,7 +4513,7 @@
 	 * instance name set.
 	 */
 	TEST_FEATURE ("with instance in running state");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "foo");
@@ -4584,7 +4545,7 @@
 	 * result as "ok"
 	 */
 	TEST_FEATURE ("with non-failed singleton in stopping state");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 	job = job_new (class, "");
 	job->goal = JOB_STOP;
@@ -4624,7 +4585,7 @@
 	 * also has the instance name set before the result information.
 	 */
 	TEST_FEATURE ("with non-failed instance in stopping state");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "foo");
@@ -4667,7 +4628,7 @@
 	 * exit status members set.
 	 */
 	TEST_FEATURE ("with failed singleton in stopping state");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 	job = job_new (class, "");
 	job->goal = JOB_STOP;
@@ -4713,7 +4674,7 @@
 	 * set before the result information.
 	 */
 	TEST_FEATURE ("with failed instance in stopping state");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "foo");
@@ -4761,7 +4722,7 @@
 	 * members set.
 	 */
 	TEST_FEATURE ("with killed singleton in stopping state");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 	job = job_new (class, "");
 	job->goal = JOB_STOP;
@@ -4807,7 +4768,7 @@
 	 * result information.
 	 */
 	TEST_FEATURE ("with killed instance in stopping state");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "foo");
@@ -4855,7 +4816,7 @@
 	 * signal members set.
 	 */
 	TEST_FEATURE ("with unknown killed singleton in stopping state");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 	job = job_new (class, "");
 	job->goal = JOB_STOP;
@@ -4901,7 +4862,7 @@
 	 * the result information.
 	 */
 	TEST_FEATURE ("with unknown killed instance in stopping state");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "foo");
@@ -4948,7 +4909,7 @@
 	 * the job name set, the result as failed, and just the process set.
 	 */
 	TEST_FEATURE ("with unstarted singleton in stopping state");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 	job = job_new (class, "");
 	job->goal = JOB_STOP;
@@ -4993,7 +4954,7 @@
 	 * the result information.
 	 */
 	TEST_FEATURE ("with unstarted instance in stopping state");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "foo");
@@ -5039,7 +5000,7 @@
 	 * the result as failed and the process set to respawn.
 	 */
 	TEST_FEATURE ("with failed respawn singleton in stopping state");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 	job = job_new (class, "");
 	job->goal = JOB_STOP;
@@ -5084,7 +5045,7 @@
 	 * information.
 	 */
 	TEST_FEATURE ("with failed respawn instance in stopping state");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "foo");
@@ -5130,7 +5091,7 @@
 	 * result as "ok"
 	 */
 	TEST_FEATURE ("with non-failed singleton in stopped state");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 	job = job_new (class, "");
 	job->goal = JOB_STOP;
@@ -5161,7 +5122,7 @@
 	 * also has the instance name set before the result information.
 	 */
 	TEST_FEATURE ("with non-failed instance in waiting state");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "foo");
@@ -5195,7 +5156,7 @@
 	 * exit status members set.
 	 */
 	TEST_FEATURE ("with failed singleton in waiting state");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 	job = job_new (class, "");
 	job->goal = JOB_STOP;
@@ -5232,7 +5193,7 @@
 	 * set before the result information.
 	 */
 	TEST_FEATURE ("with failed instance in waiting state");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "foo");
@@ -5271,7 +5232,7 @@
 	 * members set.
 	 */
 	TEST_FEATURE ("with killed singleton in waiting state");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 	job = job_new (class, "");
 	job->goal = JOB_STOP;
@@ -5308,7 +5269,7 @@
 	 * result information.
 	 */
 	TEST_FEATURE ("with killed instance in waiting state");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "foo");
@@ -5347,7 +5308,7 @@
 	 * signal members set.
 	 */
 	TEST_FEATURE ("with unknown killed singleton in waiting state");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 	job = job_new (class, "");
 	job->goal = JOB_STOP;
@@ -5384,7 +5345,7 @@
 	 * the result information.
 	 */
 	TEST_FEATURE ("with unknown killed instance in waiting state");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "foo");
@@ -5422,7 +5383,7 @@
 	 * the job name set, the result as failed, and just the process set.
 	 */
 	TEST_FEATURE ("with unstarted singleton in waiting state");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 	job = job_new (class, "");
 	job->goal = JOB_STOP;
@@ -5458,7 +5419,7 @@
 	 * the result information.
 	 */
 	TEST_FEATURE ("with unstarted instance in waiting state");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "foo");
@@ -5495,7 +5456,7 @@
 	 * the result as failed and the process set to respawn.
 	 */
 	TEST_FEATURE ("with failed respawn singleton in waiting state");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 	job = job_new (class, "");
 	job->goal = JOB_STOP;
@@ -5531,7 +5492,7 @@
 	 * information.
 	 */
 	TEST_FEATURE ("with failed respawn instance in waiting state");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "foo");
@@ -5561,7 +5522,6 @@
 	}
 
 	nih_free (class);
-	nih_free (session);
 }
 
 
@@ -5572,16 +5532,12 @@
 	Job        *job;
 	const char *ret;
 	char       *name;
-	Session    *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("job_name");
 
 	/* Check that the name of a non-instance job is returned. */
 	TEST_FEATURE ("with non-instance job");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	TEST_ALLOC_FAIL {
@@ -5595,7 +5551,7 @@
 
 	/* Check that the name of an instance job is returned. */
 	TEST_FEATURE ("with instance job");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 	job = job_new (class, "foo");
 
@@ -5612,7 +5568,7 @@
 	 * value.
 	 */
 	TEST_FEATURE ("with multiple calls");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	ret = job_name (job);
@@ -5625,7 +5581,6 @@
 	TEST_FREE (name);
 
 	nih_free (class);
-	nih_free (session);
 }
 
 
@@ -5883,11 +5838,6 @@
 	int              ret;
 	NihError        *error;
 	NihDBusError    *dbus_error;
-	Session         *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
-
 
 	TEST_FUNCTION ("job_start");
 	nih_error_init ();
@@ -5904,8 +5854,9 @@
 	 * the reply will be sent to the sender.
 	 */
 	TEST_FEATURE ("with stopping job");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
+	TEST_NE_P (job, NULL);
 
 	job->goal = JOB_STOP;
 	job->state = JOB_STOPPING;
@@ -5990,7 +5941,7 @@
 	 * and no blocking entry created.
 	 */
 	TEST_FEATURE ("with no wait");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_STOP;
@@ -6060,7 +6011,7 @@
 	 * a D-Bus error is raised immediately.
 	 */
 	TEST_FEATURE ("with starting job");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_START;
@@ -6107,7 +6058,6 @@
 	TEST_EQ (job->state, JOB_STARTING);
 
 	nih_free (class);
-	nih_free (session);
 
 	TEST_DBUS_CLOSE (conn);
 	TEST_DBUS_CLOSE (client_conn);
@@ -6132,10 +6082,6 @@
 	int              ret;
 	NihError        *error;
 	NihDBusError    *dbus_error;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("job_stop");
 	nih_error_init ();
@@ -6152,7 +6098,7 @@
 	 * the reply will be sent to the sender and the instance deleted.
 	 */
 	TEST_FEATURE ("with running job");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_START;
@@ -6231,7 +6177,7 @@
 	 * no blocking entry created.
 	 */
 	TEST_FEATURE ("with no wait");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_START;
@@ -6297,7 +6243,7 @@
 	 * a D-Bus error is raised immediately.
 	 */
 	TEST_FEATURE ("with stopping job");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_STOP;
@@ -6344,8 +6290,6 @@
 	TEST_EQ (job->state, JOB_STOPPING);
 
 	nih_free (class);
-	nih_free (session);
-
 
 	TEST_DBUS_CLOSE (conn);
 	TEST_DBUS_CLOSE (client_conn);
@@ -6370,10 +6314,6 @@
 	int              ret;
 	NihError        *error;
 	NihDBusError    *dbus_error;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("job_restart");
 	nih_error_init ();
@@ -6390,7 +6330,7 @@
 	 * it back through to running, the reply will be sent to the sender.
 	 */
 	TEST_FEATURE ("with running job");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_START;
@@ -6479,7 +6419,7 @@
 	 * and no blocking entry created.
 	 */
 	TEST_FEATURE ("with no wait");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_START;
@@ -6552,7 +6492,7 @@
 	 * a D-Bus error is raised immediately.
 	 */
 	TEST_FEATURE ("with stopping job");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_STOP;
@@ -6599,7 +6539,6 @@
 	TEST_EQ (job->state, JOB_STOPPING);
 
 	nih_free (class);
-	nih_free (session);
 
 	TEST_DBUS_CLOSE (conn);
 	TEST_DBUS_CLOSE (client_conn);
@@ -6620,10 +6559,6 @@
 	NihError       *error;
 	char           *name;
 	int             ret;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("job_get_name");
 	nih_error_init ();
@@ -6635,7 +6570,7 @@
 	TEST_FEATURE ("with instance name");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			job = job_new (class, "instance name");
 
 			message = nih_new (NULL, NihDBusMessage);
@@ -6675,7 +6610,7 @@
 	TEST_FEATURE ("with no instance name");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			job = job_new (class, "");
 
 			message = nih_new (NULL, NihDBusMessage);
@@ -6707,7 +6642,6 @@
 		nih_free (message);
 		nih_free (class);
 	}
-	nih_free (session);
 }
 
 void
@@ -6719,10 +6653,6 @@
 	NihError       *error;
 	char           *goal;
 	int             ret;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	/* Check that the goal of the instance is returned a newly allocated
 	 * string, as a child of the message.
@@ -6733,7 +6663,7 @@
 
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			job = job_new (class, "");
 			job->goal = JOB_START;
 
@@ -6766,7 +6696,6 @@
 		nih_free (message);
 		nih_free (class);
 	}
-	nih_free (session);
 }
 
 void
@@ -6778,10 +6707,6 @@
 	NihError       *error;
 	char           *state;
 	int             ret;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	/* Check that the state of the instance is returned a newly allocated
 	 * string, as a child of the message.
@@ -6792,7 +6717,7 @@
 
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			job = job_new (class, "");
 			job->goal = JOB_START;
 			job->state = JOB_RUNNING;
@@ -6826,7 +6751,6 @@
 		nih_free (message);
 		nih_free (class);
 	}
-	nih_free (session);
 }
 
 
@@ -6839,10 +6763,6 @@
 	JobProcessesElement **processes;
 	NihError *            error;
 	int                   ret;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("job_get_processes");
 	nih_error_init ();
@@ -6855,7 +6775,7 @@
 	TEST_FEATURE ("with no processes");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			job = job_new (class, "");
 			job->goal = JOB_START;
 			job->state = JOB_STARTING;
@@ -6899,7 +6819,7 @@
 	TEST_FEATURE ("with pre-start process");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->process[PROCESS_PRE_START] = process_new (class);
 			class->process[PROCESS_PRE_START]->command = "echo";
 
@@ -6954,7 +6874,7 @@
 	TEST_FEATURE ("with post-start process and no main process");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->process[PROCESS_POST_START] = process_new (class);
 			class->process[PROCESS_POST_START]->command = "echo";
 
@@ -7008,7 +6928,7 @@
 	TEST_FEATURE ("with main process");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->process[PROCESS_MAIN] = process_new (class);
 			class->process[PROCESS_MAIN]->command = "echo";
 
@@ -7063,7 +6983,7 @@
 	TEST_FEATURE ("with main process and post-start process");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->process[PROCESS_POST_START] = process_new (class);
 			class->process[PROCESS_POST_START]->command = "echo";
 			class->process[PROCESS_MAIN] = process_new (class);
@@ -7127,7 +7047,7 @@
 	TEST_FEATURE ("with main process and pre-stop process");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->process[PROCESS_MAIN] = process_new (class);
 			class->process[PROCESS_MAIN]->command = "echo";
 			class->process[PROCESS_PRE_STOP] = process_new (class);
@@ -7191,7 +7111,7 @@
 	TEST_FEATURE ("with pre-stop process and no main process");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->process[PROCESS_PRE_STOP] = process_new (class);
 			class->process[PROCESS_PRE_STOP]->command = "echo";
 
@@ -7245,7 +7165,7 @@
 	TEST_FEATURE ("with post-stop process");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->process[PROCESS_POST_STOP] = process_new (class);
 			class->process[PROCESS_POST_STOP]->command = "echo";
 
@@ -7291,7 +7211,6 @@
 		nih_free (message);
 		nih_free (class);
 	}
-	nih_free (session);
 }
 
 
@@ -7299,6 +7218,9 @@
 main (int   argc,
       char *argv[])
 {
+	/* run tests in legacy (pre-session support) mode */
+	setenv ("UPSTART_NO_SESSIONS", "1", 1);
+
 	test_new ();
 	test_register ();
 	test_change_goal ();
 
=== modified file 'init/tests/test_job_class.c'
--- init/tests/test_job_class.c	2011-02-23 13:50:30 +0000
+++ init/tests/test_job_class.c	2011-04-19 09:27:29 +0000
@@ -160,10 +160,6 @@
 	Job            *job;
 	char           *path;
 	int             ret;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("job_class_consider");
 	dbus_error_init (&dbus_error);
@@ -181,15 +177,15 @@
 	source2 = conf_source_new (NULL, "/tmp/bar", CONF_JOB_DIR);
 
 	file1 = conf_file_new (source2, "/tmp/bar/frodo");
-	class1 = file1->job = job_class_new (NULL, "frodo", session);
+	class1 = file1->job = job_class_new (NULL, "frodo", NULL);
 
 	file2 = conf_file_new (source2, "/tmp/bar/bilbo");
-	class2 = file2->job = job_class_new (NULL, "bilbo", session);
+	class2 = file2->job = job_class_new (NULL, "bilbo", NULL);
 
 	source3 = conf_source_new (NULL, "/tmp/baz", CONF_JOB_DIR);
 
 	file3 = conf_file_new (source3, "/tmp/baz/frodo");
-	class3 = file3->job = job_class_new (NULL, "frodo", session);
+	class3 = file3->job = job_class_new (NULL, "frodo", NULL);
 
 
 	control_init ();
@@ -382,7 +378,7 @@
 	 * becomes the hash table member.
 	 */
 	TEST_FEATURE ("with replacable registered class and not best class");
-	class4 = job_class_new (NULL, "frodo", session);
+	class4 = job_class_new (NULL, "frodo", NULL);
 	nih_hash_add (job_classes, &class4->entry);
 	job_class_register (class4, conn, FALSE);
 
@@ -440,7 +436,6 @@
 
 
 	nih_free (entry);
-	nih_free (session);
 
 	TEST_DBUS_CLOSE (conn);
 	TEST_DBUS_CLOSE (client_conn);
@@ -464,10 +459,6 @@
 	Job            *job;
 	char           *path;
 	int             ret;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("job_class_reconsider");
 	dbus_error_init (&dbus_error);
@@ -485,15 +476,15 @@
 	source2 = conf_source_new (NULL, "/tmp/bar", CONF_JOB_DIR);
 
 	file1 = conf_file_new (source2, "/tmp/bar/frodo");
-	class1 = file1->job = job_class_new (NULL, "frodo", session);
+	class1 = file1->job = job_class_new (NULL, "frodo", NULL);
 
 	file2 = conf_file_new (source2, "/tmp/bar/bilbo");
-	class2 = file2->job = job_class_new (NULL, "bilbo", session);
+	class2 = file2->job = job_class_new (NULL, "bilbo", NULL);
 
 	source3 = conf_source_new (NULL, "/tmp/baz", CONF_JOB_DIR);
 
 	file3 = conf_file_new (source3, "/tmp/baz/frodo");
-	class3 = file3->job = job_class_new (NULL, "frodo", session);
+	class3 = file3->job = job_class_new (NULL, "frodo", NULL);
 
 
 	control_init ();
@@ -726,7 +717,7 @@
 	nih_free (source2);
 	nih_free (source1);
 
-	class4 = job_class_new (NULL, "frodo", session);
+	class4 = job_class_new (NULL, "frodo", NULL);
 	nih_hash_add (job_classes, &class4->entry);
 	job_class_register (class4, conn, FALSE);
 
@@ -759,7 +750,6 @@
 
 
 	nih_free (entry);
-	nih_free (session);
 
 	TEST_DBUS_CLOSE (conn);
 	TEST_DBUS_CLOSE (client_conn);
@@ -779,10 +769,6 @@
 	JobClass       *class;
 	NihDBusObject  *object;
 	char           *path;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("job_class_register");
 	dbus_error_init (&dbus_error);
@@ -800,7 +786,7 @@
 	 * announce it.
 	 */
 	TEST_FEATURE ("with signal emission");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 	assert (dbus_connection_get_object_path_data (conn, class->path,
 						      (void **)&object));
@@ -837,7 +823,7 @@
 	 * by emitting a signal immediately afterwards.
 	 */
 	TEST_FEATURE ("without signal emission");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 	assert (dbus_connection_get_object_path_data (conn, class->path,
 						      (void **)&object));
@@ -870,7 +856,6 @@
 	dbus_message_unref (message);
 
 	nih_free (class);
-	nih_free (session);
 
 	TEST_DBUS_CLOSE (conn);
 	TEST_DBUS_CLOSE (client_conn);
@@ -889,10 +874,6 @@
 	JobClass       *class;
 	NihDBusObject  *object;
 	char           *path;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	/* Check that we can unregister an object for a job class from
 	 * the bus and that the JobRemoved signal is emitted as a result.
@@ -910,7 +891,7 @@
 	assert (! dbus_error_is_set (&dbus_error));
 
 
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 	assert (dbus_connection_get_object_path_data (conn, class->path,
 						      (void **)&object));
@@ -945,7 +926,6 @@
 	dbus_message_unref (message);
 
 	nih_free (class);
-	nih_free (session);
 
 	TEST_DBUS_CLOSE (conn);
 	TEST_DBUS_CLOSE (client_conn);
@@ -961,10 +941,6 @@
 	JobClass  *class;
 	char     **env;
 	size_t     len;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("job_class_environment");
 
@@ -972,7 +948,7 @@
 	 * just have the built-ins in the returned environment.
 	 */
 	TEST_FEATURE ("with no configured environment");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 	TEST_ALLOC_FAIL {
 		env = job_class_environment (NULL, class, &len);
@@ -1002,7 +978,7 @@
 	 * will have those appended to the environment as well as the builtins.
 	 */
 	TEST_FEATURE ("with configured environment");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 	class->env = nih_str_array_new (class);
 	assert (nih_str_array_add (&(class->env), class, NULL, "FOO=BAR"));
@@ -1039,7 +1015,7 @@
 	/* Check that configured environment override built-ins.
 	 */
 	TEST_FEATURE ("with configuration overriding built-ins");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 	class->env = nih_str_array_new (class);
 	assert (nih_str_array_add (&(class->env), class, NULL, "FOO=BAR"));
@@ -1072,7 +1048,6 @@
 	}
 
 	nih_free (class);
-	nih_free (session);
 }
 
 
@@ -1087,11 +1062,6 @@
 	int              ret;
 	NihError        *error;
 	NihDBusError    *dbus_error;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
-
 
 	TEST_FUNCTION ("job_class_get_instance");
 	nih_error_init ();
@@ -1103,7 +1073,7 @@
 	TEST_FEATURE ("with running job");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			job = job_new (class, "");
 
 			message = nih_new (NULL, NihDBusMessage);
@@ -1140,7 +1110,7 @@
 	/* Check that if there's no such instance, a D-Bus error is raised.
 	 */
 	TEST_FEATURE ("with unknown job");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 	message = nih_new (NULL, NihDBusMessage);
 	message->connection = NULL;
@@ -1171,7 +1141,7 @@
 	TEST_FEATURE ("with environment");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->instance = "$FOO";
 
 			job = job_new (class, "wibble");
@@ -1215,7 +1185,7 @@
 	 * is returned.
 	 */
 	TEST_FEATURE ("with invalid environment");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "wibble");
@@ -1242,7 +1212,6 @@
 
 	nih_free (message);
 	nih_free (class);
-	nih_free (session);
 }
 
 void
@@ -1255,15 +1224,11 @@
 	NihError       *error;
 	NihDBusError   *dbus_error;
 	int             ret;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("job_class_get_instance_by_name");
 	nih_error_init ();
 
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 
 	/* Check that when given a known instance name, the path to that
@@ -1377,7 +1342,6 @@
 
 
 	nih_free (class);
-	nih_free (session);
 }
 
 void
@@ -1389,16 +1353,12 @@
 	NihError        *error;
 	char           **paths;
 	int              ret;
-	Session         *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("job_class_get_all_instances");
 	nih_error_init ();
 	job_class_init ();
 
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 
 	/* Check that paths for each of the active instances are returned
@@ -1496,7 +1456,6 @@
 	}
 
 	nih_free (class);
-	nih_free (session);
 }
 
 
@@ -1516,10 +1475,6 @@
 	int              ret;
 	NihError        *error;
 	NihDBusError    *dbus_error;
-	Session         *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("job_class_start");
 	nih_error_init ();
@@ -1536,7 +1491,7 @@
 	 * the reply will be sent to the sender.
 	 */
 	TEST_FEATURE ("with new job");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 	method = dbus_message_new_method_call (
 		dbus_bus_get_unique_name (conn),
@@ -1627,7 +1582,7 @@
 	 * immediately and the job not blocked.
 	 */
 	TEST_FEATURE ("with no wait");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 	method = dbus_message_new_method_call (
 		dbus_bus_get_unique_name (conn),
@@ -1707,7 +1662,7 @@
 	 * it through to running, the reply will be sent to the sender.
 	 */
 	TEST_FEATURE ("with stopping job");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_STOP;
@@ -1808,7 +1763,7 @@
 	 * a D-Bus error is raised immediately.
 	 */
 	TEST_FEATURE ("with starting job");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_START;
@@ -1864,7 +1819,7 @@
 	 * when it's starting.
 	 */
 	TEST_FEATURE ("with environment");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	method = dbus_message_new_method_call (
@@ -1965,7 +1920,7 @@
 	 * is returned.
 	 */
 	TEST_FEATURE ("with invalid environment");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 	method = dbus_message_new_method_call (
 		dbus_bus_get_unique_name (conn),
@@ -2010,8 +1965,6 @@
 	TEST_HASH_EMPTY (class->instances);
 
 	nih_free (class);
-	nih_free (session);
-
 
 	TEST_DBUS_CLOSE (conn);
 	TEST_DBUS_CLOSE (client_conn);
@@ -2037,11 +1990,6 @@
 	int              ret;
 	NihError        *error;
 	NihDBusError    *dbus_error;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
-
 
 	TEST_FUNCTION ("job_class_stop");
 	nih_error_init ();
@@ -2058,7 +2006,7 @@
 	 * will be sent to the sender.
 	 */
 	TEST_FEATURE ("with running job");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_START;
@@ -2141,7 +2089,7 @@
 	 * and no blocking entry created.
 	 */
 	TEST_FEATURE ("with no wait");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_START;
@@ -2211,7 +2159,7 @@
 	 * a D-Bus error is raised immediately.
 	 */
 	TEST_FEATURE ("with stopping job");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_STOP;
@@ -2266,7 +2214,7 @@
 	 * immediately.
 	 */
 	TEST_FEATURE ("with unknown job");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 	method = dbus_message_new_method_call (
 		dbus_bus_get_unique_name (conn),
@@ -2315,7 +2263,7 @@
 	 * for the pre-stop script.
 	 */
 	TEST_FEATURE ("with environment");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "wibble");
@@ -2404,7 +2352,7 @@
 	 * is returned.
 	 */
 	TEST_FEATURE ("with invalid environment");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_START;
@@ -2451,7 +2399,6 @@
 	nih_free (dbus_error);
 
 	nih_free (class);
-	nih_free (session);
 
 	TEST_DBUS_CLOSE (conn);
 	TEST_DBUS_CLOSE (client_conn);
@@ -2478,11 +2425,6 @@
 	int              ret;
 	NihError        *error;
 	NihDBusError    *dbus_error;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
-
 
 	TEST_FUNCTION ("job_class_restart");
 	nih_error_init ();
@@ -2499,7 +2441,7 @@
 	 * through to waiting, the reply will be sent to the sender.
 	 */
 	TEST_FEATURE ("with running job");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_START;
@@ -2596,7 +2538,7 @@
 	 * entry created.
 	 */
 	TEST_FEATURE ("with no wait");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_START;
@@ -2677,7 +2619,7 @@
 	 * a D-Bus error is raised immediately.
 	 */
 	TEST_FEATURE ("with stopping job");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_STOP;
@@ -2732,7 +2674,7 @@
 	 * immediately.
 	 */
 	TEST_FEATURE ("with unknown job");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 	method = dbus_message_new_method_call (
 		dbus_bus_get_unique_name (conn),
@@ -2781,7 +2723,7 @@
 	 * when it's starting again.
 	 */
 	TEST_FEATURE ("with environment");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "wibble");
@@ -2894,7 +2836,7 @@
 	 * is returned.
 	 */
 	TEST_FEATURE ("with invalid environment");
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_START;
@@ -2941,7 +2883,6 @@
 	nih_free (dbus_error);
 
 	nih_free (class);
-	nih_free (session);
 
 	TEST_DBUS_CLOSE (conn);
 	TEST_DBUS_CLOSE (client_conn);
@@ -2961,10 +2902,6 @@
 	NihError       *error;
 	char           *name;
 	int             ret;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	/* Check that the name of the job class is returned from the
 	 * property, as a child of the message.
@@ -2975,7 +2912,7 @@
 
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 
 			message = nih_new (NULL, NihDBusMessage);
 			message->connection = NULL;
@@ -3006,7 +2943,6 @@
 		nih_free (message);
 		nih_free (class);
 	}
-	nih_free (session);
 }
 
 void
@@ -3017,10 +2953,6 @@
 	NihError       *error;
 	char           *description;
 	int             ret;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("job_class_get_description");
 	nih_error_init ();
@@ -3032,7 +2964,7 @@
 	TEST_FEATURE ("with description");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->description = nih_strdup (class, "a test job");
 
 			message = nih_new (NULL, NihDBusMessage);
@@ -3072,7 +3004,7 @@
 	TEST_FEATURE ("with no description");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 
 			message = nih_new (NULL, NihDBusMessage);
 			message->connection = NULL;
@@ -3103,7 +3035,6 @@
 		nih_free (message);
 		nih_free (class);
 	}
-	nih_free (session);
 }
 
 void
@@ -3114,10 +3045,6 @@
 	NihError       *error;
 	char           *author;
 	int             ret;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("job_class_get_author");
 	nih_error_init ();
@@ -3129,7 +3056,7 @@
 	TEST_FEATURE ("with author");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->author = nih_strdup (class, "a test job");
 
 			message = nih_new (NULL, NihDBusMessage);
@@ -3169,7 +3096,7 @@
 	TEST_FEATURE ("with no author");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 
 			message = nih_new (NULL, NihDBusMessage);
 			message->connection = NULL;
@@ -3200,7 +3127,6 @@
 		nih_free (message);
 		nih_free (class);
 	}
-	nih_free (session);
 }
 
 void
@@ -3211,10 +3137,6 @@
 	NihError       *error;
 	char           *version;
 	int             ret;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("job_class_get_version");
 	nih_error_init ();
@@ -3226,7 +3148,7 @@
 	TEST_FEATURE ("with version");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->version = nih_strdup (class, "a test job");
 
 			message = nih_new (NULL, NihDBusMessage);
@@ -3266,7 +3188,7 @@
 	TEST_FEATURE ("with no version");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 
 			message = nih_new (NULL, NihDBusMessage);
 			message->connection = NULL;
@@ -3297,7 +3219,6 @@
 		nih_free (message);
 		nih_free (class);
 	}
-	nih_free (session);
 }
 
 void
@@ -3310,10 +3231,6 @@
 	NihError       *error;
 	char         ***start_on;
 	int             ret;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("job_class_get_start_on");
 
@@ -3326,7 +3243,7 @@
 
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 
 			class->start_on = event_operator_new (
 				class, EVENT_OR, NULL, NULL);
@@ -3421,7 +3338,7 @@
 
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 
 			message = nih_new (NULL, NihDBusMessage);
 			message->connection = NULL;
@@ -3453,7 +3370,6 @@
 		nih_free (message);
 		nih_free (class);
 	}
-	nih_free (session);
 }
 
 void
@@ -3466,10 +3382,6 @@
 	NihError       *error;
 	char         ***stop_on;
 	int             ret;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("job_class_get_stop_on");
 
@@ -3482,7 +3394,7 @@
 
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 
 			class->stop_on = event_operator_new (
 				class, EVENT_OR, NULL, NULL);
@@ -3577,7 +3489,7 @@
 
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 
 			message = nih_new (NULL, NihDBusMessage);
 			message->connection = NULL;
@@ -3609,7 +3521,6 @@
 		nih_free (message);
 		nih_free (class);
 	}
-	nih_free (session);
 }
 
 void
@@ -3620,10 +3531,6 @@
 	NihError       *error;
 	char          **emits;
 	int             ret;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("job_class_get_emits");
 
@@ -3637,7 +3544,7 @@
 
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->emits = nih_str_array_new (class);
 
 			NIH_MUST (nih_str_array_add (&class->emits, class, NULL, "foo"));
@@ -3689,7 +3596,7 @@
 
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 
 			message = nih_new (NULL, NihDBusMessage);
 			message->connection = NULL;
@@ -3721,7 +3628,6 @@
 		nih_free (message);
 		nih_free (class);
 	}
-	nih_free (session);
 }
 
 
@@ -3729,6 +3635,9 @@
 main (int   argc,
       char *argv[])
 {
+	/* run tests in legacy (pre-session support) mode */
+	setenv ("UPSTART_NO_SESSIONS", "1", 1);
+
 	test_new ();
 	test_consider ();
 	test_reconsider ();
 
=== modified file 'init/tests/test_job_process.c'
--- init/tests/test_job_process.c	2011-02-24 15:41:04 +0000
+++ init/tests/test_job_process.c	2011-04-19 09:27:29 +0000
@@ -131,10 +131,6 @@
 	char         filename[PATH_MAX], buf[80];
 	int          ret = -1, status, first;
 	siginfo_t    info;
-	Session     *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("job_process_run");
 	job_class_init ();
@@ -151,7 +147,7 @@
 	TEST_FEATURE ("with simple command");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->process[PROCESS_MAIN] = process_new (class);
 			class->process[PROCESS_MAIN]->command = nih_sprintf (
 				class->process[PROCESS_MAIN],
@@ -183,7 +179,7 @@
 	TEST_FEATURE ("with shell command");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->process[PROCESS_MAIN] = process_new (class);
 			class->process[PROCESS_MAIN]->command = nih_sprintf (
 				class->process[PROCESS_MAIN],
@@ -220,7 +216,7 @@
 	TEST_FEATURE ("with small script");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->process[PROCESS_MAIN] = process_new (class);
 			class->process[PROCESS_MAIN]->script = TRUE;
 			class->process[PROCESS_MAIN]->command = nih_sprintf (
@@ -257,7 +253,7 @@
 	TEST_FEATURE ("with small script and trailing newlines");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->process[PROCESS_MAIN] = process_new (class);
 			class->process[PROCESS_MAIN]->script = TRUE;
 			class->process[PROCESS_MAIN]->command = nih_sprintf (
@@ -294,7 +290,7 @@
 	TEST_FEATURE ("with script that will fail");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->process[PROCESS_MAIN] = process_new (class);
 			class->process[PROCESS_MAIN]->script = TRUE;
 			class->process[PROCESS_MAIN]->command = nih_sprintf (
@@ -331,7 +327,7 @@
 	TEST_FEATURE ("with environment of unnamed instance");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->process[PROCESS_MAIN] = process_new (class);
 			class->process[PROCESS_MAIN]->command = nih_sprintf (
 				class->process[PROCESS_MAIN],
@@ -380,7 +376,7 @@
 	TEST_FEATURE ("with environment of named instance");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->process[PROCESS_MAIN] = process_new (class);
 			class->process[PROCESS_MAIN]->command = nih_sprintf (
 				class->process[PROCESS_MAIN],
@@ -430,7 +426,7 @@
 	TEST_FEATURE ("with environment for pre-stop");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->process[PROCESS_PRE_STOP] = process_new (class);
 			class->process[PROCESS_PRE_STOP]->command = nih_sprintf (
 				class->process[PROCESS_PRE_STOP],
@@ -481,7 +477,7 @@
 	TEST_FEATURE ("with environment for post-stop");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->process[PROCESS_POST_STOP] = process_new (class);
 			class->process[PROCESS_POST_STOP]->command = nih_sprintf (
 				class->process[PROCESS_POST_STOP],
@@ -532,7 +528,7 @@
 	TEST_FEATURE ("with long script");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->process[PROCESS_MAIN] = process_new (class);
 			class->process[PROCESS_MAIN]->script = TRUE;
 			class->process[PROCESS_MAIN]->command = nih_alloc (
@@ -597,7 +593,7 @@
 	TEST_FEATURE ("with non-daemon job");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->process[PROCESS_MAIN] = process_new (class);
 			class->process[PROCESS_MAIN]->command = "true";
 
@@ -633,7 +629,7 @@
 	TEST_FEATURE ("with script for daemon job");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->process[PROCESS_PRE_START] = process_new (class);
 			class->process[PROCESS_PRE_START]->command = "true";
 
@@ -670,7 +666,7 @@
 	TEST_FEATURE ("with daemon job");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->expect = EXPECT_DAEMON;
 			class->process[PROCESS_MAIN] = process_new (class);
 			class->process[PROCESS_MAIN]->command = "true";
@@ -717,7 +713,7 @@
 	TEST_FEATURE ("with forking job");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->expect = EXPECT_FORK;
 			class->process[PROCESS_MAIN] = process_new (class);
 			class->process[PROCESS_MAIN]->command = "true";
@@ -766,7 +762,7 @@
 
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test", session);
+			class = job_class_new (NULL, "test", NULL);
 			class->process[PROCESS_MAIN] = process_new (class);
 			class->process[PROCESS_MAIN]->command = filename;
 
@@ -791,7 +787,6 @@
 
 		nih_free (class);
 	}
-	nih_free (session);
 }
 
 
@@ -808,10 +803,6 @@
 	NihError         *err;
 	JobProcessError  *perr;
 	int               status;
-	Session          *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("job_process_spawn");
 	TEST_FILENAME (filename);
@@ -828,7 +819,7 @@
 	TEST_FEATURE ("with simple job");
 	sprintf (function, "%d", TEST_PIDS);
 
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 	pid = job_process_spawn (class, args, NULL, FALSE);
 	TEST_GT (pid, 0);
@@ -865,7 +856,7 @@
 	TEST_FEATURE ("with no console");
 	sprintf (function, "%d", TEST_CONSOLE);
 
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	class->console = CONSOLE_NONE;
 
 	pid = job_process_spawn (class, args, NULL, FALSE);
@@ -891,7 +882,7 @@
 	TEST_FEATURE ("with working directory");
 	sprintf (function, "%d", TEST_PWD);
 
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	class->chdir = "/tmp";
 
 	pid = job_process_spawn (class, args, NULL, FALSE);
@@ -920,7 +911,7 @@
 	env[1] = "FOO=bar";
 	env[2] = NULL;
 
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 	pid = job_process_spawn (class, args, env, FALSE);
 	TEST_GT (pid, 0);
@@ -945,7 +936,7 @@
 	TEST_FEATURE ("with non-daemon job");
 	sprintf (function, "%d", TEST_SIMPLE);
 
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 	pid = job_process_spawn (class, args, NULL, FALSE);
 	TEST_GT (pid, 0);
@@ -965,7 +956,7 @@
 	TEST_FEATURE ("with daemon job");
 	sprintf (function, "%d", TEST_SIMPLE);
 
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 	pid = job_process_spawn (class, args, NULL, TRUE);
 	TEST_GT (pid, 0);
@@ -994,7 +985,7 @@
 	args[1] = filename;
 	args[2] = NULL;
 
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 
 	pid = job_process_spawn (class, args, NULL, FALSE);
 	TEST_LT (pid, 0);
@@ -1013,7 +1004,7 @@
 	 */
 	TEST_FEATURE ("with debug enabled");
 
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	class->debug = TRUE;
 
 	sprintf (function, "%s", "/bin/true");
@@ -1042,7 +1033,6 @@
 	TEST_EQ (WEXITSTATUS (status), 0);
 
 	nih_free (class);
-	nih_free (session);
 }
 
 
@@ -1055,16 +1045,12 @@
 	struct timespec now;
 	pid_t           pid;
 	int             status;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("job_process_kill");
 	nih_timer_init ();
 	event_init ();
 
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	class->kill_timeout = 1000;
 
 	class->process[PROCESS_MAIN] = process_new (class);
@@ -1191,7 +1177,6 @@
 	}
 
 	nih_free (class);
-	nih_free (session);
 }
 
 
@@ -1212,10 +1197,6 @@
 	siginfo_t       info;
 	unsigned long   data;
 	struct timespec now;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("job_process_handler");
 	program_name = "test";
@@ -1223,7 +1204,7 @@
 
 	source = conf_source_new (NULL, "/tmp", CONF_JOB_DIR);
 	file = conf_file_new (source, "/tmp/test");
-	file->job = class = job_class_new (NULL, "test", session);
+	file->job = class = job_class_new (NULL, "test", NULL);
 	class->process[PROCESS_MAIN] = process_new (class);
 	class->process[PROCESS_MAIN]->command = "echo";
 
@@ -4387,7 +4368,6 @@
 	nih_free (source);
 
 	nih_free (event);
-	nih_free (session);
 	event_poll ();
 }
 
@@ -4398,26 +4378,22 @@
 	JobClass    *class1, *class2, *class3;
 	Job         *job1, *job2, *job3, *job4, *job5, *ptr;
 	ProcessType  process;
-	Session     *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("job_process_find");
-	class1 = job_class_new (NULL, "foo", session);
+	class1 = job_class_new (NULL, "foo", NULL);
 	class1->process[PROCESS_MAIN] = process_new (class1);
 	class1->process[PROCESS_POST_START] = process_new (class1);
 	class1->instance = "$FOO";
 	nih_hash_add (job_classes, &class1->entry);
 
-	class2 = job_class_new (NULL, "bar", session);
+	class2 = job_class_new (NULL, "bar", NULL);
 	class2->process[PROCESS_PRE_START] = process_new (class2);
 	class2->process[PROCESS_MAIN] = process_new (class2);
 	class2->process[PROCESS_PRE_STOP] = process_new (class2);
 	class2->instance = "$FOO";
 	nih_hash_add (job_classes, &class2->entry);
 
-	class3 = job_class_new (NULL, "baz", session);
+	class3 = job_class_new (NULL, "baz", NULL);
 	class3->process[PROCESS_POST_STOP] = process_new (class3);
 	nih_hash_add (job_classes, &class3->entry);
 
@@ -4521,7 +4497,6 @@
 	nih_free (class1);
 	nih_free (class2);
 	nih_free (class3);
-	nih_free (session);
 	ptr = job_process_find (20, NULL);
 
 	TEST_EQ_P (ptr, NULL);
@@ -4539,15 +4514,11 @@
 	char            utmpname[PATH_MAX];
 	struct utmpx    utmp, *utmptr;
 	struct timeval  tv;
-	Session        *session;
-
-	session = session_new (NULL, NULL, getuid ());
-	TEST_NE_P (session, NULL);
 
 	TEST_FUNCTION ("job_process_handler");
 	program_name = "test";
 
-	class = job_class_new (NULL, "test", session);
+	class = job_class_new (NULL, "test", NULL);
 	class->process[PROCESS_MAIN] = process_new (class);
 	class->process[PROCESS_MAIN]->command = "echo";
 
@@ -4765,7 +4736,6 @@
 
 		nih_free (job);
 	}
-	nih_free (session);
 }
 
 
@@ -4773,6 +4743,11 @@
 main (int   argc,
       char *argv[])
 {
+	/* Note we do not set the UPSTART_NO_SESSIONS variable since this
+	 * would cause these tests to fail (as they scrutinize the job
+	 * environment).
+	 */
+
 	/* We re-exec this binary to test various children features.  To
 	 * do that, we need to know the full path to the program.
 	 */
 
=== modified file 'init/tests/test_parse_conf.c'
--- init/tests/test_parse_conf.c	2009-06-23 09:29:35 +0000
+++ init/tests/test_parse_conf.c	2011-04-19 09:27:29 +0000
@@ -77,6 +77,9 @@
 main (int   argc,
       char *argv[])
 {
+	/* run tests in legacy (pre-session support) mode */
+	setenv ("UPSTART_NO_SESSIONS", "1", 1);
+
 	test_parse_conf ();
 
 	return 0;
 
=== modified file 'init/tests/test_parse_job.c'
--- init/tests/test_parse_job.c	2011-02-23 11:04:27 +0000
+++ init/tests/test_parse_job.c	2011-04-19 09:27:29 +0000
@@ -7536,6 +7536,9 @@
 main (int   argc,
       char *argv[])
 {
+	/* run tests in legacy (pre-session support) mode */
+	setenv ("UPSTART_NO_SESSIONS", "1", 1);
+
 	test_parse_job ();
 
 	test_stanza_instance ();
 
=== modified file 'init/tests/test_process.c'
--- init/tests/test_process.c	2009-06-23 09:29:35 +0000
+++ init/tests/test_process.c	2011-04-19 09:27:29 +0000
@@ -157,6 +157,9 @@
 main (int   argc,
       char *argv[])
 {
+	/* run tests in legacy (pre-session support) mode */
+	setenv ("UPSTART_NO_SESSIONS", "1", 1);
+
 	test_new ();
 
 	test_name ();
 
=== modified file 'init/tests/test_system.c'
--- init/tests/test_system.c	2009-06-23 09:29:35 +0000
+++ init/tests/test_system.c	2011-04-19 09:27:29 +0000
@@ -133,6 +133,9 @@
 main (int   argc,
       char *argv[])
 {
+	/* run tests in legacy (pre-session support) mode */
+	setenv ("UPSTART_NO_SESSIONS", "1", 1);
+
 	test_kill ();
 
 	return 0;
 
=== modified file 'po/upstart.pot'
--- po/upstart.pot	2011-03-24 13:11:53 +0000
+++ po/upstart.pot	2011-04-19 09:27:29 +0000
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: upstart 0.9.4\n"
+"Project-Id-Version: upstart 0.9.5\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-03-24 11:26+0000\n"
+"POT-Creation-Date: 2011-04-15 12:11+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"
@@ -35,26 +35,26 @@
 msgid "Unable to watch configuration file"
 msgstr ""
 
-#: init/conf.c:524 init/conf.c:924
-msgid "Error while reloading configuration file"
-msgstr ""
-
-#: init/conf.c:601
+#: init/conf.c:598
 msgid "Unable to watch configuration directory"
 msgstr ""
 
-#: init/conf.c:772 init/conf.c:904
+#: init/conf.c:769 init/conf.c:901
 msgid "Error while loading configuration file"
 msgstr ""
 
-#: init/conf.c:819
+#: init/conf.c:816
 msgid "Configuration directory deleted"
 msgstr ""
 
-#: init/conf.c:848
+#: init/conf.c:845
 msgid "Unable to reload configuration after override deletion"
 msgstr ""
 
+#: init/conf.c:921
+msgid "Error while reloading configuration file"
+msgstr ""
+
 #: init/control.c:165
 msgid "Connection from private client"
 msgstr ""
@@ -63,25 +63,25 @@
 msgid "Disconnected from system bus"
 msgstr ""
 
-#: init/control.c:370 init/main.c:549
+#: init/control.c:370 init/main.c:557
 msgid "Reloading configuration"
 msgstr ""
 
-#: init/control.c:412 init/control.c:561
+#: init/control.c:412 init/control.c:565
 msgid "Name may not be empty string"
 msgstr ""
 
-#: init/control.c:438
+#: init/control.c:442
 #, c-format
 msgid "Unknown job: %s"
 msgstr ""
 
-#: init/control.c:569 init/job_class.c:559 init/job_class.c:758
-#: init/job_class.c:888 init/job_class.c:1023
+#: init/control.c:573 init/job_class.c:579 init/job_class.c:778
+#: init/job_class.c:908 init/job_class.c:1043
 msgid "Env must be KEY=VALUE pairs"
 msgstr ""
 
-#: init/control.c:738
+#: init/control.c:742
 msgid "The log priority given was not recognised"
 msgstr ""
 
@@ -99,337 +99,341 @@
 msgid "Event failed"
 msgstr ""
 
-#: init/job.c:227
+#: init/job.c:233
 #, c-format
 msgid "%s goal changed from %s to %s"
 msgstr ""
 
-#: init/job.c:298
+#: init/job.c:304
 #, c-format
 msgid "%s state changed from %s to %s"
 msgstr ""
 
-#: init/job.c:717 init/job.c:755
+#: init/job.c:723 init/job.c:761
 msgid "Job failed to start"
 msgstr ""
 
-#: init/job.c:730 init/job.c:766
+#: init/job.c:736 init/job.c:772
 msgid "Job failed while stopping"
 msgstr ""
 
-#: init/job.c:742 init/job.c:777
+#: init/job.c:748 init/job.c:783
 msgid "Job failed to restart"
 msgstr ""
 
-#: init/job.c:971
+#: init/job.c:977
 msgid "stop"
 msgstr ""
 
-#: init/job.c:973
+#: init/job.c:979
 msgid "start"
 msgstr ""
 
-#: init/job.c:975
+#: init/job.c:981
 msgid "respawn"
 msgstr ""
 
-#: init/job.c:1020
+#: init/job.c:1026
 msgid "waiting"
 msgstr ""
 
-#: init/job.c:1022
+#: init/job.c:1028
 msgid "starting"
 msgstr ""
 
-#: init/job.c:1024 init/process.c:80
+#: init/job.c:1030 init/process.c:80
 msgid "pre-start"
 msgstr ""
 
-#: init/job.c:1026
+#: init/job.c:1032
 msgid "spawned"
 msgstr ""
 
-#: init/job.c:1028 init/process.c:82
+#: init/job.c:1034 init/process.c:82
 msgid "post-start"
 msgstr ""
 
-#: init/job.c:1030
+#: init/job.c:1036
 msgid "running"
 msgstr ""
 
-#: init/job.c:1032 init/process.c:84
+#: init/job.c:1038 init/process.c:84
 msgid "pre-stop"
 msgstr ""
 
-#: init/job.c:1034
+#: init/job.c:1040
 msgid "stopping"
 msgstr ""
 
-#: init/job.c:1036
+#: init/job.c:1042
 msgid "killed"
 msgstr ""
 
-#: init/job.c:1038 init/process.c:86
+#: init/job.c:1044 init/process.c:86
 msgid "post-stop"
 msgstr ""
 
-#: init/job.c:1121 init/job.c:1196 init/job.c:1272 init/job_class.c:750
-#: init/job_class.c:880 init/job_class.c:1015
+#: init/job.c:1127 init/job.c:1202 init/job.c:1278 init/job_class.c:770
+#: init/job_class.c:900 init/job_class.c:1035
 #, c-format
 msgid "You do not have permission to modify job: %s"
 msgstr ""
 
-#: init/job.c:1129 init/job_class.c:804
+#: init/job.c:1135 init/job_class.c:824
 #, c-format
 msgid "Job is already running: %s"
 msgstr ""
 
-#: init/job.c:1204 init/job.c:1280 init/job_class.c:934 init/job_class.c:1068
+#: init/job.c:1210 init/job.c:1286 init/job_class.c:954 init/job_class.c:1088
 #, c-format
 msgid "Job has already been stopped: %s"
 msgstr ""
 
-#: init/job_class.c:596 init/job_class.c:641 init/job_class.c:926
-#: init/job_class.c:1060
+#: init/job_class.c:616 init/job_class.c:661 init/job_class.c:946
+#: init/job_class.c:1080
 #, c-format
 msgid "Unknown instance: %s"
 msgstr ""
 
-#: init/job_process.c:278
+#: init/job_process.c:279
 #, c-format
 msgid "Failed to spawn %s %s process: %s"
 msgstr ""
 
-#: init/job_process.c:284
+#: init/job_process.c:285
 msgid "Temporary process spawn error"
 msgstr ""
 
-#: init/job_process.c:291
+#: init/job_process.c:292
 #, c-format
 msgid "%s %s process (%d)"
 msgstr ""
 
-#: init/job_process.c:391
+#: init/job_process.c:392
 #, c-format
 msgid "Pausing %s (%d) [pre-exec] for debug"
 msgstr ""
 
-#: init/job_process.c:445
+#: init/job_process.c:446
 #, c-format
 msgid "Failed to open system console: %s"
 msgstr ""
 
-#: init/job_process.c:661
+#: init/job_process.c:720
 #, c-format
 msgid "unable to open console: %s"
 msgstr ""
 
-#: init/job_process.c:716
+#: init/job_process.c:775
 #, c-format
 msgid "unable to set \"%s\" resource limit: %s"
 msgstr ""
 
-#: init/job_process.c:721
+#: init/job_process.c:780
 #, c-format
 msgid "unable to set priority: %s"
 msgstr ""
 
-#: init/job_process.c:726
+#: init/job_process.c:785
 #, c-format
 msgid "unable to set oom adjustment: %s"
 msgstr ""
 
-#: init/job_process.c:731
+#: init/job_process.c:790
 #, c-format
 msgid "unable to change root directory: %s"
 msgstr ""
 
-#: init/job_process.c:736
+#: init/job_process.c:795
 #, c-format
 msgid "unable to change working directory: %s"
 msgstr ""
 
-#: init/job_process.c:741
+#: init/job_process.c:800
 #, c-format
 msgid "unable to set trace: %s"
 msgstr ""
 
-#: init/job_process.c:746
+#: init/job_process.c:805
 #, c-format
 msgid "unable to execute: %s"
 msgstr ""
 
-#: init/job_process.c:777
+#: init/job_process.c:836
 #, c-format
 msgid "Sending TERM signal to %s %s process (%d)"
 msgstr ""
 
-#: init/job_process.c:785
+#: init/job_process.c:844
 #, c-format
 msgid "Failed to send TERM signal to %s %s process (%d): %s"
 msgstr ""
 
-#: init/job_process.c:825
+#: init/job_process.c:884
 #, c-format
 msgid "Sending KILL signal to %s %s process (%d)"
 msgstr ""
 
-#: init/job_process.c:833
+#: init/job_process.c:892
 #, c-format
 msgid "Failed to send KILL signal to %s %s process (%d): %s"
 msgstr ""
 
-#: init/job_process.c:882
+#: init/job_process.c:941
 #, c-format
 msgid "%s %s process (%d) terminated with status %d"
 msgstr ""
 
-#: init/job_process.c:887
+#: init/job_process.c:946
 #, c-format
 msgid "%s %s process (%d) exited normally"
 msgstr ""
 
-#: init/job_process.c:902
+#: init/job_process.c:961
 #, c-format
 msgid "%s %s process (%d) killed by %s signal"
 msgstr ""
 
-#: init/job_process.c:906
+#: init/job_process.c:965
 #, c-format
 msgid "%s %s process (%d) killed by signal %d"
 msgstr ""
 
-#: init/job_process.c:920
+#: init/job_process.c:979
 #, c-format
 msgid "%s %s process (%d) stopped by %s signal"
 msgstr ""
 
-#: init/job_process.c:924
+#: init/job_process.c:983
 #, c-format
 msgid "%s %s process (%d) stopped by signal %d"
 msgstr ""
 
-#: init/job_process.c:938
+#: init/job_process.c:997
 #, c-format
 msgid "%s %s process (%d) continued by %s signal"
 msgstr ""
 
-#: init/job_process.c:942
+#: init/job_process.c:1001
 #, c-format
 msgid "%s %s process (%d) continued by signal %d"
 msgstr ""
 
-#: init/job_process.c:1077
+#: init/job_process.c:1136
 #, c-format
 msgid "%s respawning too fast, stopped"
 msgstr ""
 
-#: init/job_process.c:1083
+#: init/job_process.c:1142
 #, c-format
 msgid "%s %s process ended, respawning"
 msgstr ""
 
-#: init/job_process.c:1323
+#: init/job_process.c:1382
 #, c-format
 msgid "Failed to set ptrace options for %s %s process (%d): %s"
 msgstr ""
 
-#: init/job_process.c:1336 init/job_process.c:1531
+#: init/job_process.c:1395 init/job_process.c:1590
 #, c-format
 msgid "Failed to continue traced %s %s process (%d): %s"
 msgstr ""
 
-#: init/job_process.c:1376 init/job_process.c:1467 init/job_process.c:1522
+#: init/job_process.c:1435 init/job_process.c:1526 init/job_process.c:1581
 #, c-format
 msgid "Failed to detach traced %s %s process (%d): %s"
 msgstr ""
 
-#: init/job_process.c:1416
+#: init/job_process.c:1475
 #, c-format
 msgid "Failed to deliver signal to traced %s %s process (%d): %s"
 msgstr ""
 
-#: init/job_process.c:1451
+#: init/job_process.c:1510
 #, c-format
 msgid "Failed to obtain child process id for %s %s process (%d): %s"
 msgstr ""
 
-#: init/job_process.c:1458
+#: init/job_process.c:1517
 #, c-format
 msgid "%s %s process (%d) became new process (%d)"
 msgstr ""
 
-#: init/job_process.c:1517
+#: init/job_process.c:1576
 #, c-format
 msgid "%s %s process (%d) executable changed"
 msgstr ""
 
-#: init/main.c:122
+#: init/main.c:124
 msgid "specify alternative directory to load configuration files from"
 msgstr ""
 
-#: init/main.c:125
+#: init/main.c:127
 msgid "specify an alternative initial event (for testing)"
 msgstr ""
 
-#: init/main.c:128
+#: init/main.c:130
 msgid "do not emit any startup event (for testing)"
 msgstr ""
 
 #: init/main.c:133
+msgid "Disable user and chroot sessions"
+msgstr ""
+
+#: init/main.c:138
 msgid "use D-Bus session bus rather than system bus (for testing)"
 msgstr ""
 
-#: init/main.c:153
+#: init/main.c:158
 msgid "Process management daemon."
 msgstr ""
 
-#: init/main.c:155
+#: init/main.c:160
 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:171 util/reboot.c:166 util/shutdown.c:363 util/telinit.c:148
+#: init/main.c:176 util/reboot.c:166 util/shutdown.c:363 util/telinit.c:148
 msgid "Need to be root"
 msgstr ""
 
-#: init/main.c:180
+#: init/main.c:185
 msgid "Not being executed as init"
 msgstr ""
 
-#: init/main.c:230 init/main.c:459
+#: init/main.c:235 init/main.c:467
 msgid "Unable to set root directory"
 msgstr ""
 
-#: init/main.c:241
+#: init/main.c:246
 msgid "Unable to mount /proc filesystem"
 msgstr ""
 
-#: init/main.c:250
+#: init/main.c:255
 msgid "Unable to mount /sys filesystem"
 msgstr ""
 
-#: init/main.c:346
+#: init/main.c:351
 msgid "Unable to listen for private connections"
 msgstr ""
 
-#: init/main.c:476
+#: init/main.c:484
 #, c-format
 msgid "Caught %s, core dumped"
 msgstr ""
 
-#: init/main.c:480
+#: init/main.c:488
 #, c-format
 msgid "Caught %s, unable to dump core"
 msgstr ""
 
-#: init/main.c:566
+#: init/main.c:574
 msgid "Reconnecting to system bus"
 msgstr ""
 
-#: init/main.c:572
+#: init/main.c:580
 msgid "Unable to connect to the system bus"
 msgstr ""
 
@@ -437,98 +441,110 @@
 msgid "main"
 msgstr ""
 
-#: util/initctl.c:310
+#: util/initctl.c:318
 msgid "Unable to connect to system bus"
 msgstr ""
 
-#: util/initctl.c:311
+#: util/initctl.c:319
 msgid "Unable to connect to session bus"
 msgstr ""
 
-#: util/initctl.c:320
+#: util/initctl.c:328
 #, c-format
 msgid "%s: --dest given without --system\n"
 msgstr ""
 
-#: util/initctl.c:328
+#: util/initctl.c:336
 msgid "Unable to connect to Upstart"
 msgstr ""
 
-#: util/initctl.c:514 util/initctl.c:649 util/initctl.c:777 util/initctl.c:912
-#: util/initctl.c:1017
+#: util/initctl.c:522 util/initctl.c:657 util/initctl.c:785 util/initctl.c:920
+#: util/initctl.c:1025
 #, c-format
 msgid "%s: missing job name\n"
 msgstr ""
 
-#: util/initctl.c:963
+#: util/initctl.c:971
 msgid "Not running"
 msgstr ""
 
-#: util/initctl.c:1319
+#: util/initctl.c:1327
 #, c-format
 msgid "%s: missing event name\n"
 msgstr ""
 
-#: util/initctl.c:1517
+#: util/initctl.c:1525
 msgid "Invalid job class"
 msgstr ""
 
-#: util/initctl.c:2218
+#: util/initctl.c:2122
+msgid "unknown event"
+msgstr ""
+
+#: util/initctl.c:2126
+msgid "unknown job"
+msgstr ""
+
+#: util/initctl.c:2227
 msgid "use D-Bus session bus to connect to init daemon (for testing)"
 msgstr ""
 
-#: util/initctl.c:2220
+#: util/initctl.c:2229
 msgid "use D-Bus system bus to connect to init daemon"
 msgstr ""
 
-#: util/initctl.c:2222
+#: util/initctl.c:2231
 msgid "destination well-known name on D-Bus bus"
 msgstr ""
 
-#: util/initctl.c:2235
+#: util/initctl.c:2244
 msgid "do not wait for job to start before exiting"
 msgstr ""
 
-#: util/initctl.c:2247
+#: util/initctl.c:2256
 msgid "do not wait for job to stop before exiting"
 msgstr ""
 
-#: util/initctl.c:2259
+#: util/initctl.c:2268
 msgid "do not wait for job to restart before exiting"
 msgstr ""
 
-#: util/initctl.c:2298
+#: util/initctl.c:2307
 msgid "do not wait for event to finish before exiting"
 msgstr ""
 
-#: util/initctl.c:2339
+#: util/initctl.c:2348
 msgid ""
 "enumerate list of events and jobs causing job created from job config to "
 "start/stop"
 msgstr ""
 
-#: util/initctl.c:2352
+#: util/initctl.c:2361
 msgid "ignore specified list of events (comma-separated)"
 msgstr ""
 
-#: util/initctl.c:2361
+#: util/initctl.c:2363
+msgid "Generate warning for any unreachable events/jobs"
+msgstr ""
+
+#: util/initctl.c:2372
 msgid "Job"
 msgstr ""
 
-#: util/initctl.c:2368
+#: util/initctl.c:2379
 msgid "Event"
 msgstr ""
 
-#: util/initctl.c:2376 util/initctl.c:2388 util/initctl.c:2399
-#: util/initctl.c:2410 util/initctl.c:2417
+#: util/initctl.c:2387 util/initctl.c:2399 util/initctl.c:2410
+#: util/initctl.c:2421 util/initctl.c:2428
 msgid "JOB [KEY=VALUE]..."
 msgstr ""
 
-#: util/initctl.c:2377
+#: util/initctl.c:2388
 msgid "Start job."
 msgstr ""
 
-#: util/initctl.c:2378
+#: util/initctl.c:2389
 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"
@@ -538,11 +554,11 @@
 "an existing instance is already running."
 msgstr ""
 
-#: util/initctl.c:2389
+#: util/initctl.c:2400
 msgid "Stop job."
 msgstr ""
 
-#: util/initctl.c:2390
+#: util/initctl.c:2401
 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 "
@@ -552,11 +568,11 @@
 "decide which of multiple instances will be stopped."
 msgstr ""
 
-#: util/initctl.c:2400
+#: util/initctl.c:2411
 msgid "Restart job."
 msgstr ""
 
-#: util/initctl.c:2401
+#: util/initctl.c:2412
 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 "
@@ -566,66 +582,66 @@
 "decide which of multiple instances will be restarted."
 msgstr ""
 
-#: util/initctl.c:2411
+#: util/initctl.c:2422
 msgid "Send HUP signal to job."
 msgstr ""
 
-#: util/initctl.c:2412
+#: util/initctl.c:2423
 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:2418
+#: util/initctl.c:2429
 msgid "Query status of job."
 msgstr ""
 
-#: util/initctl.c:2419
+#: util/initctl.c:2430
 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:2425
+#: util/initctl.c:2436
 msgid "List known jobs."
 msgstr ""
 
-#: util/initctl.c:2426
+#: util/initctl.c:2437
 msgid "The known jobs and their current status will be output."
 msgstr ""
 
-#: util/initctl.c:2429
+#: util/initctl.c:2440
 msgid "EVENT [KEY=VALUE]..."
 msgstr ""
 
-#: util/initctl.c:2430
+#: util/initctl.c:2441
 msgid "Emit an event."
 msgstr ""
 
-#: util/initctl.c:2431
+#: util/initctl.c:2442
 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:2437
+#: util/initctl.c:2448
 msgid "Reload the configuration of the init daemon."
 msgstr ""
 
-#: util/initctl.c:2441
+#: util/initctl.c:2452
 msgid "Request the version of the init daemon."
 msgstr ""
 
-#: util/initctl.c:2444
+#: util/initctl.c:2455
 msgid "[PRIORITY]"
 msgstr ""
 
-#: util/initctl.c:2445
+#: util/initctl.c:2456
 msgid "Change the minimum priority of log messages from the init daemon"
 msgstr ""
 
-#: util/initctl.c:2447
+#: util/initctl.c:2458
 msgid ""
 "PRIORITY may be one of:\n"
 "  `debug' (messages useful for debugging upstart are logged, equivalent to --"
@@ -642,25 +658,25 @@
 "Without arguments, this outputs the current log priority."
 msgstr ""
 
-#: util/initctl.c:2464 util/initctl.c:2470
+#: util/initctl.c:2475 util/initctl.c:2481
 msgid "[CONF]"
 msgstr ""
 
-#: util/initctl.c:2465
+#: util/initctl.c:2476
 msgid "Show emits, start on and stop on details for job configurations."
 msgstr ""
 
-#: util/initctl.c:2466
+#: util/initctl.c:2477
 msgid ""
 "If CONF specified, show configuration details for single job configuration, "
 "else show details for all jobs configurations.\n"
 msgstr ""
 
-#: util/initctl.c:2471
+#: util/initctl.c:2482
 msgid "Check for unreachable jobs/event conditions."
 msgstr ""
 
-#: util/initctl.c:2472
+#: util/initctl.c:2483
 msgid ""
 "List all jobs and events which cannot be satisfied by currently available "
 "job configuration files"
 
=== modified file 'scripts/init-checkconf.sh'
--- scripts/init-checkconf.sh	2011-03-10 14:06:37 +0000
+++ scripts/init-checkconf.sh	2011-04-19 09:27:29 +0000
@@ -1,7 +1,11 @@
 #!/bin/bash
 #---------------------------------------------------------------------
-# Script to determine if specified config file is valid or not
-# (whether upstart can parse it successfully).
+# Script to determine if specified config file is valid or not.
+# By default, two checks are performed:
+#
+#   - Ensure Upstart can parse overall file successfully
+#   - Ensure all script sections are parseable by shell
+#
 #---------------------------------------------------------------------
 #
 # Copyright (C) 2011 Canonical Ltd.
@@ -29,6 +33,7 @@
 debug_enabled=n
 file_valid=n
 running=n
+check_scripts=y
 
 cleanup()
 {
@@ -55,6 +60,7 @@
  --file=<file>           (no default).
  -i <path>,            : Specify path to initctl binary
  --initctl-path=<path>   (default=$initctl_path).
+ -s, --noscript        : Do not check script sections.
  -x <path>             : Specify path to init daemon binary
  --upstart-path=<path>   (default=$upstart_path).
  -h, --help            : Show this help.
@@ -85,8 +91,8 @@
 args=$(getopt \
   -n "$script_name" \
   -a \
-  --options="df:hi:x:" \
-  --longoptions="debug file: help initctl-path: upstart-path:" \
+  --options="df:hi:sx:" \
+  --longoptions="debug file: help initctl-path: noscript upstart-path:" \
   -- "$@")
 
 eval set -- "$args"
@@ -115,6 +121,10 @@
         shift
         ;;
 
+      -s|--noscript)
+        check_scripts=n
+        ;;
+
       -x|--upstart-path)
         upstart_path="$2"
         shift
@@ -165,7 +175,7 @@
 debug "upstart_out=$upstart_out"
 
 upstart_cmd=$(printf \
-   "%s --session --no-startup-event --verbose --confdir %s" \
+   "%s --session --no-sessions --no-startup-event --verbose --confdir %s" \
   "$upstart_path" \
   "$confdir")
 debug "upstart_cmd=$upstart_cmd"
@@ -177,7 +187,7 @@
 # We handle this ourselves in cleanup().
 disown 
 
-# wait for upstart to initialize
+# wait for Upstart to initialize
 for i in $(seq 1 5)
 do
   debug "Waiting for Upstart to reply over D-Bus (attempt $i)"
@@ -193,9 +203,23 @@
   sleep 1
 done
 
-[ $running = n ] && die "failed to start upstart"
-
-debug "upstart ($upstart_cmd) running with PID $upstart_pid"
+[ $running = n ] && die "failed to ask Upstart to check conf file"
+
+debug "Secondary Upstart ($upstart_cmd) running with PID $upstart_pid"
+
+if [ "$check_scripts" = y ]
+then
+  for section in pre-start post-start script pre-stop post-stop
+  do
+    if egrep -q "\<${section}\>" "$file"
+    then
+      cmd='sed -n "/^ *${section}/,/^ *end script/p" $file | /bin/sh -n 2>&1'
+      errors=$(eval "$cmd")
+      [ $? -ne 0 ] && \
+        die "$(printf "File $file: shell syntax invalid in $section section:\n${errors}")"
+    fi
+  done
+fi
 
 if "$initctl_path" --session status "$job" >/dev/null 2>&1
 then
@@ -205,4 +229,4 @@
 fi
 
 errors=$(grep "$job" "$upstart_out"|sed "s,${confdir}/,,g")
-error "File $file: syntax invalid ($errors)"
+die "$(printf "File $file: syntax invalid:\n${errors}")"
 
=== modified file 'scripts/man/init-checkconf.8'
--- scripts/man/init-checkconf.8	2011-03-07 15:02:20 +0000
+++ scripts/man/init-checkconf.8	2011-04-19 09:27:29 +0000
@@ -1,39 +1,49 @@
-.TH init-checkconf 8 2011-03-07 "Upstart"
+.TH init\-checkconf 8 2011-04-06 "Upstart"
 .\"
 .SH NAME
-init-checkconf \- manual page for init-checkconf
+init\-checkconf \- manual page for init-checkconf
 .\"
 .SH SYNOPSIS
-.B init-checkconf
+.B init\-checkconf
 .RI [ OPTIONS ] " file "
 
-.B init-checkconf
-.RI [ OPTIONS ] " " "-f" " file "
+.B init\-checkconf
+.RI [ OPTIONS ] " " "\-f" " file "
 .\"
 .SH DESCRIPTION
 Determine if specified Upstart
 .BR init (8)
 job configuration file is valid.
+.P
+By default, two checks are performed:
+.IP \(bu 4
+Ensure Upstart can parse overall file successfully
+.IP \(bu 4
+Ensure all script sections are parseable by shell
+.P
 .\"
 .SH OPTIONS
 .TP
-.B -d
+.BR \-d " , " \-\-debug
 Show some debug output.
 .TP
-.B -f \fIfile\fP
+.BR \-f " \fIfile\fP" " , " \-\-file=\fIfile\fP
 Specify job configuration file to check.
 .TP
-.B -i \fIpath\fP
+.BR \-i " \fIpath\fP" " , " \-\-initctl\-path=\fIpath\fP
 Specify path to
 .BR initctl (8)
 binary.
 .TP
-.B -x \fIpath\fP
+.BR \-s " , " \-\-noscript
+Do not check script sections.
+.TP
+.BR \-x " \fIpath\fP" " , " \-\-upstart\-path=\fIpath\fP
 Specify path to
 .BR init (8)
 binary.
 .TP
-.B -h
+.BR \-h " , " \-\-help
 Display usage statement.
 .\"
 .SH AUTHOR
@@ -51,4 +61,6 @@
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .\"
 .SH SEE ALSO
+.BR sh (1)
+.BR init (5)
 .BR init (8)
 
=== modified file 'util/initctl.c'
--- util/initctl.c	2011-03-15 12:15:28 +0000
+++ util/initctl.c	2011-04-19 09:27:29 +0000
@@ -194,6 +194,14 @@
 int check_config_mode = FALSE;
 
 /**
+ * check_config_warn:
+ *
+ * If TRUE, check-config will generate a warning for *any* unreachable
+ * events/jobs.
+ **/
+int check_config_warn = FALSE;
+
+/**
  * check_config_data:
  *
  * Used to record details of all known jobs and events.
@@ -1959,7 +1967,7 @@
 		 * this node based on children
 		 * and type of operator.
 		 */
-		if (IS_OP_AND (expr))
+		if (IS_OP_AND (expr) || check_config_warn)
 			node->value = first->value && second->value;
 		else
 			node->value = first->value || second->value;
@@ -2110,12 +2118,13 @@
 		const char *job   = expr->job_in_error;
 
 		if (event)
-			nih_message ("  %s: unknown event %s", condition, event);
+			nih_message ("  %s: %s %s", condition,
+				_("unknown event"), event);
 
 		if (job)
-			nih_message ("  %s: unknown job %s", condition, job);
+			nih_message ("  %s: %s %s", condition,
+				_("unknown job"), job);
 	}
-
 }
 
 
@@ -2349,8 +2358,10 @@
  * Command-line options accepted for the check-config command.
  **/
 NihOption check_config_options[] = {
-	{ 0, "ignore-events", N_("ignore specified list of events (comma-separated)"),
+	{ 'i', "ignore-events", N_("ignore specified list of events (comma-separated)"),
 	  NULL, "EVENT_LIST", NULL, ignored_events_setter },
+	{ 'w', "warn", N_("Generate warning for any unreachable events/jobs"),
+	  NULL, NULL, &check_config_warn, NULL },
 	NIH_OPTION_LAST
 };
 /**
 
=== modified file 'util/man/initctl.8'
--- util/man/initctl.8	2011-03-10 14:06:37 +0000
+++ util/man/initctl.8	2011-04-19 09:27:29 +0000
@@ -494,7 +494,7 @@
 
 .B OPTIONS
 .RS
-.IP "\fB\-\-ignore\-events\fP \fI[EVENTS]\fP"
+.IP "\fB-i\fP \fI[EVENTS]\fP, \fB\-\-ignore\-events\fP \fI[EVENTS]\fP"
 
 If specified, the argument should be a list of comma\-separated events to
 ignore when checking the job configuration files.
@@ -504,6 +504,8 @@
 
 Note that internal events (such as \fBstartup\fP(7) and
 \fBstarting\fP(7)) are automatically ignored.
+.IP "\fB-w\fP, \fB\-\-warn\fP"
+If specified, treat \fIany\fP unknown jobs and events as errors.
 
 .\"
 .SH AUTHOR
 
=== modified file 'util/tests/test_initctl.c'
--- util/tests/test_initctl.c	2011-03-15 11:32:15 +0000
+++ util/tests/test_initctl.c	2011-04-19 09:27:29 +0000
@@ -49,6 +49,7 @@
 /* remember we run from the 'util' directory */
 #define UPSTART_BINARY "../init/init"
 #define INITCTL_BINARY "./initctl --session"
+
 #define BUFFER_SIZE 1024
 
 /**
@@ -74,7 +75,9 @@
 	                                                             \
 	if (pid == 0)                                                \
 		execlp (UPSTART_BINARY, UPSTART_BINARY,              \
-				"--session", "--no-startup-event",   \
+				"--session",                         \
+				"--no-startup-event",                \
+				"--no-sessions",                     \
 				NULL);                               \
 	                                                             \
 	while (attempts) {                                           \
@@ -138,11 +141,11 @@
  * @len: size_t pointer which will be set to length of @result.
  *
  * Run a command and return its standard output. It is the callers
- * responsibility to free @result.
+ * responsibility to free @result. Errors from running @cmd are fatal.
  **/
 #define RUN_COMMAND(parent, cmd, result, len)                        \
 {                                                                    \
-	FILE    *initctl;                                            \
+	FILE    *f;                                                  \
 	char     buffer[BUFFER_SIZE];                                \
 	char   **ret;                                                \
 	                                                             \
@@ -152,20 +155,20 @@
 	TEST_NE_P (*result, NULL);                                   \
 	*(len) = 0;                                                  \
 	                                                             \
-	initctl = popen (cmd, "r");                                  \
-	TEST_NE_P (initctl, NULL);                                   \
+	f = popen (cmd, "r");                                        \
+	TEST_NE_P (f, NULL);                                         \
 	                                                             \
-	while (fgets (buffer, BUFFER_SIZE, initctl)) {               \
-		size_t l = strlen(buffer)-1;                         \
+	while (fgets (buffer, BUFFER_SIZE, f)) {                     \
+		size_t l = strlen (buffer)-1;                        \
 	                                                             \
 		if ( buffer[l] == '\n')                              \
 			buffer[l] = '\0';                            \
 		ret = nih_str_array_add (result, parent, len,        \
-				buffer);                             \
+			buffer);                                     \
 		TEST_NE_P (ret, NULL);                               \
 	}                                                            \
-                                                                     \
-	TEST_NE (pclose(initctl), -1);                               \
+	                                                             \
+	TEST_NE ( pclose (f), -1);                                   \
 }
 
 /**
@@ -10946,7 +10949,6 @@
 			"author \"foo\"\n"
 			"description \"wibble\"");
 
-
 	cmd = nih_sprintf (NULL, "%s show-config foo 2>&1", INITCTL_BINARY);
 	TEST_NE_P (cmd, NULL);
 	RUN_COMMAND (NULL, cmd, &output, &lines);
@@ -11790,6 +11792,47 @@
 
 	/*******************************************************************/
 
+	TEST_FEATURE (
+		"satisfiable complex start on, satisfiable complex stop on with warnings");
+
+	CREATE_FILE (dirname, "plymouth.conf",
+			"start on (starting mountall\n"
+			"      or (hello\n"
+              		"          and (stopped gdm\n"
+                   	"              or (stopped kdm\n"
+			"              or (stopped xdm\n"
+                   	"              or stopped lxdm)))))\n"
+                   	"stop on (stopping portmap\n"
+			"         or (wibble or starting beano))\n");
+
+	CREATE_FILE (dirname, "mountall.conf", "exec true\n");
+	CREATE_FILE (dirname, "portmap.conf",
+			"exec true\n"
+			"emits hello");
+	CREATE_FILE (dirname, "lxdm.conf", "exec true");
+	CREATE_FILE (dirname, "wibble.conf", "emits wibble");
+	CREATE_FILE (dirname, "beano.conf", "exec true");
+
+	cmd = nih_sprintf (NULL, "%s check-config --warn 2>&1",
+			INITCTL_BINARY);
+	TEST_NE_P (cmd, NULL);
+	RUN_COMMAND (NULL, cmd, &output, &lines);
+
+	TEST_EQ_STR (output[0], "plymouth");
+	TEST_EQ_STR (output[1], "  start on: unknown job xdm");
+	TEST_EQ_STR (output[2], "  start on: unknown job kdm");
+	TEST_EQ_STR (output[3], "  start on: unknown job gdm");
+	TEST_EQ (lines, 4);
+
+	DELETE_FILE (dirname, "plymouth.conf");
+	DELETE_FILE (dirname, "mountall.conf");
+	DELETE_FILE (dirname, "portmap.conf");
+	DELETE_FILE (dirname, "lxdm.conf");
+	DELETE_FILE (dirname, "beano.conf");
+	DELETE_FILE (dirname, "wibble.conf");
+
+	/*******************************************************************/
+
 	STOP_UPSTART (upstart_pid);
 	TEST_EQ (unsetenv ("UPSTART_CONFDIR"), 0);
 }