September 2007 - launchd-changes - lists.macosforge.org

[23422] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 20 Sep '07

20 Sep '07

Revision: 23422 http://trac.macosforge.org/projects/launchd/changeset/23422 Author: zarzycki(a)apple.com Date: 2007-09-20 16:22:05 -0700 (Thu, 20 Sep 2007) Log Message: ----------- We've already dropped privs. Use a different check. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-09-20 23:05:54 UTC (rev 23421) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-20 23:22:05 UTC (rev 23422) @@ -2947,7 +2947,7 @@ * believe that prevents launchd from being able to send signals to * setuid children. We'll settle for process-groups. */ - if (getuid()) { + if (getppid() != 1) { job_assumes(j, setpgid(0, 0) != -1); } else { job_assumes(j, setsid() != -1);

1 0

[23421] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 20 Sep '07

20 Sep '07

Revision: 23421 http://trac.macosforge.org/projects/launchd/changeset/23421 Author: zarzycki(a)apple.com Date: 2007-09-20 16:05:54 -0700 (Thu, 20 Sep 2007) Log Message: ----------- <rdar://problem/5495431> cannot drop to text console Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-09-20 20:26:16 UTC (rev 23420) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-20 23:05:54 UTC (rev 23421) @@ -2942,10 +2942,15 @@ setenv(ei->key, ei->value, 1); } - if (j->per_user) { + /* + * We'd like to call setsid() unconditionally, but we have reason to + * believe that prevents launchd from being able to send signals to + * setuid children. We'll settle for process-groups. + */ + if (getuid()) { + job_assumes(j, setpgid(0, 0) != -1); + } else { job_assumes(j, setsid() != -1); - } else { - job_assumes(j, setpgid(0, 0) != -1); } }

1 0

[23420] tags/launchd-252/
by source_changes＠macosforge.org 20 Sep '07

20 Sep '07

Revision: 23420 http://trac.macosforge.org/projects/launchd/changeset/23420 Author: zarzycki(a)apple.com Date: 2007-09-20 13:26:16 -0700 (Thu, 20 Sep 2007) Log Message: ----------- "Tagging launchd-252 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-252/ Copied: tags/launchd-252 (from rev 23419, trunk)

1 0

[23419] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 20 Sep '07

20 Sep '07

