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

[23260] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 22 May '07

22 May '07

Revision: 23260 http://trac.macosforge.org/projects/launchd/changeset/23260 Author: zarzycki(a)apple.com Date: 2007-05-22 13:08:55 -0700 (Tue, 22 May 2007) Log Message: ----------- <rdar://problem/5158497> bootstrap_set_policy: policy should be inherited 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-05-22 20:03:44 UTC (rev 23259) +++ trunk/launchd/src/launchd_core_logic.c 2007-05-22 20:08:55 UTC (rev 23260) @@ -107,7 +107,8 @@ const char name[0]; }; -static bool mspolicy_new(job_t j, const char *name, bool allow, bool pid_local); +static bool mspolicy_new(job_t j, const char *name, bool allow, bool pid_local, bool skip_check); +static bool mspolicy_copy(job_t j_to, job_t j_from); static void mspolicy_setup(launch_data_t obj, const char *key, void *context); static bool mspolicy_check(job_t j, const char *name, bool pid_local); static void mspolicy_delete(job_t j, struct mspolicy *msp); @@ -977,19 +978,28 @@ job_new_anonymous(jobmgr_t jm, pid_t anonpid) { int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, anonpid }; - struct kinfo_proc kp, ppid_kp; + struct kinfo_proc kp; size_t len = sizeof(kp); bool shutdown_state; - job_t jr = NULL; + job_t jp = NULL, jr = NULL; if (!jobmgr_assumes(jm, sysctl(mib, 4, &kp, &len, NULL, 0) != -1)) { return NULL; } - mib[3] = kp.kp_eproc.e_ppid; - - if (!jobmgr_assumes(jm, sysctl(mib, 4, &ppid_kp, &len, NULL, 0) != -1)) { - return NULL; + switch (kp.kp_eproc.e_ppid) { + case 0: + /* the kernel */ + break; + case 1: + if (getpid() != 1) { + break; + } + /* fall through */ + default: + jp = jobmgr_find_by_pid(jm, kp.kp_eproc.e_ppid, true); + jobmgr_assumes(jm, jp != NULL); + break; } /* A total hack: Normally, job_new() returns an error during shutdown, but anonymous jobs are special. */ @@ -1003,14 +1013,20 @@ total_children++; jr->anonymous = true; jr->p = anonpid; + /* anonymous process reaping is messy */ LIST_INSERT_HEAD(&jm->active_jobs[ACTIVE_JOB_HASH(jr->p)], jr, pid_hash_sle); job_assumes(jr, kevent_mod(jr->p, EVFILT_PROC, EV_ADD, proc_fflags, 0, root_jobmgr) != -1); + + if (jp) { + job_assumes(jr, mspolicy_copy(jr, jp)); + } + if (shutdown_state && jm->hopefully_first_cnt == 0) { - job_log(jr, LOG_APPLEONLY, "This process showed up to the party while all the guests were leaving. Odds are that it will have a miserable time. Blame PID %u: %s", - kp.kp_eproc.e_ppid, ppid_kp.kp_proc.p_comm); + job_log(jr, LOG_APPLEONLY, "This process showed up to the party while all the guests were leaving. Odds are that it will have a miserable time."); } - job_log(jr, LOG_DEBUG, "Created anonymously by PPID %u: %s", kp.kp_eproc.e_ppid, ppid_kp.kp_proc.p_comm); + + job_log(jr, LOG_DEBUG, "Created anonymously by PPID %u%s%s", kp.kp_eproc.e_ppid, jp ? ": " : "", jp ? jp->label : ""); } if (shutdown_state) { @@ -5572,7 +5588,7 @@ if (SLIST_EMPTY(&j->mspolicies)) { job_log(j, LOG_DEBUG, "Setting policy on job \"%s\" for Mach service: %s", target_j->label, target_service); if (target_service[0]) { - job_assumes(j, mspolicy_new(target_j, target_service, flags & BOOTSTRAP_ALLOW_LOOKUP, flags & BOOTSTRAP_PER_PID_SERVICE)); + job_assumes(j, mspolicy_new(target_j, target_service, flags & BOOTSTRAP_ALLOW_LOOKUP, flags & BOOTSTRAP_PER_PID_SERVICE, false)); } else { target_j->deny_unknown_mslookups = !(flags & BOOTSTRAP_ALLOW_LOOKUP); } @@ -5709,11 +5725,25 @@ } bool -mspolicy_new(job_t j, const char *name, bool allow, bool pid_local) +mspolicy_copy(job_t j_to, job_t j_from) { struct mspolicy *msp; - SLIST_FOREACH(msp, &j->mspolicies, sle) { + SLIST_FOREACH(msp, &j_from->mspolicies, sle) { + if (!mspolicy_new(j_to, msp->name, msp->allow, msp->per_pid, true)) { + return false; + } + } + + return true; +} + +bool +mspolicy_new(job_t j, const char *name, bool allow, bool pid_local, bool skip_check) +{ + struct mspolicy *msp; + + if (!skip_check) SLIST_FOREACH(msp, &j->mspolicies, sle) { if (msp->per_pid != pid_local) { continue; } else if (strcmp(msp->name, name) == 0) { @@ -5727,6 +5757,7 @@ strcpy((char *)msp->name, name); msp->per_pid = pid_local; + msp->allow = allow; SLIST_INSERT_HEAD(&j->mspolicies, msp, sle); @@ -5743,7 +5774,7 @@ return; } - job_assumes(j, mspolicy_new(j, key, launch_data_get_bool(obj), false)); + job_assumes(j, mspolicy_new(j, key, launch_data_get_bool(obj), false, false)); } bool

