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

[22898] trunk/launchd/src
by source_changes＠macosforge.org 16 Oct '06

16 Oct '06

Revision: 22898 http://trac.macosforge.org/projects/launchd/changeset/22898 Author: zarzycki(a)apple.com Date: 2006-10-16 14:18:21 -0700 (Mon, 16 Oct 2006) Log Message: ----------- Add the dummy header back. Modified Paths: -------------- trunk/launchd/src/Makefile.am trunk/launchd/src/Makefile.in Added Paths: ----------- trunk/launchd/src/vproc.h Modified: trunk/launchd/src/Makefile.am =================================================================== --- trunk/launchd/src/Makefile.am 2006-10-16 21:16:29 UTC (rev 22897) +++ trunk/launchd/src/Makefile.am 2006-10-16 21:18:21 UTC (rev 22898) @@ -81,6 +81,7 @@ cp $(srcdir)/StartupItemContext $(DESTDIR)/usr/libexec mkdir -p $(DESTDIR)/usr/include/servers cp $(srcdir)/launch.h $(DESTDIR)/usr/include + cp $(srcdir)/vproc.h $(DESTDIR)/usr/include cp $(srcdir)/bootstrap_public.h $(DESTDIR)/usr/include/servers/bootstrap.h cp $(srcdir)/bootstrap_public.h $(DESTDIR)/usr/include/servers/bootstrap_defs.h mkdir -p $(DESTDIR)/usr/local/include Modified: trunk/launchd/src/Makefile.in =================================================================== --- trunk/launchd/src/Makefile.in 2006-10-16 21:16:29 UTC (rev 22897) +++ trunk/launchd/src/Makefile.in 2006-10-16 21:18:21 UTC (rev 22898) @@ -1049,6 +1049,7 @@ @LIBS_ONLY_FALSE@ cp $(srcdir)/StartupItemContext $(DESTDIR)/usr/libexec @LIBS_ONLY_FALSE@ mkdir -p $(DESTDIR)/usr/include/servers @LIBS_ONLY_FALSE@ cp $(srcdir)/launch.h $(DESTDIR)/usr/include +@LIBS_ONLY_FALSE@ cp $(srcdir)/vproc.h $(DESTDIR)/usr/include @LIBS_ONLY_FALSE@ cp $(srcdir)/bootstrap_public.h $(DESTDIR)/usr/include/servers/bootstrap.h @LIBS_ONLY_FALSE@ cp $(srcdir)/bootstrap_public.h $(DESTDIR)/usr/include/servers/bootstrap_defs.h @LIBS_ONLY_FALSE@ mkdir -p $(DESTDIR)/usr/local/include Added: trunk/launchd/src/vproc.h =================================================================== --- trunk/launchd/src/vproc.h (rev 0) +++ trunk/launchd/src/vproc.h 2006-10-16 21:18:21 UTC (rev 22898) @@ -0,0 +1,78 @@ +#ifndef _VPROC_H_ +#define _VPROC_H_ +/* + * Copyright (c) 2006 Apple Computer, Inc. All rights reserved. + * + * @APPLE_APACHE_LICENSE_HEADER_START@ + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * @APPLE_APACHE_LICENSE_HEADER_END@ + */ + +__BEGIN_DECLS + +typedef void * vproc_t; +typedef void * vprocmgr_t; +typedef void * vproc_err_t; + +/* By default, pass NULL for vprocmgr_t or vproc_t to get notions of self or "my manager" */ + +vproc_err_t vprocmgr_create_vproc(vprocmgr_t vpm, launch_data_t the_vproc, vproc_t *vp); + +/* If creating multiple jobs, it is wise to create them atomically with respect to each other */ +vproc_err_t vprocmgr_create_vprocs(vprocmgr_t vpm, launch_data_t *the_vprocs, vproc_t *vp, size_t cnt); + +vproc_err_t vprocmgr_delete_vproc(vprocmgr_t vpm, vproc_t vp); + +/* The virtual process managers are arranged in a hierarchy */ +vproc_err_t vprocmgr_get_parent(vprocmgr_t vpm, vprocmgr_t *vpm_parent); + +vproc_err_t vprocmgr_get_all_vprocs(vprocmgr_t vpm, vproc_t **vps, size_t *vp_cnt); + +vproc_err_t vprocmgr_lookup_vproc(vprocmgr_t vpm, const char *label, vproc_t *vp); + +vproc_err_t vprocmgr_lookup_vprocmgr_for_user(vprocmgr_t vpm, const char *user, vprocmgr_t *vpm); + +vproc_err_t vprocmgr_lookup_mach_service(vprocmgr_t vpm, const char *service, mach_port_t *service_port); + +/* For controlling speculative and optimistical spawning of vprocs */ +vproc_err_t vprocmgr_set_force_on_demand(vproc_mgr_t vpm, bool force); +vproc_err_t vprocmgr_get_force_on_demand(vproc_mgr_t vpm, bool *force); + +/* Only release those vprocmgr_t objects that returned from APIs. */ +vproc_err_t vprocmgr_release(vprocmgr_t vpm); + + +/* Get meta-data and IPC handles from launchd */ +vproc_err_t vproc_checkin(launch_data_t *out); + +/* Get only meta-data from launchd */ +vproc_err_t vproc_get_info(vproc_t vp, launch_data_t *out); + +/* Lookup a Mach service amongst our peers and progenitors */ +vproc_err_t vproc_lookup_mach_service(vproc_t vp, const char *service, mach_port_t *service_port); + +/* Sending signals to a program that isn't running will return an error */ +vproc_err_t vproc_send_signal(vproc_t vp, int signum); + +/* Only release those vproc_t objects that returned from APIs. */ +vproc_err_t vproc_release(vproc_t vp); + + + +const char *vproc_strerror(vproc_err_t r); + +__END_DECLS + +#endif

1 0

[22897] trunk/launchd/src
by source_changes＠macosforge.org 16 Oct '06

16 Oct '06

