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

[23098] trunk/launchd/src/launchctl.c
by source_changes＠macosforge.org 22 Feb '07

22 Feb '07

Revision: 23098 http://trac.macosforge.org/projects/launchd/changeset/23098 Author: zarzycki(a)apple.com Date: 2007-02-22 14:41:38 -0800 (Thu, 22 Feb 2007) Log Message: ----------- I shot myself in the foot with the 'bootstrap' subcommand. This makes it possible to run from single user mode again. Modified Paths: -------------- trunk/launchd/src/launchctl.c Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2007-02-22 18:22:46 UTC (rev 23097) +++ trunk/launchd/src/launchctl.c 2007-02-22 22:41:38 UTC (rev 23098) @@ -1345,9 +1345,10 @@ if (!path_check("/System/Library/LoginPlugins/BootCache.loginPlugin")) { int remaining_sec = 60 - tvd.tv_sec; + if (remaining_sec > 0) { sleep(remaining_sec); - } + } const char *bcc_stop_tool[] = { "BootCacheControl", "stop", NULL }; assumes(fwexec(bcc_stop_tool, true) != -1); @@ -1357,9 +1358,9 @@ int bootstrap_cmd(int argc, char *const argv[] __attribute__((unused))) { - if (getpid() == 2 && getuid() == 0) { + if (getuid() == 0) { very_pid2_specific_bootstrap(argc == 2); - } else if (getuid() != 0) { + } else { char *load_launchd_items[] = { "load", "-D", "all", "-S", "Background", NULL }; if (is_safeboot()) {

1 0

[23097] trunk/launchd/src
by source_changes＠macosforge.org 22 Feb '07

22 Feb '07

