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

[23007] trunk/launchd/src
by source_changes＠macosforge.org 10 Jan '07

10 Jan '07

Revision: 23007 http://trac.macosforge.org/projects/launchd/changeset/23007 Author: zarzycki(a)apple.com Date: 2007-01-10 10:38:28 -0800 (Wed, 10 Jan 2007) Log Message: ----------- <rdar://problem/4884164> support loading jobs into the loginwindow context Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/liblaunch.c trunk/launchd/src/liblaunch_private.h trunk/launchd/src/libvproc.c trunk/launchd/src/libvproc_internal.h Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-01-05 22:03:52 UTC (rev 23006) +++ trunk/launchd/src/launchd_core_logic.c 2007-01-10 18:38:28 UTC (rev 23007) @@ -298,7 +298,7 @@ static void job_setup_fd(job_t j, int target_fd, const char *path, int flags); static void job_postfork_become_user(job_t j); static void job_force_sampletool(job_t j); -static void job_reparent_to_aqua_hack(job_t j); +static void job_reparent_hack(job_t j, const char *where); static void job_callback(void *obj, struct kevent *kev); static launch_data_t job_export2(job_t j, bool subjobs); static job_t job_new_spawn(job_t j, const char *label, const char *path, const char *workingdir, const char *const *argv, const char *const *env, mode_t *u_mask, bool w4d); @@ -840,7 +840,7 @@ return NULL; } - job_reparent_to_aqua_hack(jr); + job_reparent_hack(jr, "Aqua"); if (getpid() == 1) { struct ldcred ldc; @@ -1115,7 +1115,9 @@ return; } else if (strcasecmp(key, LAUNCH_JOBKEY_LIMITLOADTOSESSIONTYPE) == 0) { if (strcmp(value, "Aqua") == 0) { - job_reparent_to_aqua_hack(j); + job_reparent_hack(j, "Aqua"); + } else if (strcmp(value, "LoginWindow") == 0) { + job_reparent_hack(j, "LoginWindow"); } return; } @@ -3179,7 +3181,7 @@ return NULL; } - jmr = calloc(1, sizeof(struct jobmgr_s) + strlen("100000") + 1); + jmr = calloc(1, sizeof(struct jobmgr_s) + strlen("LoginWindow") + 1); if (jmr == NULL) { return NULL; @@ -3832,6 +3834,9 @@ } switch (key) { + case GSK_LOGINWINDOW_CONTEXT: + strcpy(j->mgr->name, "LoginWindow"); + break; case GLOBAL_ON_DEMAND: kr = job_set_global_on_demand(j, (bool)val) ? 0 : 1; break; @@ -4166,14 +4171,13 @@ return BOOTSTRAP_NO_MEMORY; } - void -job_reparent_to_aqua_hack(job_t j) +job_reparent_hack(job_t j, const char *where) { jobmgr_t jmi = NULL; SLIST_FOREACH(jmi, &root_jobmgr->submgrs, sle) { - if (strcmp(jmi->name, "Aqua") == 0) { + if (strcmp(jmi->name, where) == 0) { break; } } Modified: trunk/launchd/src/liblaunch.c =================================================================== --- trunk/launchd/src/liblaunch.c 2007-01-05 22:03:52 UTC (rev 23006) +++ trunk/launchd/src/liblaunch.c 2007-01-10 18:38:28 UTC (rev 23007) @@ -1186,6 +1186,30 @@ _exit(EXIT_FAILURE); } +void +load_launchd_jobs_at_loginwindow_prompt(int flags, ...) +{ + char *largv[] = { "/bin/launchctl", "load", "-S", "LoginWindow", "-D", "all", "/etc/mach_init_per_login_session.d", NULL }; + int wstatus; + pid_t p; + + if (flags & LOAD_ONLY_SAFEMODE_LAUNCHAGENTS) { + largv[5] = "system"; + } + + if (__vproc_tag_loginwindow_context()) { + return; + } + + if ((p = fexecv_as_user("root", 0, 0, largv)) == -1) { + return; + } + + if (waitpid(p, &wstatus, 0) != p) { + return; + } +} + pid_t create_and_switch_to_per_session_launchd(const char *login, int flags, ...) { Modified: trunk/launchd/src/liblaunch_private.h =================================================================== --- trunk/launchd/src/liblaunch_private.h 2007-01-05 22:03:52 UTC (rev 23006) +++ trunk/launchd/src/liblaunch_private.h 2007-01-10 18:38:28 UTC (rev 23007) @@ -73,14 +73,18 @@ * * After this call, the task's bootstrap port is set to the per session launchd. * - * This returns the PID on of the per session launchd, and -1 on failure. - * - * If launchd terminates, loginwindow should exit. - * If loginwindow terminates, launchd will exit. + * This returns 1 on success (it used to return otherwise), and -1 on failure. */ #define LOAD_ONLY_SAFEMODE_LAUNCHAGENTS 1 pid_t create_and_switch_to_per_session_launchd(const char *login, int flags, ...); +/* Also for LoginWindow. + * + * This is will load jobs at the LoginWindow prompt. + */ +void load_launchd_jobs_at_loginwindow_prompt(int flags, ...); + + /* batch jobs will be implicity re-enabled when the last application who * disabled them exits. * Modified: trunk/launchd/src/libvproc.c =================================================================== --- trunk/launchd/src/libvproc.c 2007-01-05 22:03:52 UTC (rev 23006) +++ trunk/launchd/src/libvproc.c 2007-01-10 18:38:28 UTC (rev 23007) @@ -208,6 +208,16 @@ } vproc_err_t +__vproc_tag_loginwindow_context(void) +{ + if (vproc_mig_set_integer(bootstrap_port, GSK_LOGINWINDOW_CONTEXT, 1) == 0) { + return NULL; + } + + return (vproc_err_t)__vproc_tag_loginwindow_context; +} + +vproc_err_t _vproc_set_global_on_demand(bool state) { int64_t val = state ? ~0 : 0; Modified: trunk/launchd/src/libvproc_internal.h =================================================================== --- trunk/launchd/src/libvproc_internal.h 2007-01-05 22:03:52 UTC (rev 23006) +++ trunk/launchd/src/libvproc_internal.h 2007-01-10 18:38:28 UTC (rev 23007) @@ -31,6 +31,7 @@ typedef enum { LAST_EXIT_STATUS = 1, GLOBAL_ON_DEMAND, + GSK_LOGINWINDOW_CONTEXT, } get_set_int_key_t; #ifdef protocol_vproc_MSG_COUNT @@ -52,6 +53,8 @@ name_array_t *service_names, mach_msg_type_number_t *service_namesCnt, mach_port_array_t *ports, mach_msg_type_number_t *portCnt); +vproc_err_t __vproc_tag_loginwindow_context(void); + kern_return_t _vprocmgr_getsocket(name_t); vproc_err_t _vproc_move_subset_to_user(void);