Revision: 22897 http://trac.macosforge.org/projects/launchd/changeset/22897 Author: zarzycki(a)apple.com Date: 2006-10-16 14:16:29 -0700 (Mon, 16 Oct 2006) Log Message: ----------- <rdar://problem/4684434> setsockopt() with the executable path as the argument Modified Paths: -------------- trunk/launchd/src/Makefile.am trunk/launchd/src/Makefile.in trunk/launchd/src/launchctl.c Modified: trunk/launchd/src/Makefile.am =================================================================== --- trunk/launchd/src/Makefile.am 2006-10-16 17:34:18 UTC (rev 22896) +++ trunk/launchd/src/Makefile.am 2006-10-16 21:16:29 UTC (rev 22897) @@ -34,7 +34,7 @@ sysconf_DATA = hostconfig rc.common rc.netboot rc.shutdown -launchctl_CFLAGS = $(AM_CFLAGS) -fvisibility=hidden +launchctl_CFLAGS = $(AM_CFLAGS) -fvisibility=hidden -I/System/Library/Frameworks/System.framework/PrivateHeaders launchctl_LDFLAGS = -framework CoreFoundation -weak_library /usr/lib/libedit.dylib SystemStarter_CFLAGS = -mdynamic-no-pic $(AM_CFLAGS) -fvisibility=hidden Modified: trunk/launchd/src/Makefile.in =================================================================== --- trunk/launchd/src/Makefile.in 2006-10-16 17:34:18 UTC (rev 22896) +++ trunk/launchd/src/Makefile.in 2006-10-16 21:16:29 UTC (rev 22897) @@ -232,7 +232,7 @@ @LIBS_ONLY_TRUE@liblaunch_profile_a_SOURCES = liblaunch.c bootstrap_public.c @LIBS_ONLY_FALSE@sbin_SCRIPTS = service @LIBS_ONLY_FALSE@sysconf_DATA = hostconfig rc.common rc.netboot rc.shutdown -@LIBS_ONLY_FALSE@launchctl_CFLAGS = $(AM_CFLAGS) -fvisibility=hidden +@LIBS_ONLY_FALSE@launchctl_CFLAGS = $(AM_CFLAGS) -fvisibility=hidden -I/System/Library/Frameworks/System.framework/PrivateHeaders @LIBS_ONLY_FALSE@launchctl_LDFLAGS = -framework CoreFoundation -weak_library /usr/lib/libedit.dylib @LIBS_ONLY_FALSE@SystemStarter_CFLAGS = -mdynamic-no-pic $(AM_CFLAGS) -fvisibility=hidden @LIBS_ONLY_FALSE@SystemStarter_LDFLAGS = -framework CoreFoundation Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2006-10-16 17:34:18 UTC (rev 22896) +++ trunk/launchd/src/launchctl.c 2006-10-16 21:16:29 UTC (rev 22897) @@ -131,6 +131,7 @@ static int touch_file(const char *path, mode_t m); static void do_sysversion_sysctl(void); static void workaround4465949(void); +static void do_application_firewal_magic(int sfd, launch_data_t thejob); static int bootstrap_cmd(int argc, char *const argv[]); static int load_and_unload_cmd(int argc, char *const argv[]); @@ -842,6 +843,9 @@ fprintf(stderr, "socket(): %s\n", strerror(errno)); return; } + + do_application_firewal_magic(sfd, thejob); + if (hints.ai_flags & AI_PASSIVE) { if (AF_INET6 == res->ai_family && -1 == setsockopt(sfd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&sock_opt, sizeof(sock_opt))) { @@ -2661,3 +2665,62 @@ CFRelease(versdict); } + +void +do_application_firewal_magic(int sfd, launch_data_t thejob) +{ + const char *prog = NULL, *partialprog = NULL; + char *path, *pathtmp, **pathstmp; + char *paths[100]; + launch_data_t tmp; + + /* + * Sigh... + * <rdar://problem/4684434> setsockopt() with the executable path as the argument + */ + + if ((tmp = launch_data_dict_lookup(thejob, LAUNCH_JOBKEY_PROGRAM))) { + prog = launch_data_get_string(tmp); + } + + if (!prog) { + if ((tmp = launch_data_dict_lookup(thejob, LAUNCH_JOBKEY_PROGRAMARGUMENTS))) { + if ((tmp = launch_data_array_get_index(tmp, 0))) { + if (assumes((partialprog = launch_data_get_string(tmp)) != NULL)) { + if (partialprog[0] == '/') { + prog = partialprog; + } + } + } + } + } + + if (!prog) { + pathtmp = path = strdup(getenv("PATH")); + + pathstmp = paths; + + while ((*pathstmp = strsep(&pathtmp, ":"))) { + if (**pathstmp != '\0') { + pathstmp++; + } + } + + free(path); + pathtmp = alloca(MAXPATHLEN); + + pathstmp = paths; + + for (; *pathstmp; pathstmp++) { + snprintf(pathtmp, MAXPATHLEN, "%s/%s", *pathstmp, partialprog); + if (path_check(pathtmp)) { + prog = pathtmp; + break; + } + } + } + + if (assumes(prog != NULL)) { + assumes(setsockopt(sfd, SOL_SOCKET, SO_EXECPATH, prog, strlen(prog) + 1) != -1); + } +}

1 0

[22896] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 16 Oct '06

16 Oct '06

Revision: 22896 http://trac.macosforge.org/projects/launchd/changeset/22896 Author: zarzycki(a)apple.com Date: 2006-10-16 10:34:18 -0700 (Mon, 16 Oct 2006) Log Message: ----------- All curly braces. All the time. 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-10-16 17:15:04 UTC (rev 22895) +++ trunk/launchd/src/launchd_core_logic.c 2006-10-16 17:34:18 UTC (rev 22896) @@ -330,14 +330,17 @@ struct machservice *ms; struct watchpath *wp; - SLIST_FOREACH(sg, &j->sockets, sle) + SLIST_FOREACH(sg, &j->sockets, sle) { socketgroup_ignore(j, sg); + } - SLIST_FOREACH(wp, &j->vnodes, sle) + SLIST_FOREACH(wp, &j->vnodes, sle) { watchpath_ignore(j, wp); + } - SLIST_FOREACH(ms, &j->machservices, sle) + SLIST_FOREACH(ms, &j->machservices, sle) { job_assumes(j, runtime_remove_mport(ms->port) == KERN_SUCCESS); + } } void @@ -347,14 +350,17 @@ struct machservice *ms; struct watchpath *wp; - SLIST_FOREACH(sg, &j->sockets, sle) + SLIST_FOREACH(sg, &j->sockets, sle) { socketgroup_watch(j, sg); + } - SLIST_FOREACH(wp, &j->vnodes, sle) + SLIST_FOREACH(wp, &j->vnodes, sle) { watchpath_watch(j, wp); + } - SLIST_FOREACH(ms, &j->machservices, sle) + SLIST_FOREACH(ms, &j->machservices, sle) { job_assumes(j, runtime_add_mport(ms->port, NULL, 0) == KERN_SUCCESS); + } } void

