X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=blobdiff_plain;f=testprogs%2Fblackbox%2Ftest_smbclient.sh;h=a803d83363ba45729723b5cb4367b9f326b1785b;hp=1d28fa2f713945c56356b4cf23f41a6e9346f8cb;hb=94fb39cfd967455ce5a554720c1c7e6183f91056;hpb=7e6357f21350d264ebedabd34f2b8f42fc0427ff

diff --git a/testprogs/blackbox/test_smbclient.sh b/testprogs/blackbox/test_smbclient.sh
index 1d28fa2f713..a803d83363b 100755
--- a/testprogs/blackbox/test_smbclient.sh
+++ b/testprogs/blackbox/test_smbclient.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
+# Blackbox tests for smbclient
+# Copyright (C) 2006-2007 Jelmer Vernooij <jelmer@samba.org>
+# Copyright (C) 2006-2007 Andrew Bartlett <abartlet@samba.org>
 
 if [ $# -lt 5 ]; then
 cat <<EOF
@@ -15,6 +18,9 @@ PREFIX=$5
 shift 5
 failed=0
 
+samba4bindir=`dirname $0`/../../source/bin
+smbclient=$samba4bindir/smbclient
+
 testit() {
 	name="$1"
 	shift
@@ -32,11 +38,26 @@ testit() {
 
 runcmd() {
 	name="$1"
+	cmd="$2"
+	shift
 	shift
-	testit "$name" $VALGRIND bin/smbclient $CONFIGURATION //$SERVER/tmp -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@
-	return $?
+	echo "test: $name"
+	$VALGRIND $smbclient $CONFIGURATION //$SERVER/tmp -c "$cmd" -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@
+	status=$?
+	if [ x$status = x0 ]; then
+		echo "success: $name"
+	else
+		echo "failure: $name"
+	fi
+	return $status
 }
 
+testit "share and server list" $VALGRIND $smbclient -L $SERVER $CONFIGURATION  -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
+
+testit "share and server list anonymously" $VALGRIND $smbclient -N -L $SERVER $CONFIGURATION $@ || failed=`expr $failed + 1`
+
+testit "domain join" $VALGRIND bin/net join $DOMAIN $CONFIGURATION  -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
+
 # Generate random file
 cat >tmpfile<<EOF
 foo
@@ -46,57 +67,89 @@ blah
 EOF
 
 # put that file
-echo mput tmpfile | runcmd "MPutting file" || failed=`expr $failed + 1`
+runcmd "MPutting file" 'mput tmpfile' || failed=`expr $failed + 1`
 # check file info
-echo altname tmpfile | runcmd "Getting alternative name" || failed=`expr $failed + 1`
+runcmd "Getting alternative name" 'altname tmpfile'|| failed=`expr $failed + 1`
 # run allinfo on that file
-echo allinfo tmpfile | runcmd "Checking info on file" || failed=`expr $failed + 1`
+runcmd "Checking info on file" 'allinfo tmpfile'|| failed=`expr $failed + 1`
 # get that file
 mv tmpfile tmpfile-old
-echo mget tmpfile | runcmd "MGetting file" || failed=`expr $failed + 1`
+runcmd "MGetting file" 'mget tmpfile' || failed=`expr $failed + 1`
 # remove that file
-echo rm tmpfile | runcmd "Removing file" || failed=`expr $failed + 1`
+runcmd "Removing file" 'rm tmpfile' || failed=`expr $failed + 1`
 # compare locally
 testit "Comparing files" diff tmpfile-old tmpfile || failed=`expr $failed + 1`
 # create directory
-echo mkdir bla | runcmd "Creating directory" || failed=`expr $failed + 1`
 # cd to directory
-echo cd bla | runcmd "Changing directory" || failed=`expr $failed + 1`
 # cd to top level directory
-echo cd .. | runcmd "Going back" || failed=`expr $failed + 1`
 # remove directory
-echo rmdir bla | runcmd "Removing directory"  || failed=`expr $failed + 1`
+runcmd "Creating directory, Changing directory, Going back" 'mkdir bla; cd bla; cd ..; rmdir bla' || failed=`expr $failed + 1`
 # enable recurse, create nested directory
-echo "recurse; echo mkdir bla/bloe; exit" | runcmd "Creating nested directory" || failed=`expr $failed + 1`
+runcmd "Creating nested directory" 'mkdir bla/bloe' || failed=`expr $failed + 1`
 # remove parent directory
-echo rmdir bla/bloe | runcmd "Removing directory" || failed=`expr $failed + 1`
+runcmd "Removing directory" 'rmdir bla/bloe' || failed=`expr $failed + 1`
 # remove child directory
-echo rmdir bla | runcmd "Removing directory" || failed=`expr $failed + 1`
+runcmd "Removing directory" 'rmdir bla'|| failed=`expr $failed + 1`
 # run fsinfo
-echo fsinfo objectid | runcmd "Getting file system info" || failed=`expr $failed + 1`
+runcmd "Getting file system info" 'fsinfo objectid'|| failed=`expr $failed + 1`
 
 # put that file
-echo put tmpfile | runcmd "Putting file" || failed=`expr $failed + 1`
+runcmd "Putting file" 'put tmpfile'|| failed=`expr $failed + 1`
 # get that file
 mv tmpfile tmpfile-old
-echo get tmpfile | runcmd "Getting file" || failed=`expr $failed + 1`
+runcmd "Getting file" 'get tmpfile'|| failed=`expr $failed + 1`
 # remove that file
-echo rm tmpfile | runcmd "Removing file" || failed=`expr $failed + 1`
+runcmd "Removing file" 'rm tmpfile' || failed=`expr $failed + 1`
 # compare locally
 testit "Comparing files" diff tmpfile-old tmpfile || failed=`expr $failed + 1`
 # put that file
-echo put tmpfile tmpfilex | runcmd "Putting file with different name" || failed=`expr $failed + 1`
+runcmd "Putting file with different name" 'put tmpfile tmpfilex' || failed=`expr $failed + 1`
 # get that file
-echo get tmpfilex | runcmd "Getting file again" || failed=`expr $failed + 1`
+runcmd "Getting file again" 'get tmpfilex' || failed=`expr $failed + 1`
 # compare locally
 testit "Comparing files" diff tmpfilex tmpfile || failed=`expr $failed + 1`
 # remove that file
-echo rm tmpfilex | runcmd "Removing file" || failed=`expr $failed + 1`
+runcmd "Removing file" 'rm tmpfilex'|| failed=`expr $failed + 1`
 
 # do some simple operations using old protocol versions
-echo ls | runcmd "List directory with LANMAN1" -m LANMAN1 || failed=`expr $failed + 1`
-echo ls | runcmd "List directory with LANMAN2" -m LANMAN2 || failed=`expr $failed + 1`
+runcmd "List directory with LANMAN1" 'ls' -m LANMAN1 || failed=`expr $failed + 1`
+runcmd "List directory with LANMAN2" 'ls' -m LANMAN2 || failed=`expr $failed + 1`
+
+runcmd "Print current working directory" 'pwd'|| failed=`expr $failed + 1`
+
+testit "Test login with --machine-pass without kerberos" $VALGRIND $smbclient -c 'ls' $CONFIGURATION //$SERVER/tmp --machine-pass -k no || failed=`expr $failed + 1`
+
+testit "Test login with --machine-pass and kerberos" $VALGRIND $smbclient -c 'ls' $CONFIGURATION //$SERVER/tmp --machine-pass -k yes || failed=`expr $failed + 1`
+
+(
+    echo "password=$PASSWORD"
+    echo "username=$USERNAME"
+    echo "domain=$DOMAIN"
+) > tmpauthfile
+
+testit "Test login with --authentication-file" $VALGRIND $smbclient -c 'ls' $CONFIGURATION //$SERVER/tmp --authentication-file=tmpauthfile  || failed=`expr $failed + 1`
+
+PASSWD_FILE="tmppassfile" 
+echo "$PASSWORD" > $PASSWD_FILE
+export PASSWD_FILE
+testit "Test login with PASSWD_FILE" $VALGRIND $smbclient -c 'ls' $CONFIGURATION //$SERVER/tmp -W "$DOMAIN" -U"$USERNAME" || failed=`expr $failed + 1`
+PASSWD_FILE=""
+export PASSWD_FILE
+unset PASSWD_FILE
+
+PASSWD="$PASSWORD" 
+export PASSWD
+testit "Test login with PASSWD" $VALGRIND $smbclient -c 'ls' $CONFIGURATION //$SERVER/tmp -W "$DOMAIN" -U"$USERNAME" || failed=`expr $failed + 1`
 
-rm -f tmpfile tmpfile-old tmpfilex
+oldUSER=$USER
+USER="$USERNAME" 
+export USER
+testit "Test login with USER and PASSWD" $VALGRIND $smbclient -k no -c 'ls' $CONFIGURATION //$SERVER/tmp -W "$DOMAIN" || failed=`expr $failed + 1`
+PASSWD=
+export PASSWD
+unset PASSWD
+USER=$oldUSER
+export USER
 
+rm -f tmpfile tmpfile-old tmpfilex tmpauthfile tmppassfile
 exit $failed