3ce7d3
From d5ca0a8f5d31dad4e77bdb8316853f703e68b60f Mon Sep 17 00:00:00 2001
3ce7d3
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
3ce7d3
Date: Tue, 29 Jan 2019 21:26:33 +0100
3ce7d3
Subject: [PATCH 4/5] Accept dnssec-lookaside yes;
3ce7d3
3ce7d3
Thread it the same way as "auto" value. Print a warning and ignore it.
3ce7d3
---
3ce7d3
 bin/named/server.c | 3 ++-
3ce7d3
 lib/bind9/check.c  | 8 +++++---
3ce7d3
 2 files changed, 7 insertions(+), 4 deletions(-)
3ce7d3
3ce7d3
diff --git a/bin/named/server.c b/bin/named/server.c
3ce7d3
index 0c8939d..93f9417 100644
3ce7d3
--- a/bin/named/server.c
3ce7d3
+++ b/bin/named/server.c
3ce7d3
@@ -4615,7 +4615,8 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
3ce7d3
 			/* If "no", skip; if "auto", log warning */
3ce7d3
 			if (!strcasecmp(dom, "no")) {
3ce7d3
 				result = ISC_R_NOTFOUND;
3ce7d3
-			} else if (!strcasecmp(dom, "auto")) {
3ce7d3
+			} else if (!strcasecmp(dom, "auto")
3ce7d3
+			           || !strcasecmp(dom, "yes")) {
3ce7d3
 				/*
3ce7d3
 				 * Warning logged by libbind9.
3ce7d3
 				 */
3ce7d3
diff --git a/lib/bind9/check.c b/lib/bind9/check.c
3ce7d3
index 1a3d534..f075de0 100644
3ce7d3
--- a/lib/bind9/check.c
3ce7d3
+++ b/lib/bind9/check.c
3ce7d3
@@ -1176,11 +1176,13 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx,
3ce7d3
 				if (!strcasecmp(dlv, "no")) {
3ce7d3
 					continue;
3ce7d3
 				}
3ce7d3
-				if (!strcasecmp(dlv, "auto")) {
3ce7d3
+				if (!strcasecmp(dlv, "auto")
3ce7d3
+				    || !strcasecmp(dlv, "yes")) {
3ce7d3
 					cfg_obj_log(obj, logctx,
3ce7d3
 						    ISC_LOG_WARNING,
3ce7d3
-						    "dnssec-lookaside 'auto' "
3ce7d3
-						    "is no longer supported");
3ce7d3
+						    "dnssec-lookaside '%s' "
3ce7d3
+						    "is no longer supported",
3ce7d3
+					            dlv);
3ce7d3
 					continue;
3ce7d3
 				}
3ce7d3
 			}
3ce7d3
-- 
3ce7d3
2.20.1
3ce7d3