From 7041e295eb1167ea4d6fe8d947efb20e1e74d15d Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 24 Apr 2003 14:07:13 +0000 Subject: Revert patch - we need to try the NTLMSSP code below... Andrew Bartlett (This used to be commit 317158972ec944742ba47b213999def9abbf7452) --- source3/libads/sasl.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'source3/libads') 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 -- cgit