mirror of
https://github.com/samba-team/samba.git
synced 2025-02-23 09:57:40 +03:00
Revert patch - we need to try the NTLMSSP code below...
Andrew Bartlett (This used to be commit 317158972ec944742ba47b213999def9abbf7452)
This commit is contained in:
parent
77ced5915d
commit
7041e295eb
@ -192,19 +192,14 @@ static ADS_STATUS ads_sasl_spnego_bind(ADS_STRUCT *ads)
|
|||||||
#ifdef HAVE_KRB5
|
#ifdef HAVE_KRB5
|
||||||
if (!(ads->auth.flags & ADS_AUTH_DISABLE_KERBEROS) &&
|
if (!(ads->auth.flags & ADS_AUTH_DISABLE_KERBEROS) &&
|
||||||
got_kerberos_mechanism) {
|
got_kerberos_mechanism) {
|
||||||
int krb_error;
|
|
||||||
status = ads_sasl_spnego_krb5_bind(ads, principal);
|
status = ads_sasl_spnego_krb5_bind(ads, principal);
|
||||||
if (ADS_ERR_OK(status))
|
if (ADS_ERR_OK(status))
|
||||||
return status;
|
return status;
|
||||||
|
if (ads_kinit_password(ads) == 0) {
|
||||||
krb_error = ads_kinit_password(ads);
|
|
||||||
if (krb_error) {
|
|
||||||
return ADS_ERROR_KRB5(krb_error);
|
|
||||||
} else {
|
|
||||||
status = ads_sasl_spnego_krb5_bind(ads, principal);
|
status = ads_sasl_spnego_krb5_bind(ads, principal);
|
||||||
if (ADS_ERR_OK(status))
|
}
|
||||||
return status;
|
if (ADS_ERR_OK(status))
|
||||||
}
|
return status;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user