Take mandatory options out of default priority list; add user class identifier

diff --git a/common/tables.c b/common/tables.c
index eb65d6f84b3697670f744fdc0fd5cb9bb392ecc5..ada34a6a3ba2895a0133a585c8e5601d4a837a91 100644 (file)
--- 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,

diff --git a/tables.c b/tables.c
index eb65d6f84b3697670f744fdc0fd5cb9bb392ecc5..ada34a6a3ba2895a0133a585c8e5601d4a837a91 100644 (file)
--- a/tables.c
+++ b/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,