1 0

[22895] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 16 Oct '06

16 Oct '06

Revision: 22895 http://trac.macosforge.org/projects/launchd/changeset/22895 Author: zarzycki(a)apple.com Date: 2006-10-16 10:15:04 -0700 (Mon, 16 Oct 2006) Log Message: ----------- Fix a 'think-o' with respect to the re-design of bootstraps and the notion of a privileged bootstrap port. 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-10-13 15:00:25 UTC (rev 22894) +++ trunk/launchd/src/launchd_core_logic.c 2006-10-16 17:15:04 UTC (rev 22895) @@ -1426,12 +1426,9 @@ } else { jr = jp; } + job_assumes(jp, jr != NULL); } - if (!launchd_assumes(jr != NULL)) { - syslog(LOG_EMERG, "@@@@@ jp->label == %s", jp->label); - } - return jr; } @@ -1704,9 +1701,6 @@ job_start_child(j, execspair[1]); break; default: - if (!SLIST_EMPTY(&j->machservices)) { - j->priv_port_has_senders = true; - } j->p = c; total_children++; job_assumes(j, close(execspair[1]) == 0);

1 0

[22894] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 13 Oct '06

13 Oct '06

Revision: 22894 http://trac.macosforge.org/projects/launchd/changeset/22894 Author: zarzycki(a)apple.com Date: 2006-10-13 08:00:25 -0700 (Fri, 13 Oct 2006) Log Message: ----------- Only allocate the per-job Mach port as needed. 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-10-13 14:52:18 UTC (rev 22893) +++ trunk/launchd/src/launchd_core_logic.c 2006-10-13 15:00:25 UTC (rev 22894) @@ -683,6 +683,10 @@ j->legacy_mach_job = true; j->priv_port_has_senders = true; /* the IPC that called us will make-send on this port */ + if (!job_setup_machport(j)) { + goto out_bad; + } + if (!job_assumes(j, launchd_mport_notify_req(j->bs_port, MACH_NOTIFY_NO_SENDERS) == KERN_SUCCESS)) { job_assumes(j, launchd_mport_close_recv(j->bs_port) == KERN_SUCCESS); goto out_bad; @@ -816,10 +820,6 @@ j->checkedin = true; j->firstborn = (strcmp(label, FIRSTBORN_LABEL) == 0); - if (!job_setup_machport(j)) { - goto out_bad; - } - if (reqport != MACH_PORT_NULL) { j->req_port = reqport; if (!job_assumes(j, launchd_mport_notify_req(reqport, MACH_NOTIFY_DEAD_NAME) == KERN_SUCCESS)) { @@ -1673,10 +1673,6 @@ time(&j->start_time); - if (j->bs_port) { - job_assumes(j, launchd_mport_notify_req(j->bs_port, MACH_NOTIFY_NO_SENDERS) == KERN_SUCCESS); - } - switch (c = job_fork(j->parent)) { case -1: job_log_error(j, LOG_ERR, "fork() failed, will try again in one second");

1 0

[22893] trunk/launchd/src
by source_changes＠macosforge.org 13 Oct '06

13 Oct '06

Revision: 22893 http://trac.macosforge.org/projects/launchd/changeset/22893 Author: zarzycki(a)apple.com Date: 2006-10-13 07:52:18 -0700 (Fri, 13 Oct 2006) Log Message: ----------- Now that the job MIG intran hook can lookup by both port and PID, we no longer need The "get_self" MIG routine. Modified Paths: -------------- trunk/launchd/src/bootstrap_public.c trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/protocol_legacy.defs Modified: trunk/launchd/src/bootstrap_public.c =================================================================== --- trunk/launchd/src/bootstrap_public.c 2006-10-13 01:21:54 UTC (rev 22892) +++ trunk/launchd/src/bootstrap_public.c 2006-10-13 14:52:18 UTC (rev 22893) @@ -34,10 +34,6 @@ #include <stdlib.h> #include <errno.h> -static mach_port_t vproc_self; - -static void vproc_get_self(void); - kern_return_t _launchd_to_launchd(mach_port_t bp, mach_port_t *reqport, mach_port_t *rcvright, name_array_t *service_names, mach_msg_type_number_t *service_namesCnt, @@ -204,13 +200,7 @@ kern_return_t bootstrap_check_in(mach_port_t bp, name_t service_name, mach_port_t *sp) { - if(bp != bootstrap_port) { - return BOOTSTRAP_NOT_PRIVILEGED; - } - - vproc_get_self(); - - return vproc_mig_check_in(vproc_self, service_name, sp); + return vproc_mig_check_in(bp, service_name, sp); } kern_return_t @@ -278,22 +268,6 @@ } -void -vproc_get_self(void) -{ - mach_port_t bp_self; - - if (vproc_self != MACH_PORT_NULL) { - return; - } - - if (vproc_mig_get_self(bootstrap_port, &bp_self) != 0) { - return; - } - - vproc_self = bp_self; -} - const char * bootstrap_strerror(kern_return_t r) { Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2006-10-13 01:21:54 UTC (rev 22892) +++ trunk/launchd/src/launchd_core_logic.c 2006-10-13 14:52:18 UTC (rev 22893) @@ -3533,26 +3533,6 @@ } kern_return_t -job_mig_get_self(job_t j, mach_port_t *unprivportp) -{ - struct ldcred ldc; - - runtime_get_caller_creds(&ldc); - - job_log(j, LOG_DEBUG, "Requested unprivileged bootstrap port"); - - if (j->anonymous) { - job_log(j, LOG_NOTICE, "PID %u not managed by %s", ldc.pid, getprogname()); - return BOOTSTRAP_NOT_PRIVILEGED; - } - - *unprivportp = job_get_bsport(j); - - return BOOTSTRAP_SUCCESS; -} - - -kern_return_t job_mig_check_in(job_t j, name_t servicename, mach_port_t *serviceportp) { static pid_t last_warned_pid = 0; Modified: trunk/launchd/src/protocol_legacy.defs =================================================================== --- trunk/launchd/src/protocol_legacy.defs 2006-10-13 01:21:54 UTC (rev 22892) +++ trunk/launchd/src/protocol_legacy.defs 2006-10-13 14:52:18 UTC (rev 22893) @@ -109,8 +109,3 @@ routine uncork_fork( __bs_port : job_t); - -/* Essentially the inverse of bootstrap_unprivileged() */ -routine get_self( - __bs_port : job_t; - out __job_port : mach_port_make_send_t);

