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 875d8d34dfa5068185e8c997de36023c284a9966..e0842cd56a2475c118fdd212a781d61ed2212cb5 100644 (file)
--- 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 9a6ed3e079ac49fe155e1584092fc4e15082f16e..f06ae0b52e257af5c0faf237745926ef52fdcb7e 100644 (file)
--- 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 73d62179e184cca5464fd61dd29038ddd73d32b6..9447bc48a8a6fe31e481acd22ecbd9de73e9da37 100644 (file)
--- 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 eec37084babd7dbe50a97619e7f9d16611769178..8e11d7b48aefb324ac33d3c3662b136a55427bf2 100644 (file)
--- 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 2ccc7ed5aa16ce92f8856302ab108553626a8ac3..e01c519b6a23921af1d35cdd8c7848ddc304b032 100644 (file)
--- 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;