diff options
author | Marcin Siodelski <marcin@isc.org> | 2018-05-28 11:18:01 +0200 |
---|---|---|
committer | Marcin Siodelski <marcin@isc.org> | 2018-05-28 11:18:01 +0200 |
commit | 2d590bfd7d1b0eca377eb99eef83a3083a1d7399 (patch) | |
tree | 8ccd55c756440a6999d75b93cf42727efd3f50eb /src/lib/dhcpsrv | |
parent | [master] Removed unused use_templates (diff) | |
parent | [5632] Swap builtin classes order as a result of review. (diff) | |
download | kea-2d590bfd7d1b0eca377eb99eef83a3083a1d7399.tar.xz kea-2d590bfd7d1b0eca377eb99eef83a3083a1d7399.zip |
[master] Merge branch 'trac5632'
Diffstat (limited to 'src/lib/dhcpsrv')
-rw-r--r-- | src/lib/dhcpsrv/client_class_def.cc | 2 | ||||
-rw-r--r-- | src/lib/dhcpsrv/client_class_def.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/dhcpsrv/client_class_def.cc b/src/lib/dhcpsrv/client_class_def.cc index 91158d9205..8a3f8da4d6 100644 --- a/src/lib/dhcpsrv/client_class_def.cc +++ b/src/lib/dhcpsrv/client_class_def.cc @@ -305,7 +305,7 @@ builtinNames = { std::list<std::string> builtinPrefixes = { - "VENDOR_CLASS_", "AFTER_", "EXTERNAL_" + "VENDOR_CLASS_", "HA_", "AFTER_", "EXTERNAL_" }; bool diff --git a/src/lib/dhcpsrv/client_class_def.h b/src/lib/dhcpsrv/client_class_def.h index 623710eb83..fc70a9f060 100644 --- a/src/lib/dhcpsrv/client_class_def.h +++ b/src/lib/dhcpsrv/client_class_def.h @@ -348,7 +348,7 @@ typedef boost::shared_ptr<ClientClassDictionary> ClientClassDictionaryPtr; extern std::list<std::string> builtinNames; /// @brief List of built-in client class prefixes -/// i.e. VENDOR_CLASS_, AFTER_ and EXTERNAL_. +/// i.e. VENDOR_CLASS_, HA_, AFTER_ and EXTERNAL_. extern std::list<std::string> builtinPrefixes; /// @brief Check if a client class name is builtin. |