diff options
| author |   krw <krw@openbsd.org> | 2015-06-27 14:29:39 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2015-06-27 14:29:39 +0000 |
| commit | 3f461432d6a77eea41f084ef892403cacc2ee370 (patch) | |
| tree | 8ffaf2f390519ced80f6c688b24c1f1156ce5fd3 /usr.sbin/dhcpd/tables.c | |
| parent | Ignore blank characters at the beginning of a conditional block, (diff) | |
| download | wireguard-openbsd-3f461432d6a77eea41f084ef892403cacc2ee370.tar.xz wireguard-openbsd-3f461432d6a77eea41f084ef892403cacc2ee370.zip | |
Do not send routers (option 3) or static routes (option 33) when
classless static routes (option 121, 249) are sent. RFC 3442 says
servers SHOULD NOT send those options.
This avoids confusing clients who fail to ignore the routers or
static routes options in the presence of classless static routes
options. RFC 3442 says clients MUST ignore those options.
Incorrect behavior in MS and Linux clients reported by Juan on
misc@.
ok millert@
Diffstat (limited to 'usr.sbin/dhcpd/tables.c')
| -rw-r--r-- | usr.sbin/dhcpd/tables.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.sbin/dhcpd/tables.c b/usr.sbin/dhcpd/tables.c index 027af5d42c5..3633474d686 100644 --- a/usr.sbin/dhcpd/tables.c +++ b/usr.sbin/dhcpd/tables.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tables.c,v 1.10 2014/01/21 03:07:51 krw Exp $ */ +/* $OpenBSD: tables.c,v 1.11 2015/06/27 14:29:39 krw Exp $ */ /* Tables of information... */ @@ -340,6 +340,8 @@ unsigned char dhcp_option_default_priority_list[256] = { DHO_DHCP_CLIENT_IDENTIFIER, DHO_SUBNET_MASK, DHO_TIME_OFFSET, + DHO_CLASSLESS_STATIC_ROUTES, /* MUST be before DHO_ROUTERS! */ + DHO_CLASSLESS_MS_STATIC_ROUTES, /* DITTO! */ DHO_ROUTERS, DHO_TIME_SERVERS, DHO_NAME_SERVERS, @@ -399,7 +401,7 @@ unsigned char dhcp_option_default_priority_list[256] = { 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, - 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, + 120, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, @@ -411,7 +413,7 @@ unsigned char dhcp_option_default_priority_list[256] = { 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, - 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, + 240, 241, 242, 243, 244, 245, 246, 247, 248, 250, 251, 252, 253, 254 }; |