diff options
| author | Stefan Metzmacher <metze@samba.org> | 2010-01-05 17:51:53 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-03-24 17:34:52 +0100 |
| commit | a42cad635f781d76637c04c170f0ad59d8d10269 (patch) | |
| tree | db28bd2f48598ad79c15f3c59b1c6bc986256413 | |
| parent | d3e7266676f3516c4d5493d11cf75099365b69dc (diff) | |
| download | samba-a42cad635f781d76637c04c170f0ad59d8d10269.tar.gz samba-a42cad635f781d76637c04c170f0ad59d8d10269.tar.bz2 samba-a42cad635f781d76637c04c170f0ad59d8d10269.zip | |
s4:ntlmssp: remove unused server_multiple_authentications feature.
metze
Signed-off-by: Günther Deschner <gd@samba.org>
| -rw-r--r-- | source4/auth/ntlmssp/ntlmssp.h | 3 | ||||
| -rw-r--r-- | source4/auth/ntlmssp/ntlmssp_server.c | 12 |
2 files changed, 1 insertions, 14 deletions
diff --git a/source4/auth/ntlmssp/ntlmssp.h b/source4/auth/ntlmssp/ntlmssp.h index 374a221a9c..fe1e65bdbb 100644 --- a/source4/auth/ntlmssp/ntlmssp.h +++ b/source4/auth/ntlmssp/ntlmssp.h @@ -56,9 +56,6 @@ struct ntlmssp_state bool allow_lm_key; /* The LM_KEY code is not functional at this point, and it's not very secure anyway */ - bool server_multiple_authentications; /* Set to 'True' to allow squid 2.5 - style 'challenge caching' */ - const char *user; const char *domain; const char *workstation; diff --git a/source4/auth/ntlmssp/ntlmssp_server.c b/source4/auth/ntlmssp/ntlmssp_server.c index 537cf6d383..9d6a897c69 100644 --- a/source4/auth/ntlmssp/ntlmssp_server.c +++ b/source4/auth/ntlmssp/ntlmssp_server.c @@ -511,16 +511,8 @@ static NTSTATUS ntlmssp_server_postauth(struct gensec_security *gensec_security, } data_blob_free(&ntlmssp_state->encrypted_session_key); - - /* allow arbitarily many authentications, but watch that this will cause a - memory leak, until the ntlmssp_state is shutdown - */ - if (ntlmssp_state->server_multiple_authentications) { - ntlmssp_state->expected_state = NTLMSSP_AUTH; - } else { - ntlmssp_state->expected_state = NTLMSSP_DONE; - } + ntlmssp_state->expected_state = NTLMSSP_DONE; return nt_status; } @@ -758,8 +750,6 @@ NTSTATUS gensec_ntlmssp_server_start(struct gensec_security *gensec_security) ntlmssp_state->allow_lm_key = (lp_lanman_auth(gensec_security->settings->lp_ctx) && gensec_setting_bool(gensec_security->settings, "ntlmssp_server", "allow_lm_key", false)); - ntlmssp_state->server_multiple_authentications = false; - ntlmssp_state->neg_flags = NTLMSSP_NEGOTIATE_NTLM | NTLMSSP_NEGOTIATE_VERSION; |