From 36669bfcf1d1ea9f0ec63280b85f3cb356dc10c1 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 30 Dec 2009 15:00:02 +0100 Subject: s4:ntlmssp: remove server_name from (gensec_)ntlmssp_state and fill the server.* fields also for the client MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Inspired by the NTLMSSP merge work by Andrew Bartlett. metze Signed-off-by: Günther Deschner --- source4/auth/ntlmssp/ntlmssp.h | 1 - source4/auth/ntlmssp/ntlmssp_client.c | 11 ++++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'source4/auth/ntlmssp') diff --git a/source4/auth/ntlmssp/ntlmssp.h b/source4/auth/ntlmssp/ntlmssp.h index b415dba9c0..09bab86740 100644 --- a/source4/auth/ntlmssp/ntlmssp.h +++ b/source4/auth/ntlmssp/ntlmssp.h @@ -62,7 +62,6 @@ struct gensec_ntlmssp_state char *user; const char *domain; const char *workstation; - char *server_domain; struct { bool is_standalone; diff --git a/source4/auth/ntlmssp/ntlmssp_client.c b/source4/auth/ntlmssp/ntlmssp_client.c index 259f07fe00..cdd377b2bc 100644 --- a/source4/auth/ntlmssp/ntlmssp_client.c +++ b/source4/auth/ntlmssp/ntlmssp_client.c @@ -178,7 +178,16 @@ NTSTATUS ntlmssp_client_challenge(struct gensec_security *gensec_security, return NT_STATUS_INVALID_PARAMETER; } - gensec_ntlmssp_state->server_domain = server_domain; + if (chal_flags & NTLMSSP_TARGET_TYPE_SERVER) { + gensec_ntlmssp_state->server.is_standalone = true; + } else { + gensec_ntlmssp_state->server.is_standalone = false; + } + /* TODO: parse struct_blob and fill in the rest */ + gensec_ntlmssp_state->server.netbios_name = ""; + gensec_ntlmssp_state->server.netbios_domain = server_domain; + gensec_ntlmssp_state->server.dns_name = ""; + gensec_ntlmssp_state->server.dns_domain = ""; if (challenge_blob.length != 8) { talloc_free(mem_ctx); -- cgit