Revision
23894
Author
dsorresso@apple.com
Date
2009-04-14 14:34:13 -0700 (Tue, 14 Apr 2009)

Log Message

<rdar://problem/6777036> (Embedded security hardening)

Modified Paths

Diff

Modified: trunk/launchd/src/launchd_core_logic.c (23893 => 23894)


--- trunk/launchd/src/launchd_core_logic.c	2009-04-10 22:38:12 UTC (rev 23893)
+++ trunk/launchd/src/launchd_core_logic.c	2009-04-14 21:34:13 UTC (rev 23894)
@@ -755,7 +755,6 @@
 
 #if TARGET_OS_EMBEDDED
 	if( g_embedded_privileged_action && s_embedded_privileged_job ) {
-	#if 0
 		if( !job_assumes(j, s_embedded_privileged_job->username != NULL && j->username != NULL) ) {
 			errno = EPERM;
 			return;
@@ -765,9 +764,6 @@
 			errno = EPERM;
 			return;
 		}
-	#else
-		/* For now, allow this. */
-	#endif
 	} else if( g_embedded_privileged_action ) {
 		errno = EINVAL;
 		return;
@@ -2985,7 +2981,6 @@
 
 #if TARGET_OS_EMBEDDED
 	if( g_embedded_privileged_action && s_embedded_privileged_job ) {
-	#if 0
 		if( !job_assumes(j, s_embedded_privileged_job->username != NULL && j->username != NULL) ) {
 			errno = EPERM;
 			return NULL;
@@ -2995,9 +2990,6 @@
 			errno = EPERM;
 			return NULL;
 		}
-	#else
-		/* For now, allow this. */
-	#endif
 	} else if( g_embedded_privileged_action ) {
 		errno = EINVAL;
 		return NULL;