From 3b257fc44a2daf7658e574a457d160dda85d1b87 Mon Sep 17 00:00:00 2001 From: Matt Kraai Date: Thu, 17 Sep 2009 07:07:42 -0700 Subject: [PATCH] Use the method used by build_env.sh to discover the user name. --- source3/script/tests/selftest.sh | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) 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 -- 1.6.4.2