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

[23323] tags/launchd-233/
by source_changes＠macosforge.org 30 Jul '07

30 Jul '07

Revision: 23323 http://trac.macosforge.org/projects/launchd/changeset/23323 Author: zarzycki(a)apple.com Date: 2007-07-30 15:05:14 -0700 (Mon, 30 Jul 2007) Log Message: ----------- "Tagging launchd-233 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-233/ Copied: tags/launchd-233 (from rev 23322, trunk)

1 0

[23322] trunk/launchd/src/launchd.c
by source_changes＠macosforge.org 30 Jul '07

30 Jul '07

Revision: 23322 http://trac.macosforge.org/projects/launchd/changeset/23322 Author: zarzycki(a)apple.com Date: 2007-07-30 10:43:00 -0700 (Mon, 30 Jul 2007) Log Message: ----------- Force dyld to resolve certain symbols at launch rather than lazily. Modified Paths: -------------- trunk/launchd/src/launchd.c Modified: trunk/launchd/src/launchd.c =================================================================== --- trunk/launchd/src/launchd.c 2007-07-30 15:15:12 UTC (rev 23321) +++ trunk/launchd/src/launchd.c 2007-07-30 17:43:00 UTC (rev 23322) @@ -179,6 +179,11 @@ #define PID1_CRASH_LOGFILE "/var/log/launchd-pid1.crash" +/* This hack forces the dynamic linker to resolve these symbols ASAP */ +static __attribute__((unused)) typeof(sync) *__junk_dyld_trick1 = sync; +static __attribute__((unused)) typeof(sleep) *__junk_dyld_trick2 = sleep; +static __attribute__((unused)) typeof(reboot) *__junk_dyld_trick3 = reboot; + void fatal_signal_handler(int sig, siginfo_t *si, void *uap) {

1 0

[23321] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 30 Jul '07

30 Jul '07

Revision: 23321 http://trac.macosforge.org/projects/launchd/changeset/23321 Author: zarzycki(a)apple.com Date: 2007-07-30 08:15:12 -0700 (Mon, 30 Jul 2007) Log Message: ----------- <rdar://problem/5351245> ARD Agent not starting when logging in as root 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-07-27 22:25:55 UTC (rev 23320) +++ trunk/launchd/src/launchd_core_logic.c 2007-07-30 15:15:12 UTC (rev 23321) @@ -1730,6 +1730,10 @@ job_t ji; LIST_FOREACH(ji, &label_hash[hash_label(label)], label_hash_sle) { + if (ji->removal_pending) { + continue; /* 5351245 */ + } + if (strcmp(ji->label, label) == 0) { return ji; } @@ -5647,6 +5651,12 @@ j->mgr->parentmgr = background_jobmgr; SLIST_INSERT_HEAD(&j->mgr->parentmgr->submgrs, j->mgr, sle); + /* + * We really should wait for all the jobs to die before proceeding. See 5351245 for more info. + * + * We have hacked around this in job_find() by ignoring jobs that are pending removal. + */ + } else if (strcmp(j->mgr->name, VPROCMGR_SESSION_AQUA) == 0) { return 0; } else {

1 0

[23320] tags/launchd-232/
by source_changes＠macosforge.org 27 Jul '07

27 Jul '07

Revision: 23320 http://trac.macosforge.org/projects/launchd/changeset/23320 Author: zarzycki(a)apple.com Date: 2007-07-27 15:25:55 -0700 (Fri, 27 Jul 2007) Log Message: ----------- "Tagging launchd-232 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-232/ Copied: tags/launchd-232 (from rev 23319, trunk)

1 0

[23319] trunk/launchd/src
by source_changes＠macosforge.org 27 Jul '07

27 Jul '07

