diff options
| author | Andreas Schneider <asn@samba.org> | 2016-09-13 08:24:41 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2017-04-29 23:31:08 +0200 |
| commit | 9fee64d0e658ad3690c539fa68de4e29081b6840 (patch) | |
| tree | b5be92c3d78cc7635c2e7e5aa4d9b16bc79c960c /source3/script | |
| parent | 31491f8bb407ebe5dd976b6d1cad3d7d31080bd4 (diff) | |
| download | samba-9fee64d0e658ad3690c539fa68de4e29081b6840.tar.gz | |
s3-tests: Use common functions in test_smbclient_netbios_aliases.sh
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlet <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/script')
| -rwxr-xr-x | source3/script/tests/test_smbclient_netbios_aliases.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source3/script/tests/test_smbclient_netbios_aliases.sh b/source3/script/tests/test_smbclient_netbios_aliases.sh index 610eeda5ab6..fe42c93e8fe 100755 --- a/source3/script/tests/test_smbclient_netbios_aliases.sh +++ b/source3/script/tests/test_smbclient_netbios_aliases.sh @@ -7,7 +7,7 @@ EOF exit 1; fi -SMBCLIENT3=$1 +smbclient=$1 SERVER=$2 USERNAME=$3 PASSWORD=$4 @@ -15,11 +15,11 @@ PREFIX=$5 shift 5 ADDARGS="$*" -samba4bindir="$BINDIR" -samba4srcdir="$SRCDIR/source4" -samba4kinit=kinit -if test -x $BINDIR/samba4kinit; then - samba4kinit=$BINDIR/samba4kinit +samba_bindir="$BINDIR" +samba_srcdir="$SRCDIR/source4" +samba_kinit=kinit +if test -x ${samba_bindir}/samba4kinit; then + samba_kinit=${samba_bindir}/samba4kinit fi KRB5CCNAME_PATH="$PREFIX/test_smbclient_netbios_aliases_krb5ccache" @@ -30,11 +30,11 @@ export KRB5CCNAME incdir=`dirname $0`/../../../testprogs/blackbox . $incdir/subunit.sh +. $incdir/common_test_fns.inc -echo $PASSWORD > $PREFIX/tmppassfile -testit "kinit" $samba4kinit --password-file=$PREFIX/tmppassfile $USERNAME || failed=`expr $failed + 1` -rm -f $PREFIX/tmppassfile -testit "smbclient" $VALGRIND $SMBCLIENT3 -k //$SERVER/tmp -c 'ls' $ADDARGS || failed=`expr $failed + 1` +testit "kinit" kerberos_kinit ${samba_kinit} ${USERNAME} ${PASSWORD} + +test_smbclient "smbclient (krb5)" "ls" "//$SERVER/tmp" -k || failed=`expr $failed + 1` rm -rf $KRB5CCNAME_PATH |