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

[master] Merge branch 'trac3887'

Browse Source
This commit is contained in:
Marcin Siodelski
2015-06-30 14:21:08 +02:00
parent 1c1902f5a7 20081a5c5c
commit 54d1dbe613
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/guide/dhcp4-srv.xml
View File

@@ -921,7 +921,7 @@ temporarily override a list of interface names and listen on all interfaces.
<row><entry>time-offset</entry><entry>2</entry><entry>int32</entry><entry>false</entry></row> <row><entry>time-offset</entry><entry>2</entry><entry>int32</entry><entry>false</entry></row>
<row><entry>routers</entry><entry>3</entry><entry>ipv4-address</entry><entry>true</entry></row> <row><entry>routers</entry><entry>3</entry><entry>ipv4-address</entry><entry>true</entry></row>
<row><entry>time-servers</entry><entry>4</entry><entry>ipv4-address</entry><entry>true</entry></row> <row><entry>time-servers</entry><entry>4</entry><entry>ipv4-address</entry><entry>true</entry></row>
<row><entry>name-servers</entry><entry>5</entry><entry>ipv4-address</entry><entry>false</entry></row> <row><entry>name-servers</entry><entry>5</entry><entry>ipv4-address</entry><entry>true</entry></row>
<row><entry>domain-name-servers</entry><entry>6</entry><entry>ipv4-address</entry><entry>true</entry></row> <row><entry>domain-name-servers</entry><entry>6</entry><entry>ipv4-address</entry><entry>true</entry></row>
<row><entry>log-servers</entry><entry>7</entry><entry>ipv4-address</entry><entry>true</entry></row> <row><entry>log-servers</entry><entry>7</entry><entry>ipv4-address</entry><entry>true</entry></row>
<row><entry>cookie-servers</entry><entry>8</entry><entry>ipv4-address</entry><entry>true</entry></row> <row><entry>cookie-servers</entry><entry>8</entry><entry>ipv4-address</entry><entry>true</entry></row>

2
src/lib/dhcp/std_option_defs.h
View File

@@ -80,7 +80,7 @@ const OptionDefParams OPTION_DEF_PARAMS4[] = {
{ "routers", DHO_ROUTERS, OPT_IPV4_ADDRESS_TYPE, true, NO_RECORD_DEF, "" }, { "routers", DHO_ROUTERS, OPT_IPV4_ADDRESS_TYPE, true, NO_RECORD_DEF, "" },
{ "time-servers", DHO_TIME_SERVERS, OPT_IPV4_ADDRESS_TYPE, true, NO_RECORD_DEF, "" }, { "time-servers", DHO_TIME_SERVERS, OPT_IPV4_ADDRESS_TYPE, true, NO_RECORD_DEF, "" },
{ "name-servers", DHO_NAME_SERVERS, OPT_IPV4_ADDRESS_TYPE, { "name-servers", DHO_NAME_SERVERS, OPT_IPV4_ADDRESS_TYPE,
false, NO_RECORD_DEF, "" }, true, NO_RECORD_DEF, "" },
{ "domain-name-servers", DHO_DOMAIN_NAME_SERVERS, { "domain-name-servers", DHO_DOMAIN_NAME_SERVERS,
OPT_IPV4_ADDRESS_TYPE, true, NO_RECORD_DEF, "" }, OPT_IPV4_ADDRESS_TYPE, true, NO_RECORD_DEF, "" },
{ "log-servers", DHO_LOG_SERVERS, OPT_IPV4_ADDRESS_TYPE, true, NO_RECORD_DEF, "" }, { "log-servers", DHO_LOG_SERVERS, OPT_IPV4_ADDRESS_TYPE, true, NO_RECORD_DEF, "" },

2
src/lib/dhcp/tests/libdhcp++_unittest.cc
View File

@@ -725,7 +725,7 @@ TEST_F(LibDhcpTest, stdOptionDefs4) {
typeid(Option4AddrLst)); typeid(Option4AddrLst));
LibDhcpTest::testStdOptionDefs4(DHO_NAME_SERVERS, begin, end, LibDhcpTest::testStdOptionDefs4(DHO_NAME_SERVERS, begin, end,
typeid(OptionCustom)); typeid(Option4AddrLst));
LibDhcpTest::testStdOptionDefs4(DHO_DOMAIN_NAME_SERVERS, begin, end, LibDhcpTest::testStdOptionDefs4(DHO_DOMAIN_NAME_SERVERS, begin, end,
typeid(Option4AddrLst)); typeid(Option4AddrLst));