1 0

[22892] trunk/launchd/src
by source_changes＠macosforge.org 13 Oct '06

13 Oct '06

Revision: 22892 http://trac.macosforge.org/projects/launchd/changeset/22892 Author: zarzycki(a)apple.com Date: 2006-10-12 18:21:54 -0700 (Thu, 12 Oct 2006) Log Message: ----------- Merge all anonymous jobs into one to keep our sanity... Modified Paths: -------------- trunk/launchd/src/bootstrap_private.h trunk/launchd/src/bootstrap_public.c trunk/launchd/src/launchd.c trunk/launchd/src/launchd.h trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/protocol_legacy.defs Modified: trunk/launchd/src/bootstrap_private.h =================================================================== --- trunk/launchd/src/bootstrap_private.h 2006-10-13 00:54:01 UTC (rev 22891) +++ trunk/launchd/src/bootstrap_private.h 2006-10-13 01:21:54 UTC (rev 22892) @@ -37,7 +37,6 @@ kern_return_t _launchd_to_launchd(mach_port_t bp, mach_port_t *reqport, mach_port_t *rcvright, name_array_t *service_names, mach_msg_type_number_t *service_namesCnt, - vm_offset_t *service_pids, mach_msg_type_number_t *service_pidsCnt, mach_port_array_t *ports, mach_msg_type_number_t *portCnt); kern_return_t bootstrap_getsocket(mach_port_t bp, name_t); Modified: trunk/launchd/src/bootstrap_public.c =================================================================== --- trunk/launchd/src/bootstrap_public.c 2006-10-13 00:54:01 UTC (rev 22891) +++ trunk/launchd/src/bootstrap_public.c 2006-10-13 01:21:54 UTC (rev 22892) @@ -41,10 +41,9 @@ kern_return_t _launchd_to_launchd(mach_port_t bp, mach_port_t *reqport, mach_port_t *rcvright, name_array_t *service_names, mach_msg_type_number_t *service_namesCnt, - vm_offset_t *service_pids, mach_msg_type_number_t *service_pidsCnt, mach_port_array_t *ports, mach_msg_type_number_t *portCnt) { - return vproc_mig_transfer_subset(bp, reqport, rcvright, service_names, service_namesCnt, service_pids, service_pidsCnt, ports, portCnt); + return vproc_mig_transfer_subset(bp, reqport, rcvright, service_names, service_namesCnt, ports, portCnt); } pid_t Modified: trunk/launchd/src/launchd.c =================================================================== --- trunk/launchd/src/launchd.c 2006-10-13 00:54:01 UTC (rev 22891) +++ trunk/launchd/src/launchd.c 2006-10-13 01:21:54 UTC (rev 22892) @@ -119,8 +119,7 @@ }; struct sigaction fsa; bool sflag = false, dflag = false, Dflag = false; - mach_msg_type_number_t l2l_name_cnt = 0, l2l_port_cnt = 0, l2l_pid_cnt = 0; - pid_t *l2l_pids = NULL; + mach_msg_type_number_t l2l_name_cnt = 0, l2l_port_cnt = 0; name_array_t l2l_names = NULL; mach_port_array_t l2l_ports = NULL; char ldconf[PATH_MAX] = PID1LAUNCHD_CONF; @@ -251,17 +250,16 @@ launchd_assert(bootstrap_parent(bootstrap_port, &newparent) == BOOTSTRAP_SUCCESS); launchd_assert(_launchd_to_launchd(bootstrap_port, &req_mport, &checkin_mport, - &l2l_names, &l2l_name_cnt, (vm_offset_t *)&l2l_pids, &l2l_pid_cnt, - &l2l_ports, &l2l_port_cnt) == BOOTSTRAP_SUCCESS); + &l2l_names, &l2l_name_cnt, &l2l_ports, &l2l_port_cnt) == BOOTSTRAP_SUCCESS); - launchd_assert(l2l_name_cnt == l2l_port_cnt && l2l_name_cnt == (l2l_pid_cnt / sizeof(pid_t))); + launchd_assert(l2l_name_cnt == l2l_port_cnt); task_set_bootstrap_port(mach_task_self(), newparent); launchd_assumes(mach_port_deallocate(mach_task_self(), bootstrap_port) == KERN_SUCCESS); bootstrap_port = newparent; } - mach_init_init(req_mport, checkin_mport, l2l_names, l2l_ports, l2l_pids, l2l_name_cnt); + mach_init_init(req_mport, checkin_mport, l2l_names, l2l_ports, l2l_name_cnt); if (l2l_names) { mig_deallocate((vm_address_t)l2l_names, l2l_name_cnt * sizeof(l2l_names[0])); @@ -269,9 +267,6 @@ if (l2l_ports) { mig_deallocate((vm_address_t)l2l_ports, l2l_port_cnt * sizeof(l2l_ports[0])); } - if (l2l_pids) { - mig_deallocate((vm_address_t)l2l_pids, l2l_pid_cnt); - } if (h) { sprintf(ldconf, "%s/%s", h, LAUNCHD_CONF); Modified: trunk/launchd/src/launchd.h =================================================================== --- trunk/launchd/src/launchd.h 2006-10-13 00:54:01 UTC (rev 22891) +++ trunk/launchd/src/launchd.h 2006-10-13 01:21:54 UTC (rev 22892) @@ -59,7 +59,7 @@ void catatonia(void); void mach_start_shutdown(void); -void mach_init_init(mach_port_t, mach_port_t, name_array_t, mach_port_array_t, pid_t *, mach_msg_type_number_t); +void mach_init_init(mach_port_t, mach_port_t, name_array_t, mach_port_array_t, mach_msg_type_number_t); int _fd(int fd); Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2006-10-13 00:54:01 UTC (rev 22891) +++ trunk/launchd/src/launchd_core_logic.c 2006-10-13 01:21:54 UTC (rev 22892) @@ -267,7 +267,8 @@ static job_t job_new_spawn(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); static job_t job_new_via_mach_init(job_t jbs, const char *cmd, uid_t uid, bool ond); static job_t job_new_bootstrap(job_t p, mach_port_t requestorport, mach_port_t checkin_port); -static job_t job_new_anonymous(job_t p, pid_t who); +static bool job_new_anonymous(job_t p); +static job_t job_find_anonymous(job_t p); static const char *job_prog(job_t j); static pid_t job_get_pid(job_t j); static mach_port_t job_get_bsport(job_t j); @@ -759,33 +760,32 @@ } job_t -job_new_anonymous(job_t p, pid_t who) +job_find_anonymous(job_t p) { - int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, who }; - char newlabel[1000], *procname = "unknown"; - struct kinfo_proc kp; - size_t kplen = sizeof(kp); - job_t jr; + job_t ji = NULL; - if (who) { - if (sysctl(mib, 4, &kp, &kplen, NULL, 0) == -1) { - return NULL; + SLIST_FOREACH(ji, &p->jobs, sle) { + if (ji->anonymous) { + break; } - procname = kp.kp_proc.p_comm; } - sprintf(newlabel, "anonymous-%u.%s", who, procname); + return ji; +} - jr = job_new(p, newlabel, procname, NULL, NULL, MACH_PORT_NULL); +bool +job_new_anonymous(job_t p) +{ + char newlabel[1000], *procname = "unknown"; + job_t jr; - if (!jr) { - return NULL; + sprintf(newlabel, "%u.anonymous", MACH_PORT_INDEX(p->bs_port)); + + if ((jr = job_new(p, newlabel, procname, NULL, NULL, MACH_PORT_NULL))) { + jr->anonymous = true; } - jr->anonymous = true; - jr->p = who; - - return jr; + return jr ? true : false; } job_t @@ -1413,7 +1413,26 @@ job_t job_mig_intran(mach_port_t p) { - return job_find_by_port2(root_job, p); + struct ldcred ldc; + job_t jp, jr = NULL; + + runtime_get_caller_creds(&ldc); + + if (launchd_assumes((jp = job_find_by_port2(root_job, p)) != NULL)) { + if (jp->req_port) { + if (!(jr = job_find_by_pid(jp, ldc.pid, false))) { + jr = job_find_anonymous(jp); + } + } else { + jr = jp; + } + } + + if (!launchd_assumes(jr != NULL)) { + syslog(LOG_EMERG, "@@@@@ jp->label == %s", jp->label); + } + + return jr; } void @@ -1658,7 +1677,7 @@ job_assumes(j, launchd_mport_notify_req(j->bs_port, MACH_NOTIFY_NO_SENDERS) == KERN_SUCCESS); } - switch (c = job_fork(j->legacy_mach_job ? j : j->parent)) { + switch (c = job_fork(j->parent)) { case -1: job_log_error(j, LOG_ERR, "fork() failed, will try again in one second"); job_assumes(j, close(execspair[0]) == 0); @@ -2898,6 +2917,8 @@ job_log(p, LOG_DEBUG, "Mach sub-bootstrap created: %s", j->label); } + job_assumes(j, job_new_anonymous(j)); + return j; out_bad: @@ -2940,10 +2961,6 @@ return job_remove(j); } } - - if (j->anonymous && SLIST_EMPTY(&j->machservices)) { - job_remove(j); - } } struct machservice * @@ -3519,27 +3536,17 @@ job_mig_get_self(job_t j, mach_port_t *unprivportp) { struct ldcred ldc; - job_t j2; runtime_get_caller_creds(&ldc); job_log(j, LOG_DEBUG, "Requested unprivileged bootstrap port"); - j2 = job_find_by_pid(j, ldc.pid, false); - - if (!j2) { - if (ldc.uid == getuid() && ldc.euid == geteuid()) { - j2 = job_new_anonymous(j, ldc.pid); - if (!j2) { - return BOOTSTRAP_NO_MEMORY; - } - } else { - job_log(j, LOG_NOTICE, "PID %u not managed by launchd", ldc.pid); - return BOOTSTRAP_NOT_PRIVILEGED; - } + if (j->anonymous) { + job_log(j, LOG_NOTICE, "PID %u not managed by %s", ldc.pid, getprogname()); + return BOOTSTRAP_NOT_PRIVILEGED; } - *unprivportp = job_get_bsport(j2); + *unprivportp = job_get_bsport(j); return BOOTSTRAP_SUCCESS; } @@ -3586,20 +3593,9 @@ { struct machservice *ms; struct ldcred ldc; - job_t j2; runtime_get_caller_creds(&ldc); - if (j == job_get_bs(j)) { - j2 = job_find_by_pid(j, ldc.pid, false); - if (!j2) { - j2 = job_new_anonymous(j, ldc.pid); - } - if (j2) { - j = j2; - } - } - job_log(j, LOG_NOTICE, "bootstrap_register() is deprecated. PID: %u Service: %s", ldc.pid, servicename); job_log(j, LOG_DEBUG, "Mach service registration attempt: %s", servicename); @@ -3691,7 +3687,6 @@ name_array_t service_names; bootstrap_status_array_t service_actives; mach_port_array_t ports; - pid_t *pids; unsigned int i; }; @@ -3708,7 +3703,6 @@ info_resp->service_actives[info_resp->i] = machservice_status(ms); } else { info_resp->ports[info_resp->i] = machservice_port(ms); - info_resp->pids[info_resp->i] = job_get_pid(machservice_job(ms)); } info_resp->i++; } @@ -3717,7 +3711,7 @@ job_mig_info(job_t j, name_array_t *servicenamesp, unsigned int *servicenames_cnt, bootstrap_status_array_t *serviceactivesp, unsigned int *serviceactives_cnt) { - struct x_bootstrap_info_copyservices_cb info_resp = { NULL, NULL, NULL, NULL, 0 }; + struct x_bootstrap_info_copyservices_cb info_resp = { NULL, NULL, NULL, 0 }; unsigned int cnt = 0; job_t ji; @@ -3759,12 +3753,15 @@ kern_return_t job_mig_transfer_subset(job_t j, mach_port_t *reqport, mach_port_t *rcvright, name_array_t *servicenamesp, unsigned int *servicenames_cnt, - vm_offset_t *service_pids, mach_msg_type_number_t *service_pidsCnt, mach_port_array_t *ports, unsigned int *ports_cnt) { - struct x_bootstrap_info_copyservices_cb info_resp = { NULL, NULL, NULL, NULL, 0 }; + struct x_bootstrap_info_copyservices_cb info_resp = { NULL, NULL, NULL, 0 }; unsigned int cnt = 0; + if (j->anonymous) { + j = j->parent; + } + if (getpid() != 1) { job_log(j, LOG_ERR, "Only the system launchd will transfer Mach sub-bootstraps."); return BOOTSTRAP_NOT_PRIVILEGED; @@ -3787,11 +3784,6 @@ goto out_bad; } - mig_allocate((vm_address_t *)&info_resp.pids, cnt * sizeof(pid_t)); - if (!launchd_assumes(info_resp.pids != NULL)) { - goto out_bad; - } - job_foreach_service(j, job_mig_info_copyservices, &info_resp, true); launchd_assumes(info_resp.i == cnt); @@ -3799,8 +3791,6 @@ *servicenamesp = info_resp.service_names; *ports = info_resp.ports; *servicenames_cnt = *ports_cnt = cnt; - *service_pids = (vm_offset_t)info_resp.pids; - *service_pidsCnt = cnt * sizeof(pid_t); *reqport = job_get_reqport(j); *rcvright = job_get_bsport(j); @@ -3818,9 +3808,6 @@ if (info_resp.ports) { mig_deallocate((vm_address_t)info_resp.ports, cnt * sizeof(info_resp.ports[0])); } - if (info_resp.pids) { - mig_deallocate((vm_address_t)info_resp.pids, cnt * sizeof(pid_t)); - } return BOOTSTRAP_NO_MEMORY; } @@ -4019,7 +4006,7 @@ void mach_init_init(mach_port_t req_port, mach_port_t checkin_port, - name_array_t l2l_names, mach_port_array_t l2l_ports, pid_t *l2l_pids, mach_msg_type_number_t l2l_cnt) + name_array_t l2l_names, mach_port_array_t l2l_ports, mach_msg_type_number_t l2l_cnt) { mach_msg_type_number_t l2l_i; auditinfo_t inherited_audit; @@ -4030,6 +4017,8 @@ launchd_assert((root_job = job_new_bootstrap(NULL, req_port ? req_port : mach_task_self(), checkin_port)) != NULL); + launchd_assert((anon_job = job_find_anonymous(root_job)) != NULL); + launchd_assert(launchd_get_bport(&inherited_bootstrap_port) == KERN_SUCCESS); if (getpid() != 1) { @@ -4049,10 +4038,6 @@ for (l2l_i = 0; l2l_i < l2l_cnt; l2l_i++) { struct machservice *ms; - if (!(anon_job = job_find_by_pid(root_job, l2l_pids[l2l_i], false))) { - launchd_assert(anon_job = job_new_anonymous(root_job, l2l_pids[l2l_i])); - } - if ((ms = machservice_new(anon_job, l2l_names[l2l_i], &l2l_ports[l2l_i]))) { machservice_watch(ms); } Modified: trunk/launchd/src/protocol_legacy.defs =================================================================== --- trunk/launchd/src/protocol_legacy.defs 2006-10-13 00:54:01 UTC (rev 22891) +++ trunk/launchd/src/protocol_legacy.defs 2006-10-13 01:21:54 UTC (rev 22892) @@ -86,7 +86,6 @@ out __bs_reqport : mach_port_t; out __bs_rcvright : mach_port_move_receive_t; out __service_names : name_array_t, dealloc; - out __service_pids : pointer_t, dealloc; out __service_ports : mach_port_array_t, dealloc); routine getsocket(

