From: Mark Andrews <marka@isc.org>
Date: Wed, 6 Sep 2017 00:04:17 +0000 (+1000)
Subject: fix merge error
X-Git-Tag: v9.12.0a1~52
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d1cd273b7b683e572176e1cfa73e37222fa0ab82;p=thirdparty%2Fbind9.git

fix merge error
---

diff --git a/bin/named/server.c b/bin/named/server.c
index d8932249533..e8ecb88ed33 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -3742,6 +3742,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
 	INSIST(result == ISC_R_SUCCESS);
 	view->synthfromdnssec = cfg_obj_asboolean(obj);
 
+	obj = NULL;
 	result = ns_config_get(maps, "max-stale-ttl", &obj);
 	INSIST(result == ISC_R_SUCCESS);
 	max_stale_ttl = cfg_obj_asuint32(obj);