Revision

23327

Author

zarzycki@apple.com

Date

2007-08-02 13:29:02 -0700 (Thu, 02 Aug 2007)

Log Message

<rdar://problem/5378922> 9A509: screen hangs on launch in root shell

Modified Paths

• trunk/launchd/src/launchd_core_logic.c
• trunk/launchd/src/libvproc.c

Diff

--- trunk/launchd/src/launchd_core_logic.c	2007-08-01 22:11:19 UTC (rev 23326)
+++ trunk/launchd/src/launchd_core_logic.c	2007-08-02 20:29:02 UTC (rev 23327)
@@ -5658,7 +5658,11 @@
 					 */
 
 				} else if (strcmp(j->mgr->name, VPROCMGR_SESSION_AQUA) == 0) {
+					job_log(j, LOG_DEBUG, "Tried to move the Aqua session.");
 					return 0;
+				} else if (strcmp(j->mgr->name, VPROCMGR_SESSION_BACKGROUND) == 0) {
+					job_log(j, LOG_DEBUG, "Tried to move the background session.");
+					return 0;
 				} else {
 					job_log(j, LOG_ERR, "Tried to initialize an already setup session!");
 					kr = BOOTSTRAP_NOT_PRIVILEGED;

--- trunk/launchd/src/libvproc.c	2007-08-01 22:11:19 UTC (rev 23326)
+++ trunk/launchd/src/libvproc.c	2007-08-02 20:29:02 UTC (rev 23327)
@@ -111,7 +111,7 @@
 		return (vproc_err_t)_vprocmgr_move_subset_to_user;
 	}
 
-	if (ldpid != 1) {
+	if (!is_bkgd && ldpid != 1) {
 		if (lduid == getuid()) {
 			return NULL;
 		}