<!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>[23131] trunk/launchd/src</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23131">23131</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-03-04 15:59:52 -0800 (Sun, 04 Mar 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/4421331> Per session launchd deployment for CLI / PAM sessions</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrcliblaunchc">trunk/launchd/src/liblaunch.c</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>
<li><a href="#trunklaunchdsrclibvproc_privateh">trunk/launchd/src/libvproc_private.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklaunchdsrcliblaunchc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/liblaunch.c (23130 => 23131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/liblaunch.c 2007-03-04 23:38:21 UTC (rev 23130)
+++ trunk/launchd/src/liblaunch.c 2007-03-04 23:59:52 UTC (rev 23131)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx">
</span><span class="cx"> #include "libbootstrap_public.h"
</span><span class="cx"> #include "libvproc_public.h"
</span><ins>+#include "libvproc_private.h"
</ins><span class="cx"> #include "libvproc_internal.h"
</span><span class="cx">
</span><span class="cx"> /* __OSBogusByteSwap__() must not really exist in the symbol namespace
</span><span class="lines">@@ -1163,7 +1164,7 @@
</span><span class="cx"> void
</span><span class="cx"> load_launchd_jobs_at_loginwindow_prompt(int flags __attribute__((unused)), ...)
</span><span class="cx"> {
</span><del>- _vproc_move_subset_to_user("LoginWindow");
</del><ins>+ _vprocmgr_move_subset_to_user(geteuid() ? geteuid() : getuid(), "LoginWindow");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> pid_t
</span><span class="lines">@@ -1171,8 +1172,9 @@
</span><span class="cx"> {
</span><span class="cx"> mach_port_t bezel_ui_server;
</span><span class="cx"> struct stat sb;
</span><ins>+ uid_t target_user = geteuid() ? geteuid() : getuid();
</ins><span class="cx">
</span><del>- if (_vproc_move_subset_to_user("Aqua")) {
</del><ins>+ if (_vprocmgr_move_subset_to_user(target_user, "Aqua")) {
</ins><span class="cx"> return -1;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1181,7 +1183,7 @@
</span><span class="cx"> #define BEZEL_UI_SERVICE "BezelUI"
</span><span class="cx">
</span><span class="cx"> if (!(stat(BEZEL_UI_PLIST, &sb) == 0 && S_ISREG(sb.st_mode))) {
</span><del>- if (bootstrap_create_server(bootstrap_port, BEZEL_UI_PATH, 0, true, &bezel_ui_server) == BOOTSTRAP_SUCCESS) {
</del><ins>+ if (bootstrap_create_server(bootstrap_port, BEZEL_UI_PATH, target_user, true, &bezel_ui_server) == BOOTSTRAP_SUCCESS) {
</ins><span class="cx"> mach_port_t srv;
</span><span class="cx">
</span><span class="cx"> if (bootstrap_create_service(bezel_ui_server, BEZEL_UI_SERVICE, &srv) == BOOTSTRAP_SUCCESS) {
</span></span></pre></div>
<a id="trunklaunchdsrclibvprocc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/libvproc.c (23130 => 23131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/libvproc.c 2007-03-04 23:38:21 UTC (rev 23130)
+++ trunk/launchd/src/libvproc.c 2007-03-04 23:59:52 UTC (rev 23131)
</span><span class="lines">@@ -47,12 +47,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> vproc_err_t
</span><del>-_vproc_move_subset_to_user(char *session_type)
</del><ins>+_vprocmgr_move_subset_to_user(uid_t target_user, char *session_type)
</ins><span class="cx"> {
</span><span class="cx"> kern_return_t kr = 1;
</span><span class="cx"> mach_port_t puc = 0, which_port = bootstrap_port;
</span><span class="cx">
</span><del>- if ((getuid() || geteuid()) && vproc_mig_lookup_per_user_context(bootstrap_port, 0, &puc) == 0) {
</del><ins>+ if (target_user && vproc_mig_lookup_per_user_context(bootstrap_port, target_user, &puc) == 0) {
</ins><span class="cx"> which_port = puc;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> mach_port_deallocate(mach_task_self(), puc);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return kr == 0 ? NULL : (vproc_err_t)_vproc_move_subset_to_user;
</del><ins>+ return kr == 0 ? NULL : (vproc_err_t)_vprocmgr_move_subset_to_user;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunklaunchdsrclibvproc_internalh"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/libvproc_internal.h (23130 => 23131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/libvproc_internal.h 2007-03-04 23:38:21 UTC (rev 23130)
+++ trunk/launchd/src/libvproc_internal.h 2007-03-04 23:59:52 UTC (rev 23131)
</span><span class="lines">@@ -57,8 +57,6 @@
</span><span class="cx">
</span><span class="cx"> kern_return_t _vprocmgr_getsocket(name_t);
</span><span class="cx">
</span><del>-vproc_err_t _vproc_move_subset_to_user(char *session_type);
-
</del><span class="cx"> void _vproc_logv(int pri, int err, const char *msg, va_list ap);
</span><span class="cx">
</span><span class="cx"> kern_return_t
</span></span></pre></div>
<a id="trunklaunchdsrclibvproc_privateh"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/libvproc_private.h (23130 => 23131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/libvproc_private.h 2007-03-04 23:38:21 UTC (rev 23130)
+++ trunk/launchd/src/libvproc_private.h 2007-03-04 23:59:52 UTC (rev 23131)
</span><span class="lines">@@ -20,6 +20,7 @@
</span><span class="cx"> * @APPLE_APACHE_LICENSE_HEADER_END@
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#include <sys/types.h>
</ins><span class="cx"> #include <sys/cdefs.h>
</span><span class="cx"> #include <sys/syslog.h>
</span><span class="cx"> #include <stdbool.h>
</span><span class="lines">@@ -34,6 +35,8 @@
</span><span class="cx"> void _vproc_log(int pri, const char *msg, ...) __attribute__((format(printf, 2, 3)));
</span><span class="cx"> void _vproc_log_error(int pri, const char *msg, ...) __attribute__((format(printf, 2, 3)));
</span><span class="cx">
</span><ins>+vproc_err_t _vprocmgr_move_subset_to_user(uid_t target_user, char *session_type);
+
</ins><span class="cx"> #pragma GCC visibility pop
</span><span class="cx">
</span><span class="cx"> __END_DECLS
</span></span></pre>
</div>
</div>
</body>
</html>