<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { 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>[23601] trunk/launchd/src</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23601">23601</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2008-04-21 13:33:29 -0700 (Mon, 21 Apr 2008)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/5856435> Make bootstrap_create_server() be per-user launchd aware</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchd_core_logicc">trunk/launchd/src/launchd_core_logic.c</a></li>
<li><a href="#trunklaunchdsrclibbootstrapc">trunk/launchd/src/libbootstrap.c</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 (23600 => 23601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2008-04-18 21:41:05 UTC (rev 23600)
+++ trunk/launchd/src/launchd_core_logic.c 2008-04-21 20:33:29 UTC (rev 23601)
</span><span class="lines">@@ -5650,18 +5650,12 @@
</span><span class="cx">
</span><span class="cx"> job_log(j, LOG_DEBUG, "Server create attempt: %s", server_cmd);
</span><span class="cx">
</span><del>-#define LET_MERE_MORTALS_ADD_SERVERS_TO_PID1
- /* XXX - This code should go away once the per session launchd is integrated with the rest of the system */
-#ifdef LET_MERE_MORTALS_ADD_SERVERS_TO_PID1
</del><span class="cx"> if (pid1_magic) {
</span><del>- if (unlikely(ldc->euid && server_uid && (ldc->euid != server_uid))) {
- job_log(j, LOG_WARNING, "Server create: \"%s\": Will run as UID %d, not UID %d as they told us to",
- server_cmd, ldc->euid, server_uid);
- server_uid = ldc->euid;
</del><ins>+ if (ldc->euid || ldc->uid) {
+ job_log(j, LOG_WARNING, "Server create attempt moved to per-user launchd: %s", server_cmd);
+ return VPROC_ERR_TRY_PER_USER;
</ins><span class="cx"> }
</span><del>- } else
-#endif
- if (getuid()) {
</del><ins>+ } else {
</ins><span class="cx"> if (unlikely(server_uid != getuid())) {
</span><span class="cx"> job_log(j, LOG_WARNING, "Server create: \"%s\": As UID %d, we will not be able to switch to UID %d",
</span><span class="cx"> server_cmd, getuid(), server_uid);
</span></span></pre></div>
<a id="trunklaunchdsrclibbootstrapc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/libbootstrap.c (23600 => 23601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/libbootstrap.c 2008-04-18 21:41:05 UTC (rev 23600)
+++ trunk/launchd/src/libbootstrap.c 2008-04-21 20:33:29 UTC (rev 23601)
</span><span class="lines">@@ -37,7 +37,20 @@
</span><span class="cx"> kern_return_t
</span><span class="cx"> bootstrap_create_server(mach_port_t bp, cmd_t server_cmd, uid_t server_uid, boolean_t on_demand, mach_port_t *server_port)
</span><span class="cx"> {
</span><del>- return vproc_mig_create_server(bp, server_cmd, server_uid, on_demand, server_port);
</del><ins>+ kern_return_t kr;
+
+ kr = vproc_mig_create_server(bp, server_cmd, server_uid, on_demand, server_port);
+
+ 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_create_server(puc, server_cmd, server_uid, on_demand, server_port);
+ mach_port_deallocate(mach_task_self(), puc);
+ }
+ }
+
+ return kr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> kern_return_t
</span></span></pre>
</div>
</div>
</body>
</html>