From: Volker Lendecke <vl@samba.org>
Date: Tue, 28 May 2024 10:23:35 +0000 (+0200)
Subject: libsmb: Slightly simplify cli_session_creds_init
X-Git-Tag: tdb-1.4.11~497
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dc31a49830d6a01b177293ededa856c8d4be06ab;p=thirdparty%2Fsamba.git

libsmb: Slightly simplify cli_session_creds_init

In this case a nested if seems easier to understand to me than another
if-expression duplicating half of a previous one.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index e6efde769e1..cac2445e1eb 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -53,6 +53,7 @@ struct cli_credentials *cli_session_creds_init(TALLOC_CTX *mem_ctx,
 	struct loadparm_context *lp_ctx = NULL;
 	struct cli_credentials *creds = NULL;
 	const char *principal = NULL;
+	enum credentials_use_kerberos creds_use_krb;
 	char *tmp = NULL;
 	char *p = NULL;
 	bool ok;
@@ -118,26 +119,25 @@ struct cli_credentials *cli_session_creds_init(TALLOC_CTX *mem_ctx,
 		principal = NULL;
 	}
 
-	if (use_kerberos && fallback_after_kerberos) {
-		/*
-		 * Keep what we learned from the
-		 * "client use kerberos" option.
-		 */
-		enum credentials_use_kerberos current_krb5 =
-			cli_credentials_get_kerberos_state(creds);
-		cli_credentials_set_kerberos_state(creds,
-						   current_krb5,
-						   CRED_SPECIFIED);
-	} else if (use_kerberos) {
-		cli_credentials_set_kerberos_state(creds,
-						   CRED_USE_KERBEROS_REQUIRED,
-						   CRED_SPECIFIED);
+	if (use_kerberos) {
+		if (fallback_after_kerberos) {
+			/*
+			 * Keep what we learned from the
+			 * "client use kerberos" option.
+			 */
+			creds_use_krb = cli_credentials_get_kerberos_state(
+				creds);
+		} else {
+			creds_use_krb = CRED_USE_KERBEROS_REQUIRED;
+		}
 	} else {
-		cli_credentials_set_kerberos_state(creds,
-						   CRED_USE_KERBEROS_DISABLED,
-						   CRED_SPECIFIED);
+		creds_use_krb = CRED_USE_KERBEROS_DISABLED;
 	}
 
+	cli_credentials_set_kerberos_state(creds,
+					   creds_use_krb,
+					   CRED_SPECIFIED);
+
 	if (use_ccache) {
 		uint32_t features;