[#2336] initialize class match expression to null

diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc
index 254f23c2935fbf63b227f18f809ee2e7ac8e7061..4f70a727d2bce825ea901ce6c35b4a525b44599a 100644 (file)
--- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc
+++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc
@@ -2414,7 +2414,7 @@ public:
 
                 auto options = boost::make_shared<CfgOption>();
                 auto option_defs = boost::make_shared<CfgOptionDef>();
-                auto expression = boost::make_shared<Expression>();
+                ExpressionPtr expression;
 
                 last_client_class = boost::make_shared<ClientClassDef>(out_bindings[1]->getString(), expression, options);
                 last_client_class->setCfgOptionDef(option_defs);

diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc
index 91928217434eff066a0a08931de051f0707bda34..96250ca7d2daaac479b6d070c60a3061997ce26d 100644 (file)
--- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc
+++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc
@@ -2857,7 +2857,7 @@ public:
 
                 auto options = boost::make_shared<CfgOption>();
                 auto option_defs = boost::make_shared<CfgOptionDef>();
-                auto expression = boost::make_shared<Expression>();
+                ExpressionPtr expression;
 
                 last_client_class = boost::make_shared<ClientClassDef>(out_bindings[1]->getString(), expression, options);
                 last_client_class->setCfgOptionDef(option_defs);

diff --git a/src/hooks/dhcp/pgsql_cb/pgsql_cb_dhcp4.cc b/src/hooks/dhcp/pgsql_cb/pgsql_cb_dhcp4.cc
index eec73bd10e5641f3bb78754808e383e29134f34b..4bd9b52d094301d0455ff176666ff28d335308fc 100644 (file)
--- a/src/hooks/dhcp/pgsql_cb/pgsql_cb_dhcp4.cc
+++ b/src/hooks/dhcp/pgsql_cb/pgsql_cb_dhcp4.cc
@@ -2213,7 +2213,7 @@ public:
 
                 auto options = boost::make_shared<CfgOption>();
                 auto option_defs = boost::make_shared<CfgOptionDef>();
-                auto expression = boost::make_shared<Expression>();
+                ExpressionPtr expression;
 
                 last_client_class = boost::make_shared<ClientClassDef>(worker.getString(1), expression, options);
                 last_client_class->setCfgOptionDef(option_defs);

diff --git a/src/hooks/dhcp/pgsql_cb/pgsql_cb_dhcp6.cc b/src/hooks/dhcp/pgsql_cb/pgsql_cb_dhcp6.cc
index 92ff7203684c6b4fafa4cf9fbf1194c36baeccd0..4ea8b8abc211ff989960da2b331a9eb59f531ca6 100644 (file)
--- a/src/hooks/dhcp/pgsql_cb/pgsql_cb_dhcp6.cc
+++ b/src/hooks/dhcp/pgsql_cb/pgsql_cb_dhcp6.cc
@@ -2549,7 +2549,7 @@ public:
 
                 auto options = boost::make_shared<CfgOption>();
                 auto option_defs = boost::make_shared<CfgOptionDef>();
-                auto expression = boost::make_shared<Expression>();
+                ExpressionPtr expression;
 
                 last_client_class = boost::make_shared<ClientClassDef>(worker.getString(1), expression, options);
                 last_client_class->setCfgOptionDef(option_defs);

diff --git a/src/lib/dhcpsrv/testutils/generic_cb_dhcp4_unittest.cc b/src/lib/dhcpsrv/testutils/generic_cb_dhcp4_unittest.cc
index 400cc1de0c4d61eb67b8386f1b9484187d609c8f..ab5ef140638b8be22d19ff44171b040961ab9e6f 100644 (file)
--- a/src/lib/dhcpsrv/testutils/generic_cb_dhcp4_unittest.cc
+++ b/src/lib/dhcpsrv/testutils/generic_cb_dhcp4_unittest.cc
@@ -4012,8 +4012,11 @@ GenericConfigBackendDHCPv4Test::setAndGetAllClientClasses4Test() {
     auto classes_list = client_classes.getClasses();
     ASSERT_EQ(3, classes_list->size());
     EXPECT_EQ("foo", (*classes_list->begin())->getName());
+    EXPECT_FALSE((*classes_list->begin())->getMatchExpr());
     EXPECT_EQ("bar", (*(classes_list->begin() + 1))->getName());
+    EXPECT_FALSE((*(classes_list->begin() + 1))->getMatchExpr());
     EXPECT_EQ("foobar", (*(classes_list->begin() + 2))->getName());
+    EXPECT_FALSE((*(classes_list->begin() + 2))->getMatchExpr());
 
     // Move the third class between the first and second class.
     ASSERT_NO_THROW_LOG(cbptr_->createUpdateClientClass4(ServerSelector::ONE("server1"), class3, "foo"));
@@ -4023,8 +4026,11 @@ GenericConfigBackendDHCPv4Test::setAndGetAllClientClasses4Test() {
     classes_list = client_classes.getClasses();
     ASSERT_EQ(3, classes_list->size());
     EXPECT_EQ("foo", (*classes_list->begin())->getName());
+    EXPECT_FALSE((*classes_list->begin())->getMatchExpr());
     EXPECT_EQ("foobar", (*(classes_list->begin() + 1))->getName());
+    EXPECT_FALSE((*(classes_list->begin() + 1))->getMatchExpr());
     EXPECT_EQ("bar", (*(classes_list->begin() + 2))->getName());
+    EXPECT_FALSE((*(classes_list->begin() + 2))->getMatchExpr());
 
     // Update the foobar class without specifying its position. It should not
     // be moved.
@@ -4034,8 +4040,11 @@ GenericConfigBackendDHCPv4Test::setAndGetAllClientClasses4Test() {
     classes_list = client_classes.getClasses();
     ASSERT_EQ(3, classes_list->size());
     EXPECT_EQ("foo", (*classes_list->begin())->getName());
+    EXPECT_FALSE((*classes_list->begin())->getMatchExpr());
     EXPECT_EQ("foobar", (*(classes_list->begin() + 1))->getName());
+    EXPECT_FALSE((*(classes_list->begin() + 1))->getMatchExpr());
     EXPECT_EQ("bar", (*(classes_list->begin() + 2))->getName());
+    EXPECT_FALSE((*(classes_list->begin() + 2))->getMatchExpr());
 }
 
 void

diff --git a/src/lib/dhcpsrv/testutils/generic_cb_dhcp6_unittest.cc b/src/lib/dhcpsrv/testutils/generic_cb_dhcp6_unittest.cc
index 355e42e35129642443a67a25797fa8d06e678144..61304b8d7db0ed31446345bf3daad5e72c4a58e8 100644 (file)
--- a/src/lib/dhcpsrv/testutils/generic_cb_dhcp6_unittest.cc
+++ b/src/lib/dhcpsrv/testutils/generic_cb_dhcp6_unittest.cc
@@ -4168,8 +4168,11 @@ GenericConfigBackendDHCPv6Test::setAndGetAllClientClasses6Test() {
     auto classes_list = client_classes.getClasses();
     ASSERT_EQ(3, classes_list->size());
     EXPECT_EQ("foo", (*classes_list->begin())->getName());
+    EXPECT_FALSE((*classes_list->begin())->getMatchExpr());
     EXPECT_EQ("bar", (*(classes_list->begin() + 1))->getName());
+    EXPECT_FALSE((*(classes_list->begin() + 1))->getMatchExpr());
     EXPECT_EQ("foobar", (*(classes_list->begin() + 2))->getName());
+    EXPECT_FALSE((*(classes_list->begin() + 2))->getMatchExpr());
 
     // Move the third class between the first and second class.
     ASSERT_NO_THROW_LOG(cbptr_->createUpdateClientClass6(ServerSelector::ONE("server1"), class3, "foo"));
@@ -4179,8 +4182,11 @@ GenericConfigBackendDHCPv6Test::setAndGetAllClientClasses6Test() {
     classes_list = client_classes.getClasses();
     ASSERT_EQ(3, classes_list->size());
     EXPECT_EQ("foo", (*classes_list->begin())->getName());
+    EXPECT_FALSE((*classes_list->begin())->getMatchExpr());
     EXPECT_EQ("foobar", (*(classes_list->begin() + 1))->getName());
+    EXPECT_FALSE((*(classes_list->begin() + 1))->getMatchExpr());
     EXPECT_EQ("bar", (*(classes_list->begin() + 2))->getName());
+    EXPECT_FALSE((*(classes_list->begin() + 2))->getMatchExpr());
 
     // Update the foobar class without specifying its position. It should not
     // be moved.
@@ -4190,8 +4196,11 @@ GenericConfigBackendDHCPv6Test::setAndGetAllClientClasses6Test() {
     classes_list = client_classes.getClasses();
     ASSERT_EQ(3, classes_list->size());
     EXPECT_EQ("foo", (*classes_list->begin())->getName());
+    EXPECT_FALSE((*classes_list->begin())->getMatchExpr());
     EXPECT_EQ("foobar", (*(classes_list->begin() + 1))->getName());
+    EXPECT_FALSE((*(classes_list->begin() + 1))->getMatchExpr());
     EXPECT_EQ("bar", (*(classes_list->begin() + 2))->getName());
+    EXPECT_FALSE((*(classes_list->begin() + 2))->getMatchExpr());
 }
 
 void