December 2006 - launchd-changes - lists.macosforge.org

[22987] trunk/launchd/src/StartupItems
by source_changes＠macosforge.org 15 Dec '06

15 Dec '06

Revision: 22987 http://trac.macosforge.org/projects/launchd/changeset/22987 Author: zarzycki(a)apple.com Date: 2006-12-15 14:10:33 -0800 (Fri, 15 Dec 2006) Log Message: ----------- The remote_cmds project now installs this. Removed Paths: ------------- trunk/launchd/src/StartupItems/NIS trunk/launchd/src/StartupItems/NIS.plist Deleted: trunk/launchd/src/StartupItems/NIS =================================================================== --- trunk/launchd/src/StartupItems/NIS 2006-12-15 21:13:18 UTC (rev 22986) +++ trunk/launchd/src/StartupItems/NIS 2006-12-15 22:10:33 UTC (rev 22987) @@ -1,79 +0,0 @@ -#!/bin/sh - -## -# Network Information Service -## - -. /etc/rc.common - - -Startyppasswdd() -{ - # rpc.yppasswdd is run on NIS masters - if [ -f "${VARYP}/${NISDOMAIN}/ypservers.db" ]; then - NISMASTER=$(makedbm -U "${VARYP}/${NISDOMAIN}/ypservers" | sed -n '/YP_MASTER_NAME/p' | awk '{print $2}') - if [ "$NISMASTER" = "$(hostname)" ]; then - rpc.yppasswdd - fi - fi -} - -StartService () -{ - ## - # Network Information Service. - ## - CheckForNetwork - if [ -f /var/run/NIS.StartupItem -o "${NETWORKUP}" = "-NO-" ]; then exit; fi - touch /var/run/NIS.StartupItem - - if [ "${NISDOMAIN:=-NO-}" != "-NO-" ]; then - - VARYP=/var/yp - - echo "Starting Network Information Service" - - echo "Setting NIS domainname to ${NISDOMAIN}" - domainname "${NISDOMAIN}" - - # ypserv is run on NIS servers - machines with an ${VARYP}/${NISDOMAIN} dir - if [ -d "${VARYP}/${NISDOMAIN}" ]; then - if ! pid=$(GetPID ypserv); then - ypserv - fi - fi - - Startyppasswdd - - # ypbind is run on all NIS clients - ypbind - fi -} - -StopService () -{ - echo "Stopping Network Information Service" - killall -TERM ypbind > /dev/null 2>&1 - killall -TERM rpc.yppasswdd > /dev/null 2>&1 - - if pid=$(GetPID ypserv); then - kill -TERM "${pid}" - fi -} - -RestartService () -{ - echo "Restarting Network Information Service" - killall -TERM ypbind > /dev/null 2>&1 - killall -TERM rpc.yppasswdd > /dev/null 2>&1 - - if pid=$(GetPID ypserv); then - kill -HUP "${pid}" - Startyppasswdd - ypbind - else - StartService - fi -} - -RunService "$1" Deleted: trunk/launchd/src/StartupItems/NIS.plist =================================================================== --- trunk/launchd/src/StartupItems/NIS.plist 2006-12-15 21:13:18 UTC (rev 22986) +++ trunk/launchd/src/StartupItems/NIS.plist 2006-12-15 22:10:33 UTC (rev 22987) @@ -1,4 +0,0 @@ -{ - Description = "Network Information Service"; - Provides = ("NIS"); -}

1 0

[22986] trunk/launchd/src/init.c
by source_changes＠macosforge.org 15 Dec '06

15 Dec '06

