diff options
| author |   reyk <reyk@openbsd.org> | 2009-09-01 08:42:31 +0000 |
|---|---|---|
| committer | reyk <reyk@openbsd.org> | 2009-09-01 08:42:31 +0000 |
| commit | 5b44f46dad3fa8fe61fd7f1f5f74f16728c06d76 (patch) | |
| tree | 0458ec671b3fd35b569f2120788d40c9254aadef /usr.sbin/dhcpd/parse.c | |
| parent | Make rtinit() cope when there is a more specific route available then (diff) | |
| download | wireguard-openbsd-5b44f46dad3fa8fe61fd7f1f5f74f16728c06d76.tar.xz wireguard-openbsd-5b44f46dad3fa8fe61fd7f1f5f74f16728c06d76.zip | |
Echo back the Relay Agent Information option if present (RFC 3046).
Also add support for the "ipsec-tunnel" hardware type as described in
RFC 3456.
ok henning@ krw@ (but needs more testing from others)
Diffstat (limited to 'usr.sbin/dhcpd/parse.c')
| -rw-r--r-- | usr.sbin/dhcpd/parse.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.sbin/dhcpd/parse.c b/usr.sbin/dhcpd/parse.c index 13398243f10..9e0dc4e2f7e 100644 --- a/usr.sbin/dhcpd/parse.c +++ b/usr.sbin/dhcpd/parse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.c,v 1.11 2007/02/26 00:49:53 stevesk Exp $ */ +/* $OpenBSD: parse.c,v 1.12 2009/09/01 08:42:31 reyk Exp $ */ /* Common parser code for dhcpd and dhclient. */ @@ -212,6 +212,9 @@ parse_hardware_param(FILE *cfile, struct hardware *hardware) case TOK_FDDI: hardware->htype = HTYPE_FDDI; break; + case TOK_IPSEC_TUNNEL: + hardware->htype = HTYPE_IPSEC_TUNNEL; + break; default: parse_warn("expecting a network hardware type"); skip_to_semi(cfile); |