From: Volker Lendecke <vl@samba.org>
Date: Wed, 29 May 2024 15:11:51 +0000 (+0200)
Subject: gensec: Simplify gensec_security_by_fn()
X-Git-Tag: tdb-1.4.11~490
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5c736ffe35408a6344e5c4c4ae57b89e09e51918;p=thirdparty%2Fsamba.git

gensec: Simplify gensec_security_by_fn()

We don't need that intermediate talloc ctx, we only allocate backends
and don't pass it anywhere else.

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

diff --git a/auth/gensec/gensec_start.c b/auth/gensec/gensec_start.c
index 23e6e170ecd..05d0d3cf7a7 100644
--- a/auth/gensec/gensec_start.c
+++ b/auth/gensec/gensec_start.c
@@ -192,16 +192,9 @@ static const struct gensec_security_ops *gensec_security_by_fn(
 {
 	size_t i;
 	const struct gensec_security_ops **backends = NULL;
-	TALLOC_CTX *mem_ctx = NULL;
 
-	mem_ctx = talloc_new(gensec_security);
-	if (!mem_ctx) {
-		return NULL;
-	}
-
-	backends = gensec_security_mechs(gensec_security, mem_ctx);
+	backends = gensec_security_mechs(gensec_security, gensec_security);
 	if (backends == NULL) {
-		TALLOC_FREE(mem_ctx);
 		return NULL;
 	}
 
@@ -211,12 +204,12 @@ static const struct gensec_security_ops *gensec_security_by_fn(
 
 		ok = fn(backend, private_data);
 		if (ok) {
-			TALLOC_FREE(mem_ctx);
+			TALLOC_FREE(backends);
 			return backend;
 		}
 	}
 
-	TALLOC_FREE(mem_ctx);
+	TALLOC_FREE(backends);
 	return NULL;
 }