6370597 in.dhcpd core dumps. Double free on a DHCP network container record

6959836 dhcp server should set file limit even in debug mode.

1 files changed, 4 insertions, 8 deletions

diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.dhcpd/dhcpd.h b/usr/src/cmd/cmd-inet/usr.lib/in.dhcpd/dhcpd.h
index 2960fe8fd3..79fc5331a9 100644
--- a/usr/src/cmd/cmd-inet/usr.lib/in.dhcpd/dhcpd.h
+++ b/usr/src/cmd/cmd-inet/usr.lib/in.dhcpd/dhcpd.h
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1993, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 #ifndef	_DHCPD_H
 #define	_DHCPD_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
@@ -203,7 +199,7 @@ extern int	icmp_echo_check(struct in_addr *, boolean_t *);
 extern void	*monitor_client(void *);
 
 extern void	dhcp(dsvc_clnt_t *, PKT_LIST *);
-boolean_t	update_offer(dsvc_clnt_t *, dn_rec_list_t *, lease_t,
+boolean_t	update_offer(dsvc_clnt_t *, dn_rec_list_t **, lease_t,
 		    struct in_addr *, boolean_t);
 extern void	bootp(dsvc_clnt_t *, PKT_LIST *);
 extern void	get_netmask(struct in_addr *, struct in_addr *);