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.12.4rc1~4^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b88bc3d3bc619352ecdf31d33739df2ede6c54c;p=thirdparty%2Fbind9.git

silently ignore additional keytag options

(cherry picked from commit 36158e6c96e982768bd33d4090cbe563718534f2)
---

diff --git a/lib/ns/client.c b/lib/ns/client.c
index 5dae36ad70c..bc1cf7395a8 100644
--- a/lib/ns/client.c
+++ b/lib/ns/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;