Merge lp:~jamesodhunt/ubuntu/natty/upstart/fix-for-bug-767053 into lp:ubuntu/natty/upstart

[James Hunt]

* control_get_job_by_name: Fix to relax session rigidity for user
  sessions (allow user sessions to see into the global
  namespace for backwards compatability) (LP: #767053).

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2011-04-15 14:37:13 +0000
+++ ChangeLog	2011-04-20 17:16:42 +0000
@@ -1,3 +1,9 @@
[phone]  James Hunt  <[e-mail]>
+
+	* control_get_job_by_name: Fix to relax session rigidity for user
+	  sessions (allow user sessions to see into the global
+	  namespace for backwards compatability) (LP: #767053).
+
 2011-04-15  James Hunt  <[e-mail]>
 
 	* init/conf.c:

=== modified file 'NEWS'
--- NEWS	2011-04-15 14:37:13 +0000
+++ NEWS	2011-04-20 17:16:42 +0000
@@ -1,3 +1,9 @@
+0.9.7  2011-04-20
+
+	* Fix for user sessions to retain backwards compatibility behaviour
+	  where a non-privileged user can enquire on jobs owned by the
+	  global namespace.
+
 0.9.6  2011-04-15
 
 	* Fix for nasty OOM scenario when an attempt is made to start

=== modified file 'configure.ac'
--- configure.ac	2011-04-15 14:37:13 +0000
+++ configure.ac	2011-04-20 17:16:42 +0000
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT([upstart], [0.9.6], [[e-mail]])
+AC_INIT([upstart], [0.9.7], [[e-mail]])
 NIH_COPYRIGHT([[Copyright © 2011 Canonical Ltd.]])
 AC_CONFIG_SRCDIR([init/main.c])
 AC_CONFIG_MACRO_DIR([m4])

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-20 16:37:10 +0000
+++ debian/changelog	2011-04-20 17:16:42 +0000
@@ -1,3 +1,9 @@
+upstart (0.9.7-1) natty; urgency=low
+
+  * New upstream release 0.9.7: Important session fix (LP: #767053).
+
+ -- James Hunt <[e-mail]>  Wed, 20 Apr 2011 17:44:41 +0100
+
 upstart (0.9.6-1ubuntu1) natty; urgency=low
 
   [ James Hunt ]

=== modified file 'init/control.c'
--- init/control.c	2011-04-06 16:35:39 +0000
+++ init/control.c	2011-04-20 17:16:42 +0000
@@ -419,20 +419,21 @@
 	/* Lookup the job */
 	class = (JobClass *)nih_hash_search (job_classes, name, NULL);
 
-	while (class && class->session != session) {
-		class = (JobClass *)nih_hash_search (job_classes, name, &class->entry);
-	}
-
-	if (class && ! session)
-		class->session = session;
-
 	while (class && (class->session != session)) {
-		if ((! class->session) && (! session->chroot))
+
+		/* 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);
+				&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;
 

=== modified file 'po/upstart.pot'
--- po/upstart.pot	2011-04-15 13:40:25 +0000
+++ po/upstart.pot	2011-04-20 17:16:42 +0000
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: upstart 0.9.5\n"
+"Project-Id-Version: upstart 0.9.6\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-04-15 12:11+0100\n"
+"POT-Creation-Date: 2011-04-20 17:07+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -67,21 +67,21 @@
 msgid "Reloading configuration"
 msgstr ""
 
-#: init/control.c:412 init/control.c:565
+#: init/control.c:412 init/control.c:566
 msgid "Name may not be empty string"
 msgstr ""
 
-#: init/control.c:442
+#: init/control.c:443
 #, c-format
 msgid "Unknown job: %s"
 msgstr ""
 
-#: init/control.c:573 init/job_class.c:579 init/job_class.c:778
+#: init/control.c:574 init/job_class.c:579 init/job_class.c:778
 #: init/job_class.c:908 init/job_class.c:1043
 msgid "Env must be KEY=VALUE pairs"
 msgstr ""
 
-#: init/control.c:742
+#: init/control.c:743
 msgid "The log priority given was not recognised"
 msgstr ""