1 0

[23259] trunk/launchd/src/launchd_runtime.c
by source_changes＠macosforge.org 22 May '07

22 May '07

Revision: 23259 http://trac.macosforge.org/projects/launchd/changeset/23259 Author: zarzycki(a)apple.com Date: 2007-05-22 13:03:44 -0700 (Tue, 22 May 2007) Log Message: ----------- <rdar://problem/5204026> "launchctl unload" hangs Modified Paths: -------------- trunk/launchd/src/launchd_runtime.c Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-05-22 17:05:17 UTC (rev 23258) +++ trunk/launchd/src/launchd_runtime.c 2007-05-22 20:03:44 UTC (rev 23259) @@ -693,10 +693,18 @@ struct kevent kev; int q = mainkq; - flags |= EV_CLEAR; - - if (EVFILT_TIMER == filter || EVFILT_VNODE == filter) { + switch (filter) { + case EVFILT_READ: + case EVFILT_WRITE: + break; + case EVFILT_TIMER: + case EVFILT_VNODE: + case EVFILT_FS: q = asynckq; + /* fall through */ + default: + flags |= EV_CLEAR; + break; } if (flags & EV_ADD && !launchd_assumes(udata != NULL)) {

1 0

[23258] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 22 May '07

22 May '07

Revision: 23258 http://trac.macosforge.org/projects/launchd/changeset/23258 Author: zarzycki(a)apple.com Date: 2007-05-22 10:05:17 -0700 (Tue, 22 May 2007) Log Message: ----------- Security checks. 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-05-18 19:37:43 UTC (rev 23257) +++ trunk/launchd/src/launchd_core_logic.c 2007-05-22 17:05:17 UTC (rev 23258) @@ -4587,11 +4587,18 @@ launch_data_t input_obj, output_obj; size_t data_offset = 0; size_t packed_size; + struct ldcred ldc; + runtime_get_caller_creds(&ldc); + if (!launchd_assumes(j != NULL)) { return BOOTSTRAP_NO_MEMORY; } + if (inkey && ldc.euid && ldc.euid != getuid()) { + return BOOTSTRAP_NOT_PRIVILEGED; + } + if (inkey && outkey && !job_assumes(j, inkey == outkey)) { return 1; } @@ -4673,12 +4680,19 @@ { const char *action; kern_return_t kr = 0; + struct ldcred ldc; int oldmask; + runtime_get_caller_creds(&ldc); + if (!launchd_assumes(j != NULL)) { return BOOTSTRAP_NO_MEMORY; } + if (inkey && ldc.euid && ldc.euid != getuid()) { + return BOOTSTRAP_NOT_PRIVILEGED; + } + if (inkey && outkey && !job_assumes(j, inkey == outkey)) { return 1; }

1 0

[23257] trunk/launchd/src/launchctl.c
by source_changes＠macosforge.org 18 May '07

18 May '07

