Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge Patchlevel 14 with trunk.

Browse Source
This commit is contained in:
mellon 1999-02-19 22:39:06 +00:00
parent a72b8385ee
commit aa0c70bd9e
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.sbin/dhcp/client/dhclient.c
View File

@ -56,7 +56,7 @@
#ifndef lint
static char ocopyright[] =
"$Id: dhclient.c,v 1.12 1999/02/18 22:14:36 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n";
"$Id: dhclient.c,v 1.13 1999/02/19 22:39:06 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
@ -97,7 +97,7 @@ void catch_sigterm PROTO ((int));
static char copyright[] =
"Copyright 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.";
static char arr [] = "All rights reserved.";
static char message [] = "Internet Software Consortium DHCP Client V2.0b1pl13";
static char message [] = "Internet Software Consortium DHCP Client V2.0b1pl14";
static char contrib [] = "\nPlease contribute if you find this software useful.";
static char url [] = "For info, please visit http://www.isc.org/dhcp-contrib.html\n";

8
usr.sbin/dhcp/server/dhcp.c
View File

@ -42,7 +42,7 @@
#ifndef lint
static char copyright[] =
"$Id: dhcp.c,v 1.3 1999/02/18 22:04:07 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n";
"$Id: dhcp.c,v 1.4 1999/02/19 22:39:06 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
@ -1360,7 +1360,8 @@ struct lease *find_lease (packet, share, ours)
lease to be abandoned. If so, this request probably came from
that client. */
if (ip_lease && (ip_lease -> shared_network != share)) {
*ours = 1;
if (ours)
*ours = 1;
ip_lease = (struct lease *)0;
strcpy (dhcp_message, "requested address on bad subnet");
}
@ -1390,7 +1391,8 @@ struct lease *find_lease (packet, share, ours)
}
strcpy (dhcp_message, "requested address is not available");
ip_lease = (struct lease *)0;
*ours = 1;
if (ours)
*ours = 1;
/* If we get to here and fixed_lease is not null, that means
that there are both a dynamic lease and a fixed-address

4
usr.sbin/dhcp/server/dhcpd.c
View File

@ -42,13 +42,13 @@
#ifndef lint
static char ocopyright[] =
"$Id: dhcpd.c,v 1.3 1999/02/18 22:04:07 mellon Exp $ Copyright 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.";
"$Id: dhcpd.c,v 1.4 1999/02/19 22:39:06 mellon Exp $ Copyright 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.";
#endif
static char copyright[] =
"Copyright 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.";
static char arr [] = "All rights reserved.";
static char message [] = "Internet Software Consortium DHCP Server V2.0b1pl13 ";
static char message [] = "Internet Software Consortium DHCP Server V2.0b1pl14 ";
static char contrib [] = "\nPlease contribute if you find this software useful.";
static char url [] = "For info, please visit http://www.isc.org/dhcp-contrib.html\n";