diff options
| author | mellon <mellon@NetBSD.org> | 1999-03-30 03:10:46 +0000 |
|---|---|---|
| committer | mellon <mellon@NetBSD.org> | 1999-03-30 03:10:46 +0000 |
| commit | 2edefbc5065e867e4ff433bfc85561fa0f276b3a (patch) | |
| tree | 4cbf1e236b64b6955fd349bad7534b01c3960c73 | |
| parent | b779dad4d422bbd157e3e580a829dcab77d24e7e (diff) | |
Import 2.0b1pl22, the pecked-to-death-by-ducks patchlevel.
| -rw-r--r-- | usr.sbin/dhcp/common/options.c | 6 | ||||
| -rw-r--r-- | usr.sbin/dhcp/relay/dhcrelay.c | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/usr.sbin/dhcp/common/options.c b/usr.sbin/dhcp/common/options.c index 74141223684..223cf5db4e8 100644 --- a/usr.sbin/dhcp/common/options.c +++ b/usr.sbin/dhcp/common/options.c @@ -42,7 +42,7 @@ #ifndef lint static char copyright[] = -"$Id: options.c,v 1.1.1.8 1999/03/30 00:10:09 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium. All rights reserved.\n"; +"$Id: options.c,v 1.1.1.9 1999/03/30 03:10:46 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #define DHCP_OPTION_DATA @@ -233,9 +233,7 @@ int cons_options (inpacket, outpacket, mms, if (prl_len + priority_len > sizeof priority_list) prl_len = (sizeof priority_list) - priority_len; - memcpy (&priority_list [priority_len], - (inpacket -> options - [DHO_DHCP_PARAMETER_REQUEST_LIST].data), prl_len); + memcpy (&priority_list [priority_len], prl, prl_len); priority_len += prl_len; prl = priority_list; } else { diff --git a/usr.sbin/dhcp/relay/dhcrelay.c b/usr.sbin/dhcp/relay/dhcrelay.c index 72a14d332af..2faa89efaaa 100644 --- a/usr.sbin/dhcp/relay/dhcrelay.c +++ b/usr.sbin/dhcp/relay/dhcrelay.c @@ -42,7 +42,7 @@ #ifndef lint static char ocopyright [] = -"$Id: dhcrelay.c,v 1.1.1.11 1999/03/30 01:51:44 mellon Exp $ Copyright (c) 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; +"$Id: dhcrelay.c,v 1.1.1.12 1999/03/30 03:10:49 mellon Exp $ Copyright (c) 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -76,7 +76,7 @@ struct server_list { static char copyright [] = "Copyright 1997, 1998, 1999 The Internet Software Consortium."; static char arr [] = "All rights reserved."; -static char message [] = "Internet Software Consortium DHCP Relay Agent V2.0b1pl21"; +static char message [] = "Internet Software Consortium DHCP Relay Agent V2.0b1pl22"; static char contrib [] = "Please contribute if you find this software useful."; static char url [] = "For info, please visit http://www.isc.org/dhcp-contrib.html"; |