Revision: 23097 http://trac.macosforge.org/projects/launchd/changeset/23097 Author: zarzycki(a)apple.com Date: 2007-02-22 10:22:46 -0800 (Thu, 22 Feb 2007) Log Message: ----------- <rdar://problem/5016362> Step one of 4746572 (seatbelt stuff) Modified Paths: -------------- trunk/launchd/src/Makefile.am trunk/launchd/src/Makefile.in trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/libbootstrap.c trunk/launchd/src/protocol_job.defs Added Paths: ----------- trunk/launchd/src/libbootstrap_private.h Modified: trunk/launchd/src/Makefile.am =================================================================== --- trunk/launchd/src/Makefile.am 2007-02-22 01:34:11 UTC (rev 23096) +++ trunk/launchd/src/Makefile.am 2007-02-22 18:22:46 UTC (rev 23097) @@ -70,22 +70,23 @@ install-data-hook: mkdir -p $(DESTDIR)/usr/libexec + mkdir -p $(DESTDIR)/usr/include/servers + 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)/Library/LaunchDaemons + mkdir -p $(DESTDIR)/Library/LaunchAgents + mkdir -p $(DESTDIR)/System/Library/LaunchAgents + mkdir -p $(DESTDIR)/System/Library/LaunchDaemons cp $(srcdir)/StartupItemContext $(DESTDIR)/usr/libexec - mkdir -p $(DESTDIR)/usr/include/servers cp $(srcdir)/liblaunch_public.h $(DESTDIR)/usr/include/launch.h cp $(srcdir)/libvproc_public.h $(DESTDIR)/usr/include/vproc.h cp $(srcdir)/libbootstrap_public.h $(DESTDIR)/usr/include/servers/bootstrap.h cp $(srcdir)/libbootstrap_public.h $(DESTDIR)/usr/include/servers/bootstrap_defs.h - mkdir -p $(DESTDIR)/usr/local/include + cp $(srcdir)/libbootstrap_private.h $(DESTDIR)/usr/local/include/bootstrap_priv.h cp $(srcdir)/liblaunch_private.h $(DESTDIR)/usr/local/include/launch_priv.h cp $(srcdir)/libvproc_private.h $(DESTDIR)/usr/local/include/vproc_priv.h cp $(srcdir)/reboot2.h $(DESTDIR)/usr/local/include/reboot2.h - mkdir -p $(DESTDIR)/$(sysconfdir)/mach_init.d - mkdir -p $(DESTDIR)/$(sysconfdir)/mach_init_per_user.d - mkdir -p $(DESTDIR)/Library/LaunchDaemons - mkdir -p $(DESTDIR)/Library/LaunchAgents - mkdir -p $(DESTDIR)/System/Library/LaunchAgents - mkdir -p $(DESTDIR)/System/Library/LaunchDaemons cp $(srcdir)/com.apple.SystemStarter.plist $(DESTDIR)/System/Library/LaunchDaemons endif Modified: trunk/launchd/src/Makefile.in =================================================================== --- trunk/launchd/src/Makefile.in 2007-02-22 01:34:11 UTC (rev 23096) +++ trunk/launchd/src/Makefile.in 2007-02-22 18:22:46 UTC (rev 23097) @@ -1060,22 +1060,23 @@ @LIBS_ONLY_FALSE@install-data-hook: @LIBS_ONLY_FALSE@ mkdir -p $(DESTDIR)/usr/libexec +@LIBS_ONLY_FALSE@ mkdir -p $(DESTDIR)/usr/include/servers +@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)/Library/LaunchDaemons +@LIBS_ONLY_FALSE@ mkdir -p $(DESTDIR)/Library/LaunchAgents +@LIBS_ONLY_FALSE@ mkdir -p $(DESTDIR)/System/Library/LaunchAgents +@LIBS_ONLY_FALSE@ mkdir -p $(DESTDIR)/System/Library/LaunchDaemons @LIBS_ONLY_FALSE@ cp $(srcdir)/StartupItemContext $(DESTDIR)/usr/libexec -@LIBS_ONLY_FALSE@ mkdir -p $(DESTDIR)/usr/include/servers @LIBS_ONLY_FALSE@ cp $(srcdir)/liblaunch_public.h $(DESTDIR)/usr/include/launch.h @LIBS_ONLY_FALSE@ cp $(srcdir)/libvproc_public.h $(DESTDIR)/usr/include/vproc.h @LIBS_ONLY_FALSE@ cp $(srcdir)/libbootstrap_public.h $(DESTDIR)/usr/include/servers/bootstrap.h @LIBS_ONLY_FALSE@ cp $(srcdir)/libbootstrap_public.h $(DESTDIR)/usr/include/servers/bootstrap_defs.h -@LIBS_ONLY_FALSE@ mkdir -p $(DESTDIR)/usr/local/include +@LIBS_ONLY_FALSE@ cp $(srcdir)/libbootstrap_private.h $(DESTDIR)/usr/local/include/bootstrap_priv.h @LIBS_ONLY_FALSE@ cp $(srcdir)/liblaunch_private.h $(DESTDIR)/usr/local/include/launch_priv.h @LIBS_ONLY_FALSE@ cp $(srcdir)/libvproc_private.h $(DESTDIR)/usr/local/include/vproc_priv.h @LIBS_ONLY_FALSE@ cp $(srcdir)/reboot2.h $(DESTDIR)/usr/local/include/reboot2.h -@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)/Library/LaunchDaemons -@LIBS_ONLY_FALSE@ mkdir -p $(DESTDIR)/Library/LaunchAgents -@LIBS_ONLY_FALSE@ mkdir -p $(DESTDIR)/System/Library/LaunchAgents -@LIBS_ONLY_FALSE@ mkdir -p $(DESTDIR)/System/Library/LaunchDaemons @LIBS_ONLY_FALSE@ cp $(srcdir)/com.apple.SystemStarter.plist $(DESTDIR)/System/Library/LaunchDaemons # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-02-22 01:34:11 UTC (rev 23096) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-22 18:22:46 UTC (rev 23097) @@ -76,6 +76,7 @@ #include "liblaunch_public.h" #include "liblaunch_private.h" #include "libbootstrap_public.h" +#include "libbootstrap_private.h" #include "libvproc_public.h" #include "libvproc_internal.h" @@ -101,14 +102,14 @@ SLIST_ENTRY(machservice) sle; job_t job; mach_port_name_t port; - unsigned int isActive:1, reset:1, recv:1, hide:1, kUNCServer:1, must_match_uid:1, debug_on_close:1; + unsigned int isActive:1, reset:1, recv:1, hide:1, kUNCServer:1, must_match_uid:1, debug_on_close:1, per_pid:1; char name[0]; }; 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); static void machservice_resetport(job_t j, struct machservice *ms); -static struct machservice *machservice_new(job_t j, const char *name, mach_port_t *serviceport); +static struct machservice *machservice_new(job_t j, const char *name, mach_port_t *serviceport, bool pid_local); static void machservice_ignore(job_t j, struct machservice *ms); static void machservice_watch(job_t j, struct machservice *ms); static void machservice_delete(struct machservice *); @@ -223,7 +224,7 @@ static void jobmgr_callback(void *obj, struct kevent *kev); static pid_t jobmgr_fork(jobmgr_t jm); static void jobmgr_setup_env_from_other_jobs(jobmgr_t jm); -static struct machservice *jobmgr_lookup_service(jobmgr_t jm, const char *name, bool check_parent); +static struct machservice *jobmgr_lookup_service(jobmgr_t jm, const char *name, bool check_parent, pid_t target_pid); static void jobmgr_logv(jobmgr_t jm, int pri, int err, const char *msg, va_list ap) __attribute__((format(printf, 4, 0))); static void jobmgr_log(jobmgr_t jm, int pri, const char *msg, ...) __attribute__((format(printf, 3, 4))); /* static void jobmgr_log_error(jobmgr_t jm, int pri, const char *msg, ...) __attribute__((format(printf, 3, 4))); */ @@ -3097,7 +3098,7 @@ } struct machservice * -machservice_new(job_t j, const char *name, mach_port_t *serviceport) +machservice_new(job_t j, const char *name, mach_port_t *serviceport, bool pid_local) { struct machservice *ms; @@ -3107,6 +3108,7 @@ strcpy(ms->name, name); ms->job = j; + ms->per_pid = pid_local; if (*serviceport == MACH_PORT_NULL) { if (!job_assumes(j, launchd_mport_create_recv(&ms->port) == KERN_SUCCESS)) { @@ -3236,12 +3238,12 @@ struct machservice *ms; mach_port_t p = MACH_PORT_NULL; - if ((ms = jobmgr_lookup_service(j->mgr, key, false))) { + if ((ms = jobmgr_lookup_service(j->mgr, key, false, 0))) { job_log(j, LOG_WARNING, "Conflict with job: %s over Mach service: %s", ms->job->label, key); return; } - if ((ms = machservice_new(j, key, &p)) == NULL) { + if ((ms = machservice_new(j, key, &p, false)) == NULL) { job_log_error(j, LOG_WARNING, "Cannot add service: %s", key); return; } @@ -3516,13 +3518,23 @@ } struct machservice * -jobmgr_lookup_service(jobmgr_t jm, const char *name, bool check_parent) +jobmgr_lookup_service(jobmgr_t jm, const char *name, bool check_parent, pid_t target_pid) { struct machservice *ms; job_t ji; + if (target_pid) { + jobmgr_assumes(jm, !check_parent); + } + TAILQ_FOREACH(ji, &jm->jobs, sle) { + if (target_pid && (ji->p != target_pid)) { + continue; + } SLIST_FOREACH(ms, &ji->machservices, sle) { + if (target_pid && !ms->per_pid) { + continue; + } if (strcmp(name, ms->name) == 0) { return ms; } @@ -3537,7 +3549,7 @@ return NULL; } - return jobmgr_lookup_service(jm->parentmgr, name, true); + return jobmgr_lookup_service(jm->parentmgr, name, true, 0); } mach_port_t @@ -4270,7 +4282,7 @@ ji->mach_uid = which_user; - if ((ms = machservice_new(ji, lbuf, up_cont)) == NULL) { + if ((ms = machservice_new(ji, lbuf, up_cont, false)) == NULL) { job_remove(ji); return BOOTSTRAP_NO_MEMORY; } @@ -4301,7 +4313,7 @@ runtime_get_caller_creds(&ldc); - ms = jobmgr_lookup_service(j->mgr, servicename, true); + ms = jobmgr_lookup_service(j->mgr, servicename, true, 0); if (ms == NULL) { job_log(j, LOG_DEBUG, "Check-in of Mach service failed. Unknown: %s", servicename); @@ -4329,7 +4341,7 @@ } kern_return_t -job_mig_register(job_t j, name_t servicename, mach_port_t serviceport) +job_mig_register2(job_t j, name_t servicename, mach_port_t serviceport, uint64_t flags) { struct machservice *ms; struct ldcred ldc; @@ -4344,7 +4356,7 @@ job_log(j, LOG_NOTICE, "bootstrap_register() is deprecated. PID: %u Service: %s", ldc.pid, servicename); #endif - job_log(j, LOG_DEBUG, "Mach service registration attempt: %s", servicename); + job_log(j, LOG_DEBUG, "%sMach service registration attempt: %s", flags & BOOTSTRAP_PER_PID_SERVICE ? "Per PID " : "", servicename); /* * From a per-user/session launchd's perspective, SecurityAgent (UID @@ -4359,7 +4371,7 @@ } } - ms = jobmgr_lookup_service(j->mgr, servicename, false); + ms = jobmgr_lookup_service(j->mgr, servicename, false, flags & BOOTSTRAP_PER_PID_SERVICE ? ldc.pid : 0); if (ms) { if (machservice_job(ms) != j) { @@ -4374,7 +4386,7 @@ } if (serviceport != MACH_PORT_NULL) { - if ((ms = machservice_new(j, servicename, &serviceport))) { + if ((ms = machservice_new(j, servicename, &serviceport, flags & BOOTSTRAP_PER_PID_SERVICE ? true : false))) { machservice_request_notifications(ms); } else { return BOOTSTRAP_NO_MEMORY; @@ -4385,7 +4397,7 @@ } kern_return_t -job_mig_look_up(job_t j, name_t servicename, mach_port_t *serviceportp, mach_msg_type_name_t *ptype) +job_mig_look_up2(job_t j, name_t servicename, mach_port_t *serviceportp, mach_msg_type_name_t *ptype, pid_t target_pid, uint64_t flags) { struct machservice *ms; struct ldcred ldc; @@ -4400,7 +4412,11 @@ return VPROC_ERR_TRY_PER_USER; } - ms = jobmgr_lookup_service(j->mgr, servicename, true); + if (flags & BOOTSTRAP_PER_PID_SERVICE) { + ms = jobmgr_lookup_service(j->mgr, servicename, false, target_pid); + } else { + ms = jobmgr_lookup_service(j->mgr, servicename, true, 0); + } if (ms && machservice_hidden(ms) && !job_active(machservice_job(ms))) { ms = NULL; @@ -4410,16 +4426,16 @@ if (ms) { launchd_assumes(machservice_port(ms) != MACH_PORT_NULL); - job_log(j, LOG_DEBUG, "Mach service lookup (by PID %d): %s", ldc.pid, servicename); + job_log(j, LOG_DEBUG, "%sMach service lookup (by PID %d): %s", flags & BOOTSTRAP_PER_PID_SERVICE ? "Per PID " : "", ldc.pid, servicename); *serviceportp = machservice_port(ms); *ptype = MACH_MSG_TYPE_COPY_SEND; return BOOTSTRAP_SUCCESS; - } else if (inherited_bootstrap_port != MACH_PORT_NULL) { + } else if (!(flags & BOOTSTRAP_PER_PID_SERVICE) && (inherited_bootstrap_port != MACH_PORT_NULL)) { job_log(j, LOG_DEBUG, "Mach service lookup (by PID %d) forwarded: %s", ldc.pid, servicename); *ptype = MACH_MSG_TYPE_MOVE_SEND; return bootstrap_look_up(inherited_bootstrap_port, servicename, serviceportp); } else { - job_log(j, LOG_DEBUG, "Mach service lookup (by PID %d) failed: %s", ldc.pid, servicename); + job_log(j, LOG_DEBUG, "%sMach service lookup (by PID %d) failed: %s", flags & BOOTSTRAP_PER_PID_SERVICE ? "Per PID " : "", ldc.pid, servicename); return BOOTSTRAP_UNKNOWN_SERVICE; } } @@ -4572,7 +4588,7 @@ for (l2l_i = 0; l2l_i < l2l_name_cnt; l2l_i++) { struct machservice *ms; - if ((ms = machservice_new(jmr->anonj, l2l_names[l2l_i], &l2l_ports[l2l_i]))) { + if ((ms = machservice_new(jmr->anonj, l2l_names[l2l_i], &l2l_ports[l2l_i], false))) { machservice_request_notifications(ms); } } @@ -4721,7 +4737,7 @@ return BOOTSTRAP_NOT_PRIVILEGED; } - ms = jobmgr_lookup_service(j->mgr, servicename, false); + ms = jobmgr_lookup_service(j->mgr, servicename, false, 0); if (ms) { job_log(j, LOG_DEBUG, "Mach service creation attempt for failed. Already exists: %s", servicename); return BOOTSTRAP_NAME_IN_USE; @@ -4730,7 +4746,7 @@ job_checkin(j); *serviceportp = MACH_PORT_NULL; - ms = machservice_new(j, servicename, serviceportp); + ms = machservice_new(j, servicename, serviceportp, false); if (!launchd_assumes(ms != NULL)) { goto out_bad; Modified: trunk/launchd/src/libbootstrap.c =================================================================== --- trunk/launchd/src/libbootstrap.c 2007-02-22 01:34:11 UTC (rev 23096) +++ trunk/launchd/src/libbootstrap.c 2007-02-22 18:22:46 UTC (rev 23097) @@ -20,6 +20,7 @@ #include "config.h" #include "libbootstrap_public.h" +#include "libbootstrap_private.h" #include "libvproc_public.h" #include "libvproc_private.h" @@ -66,13 +67,19 @@ kern_return_t bootstrap_register(mach_port_t bp, name_t service_name, mach_port_t sp) { - kern_return_t kr = vproc_mig_register(bp, service_name, sp); + return bootstrap_register2(bp, service_name, sp, 0); +} +kern_return_t +bootstrap_register2(mach_port_t bp, name_t service_name, mach_port_t sp, uint64_t flags) +{ + kern_return_t kr = vproc_mig_register2(bp, service_name, sp, flags); + if (kr == VPROC_ERR_TRY_PER_USER) { mach_port_t puc; if (vproc_mig_lookup_per_user_context(bp, 0, &puc) == 0) { - kr = vproc_mig_register(puc, service_name, sp); + kr = vproc_mig_register2(puc, service_name, sp, flags); mach_port_deallocate(mach_task_self(), puc); } } @@ -95,10 +102,16 @@ kern_return_t bootstrap_look_up(mach_port_t bp, name_t service_name, mach_port_t *sp) { + return bootstrap_look_up2(bp, service_name, sp, 0, 0); +} + +kern_return_t +bootstrap_look_up2(mach_port_t bp, name_t service_name, mach_port_t *sp, pid_t target_pid, uint64_t flags) +{ kern_return_t kr; mach_port_t puc; - if ((kr = vproc_mig_look_up(bp, service_name, sp)) != VPROC_ERR_TRY_PER_USER) { + if ((kr = vproc_mig_look_up2(bp, service_name, sp, target_pid, flags)) != VPROC_ERR_TRY_PER_USER) { return kr; } @@ -106,7 +119,7 @@ return kr; } - kr = vproc_mig_look_up(puc, service_name, sp); + kr = vproc_mig_look_up2(puc, service_name, sp, target_pid, flags); mach_port_deallocate(mach_task_self(), puc); return kr; Added: trunk/launchd/src/libbootstrap_private.h =================================================================== --- trunk/launchd/src/libbootstrap_private.h (rev 0) +++ trunk/launchd/src/libbootstrap_private.h 2007-02-22 18:22:46 UTC (rev 23097) @@ -0,0 +1,40 @@ +#ifndef _BOOTSTRAP_PRIVATE_H_ +#define _BOOTSTRAP_PRIVATE_H_ +/* + * Copyright (c) 2007 Apple 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@ + */ + +#include <servers/bootstrap.h> +#include <sys/types.h> + +__BEGIN_DECLS + +#pragma GCC visibility push(default) + +#define BOOTSTRAP_PER_PID_SERVICE 1 + +kern_return_t bootstrap_register2(mach_port_t bp, name_t service_name, mach_port_t sp, uint64_t flags); + +kern_return_t bootstrap_look_up2(mach_port_t bp, name_t service_name, mach_port_t *sp, pid_t target_pid, uint64_t flags); + +#pragma GCC visibility pop + +__END_DECLS + +#endif Modified: trunk/launchd/src/protocol_job.defs =================================================================== --- trunk/launchd/src/protocol_job.defs 2007-02-22 01:34:11 UTC (rev 23096) +++ trunk/launchd/src/protocol_job.defs 2007-02-22 18:22:46 UTC (rev 23097) @@ -54,15 +54,18 @@ __service_name : name_t; out __service_port : mach_port_move_receive_t); -routine register( +routine register2( __bs_port : job_t; __service_name : name_t; - __service_port : mach_port_t); + __service_port : mach_port_t; + __flags : uint64_t); -routine look_up( +routine look_up2( __bs_port : job_t; __service_name : name_t; - out __service_port : mach_port_send_t); + out __service_port : mach_port_send_t; + __target_pid : pid_t; + __flags : uint64_t); skip; /* last used in 10.4 */

