[135852] branches/release_2_3/base/src

[cal at macports.org]

Revision: 135852
          https://trac.macports.org/changeset/135852
Author:   cal at macports.org
Date:     2015-05-05 10:36:35 -0700 (Tue, 05 May 2015)
Log Message:
-----------
merge r135851 from trunk: Avoid overlap between existsuser/existsgroup error code and root/wheel's UID/GID, closes #45737

Revision Links:
--------------
    https://trac.macports.org/changeset/135851

Modified Paths:
--------------
    branches/release_2_3/base/src/pextlib1.0/Pextlib.c
    branches/release_2_3/base/src/port1.0/portutil.tcl

Property Changed:
----------------
    branches/release_2_3/base/src/


Property changes on: branches/release_2_3/base/src
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/gsoc08-privileges/base/src:37343-46937
/branches/gsoc09-logging/base/src:51231-60371
/branches/gsoc11-rev-upgrade/base/src:78828-88375
/branches/gsoc11-statistics/base/src:79520,79666
/branches/gsoc13-tests/src:106692-111324
/branches/universal-sanity/base/src:51872-52323
/branches/variant-descs-14482/base/src:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,128113,128274,128276,128422,134501-134502,134511,135851
/users/perry/base-bugs_and_notes/src:45682-46060
/users/perry/base-select/src:44044-44692

Modified: branches/release_2_3/base/src/pextlib1.0/Pextlib.c
===================================================================
--- branches/release_2_3/base/src/pextlib1.0/Pextlib.c	2015-05-05 17:33:30 UTC (rev 135851)
+++ branches/release_2_3/base/src/pextlib1.0/Pextlib.c	2015-05-05 17:36:35 UTC (rev 135852)
@@ -216,7 +216,7 @@
     free(user);
 
     if (pwent == NULL)
-        tcl_result = Tcl_NewIntObj(0);
+        tcl_result = Tcl_NewIntObj(-1);
     else
         tcl_result = Tcl_NewIntObj(pwent->pw_uid);
 
@@ -243,7 +243,7 @@
     free(group);
 
     if (grent == NULL)
-        tcl_result = Tcl_NewIntObj(0);
+        tcl_result = Tcl_NewIntObj(-1);
     else
         tcl_result = Tcl_NewIntObj(grent->gr_gid);
 

Modified: branches/release_2_3/base/src/port1.0/portutil.tcl
===================================================================
--- branches/release_2_3/base/src/port1.0/portutil.tcl	2015-05-05 17:33:30 UTC (rev 135851)
+++ branches/release_2_3/base/src/port1.0/portutil.tcl	2015-05-05 17:36:35 UTC (rev 135852)
@@ -2357,7 +2357,7 @@
         }
     }
 
-    if {[existsuser ${name}] != 0 || [existsuser ${uid}] != 0} {
+    if {[existsuser ${name}] != -1 || [existsuser ${uid}] != -1} {
         return
     }
 
@@ -2465,7 +2465,7 @@
         }
     }
 
-    if {[existsgroup ${name}] != 0 || [existsgroup ${gid}] != 0} {
+    if {[existsgroup ${name}] != -1 || [existsgroup ${gid}] != -1} {
         return
     }
 
@@ -3033,7 +3033,7 @@
 proc validate_macportsuser {} {
     global macportsuser
     if {[getuid] == 0 && $macportsuser ne "root" && 
-        ([existsuser $macportsuser] == 0 || [existsgroup $macportsuser] == 0 )} {
+        ([existsuser $macportsuser] == -1 || [existsgroup $macportsuser] == -1)} {
         ui_warn "configured user/group $macportsuser does not exist, will build as root"
         set macportsuser "root"
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150505/74eb1b5e/attachment.html>