From: Mark Andrews <marka@isc.org>
Date: Sun, 9 Dec 2018 21:41:26 +0000 (+1100)
Subject: silently ignore additional keytag options
X-Git-Tag: v9.15.0~140^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=35025b6e88b726ae89caacbb312d1b40e5c20b4d;p=thirdparty%2Fbind9.git

silently ignore additional keytag options
---

diff --git a/lib/ns/client.c b/lib/ns/client.c
index b71aa73eaa3..321818bd277 100644
--- a/lib/ns/client.c
+++ b/lib/ns/client.c
@@ -2079,6 +2079,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;