[SCM] Samba Shared Repository - branch v3-5-test updated

[Björn Jacke]

The branch, v3-5-test has been updated
       via  2f95768... Use the method used by build_env.sh to discover the user name.
      from  1f1c293... s3: Fix a memleak reported by dmarkey

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit 2f9576801d1e14b5489cef93c677114d18ef3d83
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