[101985] trunk/base/src

[jeremyhu at macports.org]

Revision: 101985
          https://trac.macports.org/changeset/101985
Author:   jeremyhu at macports.org
Date:     2013-01-23 14:55:53 -0800 (Wed, 23 Jan 2013)
Log Message:
-----------
nit pick ... do seteuid and setegid in consistent ordering

Modified Paths:
--------------
    trunk/base/src/package1.0/portdmg.tcl
    trunk/base/src/package1.0/portmdmg.tcl
    trunk/base/src/package1.0/portmpkg.tcl
    trunk/base/src/port1.0/fetch_common.tcl
    trunk/base/src/port1.0/portutil.tcl

Modified: trunk/base/src/package1.0/portdmg.tcl
===================================================================
--- trunk/base/src/package1.0/portdmg.tcl	2013-01-23 21:51:32 UTC (rev 101984)
+++ trunk/base/src/package1.0/portdmg.tcl	2013-01-23 22:55:53 UTC (rev 101985)
@@ -50,7 +50,7 @@
     ui_msg "$UI_PREFIX [format [msgcat::mc "Creating disk image for %s-%s"] ${subport} ${version}]"
 
     if {[getuid] == 0 && [geteuid] != 0} {
-		setegid 0; seteuid 0
+		seteuid 0; setegid 0
 	}
 
     return [package_dmg $subport $version $revision]

Modified: trunk/base/src/package1.0/portmdmg.tcl
===================================================================
--- trunk/base/src/package1.0/portmdmg.tcl	2013-01-23 21:51:32 UTC (rev 101984)
+++ trunk/base/src/package1.0/portmdmg.tcl	2013-01-23 22:55:53 UTC (rev 101985)
@@ -50,7 +50,7 @@
     ui_msg "$UI_PREFIX [format [msgcat::mc "Creating disk image for %s-%s"] ${subport} ${version}]"
 
     if {[getuid] == 0 && [geteuid] != 0} {
-		setegid 0; seteuid 0
+		seteuid 0; setegid 0
 	}
 
     return [package_mdmg $subport $version $revision]

Modified: trunk/base/src/package1.0/portmpkg.tcl
===================================================================
--- trunk/base/src/package1.0/portmpkg.tcl	2013-01-23 21:51:32 UTC (rev 101984)
+++ trunk/base/src/package1.0/portmpkg.tcl	2013-01-23 22:55:53 UTC (rev 101985)
@@ -69,7 +69,7 @@
     array set portinfo [lindex $res 1]
 
     if {[getuid] == 0 && [geteuid] != 0} {
-        setegid 0; seteuid 0
+        seteuid 0; setegid 0
         set deprivileged 1
     }
 
@@ -102,7 +102,7 @@
 
 proc portmpkg::make_one_package {portname mport} {
     if {[getuid] == 0 && [geteuid] != 0} {
-        setegid 0; seteuid 0
+        seteuid 0; setegid 0
         set deprivileged 1
     }
 

Modified: trunk/base/src/port1.0/fetch_common.tcl
===================================================================
--- trunk/base/src/port1.0/fetch_common.tcl	2013-01-23 21:51:32 UTC (rev 101984)
+++ trunk/base/src/port1.0/fetch_common.tcl	2013-01-23 22:55:53 UTC (rev 101985)
@@ -243,8 +243,7 @@
         if {[getuid] == 0 && [geteuid] != 0} {
             set oldeuid [geteuid]
             set oldegid [getegid]
-            seteuid 0
-            setegid 0
+            seteuid 0; setegid 0
         }
 
         foreach site $urllist {

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2013-01-23 21:51:32 UTC (rev 101984)
+++ trunk/base/src/port1.0/portutil.tcl	2013-01-23 22:55:53 UTC (rev 101985)
@@ -1594,7 +1594,7 @@
                 # run the activate target but ignore its (completed) dependencies
                 set result [target_run [lindex [dlist_search $dlist provides $target] 0]]
                 if {[getuid] == 0 && [geteuid] != 0} {
-                    setegid 0; seteuid 0
+                    seteuid 0; setegid 0
                 }
                 return $result
             }
@@ -1617,7 +1617,7 @@
     set dlist [dlist_eval $dlist "" target_run]
 
     if {[getuid] == 0 && [geteuid] != 0} {
-        setegid 0; seteuid 0
+        seteuid 0; setegid 0
     }
 
     if {[llength $dlist] > 0} {
@@ -2661,8 +2661,8 @@
     if { [getuid] == 0 } {
         if {[geteuid] != 0} {
             # if started with sudo but have dropped the privileges
+            seteuid $euid
             setegid $egid
-            seteuid $euid
             ui_debug "euid/egid changed to: [geteuid]/[getegid]"
             chown  ${path} ${macportsuser}
             ui_debug "chowned $path to $macportsuser"
@@ -2686,8 +2686,8 @@
     if {[getuid] == 0} {
         if {[geteuid] != 0} {
             # Started as root, but not root now
+            seteuid $euid
             setegid $egid
-            seteuid $euid
             ui_debug "euid/egid changed to: [geteuid]/[getegid]"
             ui_debug "setting attributes on $file"
             eval file attributes {$file} $attributes
@@ -2714,8 +2714,8 @@
     if { [getuid] == 0 && [geteuid] != 0 } {
     # if started with sudo but have dropped the privileges
         ui_debug "Can't run $action on this port without elevated privileges. Escalating privileges back to root."
+        seteuid $euid
         setegid $egid
-        seteuid $euid
         ui_debug "euid changed to: [geteuid]. egid changed to: [getegid]."
     } elseif { [getuid] != 0 } {
         return -code error "MacPorts requires root privileges for this action"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130123/725be916/attachment-0001.html>