<!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>[147064] trunk/base/src/port1.0/portutil.tcl</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/147064">147064</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2016-03-24 14:52:48 -0700 (Thu, 24 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>base: portutil: Improve msg for privilege handling
Let's have one line per privilege escalation and one line per privilege drop in
the log file, rather than two for escalation and three for the drop.
Additionally, format the messages in a similar way so it is easier to see that
they are related.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcport10portutiltcl">trunk/base/src/port1.0/portutil.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcport10portutiltcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portutil.tcl (147063 => 147064)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portutil.tcl 2016-03-24 21:09:03 UTC (rev 147063)
+++ trunk/base/src/port1.0/portutil.tcl 2016-03-24 21:52:48 UTC (rev 147064)
</span><span class="lines">@@ -2984,10 +2984,9 @@
</span><span class="cx">
</span><span class="cx"> if { [getuid] == 0 && [geteuid] != 0 } {
</span><span class="cx"> # if started with sudo but have dropped the privileges
</span><del>- ui_debug "Can't run $action on this port without elevated privileges. Escalating privileges back to root."
</del><span class="cx"> seteuid $euid
</span><span class="cx"> setegid $egid
</span><del>- ui_debug "euid changed to: [geteuid]. egid changed to: [getegid]."
</del><ins>+ ui_debug "elevating privileges for $action: euid changed to [geteuid], egid changed to [getegid]."
</ins><span class="cx"> } elseif { [getuid] != 0 } {
</span><span class="cx"> return -code error "MacPorts requires root privileges for this action"
</span><span class="cx"> }
</span><span class="lines">@@ -3001,15 +3000,12 @@
</span><span class="cx"> if { [geteuid] == 0 } {
</span><span class="cx"> if { [catch {
</span><span class="cx"> if {[name_to_uid "$macportsuser"] != 0} {
</span><del>- ui_debug "changing euid/egid - current euid: $euid - current egid: $egid"
-
</del><span class="cx"> #seteuid [name_to_uid [file attributes $workpath -owner]]
</span><span class="cx"> #setegid [name_to_gid [file attributes $workpath -group]]
</span><span class="cx">
</span><span class="cx"> setegid [uname_to_gid "$macportsuser"]
</span><span class="cx"> seteuid [name_to_uid "$macportsuser"]
</span><del>- ui_debug "egid changed to: [getegid]"
- ui_debug "euid changed to: [geteuid]"
</del><ins>+ ui_debug "dropping privileges: euid changed to [geteuid], egid changed to [getegid]."
</ins><span class="cx"> }
</span><span class="cx"> }]
</span><span class="cx"> } {
</span></span></pre>
</div>
</div>
</body>
</html>