From: Razvan Becheriu Date: Wed, 11 Nov 2020 18:18:28 +0000 (+0200) Subject: [#1405] fixed merge X-Git-Tag: Kea-1.9.2~95 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fbeb246d06c2fe68c609572a01dc237cd5695545;p=thirdparty%2Fkea.git [#1405] fixed merge --- diff --git a/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp6_unittest.cc b/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp6_unittest.cc index ebea6fc6ca..4c34d4f4df 100644 --- a/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp6_unittest.cc +++ b/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp6_unittest.cc @@ -311,7 +311,7 @@ public: shared_network->requireClientClass("required-class2"); shared_network->setReservationsGlobal(false); shared_network->setReservationsInSubnet(false); - subnet->setReservationsOutOfPool(false); + shared_network->setReservationsOutOfPool(false); shared_network->setContext(user_context); shared_network->setValid(5555); shared_network->setPreferred(4444);