Revision: 22986 http://trac.macosforge.org/projects/launchd/changeset/22986 Author: zarzycki(a)apple.com Date: 2006-12-15 13:13:18 -0800 (Fri, 15 Dec 2006) Log Message: ----------- <rdar://problem/4885381> launchd should stop creating a boot record Modified Paths: -------------- trunk/launchd/src/init.c Modified: trunk/launchd/src/init.c =================================================================== --- trunk/launchd/src/init.c 2006-12-15 21:12:36 UTC (rev 22985) +++ trunk/launchd/src/init.c 2006-12-15 21:13:18 UTC (rev 22986) @@ -411,7 +411,6 @@ } if (WIFEXITED(status) && WEXITSTATUS(status) == EXIT_SUCCESS) { - logwtmp("~", "reboot", ""); return; } else if (WIFSIGNALED(status) && (WTERMSIG(status) == SIGTERM || WTERMSIG(status) == SIGKILL)) { return;

1 0

[22985] trunk/launchd/src/StartupItemContext
by source_changes＠macosforge.org 15 Dec '06

15 Dec '06

Revision: 22985 http://trac.macosforge.org/projects/launchd/changeset/22985 Author: zarzycki(a)apple.com Date: 2006-12-15 13:12:36 -0800 (Fri, 15 Dec 2006) Log Message: ----------- <rdar://problem/4840178> StartUpItemContext won't work if path contains spaces Modified Paths: -------------- trunk/launchd/src/StartupItemContext Modified: trunk/launchd/src/StartupItemContext =================================================================== --- trunk/launchd/src/StartupItemContext 2006-12-14 23:20:17 UTC (rev 22984) +++ trunk/launchd/src/StartupItemContext 2006-12-15 21:12:36 UTC (rev 22985) @@ -2,4 +2,4 @@ unset LAUNCHD_SOCKET -exec launchctl bsexec / $@ +exec launchctl bsexec / "$@"

1 0

[22984] tags/launchd-180/
by source_changes＠macosforge.org 14 Dec '06

14 Dec '06

Revision: 22984 http://trac.macosforge.org/projects/launchd/changeset/22984 Author: zarzycki(a)apple.com Date: 2006-12-14 15:20:17 -0800 (Thu, 14 Dec 2006) Log Message: ----------- "Tagging launchd-180 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-180/ Copied: tags/launchd-180 (from rev 22983, trunk)

1 0

[22983] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 14 Dec '06

14 Dec '06

Revision: 22983 http://trac.macosforge.org/projects/launchd/changeset/22983 Author: zarzycki(a)apple.com Date: 2006-12-14 12:47:04 -0800 (Thu, 14 Dec 2006) Log Message: ----------- <rdar://problem/4833937> launchd hangs when KeepAlive.PathState doesn't exist Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2006-12-14 19:59:58 UTC (rev 22982) +++ trunk/launchd/src/launchd_core_logic.c 2006-12-14 20:47:04 UTC (rev 22983) @@ -377,6 +377,7 @@ void job_watch(job_t j) { + struct semaphoreitem *si; struct socketgroup *sg; struct machservice *ms; struct watchpath *wp; @@ -398,6 +399,13 @@ SLIST_FOREACH(ms, &j->machservices, sle) { job_assumes(j, runtime_add_mport(ms->port, NULL, 0) == KERN_SUCCESS); } + + SLIST_FOREACH(si, &j->semaphores, sle) { + if (si->why == PATH_EXISTS || si->why == PATH_MISSING) { + /* Maybe another job has the inverse path based semaphore as this job */ + jobmgr_dispatch_all_other_semaphores(root_jobmgr, j); + } + } } void @@ -2707,7 +2715,6 @@ struct machservice *ms; struct stat sb; bool good_exit = (WIFEXITED(j->last_exit_status) && WEXITSTATUS(j->last_exit_status) == 0); - bool dispatch_others = false; if (j->mgr->global_on_demand_cnt > 0) { return false; @@ -2765,16 +2772,10 @@ wanted_state ? "exists" : "is missing", si->what); return true; } - dispatch_others = true; break; } } - /* Maybe another job has the inverse path based semaphore as this job */ - if (dispatch_others) { - jobmgr_dispatch_all_other_semaphores(root_jobmgr, j); - } - return false; }

1 0

[22982] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 14 Dec '06

14 Dec '06

