s4:ntlmssp: remove server_name from (gensec_)ntlmssp_state and fill the server.*...

Inspired by the NTLMSSP merge work by Andrew Bartlett.

metze

Signed-off-by: Günther Deschner <gd@samba.org>

diff --git a/source4/auth/ntlmssp/ntlmssp.h b/source4/auth/ntlmssp/ntlmssp.h
index b415dba9c0fe7b8adaabf480b1ba6259b4b9f05b..09bab8674090d3dac92ad6b432300923731f592e 100644 (file)
--- 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 259f07fe00269cbe6c127dfee1918e678cc082e4..cdd377b2bc4e9ca62e28c70f5951c715617d8c45 100644 (file)
--- 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);