[src/netbsd-1-4]: src/usr.sbin/dhcp/server Pull up 1.10 (fix core dump and NA...

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

details:   https://anonhg.NetBSD.org/src/rev/c64261dfbe4b
branches:  netbsd-1-4
changeset: 468491:c64261dfbe4b
user:      mellon <mellon%NetBSD.org@localhost>
date:      Mon Apr 26 16:44:16 1999 +0000

description:
Pull up 1.10 (fix core dump and NAKing problem).

diffstat:

 usr.sbin/dhcp/server/dhcp.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r 7f1104cb945c -r c64261dfbe4b usr.sbin/dhcp/server/dhcp.c
--- a/usr.sbin/dhcp/server/dhcp.c       Mon Apr 26 16:43:07 1999 +0000
+++ b/usr.sbin/dhcp/server/dhcp.c       Mon Apr 26 16:44:16 1999 +0000
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: dhcp.c,v 1.8.2.1 1999/04/09 20:09:59 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: dhcp.c,v 1.8.2.2 1999/04/26 16:44:16 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -268,7 +268,8 @@
        if (!packet -> shared_network ||
            (packet -> raw -> ciaddr.s_addr &&
             packet -> raw -> giaddr.s_addr) ||
-           packet -> options [DHO_DHCP_REQUESTED_ADDRESS].len) {
+           (packet -> options [DHO_DHCP_REQUESTED_ADDRESS].len &&
+            !packet -> raw -> ciaddr.s_addr)) {
                
                /* If we don't know where it came from but we do know
                   where it claims to have come from, it didn't come
@@ -1471,7 +1472,7 @@
                               : piaddr (cip)),
                              piaddr (cip));
                        warn ("from the dynamic address pool for %s",
-                             ip_lease -> subnet -> shared_network -> name);
+                             share -> name);
                        if (fixed_lease)
                                ip_lease = (struct lease *)0;
                        strcpy (dhcp_message,