diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-01-19 14:54:36 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-01-19 12:29:05 +0100 |
| commit | 902e18329f7f7ed7b38f0596f5a6368c7d0cd9ac (patch) | |
| tree | 52cf2af4d5244dff888637d90f32a5b535b625fe /source4 | |
| parent | b42afa0edf375c944d39a888f4db422e8d2b13cf (diff) | |
| download | samba-902e18329f7f7ed7b38f0596f5a6368c7d0cd9ac.tar.gz samba-902e18329f7f7ed7b38f0596f5a6368c7d0cd9ac.tar.bz2 samba-902e18329f7f7ed7b38f0596f5a6368c7d0cd9ac.zip | |
s4-gensec Remove special case 'for SASL' that is not required any more.
I've examined the code paths involved, and it appears an alternative
fix has been made in the ldap_server/ldap_bind.c code, and there is no
code path that uses this behaviour.
Andrew Bartlett
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/auth/gensec/gensec_gssapi.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/source4/auth/gensec/gensec_gssapi.c b/source4/auth/gensec/gensec_gssapi.c index e807f774a5..132ea7d8ae 100644 --- a/source4/auth/gensec/gensec_gssapi.c +++ b/source4/auth/gensec/gensec_gssapi.c @@ -535,19 +535,6 @@ static NTSTATUS gensec_gssapi_update(struct gensec_security *gensec_security, /* We may have been invoked as SASL, so there * is more work to do */ if (gensec_gssapi_state->sasl) { - /* Due to a very subtle interaction - * with SASL and the LDAP libs, we - * must ensure the data pointer is - * != NULL, but the length is 0. - * - * This ensures we send a 'zero - * length' (rather than NULL) response - */ - - if (!out->data) { - out->data = (uint8_t *)talloc_strdup(out_mem_ctx, "\0"); - } - gensec_gssapi_state->sasl_state = STAGE_SASL_SSF_NEG; return NT_STATUS_MORE_PROCESSING_REQUIRED; } else { |