bin/named/server.c: Fix couple of DbC conditions reported by Cppcheck

(cherry picked from commit 476277a6e66086c1148d57eb1f43cf75bcd5539f)

diff --git a/.dir-locals.el b/.dir-locals.el
index 01fa828841f4aa1523f028da26477b837f4b8bba..30ec06a57b6ef96384db64e8b35a39d4d3830198 100644 (file)
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -66,6 +66,8 @@
                (concat directory-of-current-dir-locals-file "bin/dig/include"))
               (expand-file-name
                (concat directory-of-current-dir-locals-file "bin/named/include"))
+              (expand-file-name
+               (concat directory-of-current-dir-locals-file "bin/named/unix/include"))
               (expand-file-name
                (concat directory-of-current-dir-locals-file "bin/rndc/include"))
               (expand-file-name

diff --git a/bin/named/server.c b/bin/named/server.c
index 9a3915c56acf11a1bbcb0df76deecc3c8326fd02..7f1e5fe8abed93eb8bdce4f9f28256d58760157a 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -2495,15 +2495,17 @@ configure_rpz(dns_view_t *view, const cfg_obj_t **maps,
        } else {
                old = NULL;
        }
-       if (old == NULL)
+       if (old == NULL) {
                *old_rpz_okp = false;
-       else
+       } else {
                *old_rpz_okp = true;
+       }
 
        for (i = 0;
             zone_element != NULL;
-            ++i, zone_element = cfg_list_next(zone_element)) {
-               INSIST(old != NULL || !*old_rpz_okp);
+            ++i, zone_element = cfg_list_next(zone_element))
+       {
+               INSIST(!*old_rpz_okp || old != NULL);
                if (*old_rpz_okp && i < old->p.num_zones) {
                        old_zone = old->zones[i];
                } else {
@@ -2528,24 +2530,21 @@ configure_rpz(dns_view_t *view, const cfg_obj_t **maps,
         * zones are unchanged, then use the same policy data.
         * Data for individual zones that must be reloaded will be merged.
         */
-       if (*old_rpz_okp &&
-           old != NULL && memcmp(&old->p, &zones->p, sizeof(zones->p)) != 0)
-       {
-               *old_rpz_okp = false;
-       }
-
-       if (*old_rpz_okp &&
-           (old == NULL ||
-            old->rps_cstr == NULL) != (zones->rps_cstr == NULL))
-       {
-               *old_rpz_okp = false;
-       }
-
-       if (*old_rpz_okp &&
-           (zones->rps_cstr != NULL &&
-            strcmp(old->rps_cstr, zones->rps_cstr) != 0))
-       {
-               *old_rpz_okp = false;
+       if (*old_rpz_okp) {
+               if (old != NULL &&
+                   memcmp(&old->p, &zones->p, sizeof(zones->p)) != 0)
+               {
+                       *old_rpz_okp = false;
+               } else if ((old == NULL || old->rps_cstr == NULL) !=
+                          (zones->rps_cstr == NULL))
+               {
+                       *old_rpz_okp = false;
+               } else if (old != NULL &&
+                          zones->rps_cstr != NULL &&
+                          strcmp(old->rps_cstr, zones->rps_cstr) != 0)
+               {
+                       *old_rpz_okp = false;
+               }
        }
 
        if (*old_rpz_okp) {
@@ -2559,8 +2558,9 @@ configure_rpz(dns_view_t *view, const cfg_obj_t **maps,
                            view->rpzs->rpz_ver);
        }
 
-       if (pview != NULL)
+       if (pview != NULL) {
                dns_view_detach(&pview);
+       }
 
        return (ISC_R_SUCCESS);
 }
@@ -6861,7 +6861,7 @@ dotat(dns_keytable_t *keytable, dns_keynode_t *keynode, void *arg) {
 
        REQUIRE(keytable != NULL);
        REQUIRE(keynode != NULL);
-       REQUIRE(arg != NULL);
+       REQUIRE(dotat_arg != NULL);
 
        view = dotat_arg->view;
        task = dotat_arg->task;