Revision: 23257 http://trac.macosforge.org/projects/launchd/changeset/23257 Author: zarzycki(a)apple.com Date: 2007-05-18 12:37:43 -0700 (Fri, 18 May 2007) Log Message: ----------- <rdar://problem/5199075> Bug: launchctl.c:1498 (23236):35: fwexec(bcc_tool, true) != -1 Modified Paths: -------------- trunk/launchd/src/launchctl.c Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2007-05-17 22:18:57 UTC (rev 23256) +++ trunk/launchd/src/launchctl.c 2007-05-18 19:37:43 UTC (rev 23257) @@ -1495,7 +1495,7 @@ return; } - assumes(fwexec(bcc_tool, true) != -1); + fwexec(bcc_tool, true); } int

1 0

[23256] tags/launchd-216/
by source_changes＠macosforge.org 17 May '07

17 May '07

Revision: 23256 http://trac.macosforge.org/projects/launchd/changeset/23256 Author: zarzycki(a)apple.com Date: 2007-05-17 15:18:57 -0700 (Thu, 17 May 2007) Log Message: ----------- "Tagging launchd-216 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-216/ Copied: tags/launchd-216 (from rev 23255, trunk)

1 0

[23255] trunk/launchd/src
by source_changes＠macosforge.org 17 May '07

17 May '07