1 0

[23096] trunk/launchd/src/launchctl.c
by source_changes＠macosforge.org 22 Feb '07

22 Feb '07

Revision: 23096 http://trac.macosforge.org/projects/launchd/changeset/23096 Author: zarzycki(a)apple.com Date: 2007-02-21 17:34:11 -0800 (Wed, 21 Feb 2007) Log Message: ----------- <rdar://problem/4283301> Workaround securityd not using kqueue to track execve() transitions Modified Paths: -------------- trunk/launchd/src/launchctl.c Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2007-02-22 01:15:50 UTC (rev 23095) +++ trunk/launchd/src/launchctl.c 2007-02-22 01:34:11 UTC (rev 23096) @@ -2337,9 +2337,12 @@ setgid(getgid()); setuid(getuid()); - execvp(argv[2], argv + 2); - fprintf(stderr, "execvp(): %s\n", strerror(errno)); - return 1; + if (fwexec((const char *const *)argv + 2, true) == -1) { + fprintf(stderr, "%s bsexec failed: %s\n", getprogname(), strerror(errno)); + return 1; + } + + return 0; } int

1 0

[23095] trunk/launchd/src/launchd.plist.5
by source_changes＠macosforge.org 22 Feb '07

22 Feb '07

Revision: 23095 http://trac.macosforge.org/projects/launchd/changeset/23095 Author: zarzycki(a)apple.com Date: 2007-02-21 17:15:50 -0800 (Wed, 21 Feb 2007) Log Message: ----------- <rdar://problem/5014975> nit: launchd.plist man page typo Modified Paths: -------------- trunk/launchd/src/launchd.plist.5 Modified: trunk/launchd/src/launchd.plist.5 =================================================================== --- trunk/launchd/src/launchd.plist.5 2007-02-21 18:19:10 UTC (rev 23094) +++ trunk/launchd/src/launchd.plist.5 2007-02-22 01:15:50 UTC (rev 23095) @@ -315,7 +315,7 @@ consider all descriptors of a given key to be to be effectively equivalent, even though each file descriptor likely represents a different networking protocol which conforms to the criteria specified in the job configuration file. .Pp -The paramters below are used as inputs to call +The parameters below are used as inputs to call .Xr getaddrinfo 3 . .Bl -ohang -offset indent .It Sy SockType <string>

