diff options
| author | Francis Dupont <fdupont@isc.org> | 2020-09-30 15:14:16 +0200 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2020-09-30 15:14:16 +0200 |
| commit | 812cd4a7f8032047a3daa18e4f505efb146c687e (patch) | |
| tree | 3407ba77975753e92fbd633069c7d07ca547bdc6 | |
| parent | 792db388fd7a50e718fd52ba2c1458783be7e6ec (diff) | |
| download | isc-dhcp-812cd4a7f8032047a3daa18e4f505efb146c687e.tar.gz | |
Revert last commit
| -rw-r--r-- | common/tables.c | 3 | ||||
| -rw-r--r-- | includes/dhcp.h | 1 | ||||
| -rw-r--r-- | includes/site.h | 1 | ||||
| -rw-r--r-- | keama/options.c | 1 |
4 files changed, 0 insertions, 6 deletions
diff --git a/common/tables.c b/common/tables.c index 0d735004..50d9cf10 100644 --- a/common/tables.c +++ b/common/tables.c @@ -209,9 +209,6 @@ static struct option dhcp_options[] = { { "pcode", "t", &dhcp_universe, 100, 1 }, { "tcode", "t", &dhcp_universe, 101, 1 }, #endif -#if defined(RFC8925_OPTIONS) - { "v6-only-preferred", "L", &dhcp_universe, 108, 1 }, -#endif { "netinfo-server-address", "Ia", &dhcp_universe, 112, 1 }, { "netinfo-server-tag", "t", &dhcp_universe, 113, 1 }, { "default-url", "t", &dhcp_universe, 114, 1 }, diff --git a/includes/dhcp.h b/includes/dhcp.h index 84316924..0a74137e 100644 --- a/includes/dhcp.h +++ b/includes/dhcp.h @@ -156,7 +156,6 @@ struct dhcp_packet { #define DHO_AUTHENTICATE 90 /* RFC3118, was 210 */ #define DHO_CLIENT_LAST_TRANSACTION_TIME 91 #define DHO_ASSOCIATED_IP 92 -#define DHO_V6_ONLY_PREFERRED 108 /* RFC8925 */ #define DHO_SUBNET_SELECTION 118 /* RFC3011! */ #define DHO_DOMAIN_SEARCH 119 /* RFC3397 */ #define DHO_VIVCO_SUBOPTIONS 124 diff --git a/includes/site.h b/includes/site.h index 533e762b..2ef69e41 100644 --- a/includes/site.h +++ b/includes/site.h @@ -374,4 +374,3 @@ #define RFC7341_OPTIONS #define RFC7618_OPTIONS #define RFC7710_OPTIONS -#define RFC8925_OPTIONS diff --git a/keama/options.c b/keama/options.c index 7d1e66ea..3f714108 100644 --- a/keama/options.c +++ b/keama/options.c @@ -170,7 +170,6 @@ struct option_def options4[] = { { "geoconf-civic", "X", "dhcp", 99, 2}, { "pcode", "t", "dhcp", 100, 2}, { "tcode", "t", "dhcp", 101, 2}, - { "v6-only-preferred", "L", "dhcp", 108, 2}, { "netinfo-server-address", "Ia", "dhcp", 112, 2}, { "netinfo-server-tag", "t", "dhcp", 113, 2}, { "default-url", "t", "dhcp", 114, 2}, |