1 0

[23006] tags/launchd-186/
by source_changes＠macosforge.org 05 Jan '07

05 Jan '07

Revision: 23006 http://trac.macosforge.org/projects/launchd/changeset/23006 Author: zarzycki(a)apple.com Date: 2007-01-05 14:03:52 -0800 (Fri, 05 Jan 2007) Log Message: ----------- "Tagging launchd-186 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-186/ Copied: tags/launchd-186 (from rev 23005, trunk)

1 0

[23005] trunk/launchd/src
by source_changes＠macosforge.org 05 Jan '07

05 Jan '07

Revision: 23005 http://trac.macosforge.org/projects/launchd/changeset/23005 Author: zarzycki(a)apple.com Date: 2007-01-04 17:14:23 -0800 (Thu, 04 Jan 2007) Log Message: ----------- <rdar://problem/4857011> Unable to drag & drop, copy & paste when logged in as root. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/libvproc.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-01-05 00:11:52 UTC (rev 23004) +++ trunk/launchd/src/launchd_core_logic.c 2007-01-05 01:14:23 UTC (rev 23005) @@ -4195,6 +4195,13 @@ kern_return_t kr; jobmgr_t jmr; + if (getuid() == 0) { + j = job_mig_intran2(root_jobmgr, target_subset); + job_assumes(j, launchd_mport_deallocate(target_subset) == KERN_SUCCESS); + strcpy(j->mgr->name, "Aqua"); + return 0; + } + kr = _vproc_grab_subset(target_subset, &reqport, &rcvright, &l2l_names, &l2l_name_cnt, &l2l_ports, &l2l_port_cnt); Modified: trunk/launchd/src/libvproc.c =================================================================== --- trunk/launchd/src/libvproc.c 2007-01-05 00:11:52 UTC (rev 23004) +++ trunk/launchd/src/libvproc.c 2007-01-05 01:14:23 UTC (rev 23005) @@ -29,6 +29,7 @@ #include <stdlib.h> #include <stdio.h> #include <errno.h> +#include <unistd.h> #include "liblaunch_public.h" #include "liblaunch_private.h" @@ -47,10 +48,15 @@ _vproc_move_subset_to_user(void) { kern_return_t kr = 1; - mach_port_t puc; + mach_port_t puc = 0, which_port = bootstrap_port; - if (vproc_mig_lookup_per_user_context(bootstrap_port, 0, &puc) == 0) { - kr = vproc_mig_move_subset_to_user(puc, bootstrap_port); + if ((getuid() || geteuid()) && vproc_mig_lookup_per_user_context(bootstrap_port, 0, &puc) == 0) { + which_port = puc; + } + + kr = vproc_mig_move_subset_to_user(which_port, bootstrap_port); + + if (puc) { mach_port_deallocate(mach_task_self(), puc); }

