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

[James Hunt]

Addition of session support, for user sessions and chroot sessions.

Code is lp:~canonical-scott/upstart/session-support plus associated fixes:

  Add session support. Note that there are no automatically runnable and
  explicit tests yet. However, see TESTING.sessions.

  * TESTING.sessions: ASCII (reStructuredText) document explaining
    how to run manual tests for session support (for chroots).
  * dbus/Upstart.conf: Simplified to support allowing users to invoke
    all methods (since Upstart now isolates commands by user).
  * init/Makefile.am: Added session.[ch] files.
  * init/session.c: New file. Note that session_from_dbus() will disable sessions
    (by returning the NULL session) if environment variable "UPSTART_NO_SESSIONS"
    is set to any value (used by tests).
  * init/session.h: New file.
  * init/parse_job.h: parse_job(): Add session pointer to prototype.
  * init/parse_job.c:
    - parse_job(): Add session parameter.
    - Update calls to job_class_new() to pass session pointer.
  * init/job.c: job_new(): Crucial change to ensure chroot sessions have
    a unique D-Bus name (LP:#728531).
  * init/job_class.c:
    - job_class_new(): Add session parameter and session support.
    - job_class_remove(): Add session parameter to prototype.
    - job_class_consider(): Only consider jobs from the appropriate session.
    - job_class_reconsider(): Only consider jobs from the appropriate session.
    - job_class_start(): Disallow out-of-session modification.
    - job_class_stop(): Disallow out-of-session modification.
    - job_class_restart(): Disallow out-of-session modification.
  * init/main.c: Add "--no-sessions" command-line option to disable
    sessions and revert to traditional behaviour.
  * init/job_class.h:
    - job_class_new(): Add session pointer to prototype.
    - JobClass: Add session member.
  * init/job_process.c: job_process_spawn():
    - Call chroot(2) for chroot sessions.
    - Call setuid(2) for user session jobs.
  * init/job.c:
    - job_emit_event(): Set session for event.
    - job_start(): Disallow out-of-session modification.
    - job_stop(): Disallow out-of-session modification.
    - job_restart(): Disallow out-of-session modification.
  * init/event.h: Event: Add session member.
  * init/event.c:
    - event_new(): initialize session to NULL.
    - event_pending_handle_jobs(): Add session handling.
    - event_finished(): Set session for failure event.
  * init/control.c:
    - control_get_job_by_name(): Add session handling.
    - control_get_all_jobs(): Add session handling.
    - control_emit_event(): Add session handling.
  * init/conf.c:
    - conf_source_new(): Initialise session to NULL.
    - conf_reload_path(): Pass session to parse_job().
    - conf_select_job(): Add session parameter.
  * init/conf.h:
    - ConfSource: Add session member.
    - conf_select_job(): Add session parameter to prototype.
  * All tests updated to set "UPSTART_NO_SESSIONS".

[lp:~jamesodhunt/upstart/upstream-session-support]

1259. By James Hunt on 2011-06-06

* TESTING.sessions: Added missing awk param.

1260. By James Hunt on 2011-06-06

* TESTING.sessions:
  - Added missing "set -x" call to force log output.
  - Formatting.
  - Added remaining expected outcomes.

1261. By James Hunt on 2011-06-06

* init/man/init.5: Update for User Jobs.
* init/man/init.8: Mention $HOME/.init/ for User Jobs.

Unmerged revisions

=== modified file 'ChangeLog'
--- ChangeLog	2011-05-12 20:42:28 +0000
+++ ChangeLog	2011-06-06 15:17:24 +0000
@@ -1,3 +1,222 @@
[phone]  James Hunt  <[e-mail]>
+
+	Add session support. Note that there are no automatically runnable and
+	explicit tests yet. However, see TESTING.sessions.
+	
+	* TESTING.sessions: ASCII (reStructuredText) document explaining
+	  how to run manual tests for session support (for chroots).
+	* dbus/Upstart.conf: Simplified to support allowing users to invoke
+	  all methods (since Upstart now isolates commands by user).
+	* init/Makefile.am: Added session.[ch] files.
+	* init/session.c: New file. Note that session_from_dbus() will disable sessions
+	  (by returning the NULL session) if environment variable "UPSTART_NO_SESSIONS"
+	  is set to any value (used by tests).
+	* init/session.h: New file.
+	* init/parse_job.h: parse_job(): Add session pointer to prototype.
+	* init/parse_job.c:
+	  - parse_job(): Add session parameter.
+	  - Update calls to job_class_new() to pass session pointer.
+	* init/job.c: job_new(): Crucial change to ensure chroot sessions have
+	  a unique D-Bus name (LP:#728531).
+	* init/job_class.c: 
+	  - job_class_new(): Add session parameter and session support.
+	  - job_class_remove(): Add session parameter to prototype.
+	  - job_class_consider(): Only consider jobs from the appropriate session.
+	  - job_class_reconsider(): Only consider jobs from the appropriate session.
+	  - job_class_start(): Disallow out-of-session modification.
+	  - job_class_stop(): Disallow out-of-session modification.
+	  - job_class_restart(): Disallow out-of-session modification.
+	* init/main.c: Add "--no-sessions" command-line option to disable
+	  sessions and revert to traditional behaviour.
+	* init/job_class.h: 
+	  - job_class_new(): Add session pointer to prototype.
+	  - JobClass: Add session member.
+	* init/job_process.c: job_process_spawn():
+	  - Call chroot(2) for chroot sessions.
+	  - Call setuid(2) for user session jobs.
+	* init/job.c:
+	  - job_emit_event(): Set session for event.
+	  - job_start(): Disallow out-of-session modification.
+	  - job_stop(): Disallow out-of-session modification.
+	  - job_restart(): Disallow out-of-session modification.
+	* init/event.h: Event: Add session member.
+	* init/event.c:
+	  - event_new(): initialize session to NULL.
+	  - event_pending_handle_jobs(): Add session handling.
+	  - event_finished(): Set session for failure event.
+	* init/control.c:
+	  - control_get_job_by_name(): Add session handling.
+	  - control_get_all_jobs(): Add session handling.
+	  - control_emit_event(): Add session handling.
+	* init/conf.c:
+	  - conf_source_new(): Initialise session to NULL.
+	  - conf_reload_path(): Pass session to parse_job().
+	  - conf_select_job(): Add session parameter.
+	* init/conf.h:
+	  - ConfSource: Add session member.
+	  - conf_select_job(): Add session parameter to prototype.
+	* All tests updated to set "UPSTART_NO_SESSIONS" (to disable
+	  sessions).
+
[phone]  James Hunt  <[e-mail]>
+
+	* contrib/bash_completion/upstart:
+	  - Made function names more meaningful:
+	  - _upstart_jobs: Now returns a unique list
+	  - _upstart_events (nee _upstart_named_events ) now considers all
+	    "emits" tokens.
+	  - Updates for "check-config" and "show-config".
+	  - Added "--session" option.
+	  - Added "--no-wait" for emit, reload and restart.
+
+	Man page updates.
+	
+	* init/man/init.5:
+	  - Quoted dashes.
+	  - Explain handling of duplicated stanzas.
+	  - "respawn": Document default count and interval.
+	  - "emits": Reference "initctl check-config".
+	  - Added BUGS section.
+	  - Added copyright.
+	* init/man/init.8:
+	  - Quoted dashes.
+	  - See Also: Added control-alt-delete(7).
+	* util/man/initctl.8:
+	  - Quoted dashes.
+	  - "restart": Clarified meaning.
+	  - "list": Explained "stop/waiting" jobs.
+
[phone]  James Hunt  <[e-mail]>
+
+	Add D-Bus session support to initctl.
+	
+	* util/initctl.c:
+	  - Added "--session" command-line option.
+	  - dbus_bus_type_setter(): New function used by option parser to
+	    distinguish system/session D-Bus bus type.
+	  - system_bus variable now replaced by two others: use_dbus (boolean)
+	    and dbus_bus_type.
+	  - upstart_open(): Updated to handle multiple D-Bus bus types.
+	* util/man/initctl.8: Update for "--session" option.
+	* util/tests/test_initctl.c: Updated to make use of use_dbus and
+	  dbus_bus_type rather than system_bus.
+
+	Add "show-config" command to initctl.
+	
+	* util/initctl.c:
+	  - New functions:
+	    - job_class_condition_handler(): Handler function to retrieve job conditions.
+	    - job_class_condition_err_handler(): Handler error function for
+	      job_class_condition_handler().
+	    - job_class_parse_events(): Convert RPN "start on" and "stop on" conditions to
+	      human-readable format.
+	    - job_class_show_emits(): Display events which job emits.
+	    - job_class_show_conditions(): Make D-Bus calls to retrieve "start on" and
+	      "stop on" conditions.
+	    - show_config_action: Handle "show-config" command..
+	* util/initctl.h: New file providing stack-handling functionality for
+	  RPN parsing for "show-config" command.
+	* util/Makefile.am: Added initctl.h to initctl_SOURCES.
+	* util/man/initctl.8: Updated for "show-config" command and associated
+	  options.
+	* util/tests/test_initctl.c:
+	  - New macros START_UPSTART, STOP_UPSTART, RUN_COMMAND, CREATE_FILE and DELETE_FILE.
+	    These are required since due to the introduction of the
+	    "show-config" initctl command, initctl is no longer solely a proxy
+	    to Upstart: it now has some intelligence (it parses the 
+	    "emits", "start on" and "stop on" conditions) and thus must be
+	    tested directly.
+	  - test_show_config(): New function to test "initctl show-config".
+	  - in_chroot(): New function to detect if tests are being run from
+	    within a chroot environment.
+	  - dbus_configured(): New function which performs a basic check to
+	    establish if D-Bus is configured correctly.
+	  - main(): Added call to test_show_config(), conditional on
+	    a non-chroot environment and a working D-Bus system.
+
+	Add "check-config" command to initctl.
+	
+	* util/initctl.c:
+	  - New functions:
+	    - allow_event(): Determine if specified event is erroneous or not.
+	      Handles globbing.
+	    - allow_job(): Determine if specified job is erroneous or not.
+	      Handles variables (such as instance variables).
+	    - check_condition(): High-level function to handle checking start
+	      on/stop on conditions.
+	    - check_config_action: Handler for "check-config" command.
+	    - display_check_errors(): Display errors from expression tree nodes
+	      that are in error.
+	    - eval_expr_tree(): Evaluate expression tree.
+	    - ignored_events_setter(): handler for '--ignore-events' command-line
+	      option for "check-config" command.
+	    - tree_filter(): Used for filtering expression tree nodes.
+	  - show_config_action(): Update for check-config mode.
+	  - job_class_parse_events(): Update for check-config mode.
+	  - job_class_show_emits(): Update for check-config mode.
+	* util/initctl.h:
+	  - Added structs for JobCondition, CheckConfigData and ExprNode.
+	  - New macros: MAKE_EXPR_NODE() and MAKE_JOB_CONDITION().
+	* util/tests/test_initctl.c:
+	  - test_check_config(): New function to test "initctl check-config".
+	  - main(): Added call to test_check_config(), conditional on
+	    a non-chroot environment and a working D-Bus system.
+	* util/man/initctl.8: Updated for "check-config" command and associated
+	  options.
+	* conf/rc-sysinit.conf: Added "emits" stanza, required by
+	"check-config".
+
+	Addition of initctl2dot script for visualisation.
+	
+	* Makefile.am: Added scripts directory.
+	* configure.ac: Updated AC_CONFIG_FILES for scripts/Makefile.
+	* scripts/Makefile.am: Makefile for scripts.
+	* scripts/initctl2dot.py: Python script to produce dot(1) graphs of
+	  "initctl show-config" output.
+	* scripts/man/initctl2dot.8: Man page for initctl2dot.py script.
+
+	Addition of init-checkconf script.
+	
+	* scripts/init-checkconf.sh: Script to determine if specified job
+	  config file is valid or not.
+	* scripts/man/init-checkconf.8: Man page for init-checkconf.sh.
+	* scripts/Makefile.am: Added init-checkconf script and man
+	  page.
+
[phone]  James Hunt  <[e-mail]>
+
+	Add command-line option to use D-Bus session bus (for testing).
+	
+	* init/control.c:
+	  - Added new boolean use_session_bus.
+	  - Updated comments.
+	  - control_handle_bus_type(): New function to allow selection of
+	    session bus via env var "UPSTART_USE_SESSION_BUS".
+	    Also logs use of session bus if use_session_bus set.
+	  - control_bus_open(): Now connects to either D-Bus system bus or session bus.
+	* init/control.h: New define for USE_SESSION_BUS_ENV.
+	* init/main.c: Addition of "--session" command-line option.
+	* init/man/init.8: Update for new "--session" command-line option.
+
+	* Corrected copyright notices.
+
+	Add option to allow alternate location for job config files.
+	
+	* init/main.c:
+	  - Added "--confdir <dir>" command-line option.
+	  - handle_confdir(): New function to select alternate confdir using env
+	    var "UPSTART_CONFDIR" or command-line option (for testing).
+	* init/paths.h: Added define for CONFDIR_ENV.
+	* init/man/init.8: Update for new "--confdir" command-line option.
+
+	Add ability to suppress initial event and/or change its name.
+	
+	* init/main.c: New command-line options: "--no-startup-event" and
+	  "--startup-event". If "--no-startup-event" specified, log message as a
+	  debug aid.
+	* init/man/init.8: Documentation for new command-line options:
+	  "--no-startup-event" and "--startup-event".
+
 2011-05-12  Marc - A. Dahlhaus  <[e-mail]>
 
 	* init/job_class.h (JobClass): Add kill signal member

=== modified file 'Makefile.am'
--- Makefile.am	2010-02-04 03:42:29 +0000
+++ Makefile.am	2011-06-06 15:17:24 +0000
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = intl dbus init util conf doc contrib po
+SUBDIRS = intl dbus init util conf doc contrib po scripts
 
 EXTRA_DIST = HACKING
 

=== added file 'TESTING.sessions'
--- TESTING.sessions	1970-01-01 00:00:00 +0000
+++ TESTING.sessions	2011-06-06 15:17:24 +0000
@@ -0,0 +1,264 @@
+.. contents::
+
+=============================
+Testing Sessions with Upstart
+=============================
+
+Upstart now has support for chroots which are implemented by creating a
+separate session for every user within each chroot. It also has partial
+support for user sessions, but since this is experimental (and disabled
+in Ubuntu), this document does not cover testing this feature.
+
+The session support does not yet provide full tests (as would be run by
+"``make check``"). This is partly due to the complexity of automatically
+testing some of the scenarios below.
+
+This document attempts to outline the minimum set of tests that should
+be performed to ensure that chroot support works as expected.
+
+Assumptions
+===========
+
+You are running an Ubuntu or Debian system.
+
+Setup
+=====
+
+#. Install a chroot environement (such as ``schroot(1)``) and configure it.
+#. run, "``debootstrap(8)``" to install the same release as you are running into your chroot.
+#. Create the following files *outside* your chroot.
+
+   - ``/etc/init/foo.conf``::
+     
+       start on wibble
+       
+       script
+         exec 2>>/tmp/foo.$$.log
+         set -x
+         echo "foo: stat=`stat /`" 
+         echo "foo: env=`env`"
+         sleep 999 
+       end script
+
+   - ``/etc/init/outside_chroot.conf``::
+
+       start on A
+          
+       script
+         exec 2>>/tmp/outside_chroot.$$.log
+         set -x
+         echo "in_chroot: stat=`stat /`" 
+         echo "in_chroot: env=`env`"
+         sleep 999 
+       end script
+
+#. Create following files inside chroot environment.
+
+   - ``/path/to/chroot/etc/init/foo.conf``::
+
+       start on wibble
+          
+       script
+         exec 2>>/tmp/foo.$$.log
+         set -x
+         echo "foo: stat=`stat /`" 
+         echo "foo: env=`env`" 
+         sleep 999
+       end script
+
+   - ``/path/to/chroot/etc/init/in_chroot.conf``::
+
+       start on A
+        
+       script
+         exec 2>>/tmp/in_chroot.$$.log
+         set -x
+         echo "in_chroot: stat=`stat /`" 
+         echo "in_chroot: env=`env`" 
+         sleep 999
+       end script
+
+   
+Run as non-``root`` with no chroot
+==================================
+
+- ``initctl list``
+
+  Ensure list is contents of ``/etc/init/``: the command below should
+  return no output::
+
+    cmp <(initctl list|awk '{print $1}'|sort -u) <(cd /etc/init && ls *.conf|cut -d: -f2-|sed 's/\.conf//g'|sort -u)
+
+- ``initctl status cron``
+
+  Should work.
+
+- ``initctl show-config``
+
+  Should work.
+
+- ``initctl check-config``
+
+  Should work.
+
+- ``start foo``
+
+  Should fail ("``initctl: Rejected send message``").
+
+- ``stop cron``
+
+  Should fail ("``initctl: Rejected send message``").
+
+- ``restart cron``
+
+  Should fail ("``initctl: Rejected send message``").
+
+- ``initctl emit bar``
+
+  Should fail ("``initctl: Rejected send message``").
+
+Run as ``root`` with no chroot
+==============================
+
+- ``initctl list``
+
+  Ensure list is contents of ``/etc/init/``: command below should return no output::
+
+    cmp <(initctl list|awk '{print $1}'|sort -u) <(cd /etc/init && ls *.conf|cut -d: -f2-|sed 's/\.conf//g'|sort -u)
+
+- ``initctl status outside_chroot``
+
+  Should work.
+
+- ``initctl status in_chroot``
+
+  Should fail with message::
+
+    initct: Unknown job: in_chroot
+
+- ``initctl show-config``
+
+  Should work.
+
+- ``initctl check-config``
+
+  Should work.
+
+- ``start in_chroot``
+
+  Should fail with message::
+
+    initct: Unknown job: in_chroot
+
+- ``start outside_chroot``
+
+  Should work.
+
+- ``stop in_chroot``
+
+  Should fail with message::
+
+    initct: Unknown job: in_chroot
+
+- ``restart outside_chroot``
+
+  Should work.
+
+- ``stop outside_chroot``
+
+  Should work.
+
+- ``initctl emit wibble``
+
+  - Ensure ``/etc/init/foo.conf`` runs by looking at the log and ensuring
+    the inode for the stat of '``/``' is the same as running "``stat /``" on
+    the command-line.
+
+  * Ensure ``/path/to/chroot/etc/init/foo.conf`` does *NOT* run.
+
+- ``initctl emit A``
+
+  - Ensure ``/etc/init/outside_chroot.conf`` runs.
+
+  - Ensure ``/path/to/chroot/etc/init/in_chroot.conf`` does *NOT* run.
+
+Run as ``root`` inside a chroot
+===============================
+
+- ``initctl list``
+
+  Ensure list is contents of ``/path/to/chroot/etc/init/``: command below should return no output::
+
+    cmp <(initctl list|awk '{print $1}'|sort -u) <(cd /etc/init && ls *.conf|cut -d: -f2-|sed 's/\.conf//g'|sort -u)
+
+- ``initctl status in_chroot``
+
+  Should work.
+
+- ``initctl status outside_chroot``
+
+  Should fail with message::
+
+    initct: Unknown job: outside_chroot
+
+- ``initctl show-config``
+
+  Should work.
+
+- ``initctl check-config``
+
+  Should work.
+
+- ``start outside_chroot``
+
+  Should fail with message::
+
+    initct: Unknown job: outside_chroot
+
+- ``stop outside_chroot``
+
+  Should fail with message::
+
+    initct: Unknown job: outside_chroot
+
+- ``start in_chroot``
+
+  Should work.
+
+- ``restart in_chroot``
+
+  Should work.
+
+- ``stop in_chroot``
+
+  Should work.
+
+- ``initctl emit wibble``
+
+  - Ensure ``/path/to/chroot/etc/init/foo.conf`` runs by looking at the log and ensuring
+    the inode for the stat of '``/``' is the same as running "``stat /``" on the command-line.
+
+  - Ensure ``/etc/init/foo.conf`` does *NOT* run.
+
+- ``initctl emit A``
+
+  - Ensure ``/path/to/chroot/etc/init/in_chroot.conf`` runs.
+
+  - Ensure ``/etc/init/outside_chroot.conf`` does *NOT* run.
+
+Run as non-root inside a chroot
+===============================
+
+Not supported.
+
+Run with ``--no-sessions``
+==========================
+
+The "``--no-sessions``" option makes Upstart behave as it used to prior to
+the introduction of session support.
+
+#. Reboot system and specify "``--no-sessions``" on kernel command-line.
+
+.. Ensure "``initctl list``" within a chroot displays the same list as
+   "``initctl list``" run outside of any chroot environment.
+

=== modified file 'conf/rc-sysinit.conf'
--- conf/rc-sysinit.conf	2010-02-04 03:59:06 +0000
+++ conf/rc-sysinit.conf	2011-06-06 15:17:24 +0000
@@ -13,6 +13,8 @@
 # or by faking an old /etc/inittab entry
 env DEFAULT_RUNLEVEL=2
 
+emits runlevel
+
 # There can be no previous runlevel here, but there might be old
 # information in /var/run/utmp that we pick up, and we don't want
 # that.

=== modified file 'configure.ac'
--- configure.ac	2011-03-22 17:53:17 +0000
+++ configure.ac	2011-06-06 15:17:24 +0000
@@ -2,7 +2,7 @@
 
 AC_PREREQ(2.61)
 AC_INIT([upstart], [1.3], [[e-mail]])
-NIH_COPYRIGHT([[Copyright © 2011 Scott James Remnant, Google Inc., Canonical Ltd.]])
+NIH_COPYRIGHT([[Copyright © 2011 Scott James Remnant, Canonical Ltd.]])
 AC_CONFIG_SRCDIR([init/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -64,6 +64,7 @@
 
 AC_CONFIG_FILES([ Makefile intl/Makefile
 		  dbus/Makefile init/Makefile util/Makefile conf/Makefile
-		  doc/Makefile contrib/Makefile po/Makefile.in ])
+		  doc/Makefile contrib/Makefile po/Makefile.in
+		  scripts/Makefile ])
 AC_CONFIG_HEADERS([config.h])
 AC_OUTPUT

=== modified file 'contrib/bash_completion/upstart'
--- contrib/bash_completion/upstart	2010-12-21 13:54:49 +0000
+++ contrib/bash_completion/upstart	2011-06-06 15:17:24 +0000
@@ -3,26 +3,28 @@
 #
 # We don't provide completion for 'init' itself for obvious reasons.
 have initctl &&
-_upstart_conf_events()
-{
-  initctl list|awk '{print $1}'
-} &&
-_upstart_named_events()
-{
-  (cd /etc/init && grep '^emits ' *.conf|sed 's/^emits //g')
-} &&
-_upstart_events()
-{
-  (_upstart_conf_events;_upstart_named_events)|tr ' ' '\n'|sort -u
-} &&
-_upstart_startable_events()
+_upstart_jobs()
+{
+  initctl list|awk '{print $1}'|sort -u
+} &&
+_upstart_startable_jobs()
 {
   initctl list|cut -d\, -f1|awk '$2 == "stop/waiting" {print $1}'
 } &&
-_upstart_stoppable_events()
+_upstart_stoppable_jobs()
 {
   initctl list|cut -d\, -f1|awk '$2 == "start/running" {print $1}'
 } &&
+_upstart_events()
+{
+  # note that we don't provide the internal events such as "starting"
+  # (and those from mountall) since the user should be using the
+  # associated command to emit such events.
+  (cd /etc/init && \
+   egrep '^[[:space:]]*emits ' *.conf |\
+   cut -d: -f2- | sed 's/^[[:space:]]*emits //g' |\
+   tr ' ' '\n' | awk '{print $NF}' | grep -v ^$|sort -u)
+} &&
 _upstart_initctl()
 {
   _get_comp_words_by_ref cur prev
@@ -32,34 +34,92 @@
   case "$prev" in
 
     start)
-      COMPREPLY=( $(compgen -W "-n --no-wait $(_upstart_startable_events)" -- ${cur}) )
+      COMPREPLY=( $(compgen -W "-n --no-wait $(_upstart_startable_jobs)" -- ${cur}) )
       return 0
     ;;
 
     stop)
-      COMPREPLY=( $(compgen -W "-n --no-wait $(_upstart_stoppable_events)" -- ${cur}) )
+      COMPREPLY=( $(compgen -W "-n --no-wait $(_upstart_stoppable_jobs)" -- ${cur}) )
       return 0
     ;;
 
     emit)
