diff options
| author | Thomas Markwalder <tmark@isc.org> | 2017-12-07 10:29:40 -0500 |
|---|---|---|
| committer | Thomas Markwalder <tmark@isc.org> | 2017-12-07 10:29:40 -0500 |
| commit | b53ba1572c0d9ef0cb57c85904b11f59be032b61 (patch) | |
| tree | 7b822886e83410d5b2f8e978832b987ed39e0dc1 /server | |
| parent | 60882b8aa5350e459dda807ee819b39e2af41593 (diff) | |
| download | isc-dhcp-b53ba1572c0d9ef0cb57c85904b11f59be032b61.tar.gz | |
[master] Changes prefix-length-mode default to be "prefer"
Merges in rt45615.
Diffstat (limited to 'server')
| -rw-r--r-- | server/dhcpd.c | 2 | ||||
| -rw-r--r-- | server/dhcpd.conf.5 | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/server/dhcpd.c b/server/dhcpd.c index 66944717..fbbb37c0 100644 --- a/server/dhcpd.c +++ b/server/dhcpd.c @@ -77,7 +77,7 @@ option server.ddns-rev-domainname = \"in-addr.arpa.\";"; int ddns_update_style; int dont_use_fsync = 0; /* 0 = default, use fsync, 1 = don't use fsync */ int server_id_check = 0; /* 0 = default, don't check server id, 1 = do check */ -int prefix_length_mode = PLM_EXACT; +int prefix_length_mode = PLM_PREFER; int authoring_byte_order = 0; /* 0 = not set */ int lease_id_format = TOKEN_OCTAL; /* octal by default */ diff --git a/server/dhcpd.conf.5 b/server/dhcpd.conf.5 index 8251574b..a0d88a83 100644 --- a/server/dhcpd.conf.5 +++ b/server/dhcpd.conf.5 @@ -2922,11 +2922,11 @@ available prefix. .PP 2. prefer - The server will offer the first available prefix with the same length as the requested length. If none are found then it will offer the -first available prefix of any length. +first available prefix of any length. This is the default behavior. .PP 3. exact - The server will offer the first available prefix with the same length as the requested length. If none are found, it will return a status -indicating no prefixes available. This is the default behavior. +indicating no prefixes available. .PP 4. minimum - The server will offer the first available prefix with the same length as the requested length. If none are found, it will return the first |