From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 13 Jul 2017 13:44:53 +0000 (+0200)
Subject: auth/spnego: introduce an early goto reply: for the server in gensec_spnego_create_ne... 
X-Git-Tag: tdb-1.3.15~334
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=3042107a83c1d5e18e39ddc93deaede5610e1049

auth/spnego: introduce an early goto reply: for the server in gensec_spnego_create_negTokenInit()

This removes a useless indentation level and simplifies future patches.

Check with git show -w

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
---

diff --git a/auth/gensec/spnego.c b/auth/gensec/spnego.c
index bface127545..664591396b8 100644
--- a/auth/gensec/spnego.c
+++ b/auth/gensec/spnego.c
@@ -244,51 +244,56 @@ static NTSTATUS gensec_spnego_create_negTokenInit(struct gensec_security *gensec
 			continue;
 		}
 
+		if (spnego_state->state_position != SPNEGO_CLIENT_START) {
+			/*
+			 * The server doesn't generate an optimistic token.
+			 */
+			goto reply;
+		}
+
 		/* In the client, try and produce the first (optimistic) packet */
-		if (spnego_state->state_position == SPNEGO_CLIENT_START) {
-			nt_status = gensec_update_ev(spnego_state->sub_sec_security,
-						  out_mem_ctx, 
-						  ev,
-						  data_blob_null,
-						  &unwrapped_out);
-			if (NT_STATUS_IS_OK(nt_status)) {
-				spnego_state->sub_sec_ready = true;
-			}
+		nt_status = gensec_update_ev(spnego_state->sub_sec_security,
+					  out_mem_ctx,
+					  ev,
+					  data_blob_null,
+					  &unwrapped_out);
+		if (NT_STATUS_IS_OK(nt_status)) {
+			spnego_state->sub_sec_ready = true;
+		}
 
-			if (GENSEC_UPDATE_IS_NTERROR(nt_status)) {
-				const char *next = NULL;
-				const char *principal = NULL;
-				int dbg_level = DBGLVL_WARNING;
-
-				if (all_sec[i+1].op != NULL) {
-					next = all_sec[i+1].op->name;
-					dbg_level = DBGLVL_NOTICE;
-				}
-
-				if (gensec_security->target.principal != NULL) {
-					principal = gensec_security->target.principal;
-				} else if (gensec_security->target.service != NULL &&
-					   gensec_security->target.hostname != NULL)
-				{
-					principal = talloc_asprintf(spnego_state->sub_sec_security,
-								    "%s/%s",
-								    gensec_security->target.service,
-								    gensec_security->target.hostname);
-				} else {
-					principal = gensec_security->target.hostname;
-				}
-
-				DEBUG(dbg_level, ("SPNEGO(%s) creating NEG_TOKEN_INIT for %s failed (next[%s]): %s\n",
-					  spnego_state->sub_sec_security->ops->name,
-					  principal,
-					  next, nt_errstr(nt_status)));
+		if (GENSEC_UPDATE_IS_NTERROR(nt_status)) {
+			const char *next = NULL;
+			const char *principal = NULL;
+			int dbg_level = DBGLVL_WARNING;
 
-				/*
-				 * Pretend we never started it
-				 */
-				gensec_spnego_update_sub_abort(spnego_state);
-				continue;
+			if (all_sec[i+1].op != NULL) {
+				next = all_sec[i+1].op->name;
+				dbg_level = DBGLVL_NOTICE;
 			}
+
+			if (gensec_security->target.principal != NULL) {
+				principal = gensec_security->target.principal;
+			} else if (gensec_security->target.service != NULL &&
+				   gensec_security->target.hostname != NULL)
+			{
+				principal = talloc_asprintf(spnego_state->sub_sec_security,
+							    "%s/%s",
+							    gensec_security->target.service,
+							    gensec_security->target.hostname);
+			} else {
+				principal = gensec_security->target.hostname;
+			}
+
+			DEBUG(dbg_level, ("SPNEGO(%s) creating NEG_TOKEN_INIT for %s failed (next[%s]): %s\n",
+				  spnego_state->sub_sec_security->ops->name,
+				  principal,
+				  next, nt_errstr(nt_status)));
+
+			/*
+			 * Pretend we never started it
+			 */
+			gensec_spnego_update_sub_abort(spnego_state);
+			continue;
 		}
 
 		goto reply;