trying to get HEAD building again. If you want the code

[abartlet/samba.git/.git] / testsuite / build_farm / basicsmb.fns

diff --git a/testsuite/build_farm/basicsmb.fns b/testsuite/build_farm/basicsmb.fns
index f5143cc4d883e446abef323c0038481565a33533..3a9080f473b738b30792b7d3ce8ea3bef89d8a67 100644 (file)
--- a/testsuite/build_farm/basicsmb.fns
+++ b/testsuite/build_farm/basicsmb.fns
@@ -63,8 +63,16 @@ test_smb_conf_setup() {
     template_smb_conf_setup .preexec_close
     template_smb_conf_setup .preexec_cl_fl
 
+    template_smb_conf_setup .share
+    template_smb_conf_setup .user
+    template_smb_conf_setup .server
+    template_smb_conf_setup .domain
+
     template_setup preexec lib/preexec
 
+    touch $prefix/lib/smb.conf.
+    touch $prefix/lib/smb.conf.localhost
+
        echo "127.0.0.1    localhost">$prefix/lib/lmhosts
        echo "127.0.0.2    BUILDFARM">>$prefix/lib/lmhosts
     echo "127.0.0.3    SHARE">>$prefix/lib/lmhosts
@@ -81,20 +89,13 @@ test_smb_conf_setup() {
 
        echo "127.0.0.1" > $prefix/lib/hosts.equiv
 
-    cp basicsmb.smb.conf.share $prefix/lib/smb.conf.share
-    cp basicsmb.smb.conf.user $prefix/lib/smb.conf.user
-    cp basicsmb.smb.conf.server $prefix/lib/smb.conf.server
-    cp basicsmb.smb.conf.domain $prefix/lib/smb.conf.domain
-
-    touch $prefix/lib/smb.conf.
-    touch $prefix/lib/smb.conf.localhost
 }
 
 test_smbpasswd() {
        test_smbpasswd_password="$1"
        rm -f $prefix/private/smbpasswd
-       echo "( echo $test_smbpasswd_password ; echo $test_smbpasswd_password; ) | $prefix/bin/smbpasswd -L -s -a $whoami"
-       ( echo $test_smbpasswd_password; echo $test_smbpasswd_password; ) | $prefix/bin/smbpasswd -L -s -a $whoami
+       echo "( echo $test_smbpasswd_password ; echo $test_smbpasswd_password; ) | $prefix/bin/smbpasswd -L -D $loglevel -s -a $whoami"
+       ( echo $test_smbpasswd_password; echo $test_smbpasswd_password; ) | $prefix/bin/smbpasswd -L -D $loglevel -s -a $whoami
        status=$?
        if [ $status = 0 ]; then
            echo "smbpasswd correctly set initial password ($test_smbpasswd_password)"