From 2f31063e97c35034522eb5223ed6b00ea7f76d8b Mon Sep 17 00:00:00 2001
From: Nicolas Williams <nico@twosigma.com>
Date: Thu, 11 Nov 2021 22:41:05 -0600
Subject: [PATCH] spnego: Minor style cleanup

---
 lib/gssapi/spnego/accept_sec_context.c | 29 ++++++++++++--------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/lib/gssapi/spnego/accept_sec_context.c b/lib/gssapi/spnego/accept_sec_context.c
index bc683031d..8cb4211da 100644
--- a/lib/gssapi/spnego/accept_sec_context.c
+++ b/lib/gssapi/spnego/accept_sec_context.c
@@ -456,11 +456,10 @@ select_mech(OM_uint32 *minor_status,
 	ret = acceptor_approved(minor_status, ctx, name, cred, selected_mech);
 
 	gss_release_name(&junk, &name);
-    }
-
-    /* Stash optimistic mech for use by _gss_spnego_require_mechlist_mic() */
-    if (ret == GSS_S_COMPLETE && !verify_p)
+    } else {
+        /* Stash optimistic mech for use by _gss_spnego_require_mechlist_mic() */
 	ret = gss_duplicate_oid(minor_status, &oid, &ctx->preferred_mech_type);
+    }
 
     if (ret == GSS_S_COMPLETE) {
 	*minor_status = 0;
@@ -767,7 +766,8 @@ acceptor_start
 			      1, /* not optimistic token */
 			      &advertised_mech);
 	    if (ret == GSS_S_COMPLETE) {
-		_gss_spnego_log_mech("acceptor selected non-opportunistic mech", ctx->selected_mech_type);
+		_gss_spnego_log_mech("acceptor selected non-opportunistic mech",
+                                     ctx->selected_mech_type);
 		break;
 	    }
 	}
@@ -778,17 +778,14 @@ acceptor_start
         goto out;
     }
 
-    /*
-     * The initial token always have a response
-     */
-
-    ret = send_accept (minor_status,
-		       ctx,
-		       first_ok,
-		       &mech_output_token,
-		       advertised_mech,
-		       get_mic ? &ctx->NegTokenInit_mech_types : NULL,
-		       output_token);
+    /* The initial token always has a response */
+    ret = send_accept(minor_status,
+		      ctx,
+		      first_ok,
+		      &mech_output_token,
+		      advertised_mech,
+		      get_mic ? &ctx->NegTokenInit_mech_types : NULL,
+		      output_token);
     if (ret)
 	goto out;