summaryrefslogtreecommitdiff
path: root/source4/auth/ntlmssp
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-12-30 15:00:02 +0100
committerGünther Deschner <gd@samba.org>2010-03-24 17:34:51 +0100
commit36669bfcf1d1ea9f0ec63280b85f3cb356dc10c1 (patch)
tree495ad9e0847727ab161aaa76166fdb180bec111d /source4/auth/ntlmssp
parent282a2d8591a9132dac1d70113a7e51287d3c1674 (diff)
downloadsamba-36669bfcf1d1ea9f0ec63280b85f3cb356dc10c1.tar.gz
samba-36669bfcf1d1ea9f0ec63280b85f3cb356dc10c1.tar.bz2
samba-36669bfcf1d1ea9f0ec63280b85f3cb356dc10c1.zip
s4:ntlmssp: remove server_name from (gensec_)ntlmssp_state and fill the server.* fields also for the client
Inspired by the NTLMSSP merge work by Andrew Bartlett. metze Signed-off-by: Günther Deschner <gd@samba.org>
Diffstat (limited to 'source4/auth/ntlmssp')
-rw-r--r--source4/auth/ntlmssp/ntlmssp.h1
-rw-r--r--source4/auth/ntlmssp/ntlmssp_client.c11
2 files changed, 10 insertions, 2 deletions
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);