From: Ted Lemon <source@isc.org>
Date: Sun, 8 Jun 1997 04:10:41 +0000 (+0000)
Subject: Only store through ours if it's nonzero
X-Git-Tag: DHCP-970607~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=be6b4b2a2b9fd925dcc60530ee9c10c114eb75fe;p=thirdparty%2Fdhcp.git

Only store through ours if it's nonzero
---

diff --git a/server/dhcp.c b/server/dhcp.c
index 3be739477..6c3d0e976 100644
--- a/server/dhcp.c
+++ b/server/dhcp.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: dhcp.c,v 1.49 1997/06/08 03:58:47 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: dhcp.c,v 1.50 1997/06/08 04:10:41 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -1162,7 +1162,7 @@ struct lease *find_lease (packet, share, ours)
 	/* If ip_lease is valid at this point, set ours to one, so that
 	   even if we choose a different lease, we know that the address
 	   the client was requesting was ours, and thus we can NAK it. */
-	if (ip_lease)
+	if (ip_lease && ours)
 		*ours = 1;
 
 	/* If the requested IP address isn't on the network the packet