Revision: 22982 http://trac.macosforge.org/projects/launchd/changeset/22982 Author: zarzycki(a)apple.com Date: 2006-12-14 11:59:58 -0800 (Thu, 14 Dec 2006) Log Message: ----------- <rdar://problem/4619009> spawn_env attribute with spawn_via_launchd doesn't seem to work Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2006-12-14 19:18:26 UTC (rev 22981) +++ trunk/launchd/src/launchd_core_logic.c 2006-12-14 19:59:58 UTC (rev 22982) @@ -811,6 +811,7 @@ job_new_spawn(job_t j, const char *label, const char *path, const char *workingdir, const char *const *argv, const char *const *env, mode_t *u_mask, bool w4d, bool fppc) { job_t jr; + size_t i; if ((jr = jobmgr_find(root_jobmgr, label)) != NULL) { errno = EEXIST; @@ -845,15 +846,20 @@ jr->setmask = true; } - if (env) for (; *env; env++) { - char newkey[strlen(*env) + 1], *eqoff = strchr(*env, '='); + if (env) for (i = 0; env[i]; i++) { + char *eqoff, tmpstr[strlen(env[i]) + 1]; + + strcpy(tmpstr, env[i]); + + eqoff = strchr(tmpstr, '='); + if (!eqoff) { - job_log(jr, LOG_WARNING, "Environmental variable missing '=' separator: %s", *env); + job_log(jr, LOG_WARNING, "Environmental variable missing '=' separator: %s", tmpstr); continue; } - strcpy(newkey, *env); + *eqoff = '\0'; - envitem_new(jr, newkey, eqoff + 1, false); + envitem_new(jr, tmpstr, eqoff + 1, false); } job_dispatch(jr, true); @@ -2575,6 +2581,8 @@ SLIST_INSERT_HEAD(&j->env, ei, sle); } + job_log(j, LOG_DEBUG, "Added environmental variable: %s=%s", k, v); + return true; }

1 0

[22981] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 14 Dec '06

14 Dec '06

Revision: 22981 http://trac.macosforge.org/projects/launchd/changeset/22981 Author: zarzycki(a)apple.com Date: 2006-12-14 11:18:26 -0800 (Thu, 14 Dec 2006) Log Message: ----------- <rdar://problem/4881530> launchd crashes when parsing malformed plist Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2006-12-14 18:08:28 UTC (rev 22980) +++ trunk/launchd/src/launchd_core_logic.c 2006-12-14 19:18:26 UTC (rev 22981) @@ -1377,24 +1377,52 @@ if (pload == NULL) { return NULL; } + if (launch_data_get_type(pload) != LAUNCH_DATA_DICTIONARY) { + errno = EINVAL; return NULL; } if ((tmp = launch_data_dict_lookup(pload, LAUNCH_JOBKEY_LABEL)) && (launch_data_get_type(tmp) == LAUNCH_DATA_STRING)) { - label = launch_data_get_string(tmp); + if (!(label = launch_data_get_string(tmp))) { + errno = EINVAL; + return NULL; + } } + if ((tmp = launch_data_dict_lookup(pload, LAUNCH_JOBKEY_PROGRAM)) && (launch_data_get_type(tmp) == LAUNCH_DATA_STRING)) { prog = launch_data_get_string(tmp); } - ldpa = launch_data_dict_lookup(pload, LAUNCH_JOBKEY_PROGRAMARGUMENTS); - if (label == NULL) { - errno = EINVAL; - return NULL; - } else if ((j = jobmgr_find(root_jobmgr, label)) != NULL) { + if ((ldpa = launch_data_dict_lookup(pload, LAUNCH_JOBKEY_PROGRAMARGUMENTS))) { + size_t i, c; + + if (launch_data_get_type(ldpa) != LAUNCH_DATA_ARRAY) { + errno = EINVAL; + return NULL; + } + + c = launch_data_array_get_count(ldpa); + + argv = alloca((c + 1) * sizeof(char *)); + + for (i = 0; i < c; i++) { + tmp = launch_data_array_get_index(ldpa, i); + + if (launch_data_get_type(tmp) != LAUNCH_DATA_STRING) { + errno = EINVAL; + return NULL; + } + + argv[i] = launch_data_get_string(tmp); + } + + argv[i] = NULL; + } + + if ((j = jobmgr_find(root_jobmgr, label)) != NULL) { errno = EEXIST; return NULL; } else if (label[0] == '\0' || (strncasecmp(label, "", strlen("com.apple.launchd")) == 0) || @@ -1405,16 +1433,6 @@ return NULL; } - if (ldpa) { - size_t i, c = launch_data_array_get_count(ldpa); - - argv = alloca((c + 1) * sizeof(char *)); - - for (i = 0; i < c; i++) - argv[i] = launch_data_get_string(launch_data_array_get_index(ldpa, i)); - argv[i] = NULL; - } - if ((j = job_new(root_jobmgr, label, prog, argv, NULL))) { launch_data_dict_iterate(pload, job_import_keys, j); }

