From: Volker Lendecke <vl@samba.org>
Date: Sat, 13 Jun 2026 08:35:14 +0000 (+0200)
Subject: net dns: Move the functionality of dns_generate_keyname()
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67e69c31284ca31c2218c0286d6404846631a65a;p=thirdparty%2Fsamba.git

net dns: Move the functionality of dns_generate_keyname()

This is just a random GUID string, so I don't think we need to hide it
behind a function. python/samba/tests/dns_base.py also does it with a
plain "uuid.uuid4()".

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/lib/addns/dns.h b/lib/addns/dns.h
index 4f09cfab1d4..bc61b3b9d10 100644
--- a/lib/addns/dns.h
+++ b/lib/addns/dns.h
@@ -148,7 +148,6 @@ struct dns_buffer {
 DNS_ERROR dns_domain_name_from_string( TALLOC_CTX *mem_ctx,
 				       const char *pszDomainName,
 				       struct dns_domain_name **presult );
-char *dns_generate_keyname( TALLOC_CTX *mem_ctx );
 
 /* from dnsrecord.c */
 
diff --git a/lib/addns/dnsutils.c b/lib/addns/dnsutils.c
index d1a3173eefc..53401ebedb6 100644
--- a/lib/addns/dnsutils.c
+++ b/lib/addns/dnsutils.c
@@ -129,21 +129,3 @@ DNS_ERROR dns_domain_name_from_string( TALLOC_CTX *mem_ctx,
 	*presult = result;
 	return ERROR_DNS_SUCCESS;
 }
-
-/*********************************************************************
-*********************************************************************/
-
-char *dns_generate_keyname( TALLOC_CTX *mem_ctx )
-{
-	char *result = NULL;
-#if defined(HAVE_KRB5)
-
-	struct GUID guid;
-
-	guid = GUID_random();
-	result = GUID_string(mem_ctx, &guid);
-
-#endif
-
-	return result;
-}
diff --git a/source3/utils/net_dns.c b/source3/utils/net_dns.c
index 21cd0eb406f..51648a37c4f 100644
--- a/source3/utils/net_dns.c
+++ b/source3/utils/net_dns.c
@@ -202,7 +202,9 @@ DNS_ERROR DoDNSUpdate(const char *pszServerAddress,
 	 */
 	if (flags & DNS_UPDATE_SIGNED) {
 		struct gensec_security *gensec = NULL;
-		char *keyname = NULL;
+		struct GUID key_guid = GUID_random();
+		struct GUID_txt_buf guid_buf = {};
+		char *keyname = GUID_buf_string(&key_guid, &guid_buf);
 		struct dns_name_packet *update = NULL, *reply = NULL;
 		int ret;
 
@@ -217,11 +219,6 @@ DNS_ERROR DoDNSUpdate(const char *pszServerAddress,
 			return ERROR_DNS_NO_MEMORY;
 		}
 
-		if (!(keyname = dns_generate_keyname( mem_ctx ))) {
-			err = ERROR_DNS_NO_MEMORY;
-			goto error;
-		}
-
 		err = DoDNSUpdateNegotiateGensec(pszServerAddress,
 						 pszServerName,
 						 pszDomainName,