Module Name: src
Committed By: tonnerre
Date: Thu Jul 16 22:44:27 UTC 2009
Modified Files:
src/dist/dhcp/server: dhcp.c
Log Message:
Fix behavior of dhcpd in the case where clientid and hardware ethernet
definitions are mixed. Fixes a refcount assertion.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/dist/dhcp/server/dhcp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/dhcp/server/dhcp.c
diff -u src/dist/dhcp/server/dhcp.c:1.10 src/dist/dhcp/server/dhcp.c:1.11
--- src/dist/dhcp/server/dhcp.c:1.10 Fri Mar 31 17:28:50 2006
+++ src/dist/dhcp/server/dhcp.c Thu Jul 16 22:44:27 2009
@@ -34,7 +34,7 @@
#ifndef lint
static char copyright[] =
-"$Id: dhcp.c,v 1.10 2006/03/31 17:28:50 christos Exp $ Copyright (c) 2004-2005 Internet Systems Consortium. All rights reserved.\n";
+"$Id: dhcp.c,v 1.11 2009/07/16 22:44:27 tonnerre Exp $ Copyright (c) 2004-2005 Internet Systems Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
@@ -1763,6 +1763,8 @@
host_reference (&host, h, MDL);
}
if (!host) {
+ if (hp)
+ host_dereference (&hp, MDL);
find_hosts_by_haddr (&hp,
packet -> raw -> htype,
packet -> raw -> chaddr,
