diff options
| author | Stefan Metzmacher <metze@samba.org> | 2017-07-07 07:53:29 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2017-07-25 13:51:07 +0200 |
| commit | dc074180be692d2cfe36e70edae96b1c28e1a094 (patch) | |
| tree | 740b84e9340c2227b11f9673763b169b02bc2aba /auth | |
| parent | 3903ba821b80ba9abb2c265a4e315cf6108a4501 (diff) | |
| download | samba-dc074180be692d2cfe36e70edae96b1c28e1a094.tar.gz | |
auth/spnego: simplify the error handling logic in gensec_spnego_parse_negTokenInit()
We can just use GENSEC_UPDATE_IS_NTERROR() as NT_STATUS_INVALID_PARAMETER
is mapped to NT_STATUS_MORE_PROCESSING_REQUIRED in the lines above.
Check with git show -U10
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 | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/auth/gensec/spnego.c b/auth/gensec/spnego.c index 9291332d190..cec44bc1e2b 100644 --- a/auth/gensec/spnego.c +++ b/auth/gensec/spnego.c @@ -414,9 +414,7 @@ static NTSTATUS gensec_spnego_parse_negTokenInit(struct gensec_security *gensec_ nt_status = NT_STATUS_MORE_PROCESSING_REQUIRED; } - if (!NT_STATUS_EQUAL(nt_status, NT_STATUS_INVALID_PARAMETER) - && !NT_STATUS_EQUAL(nt_status, NT_STATUS_MORE_PROCESSING_REQUIRED) - && !NT_STATUS_IS_OK(nt_status)) { + if (GENSEC_UPDATE_IS_NTERROR(nt_status)) { DEBUG(1, ("SPNEGO(%s) NEG_TOKEN_INIT failed: %s\n", spnego_state->sub_sec_security->ops->name, nt_errstr(nt_status))); @@ -428,7 +426,7 @@ static NTSTATUS gensec_spnego_parse_negTokenInit(struct gensec_security *gensec_ return nt_status; } - return nt_status; /* OK, INVALID_PARAMETER ore MORE PROCESSING */ + return nt_status; /* OK or MORE PROCESSING */ } DEBUG(1, ("SPNEGO: Could not find a suitable mechtype in NEG_TOKEN_INIT\n")); |