Revision
22992
Author
zarzycki@apple.com
Date
2006-12-19 08:38:37 -0800 (Tue, 19 Dec 2006)

Log Message

Use the assumes() macro in more places.

Modified Paths

Diff

Modified: trunk/launchd/src/launchd_core_logic.c (22991 => 22992)


--- trunk/launchd/src/launchd_core_logic.c	2006-12-19 16:35:11 UTC (rev 22991)
+++ trunk/launchd/src/launchd_core_logic.c	2006-12-19 16:38:37 UTC (rev 22992)
@@ -1977,8 +1977,7 @@
 		_exit(EXIT_FAILURE);
 	}
 
-	if (-1 == setgid(desired_gid)) {
-		job_log_error(j, LOG_ERR, "setgid(%u)", desired_gid);
+	if (!job_assumes(j, setgid(desired_gid) != -1)) {
 		_exit(EXIT_FAILURE);
 	}
 
@@ -1988,14 +1987,12 @@
 	 */
 
 	if (!j->no_init_groups) {
-		if (initgroups(loginname, desired_gid) == -1) {
-			job_log_error(j, LOG_ERR, "initgroups()");
+		if (!job_assumes(j, initgroups(loginname, desired_gid) != -1)) {
 			_exit(EXIT_FAILURE);
 		}
 	}
 
-	if (-1 == setuid(desired_uid)) {
-		job_log_error(j, LOG_ERR, "setuid(%u)", desired_uid);
+	if (!job_assumes(j, setuid(desired_uid) != -1)) {
 		_exit(EXIT_FAILURE);
 	}