1 0

[22891] trunk/launchd/src/launchd.c
by source_changes＠macosforge.org 13 Oct '06

13 Oct '06

Revision: 22891 http://trac.macosforge.org/projects/launchd/changeset/22891 Author: zarzycki(a)apple.com Date: 2006-10-12 17:54:01 -0700 (Thu, 12 Oct 2006) Log Message: ----------- Better internal crash reporting. Modified Paths: -------------- trunk/launchd/src/launchd.c Modified: trunk/launchd/src/launchd.c =================================================================== --- trunk/launchd/src/launchd.c 2006-10-12 19:13:23 UTC (rev 22890) +++ trunk/launchd/src/launchd.c 2006-10-13 00:54:01 UTC (rev 22891) @@ -94,13 +94,14 @@ static void testfd_or_openfd(int fd, const char *path, int flags); static bool get_network_state(void); static void monitor_networking_state(void); -static void fatal_signal_handler(int sig); +static void fatal_signal_handler(int sig, siginfo_t *si, void *uap); static bool re_exec_in_single_user_mode = false; static char *pending_stdout = NULL; static char *pending_stderr = NULL; static job_t rlcj = NULL; static jmp_buf doom_doom_doom; +static void *crash_addr; sigset_t blocked_signals = 0; bool shutdown_in_progress = false; @@ -116,6 +117,7 @@ SIGTTIN, SIGTTOU, SIGIO, SIGXCPU, SIGXFSZ, SIGVTALRM, SIGPROF, SIGWINCH, SIGINFO, SIGUSR1, SIGUSR2 }; + struct sigaction fsa; bool sflag = false, dflag = false, Dflag = false; mach_msg_type_number_t l2l_name_cnt = 0, l2l_port_cnt = 0, l2l_pid_cnt = 0; pid_t *l2l_pids = NULL; @@ -330,18 +332,37 @@ init_pre_kevent(); } - launchd_assert(setjmp(doom_doom_doom) == 0); - launchd_assumes(signal(SIGILL, fatal_signal_handler) != SIG_ERR); - launchd_assumes(signal(SIGFPE, fatal_signal_handler) != SIG_ERR); - launchd_assumes(signal(SIGBUS, fatal_signal_handler) != SIG_ERR); - launchd_assumes(signal(SIGSEGV, fatal_signal_handler) != SIG_ERR); + switch (setjmp(doom_doom_doom)) { + case SIGILL: + case SIGFPE: + syslog(LOG_EMERG, "We crashed at instruction: %p", crash_addr); + abort(); + case SIGBUS: + case SIGSEGV: + syslog(LOG_EMERG, "We crashed trying to read/write: %p", crash_addr); + abort(); + default: + abort(); + case 0: + break; + } + fsa.sa_sigaction = fatal_signal_handler; + fsa.sa_flags = SA_SIGINFO; + sigemptyset(&fsa.sa_mask); + + launchd_assumes(sigaction(SIGILL, &fsa, NULL) != -1); + launchd_assumes(sigaction(SIGFPE, &fsa, NULL) != -1); + launchd_assumes(sigaction(SIGBUS, &fsa, NULL) != -1); + launchd_assumes(sigaction(SIGSEGV, &fsa, NULL) != -1); + launchd_runtime(); } void -fatal_signal_handler(int sig) +fatal_signal_handler(int sig, siginfo_t *si, void *uap) { + crash_addr = si->si_addr; longjmp(doom_doom_doom, sig); }