Revision: 23255 http://trac.macosforge.org/projects/launchd/changeset/23255 Author: zarzycki(a)apple.com Date: 2007-05-17 14:07:38 -0700 (Thu, 17 May 2007) Log Message: ----------- <rdar://problem/5171032> Leopard9A429: Cannot ssh into my machine Modified Paths: -------------- trunk/launchd/src/launchctl.c trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/liblaunch.c trunk/launchd/src/libvproc.c trunk/launchd/src/libvproc_internal.h trunk/launchd/src/libvproc_private.h Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2007-05-14 18:32:48 UTC (rev 23254) +++ trunk/launchd/src/launchctl.c 2007-05-17 21:07:38 UTC (rev 23255) @@ -1929,7 +1929,7 @@ } int -list_cmd(int argc, char *const argv[] __attribute__((unused))) +list_cmd(int argc, char *const argv[]) { launch_data_t resp, msg; int r = 0; Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-05-14 18:32:48 UTC (rev 23254) +++ trunk/launchd/src/launchd_core_logic.c 2007-05-17 21:07:38 UTC (rev 23255) @@ -244,7 +244,7 @@ unsigned int global_on_demand_cnt; unsigned int hopefully_first_cnt; unsigned int normal_active_cnt; - unsigned int sent_stop_to_normal_jobs:1, sent_stop_to_hopefully_last_jobs:1, shutting_down:1; + unsigned int sent_stop_to_normal_jobs:1, sent_stop_to_hopefully_last_jobs:1, shutting_down:1, session_initialized:1; char name[0]; }; @@ -258,6 +258,7 @@ static void jobmgr_log_stray_children(jobmgr_t jm); static void jobmgr_remove(jobmgr_t jm); static void jobmgr_dispatch_all(jobmgr_t jm, bool newmounthack); +static job_t jobmgr_init_session(jobmgr_t jm, const char *session_type, bool sflag); static job_t jobmgr_find_by_pid(jobmgr_t jm, pid_t p, bool create_anon); static job_t job_mig_intran2(jobmgr_t jm, mach_port_t mport, pid_t upid); static void job_export_all2(jobmgr_t jm, launch_data_t where); @@ -3752,15 +3753,10 @@ jobmgr_t jobmgr_new(jobmgr_t jm, mach_port_t requestorport, mach_port_t transfer_port, bool sflag, const char *name) { - const char *bootstrap_tool[] = { "/bin/launchctl", "bootstrap", "-S", name, NULL, NULL }; mach_msg_size_t mxmsgsz; job_t bootstrapper = NULL; jobmgr_t jmr; - if (sflag) { - bootstrap_tool[4] = "-s"; - } - launchd_assert(offsetof(struct jobmgr_s, kqjobmgr_callback) == 0); if (jm && requestorport == MACH_PORT_NULL) { @@ -3836,20 +3832,7 @@ } if (name) { - char thelabel[1000]; - - snprintf(thelabel, sizeof(thelabel), "com.apple.launchctl.%s", name); - /* no name implies: bootstrap_subset() where creating a "bootstrapper" makes no sense */ - bootstrapper = job_new(jmr, thelabel, NULL, bootstrap_tool); - if (jobmgr_assumes(jmr, bootstrapper != NULL) && (jm || getuid())) { - char buf[100]; - - /* <rdar://problem/5042202> launchd-201: can't ssh in with AFP OD account (hangs) */ - snprintf(buf, sizeof(buf), "0x%X:0:0", getuid()); - envitem_new(bootstrapper, "__CF_USER_TEXT_ENCODING", buf, false); - bootstrapper->weird_bootstrap = true; - jobmgr_assumes(jmr, job_setup_machport(bootstrapper)); - } + bootstrapper = jobmgr_init_session(jmr, name, sflag); } if (!bootstrapper || !bootstrapper->weird_bootstrap) { @@ -3873,6 +3856,30 @@ return NULL; } +job_t +jobmgr_init_session(jobmgr_t jm, const char *session_type, bool sflag) +{ + const char *bootstrap_tool[] = { "/bin/launchctl", "bootstrap", "-S", session_type, sflag ? "-s" : NULL, NULL }; + char thelabel[1000]; + job_t bootstrapper; + + snprintf(thelabel, sizeof(thelabel), "com.apple.launchctl.%s", session_type); + bootstrapper = job_new(jm, thelabel, NULL, bootstrap_tool); + if (jobmgr_assumes(jm, bootstrapper != NULL) && (jm->parentmgr || getuid())) { + char buf[100]; + + /* <rdar://problem/5042202> launchd-201: can't ssh in with AFP OD account (hangs) */ + snprintf(buf, sizeof(buf), "0x%X:0:0", getuid()); + envitem_new(bootstrapper, "__CF_USER_TEXT_ENCODING", buf, false); + bootstrapper->weird_bootstrap = true; + jobmgr_assumes(jm, job_setup_machport(bootstrapper)); + } + + jm->session_initialized = true; + + return bootstrapper; +} + jobmgr_t jobmgr_delete_anything_with_port(jobmgr_t jm, mach_port_t port) { @@ -4871,20 +4878,19 @@ return BOOTSTRAP_NO_MEMORY; } + job_log(j, LOG_DEBUG, "Looking up per user launchd for UID: %u", which_user); + + runtime_get_caller_creds(&ldc); + if (getpid() != 1) { + job_log(j, LOG_ERR, "Only PID 1 supports per user launchd lookups."); return BOOTSTRAP_NOT_PRIVILEGED; } - runtime_get_caller_creds(&ldc); - if (ldc.euid || ldc.uid) { which_user = ldc.euid ? ldc.euid : ldc.uid; } - if (which_user == 0) { - return BOOTSTRAP_NOT_PRIVILEGED; - } - *up_cont = MACH_PORT_NULL; LIST_FOREACH(ji, &root_jobmgr->jobs, sle) { @@ -4907,6 +4913,8 @@ struct machservice *ms; char lbuf[1024]; + job_log(j, LOG_DEBUG, "Creating per user launchd job for UID: %u", which_user); + sprintf(lbuf, "com.apple.launchd.peruser.%u", which_user); ji = job_new(root_jobmgr, lbuf, "/sbin/launchd", NULL); @@ -4927,6 +4935,8 @@ ms->hide = true; ji = job_dispatch(ji, false); + } else { + job_log(j, LOG_DEBUG, "Per user launchd job found for UID: %u", which_user); } if (job_assumes(j, ji != NULL)) { @@ -5238,37 +5248,45 @@ mach_port_array_t l2l_ports = NULL; mach_port_t reqport, rcvright; kern_return_t kr = 1; + struct ldcred ldc; jobmgr_t jmr = NULL; - job_t j2; - if (getuid() == 0) { - const char *bootstrap_tool[] = { "/bin/launchctl", "bootstrap", "-S", session_type, NULL }; - char thelabel[1000]; - job_t bootstrapper; + if (!launchd_assumes(j != NULL)) { + return BOOTSTRAP_NO_MEMORY; + } - snprintf(thelabel, sizeof(thelabel), "com.apple.launchctl.%s", session_type); + runtime_get_caller_creds(&ldc); - job_assumes(j, (j2 = job_mig_intran(target_subset)) != NULL); - j = j2; + if (target_subset == MACH_PORT_NULL) { + job_t j2; + + if (j->mgr->session_initialized) { + job_log(j, LOG_ERR, "Tried to initialize an already setup session!"); + kr = BOOTSTRAP_NOT_PRIVILEGED; + goto out; + } + jobmgr_log(j->mgr, LOG_DEBUG, "Renaming to: %s", session_type); strcpy(j->mgr->name, session_type); - bootstrapper = job_new(j->mgr, thelabel, NULL, bootstrap_tool); - if (job_assumes(j, bootstrapper != NULL)) { - job_dispatch(bootstrapper, true); + if (job_assumes(j, (j2 = jobmgr_init_session(j->mgr, session_type, false)))) { + job_assumes(j, job_dispatch(j2, true)); } kr = 0; goto out; - } + } else if (job_mig_intran2(root_jobmgr, target_subset, ldc.pid)) { + job_log(j, LOG_ERR, "Moving a session to ourself is bogus."); - /* We call job_mig_intran2 because job_mig_intran logs on failure */ - if (getpid() != 1 && job_mig_intran2(root_jobmgr, target_subset, getpid())) { - kr = 0; + kr = BOOTSTRAP_NOT_PRIVILEGED; goto out; } - if (!job_assumes(j, (kr = _vproc_grab_subset(target_subset, &reqport, &rcvright, &l2l_names, &l2l_name_cnt, &l2l_pids, &l2l_pid_cnt, &l2l_ports, &l2l_port_cnt)) == 0)) { + job_log(j, LOG_DEBUG, "Move subset attempt: 0x%x", target_subset); + + kr = _vproc_grab_subset(target_subset, &reqport, &rcvright, &l2l_names, &l2l_name_cnt, &l2l_pids, &l2l_pid_cnt, &l2l_ports, &l2l_port_cnt); + + if (!job_assumes(j, kr == 0)) { goto out; } @@ -5308,7 +5326,9 @@ } if (kr == 0) { - job_assumes(j, launchd_mport_deallocate(target_subset) == KERN_SUCCESS); + if (target_subset) { + job_assumes(j, launchd_mport_deallocate(target_subset) == KERN_SUCCESS); + } } else if (jmr) { jobmgr_shutdown(jmr); } Modified: trunk/launchd/src/liblaunch.c =================================================================== --- trunk/launchd/src/liblaunch.c 2007-05-14 18:32:48 UTC (rev 23254) +++ trunk/launchd/src/liblaunch.c 2007-05-17 21:07:38 UTC (rev 23255) @@ -1204,7 +1204,7 @@ void load_launchd_jobs_at_loginwindow_prompt(int flags __attribute__((unused)), ...) { - _vprocmgr_move_subset_to_user(geteuid() ? geteuid() : getuid(), "LoginWindow"); + _vprocmgr_init("LoginWindow"); } pid_t Modified: trunk/launchd/src/libvproc.c =================================================================== --- trunk/launchd/src/libvproc.c 2007-05-14 18:32:48 UTC (rev 23254) +++ trunk/launchd/src/libvproc.c 2007-05-17 21:07:38 UTC (rev 23255) @@ -30,6 +30,7 @@ #include <stdio.h> #include <errno.h> #include <unistd.h> +#include <syslog.h> #include "liblaunch_public.h" #include "liblaunch_private.h" @@ -65,28 +66,70 @@ } vproc_err_t -_vprocmgr_move_subset_to_user(uid_t target_user, char *session_type) +_vprocmgr_init(const char *session_type) { + if (vproc_mig_move_subset(bootstrap_port, MACH_PORT_NULL, (char *)session_type) == 0) { + return NULL; + } + + return (vproc_err_t)_vprocmgr_init; +} + +vproc_err_t +_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, which_port = bootstrap_port; + mach_port_t puc = 0, rootbs = get_root_bootstrap_port(); bool is_bkgd = (strcmp(session_type, VPROCMGR_SESSION_BACKGROUND) == 0); + int64_t ldpid, lduid; - if (target_user && vproc_mig_lookup_per_user_context(get_root_bootstrap_port(), target_user, &puc) == 0) { - which_port = puc; + if (vproc_swap_integer(NULL, VPROC_GSK_MGR_PID, 0, &ldpid) != 0) { + return (vproc_err_t)_vprocmgr_move_subset_to_user; } + if (vproc_swap_integer(NULL, VPROC_GSK_MGR_UID, 0, &lduid) != 0) { + 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; + } + /* + * Not all sessions can be moved. + * We should clean up this mess someday. + */ + 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) { kr = 0; } else { - kr = vproc_mig_move_subset(which_port, bootstrap_port, session_type); + kr = vproc_mig_move_subset(puc, bootstrap_port, (char *)session_type); } - if (puc && is_bkgd) { + if (is_bkgd) { task_set_bootstrap_port(mach_task_self(), puc); mach_port_deallocate(mach_task_self(), bootstrap_port); bootstrap_port = puc; - } else if (puc) { + } else { mach_port_deallocate(mach_task_self(), puc); } @@ -308,7 +351,9 @@ do { if (previous_port) { - mach_port_deallocate(mach_task_self(), previous_port); + if (previous_port != bootstrap_port) { + mach_port_deallocate(mach_task_self(), previous_port); + } previous_port = parent_port; } else { previous_port = bootstrap_port; Modified: trunk/launchd/src/libvproc_internal.h =================================================================== --- trunk/launchd/src/libvproc_internal.h 2007-05-14 18:32:48 UTC (rev 23254) +++ trunk/launchd/src/libvproc_internal.h 2007-05-17 21:07:38 UTC (rev 23255) @@ -39,6 +39,7 @@ #pragma GCC visibility push(default) +vproc_err_t _vprocmgr_init(const char *session_type); vproc_err_t _vproc_post_fork_ping(void); #define SPAWN_HAS_PATH 0x0001 Modified: trunk/launchd/src/libvproc_private.h =================================================================== --- trunk/launchd/src/libvproc_private.h 2007-05-14 18:32:48 UTC (rev 23254) +++ trunk/launchd/src/libvproc_private.h 2007-05-17 21:07:38 UTC (rev 23255) @@ -63,7 +63,7 @@ #define VPROCMGR_SESSION_STANDARDIO "StandardIO" #define VPROCMGR_SESSION_SYSTEM "System" -vproc_err_t _vprocmgr_move_subset_to_user(uid_t target_user, char *session_type); +vproc_err_t _vprocmgr_move_subset_to_user(uid_t target_user, const char *session_type); #pragma GCC visibility pop