-      COMPREPLY=( $(compgen -W "$(_upstart_events)" -- ${cur}) )
-      return 0
-    ;;
-
-    reload|restart|status)
-      COMPREPLY=( $(compgen -W "$(_upstart_conf_events)" -- ${cur}) )
+      COMPREPLY=( $(compgen -W "-n --no-wait $(_upstart_events)" -- ${cur}) )
+      return 0
+    ;;
+
+    -i|--ignore-events)
+      # handle visualisation options after check-config command
+      for cmd in check-config
+      do
+        cwords=${COMP_WORDS[@]##}
+        filtered_cwords=${COMP_WORDS[@]##${cmd}}
+        if [ "$filtered_cwords" != "$cwords" ]
+        then
+          COMPREPLY=( $(compgen -W "$(_upstart_jobs)" -- ${cur}) )
+          return 0
+        fi
+      done
+    ;;
+
+    -e|--enumerate)
+      # handle visualisation options after show-config command
+      for cmd in show-config
+      do
+        cwords=${COMP_WORDS[@]##}
+        filtered_cwords=${COMP_WORDS[@]##${cmd}}
+        if [ "$filtered_cwords" != "$cwords" ]
+        then
+          COMPREPLY=( $(compgen -W "$(_upstart_jobs)" -- ${cur}) )
+          return 0
+        fi
+      done
+    ;;
+
+    reload|restart)
+      COMPREPLY=( $(compgen -W "-n --no-wait $(_upstart_stoppable_jobs)" -- ${cur}) )
+      return 0
+    ;;
+
+    status)
+      COMPREPLY=( $(compgen -W "$(_upstart_jobs)" -- ${cur}) )
+      return 0
+    ;;
+
+    check-config)
+      COMPREPLY=( $(compgen -W "-w --warn -i --ignore-events= $(_upstart_jobs)" -- ${cur}) )
+      return 0
+    ;;
+    show-config)
+      COMPREPLY=( $(compgen -W "-e --enumerate $(_upstart_jobs)" -- ${cur}) )
       return 0
     ;;
 
     -n|--no-wait)
-      # allow no wait after start/stop commands
-      for cmd in start stop
+      # allow 'no wait' for certain commands
+      for cmd in start stop restart emit
       do
         cwords=${COMP_WORDS[@]##}
         filtered_cwords=${COMP_WORDS[@]##${cmd}}
         if [ "$filtered_cwords" != "$cwords" ]
         then
-          COMPREPLY=( $(compgen -W "$(_upstart_${cmd}able_events)" -- ${cur}) )
+          case "$cmd" in
+            start)
+              COMPREPLY=( $(compgen -W "$(_upstart_startable_jobs)" -- ${cur}) )
+            ;;
+
+            stop)
+              COMPREPLY=( $(compgen -W "$(_upstart_stoppable_jobs)" -- ${cur}) )
+            ;;
+
+            restart)
+              COMPREPLY=( $(compgen -W "$(_upstart_stoppable_jobs)" -- ${cur}) )
+            ;;
+
+            emit)
+              COMPREPLY=( $(compgen -W "$(_upstart_events)" -- ${cur}) )
+            ;;
+          esac
           return 0
         fi
       done
@@ -71,7 +131,7 @@
     ;;
   esac
 
-  opts="--help --version -q --quiet -v --verbose --system --dest="
+  opts="--help --version -q --quiet -v --verbose --session --system --dest="
   cmds=$(initctl help|grep "^  [^ ]"|awk '{print $1}')
 
   COMPREPLY=( $(compgen -W "${opts} ${cmds}" -- ${cur}) )
@@ -84,7 +144,7 @@
   COMPREPLY=()
   _get_comp_words_by_ref cur prev
 
-  opts="--help --version -q --quiet -v --verbose --system --dest= \
+  opts="--help --version -q --quiet -v --verbose --session --system --dest= \
         -n --no-wait"
 
   case "$prev" in
@@ -94,7 +154,7 @@
     ;;
   esac
 
-  COMPREPLY=( $(compgen -W "$opts $(_upstart_startable_events)" -- ${cur}) )
+  COMPREPLY=( $(compgen -W "$opts $(_upstart_startable_jobs)" -- ${cur}) )
   return 0
 } && complete -F _upstart_start start
 
@@ -104,7 +164,7 @@
   COMPREPLY=()
   _get_comp_words_by_ref cur prev
 
-  opts="--help --version -q --quiet -v --verbose --system --dest= \
+  opts="--help --version -q --quiet -v --verbose --session --system --dest= \
         -n --no-wait"
 
   case "$prev" in
@@ -114,7 +174,7 @@
     ;;
   esac
 
-  COMPREPLY=( $(compgen -W "$opts $(_upstart_stoppable_events)" -- ${cur}) )
+  COMPREPLY=( $(compgen -W "$opts $(_upstart_stoppable_jobs)" -- ${cur}) )
   return 0
 } && complete -F _upstart_stop stop
 
@@ -124,7 +184,7 @@
   COMPREPLY=()
   _get_comp_words_by_ref cur prev
 
-  opts="--help --version -q --quiet -v --verbose --system --dest= \
+  opts="--help --version -q --quiet -v --verbose --session --system --dest= \
         -n --no-wait"
 
   case "$prev" in
@@ -134,7 +194,7 @@
     ;;
   esac
 
-  COMPREPLY=( $(compgen -W "$opts $(_upstart_events)" -- ${cur}) )
+  COMPREPLY=( $(compgen -W "$opts $(_upstart_stoppable_jobs)" -- ${cur}) )
   return 0
 
 } && complete -F _upstart_restart restart
@@ -145,7 +205,7 @@
   COMPREPLY=()
   _get_comp_words_by_ref cur prev
 
-  opts="--help --version -q --quiet -v --verbose --system --dest="
+  opts="--help --version -q -d --detail -e --enumerate --quiet -v --verbose --session --system --dest="
 
   case "$prev" in
     --help|--version)
@@ -154,7 +214,7 @@
     ;;
   esac
 
-  COMPREPLY=( $(compgen -W "$opts $(_upstart_events)" -- ${cur}) )
+  COMPREPLY=( $(compgen -W "$opts $(_upstart_jobs)" -- ${cur}) )
   return 0
 
 } && complete -F _upstart_status status
@@ -165,7 +225,7 @@
   COMPREPLY=()
   _get_comp_words_by_ref cur prev
 
-  opts="--help --version -q --quiet -v --verbose --system --dest="
+  opts="--help --version -q --quiet -v --verbose --session --system --dest="
 
   case "$prev" in
     --help|--version)
@@ -174,7 +234,7 @@
     ;;
   esac
 
-  COMPREPLY=( $(compgen -W "$opts $(_upstart_events)" -- ${cur}) )
+  COMPREPLY=( $(compgen -W "$opts $(_upstart_stoppable_jobs)" -- ${cur}) )
   return 0
 
 } && complete -F _upstart_reload reload

=== modified file 'dbus/Upstart.conf'
--- dbus/Upstart.conf	2009-07-02 17:46:41 +0000
+++ dbus/Upstart.conf	2011-06-06 15:17:24 +0000
@@ -9,12 +9,14 @@
     <allow own="com.ubuntu.Upstart" />
   </policy>
 
-  <!-- Permit the root user to invoke all of the methods on Upstart, its jobs
-       or their instances, and to get and set properties. -->
-  <policy user="root">
+  <!-- Allow any user to invoke all of the methods on Upstart, its jobs
+       or their instances, and to get and set properties - since Upstart
+       isolates commands by user. -->
+  <policy context="default">
+    <allow send_destination="com.ubuntu.Upstart"
+	   send_interface="org.freedesktop.DBus.Introspectable" />
     <allow send_destination="com.ubuntu.Upstart"
 	   send_interface="org.freedesktop.DBus.Properties" />
-
     <allow send_destination="com.ubuntu.Upstart"
 	   send_interface="com.ubuntu.Upstart0_6" />
     <allow send_destination="com.ubuntu.Upstart"
@@ -22,36 +24,4 @@
     <allow send_destination="com.ubuntu.Upstart"
 	   send_interface="com.ubuntu.Upstart0_6.Instance" />
   </policy>
