diff options
| author | Andreas Schneider <asn@samba.org> | 2015-04-22 15:19:10 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2017-04-29 23:31:09 +0200 |
| commit | bec3a18999535fa58aafdce76539859c473b309e (patch) | |
| tree | 6c34d74543d7c76031bf3efc817ec7fd49b01adb | |
| parent | 612714d109e25df597b7ef8ad2b8c4b9ef00ed71 (diff) | |
| download | samba-bec3a18999535fa58aafdce76539859c473b309e.tar.gz | |
testprogs: Fix test_chgdcpass blackbox test with MIT
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlet <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
| -rwxr-xr-x | testprogs/blackbox/test_chgdcpass.sh | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/testprogs/blackbox/test_chgdcpass.sh b/testprogs/blackbox/test_chgdcpass.sh index 120f0024cff..3830cb4e31d 100755 --- a/testprogs/blackbox/test_chgdcpass.sh +++ b/testprogs/blackbox/test_chgdcpass.sh @@ -25,7 +25,9 @@ samba4bindir="$BINDIR" samba4srcdir="$SRCDIR/source4" samba4kinit=kinit +heimdal=0 if test -x $BINDIR/samba4kinit; then + heimdal=1 samba4kinit=bin/samba4kinit fi @@ -59,7 +61,12 @@ enctype="-e $ENCTYPE" KRB5CCNAME="$PREFIX/tmpccache" export KRB5CCNAME rm -f $KRB5CCNAME -testit "kinit with keytab" $samba4kinit $enctype -t $PROVDIR/private/secrets.keytab --use-keytab $USERNAME || failed=`expr $failed + 1` + +if [ $heimdal -eq 1 ]; then + testit "kinit with keytab" $samba4kinit $enctype -t $PROVDIR/private/secrets.keytab --use-keytab $USERNAME || failed=`expr $failed + 1` +else + testit "kinit with keytab" $samba4kinit -k -t $PROVDIR/private/secrets.keytab $USERNAME || failed=`expr $failed + 1` +fi #This is important because it puts the ticket for the old KVNO and password into a local ccache test_smbclient "Test login with kerberos ccache before password change" 'ls' "$unc" -k yes || failed=`expr $failed + 1` @@ -94,8 +101,13 @@ test_drs bind "Test drs bind after 2nd password change" || failed=`expr $failed test_drs options "Test drs options after 2nd password change" || failed=`expr $failed + 1` #This confirms that the DC password is valid for a kinit too -testit "kinit with keytab" $samba4kinit $enctype -t $PROVDIR/private/secrets.keytab --use-keytab $USERNAME || failed=`expr $failed + 1` +if [ $heimdal -eq 1 ]; then + testit "kinit with keytab" $samba4kinit $enctype -t $PROVDIR/private/secrets.keytab --use-keytab $USERNAME || failed=`expr $failed + 1` +else + testit "kinit with keytab" $samba4kinit -k -t $PROVDIR/private/secrets.keytab $USERNAME || failed=`expr $failed + 1` +fi test_smbclient "Test login with kerberos ccache with fresh kinit" 'ls' "$unc" -k yes || failed=`expr $failed + 1` + rm -f $KRB5CCNAME rm -f $PREFIX/tmpccache tmpccfile tmppassfile tmpuserpassfile tmpuserccache tmpkpasswdscript |