mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-31 14:05:33 +00:00
Code Issues Releases Wiki Activity

[#2276] clean up

Browse Source 
/doc/examples/kea4/all-keys.json
/doc/examples/kea6/all-keys.json
    Commented out ddns-use-conflict-resolution
    Added ddns-conflict-resolution-mode

/src/bin/dhcp4/dhcp4_parser.yy b/src/bin/dhcp4/dhcp4_parser.yy
/src/bin/dhcp4/dhcp4_parser.yy b/src/bin/dhcp6/dhcp6_parser.yy
    Translates ddns-use-conflict-resolution
    to ddns-conflict-resolution-mode

/src/lib/dhcpsrv/cfg_globals.cc
/src/lib/dhcpsrv/cfg_globals.h
    Removed ddns-use-conflict-resolution

/src/lib/dhcpsrv/parsers/simple_parser4.cc
/src/lib/dhcpsrv/parsers/simple_parser6.cc
    removed ddns-use-conflict-resolution
This commit is contained in:
Thomas Markwalder
2023-06-05 10:51:40 -04:00
parent 54905229fd
commit f1523a6674
13 changed files with 1591 additions and 1582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
doc/examples/kea4/all-keys.json
View File

@@ -213,7 +213,7 @@
// It may be specified at the global, shared-network, and subnet levels.
// This field has been replaced by ddns-conflict-resolution-mode.
// Parsing is maintained only for backwards compatibility.
"ddns-use-conflict-resolution": true,
// "ddns-use-conflict-resolution": true,
// Enumeration, which is passed to kea-dhcp-ddns with each DDNS
// update request to indicate the mode used for resolving conflicts
@@ -772,7 +772,7 @@
// Shared-network level value. See description at the global level.
// This field has been replaced by ddns-conflict-resolution-mode.
// Parsing is maintained only for backwards compatibility.
"ddns-use-conflict-resolution": true,
// "ddns-use-conflict-resolution": true,
// Shared-network level value. See description at the global level.
"ddns-conflict-resolution-mode": "check-with-dhcid",
@@ -916,10 +916,10 @@
// Subnet-level value. See description at the global level.
"ddns-update-on-renew": true,
// Subnet-level value. See description at the global level.
// Shared-network level value. See description at the global level.
// This field has been replaced by ddns-conflict-resolution-mode.
// Parsing is maintained only for backwards compatibility.
"ddns-use-conflict-resolution": true,
// "ddns-use-conflict-resolution": true,
// Subnet-level value. See description at the global level.
"ddns-conflict-resolution-mode": "check-with-dhcid",

6
doc/examples/kea6/all-keys.json
View File

@@ -164,7 +164,7 @@
// It may be specified at the global, shared-network, and subnet levels.
// This field has been replaced by ddns-conflict-resolution-mode.
// Parsing is maintained only for backwards compatibility.
"ddns-use-conflict-resolution": true,
// "ddns-use-conflict-resolution": true,
// Enumeration, which is passed to kea-dhcp-ddns with each DDNS
// update request to indicate the mode used for resolving conflicts
@@ -715,7 +715,7 @@
// Shared-network level value. See description at the global level.
// This field has been replaced by ddns-conflict-resolution-mode.
// Parsing is maintained only for backwards compatibility.
"ddns-use-conflict-resolution": true,
// "ddns-use-conflict-resolution": true,
// Shared-network level value. See description at the global level.
"ddns-conflict-resolution-mode": "check-with-dhcid",
@@ -854,7 +854,7 @@
// Subnet-level value. See description at the global level.
// This field has been replaced by ddns-conflict-resolution-mode.
// Parsing is maintained only for backwards compatibility.
"ddns-use-conflict-resolution": true,
// "ddns-use-conflict-resolution": true,
// Subnet-level value. See description at the global level.
"ddns-conflict-resolution-mode": "check-with-dhcid",