smbclient_s3

Signed-off-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source3/script/tests/test_smbclient_s3.sh b/source3/script/tests/test_smbclient_s3.sh
index 9a4a5a97e06b2caf21147ced93986e628327c61e..988df64edcdf9f281c294f4d13712881dea16d2a 100755 (executable)
--- a/source3/script/tests/test_smbclient_s3.sh
+++ b/source3/script/tests/test_smbclient_s3.sh
@@ -1052,13 +1052,19 @@ test_nosymlinks()
     foobar_dir="$test_dir/$foobar_dir_relative"
     get_target="$test_dir/foo/bar/testfile"
 
-    testit "smbclient4 deltree" $SMBCLIENT4 //$SERVER/nosymlinks -c 'deltree $test_dir_relative'  || failed=`expr $failed + 1` 
-    testit "smbclient mkdir" $SMBCLIENT //$SERVER/nosymlinks -c 'recurse;mkdir $test_dir_relative'  || failed=`expr $failed + 1` 
-
-    echo "$slink_target" | testit "smbclient put link target" $SMBCLIENT //$SERVER/nosymlinks -c 'put - target'  || failed=`expr $failed + 1` 
+    testit "smbclient4 deltree" $SMBCLIENT4 //$SERVER/nosymlinks \
+          -U$USERNAME%$PASSWORD -c 'deltree $test_dir_relative' -I $SERVER_IP  $ADDARGS || failed=`expr $failed + 1` 
+    testit "smbclient mkdir" "$@" $SMBCLIENT //$SERVER/nosymlinks \
+          -U$USERNAME%$PASSWORD -c 'recurse;mkdir $test_dir_relative' -I $SERVER_IP   $ADDARGS || failed=`expr $failed + 1` 
+
+    echo "$slink_target" | testit "smbclient put link target" \
+                                 $SMBCLIENT "$@" //$SERVER/nosymlinks \
+                                 -U$USERNAME%$PASSWORD -c 'put - target' -I $SERVER_IP  $ADDARGS  || failed=`expr $failed + 1` 
     ln -s $slink_target $slink_name
 
-    testit "smbclient mkdir" $SMBCLIENT //$SERVER/nosymlinks -c 'resurce;mkdir $foobar_dir_relative'  || failed=`expr $failed + 1` 
+    testit "smbclient mkdir" $SMBCLIENT "$@" //$SERVER/nosymlinks \
+          -U$USERNAME%$PASSWORD \
+          -c 'recurse;mkdir $foobar_dir_relative'  || failed=`expr $failed + 1` 
     echo "$get_target" > $get_target
 
 # Getting a file through a symlink name should fail.
@@ -1158,9 +1164,9 @@ test_local_symlinks()
     slink_target_dir_relative="$test_dir_relative/dir1"
     slink_target_dir="$test_dir/dir1"
 
-    testit "smbclient4 deltree" $SMBCLIENT4 //$SERVER/local_symlinks -c 'deltree $test_dir_relative'  || failed=`expr $failed + 1` 
-    testit "smbclient mkdir" $SMBCLIENT //$SERVER/local_nosymlinks -c 'recurse;mkdir $test_dir_relative'  || failed=`expr $failed + 1` 
-    testit "smbclient mkdir dir1" $SMBCLIENT //$SERVER/local_nosymlinks -c 'recurse;mkdir slink_target_dir_relative'  || failed=`expr $failed + 1` 
+    testit "smbclient4 deltree" $SMBCLIENT4 //$SERVER/local_symlinks -U$USERNAME%$PASSWORD -c 'deltree $test_dir_relative'  || failed=`expr $failed + 1` 
+    testit "smbclient mkdir" $SMBCLIENT "$@" //$SERVER/local_nosymlinks -U$USERNAME%$PASSWORD -c 'recurse;mkdir $test_dir_relative'  || failed=`expr $failed + 1` 
+    testit "smbclient mkdir dir1" $SMBCLIENT "$@" //$SERVER/local_nosymlinks -U$USERNAME%$PASSWORD -c 'recurse;mkdir $slink_target_dir_relative'  || failed=`expr $failed + 1` 
 
     ln -s $slink_target_dir $slink_name