[#2227] reverted changes in CB

diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_impl.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_impl.cc
index 8ac2492b41ca74965af2cb5fb58973a36f21aeab..f4a05637f3bd326b3ba9c603f7b1dbaa61ac547b 100644 (file)
--- a/src/hooks/dhcp/mysql_cb/mysql_cb_impl.cc
+++ b/src/hooks/dhcp/mysql_cb/mysql_cb_impl.cc
@@ -967,9 +967,7 @@ MySqlConfigBackendImpl::createOptionValueBinding(const OptionDescriptorPtr& opti
     OptionPtr opt = option->option_;
     if (option->formatted_value_.empty() && (opt->len() > opt->getHeaderLen())) {
         OutputBuffer buf(opt->len());
-        // The RFC3396 adds support for long options split over multiple options
-        // using the same code.
-        opt->pack(buf, false);
+        opt->pack(buf);
         const char* buf_ptr = static_cast<const char*>(buf.getData());
         std::vector<uint8_t> blob(buf_ptr + opt->getHeaderLen(),
                                   buf_ptr + buf.getLength());

diff --git a/src/hooks/dhcp/pgsql_cb/pgsql_cb_impl.cc b/src/hooks/dhcp/pgsql_cb/pgsql_cb_impl.cc
index ea193cc627f5b45e7b539aaaca80b664ecf2f831..4399cb08a2ec0703736967acfcee1a747df02315 100644 (file)
--- a/src/hooks/dhcp/pgsql_cb/pgsql_cb_impl.cc
+++ b/src/hooks/dhcp/pgsql_cb/pgsql_cb_impl.cc
@@ -1124,9 +1124,7 @@ PgSqlConfigBackendImpl::addOptionValueBinding(PsqlBindArray& bindings,
     OptionPtr opt = option->option_;
     if (option->formatted_value_.empty() && (opt->len() > opt->getHeaderLen())) {
         OutputBuffer buf(opt->len());
-        // The RFC3396 adds support for long options split over multiple options
-        // using the same code.
-        opt->pack(buf, false);
+        opt->pack(buf);
         const char* buf_ptr = static_cast<const char*>(buf.getData());
         std::vector<uint8_t> blob(buf_ptr + opt->getHeaderLen(),
                                   buf_ptr + buf.getLength());

diff --git a/src/lib/dhcp/option.h b/src/lib/dhcp/option.h
index ce069d2fff727bbe72487bc1796ca217078fad55..dfb26f378ae4cf0a6e9f83d76c60262e64aee8e5 100644 (file)
--- a/src/lib/dhcp/option.h
+++ b/src/lib/dhcp/option.h
@@ -242,7 +242,7 @@ public:
     ///
     /// @param buf pointer to a buffer
     /// @param check flag which indicates if checking the option length is
-    /// required (used in V4 only)
+    /// required (used only in V4)
     ///
     /// @throw BadValue Universe of the option is neither V4 nor V6.
     virtual void pack(isc::util::OutputBuffer& buf, bool check = true) const;