1 0

[23094] trunk/launchd/src/launchd.c
by source_changes＠macosforge.org 21 Feb '07

21 Feb '07

Revision: 23094 http://trac.macosforge.org/projects/launchd/changeset/23094 Author: zarzycki(a)apple.com Date: 2007-02-21 10:19:10 -0800 (Wed, 21 Feb 2007) Log Message: ----------- It would be better if we just reboot. Modified Paths: -------------- trunk/launchd/src/launchd.c Modified: trunk/launchd/src/launchd.c =================================================================== --- trunk/launchd/src/launchd.c 2007-02-20 18:15:13 UTC (rev 23093) +++ trunk/launchd/src/launchd.c 2007-02-21 18:19:10 UTC (rev 23094) @@ -217,11 +217,7 @@ runtime_syslog(LOG_EMERG, "We crashed %s: %p (sent by PID %u)", doom_why, crash_addr, crash_pid); sync(); sleep(3); - /* the kernel will panic() when PID 1 exits */ - _exit(EXIT_FAILURE); - /* we should never get here */ reboot(0); - /* or here either */ break; } }

1 0

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

20 Feb '07

Revision: 23093 http://trac.macosforge.org/projects/launchd/changeset/23093 Author: zarzycki(a)apple.com Date: 2007-02-20 10:15:13 -0800 (Tue, 20 Feb 2007) Log Message: ----------- The kernel team requested that launchd not SIGKILL strays at shutdown (at least for Leopard). 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-02-20 16:57:11 UTC (rev 23092) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-20 18:15:13 UTC (rev 23093) @@ -3325,7 +3325,10 @@ } jobmgr_log(jm, LOG_WARNING, "Stray process at shutdown: PID %u PPID %u %s", p_i, pp_i, kp[i].kp_proc.p_comm); - jobmgr_assumes(jm, kill(p_i, SIGKILL) != -1); + /* + * The kernel team requested that I not do this for Leopard. + * jobmgr_assumes(jm, kill(p_i, SIGKILL) != -1); + */ } out:

