From 6b2e5cd28c2cf86e2eb4afb0b6f9d723a52e52e2 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Fri, 15 Dec 2017 10:01:07 -0800 Subject: [PATCH] [master] fixed ixfr-from-difference error in previous commit --- bin/named/zoneconf.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c index bf938232ef..862b7699ac 100644 --- a/bin/named/zoneconf.c +++ b/bin/named/zoneconf.c @@ -1312,13 +1312,17 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, INSIST(result == ISC_R_SUCCESS && obj != NULL); if (cfg_obj_isboolean(obj)) { ixfrdiff = cfg_obj_asboolean(obj); - } else if (!strcasecmp(cfg_obj_asstring(obj), "primary") && - !strcasecmp(cfg_obj_asstring(obj), "master") && + } else if ((strcasecmp(cfg_obj_asstring(obj), + "primary") == 0 || + strcasecmp(cfg_obj_asstring(obj), + "master") == 0) && ztype == dns_zone_master) { ixfrdiff = ISC_TRUE; - } else if (!strcasecmp(cfg_obj_asstring(obj), "secondary") && - !strcasecmp(cfg_obj_asstring(obj), "slave") && + } else if ((strcasecmp(cfg_obj_asstring(obj), + "secondary") == 0 || + strcasecmp(cfg_obj_asstring(obj), + "slave") == 0) && ztype == dns_zone_slave) { ixfrdiff = ISC_TRUE;