1 0

[22980] trunk/launchd/src/launchctl.c
by source_changes＠macosforge.org 14 Dec '06

14 Dec '06

Revision: 22980 http://trac.macosforge.org/projects/launchd/changeset/22980 Author: zarzycki(a)apple.com Date: 2006-12-14 10:08:28 -0800 (Thu, 14 Dec 2006) Log Message: ----------- <rdar://problem/4879090> launchd apply_func_to_dir() should guard against nasty leftovers Modified Paths: -------------- trunk/launchd/src/launchctl.c Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2006-12-14 17:50:19 UTC (rev 22979) +++ trunk/launchd/src/launchctl.c 2006-12-14 18:08:28 UTC (rev 22980) @@ -130,9 +130,8 @@ static bool path_check(const char *path); static bool is_safeboot(void); static bool is_netboot(void); -static void apply_func_to_dir(const char *thedir, void (*thefunc)(const char *)); static void apply_sysctls_from_file(const char *thefile); -static void empty_dir(const char *path); +static void empty_dir(const char *thedir, struct stat *psb); static int touch_file(const char *path, mode_t m); static void do_sysversion_sysctl(void); static void workaround4465949(void); @@ -1238,8 +1237,8 @@ assumes(fwexec(rccleanup_tool, true) != -1); } - apply_func_to_dir(_PATH_VARRUN, empty_dir); - apply_func_to_dir(_PATH_TMP, empty_dir); + empty_dir(_PATH_VARRUN, NULL); + empty_dir(_PATH_TMP, NULL); remove(_PATH_NOLOGIN); // XXX --> RMRF_ITEMS="/var/tmp/folders.* @@ -2549,34 +2548,66 @@ } void -apply_func_to_dir(const char *thedir, void (*thefunc)(const char *)) +empty_dir(const char *thedir, struct stat *psb) { struct dirent *de; + struct stat psb2; DIR *od; int currend_dir_fd; - if (!assumes((currend_dir_fd = open(".", 0)) != -1)) + if (!psb) { + psb = &psb2; + if (!assumes(lstat(thedir, psb) != -1)) { + return; + } + } + + if (!assumes((currend_dir_fd = open(".", 0)) != -1)) { return; + } - if (!assumes(chdir(thedir) != -1)) + if (!assumes(chdir(thedir) != -1)) { goto out; + } - if (!assumes(od = opendir("."))) + if (!assumes(od = opendir("."))) { goto out; + } while ((de = readdir(od))) { struct stat sb; - if (strcmp(de->d_name, ".") == 0) + if (strcmp(de->d_name, ".") == 0) { continue; - if (strcmp(de->d_name, "..") == 0) + } + + if (strcmp(de->d_name, "..") == 0) { continue; + } - if (assumes(lstat(de->d_name, &sb) != -1)) { - if (S_ISDIR(sb.st_mode)) - apply_func_to_dir(de->d_name, thefunc); - thefunc(de->d_name); + if (!assumes(lstat(de->d_name, &sb) != -1)) { + continue; } + + if (psb->st_dev != sb.st_dev) { + assumes(unmount(de->d_name, MNT_FORCE) != -1); + + /* Let's lstat() again to see if the unmount() worked and what was under it */ + if (!assumes(lstat(de->d_name, &sb) != -1)) { + continue; + } + + if (!assumes(psb->st_dev == sb.st_dev)) { + continue; + } + } + + if (S_ISDIR(sb.st_mode)) { + empty_dir(de->d_name, &sb); + } + + assumes(lchflags(de->d_name, 0) != -1); + assumes(remove(de->d_name) != -1); } assumes(closedir(od) != -1); @@ -2586,13 +2617,6 @@ assumes(close(currend_dir_fd) != -1); } -void -empty_dir(const char *path) -{ - assumes(lchflags(path, 0) != -1); - assumes(remove(path) != -1); -} - int touch_file(const char *path, mode_t m) {