1 0

[23092] trunk/launchd/src/launchd.c
by source_changes＠macosforge.org 20 Feb '07

20 Feb '07

Revision: 23092 http://trac.macosforge.org/projects/launchd/changeset/23092 Author: zarzycki(a)apple.com Date: 2007-02-20 08:57:11 -0800 (Tue, 20 Feb 2007) Log Message: ----------- Workaround 4978696: getifaddrs() reports false ENOMEM Modified Paths: -------------- trunk/launchd/src/launchd.c Modified: trunk/launchd/src/launchd.c =================================================================== --- trunk/launchd/src/launchd.c 2007-02-20 14:01:28 UTC (rev 23091) +++ trunk/launchd/src/launchd.c 2007-02-20 16:57:11 UTC (rev 23092) @@ -64,6 +64,7 @@ #include <string.h> #include <setjmp.h> #include <spawn.h> +#include <sched.h> #include "libbootstrap_public.h" #include "libvproc_public.h" @@ -341,8 +342,15 @@ { struct ifaddrs *ifa, *ifai; bool up = false; + int r; - if (!launchd_assumes(getifaddrs(&ifa) != -1)) { + /* Workaround 4978696: getifaddrs() reports false ENOMEM */ + while ((r = getifaddrs(&ifa)) == -1 && errno == ENOMEM) { + runtime_syslog(LOG_DEBUG, "Worked around bug: 4978696"); + launchd_assumes(sched_yield() != -1); + } + + if (!launchd_assumes(r != -1)) { return network_up; }