-
-  <!-- Allow any user to introspect Upstart's interfaces, to obtain the
-       values of properties (but not set them) and to invoke selected
-       methods on Upstart and its jobs that are used to walk information. -->
-  <policy context="default">
-    <allow send_destination="com.ubuntu.Upstart"
-	   send_interface="org.freedesktop.DBus.Introspectable" />
-
-    <allow send_destination="com.ubuntu.Upstart"
-	   send_interface="org.freedesktop.DBus.Properties"
-	   send_type="method_call" send_member="Get" />
-    <allow send_destination="com.ubuntu.Upstart"
-	   send_interface="org.freedesktop.DBus.Properties"
-	   send_type="method_call" send_member="GetAll" />
-
-    <allow send_destination="com.ubuntu.Upstart"
-	   send_interface="com.ubuntu.Upstart0_6"
-	   send_type="method_call" send_member="GetJobByName" />
-    <allow send_destination="com.ubuntu.Upstart"
-	   send_interface="com.ubuntu.Upstart0_6"
-	   send_type="method_call" send_member="GetAllJobs" />
-
-    <allow send_destination="com.ubuntu.Upstart"
-	   send_interface="com.ubuntu.Upstart0_6.Job"
-	   send_type="method_call" send_member="GetInstance" />
-    <allow send_destination="com.ubuntu.Upstart"
-	   send_interface="com.ubuntu.Upstart0_6.Job"
-	   send_type="method_call" send_member="GetInstanceByName" />
-    <allow send_destination="com.ubuntu.Upstart"
-	   send_interface="com.ubuntu.Upstart0_6.Job"
-	   send_type="method_call" send_member="GetAllInstances" />
-  </policy>
 </busconfig>

=== modified file 'dbus/upstart.h'
--- dbus/upstart.h	2010-12-10 04:04:51 +0000
+++ dbus/upstart.h	2011-06-06 15:17:24 +0000
@@ -31,7 +31,7 @@
 #  define DBUS_SERVICE_UPSTART "com.ubuntu.TestUpstart"
 # else
 #  define DBUS_SERVICE_UPSTART "com.ubuntu.Upstart"
-#endif
+# endif
 #endif
 
 

=== modified file 'init/Makefile.am'
--- init/Makefile.am	2010-02-04 03:42:29 +0000
+++ init/Makefile.am	2011-06-06 15:17:24 +0000
@@ -40,6 +40,7 @@
 	system.c system.h \
 	environ.c environ.h \
 	process.c process.h \
+	session.c session.h \
 	job_class.c job_class.h \
 	job_process.c job_process.h \
 	job.c job.h \
@@ -158,6 +159,7 @@
 	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) \
@@ -169,6 +171,7 @@
 	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) \
@@ -180,6 +183,7 @@
 	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) \
@@ -191,6 +195,7 @@
 	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) \
@@ -202,6 +207,7 @@
 	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) \
@@ -213,6 +219,7 @@
 	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) \
@@ -224,6 +231,7 @@
 	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) \
@@ -235,6 +243,7 @@
 	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) \
@@ -246,6 +255,7 @@
 	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) \
@@ -257,6 +267,7 @@
 	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) \
@@ -268,6 +279,7 @@
 	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-03-15 18:44:09 +0000
+++ init/conf.c	2011-06-06 15:17:24 +0000
@@ -2,8 +2,7 @@
  *
  * conf.c - configuration management
  *
- * Copyright © 2011 Google Inc.
- * Copyright © 2009 Canonical Ltd.
+ * Copyright © 2009,2010,2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -147,6 +146,7 @@
 
 	source->type = type;
 	source->watch = NULL;
+	source->session = NULL;
 
 	source->flag = FALSE;
 	source->files = nih_hash_string_new (source, 0);
@@ -745,7 +745,8 @@
 		 * the job definition.
 		 */
 		nih_debug ("Loading %s from %s", name, path);
-		file->job = parse_job (NULL, name, buf, len, &pos, &lineno);
+		file->job = parse_job (NULL, source->session,
+				       name, buf, len, &pos, &lineno);
 		if (file->job) {
 			job_class_consider (file->job);
 		} else {
@@ -849,7 +850,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.
@@ -857,7 +859,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);
 
@@ -869,6 +871,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	2009-07-09 08:36:52 +0000
+++ init/conf.h	2011-06-06 15:17:24 +0000
@@ -1,6 +1,6 @@
 /* upstart
  *
- * Copyright © 2009 Canonical Ltd.
+ * Copyright © 2010,2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -26,6 +26,7 @@
 #include <nih/list.h>
 #include <nih/watch.h>
 
+#include "session.h"
 #include "job_class.h"
 
 
@@ -47,6 +48,7 @@
 /**
  * ConfSource:
  * @entry: list header,
+ * @session: attached session,
  * @path: path to source,
  * @type: type of source,
  * @watch: NihWatch structure for automatic change notification,
@@ -64,6 +66,7 @@
  **/
 typedef struct conf_source {
 	NihList             entry;
+	Session *           session;
 	char               *path;
 	ConfSourceType      type;
 
@@ -122,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);
 
 NIH_END_EXTERN
 

=== modified file 'init/control.c'
--- init/control.c	2009-07-11 11:47:12 +0000
+++ init/control.c	2011-06-06 15:17:24 +0000
@@ -2,7 +2,7 @@
  *
  * control.c - D-Bus connections, objects and methods
  *
- * Copyright © 2009 Canonical Ltd.
+ * Copyright © 2009-2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -46,6 +46,7 @@
 #include "dbus/upstart.h"
 
 #include "environ.h"
+#include "session.h"
 #include "job_class.h"
 #include "blocked.h"
 #include "conf.h"
@@ -54,12 +55,19 @@
 
 #include "com.ubuntu.Upstart.h"
 
-
 /* Prototypes for static functions */
 static int   control_server_connect (DBusServer *server, DBusConnection *conn);
 static void  control_disconnected   (DBusConnection *conn);
 static void  control_register_all   (DBusConnection *conn);
 
+/**
+ * use_session_bus:
+ *
+ * If TRUE, connect to the D-Bus sessio bus rather than the system bus.
+ *
+ * Used for testing.
+ **/
+int use_session_bus = FALSE;
 
 /**
  * control_server_address:
@@ -78,7 +86,7 @@
 /**
  * control_bus:
  *
- * Open connection to D-Bus system bus.  The connection may be opened with
+ * Open connection to a D-Bus bus.  The connection may be opened with
  * control_bus_open() and if lost will become NULL.
  **/
 DBusConnection *control_bus = NULL;
@@ -86,7 +94,7 @@
 /**
  * control_conns:
  *
- * Open control connections, including the connection to the D-Bus system
+ * Open control connections, including the connection to a D-Bus
  * bus and any private client connections.
  **/
 NihList *control_conns = NULL;
@@ -190,8 +198,9 @@
 /**
  * control_bus_open:
  *
- * Open a connection to the D-Bus system bus and store it in the control_bus
- * global.  The connection is handled automatically in the main loop.
+ * Open a connection to the appropriate D-Bus bus and store it in the
+ * control_bus global. The connection is handled automatically
+ * in the main loop.
  *
  * Returns: zero on success, negative value on raised error.
  **/
@@ -207,10 +216,13 @@
 
 	control_init ();
 
+	control_handle_bus_type ();
+
 	/* Connect to the D-Bus System Bus and hook everything up into
 	 * our own main loop automatically.
 	 */
-	conn = nih_dbus_bus (DBUS_BUS_SYSTEM, control_disconnected);
+	conn = nih_dbus_bus (use_session_bus ? DBUS_BUS_SESSION : DBUS_BUS_SYSTEM,
+			     control_disconnected);
 	if (! conn)
 		return -1;
 
@@ -382,7 +394,9 @@
 			 const char      *name,
 			 char           **job)
 {
-	JobClass *class;
+	Session  *session;
+	JobClass *class = NULL;
+	JobClass *global_class = NULL;
 
 	nih_assert (message != NULL);
 	nih_assert (name != NULL);
@@ -397,8 +411,30 @@
 		return -1;
 	}
 