1 0

[23254] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 14 May '07

14 May '07

Revision: 23254 http://trac.macosforge.org/projects/launchd/changeset/23254 Author: zarzycki(a)apple.com Date: 2007-05-14 11:32:48 -0700 (Mon, 14 May 2007) Log Message: ----------- Silly {} updates. 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-05-11 22:04:44 UTC (rev 23253) +++ trunk/launchd/src/launchd_core_logic.c 2007-05-14 18:32:48 UTC (rev 23254) @@ -1083,8 +1083,9 @@ while (*argv_tmp++) j->argc++; - for (i = 0; i < j->argc; i++) + for (i = 0; i < j->argc; i++) { cc += strlen(argv[i]) + 1; + } j->argv = malloc((j->argc + 1) * sizeof(char *) + cc); @@ -2320,8 +2321,9 @@ } else if (j->argv) { argv = alloca((j->argc + 2) * sizeof(char *)); argv[0] = file2exec; - for (i = 0; i < j->argc; i++) + for (i = 0; i < j->argc; i++) { argv[i + 1] = j->argv[i]; + } argv[i + 1] = NULL; } else { argv = alloca(3 * sizeof(char *)); @@ -3061,8 +3063,9 @@ { unsigned int i; - for (i = 0; i < sg->fd_cnt; i++) + for (i = 0; i < sg->fd_cnt; i++) { job_assumes(j, runtime_close(sg->fds[i]) != -1); + } SLIST_REMOVE(&j->sockets, sg, socketgroup, sle);