1 0

[23004] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 05 Jan '07

05 Jan '07

Revision: 23004 http://trac.macosforge.org/projects/launchd/changeset/23004 Author: zarzycki(a)apple.com Date: 2007-01-04 16:11:52 -0800 (Thu, 04 Jan 2007) Log Message: ----------- <rdar://problem/4889859> Leopard9A328: /SourceCache/xnu/xnu-1005/bsd/kern/kern_exit.c:249 "init died\nState at Last Exc 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-01-04 23:29:06 UTC (rev 23003) +++ trunk/launchd/src/launchd_core_logic.c 2007-01-05 00:11:52 UTC (rev 23004) @@ -903,6 +903,11 @@ int i, cc = 0; job_t j; + if (shutdown_in_progress) { + errno = EINVAL; + return NULL; + } + if (prog == NULL && argv == NULL) { errno = EINVAL; return NULL;

1 0

[23003] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 04 Jan '07

04 Jan '07

Revision: 23003 http://trac.macosforge.org/projects/launchd/changeset/23003 Author: zarzycki(a)apple.com Date: 2007-01-04 15:29:06 -0800 (Thu, 04 Jan 2007) Log Message: ----------- It would be good to log that the job closed its end of the pipe pair. 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-01-04 23:15:46 UTC (rev 23002) +++ trunk/launchd/src/launchd_core_logic.c 2007-01-04 23:29:06 UTC (rev 23003) @@ -1699,6 +1699,7 @@ rsz = read(j->log_redirect_fd, buf, BIG_PIPE_SIZE); if (rsz == 0) { + job_log(j, LOG_DEBUG, "Standard out/error pipe closed"); job_assumes(j, close(j->log_redirect_fd) != -1); j->log_redirect_fd = 0; } else if (job_assumes(j, rsz != -1)) { @@ -1706,7 +1707,7 @@ while ((msg = strsep(&bufindex, "\n\r"))) { if (msg[0]) { - job_log(j, LOG_NOTICE, "Standard Out/Error: %s", msg); + job_log(j, LOG_NOTICE, "Standard out/error: %s", msg); } } }

1 0

[23002] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 04 Jan '07

04 Jan '07

Revision: 23002 http://trac.macosforge.org/projects/launchd/changeset/23002 Author: zarzycki(a)apple.com Date: 2007-01-04 15:15:46 -0800 (Thu, 04 Jan 2007) Log Message: ----------- <rdar://problem/4904970> launchd needs to do better buffer management for job stdout/stderr 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-01-04 20:17:27 UTC (rev 23001) +++ trunk/launchd/src/launchd_core_logic.c 2007-01-04 23:15:46 UTC (rev 23002) @@ -46,6 +46,7 @@ #include <sys/resource.h> #include <sys/ioctl.h> #include <sys/mount.h> +#include <sys/pipe.h> #include <net/if.h> #include <netinet/in.h> #include <netinet/in_var.h> @@ -1686,26 +1687,31 @@ void job_log_stdouterr(job_t j) { - char buf[4001]; + char *msg, *bufindex, *buf = malloc(BIG_PIPE_SIZE + 1); ssize_t rsz; - rsz = read(j->log_redirect_fd, buf, sizeof(buf) - 1); + if (!job_assumes(j, buf != NULL)) { + return; + } + bufindex = buf; + + rsz = read(j->log_redirect_fd, buf, BIG_PIPE_SIZE); + if (rsz == 0) { job_assumes(j, close(j->log_redirect_fd) != -1); j->log_redirect_fd = 0; } else if (job_assumes(j, rsz != -1)) { buf[rsz] = '\0'; - switch (buf[0]) { - case '\n': - case '\r': - case '\0': - break; - default: - job_log(j, LOG_NOTICE, "Standard Out/Error: %s", buf); - break; + + while ((msg = strsep(&bufindex, "\n\r"))) { + if (msg[0]) { + job_log(j, LOG_NOTICE, "Standard Out/Error: %s", msg); + } } } + + free(buf); } void

