<!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" />
<title>[135851] trunk/base/src</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/135851">135851</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2015-05-05 10:33:30 -0700 (Tue, 05 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>base: Avoid overlap between existsuser/existsgroup error code and root/wheel's UID/GID, closes #45737
Return -1 from existsuser and existsgroup when a user or group does not exist.
Because these commands return the UID or GID in case of success, they could not
be used to check for the existence of the root user or the wheel group (UID/GID
0).
Since existsuser and existsgroup are used in adduser and addgroup in
port1.0/portutil.tcl, putting add_user root into a Portfile would make MacPorts
trash the system's root user by replacing it with a new user with a non-zero
UID, effectively stripping the root user from its privileges.
This caused a problem in the dbus port when installed in a root MacPorts
installation with the +no_root variant, which is explained in #45737.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcpextlib10Pextlibc">trunk/base/src/pextlib1.0/Pextlib.c</a></li>
<li><a href="#trunkbasesrcport10portutiltcl">trunk/base/src/port1.0/portutil.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcpextlib10Pextlibc"></a>
<div class="modfile"><h4>Modified: trunk/base/src/pextlib1.0/Pextlib.c (135850 => 135851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/pextlib1.0/Pextlib.c 2015-05-05 17:24:04 UTC (rev 135850)
+++ trunk/base/src/pextlib1.0/Pextlib.c 2015-05-05 17:33:30 UTC (rev 135851)
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (pwent == NULL) {
</span><del>- tcl_result = Tcl_NewIntObj(0);
</del><ins>+ tcl_result = Tcl_NewIntObj(-1);
</ins><span class="cx"> } else {
</span><span class="cx"> tcl_result = Tcl_NewIntObj(pwent->pw_uid);
</span><span class="cx"> }
</span><span class="lines">@@ -244,7 +244,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (grent == NULL) {
</span><del>- tcl_result = Tcl_NewIntObj(0);
</del><ins>+ tcl_result = Tcl_NewIntObj(-1);
</ins><span class="cx"> } else {
</span><span class="cx"> tcl_result = Tcl_NewIntObj(grent->gr_gid);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbasesrcport10portutiltcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portutil.tcl (135850 => 135851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portutil.tcl 2015-05-05 17:24:04 UTC (rev 135850)
+++ trunk/base/src/port1.0/portutil.tcl 2015-05-05 17:33:30 UTC (rev 135851)
</span><span class="lines">@@ -2366,7 +2366,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if {[existsuser ${name}] != 0 || [existsuser ${uid}] != 0} {
</del><ins>+ if {[existsuser ${name}] != -1 || [existsuser ${uid}] != -1} {
</ins><span class="cx"> return
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2474,7 +2474,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if {[existsgroup ${name}] != 0 || [existsgroup ${gid}] != 0} {
</del><ins>+ if {[existsgroup ${name}] != -1 || [existsgroup ${gid}] != -1} {
</ins><span class="cx"> return
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3042,7 +3042,7 @@
</span><span class="cx"> proc validate_macportsuser {} {
</span><span class="cx"> global macportsuser
</span><span class="cx"> if {[getuid] == 0 && $macportsuser ne "root" &&
</span><del>- ([existsuser $macportsuser] == 0 || [existsgroup $macportsuser] == 0 )} {
</del><ins>+ ([existsuser $macportsuser] == -1 || [existsgroup $macportsuser] == -1)} {
</ins><span class="cx"> ui_warn "configured user/group $macportsuser does not exist, will build as root"
</span><span class="cx"> set macportsuser "root"
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>