summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-12-30 14:17:51 +0100
committerGünther Deschner <gd@samba.org>2010-03-24 17:34:55 +0100
commit7c0ea293f93eb19de56ae3c642fa3e78a2b50096 (patch)
tree4a4c3039654567533aecd30c14d241dcfd8b00aa /source3
parent7d977da92554c34539a475feb7dcb0a6dc0ad654 (diff)
downloadsamba-7c0ea293f93eb19de56ae3c642fa3e78a2b50096.tar.gz
samba-7c0ea293f93eb19de56ae3c642fa3e78a2b50096.tar.bz2
samba-7c0ea293f93eb19de56ae3c642fa3e78a2b50096.zip
s3:ntlmssp: remove unused get_global_myname() and get_domain() from ntlmssp_state
Inspired by the NTLMSSP merge work by Andrew Bartlett. metze Signed-off-by: Günther Deschner <gd@samba.org>
Diffstat (limited to 'source3')
-rw-r--r--source3/include/ntlmssp.h3
-rw-r--r--source3/libsmb/ntlmssp.c8
-rw-r--r--source3/utils/ntlm_auth.c4
3 files changed, 0 insertions, 15 deletions
diff --git a/source3/include/ntlmssp.h b/source3/include/ntlmssp.h
index afed1901e5..0cf44885e5 100644
--- a/source3/include/ntlmssp.h
+++ b/source3/include/ntlmssp.h
@@ -125,9 +125,6 @@ struct ntlmssp_state
*/
NTSTATUS (*check_password)(struct ntlmssp_state *ntlmssp_state, DATA_BLOB *nt_session_key, DATA_BLOB *lm_session_key);
- const char *(*get_global_myname)(void);
- const char *(*get_domain)(void);
-
/* ntlmv2 */
unsigned char send_sign_key[16];
diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c
index e2bf4f2247..1ca9810b5d 100644
--- a/source3/libsmb/ntlmssp.c
+++ b/source3/libsmb/ntlmssp.c
@@ -941,10 +941,6 @@ NTSTATUS ntlmssp_server_start(TALLOC_CTX *mem_ctx,
return NT_STATUS_NO_MEMORY;
}
- /* TODO: remove this */
- ntlmssp_state->get_global_myname = global_myname;
- ntlmssp_state->get_domain = lp_workgroup;
-
*_ntlmssp_state = ntlmssp_state;
return NT_STATUS_OK;
}
@@ -1358,10 +1354,6 @@ NTSTATUS ntlmssp_client_start(TALLOC_CTX *mem_ctx,
return NT_STATUS_NO_MEMORY;
}
- /* TODO: remove this */
- ntlmssp_state->get_global_myname = global_myname;
- ntlmssp_state->get_domain = lp_workgroup;
-
*_ntlmssp_state = ntlmssp_state;
return NT_STATUS_OK;
}
diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index 929c11f5a9..226772eba8 100644
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -729,12 +729,8 @@ static NTSTATUS ntlm_auth_start_ntlmssp_server(struct ntlmssp_state **ntlmssp_st
/* Have we been given a local password, or should we ask winbind? */
if (opt_password) {
(*ntlmssp_state)->check_password = local_pw_check;
- (*ntlmssp_state)->get_domain = lp_workgroup;
- (*ntlmssp_state)->get_global_myname = global_myname;
} else {
(*ntlmssp_state)->check_password = winbind_pw_check;
- (*ntlmssp_state)->get_domain = get_winbind_domain;
- (*ntlmssp_state)->get_global_myname = get_winbind_netbios_name;
}
return NT_STATUS_OK;
}