Revision: 23319 http://trac.macosforge.org/projects/launchd/changeset/23319 Author: zarzycki(a)apple.com Date: 2007-07-27 10:59:56 -0700 (Fri, 27 Jul 2007) Log Message: ----------- <rdar://problem/5345685> kinit fails with Internal credentials cache error when run by root user over ssh Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/libvproc.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-07-17 21:55:52 UTC (rev 23318) +++ trunk/launchd/src/launchd_core_logic.c 2007-07-27 17:59:56 UTC (rev 23319) @@ -5659,6 +5659,12 @@ kr = BOOTSTRAP_NOT_PRIVILEGED; goto out; } + } else if (ldc.uid == 0 && getpid() == 1 && strcmp(session_type, VPROCMGR_SESSION_STANDARDIO) == 0) { + ensure_root_bkgd_setup(); + + SLIST_REMOVE(&j->mgr->parentmgr->submgrs, j->mgr, jobmgr_s, sle); + j->mgr->parentmgr = background_jobmgr; + SLIST_INSERT_HEAD(&j->mgr->parentmgr->submgrs, j->mgr, sle); } jobmgr_log(j->mgr, LOG_DEBUG, "Renaming to: %s", session_type); Modified: trunk/launchd/src/libvproc.c =================================================================== --- trunk/launchd/src/libvproc.c 2007-07-17 21:55:52 UTC (rev 23318) +++ trunk/launchd/src/libvproc.c 2007-07-27 17:59:56 UTC (rev 23319) @@ -99,8 +99,7 @@ _vprocmgr_move_subset_to_user(uid_t target_user, const char *session_type) { launch_data_t output_obj; - kern_return_t kr = 1; - mach_port_t puc = 0, rootbs = get_root_bootstrap_port(); + kern_return_t kr = 0; bool is_bkgd = (strcmp(session_type, VPROCMGR_SESSION_BACKGROUND) == 0); int64_t ldpid, lduid; @@ -112,18 +111,6 @@ return (vproc_err_t)_vprocmgr_move_subset_to_user; } - if (target_user == 0) { - if (ldpid == 1 && rootbs != bootstrap_port) { - return _vprocmgr_init(session_type); - } - - task_set_bootstrap_port(mach_task_self(), rootbs); - mach_port_deallocate(mach_task_self(), bootstrap_port); - bootstrap_port = rootbs; - - return NULL; - } - if (ldpid != 1) { if (lduid == getuid()) { return NULL; @@ -135,22 +122,23 @@ return (vproc_err_t)_vprocmgr_move_subset_to_user; } - if (vproc_mig_lookup_per_user_context(rootbs, target_user, &puc) != 0) { - return (vproc_err_t)_vprocmgr_move_subset_to_user; - } + if (is_bkgd || target_user) { + mach_port_t puc = 0, rootbs = get_root_bootstrap_port(); - if (is_bkgd) { - kr = 0; - } else { - kr = vproc_mig_move_subset(puc, bootstrap_port, (char *)session_type); - } + if (vproc_mig_lookup_per_user_context(rootbs, target_user, &puc) != 0) { + return (vproc_err_t)_vprocmgr_move_subset_to_user; + } - if (is_bkgd) { - task_set_bootstrap_port(mach_task_self(), puc); - mach_port_deallocate(mach_task_self(), bootstrap_port); - bootstrap_port = puc; + if (is_bkgd) { + task_set_bootstrap_port(mach_task_self(), puc); + mach_port_deallocate(mach_task_self(), bootstrap_port); + bootstrap_port = puc; + } else { + kr = vproc_mig_move_subset(puc, bootstrap_port, (char *)session_type); + mach_port_deallocate(mach_task_self(), puc); + } } else { - mach_port_deallocate(mach_task_self(), puc); + kr = _vprocmgr_init(session_type) ? 1 : 0; } cached_pid = -1;

1 0

[23318] tags/launchd-231/
by source_changes＠macosforge.org 17 Jul '07

17 Jul '07

Revision: 23318 http://trac.macosforge.org/projects/launchd/changeset/23318 Author: zarzycki(a)apple.com Date: 2007-07-17 14:55:52 -0700 (Tue, 17 Jul 2007) Log Message: ----------- "Tagging launchd-231 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-231/ Copied: tags/launchd-231 (from rev 23317, trunk)

1 0

[23317] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 17 Jul '07

17 Jul '07

Revision: 23317 http://trac.macosforge.org/projects/launchd/changeset/23317 Author: zarzycki(a)apple.com Date: 2007-07-17 12:03:04 -0700 (Tue, 17 Jul 2007) Log Message: ----------- Typo. 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-07-17 15:46:29 UTC (rev 23316) +++ trunk/launchd/src/launchd_core_logic.c 2007-07-17 19:03:04 UTC (rev 23317) @@ -5105,19 +5105,19 @@ errno = task_set_special_port(child_task, ms->special_port_num, ms->port); if (errno) { - int desired_log_devel = LOG_ERR; + int desired_log_level = LOG_ERR; if (j->anonymous) { /* 5338127 */ - desired_log_devel = LOG_WARNING; + desired_log_level = LOG_WARNING; if (ms->special_port_num == TASK_SEATBELT_PORT) { - desired_log_devel = LOG_DEBUG; + desired_log_level = LOG_DEBUG; } } - job_log(j, desired_log_devel, "Could not setup Mach task special port %u: %s", ms->special_port_num, mach_error_string(errno)); + job_log(j, desired_log_level, "Could not setup Mach task special port %u: %s", ms->special_port_num, mach_error_string(errno)); } }

