From: Francis Dupont <fdupont@isc.org>
Date: Sat, 29 Jun 2019 13:37:44 +0000 (+0200)
Subject: [676-add-support-for-server-tags-in-the-cb_cmds-hooks-library] Better fixes...
X-Git-Tag: Kea-1.6.0-beta2~150
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f71e2c6d68b5b633adb1c8fc58210efaab0204d;p=thirdparty%2Fkea.git

[676-add-support-for-server-tags-in-the-cb_cmds-hooks-library] Better fixes...
---

diff --git a/src/lib/dhcpsrv/testutils/test_config_backend_dhcp4.cc b/src/lib/dhcpsrv/testutils/test_config_backend_dhcp4.cc
index 222b3b0f81..650542cce9 100644
--- a/src/lib/dhcpsrv/testutils/test_config_backend_dhcp4.cc
+++ b/src/lib/dhcpsrv/testutils/test_config_backend_dhcp4.cc
@@ -197,10 +197,11 @@ TestConfigBackendDHCPv4::getGlobalParameter4(const db::ServerSelector& server_se
         for (auto tag : tags) {
             if ((*global_it)->hasServerTag(ServerTag(tag))) {
                 return (*global_it);
-            } else if ((*global_it)->hasAllServerTag()) {
-                candidate = *global_it;
             }
         }
+        if ((*global_it)->hasAllServerTag()) {
+            candidate = *global_it;
+        }
     }
 
     return (candidate);
diff --git a/src/lib/dhcpsrv/testutils/test_config_backend_dhcp6.cc b/src/lib/dhcpsrv/testutils/test_config_backend_dhcp6.cc
index 6e183b39fe..383c4cd6e9 100644
--- a/src/lib/dhcpsrv/testutils/test_config_backend_dhcp6.cc
+++ b/src/lib/dhcpsrv/testutils/test_config_backend_dhcp6.cc
@@ -197,7 +197,8 @@ TestConfigBackendDHCPv6::getGlobalParameter6(const db::ServerSelector& server_se
             if ((*global_it)->hasServerTag(ServerTag(tag))) {
                 return (*global_it);
             }
-        } else if ((*global_it)->hasAllServerTag()) {
+        }
+        if ((*global_it)->hasAllServerTag()) {
             candidate = *global_it;
         }
     }