From: Thomas Markwalder Date: Mon, 7 Oct 2019 14:36:45 +0000 (-0400) Subject: [#35,!517] Removed ddns params from INHERIT_TO_SUBNETX lists X-Git-Tag: tmark-post-35-refactor~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f60cb9dd752343a0997a90cecdb79c768440265;p=thirdparty%2Fkea.git [#35,!517] Removed ddns params from INHERIT_TO_SUBNETX lists src/bin/dhcp4/tests/get_config_unittest.cc src/bin/dhcp6/tests/get_config_unittest.cc regenerated tests src/lib/dhcpsrv/parsers/simple_parser4.cc Removed DDNS params from INHERIT_TO_SUBNET4 list src/lib/dhcpsrv/parsers/simple_parser6.cc Removed DDNS params from INHERIT_TO_SUBNET6 list --- diff --git a/src/bin/dhcp4/tests/get_config_unittest.cc b/src/bin/dhcp4/tests/get_config_unittest.cc index ac2a2aeeb1..a45e1fa8b1 100644 --- a/src/bin/dhcp4/tests/get_config_unittest.cc +++ b/src/bin/dhcp4/tests/get_config_unittest.cc @@ -2267,12 +2267,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -2364,12 +2358,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -2464,12 +2452,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"max-valid-lifetime\": 5000,\n" @@ -2565,12 +2547,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -2599,12 +2575,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 2,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -2633,12 +2603,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 3,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -2667,12 +2631,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 4,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -2766,12 +2724,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1024,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -2800,12 +2752,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 100,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -2834,12 +2780,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -2868,12 +2808,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 34,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -2968,12 +2902,6 @@ const char* UNPARSED_CONFIGS[] = { " \"authoritative\": false,\n" " \"boot-file-name\": \"bar\",\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"1.2.3.4\",\n" @@ -3069,12 +2997,6 @@ const char* UNPARSED_CONFIGS[] = { " \"authoritative\": false,\n" " \"boot-file-name\": \"bar\",\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"1.2.3.4\",\n" @@ -3170,12 +3092,6 @@ const char* UNPARSED_CONFIGS[] = { " \"authoritative\": false,\n" " \"boot-file-name\": \"bootfile.efi\",\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"1.2.3.4\",\n" @@ -3270,12 +3186,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -3369,12 +3279,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -3468,12 +3372,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -3502,12 +3400,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 2,\n" " \"match-client-id\": false,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -3601,12 +3493,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": false,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -3635,12 +3521,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 2,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -3734,12 +3614,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": true,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -3768,12 +3642,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 2,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -3867,12 +3735,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -3901,12 +3763,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": true,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 2,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -4002,12 +3858,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"max-valid-lifetime\": 5,\n" @@ -4103,12 +3953,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -4141,12 +3985,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 2,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -4244,12 +4082,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -4873,12 +4705,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -4972,12 +4798,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -5115,12 +4935,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -5367,12 +5181,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -5475,12 +5283,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -5591,12 +5393,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -5634,12 +5430,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 2,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -5742,12 +5532,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -5858,12 +5642,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -5996,12 +5774,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -6239,12 +6011,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -6353,12 +6119,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -6471,12 +6231,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -6698,12 +6452,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -6799,14 +6547,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"test.prefix\",\n" -" \"ddns-override-client-update\": true,\n" -" \"ddns-override-no-update\": true,\n" -" \"ddns-qualifying-suffix\": \"test.suffix.\",\n" -" \"ddns-replace-client-name\": \"when-present\",\n" -" \"ddns-send-updates\": true,\n" -" \"hostname-char-replacement\": \"x\",\n" -" \"hostname-char-set\": \"[^A-Z]\",\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -6902,14 +6642,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"global.prefix\",\n" -" \"ddns-override-client-update\": true,\n" -" \"ddns-override-no-update\": true,\n" -" \"ddns-qualifying-suffix\": \"global.suffix.\",\n" -" \"ddns-replace-client-name\": \"always\",\n" -" \"ddns-send-updates\": false,\n" -" \"hostname-char-replacement\": \"x\",\n" -" \"hostname-char-set\": \"[^A-Z]\",\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -7003,12 +6735,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -7102,12 +6828,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -7202,12 +6922,6 @@ const char* UNPARSED_CONFIGS[] = { " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" " \"client-class\": \"alpha\",\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -7237,12 +6951,6 @@ const char* UNPARSED_CONFIGS[] = { " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" " \"client-class\": \"beta\",\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 2,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -7272,12 +6980,6 @@ const char* UNPARSED_CONFIGS[] = { " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" " \"client-class\": \"gamma\",\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 3,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -7306,12 +7008,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 4,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -7405,12 +7101,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -7519,12 +7209,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 123,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -7553,12 +7237,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 234,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -7642,12 +7320,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 542,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -7799,12 +7471,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 234,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -7918,12 +7584,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -7952,12 +7612,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 2,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -7986,12 +7640,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 3,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -8020,12 +7668,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 4,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -8119,12 +7761,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -8153,12 +7789,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 2,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -8500,12 +8130,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -8599,12 +8223,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"2001:db8::123/45\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -8698,12 +8316,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -8797,12 +8409,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"2001:db8::543/21\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -8896,12 +8502,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -9021,12 +8621,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -9120,12 +8714,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -9219,12 +8807,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -9319,12 +8901,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -9423,12 +8999,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -9661,12 +9231,6 @@ const char* UNPARSED_CONFIGS[] = { " \"comment\": \"A shared network\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"name\": \"foo\",\n" @@ -9684,12 +9248,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 100,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -9864,12 +9422,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 123,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -9898,12 +9450,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 542,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -9991,12 +9537,6 @@ const char* UNPARSED_CONFIGS[] = { " {\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"interface\": \"\",\n" " \"match-client-id\": true,\n" " \"name\": \"foo\",\n" @@ -10013,12 +9553,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 100,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -10045,12 +9579,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 200,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -10084,12 +9612,6 @@ const char* UNPARSED_CONFIGS[] = { " \"4o6-subnet\": \"\",\n" " \"authoritative\": false,\n" " \"calculate-tee-times\": false,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 300,\n" " \"match-client-id\": true,\n" " \"next-server\": \"0.0.0.0\",\n" @@ -10115,6 +9637,7 @@ const char* UNPARSED_CONFIGS[] = { " \"t2-percent\": 0.875,\n" " \"valid-lifetime\": 4000\n" " }\n" + }; /// @brief the number of configurations diff --git a/src/bin/dhcp6/tests/get_config_unittest.cc b/src/bin/dhcp6/tests/get_config_unittest.cc index 1f79f578e0..dd4c6a8d33 100644 --- a/src/bin/dhcp6/tests/get_config_unittest.cc +++ b/src/bin/dhcp6/tests/get_config_unittest.cc @@ -1919,211 +1919,6 @@ const char* EXTRACTED_CONFIGS[] = { " }\n" " ],\n" " \"valid-lifetime\": 4000\n" -" }\n", - // CONFIGURATION 60 -"{\n" -" \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" -" \"decline-probation-period\": 86400,\n" -" \"dhcp-ddns\": {\n" -" \"enable-updates\": false,\n" -" \"max-queue-size\": 1024,\n" -" \"ncr-format\": \"JSON\",\n" -" \"ncr-protocol\": \"UDP\",\n" -" \"sender-ip\": \"0.0.0.0\",\n" -" \"sender-port\": 0,\n" -" \"server-ip\": \"127.0.0.1\",\n" -" \"server-port\": 53001\n" -" },\n" -" \"dhcp-queue-control\": {\n" -" \"capacity\": 500,\n" -" \"enable-queue\": false,\n" -" \"queue-type\": \"kea-ring6\"\n" -" },\n" -" \"dhcp4o6-port\": 0,\n" -" \"expired-leases-processing\": {\n" -" \"flush-reclaimed-timer-wait-time\": 25,\n" -" \"hold-reclaimed-time\": 3600,\n" -" \"max-reclaim-leases\": 100,\n" -" \"max-reclaim-time\": 250,\n" -" \"reclaim-timer-wait-time\": 10,\n" -" \"unwarned-reclaim-cycles\": 5\n" -" },\n" -" \"hooks-libraries\": [ ],\n" -" \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n" -" \"interfaces-config\": {\n" -" \"interfaces\": [ \"*\" ],\n" -" \"re-detect\": false\n" -" },\n" -" \"lease-database\": {\n" -" \"type\": \"memfile\"\n" -" },\n" -" \"mac-sources\": [ \"any\" ],\n" -" \"option-data\": [ ],\n" -" \"option-def\": [ ],\n" -" \"preferred-lifetime\": 3000,\n" -" \"rebind-timer\": 2000,\n" -" \"relay-supplied-options\": [ \"65\" ],\n" -" \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" -" \"reservations\": [\n" -" {\n" -" \"client-classes\": [ ],\n" -" \"hostname\": \"\",\n" -" \"hw-address\": \"01:02:03:04:05:06\",\n" -" \"ip-addresses\": [ \"2001:db8:2::abcd\" ],\n" -" \"option-data\": [\n" -" {\n" -" \"always-send\": false,\n" -" \"code\": 23,\n" -" \"csv-format\": true,\n" -" \"data\": \"2001:db8:2::abbc\",\n" -" \"name\": \"dns-servers\",\n" -" \"space\": \"dhcp6\"\n" -" },\n" -" {\n" -" \"always-send\": false,\n" -" \"code\": 7,\n" -" \"csv-format\": true,\n" -" \"data\": \"25\",\n" -" \"name\": \"preference\",\n" -" \"space\": \"dhcp6\"\n" -" }\n" -" ],\n" -" \"prefixes\": [ ]\n" -" },\n" -" {\n" -" \"client-classes\": [ ],\n" -" \"duid\": \"01:02:03:04:05:06:07:08:09:0a\",\n" -" \"hostname\": \"\",\n" -" \"ip-addresses\": [ \"2001:db8:2::1234\" ],\n" -" \"option-data\": [\n" -" {\n" -" \"always-send\": false,\n" -" \"code\": 23,\n" -" \"csv-format\": true,\n" -" \"data\": \"2001:db8:2::1111\",\n" -" \"name\": \"dns-servers\",\n" -" \"space\": \"dhcp6\"\n" -" },\n" -" {\n" -" \"always-send\": false,\n" -" \"code\": 7,\n" -" \"csv-format\": true,\n" -" \"data\": \"11\",\n" -" \"name\": \"preference\",\n" -" \"space\": \"dhcp6\"\n" -" }\n" -" ],\n" -" \"prefixes\": [ ]\n" -" }\n" -" ],\n" -" \"sanity-checks\": {\n" -" \"lease-checks\": \"warn\"\n" -" },\n" -" \"server-id\": {\n" -" \"enterprise-id\": 0,\n" -" \"htype\": 0,\n" -" \"identifier\": \"\",\n" -" \"persist\": true,\n" -" \"time\": 0,\n" -" \"type\": \"LLT\"\n" -" },\n" -" \"server-tag\": \"\",\n" -" \"shared-networks\": [ ],\n" -" \"subnet6\": [\n" -" {\n" -" \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" -" \"id\": 123,\n" -" \"option-data\": [ ],\n" -" \"pd-pools\": [ ],\n" -" \"pools\": [\n" -" {\n" -" \"option-data\": [ ],\n" -" \"pool\": \"2001:db8:1::/80\"\n" -" }\n" -" ],\n" -" \"preferred-lifetime\": 3000,\n" -" \"rapid-commit\": false,\n" -" \"rebind-timer\": 2000,\n" -" \"relay\": {\n" -" \"ip-addresses\": [ ]\n" -" },\n" -" \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" -" \"reservations\": [ ],\n" -" \"subnet\": \"2001:db8:1::/64\",\n" -" \"t1-percent\": 0.5,\n" -" \"t2-percent\": 0.8,\n" -" \"valid-lifetime\": 4000\n" -" },\n" -" {\n" -" \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" -" \"id\": 234,\n" -" \"option-data\": [ ],\n" -" \"pd-pools\": [ ],\n" -" \"pools\": [ ],\n" -" \"preferred-lifetime\": 3000,\n" -" \"rapid-commit\": false,\n" -" \"rebind-timer\": 2000,\n" -" \"relay\": {\n" -" \"ip-addresses\": [ ]\n" -" },\n" -" \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" -" \"reservations\": [ ],\n" -" \"subnet\": \"2001:db8:2::/64\",\n" -" \"t1-percent\": 0.5,\n" -" \"t2-percent\": 0.8,\n" -" \"valid-lifetime\": 4000\n" -" },\n" -" {\n" -" \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" -" \"id\": 542,\n" -" \"option-data\": [ ],\n" -" \"pd-pools\": [ ],\n" -" \"pools\": [ ],\n" -" \"preferred-lifetime\": 3000,\n" -" \"rapid-commit\": false,\n" -" \"rebind-timer\": 2000,\n" -" \"relay\": {\n" -" \"ip-addresses\": [ ]\n" -" },\n" -" \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" -" \"reservations\": [ ],\n" -" \"subnet\": \"2001:db8:3::/64\",\n" -" \"t1-percent\": 0.5,\n" -" \"t2-percent\": 0.8,\n" -" \"valid-lifetime\": 4000\n" -" }\n" -" ],\n" -" \"t1-percent\": 0.5,\n" -" \"t2-percent\": 0.8,\n" -" \"valid-lifetime\": 4000\n" " }\n" }; @@ -2270,12 +2065,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"max-preferred-lifetime\": 4000,\n" " \"max-valid-lifetime\": 5000,\n" @@ -2375,12 +2164,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -2406,12 +2189,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 2,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -2437,12 +2214,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 3,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -2468,12 +2239,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 4,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -2569,12 +2334,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1024,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -2600,12 +2359,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 100,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -2631,12 +2384,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -2662,12 +2409,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 34,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -2763,12 +2504,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -2794,12 +2529,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 2,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -2825,12 +2554,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 3,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -2856,12 +2579,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 4,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -2961,12 +2678,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"max-preferred-lifetime\": 4,\n" " \"max-valid-lifetime\": 5,\n" @@ -3066,12 +2777,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"interface\": \"eth0\",\n" " \"option-data\": [ ],\n" @@ -3168,12 +2873,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"interface-id\": \"foobar\",\n" " \"option-data\": [ ],\n" @@ -3270,12 +2969,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -3305,12 +2998,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 2,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -3410,12 +3097,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -3511,12 +3192,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [\n" @@ -3614,12 +3289,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [\n" @@ -3719,12 +3388,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [\n" @@ -3839,12 +3502,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [\n" @@ -4353,12 +4010,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -4454,12 +4105,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [\n" " {\n" @@ -4599,12 +4244,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -4858,12 +4497,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -4959,12 +4592,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [\n" " {\n" @@ -4999,12 +4626,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 2,\n" " \"option-data\": [\n" " {\n" @@ -5109,12 +4730,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [\n" @@ -5278,12 +4893,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -5398,12 +5007,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -5637,12 +5240,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -5738,12 +5335,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -5840,12 +5431,6 @@ const char* UNPARSED_CONFIGS[] = { " {\n" " \"calculate-tee-times\": true,\n" " \"client-class\": \"alpha\",\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -5872,12 +5457,6 @@ const char* UNPARSED_CONFIGS[] = { " {\n" " \"calculate-tee-times\": true,\n" " \"client-class\": \"beta\",\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 2,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -5904,12 +5483,6 @@ const char* UNPARSED_CONFIGS[] = { " {\n" " \"calculate-tee-times\": true,\n" " \"client-class\": \"gamma\",\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 3,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -5935,12 +5508,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 4,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -6036,12 +5603,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -6152,12 +5713,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [\n" @@ -6276,12 +5831,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -6379,14 +5928,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"test.prefix\",\n" -" \"ddns-override-client-update\": true,\n" -" \"ddns-override-no-update\": true,\n" -" \"ddns-qualifying-suffix\": \"test.suffix.\",\n" -" \"ddns-replace-client-name\": \"when-present\",\n" -" \"ddns-send-updates\": true,\n" -" \"hostname-char-replacement\": \"x\",\n" -" \"hostname-char-set\": \"[^A-Z]\",\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -6484,14 +6025,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"global.prefix\",\n" -" \"ddns-override-client-update\": true,\n" -" \"ddns-override-no-update\": true,\n" -" \"ddns-qualifying-suffix\": \"global.suffix.\",\n" -" \"ddns-replace-client-name\": \"always\",\n" -" \"ddns-send-updates\": false,\n" -" \"hostname-char-replacement\": \"x\",\n" -" \"hostname-char-set\": \"[^A-Z]\",\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -6587,12 +6120,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 123,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -6618,12 +6145,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 234,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -6695,12 +6216,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 542,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -6835,12 +6350,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 234,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -7087,12 +6596,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -7118,12 +6621,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 2,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -7149,12 +6646,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 3,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -7180,12 +6671,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 4,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -7211,12 +6696,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 5,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -7312,12 +6791,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -7343,12 +6816,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 2,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -7795,12 +7262,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -7896,12 +7357,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -7997,12 +7452,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -8099,12 +7548,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -8206,12 +7649,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -8313,12 +7750,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [\n" @@ -8416,12 +7847,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [\n" @@ -8520,12 +7945,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 1,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [\n" @@ -8760,12 +8179,6 @@ const char* UNPARSED_CONFIGS[] = { " {\n" " \"comment\": \"A shared network\",\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"interface\": \"\",\n" " \"name\": \"foo\",\n" " \"option-data\": [ ],\n" @@ -8779,12 +8192,6 @@ const char* UNPARSED_CONFIGS[] = { " {\n" " \"comment\": \"A subnet\",\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 100,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [\n" @@ -8965,217 +8372,6 @@ const char* UNPARSED_CONFIGS[] = { " \"subnet6\": [\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" -" \"id\": 123,\n" -" \"option-data\": [ ],\n" -" \"pd-pools\": [ ],\n" -" \"pools\": [\n" -" {\n" -" \"option-data\": [ ],\n" -" \"pool\": \"2001:db8:1::/80\"\n" -" }\n" -" ],\n" -" \"preferred-lifetime\": 3000,\n" -" \"rapid-commit\": false,\n" -" \"rebind-timer\": 2000,\n" -" \"relay\": {\n" -" \"ip-addresses\": [ ]\n" -" },\n" -" \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" -" \"reservations\": [ ],\n" -" \"subnet\": \"2001:db8:1::/64\",\n" -" \"t1-percent\": 0.5,\n" -" \"t2-percent\": 0.8,\n" -" \"valid-lifetime\": 4000\n" -" },\n" -" {\n" -" \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" -" \"id\": 234,\n" -" \"option-data\": [ ],\n" -" \"pd-pools\": [ ],\n" -" \"pools\": [ ],\n" -" \"preferred-lifetime\": 3000,\n" -" \"rapid-commit\": false,\n" -" \"rebind-timer\": 2000,\n" -" \"relay\": {\n" -" \"ip-addresses\": [ ]\n" -" },\n" -" \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" -" \"reservations\": [ ],\n" -" \"subnet\": \"2001:db8:2::/64\",\n" -" \"t1-percent\": 0.5,\n" -" \"t2-percent\": 0.8,\n" -" \"valid-lifetime\": 4000\n" -" },\n" -" {\n" -" \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" -" \"id\": 542,\n" -" \"option-data\": [ ],\n" -" \"pd-pools\": [ ],\n" -" \"pools\": [ ],\n" -" \"preferred-lifetime\": 3000,\n" -" \"rapid-commit\": false,\n" -" \"rebind-timer\": 2000,\n" -" \"relay\": {\n" -" \"ip-addresses\": [ ]\n" -" },\n" -" \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" -" \"reservations\": [ ],\n" -" \"subnet\": \"2001:db8:3::/64\",\n" -" \"t1-percent\": 0.5,\n" -" \"t2-percent\": 0.8,\n" -" \"valid-lifetime\": 4000\n" -" }\n" -" ],\n" -" \"t1-percent\": 0.5,\n" -" \"t2-percent\": 0.8,\n" -" \"valid-lifetime\": 4000\n" -" }\n", - // CONFIGURATION 60 -"{\n" -" \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" -" \"decline-probation-period\": 86400,\n" -" \"dhcp-ddns\": {\n" -" \"enable-updates\": false,\n" -" \"max-queue-size\": 1024,\n" -" \"ncr-format\": \"JSON\",\n" -" \"ncr-protocol\": \"UDP\",\n" -" \"sender-ip\": \"0.0.0.0\",\n" -" \"sender-port\": 0,\n" -" \"server-ip\": \"127.0.0.1\",\n" -" \"server-port\": 53001\n" -" },\n" -" \"dhcp-queue-control\": {\n" -" \"capacity\": 500,\n" -" \"enable-queue\": false,\n" -" \"queue-type\": \"kea-ring6\"\n" -" },\n" -" \"dhcp4o6-port\": 0,\n" -" \"expired-leases-processing\": {\n" -" \"flush-reclaimed-timer-wait-time\": 25,\n" -" \"hold-reclaimed-time\": 3600,\n" -" \"max-reclaim-leases\": 100,\n" -" \"max-reclaim-time\": 250,\n" -" \"reclaim-timer-wait-time\": 10,\n" -" \"unwarned-reclaim-cycles\": 5\n" -" },\n" -" \"hooks-libraries\": [ ],\n" -" \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n" -" \"interfaces-config\": {\n" -" \"interfaces\": [ \"*\" ],\n" -" \"re-detect\": false\n" -" },\n" -" \"lease-database\": {\n" -" \"type\": \"memfile\"\n" -" },\n" -" \"mac-sources\": [ \"any\" ],\n" -" \"option-data\": [ ],\n" -" \"option-def\": [ ],\n" -" \"preferred-lifetime\": 3000,\n" -" \"rebind-timer\": 2000,\n" -" \"relay-supplied-options\": [ \"65\" ],\n" -" \"renew-timer\": 1000,\n" -" \"reservation-mode\": \"all\",\n" -" \"reservations\": [\n" -" {\n" -" \"client-classes\": [ ],\n" -" \"hostname\": \"\",\n" -" \"hw-address\": \"01:02:03:04:05:06\",\n" -" \"ip-addresses\": [ \"2001:db8:2::abcd\" ],\n" -" \"option-data\": [\n" -" {\n" -" \"always-send\": false,\n" -" \"code\": 23,\n" -" \"csv-format\": true,\n" -" \"data\": \"2001:db8:2::abbc\",\n" -" \"name\": \"dns-servers\",\n" -" \"space\": \"dhcp6\"\n" -" },\n" -" {\n" -" \"always-send\": false,\n" -" \"code\": 7,\n" -" \"csv-format\": true,\n" -" \"data\": \"25\",\n" -" \"name\": \"preference\",\n" -" \"space\": \"dhcp6\"\n" -" }\n" -" ],\n" -" \"prefixes\": [ ]\n" -" },\n" -" {\n" -" \"client-classes\": [ ],\n" -" \"duid\": \"01:02:03:04:05:06:07:08:09:0a\",\n" -" \"hostname\": \"\",\n" -" \"ip-addresses\": [ \"2001:db8:2::1234\" ],\n" -" \"option-data\": [\n" -" {\n" -" \"always-send\": false,\n" -" \"code\": 23,\n" -" \"csv-format\": true,\n" -" \"data\": \"2001:db8:2::1111\",\n" -" \"name\": \"dns-servers\",\n" -" \"space\": \"dhcp6\"\n" -" },\n" -" {\n" -" \"always-send\": false,\n" -" \"code\": 7,\n" -" \"csv-format\": true,\n" -" \"data\": \"11\",\n" -" \"name\": \"preference\",\n" -" \"space\": \"dhcp6\"\n" -" }\n" -" ],\n" -" \"prefixes\": [ ]\n" -" }\n" -" ],\n" -" \"sanity-checks\": {\n" -" \"lease-checks\": \"warn\"\n" -" },\n" -" \"server-id\": {\n" -" \"enterprise-id\": 0,\n" -" \"htype\": 0,\n" -" \"identifier\": \"\",\n" -" \"persist\": true,\n" -" \"time\": 0,\n" -" \"type\": \"LLT\"\n" -" },\n" -" \"server-tag\": \"\",\n" -" \"shared-networks\": [ ],\n" -" \"subnet6\": [\n" -" {\n" -" \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 123,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -9201,12 +8397,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 234,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" @@ -9227,12 +8417,6 @@ const char* UNPARSED_CONFIGS[] = { " },\n" " {\n" " \"calculate-tee-times\": true,\n" -" \"ddns-generated-prefix\": \"myhost\",\n" -" \"ddns-override-client-update\": false,\n" -" \"ddns-override-no-update\": false,\n" -" \"ddns-qualifying-suffix\": \"\",\n" -" \"ddns-replace-client-name\": \"never\",\n" -" \"ddns-send-updates\": true,\n" " \"id\": 542,\n" " \"option-data\": [ ],\n" " \"pd-pools\": [ ],\n" diff --git a/src/lib/dhcpsrv/parsers/simple_parser4.cc b/src/lib/dhcpsrv/parsers/simple_parser4.cc index 0224fc1591..d5412eec12 100644 --- a/src/lib/dhcpsrv/parsers/simple_parser4.cc +++ b/src/lib/dhcpsrv/parsers/simple_parser4.cc @@ -110,7 +110,6 @@ const SimpleDefaults SimpleParser4::GLOBAL4_DEFAULTS = { { "ddns-override-client-update", Element::boolean, "false" }, { "ddns-replace-client-name", Element::string, "never" }, { "ddns-generated-prefix", Element::string, "myhost" }, - // TKM should this still be true? qualifying-suffix has no default ?? { "ddns-qualifying-suffix", Element::string, "" } }; @@ -271,15 +270,7 @@ const ParamsList SimpleParser4::INHERIT_TO_SUBNET4 = { "max-valid-lifetime", "calculate-tee-times", "t1-percent", - "t2-percent", - "ddns-send-updates", - "ddns-override-no-update", - "ddns-override-client-update", - "ddns-replace-client-name", - "ddns-generated-prefix", - "ddns-qualifying-suffix", - "hostname-char-set", - "hostname-char-replacement" + "t2-percent" }; /// @brief This table defines all pool parameters. diff --git a/src/lib/dhcpsrv/parsers/simple_parser6.cc b/src/lib/dhcpsrv/parsers/simple_parser6.cc index 9bba170a8d..89319b2de1 100644 --- a/src/lib/dhcpsrv/parsers/simple_parser6.cc +++ b/src/lib/dhcpsrv/parsers/simple_parser6.cc @@ -105,7 +105,6 @@ const SimpleDefaults SimpleParser6::GLOBAL6_DEFAULTS = { { "ddns-override-client-update", Element::boolean, "false" }, { "ddns-replace-client-name", Element::string, "never" }, { "ddns-generated-prefix", Element::string, "myhost" }, - // TKM should this still be true? qualifying-suffix has no default ?? { "ddns-qualifying-suffix", Element::string, "" } }; @@ -252,15 +251,7 @@ const ParamsList SimpleParser6::INHERIT_TO_SUBNET6 = { "max-valid-lifetime", "calculate-tee-times", "t1-percent", - "t2-percent", - "ddns-send-updates", - "ddns-override-no-update", - "ddns-override-client-update", - "ddns-replace-client-name", - "ddns-generated-prefix", - "ddns-qualifying-suffix", - "hostname-char-set", - "hostname-char-replacement" + "t2-percent" }; /// @brief This table defines all pool parameters.