silently ignore additional keytag options

(cherry picked from commit 078f668e0d869f26c8c409eececc33c7dd2c5cf7)

diff --git a/lib/ns/client.c b/lib/ns/client.c
index a32d58fe8f842b706cb2b3c95ff1ab93be4b3fce..c8904ff7ebad4fb116ba492271118ac7bc9ee872 100644 (file)
--- a/lib/ns/client.c
+++ b/lib/ns/client.c
@@ -2115,6 +2115,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;