1 0

[23253] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 11 May '07

11 May '07

Revision: 23253 http://trac.macosforge.org/projects/launchd/changeset/23253 Author: zarzycki(a)apple.com Date: 2007-05-11 15:04:44 -0700 (Fri, 11 May 2007) Log Message: ----------- Better symbol exports. 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-05-10 22:34:45 UTC (rev 23252) +++ trunk/launchd/src/launchd_core_logic.c 2007-05-11 22:04:44 UTC (rev 23253) @@ -127,7 +127,7 @@ #define PORT_HASH_SIZE 32 #define HASH_PORT(x) (IS_POWER_OF_TWO(PORT_HASH_SIZE) ? (MACH_PORT_INDEX(x) & (PORT_HASH_SIZE - 1)) : (MACH_PORT_INDEX(x) % PORT_HASH_SIZE)) -LIST_HEAD(, machservice) port_hash[PORT_HASH_SIZE]; +static LIST_HEAD(, machservice) port_hash[PORT_HASH_SIZE]; static void machservice_setup(launch_data_t obj, const char *key, void *context); static void machservice_setup_options(launch_data_t obj, const char *key, void *context); @@ -332,7 +332,7 @@ #define LABEL_HASH_SIZE 53 -LIST_HEAD(, job_s) label_hash[LABEL_HASH_SIZE]; +static LIST_HEAD(, job_s) label_hash[LABEL_HASH_SIZE]; static size_t hash_label(const char *label) __attribute__((pure)); static size_t hash_ms(const char *msstr) __attribute__((pure));