Revision: 23419 http://trac.macosforge.org/projects/launchd/changeset/23419 Author: zarzycki(a)apple.com Date: 2007-09-20 13:23:58 -0700 (Thu, 20 Sep 2007) Log Message: ----------- <rdar://problem/5494550> Workaround 5226811, 3524219, and 4124079 Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-09-20 01:54:50 UTC (rev 23418) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-20 20:23:58 UTC (rev 23419) @@ -359,7 +359,8 @@ unsigned int globargv:1, wait4debugger:1, unload_at_exit:1, stall_before_exec:1, only_once:1, currently_ignored:1, forced_peers_to_demand_mode:1, setnice:1, hopefully_exits_last:1, removal_pending:1, wait4pipe_eof:1, sent_sigkill:1, debug_before_kill:1, weird_bootstrap:1, start_on_mount:1, - per_user:1, hopefully_exits_first:1, deny_unknown_mslookups:1, unload_at_mig_return:1, abandon_pg:1; + per_user:1, hopefully_exits_first:1, deny_unknown_mslookups:1, unload_at_mig_return:1, abandon_pg:1, + poll_for_vfs_changes:1; const char label[0]; }; @@ -480,6 +481,11 @@ j->currently_ignored = true; + if (j->poll_for_vfs_changes) { + j->poll_for_vfs_changes = false; + job_assumes(j, kevent_mod((uintptr_t)&j->semaphores, EVFILT_TIMER, EV_DELETE, 0, 0, j) != -1); + } + SLIST_FOREACH(sg, &j->sockets, sle) { socketgroup_ignore(j, sg); } @@ -868,6 +874,9 @@ runtime_del_ref(); job_assumes(j, kevent_mod((uintptr_t)&j->start_interval, EVFILT_TIMER, EV_DELETE, 0, 0, NULL) != -1); } + if (j->poll_for_vfs_changes) { + job_assumes(j, kevent_mod((uintptr_t)&j->semaphores, EVFILT_TIMER, EV_DELETE, 0, 0, j) != -1); + } kevent_mod((uintptr_t)j, EVFILT_TIMER, EV_DELETE, 0, 0, NULL); @@ -2307,6 +2316,8 @@ { if (j == ident) { job_dispatch(j, true); + } else if (&j->semaphores == ident) { + job_dispatch(j, false); } else if (&j->start_interval == ident) { j->start_pending = true; job_dispatch(j, false); @@ -3246,7 +3257,7 @@ } if (si->fd == -1) { - return job_log_error(j, LOG_ERR, "Watchpath monitoring failed on \"%s\"", which_path); + return job_log_error(j, LOG_ERR, "Path monitoring failed on \"%s\"", which_path); } job_log(j, LOG_DEBUG, "Watching Vnode: %d", si->fd); @@ -3263,6 +3274,20 @@ si->fd = -1; } } while ((si->fd == -1) && (saved_errno == ENOENT)); + + if (saved_errno == ENOTSUP) { + /* + * 3524219 NFS needs kqueue support + * 4124079 VFS needs generic kqueue support + * 5226811 EVFILT: Launchd EVFILT_VNODE doesn't work on /dev + */ + job_log(j, LOG_DEBUG, "Falling back to polling for path: %s", si->what); + + if (!j->poll_for_vfs_changes) { + j->poll_for_vfs_changes = true; + job_assumes(j, kevent_mod((uintptr_t)&j->semaphores, EVFILT_TIMER, EV_ADD, NOTE_SECONDS, 3, j) != -1); + } + } } void @@ -3815,7 +3840,7 @@ break; case DIR_NOT_EMPTY: if (-1 == (qdir_file_cnt = dir_has_files(j, si->what))) { - job_log_error(j, LOG_ERR, "dir_has_files(\"%s\", ...)", si->what); + job_log_error(j, LOG_ERR, "Failed to count the number of files in \"%s\"", si->what); } else if (qdir_file_cnt > 0) { job_log(j, LOG_DEBUG, "KeepAlive: Directory is not empty: %s", si->what); return true;

1 0

[23418] tags/launchd-251/
by source_changes＠macosforge.org 20 Sep '07

20 Sep '07

Revision: 23418 http://trac.macosforge.org/projects/launchd/changeset/23418 Author: kvv(a)apple.com Date: 2007-09-19 18:54:50 -0700 (Wed, 19 Sep 2007) Log Message: ----------- "Tagging launchd-251 from http://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-251/ Copied: tags/launchd-251 (from rev 23417, trunk)

1 0

[23417] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 19 Sep '07

19 Sep '07

Revision: 23417 http://trac.macosforge.org/projects/launchd/changeset/23417 Author: zarzycki(a)apple.com Date: 2007-09-19 15:30:56 -0700 (Wed, 19 Sep 2007) Log Message: ----------- <rdar://problem/5492855> 9A558: Adobe Creative Suite 3 installer dies after auth and initialization dialog Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-09-19 22:00:26 UTC (rev 23416) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-19 22:30:56 UTC (rev 23417) @@ -6378,6 +6378,7 @@ jr->unload_at_exit = true; jr->wait4pipe_eof = true; + jr->abandon_pg = true; jr->stall_before_exec = jr->wait4debugger; jr->wait4debugger = false;

1 0

[23416] tags/launchd-250/
by source_changes＠macosforge.org 19 Sep '07

19 Sep '07

