The branch, master has been updated via 1930781 s4-librpc: Remove unused new_ev via b6ba8bd auth/ntlmssp: Remove reference to struct ntlmssp_state via 239c7a3 auth/ntlmssp: Remove gensec_security element from gensec_ntlmssp_state from b42825f selftest: mark samba3.smb2.session tests as knownfail instead of skip
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 193078117d09732fa9c812303f505e59cc047c2b Author: Andrew Bartlett <abart...@samba.org> Date: Fri Mar 9 15:30:00 2012 +1100 s4-librpc: Remove unused new_ev Autobuild-User: Andrew Bartlett <abart...@samba.org> Autobuild-Date: Fri Mar 9 07:18:45 CET 2012 on sn-devel-104 commit b6ba8bdac33166bb864bbc9d98c5086cb7f9c969 Author: Andrew Bartlett <abart...@samba.org> Date: Fri Mar 9 14:29:55 2012 +1100 auth/ntlmssp: Remove reference to struct ntlmssp_state commit 239c7a355c2caec095e649ec3ccb7102fe93de67 Author: Andrew Bartlett <abart...@samba.org> Date: Fri Mar 9 14:28:46 2012 +1100 auth/ntlmssp: Remove gensec_security element from gensec_ntlmssp_state This just means there is one less pointer to ensure we initialise. Andrew Bartlett ----------------------------------------------------------------------- Summary of changes: auth/ntlmssp/gensec_ntlmssp.c | 2 -- auth/ntlmssp/ntlmssp.c | 6 +++--- auth/ntlmssp/ntlmssp_private.h | 1 - auth/ntlmssp/ntlmssp_server.c | 11 +++-------- source3/libsmb/ntlmssp_wrap.c | 6 +++--- source4/librpc/rpc/dcerpc_connect.c | 3 --- 6 files changed, 9 insertions(+), 20 deletions(-) Changeset truncated at 500 lines: diff --git a/auth/ntlmssp/gensec_ntlmssp.c b/auth/ntlmssp/gensec_ntlmssp.c index 9cbd6e1..9e1d8a8 100644 --- a/auth/ntlmssp/gensec_ntlmssp.c +++ b/auth/ntlmssp/gensec_ntlmssp.c @@ -114,8 +114,6 @@ NTSTATUS gensec_ntlmssp_start(struct gensec_security *gensec_security) return NT_STATUS_NO_MEMORY; } - gensec_ntlmssp->gensec_security = gensec_security; - gensec_security->private_data = gensec_ntlmssp; return NT_STATUS_OK; } diff --git a/auth/ntlmssp/ntlmssp.c b/auth/ntlmssp/ntlmssp.c index ad2a312..1a2d662 100644 --- a/auth/ntlmssp/ntlmssp.c +++ b/auth/ntlmssp/ntlmssp.c @@ -62,10 +62,10 @@ static const struct ntlmssp_callbacks { }; -static NTSTATUS gensec_ntlmssp_update_find(struct gensec_ntlmssp_context *gensec_ntlmssp, +static NTSTATUS gensec_ntlmssp_update_find(struct gensec_security *gensec_security, + struct gensec_ntlmssp_context *gensec_ntlmssp, const DATA_BLOB input, uint32_t *idx) { - struct gensec_security *gensec_security = gensec_ntlmssp->gensec_security; uint32_t ntlmssp_command; uint32_t i; @@ -156,7 +156,7 @@ NTSTATUS gensec_ntlmssp_update(struct gensec_security *gensec_security, out_mem_ctx = ntlmssp_state; } - status = gensec_ntlmssp_update_find(gensec_ntlmssp, input, &i); + status = gensec_ntlmssp_update_find(gensec_security, gensec_ntlmssp, input, &i); NT_STATUS_NOT_OK_RETURN(status); status = ntlmssp_callbacks[i].sync_fn(gensec_security, out_mem_ctx, input, out); diff --git a/auth/ntlmssp/ntlmssp_private.h b/auth/ntlmssp/ntlmssp_private.h index cd9f9db..778d638 100644 --- a/auth/ntlmssp/ntlmssp_private.h +++ b/auth/ntlmssp/ntlmssp_private.h @@ -43,7 +43,6 @@ union ntlmssp_crypt_state { struct gensec_ntlmssp_context { /* For GENSEC users */ - struct gensec_security *gensec_security; void *server_returned_info; /* used by both client and server implementation */ diff --git a/auth/ntlmssp/ntlmssp_server.c b/auth/ntlmssp/ntlmssp_server.c index 03e3703..bb86c9c 100644 --- a/auth/ntlmssp/ntlmssp_server.c +++ b/auth/ntlmssp/ntlmssp_server.c @@ -426,7 +426,7 @@ static NTSTATUS ntlmssp_server_check_password(struct gensec_security *gensec_sec DATA_BLOB *user_session_key, DATA_BLOB *lm_session_key) { struct ntlmssp_state *ntlmssp_state = gensec_ntlmssp->ntlmssp_state; - struct auth4_context *auth_context = gensec_ntlmssp->gensec_security->auth_context; + struct auth4_context *auth_context = gensec_security->auth_context; NTSTATUS nt_status = NT_STATUS_NOT_IMPLEMENTED; struct auth_usersupplied_info *user_info; @@ -441,7 +441,7 @@ static NTSTATUS ntlmssp_server_check_password(struct gensec_security *gensec_sec user_info->client.account_name = ntlmssp_state->user; user_info->client.domain_name = ntlmssp_state->domain; user_info->workstation_name = ntlmssp_state->client.netbios_name; - user_info->remote_host = gensec_get_remote_address(gensec_ntlmssp->gensec_security); + user_info->remote_host = gensec_get_remote_address(gensec_security); user_info->password_state = AUTH_PASSWORD_RESPONSE; user_info->password.response.lanman = ntlmssp_state->lm_resp; @@ -624,14 +624,13 @@ NTSTATUS gensec_ntlmssp_server_auth(struct gensec_security *gensec_security, struct gensec_ntlmssp_context *gensec_ntlmssp = talloc_get_type_abort(gensec_security->private_data, struct gensec_ntlmssp_context); - struct ntlmssp_state *ntlmssp_state = gensec_ntlmssp->ntlmssp_state; struct ntlmssp_server_auth_state *state; NTSTATUS nt_status; /* zero the outbound NTLMSSP packet */ *out = data_blob_null; - state = talloc_zero(ntlmssp_state, struct ntlmssp_server_auth_state); + state = talloc_zero(gensec_ntlmssp, struct ntlmssp_server_auth_state); if (state == NULL) { return NT_STATUS_NO_MEMORY; } @@ -655,10 +654,6 @@ NTSTATUS gensec_ntlmssp_server_auth(struct gensec_security *gensec_security, &state->user_session_key, &state->lm_session_key); if (!NT_STATUS_IS_OK(nt_status)) { - DEBUG(5,("%s: Checking NTLMSSP password for %s\\%s failed: %s\n", - __location__, - ntlmssp_state->domain, ntlmssp_state->user, - nt_errstr(nt_status))); TALLOC_FREE(state); return nt_status; } diff --git a/source3/libsmb/ntlmssp_wrap.c b/source3/libsmb/ntlmssp_wrap.c index c0b1307..9ce4b12 100644 --- a/source3/libsmb/ntlmssp_wrap.c +++ b/source3/libsmb/ntlmssp_wrap.c @@ -93,13 +93,13 @@ static NTSTATUS gensec_ntlmssp3_client_start(struct gensec_security *gensec_secu return nt_status; } - if (gensec_ntlmssp->gensec_security->want_features & GENSEC_FEATURE_SESSION_KEY) { + if (gensec_security->want_features & GENSEC_FEATURE_SESSION_KEY) { gensec_ntlmssp->ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SIGN; } - if (gensec_ntlmssp->gensec_security->want_features & GENSEC_FEATURE_SIGN) { + if (gensec_security->want_features & GENSEC_FEATURE_SIGN) { gensec_ntlmssp->ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SIGN; } - if (gensec_ntlmssp->gensec_security->want_features & GENSEC_FEATURE_SEAL) { + if (gensec_security->want_features & GENSEC_FEATURE_SEAL) { gensec_ntlmssp->ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SIGN; gensec_ntlmssp->ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SEAL; } diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c index 634e3f4..8cf60e6 100644 --- a/source4/librpc/rpc/dcerpc_connect.c +++ b/source4/librpc/rpc/dcerpc_connect.c @@ -733,15 +733,12 @@ _PUBLIC_ struct composite_context* dcerpc_pipe_connect_b_send(TALLOC_CTX *parent { struct composite_context *c; struct pipe_connect_state *s; - struct tevent_context *new_ev = NULL; /* composite context allocation and setup */ c = composite_create(parent_ctx, ev); if (c == NULL) { - talloc_free(new_ev); return NULL; } - talloc_steal(c, new_ev); s = talloc_zero(c, struct pipe_connect_state); if (composite_nomem(s, c)) return c; -- Samba Shared Repository