diff options
| author | Ted Lemon <source@isc.org> | 1996-02-29 18:36:43 +0000 |
|---|---|---|
| committer | Ted Lemon <source@isc.org> | 1996-02-29 18:36:43 +0000 |
| commit | 1672a2bd0bcd095fd895796842d4f50aeadd82b1 (patch) | |
| tree | 5783a71caa197b845fa485b80516ac35b674aabc | |
| parent | ee56203f8871e9c29ffc61653b7685e748a2fff6 (diff) | |
| download | isc-dhcp-1672a2bd0bcd095fd895796842d4f50aeadd82b1.tar.gz | |
Take mandatory options out of default priority list; add user class identifier
| -rw-r--r-- | common/tables.c | 8 | ||||
| -rw-r--r-- | tables.c | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/common/tables.c b/common/tables.c index eb65d6f8..ada34a6a 100644 --- a/common/tables.c +++ b/common/tables.c @@ -126,7 +126,7 @@ struct option dhcp_options [256] = { { "dhcp-renewal-time", "L", &dhcp_universe, 58 }, { "dhcp-rebinding-time", "L", &dhcp_universe, 59 }, { "dhcp-class-identifier", "t", &dhcp_universe, 60 }, - { "dhcp-client-identifier", "t", &dhcp_universe, 61 }, + { "dhcp-client-identifier", "BA", &dhcp_universe, 61 }, { "option-62", "", &dhcp_universe, 62 }, { "option-63", "", &dhcp_universe, 63 }, { "option-64", "", &dhcp_universe, 64 }, @@ -142,7 +142,7 @@ struct option dhcp_options [256] = { { "option-74", "", &dhcp_universe, 74 }, { "option-75", "", &dhcp_universe, 75 }, { "option-76", "", &dhcp_universe, 76 }, - { "option-77", "", &dhcp_universe, 77 }, + { "dhcp-user-class-identifier", "t", &dhcp_universe, 77 }, { "option-78", "", &dhcp_universe, 78 }, { "option-79", "", &dhcp_universe, 79 }, { "option-80", "", &dhcp_universe, 80 }, @@ -327,11 +327,7 @@ struct option dhcp_options [256] = { mistaken for a carefully crafted and optimized list). */ unsigned char dhcp_option_default_priority_list [] = { DHO_DHCP_REQUESTED_ADDRESS, - DHO_DHCP_LEASE_TIME, - DHO_DHCP_MESSAGE_TYPE, DHO_DHCP_OPTION_OVERLOAD, - DHO_DHCP_SERVER_IDENTIFIER, - DHO_DHCP_MESSAGE, DHO_DHCP_MAX_MESSAGE_SIZE, DHO_DHCP_RENEWAL_TIME, DHO_DHCP_REBINDING_TIME, @@ -126,7 +126,7 @@ struct option dhcp_options [256] = { { "dhcp-renewal-time", "L", &dhcp_universe, 58 }, { "dhcp-rebinding-time", "L", &dhcp_universe, 59 }, { "dhcp-class-identifier", "t", &dhcp_universe, 60 }, - { "dhcp-client-identifier", "t", &dhcp_universe, 61 }, + { "dhcp-client-identifier", "BA", &dhcp_universe, 61 }, { "option-62", "", &dhcp_universe, 62 }, { "option-63", "", &dhcp_universe, 63 }, { "option-64", "", &dhcp_universe, 64 }, @@ -142,7 +142,7 @@ struct option dhcp_options [256] = { { "option-74", "", &dhcp_universe, 74 }, { "option-75", "", &dhcp_universe, 75 }, { "option-76", "", &dhcp_universe, 76 }, - { "option-77", "", &dhcp_universe, 77 }, + { "dhcp-user-class-identifier", "t", &dhcp_universe, 77 }, { "option-78", "", &dhcp_universe, 78 }, { "option-79", "", &dhcp_universe, 79 }, { "option-80", "", &dhcp_universe, 80 }, @@ -327,11 +327,7 @@ struct option dhcp_options [256] = { mistaken for a carefully crafted and optimized list). */ unsigned char dhcp_option_default_priority_list [] = { DHO_DHCP_REQUESTED_ADDRESS, - DHO_DHCP_LEASE_TIME, - DHO_DHCP_MESSAGE_TYPE, DHO_DHCP_OPTION_OVERLOAD, - DHO_DHCP_SERVER_IDENTIFIER, - DHO_DHCP_MESSAGE, DHO_DHCP_MAX_MESSAGE_SIZE, DHO_DHCP_RENEWAL_TIME, DHO_DHCP_REBINDING_TIME, |