Revision: 23720 http://trac.macosforge.org/projects/launchd/changeset/23720 Author: dsorresso@apple.com Date: 2008-10-08 17:27:04 -0700 (Wed, 08 Oct 2008) Log Message: ----------- rdar://problem/6274978. Conditionalized some new stuff for when the Embedded folks sync up. Modified Paths: -------------- branches/SULeopard/launchd/src/launchctl.c branches/SULeopard/launchd/src/launchd_core_logic.c Modified: branches/SULeopard/launchd/src/launchctl.c =================================================================== --- branches/SULeopard/launchd/src/launchctl.c 2008-10-03 00:22:00 UTC (rev 23719) +++ branches/SULeopard/launchd/src/launchctl.c 2008-10-09 00:27:04 UTC (rev 23720) @@ -1414,6 +1414,13 @@ assumes(fwexec(rcserver_tool, true) != -1); } +#if TARGET_OS_EMBEDDED + if (path_check("/etc/rc.boot")) { + const char *rcboot_tool[] = { "/etc/rc.boot", NULL }; + assumes(fwexec(rcboot_tool, true) != -1); + } +#endif + apply_sysctls_from_file("/etc/sysctl.conf"); if (path_check("/etc/rc.cdrom")) { Modified: branches/SULeopard/launchd/src/launchd_core_logic.c =================================================================== --- branches/SULeopard/launchd/src/launchd_core_logic.c 2008-10-03 00:22:00 UTC (rev 23719) +++ branches/SULeopard/launchd/src/launchd_core_logic.c 2008-10-09 00:27:04 UTC (rev 23720) @@ -420,7 +420,9 @@ static bool job_setup_machport(job_t j); static void job_setup_fd(job_t j, int target_fd, const char *path, int flags); static void job_postfork_become_user(job_t j); +#if !TARGET_OS_EMBEDDED static void job_enable_audit_for_user(job_t j, uid_t u, char *name); +#endif static void job_find_and_blame_pids_with_weird_uids(job_t j); static void job_force_sampletool(job_t j); static void job_setup_exception_port(job_t j, task_t target_task); @@ -2925,6 +2927,7 @@ free(kp); } +#if !TARGET_OS_EMBEDDED void job_enable_audit_for_user(job_t j, uid_t u, char *name) { @@ -2946,6 +2949,7 @@ } } } +#endif void job_postfork_become_user(job_t j) @@ -3024,7 +3028,9 @@ desired_gid = gre->gr_gid; } +#if !TARGET_OS_EMBEDDED job_enable_audit_for_user(j, desired_uid, loginname); +#endif if (!job_assumes(j, setlogin(loginname) != -1)) { _exit(EXIT_FAILURE);