diff options
| author | Mukund Sivaraman <muks@isc.org> | 2014-02-06 10:01:17 +0100 |
|---|---|---|
| committer | Mukund Sivaraman <muks@isc.org> | 2014-02-06 10:01:17 +0100 |
| commit | 8b413f0b6f0325a124af6e170e9c96016d032007 (patch) | |
| tree | e091a297313fbd71ab7fd76472cb9bd2d50c088e /src/lib/dhcp/std_option_defs.h | |
| parent | [2168] Fix more unittests (diff) | |
| parent | Merge branch 'trac956' (diff) | |
| download | kea-8b413f0b6f0325a124af6e170e9c96016d032007.tar.xz kea-8b413f0b6f0325a124af6e170e9c96016d032007.zip | |
Merge branch 'master' into trac2168
Conflicts:
src/lib/dns/tests/rrset_unittest.cc
Diffstat (limited to 'src/lib/dhcp/std_option_defs.h')
| -rw-r--r-- | src/lib/dhcp/std_option_defs.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/dhcp/std_option_defs.h b/src/lib/dhcp/std_option_defs.h index 9f6455338f..6611f199e6 100644 --- a/src/lib/dhcp/std_option_defs.h +++ b/src/lib/dhcp/std_option_defs.h @@ -160,7 +160,7 @@ const OptionDefParams OPTION_DEF_PARAMS4[] = { { "dhcp-rebinding-time", DHO_DHCP_REBINDING_TIME, OPT_UINT32_TYPE, false, NO_RECORD_DEF, "" }, { "vendor-class-identifier", DHO_VENDOR_CLASS_IDENTIFIER, - OPT_BINARY_TYPE, false, NO_RECORD_DEF, "" }, + OPT_STRING_TYPE, false, NO_RECORD_DEF, "" }, { "dhcp-client-identifier", DHO_DHCP_CLIENT_IDENTIFIER, OPT_BINARY_TYPE, false, NO_RECORD_DEF, "" }, { "nwip-domain-name", DHO_NWIP_DOMAIN_NAME, OPT_STRING_TYPE, false, NO_RECORD_DEF, "" }, @@ -230,7 +230,8 @@ RECORD_DECL(REMOTE_ID_RECORDS, OPT_UINT32_TYPE, OPT_BINARY_TYPE); // status-code RECORD_DECL(STATUS_CODE_RECORDS, OPT_UINT16_TYPE, OPT_STRING_TYPE); // vendor-class -RECORD_DECL(VENDOR_CLASS_RECORDS, OPT_UINT32_TYPE, OPT_BINARY_TYPE); +RECORD_DECL(VENDOR_CLASS_RECORDS, OPT_UINT32_TYPE, OPT_UINT16_TYPE, + OPT_STRING_TYPE); /// Standard DHCPv6 option definitions. /// |