diff options
| author | Stefan Metzmacher <metze@samba.org> | 2017-07-17 20:47:57 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2017-07-25 13:51:11 +0200 |
| commit | f7f9de406a2d1a5e4fea1633c77c3907545a48a3 (patch) | |
| tree | 992ac7553453b4783ebcfb47d90a49d55d274d24 /auth | |
| parent | 9b4d44a0559e57d921e0a1c033b2ca0c35326f57 (diff) | |
| download | samba-f7f9de406a2d1a5e4fea1633c77c3907545a48a3.tar.gz | |
auth/spnego: do an early return for the success case in gensec_spnego_client_negTokenTarg()
Check with git show -w
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'auth')
| -rw-r--r-- | auth/gensec/spnego.c | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/auth/gensec/spnego.c b/auth/gensec/spnego.c index 9a2fdbdb48c..87a0791149f 100644 --- a/auth/gensec/spnego.c +++ b/auth/gensec/spnego.c @@ -841,37 +841,38 @@ static NTSTATUS gensec_spnego_client_negTokenTarg(struct gensec_security *gensec return status; } - if (sub_out.length || mech_list_mic.length) { - /* compose reply */ - spnego_out.type = SPNEGO_NEG_TOKEN_TARG; - spnego_out.negTokenTarg.negResult = SPNEGO_NONE_RESULT; - spnego_out.negTokenTarg.supportedMech = NULL; - spnego_out.negTokenTarg.responseToken = sub_out; - spnego_out.negTokenTarg.mechListMIC = mech_list_mic; - - if (spnego_write_data(out_mem_ctx, out, &spnego_out) == -1) { - DBG_WARNING("Failed to write NEG_TOKEN_TARG\n"); - return NT_STATUS_INVALID_PARAMETER; - } - - spnego_state->num_targs++; - spnego_state->state_position = SPNEGO_CLIENT_TARG; - status = NT_STATUS_MORE_PROCESSING_REQUIRED; - } else { - - /* all done - server has accepted, and we agree */ + if (sub_out.length == 0 && mech_list_mic.length == 0) { *out = data_blob_null; if (ta->negResult != SPNEGO_ACCEPT_COMPLETED) { /* unless of course it did not accept */ DBG_WARNING("gensec_update ok but not accepted\n"); - status = NT_STATUS_INVALID_PARAMETER; + return NT_STATUS_INVALID_PARAMETER; } spnego_state->state_position = SPNEGO_DONE; + return status; } - return status; + /* compose reply */ + spnego_out.type = SPNEGO_NEG_TOKEN_TARG; + spnego_out.negTokenTarg.negResult = SPNEGO_NONE_RESULT; + spnego_out.negTokenTarg.supportedMech = NULL; + spnego_out.negTokenTarg.responseToken = sub_out; + spnego_out.negTokenTarg.mechListMIC = mech_list_mic; + + if (spnego_write_data(out_mem_ctx, out, &spnego_out) == -1) { + DBG_WARNING("Failed to write NEG_TOKEN_TARG\n"); + return NT_STATUS_INVALID_PARAMETER; + } + + spnego_state->num_targs++; + + /* set next state */ + spnego_state->state_position = SPNEGO_CLIENT_TARG; + spnego_state->expected_packet = SPNEGO_NEG_TOKEN_TARG; + + return NT_STATUS_MORE_PROCESSING_REQUIRED; } /** create a server negTokenTarg |