summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-04-24 14:07:13 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-04-24 14:07:13 +0000
commit7041e295eb1167ea4d6fe8d947efb20e1e74d15d (patch)
treec470a3adcc734ef61959c2a5e3ff9e1ff67a290c
parent77ced5915d0b6bc07d0518ca8bd4412f3ae0e30b (diff)
downloadsamba-7041e295eb1167ea4d6fe8d947efb20e1e74d15d.tar.gz
samba-7041e295eb1167ea4d6fe8d947efb20e1e74d15d.tar.bz2
samba-7041e295eb1167ea4d6fe8d947efb20e1e74d15d.zip
Revert patch - we need to try the NTLMSSP code below...
Andrew Bartlett (This used to be commit 317158972ec944742ba47b213999def9abbf7452)
-rw-r--r--source3/libads/sasl.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/source3/libads/sasl.c b/source3/libads/sasl.c
index 078ff826e3..29d4533a54 100644
--- a/source3/libads/sasl.c
+++ b/source3/libads/sasl.c
@@ -192,19 +192,14 @@ static ADS_STATUS ads_sasl_spnego_bind(ADS_STRUCT *ads)
#ifdef HAVE_KRB5
if (!(ads->auth.flags & ADS_AUTH_DISABLE_KERBEROS) &&
got_kerberos_mechanism) {
- int krb_error;
status = ads_sasl_spnego_krb5_bind(ads, principal);
if (ADS_ERR_OK(status))
return status;
-
- krb_error = ads_kinit_password(ads);
- if (krb_error) {
- return ADS_ERROR_KRB5(krb_error);
- } else {
+ if (ads_kinit_password(ads) == 0) {
status = ads_sasl_spnego_krb5_bind(ads, principal);
- if (ADS_ERR_OK(status))
- return status;
- }
+ }
+ if (ADS_ERR_OK(status))
+ return status;
}
#endif