diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-12-29 09:18:06 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:16:47 -0500 |
| commit | 0b72c04906b1c25e80b217a8f34fd3a8e756b9ca (patch) | |
| tree | b300e22329997923eea8bc3498d60a7cf1551998 /source/libads | |
| parent | e43aa4e03d8d2d3ffa3a0383b0b0835dd1a51cda (diff) | |
| download | samba-0b72c04906b1c25e80b217a8f34fd3a8e756b9ca.tar.gz | |
r20403: Cleaning out my Samba 3.0 tree:
As discussed with jerry at the CIFS conf: overriding the
administrator's wishes from the krb5.conf has only every given me
segfaults. We suggest leaving this up to the defaults from the
libraries anyway.
Andrew Bartlett
Diffstat (limited to 'source/libads')
| -rw-r--r-- | source/libads/sasl.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/source/libads/sasl.c b/source/libads/sasl.c index 7d1fd0d1a83..d1699dbab78 100644 --- a/source/libads/sasl.c +++ b/source/libads/sasl.c @@ -42,7 +42,6 @@ static ADS_STATUS ads_sasl_spnego_ntlmssp_bind(ADS_STRUCT *ads) if (!NT_STATUS_IS_OK(nt_status = ntlmssp_client_start(&ntlmssp_state))) { return ADS_ERROR_NT(nt_status); } - ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_SIGN; if (!NT_STATUS_IS_OK(nt_status = ntlmssp_set_username(ntlmssp_state, ads->auth.user_name))) { return ADS_ERROR_NT(nt_status); @@ -283,12 +282,6 @@ static ADS_STATUS ads_sasl_gssapi_bind(ADS_STRUCT *ads) ADS_STATUS status; krb5_principal principal; krb5_context ctx = NULL; - krb5_enctype enc_types[] = { -#ifdef ENCTYPE_ARCFOUR_HMAC - ENCTYPE_ARCFOUR_HMAC, -#endif - ENCTYPE_DES_CBC_MD5, - ENCTYPE_NULL}; gss_OID_desc nt_principal = {10, CONST_DISCARD(char *, "\052\206\110\206\367\022\001\002\002\002")}; @@ -301,10 +294,6 @@ static ADS_STATUS ads_sasl_gssapi_bind(ADS_STRUCT *ads) if (!ADS_ERR_OK(status)) { return status; } - status = ADS_ERROR_KRB5(krb5_set_default_tgs_ktypes(ctx, enc_types)); - if (!ADS_ERR_OK(status)) { - return status; - } status = ADS_ERROR_KRB5(smb_krb5_parse_name(ctx, sname, &principal)); if (!ADS_ERR_OK(status)) { return status; |