sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-01 04:58:35 +03:00
Code

r6465: Use talloc_zero for the gensec_ntlmssp_state structure, as the history

Browse Source 
of this code has too many pre-zeroed structure assumptions.

Remove unused 'stub' functions

Andrew Bartlett
(This used to be commit 78dc57c65513ba4c271308d84fc2a2a533f76061)
This commit is contained in:
Andrew Bartlett 2005-04-25 10:58:46 +00:00 committed by Gerald (Jerry) Carter
parent 8b0e09e24f
commit 9c0647ddca
2 changed files with 6 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source4/auth/ntlmssp/ntlmssp.c
View File

@ -307,7 +307,7 @@ NTSTATUS gensec_ntlmssp_start(struct gensec_security *gensec_security)
{ {
struct gensec_ntlmssp_state *gensec_ntlmssp_state; struct gensec_ntlmssp_state *gensec_ntlmssp_state;
gensec_ntlmssp_state = talloc(gensec_security, struct gensec_ntlmssp_state); gensec_ntlmssp_state = talloc_zero(gensec_security, struct gensec_ntlmssp_state);
if (!gensec_ntlmssp_state) { if (!gensec_ntlmssp_state) {
return NT_STATUS_NO_MEMORY; return NT_STATUS_NO_MEMORY;
} }

45
source4/auth/ntlmssp/ntlmssp_server.c
View File

@ -73,42 +73,6 @@ static NTSTATUS ntlmssp_set_workstation(struct gensec_ntlmssp_state *gensec_ntlm
return NT_STATUS_OK; return NT_STATUS_OK;
} }
/**
* Default challenge generation code.
*
*/
static const uint8_t *get_challenge(const struct gensec_ntlmssp_state *gensec_ntlmssp_state)
{
uint8_t *chal = talloc_size(gensec_ntlmssp_state, 8);
generate_random_buffer(chal, 8);
return chal;
}
/**
* Default 'we can set the challenge to anything we like' implementation
*
*/
static BOOL may_set_challenge(const struct gensec_ntlmssp_state *gensec_ntlmssp_state)
{
return True;
}
/**
* Default 'we can set the challenge to anything we like' implementation
*
* Does not actually do anything, as the value is always in the structure anyway.
*
*/
static NTSTATUS set_challenge(struct gensec_ntlmssp_state *gensec_ntlmssp_state, DATA_BLOB *challenge)
{
SMB_ASSERT(challenge->length == 8);
return NT_STATUS_OK;
}
/** /**
* Determine correct target name flags for reply, given server role * Determine correct target name flags for reply, given server role
* and negotiated flags * and negotiated flags
@ -295,6 +259,7 @@ static NTSTATUS ntlmssp_server_preauth(struct gensec_ntlmssp_state *gensec_ntlms
/* zero these out */ /* zero these out */
data_blob_free(&gensec_ntlmssp_state->lm_resp); data_blob_free(&gensec_ntlmssp_state->lm_resp);
data_blob_free(&gensec_ntlmssp_state->nt_resp); data_blob_free(&gensec_ntlmssp_state->nt_resp);
data_blob_free(&gensec_ntlmssp_state->encrypted_session_key);
gensec_ntlmssp_state->user = NULL; gensec_ntlmssp_state->user = NULL;
gensec_ntlmssp_state->domain = NULL; gensec_ntlmssp_state->domain = NULL;
@ -733,10 +698,6 @@ NTSTATUS gensec_ntlmssp_server_start(struct gensec_security *gensec_security)
gensec_ntlmssp_state->role = NTLMSSP_SERVER; gensec_ntlmssp_state->role = NTLMSSP_SERVER;
gensec_ntlmssp_state->get_challenge = get_challenge;
gensec_ntlmssp_state->set_challenge = set_challenge;
gensec_ntlmssp_state->may_set_challenge = may_set_challenge;
gensec_ntlmssp_state->workstation = NULL; gensec_ntlmssp_state->workstation = NULL;
gensec_ntlmssp_state->server_name = lp_netbios_name(); gensec_ntlmssp_state->server_name = lp_netbios_name();
@ -754,6 +715,10 @@ NTSTATUS gensec_ntlmssp_server_start(struct gensec_security *gensec_security)
gensec_ntlmssp_state->neg_flags = gensec_ntlmssp_state->neg_flags =
NTLMSSP_NEGOTIATE_NTLM; NTLMSSP_NEGOTIATE_NTLM;
gensec_ntlmssp_state->lm_resp = data_blob(NULL, 0);
gensec_ntlmssp_state->nt_resp = data_blob(NULL, 0);
gensec_ntlmssp_state->encrypted_session_key = data_blob(NULL, 0);
if (lp_parm_bool(-1, "ntlmssp_server", "128bit", True)) { if (lp_parm_bool(-1, "ntlmssp_server", "128bit", True)) {
gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_128; gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_128;
} }