change "key" to "tsigkey" to silence "short global name" warning

(cherry picked from commit 0cc7aa250edb03b9b5178b74d0d600dde4ce7925)
(cherry picked from commit 9d99bf0f4b8243ee18fbb7f12fefd401201448ce)

diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index 2de0fc3b0526fd69a3fa3fcc631519f2523a85c4..3316d909a37ea578fb26a1e2a0d8d0e2091e823f 100644 (file)
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -323,12 +323,12 @@ received(unsigned int bytes, isc_sockaddr_t *from, dig_query_t *query) {
                } else {
                        printf(";; MSG SIZE  rcvd: %u\n", bytes);
                }
-               if (key != NULL) {
+               if (tsigkey != NULL) {
                        if (!validated)
                                puts(";; WARNING -- Some TSIG could not "
                                     "be validated");
                }
-               if ((key == NULL) && (keysecret[0] != 0)) {
+               if ((tsigkey == NULL) && (keysecret[0] != 0)) {
                        puts(";; WARNING -- TSIG key was not used.");
                }
                puts("");

diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 17e3fed090be8fde53c1dbcaaa3052516534527f..d75d3aa98a35b3bcb859894933479946e42c2d97 100644 (file)
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -192,7 +192,7 @@ unsigned char cookie[8];
 dns_name_t *hmacname = NULL;
 unsigned int digestbits = 0;
 isc_buffer_t *namebuf = NULL;
-dns_tsigkey_t *key = NULL;
+dns_tsigkey_t *tsigkey = NULL;
 isc_boolean_t validated = ISC_TRUE;
 isc_entropy_t *entp = NULL;
 isc_mempool_t *commctx = NULL;
@@ -1076,13 +1076,13 @@ setup_text_key(void) {
 
        result = dns_tsigkey_create(&keyname, hmacname, secretstore,
                                    (int)secretsize, ISC_FALSE, NULL, 0, 0,
-                                   mctx, NULL, &key);
+                                   mctx, NULL, &tsigkey);
  failure:
        if (result != ISC_R_SUCCESS)
                printf(";; Couldn't create key %s: %s\n",
                       keynametext, isc_result_totext(result));
        else
-               dst_key_setbits(key->key, digestbits);
+               dst_key_setbits(tsigkey->key, digestbits);
 
        isc_mem_free(mctx, secretstore);
        dns_name_invalidate(&keyname);
@@ -1369,7 +1369,7 @@ setup_file_key(void) {
        }
        result = dns_tsigkey_createfromkey(dst_key_name(dstkey), hmacname,
                                           dstkey, ISC_FALSE, NULL, 0, 0,
-                                          mctx, NULL, &key);
+                                          mctx, NULL, &tsigkey);
        if (result != ISC_R_SUCCESS) {
                printf(";; Couldn't create key %s: %s\n",
                       keynametext, isc_result_totext(result));
@@ -2562,9 +2562,9 @@ setup_lookup(dig_lookup_t *lookup) {
        /* XXX Insist this? */
        lookup->tsigctx = NULL;
        lookup->querysig = NULL;
-       if (key != NULL) {
+       if (tsigkey != NULL) {
                debug("initializing keys");
-               result = dns_message_settsigkey(lookup->sendmsg, key);
+               result = dns_message_settsigkey(lookup->sendmsg, tsigkey);
                check_result(result, "dns_message_settsigkey");
        }
 
@@ -3850,7 +3850,7 @@ recv_done(isc_task_t *task, isc_event_t *event) {
        result = dns_message_create(mctx, DNS_MESSAGE_INTENTPARSE, &msg);
        check_result(result, "dns_message_create");
 
-       if (key != NULL) {
+       if (tsigkey != NULL) {
                if (l->querysig == NULL) {
                        debug("getting initial querysig");
                        result = dns_message_getquerytsig(l->sendmsg, mctx,
@@ -3859,7 +3859,7 @@ recv_done(isc_task_t *task, isc_event_t *event) {
                }
                result = dns_message_setquerytsig(msg, l->querysig);
                check_result(result, "dns_message_setquerytsig");
-               result = dns_message_settsigkey(msg, key);
+               result = dns_message_settsigkey(msg, tsigkey);
                check_result(result, "dns_message_settsigkey");
                msg->tsigctx = l->tsigctx;
                l->tsigctx = NULL;
@@ -4023,7 +4023,7 @@ recv_done(isc_task_t *task, isc_event_t *event) {
                }
        }
 
-       if (key != NULL) {
+       if (tsigkey != NULL) {
                result = dns_tsig_verify(&query->recvbuf, msg, NULL, NULL);
                if (result != ISC_R_SUCCESS) {
                        printf(";; Couldn't verify signature: %s\n",
@@ -4461,9 +4461,9 @@ destroy_libs(void) {
                debug("freeing timermgr");
                isc_timermgr_destroy(&timermgr);
        }
-       if (key != NULL) {
-               debug("freeing key %p", key);
-               dns_tsigkey_detach(&key);
+       if (tsigkey != NULL) {
+               debug("freeing key %p", tsigkey);
+               dns_tsigkey_detach(&tsigkey);
        }
        if (namebuf != NULL)
                isc_buffer_free(&namebuf);

diff --git a/bin/dig/include/dig/dig.h b/bin/dig/include/dig/dig.h
index bdd11a968609ceef1fdce63af151fe8da514d773..c37beaf810b5cfac8c6455daa6ad2d9cb9a044b1 100644 (file)
--- a/bin/dig/include/dig/dig.h
+++ b/bin/dig/include/dig/dig.h
@@ -286,7 +286,7 @@ extern unsigned int digestbits;
 #ifdef DIG_SIGCHASE
 extern char trustedkey[MXNAME];
 #endif
-extern dns_tsigkey_t *key;
+extern dns_tsigkey_t *tsigkey;
 extern isc_boolean_t validated;
 extern isc_taskmgr_t *taskmgr;
 extern isc_task_t *global_task;