1 0

[22890] trunk/launchd/src
by source_changes＠macosforge.org 12 Oct '06

12 Oct '06

Revision: 22890 http://trac.macosforge.org/projects/launchd/changeset/22890 Author: zarzycki(a)apple.com Date: 2006-10-12 12:13:23 -0700 (Thu, 12 Oct 2006) Log Message: ----------- Make the remote creds accessible at any time. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_runtime.c trunk/launchd/src/launchd_runtime.h trunk/launchd/src/protocol_legacy.defs Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2006-10-11 00:09:19 UTC (rev 22889) +++ trunk/launchd/src/launchd_core_logic.c 2006-10-12 19:13:23 UTC (rev 22890) @@ -88,16 +88,6 @@ static au_asid_t inherited_asid; mach_port_t inherited_bootstrap_port; -struct ldcred { - uid_t euid; - uid_t uid; - gid_t egid; - gid_t gid; - pid_t pid; - au_asid_t asid; -}; - -static void audit_token_to_launchd_cred(audit_token_t au_tok, struct ldcred *ldc); static bool trusted_client_check(job_t j, struct ldcred *ldc); @@ -3473,13 +3463,12 @@ } kern_return_t -job_mig_create_server(job_t j, cmd_t server_cmd, uid_t server_uid, boolean_t on_demand, - audit_token_t au_tok, mach_port_t *server_portp) +job_mig_create_server(job_t j, cmd_t server_cmd, uid_t server_uid, boolean_t on_demand, mach_port_t *server_portp) { struct ldcred ldc; job_t js; - audit_token_to_launchd_cred(au_tok, &ldc); + runtime_get_caller_creds(&ldc); job_log(j, LOG_DEBUG, "Server create attempt: %s", server_cmd); @@ -3527,12 +3516,12 @@ } kern_return_t -job_mig_get_self(job_t j, audit_token_t au_tok, mach_port_t *unprivportp) +job_mig_get_self(job_t j, mach_port_t *unprivportp) { struct ldcred ldc; job_t j2; - audit_token_to_launchd_cred(au_tok, &ldc); + runtime_get_caller_creds(&ldc); job_log(j, LOG_DEBUG, "Requested unprivileged bootstrap port"); @@ -3557,13 +3546,13 @@ kern_return_t -job_mig_check_in(job_t j, name_t servicename, audit_token_t au_tok, mach_port_t *serviceportp) +job_mig_check_in(job_t j, name_t servicename, mach_port_t *serviceportp) { static pid_t last_warned_pid = 0; struct machservice *ms; struct ldcred ldc; - audit_token_to_launchd_cred(au_tok, &ldc); + runtime_get_caller_creds(&ldc); ms = job_lookup_service(j, servicename, true); @@ -3593,13 +3582,13 @@ } kern_return_t -job_mig_register(job_t j, audit_token_t au_tok, name_t servicename, mach_port_t serviceport) +job_mig_register(job_t j, name_t servicename, mach_port_t serviceport) { struct machservice *ms; struct ldcred ldc; job_t j2; - audit_token_to_launchd_cred(au_tok, &ldc); + runtime_get_caller_creds(&ldc); if (j == job_get_bs(j)) { j2 = job_find_by_pid(j, ldc.pid, false); @@ -3641,12 +3630,12 @@ } kern_return_t -job_mig_look_up(job_t j, audit_token_t au_tok, name_t servicename, mach_port_t *serviceportp, mach_msg_type_name_t *ptype) +job_mig_look_up(job_t j, name_t servicename, mach_port_t *serviceportp, mach_msg_type_name_t *ptype) { struct machservice *ms; struct ldcred ldc; - audit_token_to_launchd_cred(au_tok, &ldc); + runtime_get_caller_creds(&ldc); ms = job_lookup_service(j, servicename, true); @@ -3896,17 +3885,17 @@ } kern_return_t -job_mig_wait(job_t j, mach_port_t srp, audit_token_t au_tok, integer_t *waitstatus) +job_mig_wait(job_t j, mach_port_t srp, integer_t *waitstatus) { #if 0 struct ldcred ldc; - audit_token_to_launchd_cred(au_tok, &ldc); + runtime_get_caller_creds(&ldc); #endif return job_handle_mpm_wait(j, srp, waitstatus); } kern_return_t -job_mig_uncork_fork(job_t j, audit_token_t au_tok) +job_mig_uncork_fork(job_t j) { if (!j) { return BOOTSTRAP_NOT_PRIVILEGED; @@ -3918,8 +3907,7 @@ } kern_return_t -job_mig_spawn(job_t j, audit_token_t au_tok, - _internal_string_t charbuf, mach_msg_type_number_t charbuf_cnt, +job_mig_spawn(job_t j, _internal_string_t charbuf, mach_msg_type_number_t charbuf_cnt, uint32_t argc, uint32_t envc, uint64_t flags, uint16_t mig_umask, pid_t *child_pid, mach_port_t *obsvr_port) { @@ -3933,7 +3921,7 @@ const char *workingdir = NULL; size_t argv_i = 0, env_i = 0; - audit_token_to_launchd_cred(au_tok, &ldc); + runtime_get_caller_creds(&ldc); #if 0 if (ldc.asid != inherited_asid) { @@ -3993,14 +3981,6 @@ return BOOTSTRAP_SUCCESS; } -void -audit_token_to_launchd_cred(audit_token_t au_tok, struct ldcred *ldc) -{ - audit_token_to_au32(au_tok, /* audit UID */ NULL, &ldc->euid, - &ldc->egid, &ldc->uid, &ldc->gid, &ldc->pid, - &ldc->asid, /* au_tid_t */ NULL); -} - bool trusted_client_check(job_t j, struct ldcred *ldc) { Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2006-10-11 00:09:19 UTC (rev 22889) +++ trunk/launchd/src/launchd_runtime.c 2006-10-12 19:13:23 UTC (rev 22890) @@ -79,6 +79,7 @@ static size_t mig_cb_table_sz; static timeout_callback runtime_idle_callback; static mach_msg_timeout_t runtime_idle_timeout; +static audit_token_t *au_tok; void launchd_runtime_init(void) @@ -475,6 +476,38 @@ return KERN_SUCCESS; } +static void +record_caller_creds(mach_msg_header_t *mh) +{ + mach_msg_max_trailer_t *tp; + size_t trailer_size; + + tp = (mach_msg_max_trailer_t *)((vm_offset_t)mh + round_msg(mh->msgh_size)); + + trailer_size = tp->msgh_trailer_size - (mach_msg_size_t)(sizeof(mach_msg_trailer_type_t) - sizeof(mach_msg_trailer_size_t)); + + if (trailer_size < (mach_msg_size_t)sizeof(audit_token_t)) { + au_tok = NULL; + return; + } + + au_tok = &tp->msgh_audit; +} + +bool +runtime_get_caller_creds(struct ldcred *ldc) +{ + if (!au_tok) { + return false; + } + + audit_token_to_au32(*au_tok, /* audit UID */ NULL, &ldc->euid, + &ldc->egid, &ldc->uid, &ldc->gid, &ldc->pid, + &ldc->asid, /* au_tid_t */ NULL); + + return true; +} + void launchd_runtime2(mach_msg_size_t msg_size, mig_reply_error_t *bufRequest, mig_reply_error_t *bufReply) { @@ -555,6 +588,8 @@ break; } + record_caller_creds(&bufRequest->Head); + if (the_demux(&bufRequest->Head, &bufReply->Head) == FALSE) { /* XXX - also gross */ if (bufRequest->Head.msgh_id == MACH_NOTIFY_NO_SENDERS) { Modified: trunk/launchd/src/launchd_runtime.h =================================================================== --- trunk/launchd/src/launchd_runtime.h 2006-10-11 00:09:19 UTC (rev 22889) +++ trunk/launchd/src/launchd_runtime.h 2006-10-12 19:13:23 UTC (rev 22890) @@ -22,6 +22,15 @@ #include <mach/mach.h> +struct ldcred { + uid_t euid; + uid_t uid; + gid_t egid; + gid_t gid; + pid_t pid; + au_asid_t asid; +}; + /* * Use launchd_assumes() when we can recover, even if it means we leak or limp along. * @@ -50,7 +59,9 @@ void runtime_set_timeout(timeout_callback to_cb, mach_msg_timeout_t to); kern_return_t runtime_add_mport(mach_port_t name, mig_callback demux, mach_msg_size_t msg_size); kern_return_t runtime_remove_mport(mach_port_t name); +bool runtime_get_caller_creds(struct ldcred *ldc); + int kevent_mod(uintptr_t ident, short filter, u_short flags, u_int fflags, intptr_t data, void *udata); kern_return_t launchd_set_bport(mach_port_t name); Modified: trunk/launchd/src/protocol_legacy.defs =================================================================== --- trunk/launchd/src/protocol_legacy.defs 2006-10-11 00:09:19 UTC (rev 22889) +++ trunk/launchd/src/protocol_legacy.defs 2006-10-12 19:13:23 UTC (rev 22890) @@ -39,7 +39,6 @@ __server_cmd : cmd_t; __server_uid : natural_t; __on_demand : boolean_t; - ServerAuditToken __token : audit_token_t; out __server_port : mach_port_make_send_t); skip; /* Last used in 10.4. Was bootstrap_unprivileged() */ @@ -47,18 +46,15 @@ routine check_in( __bs_port : job_t; __service_name : name_t; - ServerAuditToken __token : audit_token_t; out __service_port : mach_port_move_receive_t); routine register( __bs_port : job_t; - ServerAuditToken __token : audit_token_t; __service_name : name_t; __service_port : mach_port_t); routine look_up( __bs_port : job_t; - ServerAuditToken __token : audit_token_t; __service_name : name_t; out __service_port : mach_port_send_t); @@ -99,7 +95,6 @@ routine spawn( __bs_port : job_t; - ServerAuditToken __token : audit_token_t; __chars : _internal_string_t; __argc : uint32_t; __envc : uint32_t; @@ -111,15 +106,12 @@ routine wait( __bs_port : job_t; sreplyport __rport : mach_port_make_send_once_t; - ServerAuditToken __token : audit_token_t; out __waitval : integer_t); routine uncork_fork( - __bs_port : job_t; - ServerAuditToken __token : audit_token_t); + __bs_port : job_t); /* Essentially the inverse of bootstrap_unprivileged() */ routine get_self( __bs_port : job_t; - ServerAuditToken __token : audit_token_t; out __job_port : mach_port_make_send_t);

1 0

[22889] trunk/launchd/src/launchctl.c
by source_changes＠macosforge.org 11 Oct '06

11 Oct '06

Revision: 22889 http://trac.macosforge.org/projects/launchd/changeset/22889 Author: zarzycki(a)apple.com Date: 2006-10-10 17:09:19 -0700 (Tue, 10 Oct 2006) Log Message: ----------- "typo" Modified Paths: -------------- trunk/launchd/src/launchctl.c Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2006-09-28 19:38:17 UTC (rev 22888) +++ trunk/launchd/src/launchctl.c 2006-10-11 00:09:19 UTC (rev 22889) @@ -2581,7 +2581,7 @@ void empty_dir(const char *path) { - assumes(chflags(path, 0) != -1); + assumes(lchflags(path, 0) != -1); assumes(remove(path) != -1); }

1 0