s3-selftest: use absolute path when setting SOCKET_WRAPPER_DIR.

[ira/wip.git] / source3 / script / tests / selftest.sh

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index e3871132d2d027b0c9df65ace9b5fa65a9cbdcab..8565185ab6564f51409801f7db2b3479c109105a 100755 (executable)
--- 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
@@ -74,13 +82,14 @@ COMMONCONFFILE=$LIBDIR/common.conf
 PRIVATEDIR=$PREFIX_ABS/private
 LOCKDIR=$PREFIX_ABS/lockdir
 LOGDIR=$PREFIX_ABS/logs
-SOCKET_WRAPPER_DIR=$PREFIX/sw
+SOCKET_WRAPPER_DIR=$PREFIX_ABS/sw
 CONFIGURATION="--configfile $CONFFILE"
 SAMBA4CONFIGURATION="-s $SAMBA4CONFFILE"
 NSS_WRAPPER_PASSWD="$PRIVATEDIR/passwd"
 NSS_WRAPPER_GROUP="$PRIVATEDIR/group"
 WINBINDD_SOCKET_DIR=$PREFIX_ABS/winbindd
 WINBINDD_PRIV_PIPE_DIR=$LOCKDIR/winbindd_privileged
+TEST_DIRECTORY=$DIRECTORY
 
 export PREFIX PREFIX_ABS
 export CONFIGURATION CONFFILE SAMBA4CONFIGURATION SAMBA4CONFFILE
@@ -91,6 +100,7 @@ export USERNAME PASSWORD
 export WORKGROUP SERVER SERVER_IP
 export NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
 export WINBINDD_SOCKET_DIR WINBINDD_PRIV_PIPE_DIR
+export TEST_DIRECTORY
 
 PATH=bin:$PATH
 export PATH
@@ -234,15 +244,20 @@ cat >$SERVERCONFFILE<<EOF
        winbindd:socket dir = $WINBINDD_SOCKET_DIR
        idmap uid = 100000-200000
        idmap gid = 100000-200000
+       winbind enum users = yes
+       winbind enum groups = yes
 
 #      min receivefile size = 4000
 
        read only = no
        smbd:sharedelay = 100000
-       smbd:writetimeupdatedelay = 500000
-       map hidden = yes
-       map system = yes
+#      smbd:writetimeupdatedelay = 500000
+       map hidden = no
+       map system = no
+       map readonly = no
+       store dos attributes = yes
        create mask = 755
+       store create time = yes
        vfs objects = $BINDIR/xattr_tdb.so $BINDIR/streams_depot.so
 
        #Include user defined custom parameters if set
@@ -253,6 +268,9 @@ cat >$SERVERCONFFILE<<EOF
 [hideunread]
        copy = tmp
        hide unreadable = yes
+[tmpcase]
+       copy = tmp
+       case sensitive = yes
 [hideunwrite]
        copy = tmp
        hide unwriteable files = yes
@@ -331,6 +349,7 @@ TORTURE4_OPTIONS="$SAMBA4CONFIGURATION"
 TORTURE4_OPTIONS="$TORTURE4_OPTIONS --maximum-runtime=$TORTURE_MAXTIME"
 TORTURE4_OPTIONS="$TORTURE4_OPTIONS --target=samba3"
 TORTURE4_OPTIONS="$TORTURE4_OPTIONS --option=torture:localdir=$SHRDIR"
+TORTURE4_OPTIONS="$TORTURE4_OPTIONS --option=torture:winbindd_netbios_name=$SERVER"
 export TORTURE4_OPTIONS
 
 if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then