1 0

[23091] trunk/launchd/src
by source_changes＠macosforge.org 20 Feb '07

20 Feb '07

Revision: 23091 http://trac.macosforge.org/projects/launchd/changeset/23091 Author: zarzycki(a)apple.com Date: 2007-02-20 06:01:28 -0800 (Tue, 20 Feb 2007) Log Message: ----------- More flag decoding. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_runtime.c trunk/launchd/src/launchd_runtime.h Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-02-20 03:03:53 UTC (rev 23090) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-20 14:01:28 UTC (rev 23091) @@ -580,9 +580,12 @@ if (jm->parentmgr) { SLIST_REMOVE(&jm->parentmgr->submgrs, jm, jobmgr_s, sle); } else if (getpid() == 1) { - jobmgr_log(jm, LOG_DEBUG, "About to call reboot(0x%x).", jm->reboot_flags); + jobmgr_log(jm, LOG_DEBUG, "About to call: reboot(%s)", reboot_flags_to_C_names(jm->reboot_flags)); + runtime_closelog(); jobmgr_assumes(jm, reboot(jm->reboot_flags) != -1); + runtime_closelog(); } else { + runtime_closelog(); jobmgr_log(jm, LOG_DEBUG, "About to exit."); exit(EXIT_SUCCESS); } Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-02-20 03:03:53 UTC (rev 23090) +++ trunk/launchd/src/launchd_runtime.c 2007-02-20 14:01:28 UTC (rev 23091) @@ -41,6 +41,7 @@ #include <sys/queue.h> #include <sys/socket.h> #include <sys/mount.h> +#include <sys/reboot.h> #include <bsm/libbsm.h> #include <malloc/malloc.h> #include <unistd.h> @@ -149,6 +150,45 @@ } const char * +reboot_flags_to_C_names(unsigned int flags) +{ +#define MAX_RB_STR "RB_ASKNAME|RB_SINGLE|RB_NOSYNC|RB_KDB|RB_HALT|RB_INITNAME|RB_DFLTROOT|RB_ALTBOOT|RB_UNIPROC|RB_SAFEBOOT|RB_UPSDELAY|0xdeadbeeffeedface" + static char flags_buf[sizeof(MAX_RB_STR)]; + char *flags_off = NULL; + + if (flags) while (flags) { + if (flags_off) { + *flags_off = '|'; + flags_off++; + *flags_off = '\0'; + } else { + flags_off = flags_buf; + } + +#define FLAGIF(f) if (flags & f) { flags_off += sprintf(flags_off, #f); flags &= ~f; } + + FLAGIF(RB_ASKNAME) + else FLAGIF(RB_SINGLE) + else FLAGIF(RB_NOSYNC) + else FLAGIF(RB_KDB) + else FLAGIF(RB_HALT) + else FLAGIF(RB_INITNAME) + else FLAGIF(RB_DFLTROOT) + else FLAGIF(RB_ALTBOOT) + else FLAGIF(RB_UNIPROC) + else FLAGIF(RB_SAFEBOOT) + else FLAGIF(RB_UPSDELAY) + else { + flags_off += sprintf(flags_off, "0x%x", flags); + flags = 0; + } + return flags_buf; + } else { + return "RB_AUTOBOOT"; + } +} + +const char * signal_to_C_name(unsigned int sig) { static char unknown[25]; @@ -214,8 +254,6 @@ flags_off = flags_buf; } -#define FLAGIF(f) if (flags & f) { flags_off += sprintf(flags_off, #f); flags &= ~f; } - FLAGIF(EV_ADD) else FLAGIF(EV_DELETE) else FLAGIF(EV_ENABLE) @@ -852,12 +890,22 @@ } } +static FILE *ourlogfile; + void runtime_openlog(const char *ident, int logopt, int facility) { openlog(ident, logopt, facility); } +void +runtime_closelog(void) +{ + if (ourlogfile) { + fflush(ourlogfile); + } +} + int runtime_setlogmask(int maskpri) { @@ -880,7 +928,6 @@ runtime_vsyslog(int priority, const char *message, va_list args) { static pthread_mutex_t ourlock = PTHREAD_MUTEX_INITIALIZER; - static FILE *ourlogfile = NULL; static struct timeval shutdown_start = { 0, 0 }; struct timeval tvnow, tvd; int saved_errno = errno; @@ -940,6 +987,4 @@ strcpy(newmsg + j, "\n"); vfprintf(ourlogfile, newmsg, args); - - fflush(ourlogfile); } Modified: trunk/launchd/src/launchd_runtime.h =================================================================== --- trunk/launchd/src/launchd_runtime.h 2007-02-20 03:03:53 UTC (rev 23090) +++ trunk/launchd/src/launchd_runtime.h 2007-02-20 14:01:28 UTC (rev 23091) @@ -66,10 +66,14 @@ bool runtime_get_caller_creds(struct ldcred *ldc); const char *signal_to_C_name(unsigned int sig); +const char *reboot_flags_to_C_names(unsigned int flags); + int kevent_mod(uintptr_t ident, short filter, u_short flags, u_int fflags, intptr_t data, void *udata); void runtime_openlog(const char *ident, int logopt, int facility); +void runtime_closelog(void); + int runtime_setlogmask(int maskpri); void runtime_syslog(int priority, const char *message, ...) __attribute__((format(printf, 2, 3))); void runtime_vsyslog(int priority, const char *message, va_list args) __attribute__((format(printf, 2, 0)));

