silently ignore additional keytag options

(cherry picked from commit 36158e6c96e982768bd33d4090cbe563718534f2)
(cherry picked from commit ccca4986b3a14188becb173c4473d9eac1587f66)

diff --git a/bin/named/client.c b/bin/named/client.c
index e5159d80e9de3f788b894112fa9144fd37e44272..d425df27f0de6476e2294ccb4e63d21b7a9191b7 100644 (file)
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -2120,6 +2120,12 @@ process_keytag(ns_client_t *client, isc_buffer_t *buf, size_t optlen) {
                return (DNS_R_OPTERR);
        }
 
+       /* Silently drop additional keytag options. */
+       if (client->keytag != NULL) {
+               isc_buffer_forward(buf, (unsigned int)optlen);
+               return (ISC_R_SUCCESS);
+       }
+
        client->keytag = isc_mem_get(client->mctx, optlen);
        if (client->keytag != NULL) {
                client->keytag_len = (uint16_t)optlen;