<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[23007] trunk/launchd/src</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23007">23007</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-01-10 10:38:28 -0800 (Wed, 10 Jan 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/4884164> support loading jobs into the loginwindow context</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchd_core_logicc">trunk/launchd/src/launchd_core_logic.c</a></li>
<li><a href="#trunklaunchdsrcliblaunchc">trunk/launchd/src/liblaunch.c</a></li>
<li><a href="#trunklaunchdsrcliblaunch_privateh">trunk/launchd/src/liblaunch_private.h</a></li>
<li><a href="#trunklaunchdsrclibvprocc">trunk/launchd/src/libvproc.c</a></li>
<li><a href="#trunklaunchdsrclibvproc_internalh">trunk/launchd/src/libvproc_internal.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklaunchdsrclaunchd_core_logicc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_core_logic.c (23006 => 23007)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -298,7 +298,7 @@
</span><span class="cx"> static void job_setup_fd(job_t j, int target_fd, const char *path, int flags);
</span><span class="cx"> static void job_postfork_become_user(job_t j);
</span><span class="cx"> static void job_force_sampletool(job_t j);
</span><del>-static void job_reparent_to_aqua_hack(job_t j);
</del><ins>+static void job_reparent_hack(job_t j, const char *where);
</ins><span class="cx"> static void job_callback(void *obj, struct kevent *kev);
</span><span class="cx"> static launch_data_t job_export2(job_t j, bool subjobs);
</span><span class="cx"> 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);
</span><span class="lines">@@ -840,7 +840,7 @@
</span><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- job_reparent_to_aqua_hack(jr);
</del><ins>+ job_reparent_hack(jr, "Aqua");
</ins><span class="cx">
</span><span class="cx"> if (getpid() == 1) {
</span><span class="cx"> struct ldcred ldc;
</span><span class="lines">@@ -1115,7 +1115,9 @@
</span><span class="cx"> return;
</span><span class="cx"> } else if (strcasecmp(key, LAUNCH_JOBKEY_LIMITLOADTOSESSIONTYPE) == 0) {
</span><span class="cx"> if (strcmp(value, "Aqua") == 0) {
</span><del>- job_reparent_to_aqua_hack(j);
</del><ins>+ job_reparent_hack(j, "Aqua");
+ } else if (strcmp(value, "LoginWindow") == 0) {
+ job_reparent_hack(j, "LoginWindow");
</ins><span class="cx"> }
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -3179,7 +3181,7 @@
</span><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- jmr = calloc(1, sizeof(struct jobmgr_s) + strlen("100000") + 1);
</del><ins>+ jmr = calloc(1, sizeof(struct jobmgr_s) + strlen("LoginWindow") + 1);
</ins><span class="cx">
</span><span class="cx"> if (jmr == NULL) {
</span><span class="cx"> return NULL;
</span><span class="lines">@@ -3832,6 +3834,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch (key) {
</span><ins>+ case GSK_LOGINWINDOW_CONTEXT:
+ strcpy(j->mgr->name, "LoginWindow");
+ break;
</ins><span class="cx"> case GLOBAL_ON_DEMAND:
</span><span class="cx"> kr = job_set_global_on_demand(j, (bool)val) ? 0 : 1;
</span><span class="cx"> break;
</span><span class="lines">@@ -4166,14 +4171,13 @@
</span><span class="cx"> return BOOTSTRAP_NO_MEMORY;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> void
</span><del>-job_reparent_to_aqua_hack(job_t j)
</del><ins>+job_reparent_hack(job_t j, const char *where)
</ins><span class="cx"> {
</span><span class="cx"> jobmgr_t jmi = NULL;
</span><span class="cx">
</span><span class="cx"> SLIST_FOREACH(jmi, &root_jobmgr->submgrs, sle) {
</span><del>- if (strcmp(jmi->name, "Aqua") == 0) {
</del><ins>+ if (strcmp(jmi->name, where) == 0) {
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunklaunchdsrcliblaunchc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/liblaunch.c (23006 => 23007)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1186,6 +1186,30 @@
</span><span class="cx"> _exit(EXIT_FAILURE);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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;
+ }
+}
+
</ins><span class="cx"> pid_t
</span><span class="cx"> create_and_switch_to_per_session_launchd(const char *login, int flags, ...)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunklaunchdsrcliblaunch_privateh"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/liblaunch_private.h (23006 => 23007)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -73,14 +73,18 @@
</span><span class="cx"> *
</span><span class="cx"> * After this call, the task's bootstrap port is set to the per session launchd.
</span><span class="cx"> *
</span><del>- * 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.
</del><ins>+ * This returns 1 on success (it used to return otherwise), and -1 on failure.
</ins><span class="cx"> */
</span><span class="cx"> #define LOAD_ONLY_SAFEMODE_LAUNCHAGENTS 1
</span><span class="cx"> pid_t create_and_switch_to_per_session_launchd(const char *login, int flags, ...);
</span><span class="cx">
</span><ins>+/* Also for LoginWindow.
+ *
+ * This is will load jobs at the LoginWindow prompt.
+ */
+void load_launchd_jobs_at_loginwindow_prompt(int flags, ...);
+
+
</ins><span class="cx"> /* batch jobs will be implicity re-enabled when the last application who
</span><span class="cx"> * disabled them exits.
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunklaunchdsrclibvprocc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/libvproc.c (23006 => 23007)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -208,6 +208,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> vproc_err_t
</span><ins>+__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
</ins><span class="cx"> _vproc_set_global_on_demand(bool state)
</span><span class="cx"> {
</span><span class="cx"> int64_t val = state ? ~0 : 0;
</span></span></pre></div>
<a id="trunklaunchdsrclibvproc_internalh"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/libvproc_internal.h (23006 => 23007)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> typedef enum {
</span><span class="cx"> LAST_EXIT_STATUS = 1,
</span><span class="cx"> GLOBAL_ON_DEMAND,
</span><ins>+ GSK_LOGINWINDOW_CONTEXT,
</ins><span class="cx"> } get_set_int_key_t;
</span><span class="cx">
</span><span class="cx"> #ifdef protocol_vproc_MSG_COUNT
</span><span class="lines">@@ -52,6 +53,8 @@
</span><span class="cx"> name_array_t *service_names, mach_msg_type_number_t *service_namesCnt,
</span><span class="cx"> mach_port_array_t *ports, mach_msg_type_number_t *portCnt);
</span><span class="cx">
</span><ins>+vproc_err_t __vproc_tag_loginwindow_context(void);
+
</ins><span class="cx"> kern_return_t _vprocmgr_getsocket(name_t);
</span><span class="cx">
</span><span class="cx"> vproc_err_t _vproc_move_subset_to_user(void);
</span></span></pre>
</div>
</div>
</body>
</html>