mirror of
https://github.com/samba-team/samba.git
synced 2025-02-04 17:47:26 +03:00
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>
This commit is contained in:
parent
7d977da925
commit
7c0ea293f9
@ -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];
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user