1 0

[23090] tags/launchd-197.1/
by source_changes＠macosforge.org 20 Feb '07

20 Feb '07

Revision: 23090 http://trac.macosforge.org/projects/launchd/changeset/23090 Author: zarzycki(a)apple.com Date: 2007-02-19 19:03:53 -0800 (Mon, 19 Feb 2007) Log Message: ----------- "Tagging launchd-197.1 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-197.1/ Copied: tags/launchd-197.1 (from rev 23089, trunk)

1 0

[23089] trunk/launchd/src/rc.shutdown
by source_changes＠macosforge.org 20 Feb '07

20 Feb '07

Revision: 23089 http://trac.macosforge.org/projects/launchd/changeset/23089 Author: zarzycki(a)apple.com Date: 2007-02-19 19:02:30 -0800 (Mon, 19 Feb 2007) Log Message: ----------- Dead code. Modified Paths: -------------- trunk/launchd/src/rc.shutdown Modified: trunk/launchd/src/rc.shutdown =================================================================== --- trunk/launchd/src/rc.shutdown 2007-02-19 23:21:44 UTC (rev 23088) +++ trunk/launchd/src/rc.shutdown 2007-02-20 03:02:30 UTC (rev 23089) @@ -7,8 +7,4 @@ sh /etc/rc.shutdown.local fi -SystemStarter stop - -kill -TERM 1 - -exit 0 +exec SystemStarter stop

1 0