mirror of
https://gitlab.isc.org/isc-projects/kea
synced 2025-08-31 05:55:28 +00:00
[#2276] Initial impl ddns-resolution-conflict-mode
New Files: src/bin/d2/check_exists_add.cc src/bin/d2/check_exists_add.h src/bin/d2/check_exists_remove.cc src/bin/d2/check_exists_remove.h src/bin/d2/simple_add_without_dhcid.cc src/bin/d2/simple_add_without_dhcid.h src/bin/d2/simple_remove_without_dhcid.cc src/bin/d2/simple_remove_without_dhcid.h src/bin/d2/tests/check_exists_add_unittests.cc src/bin/d2/tests/check_exists_remove_unittests.cc src/bin/d2/tests/simple_add_without_dhcid_unittests.cc src/bin/d2/tests/simple_remove_without_dhcid_unittests.cc Modified: doc/examples/kea4/all-keys.json doc/examples/kea4/with-ddns.json doc/examples/kea6/all-keys.json doc/examples/kea6/with-ddns.json src/bin/d2/Makefile.am src/bin/d2/check_exists_add.cc src/bin/d2/check_exists_add.h src/bin/d2/check_exists_remove.cc src/bin/d2/check_exists_remove.h src/bin/d2/d2_update_mgr.cc src/bin/d2/simple_add_without_dhcid.cc src/bin/d2/simple_add_without_dhcid.h src/bin/d2/simple_remove_without_dhcid.cc src/bin/d2/simple_remove_without_dhcid.h src/bin/d2/tests/Makefile.am src/bin/d2/tests/check_exists_add_unittests.cc src/bin/d2/tests/check_exists_remove_unittests.cc src/bin/d2/tests/d2_process_unittests.cc src/bin/d2/tests/d2_queue_mgr_unittests.cc src/bin/d2/tests/d2_update_mgr_unittests.cc src/bin/d2/tests/nc_add_unittests.cc src/bin/d2/tests/nc_remove_unittests.cc src/bin/d2/tests/simple_add_unittests.cc src/bin/d2/tests/simple_add_without_dhcid_unittests.cc src/bin/d2/tests/simple_remove_unittests.cc src/bin/d2/tests/simple_remove_without_dhcid_unittests.cc src/bin/dhcp4/dhcp4_lexer.cc src/bin/dhcp4/dhcp4_lexer.ll src/bin/dhcp4/dhcp4_parser.cc src/bin/dhcp4/dhcp4_parser.h src/bin/dhcp4/dhcp4_parser.yy src/bin/dhcp4/json_config_parser.cc src/bin/dhcp4/location.hh src/bin/dhcp4/parser_context.h src/bin/dhcp4/tests/config_parser_unittest.cc src/bin/dhcp4/tests/d2_unittest.cc src/bin/dhcp4/tests/fqdn_unittest.cc src/bin/dhcp4/tests/get_config_unittest.cc src/bin/dhcp6/dhcp6_lexer.cc src/bin/dhcp6/dhcp6_lexer.ll src/bin/dhcp6/dhcp6_parser.cc src/bin/dhcp6/dhcp6_parser.h src/bin/dhcp6/dhcp6_parser.yy src/bin/dhcp6/dhcp6_srv.cc src/bin/dhcp6/json_config_parser.cc src/bin/dhcp6/location.hh src/bin/dhcp6/parser_context.h src/bin/dhcp6/tests/config_parser_unittest.cc src/bin/dhcp6/tests/d2_unittest.cc src/bin/dhcp6/tests/fqdn_unittest.cc src/bin/dhcp6/tests/get_config_unittest.cc src/lib/d2srv/testutils/nc_test_utils.cc src/lib/d2srv/testutils/nc_test_utils.h src/lib/dhcp_ddns/ncr_msg.cc src/lib/dhcp_ddns/ncr_msg.h src/lib/dhcp_ddns/tests/ncr_udp_unittests.cc src/lib/dhcp_ddns/tests/ncr_unittests.cc src/lib/dhcpsrv/cfg_globals.cc src/lib/dhcpsrv/cfg_globals.h src/lib/dhcpsrv/ncr_generator.cc src/lib/dhcpsrv/network.cc src/lib/dhcpsrv/network.h src/lib/dhcpsrv/parsers/base_network_parser.cc src/lib/dhcpsrv/parsers/base_network_parser.h src/lib/dhcpsrv/parsers/simple_parser4.cc src/lib/dhcpsrv/parsers/simple_parser6.cc src/lib/dhcpsrv/srv_config.cc src/lib/dhcpsrv/srv_config.h src/lib/dhcpsrv/tests/d2_udp_unittest.cc src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc src/lib/dhcpsrv/tests/ncr_generator_unittest.cc src/lib/dhcpsrv/tests/network_unittest.cc src/lib/dhcpsrv/tests/srv_config_unittest.cc
This commit is contained in:
@@ -687,6 +687,7 @@ processDhcp4Config(isc::data::ConstElementPtr config_set) {
|
||||
(config_pair.first == "ddns-qualifying-suffix") ||
|
||||
(config_pair.first == "ddns-update-on-renew") ||
|
||||
(config_pair.first == "ddns-use-conflict-resolution") ||
|
||||
(config_pair.first == "ddns-conflict-resolution-mode") ||
|
||||
(config_pair.first == "ddns-ttl-percent") ||
|
||||
(config_pair.first == "store-extended-info") ||
|
||||
(config_pair.first == "statistic-default-sample-count") ||
|
||||
|
Reference in New Issue
Block a user