1 0

[22979] trunk/launchd/src
by source_changes＠macosforge.org 14 Dec '06

14 Dec '06

Revision: 22979 http://trac.macosforge.org/projects/launchd/changeset/22979 Author: zarzycki(a)apple.com Date: 2006-12-14 09:50:19 -0800 (Thu, 14 Dec 2006) Log Message: ----------- <rdar://problem/4822392> Investigation: Figure out what remaining processes are hanging at shutdown Modified Paths: -------------- trunk/launchd/src/Makefile.am trunk/launchd/src/Makefile.in Modified: trunk/launchd/src/Makefile.am =================================================================== --- trunk/launchd/src/Makefile.am 2006-12-14 17:37:14 UTC (rev 22978) +++ trunk/launchd/src/Makefile.am 2006-12-14 17:50:19 UTC (rev 22979) @@ -66,7 +66,7 @@ man5_MANS = launchd.plist.5 launchd.conf.5 -man8_MANS = StartupItemContext.8 SystemStarter.8 rc.8 launchd.8 service.8 launchproxy.8 +man8_MANS = StartupItemContext.8 SystemStarter.8 rc.8 launchd.8 service.8 launchproxy.8 shutdown_debugger.8 STARTUPITEMS = $(basename $(notdir $(wildcard $(srcdir)/StartupItems/*.plist))) Modified: trunk/launchd/src/Makefile.in =================================================================== --- trunk/launchd/src/Makefile.in 2006-12-14 17:37:14 UTC (rev 22978) +++ trunk/launchd/src/Makefile.in 2006-12-14 17:50:19 UTC (rev 22979) @@ -253,7 +253,7 @@ @LIBS_ONLY_FALSE@launchproxy_LDFLAGS = -weak_framework Security @LIBS_ONLY_FALSE@man1_MANS = wait4path.1 launchctl.1 @LIBS_ONLY_FALSE@man5_MANS = launchd.plist.5 launchd.conf.5 -@LIBS_ONLY_FALSE@man8_MANS = StartupItemContext.8 SystemStarter.8 rc.8 launchd.8 service.8 launchproxy.8 +@LIBS_ONLY_FALSE@man8_MANS = StartupItemContext.8 SystemStarter.8 rc.8 launchd.8 service.8 launchproxy.8 shutdown_debugger.8 @LIBS_ONLY_FALSE@STARTUPITEMS = $(basename $(notdir $(wildcard $(srcdir)/StartupItems/*.plist))) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am

1 0

[22978] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 14 Dec '06

14 Dec '06

Revision: 22978 http://trac.macosforge.org/projects/launchd/changeset/22978 Author: zarzycki(a)apple.com Date: 2006-12-14 09:37:14 -0800 (Thu, 14 Dec 2006) Log Message: ----------- Silly comment update. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2006-12-14 17:29:56 UTC (rev 22977) +++ trunk/launchd/src/launchd_core_logic.c 2006-12-14 17:37:14 UTC (rev 22978) @@ -1947,7 +1947,8 @@ } /* - * <rdar://problem/4616864> launchctl should invoke initgroups after setgid + * The kernel team and the DirectoryServices team want initgroups() + * called after setgid(). See 4616864 for more information. */ if (!j->no_init_groups) {

1 0