diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-04-24 14:07:13 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-04-24 14:07:13 +0000 |
| commit | 317158972ec944742ba47b213999def9abbf7452 (patch) | |
| tree | aff52f39d10048e1e0667fdd020c206240da8a1f /source/libads | |
| parent | 984321bfab79a1ff20b504e115e94bd6270f0196 (diff) | |
| download | samba-317158972ec944742ba47b213999def9abbf7452.tar.gz samba-317158972ec944742ba47b213999def9abbf7452.tar.xz samba-317158972ec944742ba47b213999def9abbf7452.zip | |
Revert patch - we need to try the NTLMSSP code below...
Andrew Bartlett
Diffstat (limited to 'source/libads')
| -rw-r--r-- | source/libads/sasl.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/source/libads/sasl.c b/source/libads/sasl.c index 078ff826e35..29d4533a54f 100644 --- a/source/libads/sasl.c +++ b/source/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 |