[src/trunk]: src/usr.sbin/dhcp Import 2.0b1pl22, the pecked-to-death-by-ducks...

[mellon <mellon%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9592d60550a9
branches:  trunk
changeset: 467846:9592d60550a9
user:      mellon <mellon%NetBSD.org@localhost>
date:      Tue Mar 30 03:10:46 1999 +0000

description:
Import 2.0b1pl22, the pecked-to-death-by-ducks patchlevel.

diffstat:

 usr.sbin/dhcp/common/options.c |  6 ++----
 usr.sbin/dhcp/relay/dhcrelay.c |  4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diffs (44 lines):

diff -r 38ac34487e5d -r 9592d60550a9 usr.sbin/dhcp/common/options.c
--- a/usr.sbin/dhcp/common/options.c    Tue Mar 30 02:36:05 1999 +0000
+++ b/usr.sbin/dhcp/common/options.c    Tue Mar 30 03:10:46 1999 +0000
@@ -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 @@
                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 -r 38ac34487e5d -r 9592d60550a9 usr.sbin/dhcp/relay/dhcrelay.c
--- a/usr.sbin/dhcp/relay/dhcrelay.c    Tue Mar 30 02:36:05 1999 +0000
+++ b/usr.sbin/dhcp/relay/dhcrelay.c    Tue Mar 30 03:10:46 1999 +0000
@@ -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 @@
 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";;