From: Volker Lendecke <vl@samba.org>
Date: Wed, 27 May 2026 09:01:38 +0000 (+0200)
Subject: addns: Rename struct dns_tkey_record to addns_tkey_record
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4469d114e361a3b1a0cdd27de887db5c489daee;p=thirdparty%2Fsamba.git

addns: Rename struct dns_tkey_record to addns_tkey_record

This was preventing us from including librpc/gen_ndr/dns.h along with
lib/addns/dns.h.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Anoop C S <anoopcs@samba.org>
---

diff --git a/lib/addns/dns.h b/lib/addns/dns.h
index 5c11b398ff7..6cd2d09fb2d 100644
--- a/lib/addns/dns.h
+++ b/lib/addns/dns.h
@@ -175,7 +175,7 @@ struct dns_rrec {
 	uint8_t *data;
 };
 
-struct dns_tkey_record {
+struct addns_tkey_record {
 	struct dns_domain_name *algorithm;
 	time_t inception;
 	time_t expiration;
@@ -266,7 +266,7 @@ DNS_ERROR dns_create_aaaa_record(TALLOC_CTX *mem_ctx, const char *host,
 				 uint32_t ttl, const struct sockaddr_storage *pss,
 				 struct dns_rrec **prec);
 DNS_ERROR dns_unmarshall_tkey_record(TALLOC_CTX *mem_ctx, struct dns_rrec *rec,
-				     struct dns_tkey_record **ptkey);
+				     struct addns_tkey_record **ptkey);
 DNS_ERROR dns_create_tsig_record(TALLOC_CTX *mem_ctx, const char *keyname,
 				 const char *algorithm_name,
 				 time_t time_signed, uint16_t fudge,
diff --git a/lib/addns/dnsgss.c b/lib/addns/dnsgss.c
index 8800ac24c8a..59027b34db5 100644
--- a/lib/addns/dnsgss.c
+++ b/lib/addns/dnsgss.c
@@ -99,7 +99,7 @@ static DNS_ERROR dns_negotiate_gss_ctx_int(struct dns_connection *conn,
 
 		if (NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
 			struct dns_request *resp;
-			struct dns_tkey_record *tkey;
+			struct addns_tkey_record *tkey;
 			struct dns_rrec *tkey_answer = NULL;
 			uint16_t i;
 
diff --git a/lib/addns/dnsrecord.c b/lib/addns/dnsrecord.c
index 3c5a81c9c4c..47d1ed0458f 100644
--- a/lib/addns/dnsrecord.c
+++ b/lib/addns/dnsrecord.c
@@ -260,13 +260,13 @@ DNS_ERROR dns_create_tkey_record(TALLOC_CTX *mem_ctx, const char *keyname,
 }
 
 DNS_ERROR dns_unmarshall_tkey_record(TALLOC_CTX *mem_ctx, struct dns_rrec *rec,
-				     struct dns_tkey_record **ptkey)
+				     struct addns_tkey_record **ptkey)
 {
-	struct dns_tkey_record *tkey;
+	struct addns_tkey_record *tkey;
 	struct dns_buffer buf;
 	uint32_t tmp_inception, tmp_expiration;
 	
-	if (!(tkey = talloc(mem_ctx, struct dns_tkey_record))) {
+	if (!(tkey = talloc(mem_ctx, struct addns_tkey_record))) {
 		return ERROR_DNS_NO_MEMORY;
 	}