1 0

[23252] trunk/launchd/src
by source_changes＠macosforge.org 10 May '07

10 May '07

Revision: 23252 http://trac.macosforge.org/projects/launchd/changeset/23252 Author: zarzycki(a)apple.com Date: 2007-05-10 15:34:45 -0700 (Thu, 10 May 2007) Log Message: ----------- Some developers seem to be just making up keys... Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/liblaunch_private.h Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-05-10 21:36:14 UTC (rev 23251) +++ trunk/launchd/src/launchd_core_logic.c 2007-05-10 22:34:45 UTC (rev 23252) @@ -1159,47 +1159,64 @@ void job_import_bool(job_t j, const char *key, bool value) { + bool found_key = false; + switch (key[0]) { case 'k': case 'K': if (strcasecmp(key, LAUNCH_JOBKEY_KEEPALIVE) == 0) { j->ondemand = !value; + found_key = true; } break; case 'o': case 'O': if (strcasecmp(key, LAUNCH_JOBKEY_ONDEMAND) == 0) { j->ondemand = value; + found_key = true; } break; case 'd': case 'D': if (strcasecmp(key, LAUNCH_JOBKEY_DEBUG) == 0) { j->debug = value; + found_key = true; + } else if (strcasecmp(key, LAUNCH_JOBKEY_DISABLED) == 0) { + job_assumes(j, !value); + found_key = true; } break; case 'h': case 'H': if (strcasecmp(key, LAUNCH_JOBKEY_HOPEFULLYEXITSLAST) == 0) { j->hopefully_exits_last = value; + found_key = true; } else if (strcasecmp(key, LAUNCH_JOBKEY_HOPEFULLYEXITSFIRST) == 0) { j->hopefully_exits_first = value; + found_key = true; } break; case 's': case 'S': if (strcasecmp(key, LAUNCH_JOBKEY_SESSIONCREATE) == 0) { j->session_create = value; + found_key = true; } else if (strcasecmp(key, LAUNCH_JOBKEY_STARTONMOUNT) == 0) { j->start_on_mount = value; + found_key = true; + } else if (strcasecmp(key, LAUNCH_JOBKEY_SERVICEIPC) == 0) { + /* this only does something on Mac OS X 10.4 "Tiger" */ + found_key = true; } break; case 'l': case 'L': if (strcasecmp(key, LAUNCH_JOBKEY_LOWPRIORITYIO) == 0) { j->low_pri_io = value; + found_key = true; } else if (strcasecmp(key, LAUNCH_JOBKEY_LAUNCHONLYONCE) == 0) { j->only_once = value; + found_key = true; } break; case 'i': @@ -1210,32 +1227,40 @@ return; } j->no_init_groups = !value; + found_key = true; } break; case 'r': case 'R': if (strcasecmp(key, LAUNCH_JOBKEY_RUNATLOAD) == 0) { j->runatload = value; + found_key = true; } break; case 'e': case 'E': if (strcasecmp(key, LAUNCH_JOBKEY_ENABLEGLOBBING) == 0) { j->globargv = value; + found_key = true; } else if (strcasecmp(key, LAUNCH_JOBKEY_ENTERKERNELDEBUGGERBEFOREKILL) == 0) { j->debug_before_kill = value; + found_key = true; } break; case 'w': case 'W': if (strcasecmp(key, LAUNCH_JOBKEY_WAITFORDEBUGGER) == 0) { j->wait4debugger = value; + found_key = true; } break; default: - job_log(j, LOG_WARNING, "Unknown key for boolean: %s", key); break; } + + if (!found_key) { + job_log(j, LOG_WARNING, "Unknown key for boolean: %s", key); + } } void Modified: trunk/launchd/src/liblaunch_private.h =================================================================== --- trunk/launchd/src/liblaunch_private.h 2007-05-10 21:36:14 UTC (rev 23251) +++ trunk/launchd/src/liblaunch_private.h 2007-05-10 22:34:45 UTC (rev 23252) @@ -47,6 +47,7 @@ #define LAUNCH_JOBKEY_ENTERKERNELDEBUGGERBEFOREKILL "EnterKernelDebuggerBeforeKill" #define LAUNCH_JOBKEY_PERJOBMACHSERVICES "PerJobMachServices" +#define LAUNCH_JOBKEY_SERVICEIPC "ServiceIPC" #define LAUNCH_JOBKEY_MACH_KUNCSERVER "kUNCServer" #define LAUNCH_JOBKEY_MACH_EXCEPTIONSERVER "ExceptionServer"

