From owner-svn-src-user@FreeBSD.ORG  Tue Apr 12 00:05:01 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7713F106564A;
	Tue, 12 Apr 2011 00:05:01 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 601438FC0C;
	Tue, 12 Apr 2011 00:05:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p3C051mb003750;
	Tue, 12 Apr 2011 00:05:01 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3C051D9003748;
	Tue, 12 Apr 2011 00:05:01 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201104120005.p3C051D9003748@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Tue, 12 Apr 2011 00:05:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220553 - user/dougb/portmaster
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Apr 2011 00:05:01 -0000

Author: dougb
Date: Tue Apr 12 00:05:01 2011
New Revision: 220553
URL: http://svn.freebsd.org/changeset/base/220553

Log:
  Fix the problem created by jumbo numeric uids, and simplify
  the code in the process.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Mon Apr 11 22:01:06 2011	(r220552)
+++ user/dougb/portmaster/portmaster	Tue Apr 12 00:05:01 2011	(r220553)
@@ -39,8 +39,8 @@ if [ -z "$PM_PARENT_PID" ]; then
 	my_environment=`set`
 
 	# If we are already root, unset this to avoid potential conflict
-	euid=`ps -o uid $$` ; euid=${euid##* }
-	[ "$euid" -eq 0 ] && unset PM_SU_CMD PM_SU_VERBOSE
+	euid=`ps -o uid= $$`
+	[ $euid -eq 0 ] && unset PM_SU_CMD PM_SU_VERBOSE
 	unset euid
 fi