diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-01-11 11:36:58 +1100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-01-18 16:23:24 +0100 |
| commit | c7590979567008708af6fa9f4eba71001c404f91 (patch) | |
| tree | 104f7f22fe522105f6b5e6c107c2c018f22e790a /source3/librpc/crypto | |
| parent | 5b90bcf83bccd3462056c165d7581098c97e1b08 (diff) | |
| download | samba-c7590979567008708af6fa9f4eba71001c404f91.tar.gz | |
s3-gse remove special more_processing hook from gse
The NT_STATUS_MORE_PROCESSING_REQUIRED status code is what gensec
is expecting in any case.
Andrew Bartlett
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/librpc/crypto')
| -rw-r--r-- | source3/librpc/crypto/gse.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/source3/librpc/crypto/gse.c b/source3/librpc/crypto/gse.c index 18452cc124f..b2b08f0062e 100644 --- a/source3/librpc/crypto/gse.c +++ b/source3/librpc/crypto/gse.c @@ -86,7 +86,6 @@ struct gse_context { gss_cred_id_t delegated_cred_handle; gss_name_t client_name; - bool more_processing; bool authenticated; }; @@ -340,14 +339,11 @@ static NTSTATUS gse_get_client_auth_token(TALLOC_CTX *mem_ctx, switch (gss_maj) { case GSS_S_COMPLETE: /* we are done with it */ - gse_ctx->more_processing = false; status = NT_STATUS_OK; break; case GSS_S_CONTINUE_NEEDED: /* we will need a third leg */ - gse_ctx->more_processing = true; - /* status = NT_STATUS_MORE_PROCESSING_REQUIRED; */ - status = NT_STATUS_OK; + status = NT_STATUS_MORE_PROCESSING_REQUIRED; break; default: DEBUG(0, ("gss_init_sec_context failed with [%s]\n", @@ -490,15 +486,12 @@ static NTSTATUS gse_get_server_auth_token(TALLOC_CTX *mem_ctx, switch (gss_maj) { case GSS_S_COMPLETE: /* we are done with it */ - gse_ctx->more_processing = false; gse_ctx->authenticated = true; status = NT_STATUS_OK; break; case GSS_S_CONTINUE_NEEDED: /* we will need a third leg */ - gse_ctx->more_processing = true; - /* status = NT_STATUS_MORE_PROCESSING_REQUIRED; */ - status = NT_STATUS_OK; + status = NT_STATUS_MORE_PROCESSING_REQUIRED; break; default: DEBUG(0, ("gss_init_sec_context failed with [%s]\n", @@ -983,9 +976,6 @@ static NTSTATUS gensec_gse_update(struct gensec_security *gensec_security, if (!NT_STATUS_IS_OK(status)) { return status; } - if (gse_ctx->more_processing) { - return NT_STATUS_MORE_PROCESSING_REQUIRED; - } if (gensec_security->gensec_role == GENSEC_SERVER) { return gse_verify_server_auth_flags(gse_ctx); |