From: Volker Lendecke <vl@samba.org>
Date: Tue, 31 Mar 2026 18:07:41 +0000 (+0200)
Subject: lib/addns: Avoid DNS_CLASS defines, use idl defines
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ecf05e1d60439ae493d467ca4463a948c1e76e5;p=thirdparty%2Fsamba.git

lib/addns: Avoid DNS_CLASS defines, use idl defines

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 875d8d34dfa..e0842cd56a2 100644
--- a/lib/addns/dns.h
+++ b/lib/addns/dns.h
@@ -49,12 +49,6 @@
 #define DNS_TCP			1
 #define DNS_UDP			2
 
-/* DNS Class Types */
-
-#define DNS_CLASS_IN		1
-#define DNS_CLASS_ANY		255
-#define DNS_CLASS_NONE		254
-
 #define DNS_TCP_PORT		53
 #define DNS_UDP_PORT		53
 
diff --git a/lib/addns/dnsgss.c b/lib/addns/dnsgss.c
index 9a6ed3e079a..f06ae0b52e2 100644
--- a/lib/addns/dnsgss.c
+++ b/lib/addns/dnsgss.c
@@ -61,7 +61,7 @@ DNS_ERROR dns_negotiate_sec_ctx(const char *serveraddress,
 			struct dns_res_rec tkey = {
 				.name = keyname,
 				.rr_type = QTYPE_TKEY,
-				.rr_class = DNS_CLASS_ANY,
+				.rr_class = DNS_QCLASS_ANY,
 				.length = 1,
 				.rdata.tkey_record
 					.algorithm = "gss.microsoft.com",
@@ -73,7 +73,7 @@ DNS_ERROR dns_negotiate_sec_ctx(const char *serveraddress,
 			};
 			struct dns_name_question question = {
 				.name = keyname,
-				.question_class = DNS_CLASS_IN,
+				.question_class = DNS_QCLASS_IN,
 				.question_type = QTYPE_TKEY,
 			};
 			struct dns_name_packet rec = {
diff --git a/lib/addns/dnsrecord.c b/lib/addns/dnsrecord.c
index 73d62179e18..9447bc48a8a 100644
--- a/lib/addns/dnsrecord.c
+++ b/lib/addns/dnsrecord.c
@@ -85,7 +85,7 @@ DNS_ERROR dns_create_update( TALLOC_CTX *mem_ctx, const char *name,
 	}
 
 	z->z_type = QTYPE_SOA;
-	z->z_class = DNS_CLASS_IN;
+	z->z_class = DNS_QCLASS_IN;
 
 	*preq = req;
 	return ERROR_DNS_SUCCESS;
@@ -137,8 +137,14 @@ DNS_ERROR dns_create_a_record(TALLOC_CTX *mem_ctx, const char *host,
 		return ERROR_DNS_NO_MEMORY;
 	}
 
-	err = dns_create_rrec(mem_ctx, host, QTYPE_A, DNS_CLASS_IN, ttl,
-			      sizeof(ip.s_addr), data, prec);
+	err = dns_create_rrec(mem_ctx,
+			      host,
+			      QTYPE_A,
+			      DNS_QCLASS_IN,
+			      ttl,
+			      sizeof(ip.s_addr),
+			      data,
+			      prec);
 
 	if (!ERR_DNS_IS_OK(err)) {
 		TALLOC_FREE(data);
@@ -166,8 +172,14 @@ DNS_ERROR dns_create_aaaa_record(TALLOC_CTX *mem_ctx, const char *host,
 		return ERROR_DNS_NO_MEMORY;
 	}
 
-	err = dns_create_rrec(mem_ctx, host, QTYPE_AAAA, DNS_CLASS_IN, ttl,
-			      sizeof(ip6.s6_addr), data, prec);
+	err = dns_create_rrec(mem_ctx,
+			      host,
+			      QTYPE_AAAA,
+			      DNS_QCLASS_IN,
+			      ttl,
+			      sizeof(ip6.s6_addr),
+			      data,
+			      prec);
 
 	if (!ERR_DNS_IS_OK(err)) {
 		TALLOC_FREE(data);
diff --git a/source4/libcli/resolve/dns_ex.c b/source4/libcli/resolve/dns_ex.c
index eec37084bab..8e11d7b48ae 100644
--- a/source4/libcli/resolve/dns_ex.c
+++ b/source4/libcli/resolve/dns_ex.c
@@ -109,7 +109,7 @@ static int reply_to_addrs(TALLOC_CTX *mem_ctx,
 		rr = &reply->answers[i];
 
 		/* we are only interested in the IN class */
-		if (rr->rr_class != DNS_CLASS_IN) {
+		if (rr->rr_class != DNS_QCLASS_IN) {
 			continue;
 		}
 
@@ -171,7 +171,7 @@ static DNS_ERROR dns_lookup(TALLOC_CTX *mem_ctx,
 		if (!ok) {
 			return ERROR_DNS_NO_MEMORY;
 		}
-		rlen = res_search(name, DNS_CLASS_IN, q_type, blob.data, len);
+		rlen = res_search(name, DNS_QCLASS_IN, q_type, blob.data, len);
 		if (rlen == -1) {
 			if (len >= 65535) {
 				data_blob_free(&blob);
diff --git a/source4/torture/dns/internal_dns.c b/source4/torture/dns/internal_dns.c
index 2ccc7ed5aa1..e01c519b6a2 100644
--- a/source4/torture/dns/internal_dns.c
+++ b/source4/torture/dns/internal_dns.c
@@ -77,7 +77,7 @@ static bool test_internal_dns_query_self(struct torture_context *tctx)
 		return false;
 	}
 
-	err = dns_create_query(conn, host, QTYPE_A, DNS_CLASS_IN, &req);
+	err = dns_create_query(conn, host, QTYPE_A, DNS_QCLASS_IN, &req);
 	if (!ERR_DNS_IS_OK(err)) {
 		printf("Failed to create A record query\n");
 		return false;