1 0

[23251] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 10 May '07

10 May '07

Revision: 23251 http://trac.macosforge.org/projects/launchd/changeset/23251 Author: zarzycki(a)apple.com Date: 2007-05-10 14:36:14 -0700 (Thu, 10 May 2007) Log Message: ----------- socketgroup_watch() and socketgroup_ignore() are basically the same, with slightly different args. 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-05-10 21:23:35 UTC (rev 23250) +++ trunk/launchd/src/launchd_core_logic.c 2007-05-10 21:36:14 UTC (rev 23251) @@ -3045,29 +3045,9 @@ free(sg); } -void -socketgroup_ignore(job_t j, struct socketgroup *sg) +static void +socketgroup_kevent_mod(job_t j, struct socketgroup *sg, bool do_add) { - char buf[10000]; - unsigned int i, buf_off = 0; - - if (sg->junkfds) { - return; - } - - for (i = 0; i < sg->fd_cnt; i++) - buf_off += snprintf(buf + buf_off, sizeof(buf) - buf_off, " %d", sg->fds[i]); - - job_log(j, LOG_DEBUG, "Ignoring Sockets:%s", buf); - - for (i = 0; i < sg->fd_cnt; i++) { - job_assumes(j, kevent_mod(sg->fds[i], EVFILT_READ, EV_DELETE, 0, 0, NULL) != -1); - } -} - -void -socketgroup_watch(job_t j, struct socketgroup *sg) -{ struct kevent kev[sg->fd_cnt]; char buf[10000]; unsigned int i, buf_off = 0; @@ -3076,15 +3056,13 @@ return; } - for (i = 0; i < sg->fd_cnt; i++) - buf_off += snprintf(buf + buf_off, sizeof(buf) - buf_off, " %d", sg->fds[i]); - - job_log(j, LOG_DEBUG, "Watching sockets:%s", buf); - for (i = 0; i < sg->fd_cnt; i++) { - EV_SET(&kev[i], sg->fds[i], EVFILT_READ, EV_ADD, 0, 0, j); + EV_SET(&kev[i], sg->fds[i], EVFILT_READ, do_add ? EV_ADD : EV_DELETE, 0, 0, j); + buf_off += snprintf(buf + buf_off, sizeof(buf) - buf_off, " %d", sg->fds[i]); } + job_log(j, LOG_DEBUG, "%s Sockets:%s", do_add ? "Watching" : "Ignoring", buf); + job_assumes(j, kevent_bulk_mod(kev, sg->fd_cnt) != -1); for (i = 0; i < sg->fd_cnt; i++) { @@ -3095,6 +3073,18 @@ } void +socketgroup_ignore(job_t j, struct socketgroup *sg) +{ + socketgroup_kevent_mod(j, sg, false); +} + +void +socketgroup_watch(job_t j, struct socketgroup *sg) +{ + socketgroup_kevent_mod(j, sg, true); +} + +void socketgroup_callback(job_t j) { job_dispatch(j, true);

1 0