From: Volker Lendecke <vl@samba.org>
Date: Fri, 27 May 2022 18:57:53 +0000 (+0200)
Subject: lsa_server4: Simplify get_tdo() with talloc_asprintf_addbuf()
X-Git-Tag: talloc-2.3.4~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=540d4ae6b99278e1346caab6ac2bbabd29492222;p=thirdparty%2Fsamba.git

lsa_server4: Simplify get_tdo() with talloc_asprintf_addbuf()

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index 8861cf95af8..185e0044de1 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -1684,47 +1684,32 @@ static NTSTATUS get_tdo(struct ldb_context *sam, TALLOC_CTX *mem_ctx,
 		filter = talloc_strdup(mem_ctx,
 				       "(objectclass=trustedDomain)");
 	}
-	if (!filter) {
-		return NT_STATUS_NO_MEMORY;
-	}
 
 	if (dns_domain) {
 		dns = ldb_binary_encode_string(mem_ctx, dns_domain);
 		if (!dns) {
 			return NT_STATUS_NO_MEMORY;
 		}
-		filter = talloc_asprintf_append(filter,
-						"(trustPartner=%s)", dns);
-		if (!filter) {
-			return NT_STATUS_NO_MEMORY;
-		}
+		talloc_asprintf_addbuf(&filter, "(trustPartner=%s)", dns);
 	}
 	if (netbios) {
 		nbn = ldb_binary_encode_string(mem_ctx, netbios);
 		if (!nbn) {
 			return NT_STATUS_NO_MEMORY;
 		}
-		filter = talloc_asprintf_append(filter,
-						"(flatname=%s)", nbn);
-		if (!filter) {
-			return NT_STATUS_NO_MEMORY;
-		}
+		talloc_asprintf_addbuf(&filter, "(flatname=%s)", nbn);
 	}
 	if (sid) {
 		struct dom_sid_buf buf;
 		char *sidstr = dom_sid_str_buf(sid, &buf);
-		filter = talloc_asprintf_append(filter,
-						"(securityIdentifier=%s)",
-						sidstr);
-		if (!filter) {
-			return NT_STATUS_NO_MEMORY;
-		}
+		talloc_asprintf_addbuf(
+			&filter, "(securityIdentifier=%s)", sidstr);
 	}
 	if (dns_domain || netbios || sid) {
-		filter = talloc_asprintf_append(filter, "))");
-		if (!filter) {
-			return NT_STATUS_NO_MEMORY;
-		}
+		talloc_asprintf_addbuf(&filter, "))");
+	}
+	if (filter == NULL) {
+		return NT_STATUS_NO_MEMORY;
 	}
 
 	ret = gendb_search(sam, mem_ctx, basedn, msgs, attrs, "%s", filter);