1 0

[23001] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 04 Jan '07

04 Jan '07

Revision: 23001 http://trac.macosforge.org/projects/launchd/changeset/23001 Author: zarzycki(a)apple.com Date: 2007-01-04 12:17:27 -0800 (Thu, 04 Jan 2007) Log Message: ----------- Prepare for growth. 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-01-04 20:05:30 UTC (rev 23000) +++ trunk/launchd/src/launchd_core_logic.c 2007-01-04 20:17:27 UTC (rev 23001) @@ -306,6 +306,7 @@ static pid_t job_get_pid(job_t j); static jobmgr_t job_get_bs(job_t j); static void job_uncork_fork(job_t j); +static void job_log_stdouterr(job_t j); static void job_logv(job_t j, int pri, int err, const char *msg, va_list ap); static void job_log(job_t j, int pri, const char *msg, ...) __attribute__((format(printf, 3, 4))); static void job_log_error(job_t j, int pri, const char *msg, ...) __attribute__((format(printf, 3, 4))); @@ -1683,6 +1684,31 @@ } void +job_log_stdouterr(job_t j) +{ + char buf[4001]; + ssize_t rsz; + + rsz = read(j->log_redirect_fd, buf, sizeof(buf) - 1); + + if (rsz == 0) { + job_assumes(j, close(j->log_redirect_fd) != -1); + j->log_redirect_fd = 0; + } else if (job_assumes(j, rsz != -1)) { + buf[rsz] = '\0'; + switch (buf[0]) { + case '\n': + case '\r': + case '\0': + break; + default: + job_log(j, LOG_NOTICE, "Standard Out/Error: %s", buf); + break; + } + } +} + +void job_callback(void *obj, struct kevent *kev) { job_t j = obj; @@ -1716,26 +1742,7 @@ break; case EVFILT_READ: if (kev->ident == (uintptr_t)j->log_redirect_fd) { - char buf[4001]; - ssize_t rsz; - - rsz = read(j->log_redirect_fd, buf, sizeof(buf) - 1); - - if (rsz == 0) { - job_assumes(j, close(j->log_redirect_fd) != -1); - j->log_redirect_fd = 0; - } else if (job_assumes(j, rsz != -1)) { - buf[rsz] = '\0'; - switch (buf[0]) { - case '\n': - case '\r': - case '\0': - break; - default: - job_log(j, LOG_NOTICE, "Standard Out/Error: %s", buf); - break; - } - } + job_log_stdouterr(j); } else { socketgroup_callback(j, kev); }

1 0

[23000] tags/launchd-185/
by source_changes＠macosforge.org 04 Jan '07

04 Jan '07

Revision: 23000 http://trac.macosforge.org/projects/launchd/changeset/23000 Author: zarzycki(a)apple.com Date: 2007-01-04 12:05:30 -0800 (Thu, 04 Jan 2007) Log Message: ----------- "Tagging launchd-185 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-185/ Copied: tags/launchd-185 (from rev 22999, trunk)

1 0

[22999] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 02 Jan '07

02 Jan '07