1 0

[23316] trunk/launchd/src
by source_changes＠macosforge.org 17 Jul '07

17 Jul '07

Revision: 23316 http://trac.macosforge.org/projects/launchd/changeset/23316 Author: zarzycki(a)apple.com Date: 2007-07-17 08:46:29 -0700 (Tue, 17 Jul 2007) Log Message: ----------- <rdar://problem/5311045> Possible Error Messages in System Log: Couldn't stat(/etc/mach_init_per_login_session.d) Modified Paths: -------------- trunk/launchd/src/Makefile.am trunk/launchd/src/Makefile.in Modified: trunk/launchd/src/Makefile.am =================================================================== --- trunk/launchd/src/Makefile.am 2007-07-16 21:36:59 UTC (rev 23315) +++ trunk/launchd/src/Makefile.am 2007-07-17 15:46:29 UTC (rev 23316) @@ -77,6 +77,7 @@ mkdir -p $(DESTDIR)/usr/local/include mkdir -p $(DESTDIR)/$(sysconfdir)/mach_init.d mkdir -p $(DESTDIR)/$(sysconfdir)/mach_init_per_user.d + mkdir -p $(DESTDIR)/$(sysconfdir)/mach_init_per_login_session.d mkdir -p $(DESTDIR)/Library/LaunchDaemons mkdir -p $(DESTDIR)/Library/LaunchAgents mkdir -p $(DESTDIR)/System/Library/LaunchAgents Modified: trunk/launchd/src/Makefile.in =================================================================== --- trunk/launchd/src/Makefile.in 2007-07-16 21:36:59 UTC (rev 23315) +++ trunk/launchd/src/Makefile.in 2007-07-17 15:46:29 UTC (rev 23316) @@ -1150,6 +1150,7 @@ @LIBS_ONLY_FALSE@ mkdir -p $(DESTDIR)/usr/local/include @LIBS_ONLY_FALSE@ mkdir -p $(DESTDIR)/$(sysconfdir)/mach_init.d @LIBS_ONLY_FALSE@ mkdir -p $(DESTDIR)/$(sysconfdir)/mach_init_per_user.d +@LIBS_ONLY_FALSE@ mkdir -p $(DESTDIR)/$(sysconfdir)/mach_init_per_login_session.d @LIBS_ONLY_FALSE@ mkdir -p $(DESTDIR)/Library/LaunchDaemons @LIBS_ONLY_FALSE@ mkdir -p $(DESTDIR)/Library/LaunchAgents @LIBS_ONLY_FALSE@ mkdir -p $(DESTDIR)/System/Library/LaunchAgents

1 0

[23315] tags/launchd-230/
by source_changes＠macosforge.org 16 Jul '07

16 Jul '07

Revision: 23315 http://trac.macosforge.org/projects/launchd/changeset/23315 Author: zarzycki(a)apple.com Date: 2007-07-16 14:36:59 -0700 (Mon, 16 Jul 2007) Log Message: ----------- "Tagging launchd-230 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-230/ Copied: tags/launchd-230 (from rev 23314, trunk)

1 0

[23314] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 16 Jul '07

16 Jul '07

Revision: 23314 http://trac.macosforge.org/projects/launchd/changeset/23314 Author: zarzycki(a)apple.com Date: 2007-07-16 14:36:44 -0700 (Mon, 16 Jul 2007) Log Message: ----------- <rdar://problem/5338127> Bug: launchd_core_logic.c:5095 (23304):8: (errno = task_set_special_port(child_task, ms->special_port_num, ms->port)) == KERN_SUCCESS 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-07-16 17:21:16 UTC (rev 23313) +++ trunk/launchd/src/launchd_core_logic.c 2007-07-16 21:36:44 UTC (rev 23314) @@ -5101,7 +5101,24 @@ /* The TASK_ACCESS_PORT funny business is to workaround 5325399. */ continue; } - job_assumes(j, (errno = task_set_special_port(child_task, ms->special_port_num, ms->port)) == KERN_SUCCESS); + + errno = task_set_special_port(child_task, ms->special_port_num, ms->port); + + if (errno) { + int desired_log_devel = LOG_ERR; + + if (j->anonymous) { + /* 5338127 */ + + desired_log_devel = LOG_WARNING; + + if (ms->special_port_num == TASK_SEATBELT_PORT) { + desired_log_devel = LOG_DEBUG; + } + } + + job_log(j, desired_log_devel, "Could not setup Mach task special port %u: %s", ms->special_port_num, mach_error_string(errno)); + } } job_assumes(j, launchd_mport_deallocate(child_task) == KERN_SUCCESS);

1 0