-	/* Lookup the job and copy its path into the reply */
-	class = (JobClass *)nih_hash_lookup (job_classes, name);
+	/* Get the relevant session */
+	session = session_from_dbus (NULL, message);
+
+	/* Lookup the job */
+	class = (JobClass *)nih_hash_search (job_classes, name, NULL);
+
+	while (class && (class->session != session)) {
+
+		/* Found a match in the global session which may be used
+		 * later if no matching user session job exists.
+		 */
+		if ((! class->session) && (session && ! session->chroot))
+			global_class = class;
+
+		class = (JobClass *)nih_hash_search (job_classes, name,
+				&class->entry);
+	}
+
+	/* If no job with the given name exists in the appropriate
+	 * session, look in the global namespace (aka the NULL session).
+	 */ 
+	if (! class)
+		class = global_class;
+
 	if (! class) {
 		nih_dbus_error_raise_printf (
 			DBUS_INTERFACE_UPSTART ".Error.UnknownJob",
@@ -406,6 +442,7 @@
 		return -1;
 	}
 
+	/* Copy the path */
 	*job = nih_strdup (message, class->path);
 	if (! *job)
 		nih_return_system_error (-1);
@@ -432,6 +469,7 @@
 		      NihDBusMessage   *message,
 		      char           ***jobs)
 {
+	Session *session;
 	char   **list;
 	size_t   len;
 
@@ -445,9 +483,16 @@
 	if (! list)
 		nih_return_system_error (-1);
 
+	/* Get the relevant session */
+	session = session_from_dbus (NULL, message);
+
 	NIH_HASH_FOREACH (job_classes, iter) {
 		JobClass *class = (JobClass *)iter;
 
+		if ((class->session || (session && session->chroot))
+		    && (class->session != session))
+			continue;
+
 		if (! nih_str_array_add (&list, message, &len,
 					 class->path)) {
 			nih_error_raise_system ();
@@ -520,6 +565,9 @@
 	if (! event)
 		nih_return_system_error (-1);
 
+	/* Obtain the session */
+	event->session = session_from_dbus (NULL, message);
+
 	if (wait) {
 		blocked = blocked_new (event, BLOCKED_EMIT_METHOD, message);
 		if (! blocked) {
@@ -669,3 +717,18 @@
 
 	return 0;
 }
+
+/**
+ * control_handle_bus_type:
+ *
+ * Determine D-Bus bus type to connect to.
+ **/
+void
+control_handle_bus_type (void)
+{
+	if (getenv (USE_SESSION_BUS_ENV))
+		use_session_bus = TRUE;
+
+	if (use_session_bus)
+		nih_debug ("Using session bus");
+}

=== modified file 'init/control.h'
--- init/control.h	2009-07-09 08:36:52 +0000
+++ init/control.h	2011-06-06 15:17:24 +0000
@@ -1,6 +1,6 @@
 /* upstart
  *
- * Copyright © 2009 Canonical Ltd.
+ * Copyright © 2009-2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -27,6 +27,18 @@
 #include <nih-dbus/dbus_connection.h>
 #include <nih-dbus/dbus_message.h>
 
+/**
+ * USE_SESSION_BUS_ENV:
+ *
+ * If this environment variable is set to any value, connect to
+ * D-Bus session bus rather than the system bus.
+ *
+ * Used for testing.
+ **/
+#ifndef USE_SESSION_BUS_ENV
+#define USE_SESSION_BUS_ENV "UPSTART_USE_SESSION_BUS"
+#endif
+
 
 NIH_BEGIN_EXTERN
 
@@ -72,6 +84,8 @@
 				   const char *log_priority)
 	__attribute__ ((warn_unused_result));
 
+void control_handle_bus_type      (void);
+
 NIH_END_EXTERN
 
 #endif /* INIT_CONTROL_H */

=== modified file 'init/environ.c'
--- init/environ.c	2011-03-16 22:42:48 +0000
+++ init/environ.c	2011-06-06 15:17:24 +0000
@@ -2,7 +2,6 @@
  *
  * environ.c - environment table utilities
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2009 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *

=== modified file 'init/environ.h'
--- init/environ.h	2011-03-16 22:42:48 +0000
+++ init/environ.h	2011-06-06 15:17:24 +0000
@@ -1,6 +1,5 @@
 /* upstart
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2009 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *

=== modified file 'init/event.c'
--- init/event.c	2010-12-14 15:32:41 +0000
+++ init/event.c	2011-06-06 15:17:24 +0000
@@ -123,6 +123,8 @@
 
 	nih_list_init (&event->entry);
 
+	event->session = NULL;
+
 	event->progress = EVENT_PENDING;
 	event->failed = FALSE;
 
@@ -293,6 +295,13 @@
 	NIH_HASH_FOREACH_SAFE (job_classes, iter) {
 		JobClass *class = (JobClass *)iter;
 
+		/* Only affect jobs within the same session as the event
+		 * unless the event has no session, in which case do them
+		 * all.
+		 */
+		if (event->session && (class->session != event->session))
+			continue;
+
 		/* We stop first so that if an event is listed both as a
 		 * stop and start event, it causes an active running process
 		 * to be killed, the stop script then the start script to be
@@ -470,6 +479,7 @@
 			failed = NIH_MUST (nih_sprintf (NULL, "%s/failed",
 							event->name));
 			new_event = NIH_MUST (event_new (NULL, failed, NULL));
+			new_event->session = event->session;
 
 			if (event->env)
 				new_event->env = NIH_MUST (nih_str_array_copy (

=== modified file 'init/event.h'
--- init/event.h	2009-07-09 08:36:52 +0000
+++ init/event.h	2011-06-06 15:17:24 +0000
@@ -1,6 +1,6 @@
 /* upstart
  *
- * Copyright © 2009 Canonical Ltd.
+ * Copyright © 2010 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23,6 +23,8 @@
 #include <nih/macros.h>
 #include <nih/list.h>
 
+#include "session.h"
+
 
 /**
  * EventProgress:
@@ -40,6 +42,7 @@
 /**
  * Event:
  * @entry: list header,
+ * @session: session the event is attached to,
  * @name: string name of the event,
  * @env: NULL-terminated array of environment variables,
  * @progress: progress of event,
@@ -61,6 +64,7 @@
 typedef struct event {
 	NihList          entry;
 
+	Session *        session;
  	char            *name;
 	char           **env;
 

=== modified file 'init/job.c'
--- init/job.c	2010-12-14 15:32:41 +0000
+++ init/job.c	2011-06-06 15:17:24 +0000
@@ -2,7 +2,7 @@
  *
  * job.c - core state machine of tasks and services
  *
- * Copyright © 2010 Canonical Ltd.
+ * Copyright © 2010,2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -47,6 +47,7 @@
 #include "events.h"
 #include "environ.h"
 #include "process.h"
+#include "session.h"
 #include "job_class.h"
 #include "job.h"
 #include "job_process.h"
@@ -99,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;
 
@@ -906,6 +913,7 @@
 	}
 
 	event = NIH_MUST (event_new (NULL, name, env));
+	event->session = job->class->session;
 
 	if (block) {
 		Blocked *blocked;
@@ -1102,11 +1110,22 @@
 	   NihDBusMessage  *message,
 	   int              wait)
 {
+	Session *session;
 	Blocked *blocked = NULL;
 
 	nih_assert (job != NULL);
 	nih_assert (message != NULL);
 
+	/* Don't permit out-of-session modification */
+	session = session_from_dbus (NULL, message);
+	if (session != job->class->session) {
+		nih_dbus_error_raise_printf (
+			DBUS_INTERFACE_UPSTART ".Error.PermissionDenied",
+			_("You do not have permission to modify job: %s"),
+			job_name (job));
+		return -1;
+	}
+
 	if (job->goal == JOB_START) {
 		nih_dbus_error_raise_printf (
 			DBUS_INTERFACE_UPSTART ".Error.AlreadyStarted",
@@ -1166,11 +1185,22 @@
 	  NihDBusMessage *message,
 	  int             wait)
 {
+	Session *session;
 	Blocked *blocked = NULL;
 
 	nih_assert (job != NULL);
 	nih_assert (message != NULL);
 
+	/* Don't permit out-of-session modification */
+	session = session_from_dbus (NULL, message);
+	if (session != job->class->session) {
+		nih_dbus_error_raise_printf (
+			DBUS_INTERFACE_UPSTART ".Error.PermissionDenied",
+			_("You do not have permission to modify job: %s"),
+			job_name (job));
+		return -1;
+	}
+
 	if (job->goal == JOB_STOP) {
 		nih_dbus_error_raise_printf (
 			DBUS_INTERFACE_UPSTART ".Error.AlreadyStopped",
@@ -1231,11 +1261,22 @@
 	     NihDBusMessage *message,
 	     int             wait)
 {
+	Session *session;
 	Blocked *blocked = NULL;
 
 	nih_assert (job != NULL);
 	nih_assert (message != NULL);
 
+	/* Don't permit out-of-session modification */
+	session = session_from_dbus (NULL, message);
+	if (session != job->class->session) {
+		nih_dbus_error_raise_printf (
+			DBUS_INTERFACE_UPSTART ".Error.PermissionDenied",
+			_("You do not have permission to modify job: %s"),
+			job_name (job));
+		return -1;
+	}
+
 	if (job->goal == JOB_STOP) {
 		nih_dbus_error_raise_printf (
 			DBUS_INTERFACE_UPSTART ".Error.AlreadyStopped",

=== modified file 'init/job.h'
--- init/job.h	2009-07-03 16:38:02 +0000
+++ init/job.h	2011-06-06 15:17:24 +0000
@@ -1,6 +1,6 @@
 /* upstart
  *
- * Copyright © 2009 Canonical Ltd.
+ * Copyright © 2010 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify

=== modified file 'init/job_class.c'
--- init/job_class.c	2011-05-12 20:42:28 +0000
+++ init/job_class.c	2011-06-06 15:17:24 +0000
@@ -2,7 +2,7 @@
  *
  * job_class.c - job class definition handling
  *
- * Copyright © 2010 Canonical Ltd.
+ * Copyright © 2010,2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -45,6 +45,7 @@
 
 #include "environ.h"
 #include "process.h"
+#include "session.h"
 #include "job_class.h"
 #include "job.h"
 #include "event_operator.h"
@@ -100,7 +101,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);
 
 
 /**
@@ -128,13 +129,15 @@
 
 /**
  * job_class_new:
+ *
  * @parent: parent for new job class,
- * @name: name of new job class.
+ * @name: name of new job class,
+ * @session: session.
  *
- * Allocates and returns a new JobClass structure with the @name given.
- * It will not be automatically added to the job classes table, it is up
- * to the caller to ensure this is done using job_class_register() once
- * the class has been set up.
+ * Allocates and returns a new JobClass structure with the given @name
+ * and @session. It will not be automatically added to the job classes
+ * table, it is up to the caller to ensure this is done using
+ * job_class_register() once the class has been set up.
  *
  * If @parent is not NULL, it should be a pointer to another object which
  * will be used as a parent for the returned job class.  When all parents
@@ -145,7 +148,8 @@
  **/
 JobClass *
 job_class_new (const void *parent,
-	       const char *name)
+	       const char *name,
+	       Session *   session)
 {
 	JobClass *class;
 	int       i;
@@ -165,8 +169,41 @@
 	if (! class->name)
 		goto error;
 
-	class->path = nih_dbus_path (class, DBUS_PATH_UPSTART, "jobs",
-				     class->name, NULL);
+	class->session = session;
+	if (class->session
+	    && class->session->chroot
+	    && class->session->user) {
+		nih_local char *uid = NULL;
+
+		uid = nih_sprintf (NULL, "%d", class->session->user);
+		if (! uid)
+			goto error;
+
+		class->path = nih_dbus_path (class, DBUS_PATH_UPSTART, "jobs",
+					     session->chroot, uid,
+					     class->name, NULL);
+
+	} else if (class->session
+		   && class->session->chroot) {
+		class->path = nih_dbus_path (class, DBUS_PATH_UPSTART, "jobs",
+					     session->chroot,
+					     class->name, NULL);
+
+	} else if (class->session
+		   && class->session->user) {
+		nih_local char *uid = NULL;
+
+		uid = nih_sprintf (NULL, "%d", class->session->user);
+		if (! uid)
+			goto error;
+
+		class->path = nih_dbus_path (class, DBUS_PATH_UPSTART, "jobs",
+					     uid, class->name, NULL);
+
+	} else {
+		class->path = nih_dbus_path (class, DBUS_PATH_UPSTART, "jobs",
+					     class->name, NULL);
+	}
 	if (! class->path)
 		goto error;
 
@@ -245,19 +282,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);
@@ -282,18 +327,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);
@@ -334,19 +386,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 */
@@ -696,6 +753,7 @@
 		 char * const    *env,
 		 int              wait)
 {
+	Session         *session;
 	Blocked         *blocked = NULL;
 	Job             *job;
 	nih_local char **start_env = NULL;
@@ -706,6 +764,16 @@
 	nih_assert (message != NULL);
 	nih_assert (env != NULL);
 
+	/* Don't permit out-of-session modification */
+	session = session_from_dbus (NULL, message);
+	if (session != class->session) {
+		nih_dbus_error_raise_printf (
+			DBUS_INTERFACE_UPSTART ".Error.PermissionDenied",
+			_("You do not have permission to modify job: %s"),
+			class->name);
+		return -1;
+	}
+
 	/* Verify that the environment is valid */
 	if (! environ_all_valid (env)) {
 		nih_dbus_error_raise_printf (DBUS_ERROR_INVALID_ARGS,
@@ -815,6 +883,7 @@
 		char * const   *env,
 		int             wait)
 {
+	Session         *session;
 	Blocked         *blocked = NULL;
 	Job             *job;
 	nih_local char **stop_env = NULL;
@@ -825,6 +894,16 @@
 	nih_assert (message != NULL);
 	nih_assert (env != NULL);
 
+	/* Don't permit out-of-session modification */
+	session = session_from_dbus (NULL, message);
+	if (session != class->session) {
+		nih_dbus_error_raise_printf (
+			DBUS_INTERFACE_UPSTART ".Error.PermissionDenied",
+			_("You do not have permission to modify job: %s"),
+			class->name);
+		return -1;
+	}
+
 	/* Verify that the environment is valid */
 	if (! environ_all_valid (env)) {
 		nih_dbus_error_raise_printf (DBUS_ERROR_INVALID_ARGS,
@@ -939,6 +1018,7 @@
 		   char * const    *env,
 		   int              wait)
 {
+	Session         *session;
 	Blocked         *blocked = NULL;
 	Job             *job;
 	nih_local char **restart_env = NULL;
@@ -949,6 +1029,16 @@
 	nih_assert (message != NULL);
 	nih_assert (env != NULL);
 
+	/* Don't permit out-of-session modification */
+	session = session_from_dbus (NULL, message);
+	if (session != class->session) {
+		nih_dbus_error_raise_printf (
+			DBUS_INTERFACE_UPSTART ".Error.PermissionDenied",
+			_("You do not have permission to modify job: %s"),
+			class->name);
+		return -1;
+	}
+
 	/* Verify that the environment is valid */
 	if (! environ_all_valid (env)) {
 		nih_dbus_error_raise_printf (DBUS_ERROR_INVALID_ARGS,

=== modified file 'init/job_class.h'
--- init/job_class.h	2011-05-12 20:42:28 +0000
+++ init/job_class.h	2011-06-06 15:17:24 +0000
@@ -35,6 +35,7 @@
 
 #include "process.h"
 #include "event_operator.h"
+#include "session.h"
 
 
 /**
@@ -71,6 +72,7 @@
  * @entry: list header,
  * @name: unique name,
  * @path: path of D-Bus object,
+ * @session: attached session,
  * @instance: pattern to uniquely identify multiple instances,
  * @instances: hash table of active instances,
  * @description: description; intended for humans,
@@ -110,6 +112,7 @@
 
 	char           *name;
 	char           *path;
+	Session *       session;
 
 	char           *instance;
 	NihHash        *instances;
@@ -161,7 +164,8 @@
 void        job_class_init                 (void);
 
 JobClass  * job_class_new                  (const void *parent,
-					    const char *name)
+					    const char *name,
+					    Session *session)
 	__attribute__ ((warn_unused_result, malloc));
 
 int         job_class_consider             (JobClass *class);

=== modified file 'init/job_process.c'
--- init/job_process.c	2011-05-12 20:42:28 +0000
+++ init/job_process.c	2011-06-06 15:17:24 +0000
@@ -2,7 +2,6 @@
  *
  * job_process.c - job process handling
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
@@ -41,6 +40,7 @@
 #include <unistd.h>
 #include <utmp.h>
 #include <utmpx.h>
+#include <pwd.h>
 
 #include <nih/macros.h>
 #include <nih/alloc.h>
@@ -539,6 +539,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.
@@ -594,6 +604,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	2011-05-12 19:21:16 +0000
+++ init/job_process.h	2011-06-06 15:17:24 +0000
@@ -1,7 +1,6 @@
 /* upstart
  *
- * Copyright © 2011 Google Inc.
- * Copyright © 2009 Canonical Ltd.
+ * Copyright © 2009,2010,2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -57,7 +56,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-16 22:54:56 +0000
+++ init/main.c	2011-06-06 15:17:24 +0000
@@ -1,7 +1,6 @@
 /* upstart
  *
- * Copyright © 2011 Google Inc.
- * Copyright © 2010 Canonical Ltd.
+ * Copyright © 2009-2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -71,6 +70,8 @@
 static void usr1_handler    (void *data, NihSignal *signal);
 #endif /* DEBUG */
 
+static void handle_confdir  (void);
+
 
 /**
  * argv0:
@@ -89,14 +90,55 @@
 static int restart = FALSE;
 
 
+extern int disable_sessions;
+
+/**
+ * conf_dir:
+ *
+ * Full path to job configuration file directory.
+ *
+ **/
+static char *conf_dir = NULL;
+
+/**
+ * initial_event:
+ *
+ * Alternate event to emit at startup (rather than STARTUP_EVENT).
+ **/
+static char *initial_event = NULL;
+
+/**
+ * disable_startup_event:
+ *
+ * If TRUE, do not emit a startup event.
+ **/
+static int disable_startup_event = FALSE;
+
+extern int use_session_bus;
+
 /**
  * options:
  *
  * Command-line options we accept.
  **/
 static NihOption options[] = {
+	{ 0, "confdir", N_("specify alternative directory to load configuration files from"),
+		NULL, "DIR", &conf_dir, NULL },
+
+	{ 0, "no-sessions", N_("Disable user and chroot sessions"),
+		NULL, NULL, &disable_sessions, NULL },
+
+	{ 0, "no-startup-event", N_("do not emit any startup event (for testing)"),
+		NULL, NULL, &disable_startup_event, NULL },
+
 	{ 0, "restart", NULL, NULL, NULL, &restart, NULL },
 
+	{ 0, "session", N_("use D-Bus session bus rather than system bus (for testing)"),
+		NULL, NULL, &use_session_bus, NULL },
+
+	{ 0, "startup-event", N_("specify an alternative initial event (for testing)"),
+		NULL, "NAME", &initial_event, NULL },
+
 	/* Ignore invalid options */
 	{ '-', "--", NULL, NULL, NULL, NULL, NULL },
 
@@ -124,94 +166,105 @@
 	if (! args)
 		exit (1);
 
+	handle_confdir ();
+	control_handle_bus_type ();
+
 #ifndef DEBUG
-	/* Check we're root */
-	if (getuid ()) {
-		nih_fatal (_("Need to be root"));
-		exit (1);
-	}
-
-	/* Check we're process #1 */
-	if (getpid () > 1) {
-		execv (TELINIT, argv);
-		/* Ignore failure, probably just that telinit doesn't exist */
-
-		nih_fatal (_("Not being executed as init"));
-		exit (1);
-	}
-
-	/* Clear our arguments from the command-line, so that we show up in
-	 * ps or top output as /sbin/init, with no extra flags.
-	 *
-	 * This is a very Linux-specific trick; by deleting the NULL
-	 * terminator at the end of the last argument, we fool the kernel
-	 * into believing we used a setproctitle()-a-like to extend the
-	 * argument space into the environment space, and thus make it use
-	 * strlen() instead of its own assumed length.  In fact, we've done
-	 * the exact opposite, and shrunk the command line length to just that
-	 * of whatever is in argv[0].
-	 *
-	 * If we don't do this, and just write \0 over the rest of argv, for
-	 * example; the command-line length still includes those \0s, and ps
-	 * will show whitespace in their place.
-	 */
-	if (argc > 1) {
-		char *arg_end;
-
-		arg_end = argv[argc-1] + strlen (argv[argc-1]);
-		*arg_end = ' ';
-	}
-
-
-	/* Become the leader of a new session and process group, shedding
-	 * any controlling tty (which we shouldn't have had anyway - but
-	 * you never know what initramfs did).
-	 */
-	setsid ();
-
-	/* Set the standard file descriptors to the ordinary console device,
-	 * resetting it to sane defaults unless we're inheriting from another
-	 * init process which we know left it in a sane state.
-	 */
-	if (system_setup_console (CONSOLE_OUTPUT, (! restart)) < 0)
-		nih_free (nih_error_get ());
-
-	/* Set the PATH environment variable */
-	setenv ("PATH", PATH, TRUE);
-
-	/* Switch to the root directory in case we were started from some
-	 * strange place, or worse, some directory in the initramfs that's
-	 * going to go away soon.
-	 */
-	if (chdir ("/"))
-		nih_warn ("%s: %s", _("Unable to set root directory"),
-			  strerror (errno));
-
-	/* Mount the /proc and /sys filesystems, which are pretty much
-	 * essential for any Linux system; not to mention used by
-	 * ourselves.
-	 */
-	if (system_mount ("proc", "/proc") < 0) {
-		NihError *err;
-
-		err = nih_error_get ();
-		nih_warn ("%s: %s", _("Unable to mount /proc filesystem"),
-			  err->message);
-		nih_free (err);
-	}
-
-	if (system_mount ("sysfs", "/sys") < 0) {
-		NihError *err;
-
-		err = nih_error_get ();
-		nih_warn ("%s: %s", _("Unable to mount /sys filesystem"),
-			  err->message);
-		nih_free (err);
-	}
+	if (use_session_bus == FALSE) {
+
+		/* Check we're root */
+		if (getuid ()) {
+			nih_fatal (_("Need to be root"));
+			exit (1);
+		}
+
+		/* Check we're process #1 */
+		if (getpid () > 1) {
+			execv (TELINIT, argv);
+			/* Ignore failure, probably just that telinit doesn't exist */
+
+			nih_fatal (_("Not being executed as init"));
+			exit (1);
+		}
+
+		/* Clear our arguments from the command-line, so that we show up in
+		 * ps or top output as /sbin/init, with no extra flags.
+		 *
+		 * This is a very Linux-specific trick; by deleting the NULL
+		 * terminator at the end of the last argument, we fool the kernel
+		 * into believing we used a setproctitle()-a-like to extend the
+		 * argument space into the environment space, and thus make it use
+		 * strlen() instead of its own assumed length.  In fact, we've done
+		 * the exact opposite, and shrunk the command line length to just that
+		 * of whatever is in argv[0].
+		 *
+		 * If we don't do this, and just write \0 over the rest of argv, for
+		 * example; the command-line length still includes those \0s, and ps
+		 * will show whitespace in their place.
+		 */
+		if (argc > 1) {
+			char *arg_end;
+
+			arg_end = argv[argc-1] + strlen (argv[argc-1]);
+			*arg_end = ' ';
+		}
+
+
+		/* Become the leader of a new session and process group, shedding
+		 * any controlling tty (which we shouldn't have had anyway - but
+		 * you never know what initramfs did).
+		 */
+		setsid ();
+
+		/* Set the standard file descriptors to the ordinary console device,
+		 * resetting it to sane defaults unless we're inheriting from another
+		 * init process which we know left it in a sane state.
+		 */
+		if (system_setup_console (CONSOLE_OUTPUT, (! restart)) < 0)
+			nih_free (nih_error_get ());
+
+		/* Set the PATH environment variable */
+		setenv ("PATH", PATH, TRUE);
+
+		/* Switch to the root directory in case we were started from some
+		 * strange place, or worse, some directory in the initramfs that's
+		 * going to go away soon.
+		 */
+		if (chdir ("/"))
+			nih_warn ("%s: %s", _("Unable to set root directory"),
+				strerror (errno));
+
+		/* Mount the /proc and /sys filesystems, which are pretty much
+		 * essential for any Linux system; not to mention used by
+		 * ourselves.
+		 */
+		if (system_mount ("proc", "/proc") < 0) {
+			NihError *err;
+
+			err = nih_error_get ();
+			nih_warn ("%s: %s", _("Unable to mount /proc filesystem"),
+				err->message);
+			nih_free (err);
+		}
+
+		if (system_mount ("sysfs", "/sys") < 0) {
+			NihError *err;
+
+			err = nih_error_get ();
+			nih_warn ("%s: %s", _("Unable to mount /sys filesystem"),
+				err->message);
+			nih_free (err);
+		}
+	} else {
+		nih_log_set_priority (NIH_LOG_DEBUG);
+		nih_debug ("Running with UID %d as PID %d (PPID %d)",
+				(int)getuid (), (int)getpid (), (int)getppid ());
+	}
+
 #else /* DEBUG */
 	nih_log_set_priority (NIH_LOG_DEBUG);
-	nih_debug ("Running as PID %d (PPID %d)",
-		(int)getpid (), (int)getppid ());
+	nih_debug ("Running with UID %d as PID %d (PPID %d)",
+		(int)getuid (), (int)getpid (), (int)getppid ());
 #endif /* DEBUG */
 
 
@@ -223,11 +276,13 @@
 		nih_signal_reset ();
 
 #ifndef DEBUG
-	/* Catch fatal errors immediately rather than waiting for a new
-	 * iteration through the main loop.
-	 */
-	nih_signal_set_handler (SIGSEGV, crash_handler);
-	nih_signal_set_handler (SIGABRT, crash_handler);
+	if (use_session_bus == FALSE) {
+		/* Catch fatal errors immediately rather than waiting for a new
+		 * iteration through the main loop.
+		 */
+		nih_signal_set_handler (SIGSEGV, crash_handler);
+		nih_signal_set_handler (SIGABRT, crash_handler);
+	}
 #endif /* DEBUG */
 
 	/* Don't ignore SIGCHLD or SIGALRM, but don't respond to them
@@ -238,33 +293,35 @@
 	nih_signal_set_handler (SIGALRM, nih_signal_handler);
 
 #ifndef DEBUG
-	/* Ask the kernel to send us SIGINT when control-alt-delete is
-	 * pressed; generate an event with the same name.
-	 */
-	reboot (RB_DISABLE_CAD);
-	nih_signal_set_handler (SIGINT, nih_signal_handler);
-	NIH_MUST (nih_signal_add_handler (NULL, SIGINT, cad_handler, NULL));
-
-	/* Ask the kernel to send us SIGWINCH when alt-uparrow is pressed;
-	 * generate a keyboard-request event.
-	 */
-	if (ioctl (0, KDSIGACCEPT, SIGWINCH) == 0) {
-		nih_signal_set_handler (SIGWINCH, nih_signal_handler);
-		NIH_MUST (nih_signal_add_handler (NULL, SIGWINCH,
-						  kbd_handler, NULL));
+	if (use_session_bus == FALSE) {
+		/* Ask the kernel to send us SIGINT when control-alt-delete is
+		 * pressed; generate an event with the same name.
+		 */
+		reboot (RB_DISABLE_CAD);
+		nih_signal_set_handler (SIGINT, nih_signal_handler);
+		NIH_MUST (nih_signal_add_handler (NULL, SIGINT, cad_handler, NULL));
+
+		/* Ask the kernel to send us SIGWINCH when alt-uparrow is pressed;
+		 * generate a keyboard-request event.
+		 */
+		if (ioctl (0, KDSIGACCEPT, SIGWINCH) == 0) {
+			nih_signal_set_handler (SIGWINCH, nih_signal_handler);
+			NIH_MUST (nih_signal_add_handler (NULL, SIGWINCH,
+						kbd_handler, NULL));
+		}
+
+		/* powstatd sends us SIGPWR when it changes /etc/powerstatus */
+		nih_signal_set_handler (SIGPWR, nih_signal_handler);
+		NIH_MUST (nih_signal_add_handler (NULL, SIGPWR, pwr_handler, NULL));
+
+		/* SIGHUP instructs us to re-load our configuration */
+		nih_signal_set_handler (SIGHUP, nih_signal_handler);
+		NIH_MUST (nih_signal_add_handler (NULL, SIGHUP, hup_handler, NULL));
+
+		/* SIGUSR1 instructs us to reconnect to D-Bus */
+		nih_signal_set_handler (SIGUSR1, nih_signal_handler);
+		NIH_MUST (nih_signal_add_handler (NULL, SIGUSR1, usr1_handler, NULL));
 	}
-
-	/* powstatd sends us SIGPWR when it changes /etc/powerstatus */
-	nih_signal_set_handler (SIGPWR, nih_signal_handler);
-	NIH_MUST (nih_signal_add_handler (NULL, SIGPWR, pwr_handler, NULL));
-
-	/* SIGHUP instructs us to re-load our configuration */
-	nih_signal_set_handler (SIGHUP, nih_signal_handler);
-	NIH_MUST (nih_signal_add_handler (NULL, SIGHUP, hup_handler, NULL));
-
-	/* SIGUSR1 instructs us to reconnect to D-Bus */
-	nih_signal_set_handler (SIGUSR1, nih_signal_handler);
-	NIH_MUST (nih_signal_add_handler (NULL, SIGUSR1, usr1_handler, NULL));
 #endif /* DEBUG */
 
 
@@ -279,25 +336,27 @@
 
 	/* Read configuration */
 	NIH_MUST (conf_source_new (NULL, CONFFILE, CONF_FILE));
-	NIH_MUST (conf_source_new (NULL, CONFDIR, CONF_JOB_DIR));
+	NIH_MUST (conf_source_new (NULL, conf_dir, CONF_JOB_DIR));
 
 	conf_reload ();
 
 	/* Create a listening server for private connections. */
-	while (control_server_open () < 0) {
-		NihError *err;
+	if (use_session_bus == FALSE) {
+		while (control_server_open () < 0) {
+			NihError *err;
 
-		err = nih_error_get ();
-		if (err->number != ENOMEM) {
-			nih_warn ("%s: %s", _("Unable to listen for private connections"),
-				  err->message);
+			err = nih_error_get ();
+			if (err->number != ENOMEM) {
+				nih_warn ("%s: %s", _("Unable to listen for private connections"),
+					err->message);
+				nih_free (err);
+				break;
+			}
 			nih_free (err);
-			break;
 		}
-		nih_free (err);
 	}
 
-	/* Open connection to the system bus; we normally expect this to
+	/* Open connection to the appropriate D-Bus bus; we normally expect this to
 	 * fail and will try again later - don't let ENOMEM stop us though.
 	 */
 	while (control_bus_open () < 0) {
@@ -313,21 +372,32 @@
 	}
 
 #ifndef DEBUG
-	/* Now that the startup is complete, send all further logging output
-	 * to kmsg instead of to the console.
-	 */
-	if (system_setup_console (CONSOLE_NONE, FALSE) < 0)
-		nih_free (nih_error_get ());
+	if (use_session_bus == FALSE) {
+		/* Now that the startup is complete, send all further logging output
+		 * to kmsg instead of to the console.
+		 */
+		if (system_setup_console (CONSOLE_NONE, FALSE) < 0)
+			nih_free (nih_error_get ());
 
-	nih_log_set_logger (logger_kmsg);
+		nih_log_set_logger (logger_kmsg);
+	}
 #endif /* DEBUG */
 
 
 	/* Generate and run the startup event or read the state from the
 	 * init daemon that exec'd us
 	 */
-	if (! restart) {
-		NIH_MUST (event_new (NULL, STARTUP_EVENT, NULL));
+	if (! restart ) {
+		if (disable_startup_event) {
+			nih_debug ("Startup event disabled");
+		} else {
+			NIH_MUST (event_new (NULL,
+				initial_event
+				? initial_event
+				: STARTUP_EVENT,
+				NULL));
+		}
+
 	} else {
 		sigset_t mask;
 
@@ -573,3 +643,31 @@
 	}
 }
 #endif /* DEBUG */
+
+/**
+ * handle_confdir:
+ *
+ * Determine where system configuration files should be loaded from.
+ **/
+static void
+handle_confdir (void)
+{
+	char *dir;
+
+	/* user has already specified directory on command-line */
+	if (conf_dir)
+		goto out;
+
+	conf_dir = CONFDIR;
+
+	dir = getenv (CONFDIR_ENV);
+	if (! dir)
+		return;
+
+	conf_dir = dir;
+
+out:
+	nih_debug ("Using alternate configuration directory %s",
+			conf_dir);
+}
+

=== modified file 'init/man/init.5'
--- init/man/init.5	2011-05-12 20:42:28 +0000
+++ init/man/init.5	2011-06-06 15:17:24 +0000
@@ -9,9 +9,9 @@
 .SH DESCRIPTION
 On startup, the Upstart
 .BR init (8)
-daemon reads its job configuration from the
-.I /etc/init
-directory, and watches for future changes using
+daemon reads its job configuration from files in the
+.I /etc/init/
+directory, and watches for future changes to these files using
 .BR inotify (7).
 
 Files in this directory must end in
@@ -37,6 +37,9 @@
 within a stanza are permitted within single or double quotes, or if
 preceeded by a blackslash.
 
+If a stanza is duplicated, the last occurence will be used. Unrecognized
+stanzas will generate parse errors, which will stop a job from running.
+
 Stanzas and their arguments are delimited by whitespace, which consists
 of one or more space or tab characters which are otherwise ignored unless
 placed within single or double quotes.
@@ -69,7 +72,7 @@
 entire command being passed to a shell for expansion.
 
 .nf
-exec /usr/sbin/acpid -c $EVENTSDIR -s $SOCKET
+exec /usr/sbin/acpid \-c $EVENTSDIR \-s $SOCKET
 .fi
 .\"
 .TP
@@ -78,7 +81,7 @@
 be executed using
 .BR sh(1).
 The
-.I -e
+.I \-e
 shell option is always used, so any command that fails will terminate
 the script.
 
@@ -92,7 +95,7 @@
 .nf
 script
     dd bs=1 if=/proc/kmsg of=$KMSGSINK
-    exec /sbin/klogd -P $KMSGSINK
+    exec /sbin/klogd \-P $KMSGSINK
 end script
 .fi
 
@@ -105,14 +108,14 @@
 stanza.
 
 .TP
-.B pre-start exec\fR|\fBscript\fR...
+.B pre\-start exec\fR|\fBscript\fR...
 This process will be run after the job's
 .BR starting (7)
 event has finished, but before the main process is run.  It is typically
 used to prepare the environment, such as making necessary directories.
 .\"
 .TP
-.B post-start exec\fR|\fBscript\fR...
+.B post\-start exec\fR|\fBscript\fR...
 This process will be run before the job's
 .BR started (7)
 event is emitted, but after the main process has been spawned.  It is
@@ -122,7 +125,7 @@
 event until the main process is ready to receive clients.
 .\"
 .TP
-.B pre-stop exec\fR|\fBscript\fR...
+.B pre\-stop exec\fR|\fBscript\fR...
 This process is run if the job is stopped by an event listed in its
 .B stop on
 stanza or by the
@@ -136,7 +139,7 @@
 command without arguments to cancel the stop.
 .\"
 .TP
-.B post-stop exec\fR|\fBscript\fR...
+.B post\-stop exec\fR|\fBscript\fR...
 This process is run after the main process has been killed and before
 the job's
 .BR stopped (7)
@@ -144,19 +147,19 @@
 such as removing temporary directories.
 
 .PP
-All of these processes, including the main process, are optional.  Services
-without a main process will appear to be running until they are stopped,
-this is commonly used to define states such as runlevels.  It's quite
-permissable to have no main process, but to have
-.B pre-start
+All of these processes, including the main process, are optional.
+Services without a main process will appear to be running until they are
+stopped: this is commonly used to define states such as runlevels.  It
+is permissable to have no main process, but to have
+.B pre\-start
 and
-.B post-stop
+.B post\-stop
 processes for the state.
 
 .RS
 .nf
-pre-start exec ifup -a
-post-stop exec ifdown -a
+pre\-start exec ifup \-a
+post\-stop exec ifdown \-a
 .fi
 .RE
 .\"
@@ -238,9 +241,9 @@
 .nf
 start on started gdm or started kdm
 
-start on device-added SUBSYSTEM=tty DEVPATH=ttyS*
+start on device\-added SUBSYSTEM=tty DEVPATH=ttyS*
 
-start on net-device-added INTERFACE!=lo
+start on net\-device\-added INTERFACE!=lo
 .fi
 .TP
 .B stop on \fIEVENT \fR[[\fIKEY=\fR]\fIVALUE\fR]... [\fBand\fR|\fBor\fR...]
@@ -249,7 +252,7 @@
 .B stop on
 stanza defines the set of events that will cause the job to be automatically
 stopped.  It has the same syntax as
-.B start on
+\fBstart on\fP.
 
 .I VALUE
 may additionally expand the value of any variable that came from the
@@ -258,7 +261,7 @@
 .nf
 stop on stopping gdm or stopping kdm
 
-stop on device-removed DEVPATH=$DEVPATH
+stop on device\-removed DEVPATH=$DEVPATH
 .fi
 
 .TP
@@ -284,11 +287,11 @@
 it will not be present if the job was started manually.
 
 In addition, the
-.B pre-stop
+.B pre\-stop
 and
-.B post-stop
+.B post\-stop
 scripts are run with the environment of the events or commands that
-stopped the job.  THe
+stopped the job.  The
 .B UPSTART_STOP_EVENTS
 environment variable contains the list of events that stopped the job,
 it will not be present if the job was stopped manually.
@@ -306,7 +309,8 @@
 .B env \fIKEY\fR[=\fIVALUE\fR]
 Defines a default environment variable, the value of which may be overriden
 by the event or command that starts the job.
-If no value is given, then the value is taken from the
+If \'KEY=VALUE\' is specified, the variable KEY is given the value VALUE.
+If only \'KEY\' is given, then the value is taken from the
 .BR init (8)
 daemon's own environment.
 .\"
@@ -366,7 +370,7 @@
 times in
 .I INTERVAL
 seconds, it will be considered to be having deeper problems and will
-be stopped.
+be stopped. Default COUNT is 10. Default INTERVAL is 5 seconds.
 
 This only applies to automatic respawns and not the
 .BR restart (8)
@@ -385,7 +389,8 @@
 .SS Instances
 By default, only one instance of any job is permitted to exist at one
 time.  Attempting to start a job when it's already starting or running
-results in an error.
+results in an error. Note that a job is considered to be running if its
+pre\-start process is running.
 
 Multiple instances may be permitted by defining the names of those
 instances.  If an instance with the same name is not already starting
@@ -405,12 +410,12 @@
 
 .nf
 instance $CONFFILE
-exec /sbin/httpd -c $CONFFILE
+exec /sbin/httpd \-c $CONFFILE
 .fi
 
 .nf
 instance $TTY
-exec /sbin/getty -8 38300 $TTY
+exec /sbin/getty \-8 38300 $TTY
 .fi
 
 These jobs appear in the
@@ -461,6 +466,11 @@
 
 This stanza allows a job to document in its job configuration what events
 it emits itself, and may be useful for graphing possible transitions.
+
+The
+.BR initctl "(8) " check\-config
+command attempts to use this stanza to resolve events.
+
 .\"
 .SS Process environment
 Many common adjustments to the process environment, such as resource
@@ -481,7 +491,7 @@
 is special, it not only connects the job to the system console but sets
 the job to be the owner of the system console, which means it will receive
 certain signals from the kernel when special key combinations such as
-Control-C are pressed.
+Control\-C are pressed.
 .\"
 .TP
 .B umask \fIUMASK
@@ -586,7 +596,7 @@
 .I SIGSTOP
 signal to indicate that it is ready.
 .BR init (8)
-will wait for this signal before running the job's post-start script,
+will wait for this signal before running the job's post\-start script,
 or considering the job to be running.
 
 .BR init (8)
@@ -600,7 +610,7 @@
 after being run.
 .BR init (8)
 will follow this daemonisation, and will wait for this to occur before
-running the job's post-start script or considering the job to be running.
+running the job's post\-start script or considering the job to be running.
 
 Without this stanza
 .BR init (8)
@@ -612,13 +622,56 @@
 Specifies that the job's main process will fork once after being run.
 .BR init (8)
 will follow this fork, and will wait for this to occur before
-running the job's post-start script or considering the job to be running.
+running the job's post\-start script or considering the job to be running.
 
 Without this stanza
 .BR init (8)
 is unable to supervise forking processes and will believe them to have
 stopped as soon as they fork on startup.
 .\"
+.SH BUGS
+The 
+.B and
+and 
+.B or
+operators allowed with
+.B start on
+and
+.B stop on
+do not work intuitively: operands to the right of either operator are
+only evaluated once and state information is then discarded. This can
+lead to jobs with complex \fBstart on\fP or \fPstop on\fP conditions
+not behaving as expected \fIwhen restarted\fP. For example, if a job
+encodes the following condition:
+.ti +4
+.sp 1
+.nf
+start on A and (B or C)
+.fi
+.P
+When \(aqA\(aq and \(aqB\(aq become true, the condition is satisfied so
+the job will be run. However, if the job ends and subsequently \(aqA\(aq
+and \(aqC\(aq become true, the job will \fInot\fP be re\-run even though
+the condtion is satisfied.  Avoid using complex conditions with jobs
+which need to be restarted.
+.\"
+.SH AUTHOR
+Manual page written by Scott James Remnant
+.RB < [e-mail] >
+and James Hunt
+.RB < [e-mail] > .
+.\"
+.SH REPORTING BUGS
+Report bugs at
+.RB < https://launchpad.net/upstart/+bugs >
+.\"
+.SH COPYRIGHT
+Copyright \(co 2009-2011 Canonical Ltd.
+.br
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+.\"
 .SH SEE ALSO
 .BR init (8)
 .BR sh (1)

=== modified file 'init/man/init.8'
--- init/man/init.8	2010-02-04 19:26:17 +0000
+++ init/man/init.8	2011-06-06 15:17:24 +0000
@@ -1,4 +1,4 @@
-.TH init 8 2010-02-04 "Upstart"
+.TH init 8 2011-04-06 "Upstart"
 .\"
 .SH NAME
 init \- Upstart process management daemon
@@ -64,7 +64,32 @@
 by placing them on the kernel command-line.
 .\"
 .TP
-.B --verbose
+.B \-\-confdir \fIdirectory\fP
+Read job configuration files from a directory other than
+\fI/etc/init\fP.
+.\"
+.TP
+.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
+Connect to the D\-Bus session bus. This should only be used for testing.
+.\"
+.TP
+.B \-\-startup-event \fIevent\fP
+Specify a different initial startup event from the standard
+.BR startup (7) .
+.\"
+.TP
+.B \-\-verbose
 Outputs verbose messages about job state changes and event emissions to the
 system console or log, useful for debugging boot.
 .\"
@@ -90,18 +115,19 @@
 .RB < https://launchpad.net/upstart/+bugs >
 .\"
 .SH COPYRIGHT
-Copyright \(co 2010 Canonical Ltd.
+Copyright \(co 2009\-2011 Canonical Ltd.
 .br
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .\"
 .SH SEE ALSO
+.BR control\-alt\-delete (7)
 .BR init (5)
 .BR initctl (8)
-.BR telinit (8)
 .BR runlevel (7)
 .BR startup (7)
 .BR starting (7)
 .BR started (7)
 .BR stopping (7)
 .BR stopped (7)
+.BR telinit (8)

=== modified file 'init/parse_job.c'
--- init/parse_job.c	2011-05-12 20:42:28 +0000
+++ init/parse_job.c	2011-06-06 15:17:24 +0000
@@ -2,7 +2,7 @@
  *
  * parse_job.c - job definition parsing
  *
- * Copyright © 2010 Canonical Ltd.
+ * Copyright © 2010,2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -263,6 +263,7 @@
 /**
  * parse_job:
  * @parent: parent object for new job,
+ * @session: session,
  * @name: name of new job,
  * @file: file or string to parse,
  * @len: length of @file,
@@ -282,6 +283,7 @@
  **/
 JobClass *
 parse_job (const void *parent,
+	   Session *   session,
 	   const char *name,
 	   const char *file,
 	   size_t      len,
@@ -294,7 +296,7 @@
 	nih_assert (file != NULL);
 	nih_assert (pos != NULL);
 
-	class = job_class_new (parent, name);
+	class = job_class_new (parent, name, session);
 	if (! class)
 		nih_return_system_error (NULL);
 

=== modified file 'init/parse_job.h'
--- init/parse_job.h	2009-06-23 09:29:35 +0000
+++ init/parse_job.h	2011-06-06 15:17:24 +0000
@@ -1,6 +1,6 @@
 /* upstart
  *
- * Copyright © 2009 Canonical Ltd.
+ * Copyright © 2010 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,13 +22,14 @@
 
 #include <nih/macros.h>
 
+#include "session.h"
 #include "job_class.h"
 
 
 NIH_BEGIN_EXTERN
 
-JobClass *parse_job (const void *parent, const char *name,
-		     const char *file, size_t len,
+JobClass *parse_job (const void *parent, Session *session,
+		     const char *name, const char *file, size_t len,
 		     size_t *pos, size_t *lineno)
 	__attribute__ ((warn_unused_result, malloc));
 

=== modified file 'init/paths.h'
--- init/paths.h	2010-02-26 15:27:14 +0000
+++ init/paths.h	2011-06-06 15:17:24 +0000
@@ -1,6 +1,6 @@
 /* upstart
  *
- * Copyright © 2010 Canonical Ltd.
+ * Copyright © 2010-2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -67,12 +67,35 @@
 /**
  * CONFDIR:
  *
- * Top-level directory of the system configuration files.
+ * Default top-level directory of the system configuration files.
  **/
 #ifndef CONFDIR
 #define CONFDIR "/etc/init"
 #endif
 
+/**
+ * USERCONFDIR:
+ *
+ * Sub-directory of user's home directory for their jobs.
+ **/
+#ifndef USERCONFDIR
+#define USERCONFDIR ".init"
+#endif
+
+
+/**
+ * CONFDIR_ENV:
+ *
+ * If this environment variable is set, read configuration files
+ * from the location specified, rather than CONFDIR.
+ *
+ * Value is expected to be the full path to an alternative job
+ * configuration directory.
+ **/
+#ifndef CONFDIR_ENV
+#define CONFDIR_ENV "UPSTART_CONFDIR"
+#endif
+
 
 /**
  * SHELL:

=== added file 'init/session.c'
--- init/session.c	1970-01-01 00:00:00 +0000
+++ init/session.c	2011-06-06 15:17:24 +0000
@@ -0,0 +1,279 @@
+/* upstart
+ *
+ * session.c - session segregation
+ *
+ * Copyright © 2010,2011 Canonical Ltd.
+ * Author: Scott James Remnant <[e-mail]>.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif /* HAVE_CONFIG_H */
+
+
+#include <dbus/dbus.h>
+
+#include <sys/types.h>
+
+#include <pwd.h>
+#include <errno.h>
+#include <limits.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <nih/macros.h>
+#include <nih/alloc.h>
+#include <nih/list.h>
+#include <nih/string.h>
+#include <nih/logging.h>
+#include <nih/error.h>
+
+#include <nih-dbus/dbus_message.h>
+
+#include "session.h"
+#include "conf.h"
+#include "paths.h"
+
+
+/**
+ * sessions:
+ *
+ * This list holds the list of known sessions; each item is a Session
+ * structure.
+ **/
+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);
+
+
+/**
+ * session_init:
+ *
+ * Initialise the sessions list.
+ **/
+void
+session_init (void)
+{
+	if (! sessions)
+		sessions = NIH_MUST (nih_list_new (NULL));
+}
+
+
+Session *
+session_new (const void *parent,
+	     const char *chroot,
+	     uid_t       user)
+{
+	Session *session;
+
+	nih_assert ((chroot != NULL) || (user != 0));
+
+	session_init ();
+
+	session = nih_new (parent, Session);
+	if (! session)
+		return NULL;
+
+	nih_list_init (&session->entry);
+
+	if (chroot) {
+		session->chroot = nih_strdup (session, chroot);
+		if (! session->chroot) {
+			nih_free (session);
+			return NULL;
+		}
+	} else {
+		session->chroot = NULL;
+	}
+
+	session->user = user;
+
+	session->conf_path = NULL;
+
+	nih_alloc_set_destructor (session, nih_list_destroy);
+
+	nih_list_add (sessions, &session->entry);
+
+	return session;
+}
+
+Session *
+session_from_dbus (const void     *parent,
+		   NihDBusMessage *message)
+{
+	const char   *sender;
+	DBusError     dbus_error;
+	unsigned long unix_user;
+	unsigned long unix_process_id;
+	char          root[PATH_MAX];
+	Session      *session;
+
+	nih_assert (message != NULL);
+
+	/* 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 ();
+
+	/* Ask D-Bus nicely for the origin uid and/or pid of the caller;
+	 * sadly we can't ask the bus daemon for the origin pid, so that
+	 * one will just have to stay user-session only.
+	 */
+	dbus_error_init (&dbus_error);
+
+	sender = dbus_message_get_sender (message->message);
+	if (sender) {
+		unix_user = dbus_bus_get_unix_user (message->connection, sender,
+						    &dbus_error);
+		if (unix_user == (unsigned long)-1) {
+			dbus_error_free (&dbus_error);
+			unix_user = 0;
+		}
+
+		unix_process_id = 0;
+
+	} else {
+		if (! dbus_connection_get_unix_user (message->connection,
+						     &unix_user))
+			unix_process_id = 0;
+
+		if (! dbus_connection_get_unix_process_id (message->connection,
+							   &unix_process_id))
+			unix_process_id = 0;
+	}
+
+	/* 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 (unix_process_id) {
+		nih_local char *symlink = NULL;
+		ssize_t len;
+
+		symlink = NIH_MUST (nih_sprintf (NULL, "/proc/%lu/root",
+						 unix_process_id));
+		len = readlink (symlink, root, sizeof root);
+		if (len < 0)
+			return NULL;
+
+		root[len] = '\0';
+
+		if (! strcmp (root, "/")) {
+			unix_process_id = 0;
+			if (! unix_user)
+				return NULL;
+		}
+
+	} else if (! unix_user) {
+		/* No process id or user id found, return the NULL session */
+		return NULL;
+
+	}
+
+	/* Now find in the existing Sessions list */
+	NIH_LIST_FOREACH (sessions, iter) {
+		Session *session = (Session *)iter;
+
+		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;
+	}
+
+
+	/* Didn't find one, make a new one */
+	session = NIH_MUST (session_new (parent, unix_process_id ? root : NULL,
+					 unix_user));
+	session_create_conf_source (session);
+
+	return session;
+}
+
+static void
+session_create_conf_source (Session *session)
+{
+	ConfSource *source;
+
+	nih_assert (session != NULL);
+	nih_assert (session->conf_path == NULL);
+
+	if (session->chroot)
+		session->conf_path = NIH_MUST (nih_strdup (NULL, session->chroot));
+	if (session->user) {
+		struct passwd *pwd;
+
+		pwd = getpwuid (session->user);
+		if (! pwd) {
+			nih_error ("%d: %s: %s", session->user,
+				   _("Unable to lookup home directory"),
+				   strerror (errno));
+
+			nih_free (session->conf_path);
+			session->conf_path = NULL;
+			return;
+		}
+
+		NIH_MUST (nih_strcat_sprintf (&session->conf_path, NULL, "%s/%s",
+					      pwd->pw_dir, USERCONFDIR));
+	} else {
+		NIH_MUST (nih_strcat (&session->conf_path, NULL, CONFDIR));
+	}
+
+	source = NIH_MUST (conf_source_new (session, session->conf_path,
+					    CONF_JOB_DIR));
+	source->session = session;
+
+	if (conf_source_reload (source) < 0) {
+		NihError *err;
+
+		err = nih_error_get ();
+		if (err->number != ENOENT)
+			nih_error ("%s: %s: %s", source->path,
+				   _("Unable to load configuration"),
+				   err->message);
+		nih_free (err);
+
+		nih_free (source);
+		nih_free (session->conf_path);
+		session->conf_path = NULL;
+		return;
+	}
+}

=== added file 'init/session.h'
--- init/session.h	1970-01-01 00:00:00 +0000
+++ init/session.h	2011-06-06 15:17:24 +0000
@@ -0,0 +1,87 @@
+/* upstart
+ *
+ * Copyright © 2010,2011 Canonical Ltd.
+ * Author: Scott James Remnant <[e-mail]>.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef INIT_SESSION_H
+#define INIT_SESSION_H
+
+#include <sys/types.h>
+
+#include <nih/macros.h>
+#include <nih/list.h>
+
+#include <nih-dbus/dbus_message.h>
+
+
+/**
+ * Session:
+ * @entry: list header,
+ * @chroot: path all jobs are chrooted to,
+ * @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.
+ *
+ * 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;
+	char *  chroot;
+	uid_t   user;
+	char *  conf_path;
+} Session;
+
+
+NIH_BEGIN_EXTERN
+
+extern NihList *sessions;
+
+void     session_init      (void);
+
+Session *session_new       (const void *parent, const char *chroot, uid_t user)
+	__attribute__ ((malloc, warn_unused_result));
+
+Session *session_from_dbus (const void *parent, NihDBusMessage *message);
+
+NIH_END_EXTERN
+
+#endif /* INIT_SESSION_H */

=== modified file 'init/tests/test_blocked.c'
--- init/tests/test_blocked.c	2009-06-23 09:29:35 +0000
+++ init/tests/test_blocked.c	2011-06-06 15:17:24 +0000
@@ -46,7 +46,7 @@
 	 * in a list.
 	 */
 	TEST_FEATURE ("with job");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	TEST_ALLOC_FAIL {
@@ -364,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-17 23:38:17 +0000
+++ init/tests/test_conf.c	2011-06-06 15:17:24 +0000
@@ -2,7 +2,6 @@
  *
  * test_conf.c - test suite for init/conf.c
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2009 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
@@ -3309,9 +3308,9 @@
 	 */
 	TEST_FEATURE ("with not-current job");
 	file = conf_file_new (source, "/path/to/file");
-	job = file->job = job_class_new (NULL, "foo");
+	job = file->job = job_class_new (NULL, "foo", NULL);
 
-	other = job_class_new (NULL, "foo");
+	other = job_class_new (NULL, "foo", NULL);
 	nih_hash_add (job_classes, &other->entry);
 
 	TEST_FREE_TAG (job);
@@ -3331,7 +3330,7 @@
 	 */
 	TEST_FEATURE ("with stopped job");
 	file = conf_file_new (source, "/path/to/file");
-	job = file->job = job_class_new (NULL, "foo");
+	job = file->job = job_class_new (NULL, "foo", NULL);
 
 	nih_hash_add (job_classes, &job->entry);
 
@@ -3351,7 +3350,7 @@
 	 */
 	TEST_FEATURE ("with running job");
 	file = conf_file_new (source, "/path/to/file");
-	job = file->job = job_class_new (NULL, "foo");
+	job = file->job = job_class_new (NULL, "foo", NULL);
 
 	nih_hash_add (job_classes, &job->entry);
 
@@ -3391,26 +3390,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");
+	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");
+	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");
+	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");
+	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);
 
@@ -3419,7 +3418,7 @@
 	 * returned.
 	 */
 	TEST_FEATURE ("with multiple files");
-	ptr = conf_select_job ("frodo");
+	ptr = conf_select_job ("frodo", NULL);
 
 	TEST_EQ_P (ptr, class1);
 
@@ -3427,7 +3426,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);
 
@@ -3435,7 +3434,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);
 
@@ -3450,6 +3449,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-16 22:42:48 +0000
+++ init/tests/test_control.c	2011-06-06 15:17:24 +0000
@@ -2,7 +2,6 @@
  *
  * test_dbus.c - test suite for init/dbus.c
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2010 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
@@ -234,10 +233,10 @@
 	 * new connection has them automatically registered.
 	 */
 	TEST_FEATURE ("with existing jobs");
-	class1 = job_class_new (NULL, "foo");
+	class1 = job_class_new (NULL, "foo", NULL);
 	nih_hash_add (job_classes, &class1->entry);
 
-	class2 = job_class_new (NULL, "bar");
+	class2 = job_class_new (NULL, "bar", NULL);
 	job1 = job_new (class2, "test1");
 	job2 = job_new (class2, "test2");
 	nih_hash_add (job_classes, &class2->entry);
@@ -334,7 +333,6 @@
 	nih_free (class1);
 	nih_free (class2);
 
-
 	control_server_close ();
 
 	dbus_shutdown ();
@@ -535,10 +533,10 @@
 	refuse_registration = FALSE;
 	server_conn = NULL;
 
-	class1 = job_class_new (NULL, "foo");
+	class1 = job_class_new (NULL, "foo", NULL);
 	nih_hash_add (job_classes, &class1->entry);
 
-	class2 = job_class_new (NULL, "bar");
+	class2 = job_class_new (NULL, "bar", NULL);
 	job1 = job_new (class2, "test1");
 	job2 = job_new (class2, "test2");
 	nih_hash_add (job_classes, &class2->entry);
@@ -933,9 +931,12 @@
 
 	strcpy (filename, dirname);
 	strcat (filename, "/baz");
+
+	/* XXX: note that this will generate an error message when this
+	 * test runs sine "/baz" does not exist as a directory.
+	 */
 	source3 = conf_source_new (NULL, filename, CONF_DIR);
 
-
 	message = nih_new (NULL, NihDBusMessage);
 	message->connection = NULL;
 	message->message = NULL;
@@ -987,7 +988,7 @@
 	nih_error_init ();
 	job_class_init ();
 
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	nih_hash_add (job_classes, &class->entry);
 
 
@@ -1102,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");
+	class1 = job_class_new (NULL, "frodo", NULL);
 	nih_hash_add (job_classes, &class1->entry);
 
-	class2 = job_class_new (NULL, "bilbo");
+	class2 = job_class_new (NULL, "bilbo", NULL);
 	nih_hash_add (job_classes, &class2->entry);
 
-	class3 = job_class_new (NULL, "sauron");
+	class3 = job_class_new (NULL, "sauron", NULL);
 	nih_hash_add (job_classes, &class3->entry);
 
 	TEST_ALLOC_FAIL {
@@ -2180,6 +2181,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	2011-03-16 22:42:48 +0000
+++ init/tests/test_environ.c	2011-06-06 15:17:24 +0000
@@ -2,7 +2,6 @@
  *
  * test_environ.c - test suite for init/environ.c
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2009 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
@@ -1587,6 +1586,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	2010-02-04 08:33:40 +0000
+++ init/tests/test_event.c	2011-06-06 15:17:24 +0000
@@ -233,7 +233,7 @@
 		TEST_ALLOC_SAFE {
 			event = event_new (NULL, "test", NULL);
 
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 			class->task = TRUE;
 			class->process[PROCESS_MAIN] = process_new (class->process);
 			class->process[PROCESS_MAIN]->command = "echo";
@@ -292,7 +292,7 @@
 
 			TEST_FREE_TAG (event1);
 
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 			class->task = TRUE;
 
 			class->start_on = event_operator_new (
@@ -327,7 +327,7 @@
 
 			TEST_FREE_TAG (event1);
 
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 			class->task = TRUE;
 
 			class->start_on = event_operator_new (
@@ -386,7 +386,7 @@
 			TEST_FREE_TAG (event1);
 			TEST_FREE_TAG (event2);
 
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 			class->task = TRUE;
 
 			assert (nih_str_array_add (&(class->env), class,
@@ -502,7 +502,7 @@
 
 			TEST_FREE_TAG (event2);
 
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 			class->task = TRUE;
 
 			assert (nih_str_array_add (&(class->env), class,
@@ -628,7 +628,7 @@
 
 			TEST_FREE_TAG (event2);
 
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 			class->task = TRUE;
 
 			assert (nih_str_array_add (&(class->env), class,
@@ -796,7 +796,7 @@
 
 			TEST_FREE_TAG (event2);
 
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 			class->task = TRUE;
 
 			assert (nih_str_array_add (&(class->env), class,
@@ -921,7 +921,7 @@
 
 			TEST_FREE_TAG (event1);
 
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 			class->instance = "$FRODO";
 			class->task = TRUE;
 
@@ -1000,7 +1000,7 @@
 
 			TEST_FREE_TAG (event1);
 
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 			class->instance = "$FRODO";
 			class->task = TRUE;
 
@@ -1084,7 +1084,7 @@
 
 			TEST_FREE_TAG (event1);
 
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 			class->instance = "$TIPPLE";
 			class->task = TRUE;
 
@@ -1127,7 +1127,7 @@
 
 			TEST_FREE_TAG (event1);
 
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 			class->task = TRUE;
 
 			class->process[PROCESS_POST_STOP] = process_new (class);
@@ -1175,7 +1175,7 @@
 
 			TEST_FREE_TAG (event1);
 
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 			class->task = TRUE;
 
 			class->process[PROCESS_POST_STOP] = process_new (class);
@@ -1250,7 +1250,7 @@
 
 			TEST_FREE_TAG (event1);
 
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 			class->task = TRUE;
 
 			class->process[PROCESS_POST_STOP] = process_new (class);
@@ -1329,7 +1329,7 @@
 
 			TEST_FREE_TAG (event1);
 
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 			class->task = TRUE;
 
 			class->process[PROCESS_POST_STOP] = process_new (class);
@@ -1439,7 +1439,7 @@
 
 			TEST_FREE_TAG (event1);
 
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 			class->task = TRUE;
 
 			class->process[PROCESS_POST_STOP] = process_new (class);
@@ -1527,7 +1527,7 @@
 
 			TEST_FREE_TAG (event1);
 
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 			class->task = TRUE;
 
 			class->process[PROCESS_POST_STOP] = process_new (class);
@@ -1623,7 +1623,7 @@
 
 			TEST_FREE_TAG (event);
 
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 			class->process[PROCESS_MAIN] = process_new (class->process);
 			class->process[PROCESS_MAIN]->command = "echo";
 
@@ -1657,7 +1657,7 @@
 
 			TEST_FREE_TAG (event);
 
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 			class->process[PROCESS_MAIN] = process_new (class->process);
 			class->process[PROCESS_MAIN]->command = "echo";
 
@@ -1699,7 +1699,7 @@
 
 			TEST_FREE_TAG (event);
 
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 			class->process[PROCESS_MAIN] = process_new (class->process);
 			class->process[PROCESS_MAIN]->command = "echo";
 
@@ -1740,7 +1740,7 @@
 
 			TEST_FREE_TAG (event);
 
-			class = job_class_new (NULL, "foo");
+			class = job_class_new (NULL, "foo", NULL);
 
 			job = job_new (class, "");
 			job->goal = JOB_STOP;
@@ -1773,7 +1773,7 @@
 
 			TEST_FREE_TAG (event);
 
-			class = job_class_new (NULL, "foo");
+			class = job_class_new (NULL, "foo", NULL);
 
 			job = job_new (class, "");
 			job->goal = JOB_START;
@@ -1804,7 +1804,7 @@
 
 			TEST_FREE_TAG (event);
 
-			class = job_class_new (NULL, "foo");
+			class = job_class_new (NULL, "foo", NULL);
 
 			job = job_new (class, "");
 			job->goal = JOB_STOP;
@@ -1846,7 +1846,7 @@
 
 			TEST_FREE_TAG (event);
 
-			class = job_class_new (NULL, "foo");
+			class = job_class_new (NULL, "foo", NULL);
 
 			job = job_new (class, "");
 			job->goal = JOB_START;
@@ -1889,7 +1889,7 @@
 
 			TEST_FREE_TAG (event);
 
-			class = job_class_new (NULL, "foo");
+			class = job_class_new (NULL, "foo", NULL);
 			class->process[PROCESS_POST_STOP] = process_new (class);
 			class->process[PROCESS_POST_STOP]->command = "echo";
 
@@ -1934,7 +1934,7 @@
 
 			TEST_FREE_TAG (event);
 
-			class = job_class_new (NULL, "foo");
+			class = job_class_new (NULL, "foo", NULL);
 			class->process[PROCESS_PRE_START] = process_new (class);
 			class->process[PROCESS_PRE_START]->command = "echo";
 
@@ -1974,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-06-06 15:17:24 +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	2010-12-14 15:32:41 +0000
+++ init/tests/test_job.c	2011-06-06 15:17:24 +0000
@@ -86,7 +86,7 @@
 	 * list of the class and have sensible defaults.
 	 */
 	TEST_FEATURE ("with no name");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	class->stop_on = event_operator_new (class, EVENT_MATCH, "baz", NULL);
 
 	TEST_ALLOC_FAIL {
@@ -284,7 +284,7 @@
 	 * using its path, and have a InstanceAdded signal emitted.
 	 */
 	TEST_FEATURE ("with signal emission");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "fred");
 
 	assert (dbus_connection_get_object_path_data (conn, job->path,
@@ -324,7 +324,7 @@
 	 * is still registered.
 	 */
 	TEST_FEATURE ("without signal emission");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "fred");
 
 	assert (dbus_connection_get_object_path_data (conn, job->path,
@@ -359,7 +359,6 @@
 
 	nih_free (class);
 
-
 	TEST_DBUS_CLOSE (conn);
 	TEST_DBUS_CLOSE (client_conn);
 	TEST_DBUS_END (dbus_pid);
@@ -386,7 +385,7 @@
 
 	program_name = "test";
 
-	class = job_class_new (NULL, "test");
+	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);
@@ -691,7 +690,7 @@
 	TEST_FILENAME (dirname);
 	mkdir (dirname, 0700);
 
-	class = job_class_new (NULL, "test");
+	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);
@@ -3736,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");
+			file->job = job_class_new (NULL, "test", NULL);
 			replacement = file->job;
 
 			job = job_new (class, "");
@@ -3805,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");
+			file->job = job_class_new (NULL, "test", NULL);
 			replacement = file->job;
 
 			job = job_new (class, "");
@@ -3882,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");
+	file->job = job_class_new (NULL, "test", NULL);
 	replacement = file->job;
 
 	class->deleted = TRUE;
@@ -3951,11 +3950,11 @@
 void
 test_next_state (void)
 {
-	JobClass *class;
+	JobClass  *class;
 	Job       *job;
 
 	TEST_FUNCTION ("job_next_state");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	class->process[PROCESS_MAIN] = process_new (class);
 	class->process[PROCESS_MAIN]->command = "echo";
 
@@ -4210,7 +4209,7 @@
 	 * as failed before freeing the blocking list.
 	 */
 	TEST_FEATURE ("with no current failure");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	event1 = event_new (NULL, "foo", NULL);
@@ -4251,7 +4250,7 @@
 	 * since these were added after the first failure.
 	 */
 	TEST_FEATURE ("with previous failure");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 	job->failed = TRUE;
 	job->failed_process = PROCESS_PRE_START;
@@ -4289,7 +4288,6 @@
 
 	nih_free (class);
 
-
 	event_poll ();
 }
 
@@ -4307,7 +4305,7 @@
 	 * is unblocked and the list itself is then freed.
 	 */
 	TEST_FEATURE ("with blocked events");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	event1 = event_new (NULL, "foo", NULL);
@@ -4343,7 +4341,7 @@
 	 * unblocked and marked as failed.
 	 */
 	TEST_FEATURE ("with blocked events and failure");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	event1 = event_new (NULL, "foo", NULL);
@@ -4379,7 +4377,7 @@
 	 * still works (and just does nothing).
 	 */
 	TEST_FEATURE ("without blocked events");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job_finished (job, TRUE);
@@ -4388,7 +4386,6 @@
 
 	nih_free (class);
 
-
 	event_poll ();
 }
 
@@ -4407,7 +4404,7 @@
 	 * event event emitted with the job name set.
 	 */
 	TEST_FEATURE ("with singleton in starting state");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 
 	job = job_new (class, "");
 	job->goal = JOB_START;
@@ -4446,7 +4443,7 @@
 	 * instance name set.
 	 */
 	TEST_FEATURE ("with instance in starting state");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "foo");
@@ -4486,7 +4483,7 @@
 	 * event emitted with the job name set.
 	 */
 	TEST_FEATURE ("with singleton in running state");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 
 	job = job_new (class, "");
 	job->goal = JOB_START;
@@ -4516,7 +4513,7 @@
 	 * instance name set.
 	 */
 	TEST_FEATURE ("with instance in running state");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "foo");
@@ -4548,7 +4545,7 @@
 	 * result as "ok"
 	 */
 	TEST_FEATURE ("with non-failed singleton in stopping state");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 
 	job = job_new (class, "");
 	job->goal = JOB_STOP;
@@ -4588,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");
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "foo");
@@ -4631,7 +4628,7 @@
 	 * exit status members set.
 	 */
 	TEST_FEATURE ("with failed singleton in stopping state");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 
 	job = job_new (class, "");
 	job->goal = JOB_STOP;
@@ -4677,7 +4674,7 @@
 	 * set before the result information.
 	 */
 	TEST_FEATURE ("with failed instance in stopping state");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "foo");
@@ -4725,7 +4722,7 @@
 	 * members set.
 	 */
 	TEST_FEATURE ("with killed singleton in stopping state");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 
 	job = job_new (class, "");
 	job->goal = JOB_STOP;
@@ -4771,7 +4768,7 @@
 	 * result information.
 	 */
 	TEST_FEATURE ("with killed instance in stopping state");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "foo");
@@ -4819,7 +4816,7 @@
 	 * signal members set.
 	 */
 	TEST_FEATURE ("with unknown killed singleton in stopping state");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 
 	job = job_new (class, "");
 	job->goal = JOB_STOP;
@@ -4865,7 +4862,7 @@
 	 * the result information.
 	 */
 	TEST_FEATURE ("with unknown killed instance in stopping state");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "foo");
@@ -4912,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");
+	class = job_class_new (NULL, "test", NULL);
 
 	job = job_new (class, "");
 	job->goal = JOB_STOP;
@@ -4957,7 +4954,7 @@
 	 * the result information.
 	 */
 	TEST_FEATURE ("with unstarted instance in stopping state");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "foo");
@@ -5003,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");
+	class = job_class_new (NULL, "test", NULL);
 
 	job = job_new (class, "");
 	job->goal = JOB_STOP;
@@ -5048,7 +5045,7 @@
 	 * information.
 	 */
 	TEST_FEATURE ("with failed respawn instance in stopping state");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "foo");
@@ -5094,7 +5091,7 @@
 	 * result as "ok"
 	 */
 	TEST_FEATURE ("with non-failed singleton in stopped state");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 
 	job = job_new (class, "");
 	job->goal = JOB_STOP;
@@ -5125,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");
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "foo");
@@ -5159,7 +5156,7 @@
 	 * exit status members set.
 	 */
 	TEST_FEATURE ("with failed singleton in waiting state");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 
 	job = job_new (class, "");
 	job->goal = JOB_STOP;
@@ -5196,7 +5193,7 @@
 	 * set before the result information.
 	 */
 	TEST_FEATURE ("with failed instance in waiting state");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "foo");
@@ -5235,7 +5232,7 @@
 	 * members set.
 	 */
 	TEST_FEATURE ("with killed singleton in waiting state");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 
 	job = job_new (class, "");
 	job->goal = JOB_STOP;
@@ -5272,7 +5269,7 @@
 	 * result information.
 	 */
 	TEST_FEATURE ("with killed instance in waiting state");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "foo");
@@ -5311,7 +5308,7 @@
 	 * signal members set.
 	 */
 	TEST_FEATURE ("with unknown killed singleton in waiting state");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 
 	job = job_new (class, "");
 	job->goal = JOB_STOP;
@@ -5348,7 +5345,7 @@
 	 * the result information.
 	 */
 	TEST_FEATURE ("with unknown killed instance in waiting state");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "foo");
@@ -5386,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");
+	class = job_class_new (NULL, "test", NULL);
 
 	job = job_new (class, "");
 	job->goal = JOB_STOP;
@@ -5422,7 +5419,7 @@
 	 * the result information.
 	 */
 	TEST_FEATURE ("with unstarted instance in waiting state");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "foo");
@@ -5459,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");
+	class = job_class_new (NULL, "test", NULL);
 
 	job = job_new (class, "");
 	job->goal = JOB_STOP;
@@ -5495,7 +5492,7 @@
 	 * information.
 	 */
 	TEST_FEATURE ("with failed respawn instance in waiting state");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "foo");
@@ -5540,7 +5537,7 @@
 
 	/* Check that the name of a non-instance job is returned. */
 	TEST_FEATURE ("with non-instance job");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	TEST_ALLOC_FAIL {
@@ -5554,7 +5551,7 @@
 
 	/* Check that the name of an instance job is returned. */
 	TEST_FEATURE ("with instance job");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 	job = job_new (class, "foo");
 
@@ -5571,7 +5568,7 @@
 	 * value.
 	 */
 	TEST_FEATURE ("with multiple calls");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	ret = job_name (job);
@@ -5842,7 +5839,6 @@
 	NihError        *error;
 	NihDBusError    *dbus_error;
 
-
 	TEST_FUNCTION ("job_start");
 	nih_error_init ();
 	nih_main_loop_init ();
@@ -5858,8 +5854,9 @@
 	 * the reply will be sent to the sender.
 	 */
 	TEST_FEATURE ("with stopping job");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
+	TEST_NE_P (job, NULL);
 
 	job->goal = JOB_STOP;
 	job->state = JOB_STOPPING;
@@ -5944,7 +5941,7 @@
 	 * and no blocking entry created.
 	 */
 	TEST_FEATURE ("with no wait");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_STOP;
@@ -6014,7 +6011,7 @@
 	 * a D-Bus error is raised immediately.
 	 */
 	TEST_FEATURE ("with starting job");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_START;
@@ -6062,7 +6059,6 @@
 
 	nih_free (class);
 
-
 	TEST_DBUS_CLOSE (conn);
 	TEST_DBUS_CLOSE (client_conn);
 	TEST_DBUS_END (dbus_pid);
@@ -6087,7 +6083,6 @@
 	NihError        *error;
 	NihDBusError    *dbus_error;
 
-
 	TEST_FUNCTION ("job_stop");
 	nih_error_init ();
 	nih_main_loop_init ();
@@ -6103,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");
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_START;
@@ -6182,7 +6177,7 @@
 	 * no blocking entry created.
 	 */
 	TEST_FEATURE ("with no wait");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_START;
@@ -6248,7 +6243,7 @@
 	 * a D-Bus error is raised immediately.
 	 */
 	TEST_FEATURE ("with stopping job");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_STOP;
@@ -6296,7 +6291,6 @@
 
 	nih_free (class);
 
-
 	TEST_DBUS_CLOSE (conn);
 	TEST_DBUS_CLOSE (client_conn);
 	TEST_DBUS_END (dbus_pid);
@@ -6321,7 +6315,6 @@
 	NihError        *error;
 	NihDBusError    *dbus_error;
 
-
 	TEST_FUNCTION ("job_restart");
 	nih_error_init ();
 	nih_main_loop_init ();
@@ -6337,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");
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_START;
@@ -6426,7 +6419,7 @@
 	 * and no blocking entry created.
 	 */
 	TEST_FEATURE ("with no wait");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_START;
@@ -6499,7 +6492,7 @@
 	 * a D-Bus error is raised immediately.
 	 */
 	TEST_FEATURE ("with stopping job");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_STOP;
@@ -6547,7 +6540,6 @@
 
 	nih_free (class);
 
-
 	TEST_DBUS_CLOSE (conn);
 	TEST_DBUS_CLOSE (client_conn);
 	TEST_DBUS_END (dbus_pid);
@@ -6578,7 +6570,7 @@
 	TEST_FEATURE ("with instance name");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 			job = job_new (class, "instance name");
 
 			message = nih_new (NULL, NihDBusMessage);
@@ -6618,7 +6610,7 @@
 	TEST_FEATURE ("with no instance name");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 			job = job_new (class, "");
 
 			message = nih_new (NULL, NihDBusMessage);
@@ -6671,7 +6663,7 @@
 
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 			job = job_new (class, "");
 			job->goal = JOB_START;
 
@@ -6725,7 +6717,7 @@
 
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 			job = job_new (class, "");
 			job->goal = JOB_START;
 			job->state = JOB_RUNNING;
@@ -6783,7 +6775,7 @@
 	TEST_FEATURE ("with no processes");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 			job = job_new (class, "");
 			job->goal = JOB_START;
 			job->state = JOB_STARTING;
@@ -6827,7 +6819,7 @@
 	TEST_FEATURE ("with pre-start process");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 			class->process[PROCESS_PRE_START] = process_new (class);
 			class->process[PROCESS_PRE_START]->command = "echo";
 
@@ -6882,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");
+			class = job_class_new (NULL, "test", NULL);
 			class->process[PROCESS_POST_START] = process_new (class);
 			class->process[PROCESS_POST_START]->command = "echo";
 
@@ -6936,7 +6928,7 @@
 	TEST_FEATURE ("with main process");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 			class->process[PROCESS_MAIN] = process_new (class);
 			class->process[PROCESS_MAIN]->command = "echo";
 
@@ -6991,7 +6983,7 @@
 	TEST_FEATURE ("with main process and post-start process");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test");
+			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);
@@ -7055,7 +7047,7 @@
 	TEST_FEATURE ("with main process and pre-stop process");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test");
+			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);
@@ -7119,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");
+			class = job_class_new (NULL, "test", NULL);
 			class->process[PROCESS_PRE_STOP] = process_new (class);
 			class->process[PROCESS_PRE_STOP]->command = "echo";
 
@@ -7173,7 +7165,7 @@
 	TEST_FEATURE ("with post-stop process");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 			class->process[PROCESS_POST_STOP] = process_new (class);
 			class->process[PROCESS_POST_STOP]->command = "echo";
 
@@ -7226,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-05-12 20:42:28 +0000
+++ init/tests/test_job_class.c	2011-06-06 15:17:24 +0000
@@ -2,7 +2,6 @@
  *
  * test_job_class.c - test suite for init/job_class.c
  *
- * Copyright © 2011 Google Inc.
  * Copyright © 2010 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
@@ -66,7 +65,7 @@
 {
 	JobClass *class;
 	int       i;
-
+	       
 	/* Check that we can create a new JobClass structure; the structure
 	 * should be allocated with nih_alloc but not placed in the jobs
 	 * hash.
@@ -75,8 +74,7 @@
 	job_class_init ();
 
 	TEST_ALLOC_FAIL {
-		class = job_class_new (NULL, "test");
-
+		class = job_class_new (NULL, "test", NULL);
 		if (test_alloc_failed) {
 			TEST_EQ_P (class, NULL);
 			continue;
@@ -180,15 +178,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");
+	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");
+	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");
+	class3 = file3->job = job_class_new (NULL, "frodo", NULL);
 
 
 	control_init ();
@@ -381,7 +379,7 @@
 	 * becomes the hash table member.
 	 */
 	TEST_FEATURE ("with replacable registered class and not best class");
-	class4 = job_class_new (NULL, "frodo");
+	class4 = job_class_new (NULL, "frodo", NULL);
 	nih_hash_add (job_classes, &class4->entry);
 	job_class_register (class4, conn, FALSE);
 
@@ -479,15 +477,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");
+	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");
+	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");
+	class3 = file3->job = job_class_new (NULL, "frodo", NULL);
 
 
 	control_init ();
@@ -720,7 +718,7 @@
 	nih_free (source2);
 	nih_free (source1);
 
-	class4 = job_class_new (NULL, "frodo");
+	class4 = job_class_new (NULL, "frodo", NULL);
 	nih_hash_add (job_classes, &class4->entry);
 	job_class_register (class4, conn, FALSE);
 
@@ -789,7 +787,7 @@
 	 * announce it.
 	 */
 	TEST_FEATURE ("with signal emission");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 
 	assert (dbus_connection_get_object_path_data (conn, class->path,
 						      (void **)&object));
@@ -826,7 +824,7 @@
 	 * by emitting a signal immediately afterwards.
 	 */
 	TEST_FEATURE ("without signal emission");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 
 	assert (dbus_connection_get_object_path_data (conn, class->path,
 						      (void **)&object));
@@ -860,7 +858,6 @@
 
 	nih_free (class);
 
-
 	TEST_DBUS_CLOSE (conn);
 	TEST_DBUS_CLOSE (client_conn);
 	TEST_DBUS_END (dbus_pid);
@@ -895,7 +892,7 @@
 	assert (! dbus_error_is_set (&dbus_error));
 
 
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 
 	assert (dbus_connection_get_object_path_data (conn, class->path,
 						      (void **)&object));
@@ -931,7 +928,6 @@
 
 	nih_free (class);
 
-
 	TEST_DBUS_CLOSE (conn);
 	TEST_DBUS_CLOSE (client_conn);
 	TEST_DBUS_END (dbus_pid);
@@ -953,7 +949,7 @@
 	 * just have the built-ins in the returned environment.
 	 */
 	TEST_FEATURE ("with no configured environment");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 
 	TEST_ALLOC_FAIL {
 		env = job_class_environment (NULL, class, &len);
@@ -983,7 +979,7 @@
 	 * will have those appended to the environment as well as the builtins.
 	 */
 	TEST_FEATURE ("with configured environment");
-	class = job_class_new (NULL, "test");
+	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"));
@@ -1020,7 +1016,7 @@
 	/* Check that configured environment override built-ins.
 	 */
 	TEST_FEATURE ("with configuration overriding built-ins");
-	class = job_class_new (NULL, "test");
+	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"));
@@ -1068,7 +1064,6 @@
 	NihError        *error;
 	NihDBusError    *dbus_error;
 
-
 	TEST_FUNCTION ("job_class_get_instance");
 	nih_error_init ();
 
@@ -1079,7 +1074,7 @@
 	TEST_FEATURE ("with running job");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 			job = job_new (class, "");
 
 			message = nih_new (NULL, NihDBusMessage);
@@ -1116,7 +1111,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");
+	class = job_class_new (NULL, "test", NULL);
 
 	message = nih_new (NULL, NihDBusMessage);
 	message->connection = NULL;
@@ -1147,7 +1142,7 @@
 	TEST_FEATURE ("with environment");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 			class->instance = "$FOO";
 
 			job = job_new (class, "wibble");
@@ -1191,7 +1186,7 @@
 	 * is returned.
 	 */
 	TEST_FEATURE ("with invalid environment");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "wibble");
@@ -1234,7 +1229,7 @@
 	TEST_FUNCTION ("job_class_get_instance_by_name");
 	nih_error_init ();
 
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 
 
 	/* Check that when given a known instance name, the path to that
@@ -1364,7 +1359,7 @@
 	nih_error_init ();
 	job_class_init ();
 
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 
 
 	/* Check that paths for each of the active instances are returned
@@ -1461,7 +1456,6 @@
 		nih_free (message);
 	}
 
-
 	nih_free (class);
 }
 
@@ -1483,7 +1477,6 @@
 	NihError        *error;
 	NihDBusError    *dbus_error;
 
-
 	TEST_FUNCTION ("job_class_start");
 	nih_error_init ();
 	nih_main_loop_init ();
@@ -1499,7 +1492,7 @@
 	 * the reply will be sent to the sender.
 	 */
 	TEST_FEATURE ("with new job");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 
 	method = dbus_message_new_method_call (
 		dbus_bus_get_unique_name (conn),
@@ -1590,7 +1583,7 @@
 	 * immediately and the job not blocked.
 	 */
 	TEST_FEATURE ("with no wait");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 
 	method = dbus_message_new_method_call (
 		dbus_bus_get_unique_name (conn),
@@ -1670,7 +1663,7 @@
 	 * it through to running, the reply will be sent to the sender.
 	 */
 	TEST_FEATURE ("with stopping job");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_STOP;
@@ -1771,7 +1764,7 @@
 	 * a D-Bus error is raised immediately.
 	 */
 	TEST_FEATURE ("with starting job");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_START;
@@ -1827,7 +1820,7 @@
 	 * when it's starting.
 	 */
 	TEST_FEATURE ("with environment");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	method = dbus_message_new_method_call (
@@ -1928,7 +1921,7 @@
 	 * is returned.
 	 */
 	TEST_FEATURE ("with invalid environment");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 
 	method = dbus_message_new_method_call (
 		dbus_bus_get_unique_name (conn),
@@ -1974,7 +1967,6 @@
 
 	nih_free (class);
 
-
 	TEST_DBUS_CLOSE (conn);
 	TEST_DBUS_CLOSE (client_conn);
 	TEST_DBUS_END (dbus_pid);
@@ -2000,7 +1992,6 @@
 	NihError        *error;
 	NihDBusError    *dbus_error;
 
-
 	TEST_FUNCTION ("job_class_stop");
 	nih_error_init ();
 	nih_main_loop_init ();
@@ -2016,7 +2007,7 @@
 	 * will be sent to the sender.
 	 */
 	TEST_FEATURE ("with running job");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_START;
@@ -2099,7 +2090,7 @@
 	 * and no blocking entry created.
 	 */
 	TEST_FEATURE ("with no wait");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_START;
@@ -2169,7 +2160,7 @@
 	 * a D-Bus error is raised immediately.
 	 */
 	TEST_FEATURE ("with stopping job");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_STOP;
@@ -2224,7 +2215,7 @@
 	 * immediately.
 	 */
 	TEST_FEATURE ("with unknown job");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 
 	method = dbus_message_new_method_call (
 		dbus_bus_get_unique_name (conn),
@@ -2273,7 +2264,7 @@
 	 * for the pre-stop script.
 	 */
 	TEST_FEATURE ("with environment");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "wibble");
@@ -2362,7 +2353,7 @@
 	 * is returned.
 	 */
 	TEST_FEATURE ("with invalid environment");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_START;
@@ -2410,7 +2401,6 @@
 
 	nih_free (class);
 
-
 	TEST_DBUS_CLOSE (conn);
 	TEST_DBUS_CLOSE (client_conn);
 	TEST_DBUS_END (dbus_pid);
@@ -2437,7 +2427,6 @@
 	NihError        *error;
 	NihDBusError    *dbus_error;
 
-
 	TEST_FUNCTION ("job_class_restart");
 	nih_error_init ();
 	nih_main_loop_init ();
@@ -2453,7 +2442,7 @@
 	 * through to waiting, the reply will be sent to the sender.
 	 */
 	TEST_FEATURE ("with running job");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_START;
@@ -2550,7 +2539,7 @@
 	 * entry created.
 	 */
 	TEST_FEATURE ("with no wait");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_START;
@@ -2631,7 +2620,7 @@
 	 * a D-Bus error is raised immediately.
 	 */
 	TEST_FEATURE ("with stopping job");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_STOP;
@@ -2686,7 +2675,7 @@
 	 * immediately.
 	 */
 	TEST_FEATURE ("with unknown job");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 
 	method = dbus_message_new_method_call (
 		dbus_bus_get_unique_name (conn),
@@ -2735,7 +2724,7 @@
 	 * when it's starting again.
 	 */
 	TEST_FEATURE ("with environment");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	class->instance = "$FOO";
 
 	job = job_new (class, "wibble");
@@ -2848,7 +2837,7 @@
 	 * is returned.
 	 */
 	TEST_FEATURE ("with invalid environment");
-	class = job_class_new (NULL, "test");
+	class = job_class_new (NULL, "test", NULL);
 	job = job_new (class, "");
 
 	job->goal = JOB_START;
@@ -2896,7 +2885,6 @@
 
 	nih_free (class);
 
-
 	TEST_DBUS_CLOSE (conn);
 	TEST_DBUS_CLOSE (client_conn);
 	TEST_DBUS_END (dbus_pid);
@@ -2925,7 +2913,7 @@
 
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 
 			message = nih_new (NULL, NihDBusMessage);
 			message->connection = NULL;
@@ -2977,7 +2965,7 @@
 	TEST_FEATURE ("with description");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 			class->description = nih_strdup (class, "a test job");
 
 			message = nih_new (NULL, NihDBusMessage);
@@ -3017,7 +3005,7 @@
 	TEST_FEATURE ("with no description");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 
 			message = nih_new (NULL, NihDBusMessage);
 			message->connection = NULL;
@@ -3069,7 +3057,7 @@
 	TEST_FEATURE ("with author");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 			class->author = nih_strdup (class, "a test job");
 
 			message = nih_new (NULL, NihDBusMessage);
@@ -3109,7 +3097,7 @@
 	TEST_FEATURE ("with no author");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 
 			message = nih_new (NULL, NihDBusMessage);
 			message->connection = NULL;
@@ -3161,7 +3149,7 @@
 	TEST_FEATURE ("with version");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 			class->version = nih_strdup (class, "a test job");
 
 			message = nih_new (NULL, NihDBusMessage);
@@ -3201,7 +3189,7 @@
 	TEST_FEATURE ("with no version");
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 
 			message = nih_new (NULL, NihDBusMessage);
 			message->connection = NULL;
@@ -3256,7 +3244,7 @@
 
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 
 			class->start_on = event_operator_new (
 				class, EVENT_OR, NULL, NULL);
@@ -3351,7 +3339,7 @@
 
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 
 			message = nih_new (NULL, NihDBusMessage);
 			message->connection = NULL;
@@ -3407,7 +3395,7 @@
 
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);
 
 			class->stop_on = event_operator_new (
 				class, EVENT_OR, NULL, NULL);
@@ -3502,7 +3490,7 @@
 
 	TEST_ALLOC_FAIL {
 		TEST_ALLOC_SAFE {
-			class = job_class_new (NULL, "test");
+			class = job_class_new (NULL, "test", NULL);