Revision: 23416 http://trac.macosforge.org/projects/launchd/changeset/23416 Author: zarzycki(a)apple.com Date: 2007-09-19 15:00:26 -0700 (Wed, 19 Sep 2007) Log Message: ----------- "Tagging launchd-250 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-250/ Copied: tags/launchd-250 (from rev 23415, trunk)

1 0

[23415] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 19 Sep '07

19 Sep '07

Revision: 23415 http://trac.macosforge.org/projects/launchd/changeset/23415 Author: zarzycki(a)apple.com Date: 2007-09-19 11:39:28 -0700 (Wed, 19 Sep 2007) Log Message: ----------- <rdar://problem/5492240> Code audit: order of operations problem can hang shutdown Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-09-19 17:47:36 UTC (rev 23414) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-19 18:39:28 UTC (rev 23415) @@ -2015,7 +2015,7 @@ j->weird_bootstrap = false; } - if (j->log_redirect_fd && (!j->wait4pipe_eof || j->mgr->shutting_down)) { + if (j->log_redirect_fd && !j->wait4pipe_eof) { job_assumes(j, runtime_close(j->log_redirect_fd) != -1); j->log_redirect_fd = 0; } @@ -3844,14 +3844,20 @@ { struct machservice *ms; - if (j->wait4pipe_eof && j->log_redirect_fd) { - return "Standard out/error is still valid"; - } - if (j->p) { return "PID is still valid"; } + if (j->mgr->shutting_down && j->log_redirect_fd) { + job_assumes(j, runtime_close(j->log_redirect_fd) != -1); + j->log_redirect_fd = 0; + } + + if (j->log_redirect_fd) { + job_assumes(j, j->wait4pipe_eof); + return "Standard out/error is still valid"; + } + if (j->priv_port_has_senders) { return "Privileged Port still has outstanding senders"; }

1 0

[23414] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 19 Sep '07

19 Sep '07

Revision: 23414 http://trac.macosforge.org/projects/launchd/changeset/23414 Author: zarzycki(a)apple.com Date: 2007-09-19 10:47:36 -0700 (Wed, 19 Sep 2007) Log Message: ----------- Duh. Don't log when PID == PGID. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-09-19 17:41:53 UTC (rev 23413) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-19 17:47:36 UTC (rev 23414) @@ -1983,8 +1983,10 @@ const char *z = (kp[i].kp_proc.p_stat == SZOMB) ? "zombie " : ""; const char *n = kp[i].kp_proc.p_comm; - if (!job_assumes(j, p_i != 0 && p_i != 1)) { + if (p_i == j->p) { continue; + } else if (!job_assumes(j, p_i != 0 && p_i != 1)) { + continue; } job_log(j, LOG_WARNING, "Stray %sprocess with PGID equal to this dead job: PID %u PPID %u %s", z, p_i, pp_i, n); @@ -2031,8 +2033,8 @@ * The job is dead. While the PID/PGID is still known to be * valid, try to kill abandoned descendant processes. */ + job_log_stray_pg(j); if (!j->abandon_pg) { - job_log_stray_pg(j); job_assumes(j, runtime_killpg(j->p, SIGTERM) != -1 || errno == ESRCH); }

1 0

[23413] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 19 Sep '07

19 Sep '07

Revision: 23413 http://trac.macosforge.org/projects/launchd/changeset/23413 Author: zarzycki(a)apple.com Date: 2007-09-19 10:41:53 -0700 (Wed, 19 Sep 2007) Log Message: ----------- Let's be less harsh. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-09-19 17:38:35 UTC (rev 23412) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-19 17:41:53 UTC (rev 23413) @@ -2033,7 +2033,7 @@ */ if (!j->abandon_pg) { job_log_stray_pg(j); - job_assumes(j, runtime_killpg(j->p, SIGKILL) != -1 || errno == ESRCH); + job_assumes(j, runtime_killpg(j->p, SIGTERM) != -1 || errno == ESRCH); } /*

1 0