summaryrefslogtreecommitdiff
path: root/source3/libads
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2002-11-10 00:35:04 +0000
committerAndrew Tridgell <tridge@samba.org>2002-11-10 00:35:04 +0000
commita46d452926cea70bb59ba470cfc5cb2cde88c027 (patch)
tree66355011eef7fccd7072fd06c220f0bf813fce9e /source3/libads
parenta0dd6128bfb73a3078a2686a1998b7fbd541ca6c (diff)
downloadsamba-a46d452926cea70bb59ba470cfc5cb2cde88c027.tar.gz
samba-a46d452926cea70bb59ba470cfc5cb2cde88c027.tar.bz2
samba-a46d452926cea70bb59ba470cfc5cb2cde88c027.zip
make sure that if kerberos fails we can fall back on NTLMSSP for SASL
(This used to be commit 69dba08c40c9739137b4f01d38be5228edc6dd6e)
Diffstat (limited to 'source3/libads')
-rw-r--r--source3/libads/sasl.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/source3/libads/sasl.c b/source3/libads/sasl.c
index dacf8f7da8..16ad397d0e 100644
--- a/source3/libads/sasl.c
+++ b/source3/libads/sasl.c
@@ -196,8 +196,11 @@ static ADS_STATUS ads_sasl_spnego_bind(ADS_STRUCT *ads)
status = ads_sasl_spnego_krb5_bind(ads, principal);
if (ADS_ERR_OK(status))
return status;
- if (ads_kinit_password(ads) == 0)
- return ads_sasl_spnego_krb5_bind(ads, principal);
+ if (ads_kinit_password(ads) == 0) {
+ status = ads_sasl_spnego_krb5_bind(ads, principal);
+ }
+ if (ADS_ERR_OK(status))
+ return status;
}
#endif