<!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>[23005] trunk/launchd/src</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23005">23005</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-01-04 17:14:23 -0800 (Thu, 04 Jan 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/4857011> Unable to drag & drop, copy & paste when logged in as root.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchd_core_logicc">trunk/launchd/src/launchd_core_logic.c</a></li>
<li><a href="#trunklaunchdsrclibvprocc">trunk/launchd/src/libvproc.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 (23004 => 23005)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -4195,6 +4195,13 @@
</span><span class="cx"> kern_return_t kr;
</span><span class="cx"> jobmgr_t jmr;
</span><span class="cx">
</span><ins>+ 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;
+ }
+
</ins><span class="cx"> kr = _vproc_grab_subset(target_subset, &reqport,
</span><span class="cx"> &rcvright, &l2l_names, &l2l_name_cnt, &l2l_ports, &l2l_port_cnt);
</span><span class="cx">
</span></span></pre></div>
<a id="trunklaunchdsrclibvprocc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/libvproc.c (23004 => 23005)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include <stdlib.h>
</span><span class="cx"> #include <stdio.h>
</span><span class="cx"> #include <errno.h>
</span><ins>+#include <unistd.h>
</ins><span class="cx">
</span><span class="cx"> #include "liblaunch_public.h"
</span><span class="cx"> #include "liblaunch_private.h"
</span><span class="lines">@@ -47,10 +48,15 @@
</span><span class="cx"> _vproc_move_subset_to_user(void)
</span><span class="cx"> {
</span><span class="cx"> kern_return_t kr = 1;
</span><del>- mach_port_t puc;
</del><ins>+ mach_port_t puc = 0, which_port = bootstrap_port;
</ins><span class="cx">
</span><del>- if (vproc_mig_lookup_per_user_context(bootstrap_port, 0, &puc) == 0) {
- kr = vproc_mig_move_subset_to_user(puc, bootstrap_port);
</del><ins>+ 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) {
</ins><span class="cx"> mach_port_deallocate(mach_task_self(), puc);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>