[5533a] Reordered get4 hwaddr/duid code to follow CfgHosts behavior

diff --git a/.gitmodules b/.gitmodules
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e4730c1e823a4fabee1dc45a247a5ab636a2d5ba 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "premium"]
+       path = premium
+       url = ssh://fdupont@repo.isc.org/proj/git/prod/kea-premium.git

diff --git a/premium b/premium
new file mode 160000 (submodule)
index 0000000..02dfa84
--- /dev/null
+++ b/premium
@@ -0,0 +1 @@
+Subproject commit 02dfa841546e3ab44e5cc8d55c82e0e5af8cbb7a

diff --git a/src/lib/dhcpsrv/host_mgr.cc b/src/lib/dhcpsrv/host_mgr.cc
index e08b1288f83f4850d696a675fed2b33d83843569..775997d12a69e7dcb662a30486a9032fbff6d5b2 100644 (file)
--- a/src/lib/dhcpsrv/host_mgr.cc
+++ b/src/lib/dhcpsrv/host_mgr.cc
@@ -148,12 +148,12 @@ HostMgr::get4(const SubnetID& subnet_id, const HWAddrPtr& hwaddr,
         .arg(duid ? duid->toText() : "(duid)");
     for (auto it = alternate_sources_.begin();
          !host && it != alternate_sources_.end(); ++it) {
-        if (duid) {
-            host = (*it)->get4(subnet_id, HWAddrPtr(), duid);
-        }
-        if (!host && hwaddr) {
+        if (hwaddr) {
             host = (*it)->get4(subnet_id, hwaddr, DuidPtr());
         }
+        if (!host && duid) {
+            host = (*it)->get4(subnet_id, HWAddrPtr(), duid);
+        }
         if (host && cache_ptr_ && (it != alternate_sources_.begin())) {
             cache(host);
         }