diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2011-05-11 14:38:37 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2011-05-11 14:38:37 +0000 |
| commit | 2738e3bb29bd9e8a6234dc538b2cb1e5d824e2d7 (patch) | |
| tree | a3654bd5d15b75c5a9357e02f10427fcf284067c /sbin/dhclient/dhcpd.h | |
| parent | 244b931de87cae31e725020f4da297be6d32637c (diff) | |
Make dhclient more friendly to sequential option processing by
always starting DHCP packet options with DHO_DHCP_MESSAGE_TYPE. Now
DHCP-specific options always come after the option identifying the
packet as DHCP rather than BOOTP. Makes at least Nortel NetIP DHCP
server happier. Clean up some code and parameter passing.
Closes PR#6543, as confirmed by original submitter and patch
tester Len Zaifman. Thanks!
ok matthew@ (who hates the ISC-like code)
Diffstat (limited to 'sbin/dhclient/dhcpd.h')
| -rw-r--r-- | sbin/dhclient/dhcpd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sbin/dhclient/dhcpd.h b/sbin/dhclient/dhcpd.h index 1c686ade33b..fffb63d1f1b 100644 --- a/sbin/dhclient/dhcpd.h +++ b/sbin/dhclient/dhcpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dhcpd.h,v 1.72 2011/04/04 11:14:52 krw Exp $ */ +/* $OpenBSD: dhcpd.h,v 1.73 2011/05/11 14:38:36 krw Exp $ */ /* * Copyright (c) 2004 Henning Brauer <henning@openbsd.org> @@ -207,7 +207,7 @@ extern struct client_state *client; extern struct client_config *config; /* options.c */ -int cons_options(unsigned char *, const int, struct option_data *); +int cons_options(struct option_data *); char *pretty_print_option(unsigned int, unsigned char *, int, int, int); void do_packet(int, unsigned int, struct iaddr, struct hardware *); |