[SCM] Samba Shared Repository - branch master updated
Björn Jacke
bjacke at samba.org
Sun Oct 11 04:43:42 MDT 2009
The branch, master has been updated
via 815b790... Use the method used by build_env.sh to discover the user name.
from 622bffc... s4/torture: fix build break "implicit declaration of function 'isprint'"
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 815b790c96c72cb995c983bbbc3cc95801aaacaa
Author: Matt Kraai <mkraai at beckman.com>
Date: Thu Sep 17 07:07:42 2009 -0700
Use the method used by build_env.sh to discover the user name.
so try USERNAME, then LOGNAME, then whoami, then id -un to find out who we
are.
-----------------------------------------------------------------------
Summary of changes:
source3/script/tests/selftest.sh | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index ae856ca..43e7bf1 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -57,7 +57,15 @@ export TORTURE_MAXTIME
WORKGROUP=SAMBA-TEST
SERVER=localhost2
SERVER_IP=127.0.0.2
-USERNAME=`PATH=/usr/ucb:$PATH whoami`
+if [ ! "x$USER" = "x" ]; then
+ USERNAME=$USER
+else
+ if [ ! "x$LOGNAME" = "x" ]; then
+ USERNAME=$LOGNAME
+ else
+ USERNAME=`PATH=/usr/ucb:$PATH whoami || id -un`
+ fi
+fi
USERID=`PATH=/usr/ucb:$PATH id | cut -d ' ' -f1 | sed -e 's/uid=\([0-9]*\).*/\1/g'`
GROUPID=`PATH=/usr/ucb:$PATH id | cut -d ' ' -f2 | sed -e 's/gid=\([0-9]*\).*/\1/g'`
PASSWORD=test
--
Samba Shared Repository
More information about the samba-cvs
mailing list