Revision: 22999 http://trac.macosforge.org/projects/launchd/changeset/22999 Author: zarzycki(a)apple.com Date: 2007-01-02 14:35:13 -0800 (Tue, 02 Jan 2007) Log Message: ----------- <rdar://problem/4696825> reflect stderr of launchd jobs to ASL ("console logging") 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-01-02 18:32:46 UTC (rev 22998) +++ trunk/launchd/src/launchd_core_logic.c 2007-01-02 22:35:13 UTC (rev 22999) @@ -257,6 +257,7 @@ int argc; int last_exit_status; int forkfd; + int log_redirect_fd; int nice; int timeout; int stdout_err_fd; @@ -609,6 +610,10 @@ job_assumes(j, close(j->forkfd) != -1); } + if (j->log_redirect_fd) { + job_assumes(j, close(j->log_redirect_fd) != -1); + } + if (j->j_port) { job_assumes(j, launchd_mport_close_recv(j->j_port) == KERN_SUCCESS); } @@ -1586,6 +1591,11 @@ job_log(j, LOG_DEBUG, "Reaping"); + if (j->log_redirect_fd) { + job_assumes(j, close(j->log_redirect_fd) != -1); + j->log_redirect_fd = 0; + } + if (j->forkfd) { job_assumes(j, close(j->forkfd) != -1); j->forkfd = 0; @@ -1705,7 +1715,30 @@ watchpath_callback(j, kev); break; case EVFILT_READ: - socketgroup_callback(j, kev); + if (kev->ident == (uintptr_t)j->log_redirect_fd) { + char buf[4001]; + ssize_t rsz; + + rsz = read(j->log_redirect_fd, buf, sizeof(buf) - 1); + + if (rsz == 0) { + job_assumes(j, close(j->log_redirect_fd) != -1); + j->log_redirect_fd = 0; + } else if (job_assumes(j, rsz != -1)) { + buf[rsz] = '\0'; + switch (buf[0]) { + case '\n': + case '\r': + case '\0': + break; + default: + job_log(j, LOG_NOTICE, "Standard Out/Error: %s", buf); + break; + } + } + } else { + socketgroup_callback(j, kev); + } break; case EVFILT_MACHPORT: job_dispatch(j, true); @@ -1721,6 +1754,7 @@ { int spair[2]; int execspair[2]; + int oepair[2]; char nbuf[64]; pid_t c; bool sipc = false; @@ -1759,11 +1793,17 @@ j->checkedin = false; if (sipc) { - socketpair(AF_UNIX, SOCK_STREAM, 0, spair); + job_assumes(j, socketpair(AF_UNIX, SOCK_STREAM, 0, spair) != -1); } - socketpair(AF_UNIX, SOCK_STREAM, 0, execspair); + job_assumes(j, socketpair(AF_UNIX, SOCK_STREAM, 0, execspair) != -1); + if (job_assumes(j, pipe(oepair) != -1)) { + j->log_redirect_fd = _fd(oepair[0]); + job_assumes(j, fcntl(j->log_redirect_fd, F_SETFL, O_NONBLOCK) != -1); + job_assumes(j, kevent_mod(j->log_redirect_fd, EVFILT_READ, EV_ADD, 0, 0, j) != -1); + } + time(&j->start_time); switch (c = jobmgr_fork(j->mgr)) { @@ -1777,6 +1817,9 @@ } break; case 0: + job_assumes(j, dup2(oepair[1], STDOUT_FILENO) != -1); + job_assumes(j, dup2(oepair[1], STDERR_FILENO) != -1); + job_assumes(j, close(oepair[1]) != -1); job_assumes(j, close(execspair[0]) == 0); /* wait for our parent to say they've attached a kevent to us */ read(_fd(execspair[1]), &c, sizeof(c)); @@ -1797,6 +1840,7 @@ job_start_child(j); break; default: + job_assumes(j, close(oepair[1]) != -1); j->p = c; j->forkfd = _fd(execspair[0]); job_assumes(j, close(execspair[1]) == 0); @@ -2544,8 +2588,9 @@ job_log(j, LOG_DEBUG, "Ignoring Sockets:%s", buf); - for (i = 0; i < sg->fd_cnt; i++) + 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 @@ -2563,8 +2608,9 @@ job_log(j, LOG_DEBUG, "Watching sockets:%s", buf); - for (i = 0; i < sg->fd_cnt; i++) + for (i = 0; i < sg->fd_cnt; i++) { job_assumes(j, kevent_mod(sg->fds[i], EVFILT_READ, EV_ADD, 0, 0, j) != -1); + } } void

1 0

[22998] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 02 Jan '07

02 Jan '07

Revision: 22998 http://trac.macosforge.org/projects/launchd/changeset/22998 Author: zarzycki(a)apple.com Date: 2007-01-02 10:32:46 -0800 (Tue, 02 Jan 2007) Log Message: ----------- Fix a Mach port leak. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2006-12-22 19:44:52 UTC (rev 22997) +++ trunk/launchd/src/launchd_core_logic.c 2007-01-02 18:32:46 UTC (rev 22998) @@ -613,10 +613,9 @@ job_assumes(j, launchd_mport_close_recv(j->j_port) == KERN_SUCCESS); } -#if 0 - if (j->wait_reply_port) { + if (!job_assumes(j, j->wait_reply_port == MACH_PORT_NULL)) { + job_assumes(j, launchd_mport_deallocate(j->wait_reply_port) == KERN_SUCCESS); } -#endif while ((sg = SLIST_FIRST(&j->sockets))) { socketgroup_delete(j, sg);

1 0