Fix the constification of the dns_name_t * result variable for dns_tsig_identity()

(cherry picked from commit fa7475b77a27d326be15a4c4b987f1f5388272dc)

diff --git a/bin/named/server.c b/bin/named/server.c
index 7f1e5fe8abed93eb8bdce4f9f28256d58760157a..148edb5bfc9b190a47f86a3e360cb2a85d675966 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -9689,7 +9689,7 @@ get_matching_view(isc_netaddr_t *srcaddr, isc_netaddr_t *destaddr,
                if (message->rdclass == view->rdclass ||
                    message->rdclass == dns_rdataclass_any)
                {
-                       dns_name_t *tsig = NULL;
+                       const dns_name_t *tsig = NULL;
 
                        *sigresult = dns_message_rechecksig(message, view);
                        if (*sigresult == ISC_R_SUCCESS) {

diff --git a/lib/dns/message.c b/lib/dns/message.c
index 3d7a00cf30459c24465524c0a3bbdcd1ef21d327..a31e248133a12386863898cc8cb0f7184ba01ea3 100644 (file)
--- a/lib/dns/message.c
+++ b/lib/dns/message.c
@@ -3064,7 +3064,7 @@ dns_message_signer(dns_message_t *msg, dns_name_t *signer) {
                dns_name_clone(&sig.signer, signer);
                dns_rdata_freestruct(&sig);
        } else {
-               dns_name_t *identity;
+               const dns_name_t *identity;
                dns_rdata_any_tsig_t tsig;
 
                result = dns_rdataset_first(msg->tsig);

diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c
index 2629174f5aac1eba0f596f6f6f984da7071d74b6..c08b52a75db120ea067c5913eccb7b5600568b90 100644 (file)
--- a/lib/dns/tkey.c
+++ b/lib/dns/tkey.c
@@ -661,7 +661,7 @@ process_deletetkey(dns_name_t *signer, dns_name_t *name,
 {
        isc_result_t result;
        dns_tsigkey_t *tsigkey = NULL;
-       dns_name_t *identity;
+       const dns_name_t *identity;
 
        result = dns_tsigkey_find(&tsigkey, name, &tkeyin->algorithm, ring);
        if (result != ISC_R_SUCCESS) {

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 44f2ec941d71dcae6babd165fa01248e6c87771a..be0865c891c93be38bfb531eaf66e144573414c4 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -13734,7 +13734,7 @@ dns_zone_notifyreceive(dns_zone_t *zone, isc_sockaddr_t *from,
        uint32_t serial = 0;
        bool have_serial = false;
        dns_tsigkey_t *tsigkey;
-       dns_name_t *tsig;
+       const dns_name_t *tsig;
 
        REQUIRE(DNS_ZONE_VALID(zone));