Module Name: src
Committed By: christos
Date: Wed Mar 27 00:38:09 UTC 2013
Modified Files:
src/external/bsd/dhcp/dist/client: dhc6.c dhclient.c
src/external/bsd/dhcp/dist/common: dispatch.c dns.c ns_name.c
src/external/bsd/dhcp/dist/dst: base64.c dst_api.c
src/external/bsd/dhcp/dist/includes: dhcpd.h
src/external/bsd/dhcp/dist/relay: dhcrelay.c
src/external/bsd/dhcp/dist/server: dhcpleasequery.c dhcpv6.c mdb6.c
Log Message:
welcome to 4.2.5-P1
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/dhcp/dist/client/dhc6.c \
src/external/bsd/dhcp/dist/client/dhclient.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/dhcp/dist/common/dispatch.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/dhcp/dist/common/dns.c \
src/external/bsd/dhcp/dist/common/ns_name.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/dhcp/dist/dst/base64.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/dhcp/dist/dst/dst_api.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/dhcp/dist/includes/dhcpd.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/dhcp/dist/relay/dhcrelay.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/dhcp/dist/server/dhcpleasequery.c \
src/external/bsd/dhcp/dist/server/dhcpv6.c \
src/external/bsd/dhcp/dist/server/mdb6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcp/dist/client/dhc6.c
diff -u src/external/bsd/dhcp/dist/client/dhc6.c:1.3 src/external/bsd/dhcp/dist/client/dhc6.c:1.4
--- src/external/bsd/dhcp/dist/client/dhc6.c:1.3 Sun Mar 24 19:03:05 2013
+++ src/external/bsd/dhcp/dist/client/dhc6.c Tue Mar 26 20:38:07 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dhc6.c,v 1.3 2013/03/24 23:03:05 christos Exp $ */
+/* $NetBSD: dhc6.c,v 1.4 2013/03/27 00:38:07 christos Exp $ */
/* dhc6.c - DHCPv6 client routines. */
@@ -25,6 +25,9 @@
* https://www.isc.org/
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: dhc6.c,v 1.4 2013/03/27 00:38:07 christos Exp $");
+
#include "dhcpd.h"
#ifdef DHCPv6
Index: src/external/bsd/dhcp/dist/client/dhclient.c
diff -u src/external/bsd/dhcp/dist/client/dhclient.c:1.3 src/external/bsd/dhcp/dist/client/dhclient.c:1.4
--- src/external/bsd/dhcp/dist/client/dhclient.c:1.3 Sun Mar 24 19:03:05 2013
+++ src/external/bsd/dhcp/dist/client/dhclient.c Tue Mar 26 20:38:07 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dhclient.c,v 1.3 2013/03/24 23:03:05 christos Exp $ */
+/* $NetBSD: dhclient.c,v 1.4 2013/03/27 00:38:07 christos Exp $ */
/* dhclient.c
@@ -32,6 +32,9 @@
* fault and not Elliot's.
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: dhclient.c,v 1.4 2013/03/27 00:38:07 christos Exp $");
+
#include "dhcpd.h"
#include <syslog.h>
#include <signal.h>
@@ -866,6 +869,9 @@ int find_subnet (struct subnet **sp,
* can no longer legitimately use the lease.
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: dhclient.c,v 1.4 2013/03/27 00:38:07 christos Exp $");
+
void state_reboot (cpp)
void *cpp;
{
Index: src/external/bsd/dhcp/dist/common/dispatch.c
diff -u src/external/bsd/dhcp/dist/common/dispatch.c:1.2 src/external/bsd/dhcp/dist/common/dispatch.c:1.3
--- src/external/bsd/dhcp/dist/common/dispatch.c:1.2 Sun Mar 24 11:53:58 2013
+++ src/external/bsd/dhcp/dist/common/dispatch.c Tue Mar 26 20:38:07 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dispatch.c,v 1.2 2013/03/24 15:53:58 christos Exp $ */
+/* $NetBSD: dispatch.c,v 1.3 2013/03/27 00:38:07 christos Exp $ */
/* dispatch.c
@@ -28,6 +28,9 @@
*
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: dispatch.c,v 1.3 2013/03/27 00:38:07 christos Exp $");
+
#include "dhcpd.h"
#include <sys/time.h>
Index: src/external/bsd/dhcp/dist/common/dns.c
diff -u src/external/bsd/dhcp/dist/common/dns.c:1.3 src/external/bsd/dhcp/dist/common/dns.c:1.4
--- src/external/bsd/dhcp/dist/common/dns.c:1.3 Sun Mar 24 19:03:06 2013
+++ src/external/bsd/dhcp/dist/common/dns.c Tue Mar 26 20:38:07 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dns.c,v 1.3 2013/03/24 23:03:06 christos Exp $ */
+/* $NetBSD: dns.c,v 1.4 2013/03/27 00:38:07 christos Exp $ */
/* dns.c
@@ -32,6 +32,9 @@
* asynchronous DNS routines.
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: dns.c,v 1.4 2013/03/27 00:38:07 christos Exp $");
+
#include "dhcpd.h"
#include "arpa/nameser.h"
#include <isc/md5.h>
Index: src/external/bsd/dhcp/dist/common/ns_name.c
diff -u src/external/bsd/dhcp/dist/common/ns_name.c:1.3 src/external/bsd/dhcp/dist/common/ns_name.c:1.4
--- src/external/bsd/dhcp/dist/common/ns_name.c:1.3 Sun Mar 24 19:03:06 2013
+++ src/external/bsd/dhcp/dist/common/ns_name.c Tue Mar 26 20:38:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ns_name.c,v 1.3 2013/03/24 23:03:06 christos Exp $ */
+/* $NetBSD: ns_name.c,v 1.4 2013/03/27 00:38:08 christos Exp $ */
/*
* Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC")
@@ -23,6 +23,9 @@
* http://www.isc.org/
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: ns_name.c,v 1.4 2013/03/27 00:38:08 christos Exp $");
+
#ifndef lint
static const char rcsid[] = "Id: ns_name.c,v 1.2 2009/10/28 04:12:29 sar Exp ";
#endif
Index: src/external/bsd/dhcp/dist/dst/base64.c
diff -u src/external/bsd/dhcp/dist/dst/base64.c:1.4 src/external/bsd/dhcp/dist/dst/base64.c:1.5
--- src/external/bsd/dhcp/dist/dst/base64.c:1.4 Sun Mar 24 19:03:06 2013
+++ src/external/bsd/dhcp/dist/dst/base64.c Tue Mar 26 20:38:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: base64.c,v 1.4 2013/03/24 23:03:06 christos Exp $ */
+/* $NetBSD: base64.c,v 1.5 2013/03/27 00:38:08 christos Exp $ */
/*
* Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC")
@@ -23,6 +23,9 @@
* https://www.isc.org/
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: base64.c,v 1.5 2013/03/27 00:38:08 christos Exp $");
+
/*
* Portions Copyright (c) 1995 by International Business Machines, Inc.
*
Index: src/external/bsd/dhcp/dist/dst/dst_api.c
diff -u src/external/bsd/dhcp/dist/dst/dst_api.c:1.2 src/external/bsd/dhcp/dist/dst/dst_api.c:1.3
--- src/external/bsd/dhcp/dist/dst/dst_api.c:1.2 Sun Mar 24 19:03:06 2013
+++ src/external/bsd/dhcp/dist/dst/dst_api.c Tue Mar 26 20:38:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dst_api.c,v 1.2 2013/03/24 23:03:06 christos Exp $ */
+/* $NetBSD: dst_api.c,v 1.3 2013/03/27 00:38:08 christos Exp $ */
#ifndef LINT
static const char rcsid[] = "Header: /tmp/cvstest/DHCP/dst/dst_api.c,v 1.9.6.1 2012/04/11 15:43:55 sar Exp ";
@@ -22,6 +22,10 @@ static const char rcsid[] = "Header: /tm
* NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
* WITH THE USE OR PERFORMANCE OF THE SOFTWARE.
*/
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: dst_api.c,v 1.3 2013/03/27 00:38:08 christos Exp $");
+
/*
* This file contains the interface between the DST API and the crypto API.
* This is the only file that needs to be changed if the crypto system is
Index: src/external/bsd/dhcp/dist/includes/dhcpd.h
diff -u src/external/bsd/dhcp/dist/includes/dhcpd.h:1.3 src/external/bsd/dhcp/dist/includes/dhcpd.h:1.4
--- src/external/bsd/dhcp/dist/includes/dhcpd.h:1.3 Sun Mar 24 19:03:06 2013
+++ src/external/bsd/dhcp/dist/includes/dhcpd.h Tue Mar 26 20:38:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dhcpd.h,v 1.3 2013/03/24 23:03:06 christos Exp $ */
+/* $NetBSD: dhcpd.h,v 1.4 2013/03/27 00:38:08 christos Exp $ */
/* dhcpd.h
@@ -34,9 +34,6 @@
* ``http://www.nominum.com''.
*/
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: dhcpd.h,v 1.3 2013/03/24 23:03:06 christos Exp $");
-
#include "config.h"
#ifndef __CYGWIN32__
Index: src/external/bsd/dhcp/dist/relay/dhcrelay.c
diff -u src/external/bsd/dhcp/dist/relay/dhcrelay.c:1.3 src/external/bsd/dhcp/dist/relay/dhcrelay.c:1.4
--- src/external/bsd/dhcp/dist/relay/dhcrelay.c:1.3 Sun Mar 24 19:03:06 2013
+++ src/external/bsd/dhcp/dist/relay/dhcrelay.c Tue Mar 26 20:38:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dhcrelay.c,v 1.3 2013/03/24 23:03:06 christos Exp $ */
+/* $NetBSD: dhcrelay.c,v 1.4 2013/03/27 00:38:08 christos Exp $ */
/* dhcrelay.c
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: dhcrelay.c,v 1.3 2013/03/24 23:03:06 christos Exp $");
+__RCSID("$NetBSD: dhcrelay.c,v 1.4 2013/03/27 00:38:08 christos Exp $");
#include "dhcpd.h"
#include <syslog.h>
@@ -928,6 +928,9 @@ find_interface_by_agent_option(struct dh
* Agent Information option tacked onto its tail. If it is, tack
* the option on.
*/
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: dhcrelay.c,v 1.4 2013/03/27 00:38:08 christos Exp $");
static int
add_relay_agent_options(struct interface_info *ip, struct dhcp_packet *packet,
unsigned length, struct in_addr giaddr) {
Index: src/external/bsd/dhcp/dist/server/dhcpleasequery.c
diff -u src/external/bsd/dhcp/dist/server/dhcpleasequery.c:1.3 src/external/bsd/dhcp/dist/server/dhcpleasequery.c:1.4
--- src/external/bsd/dhcp/dist/server/dhcpleasequery.c:1.3 Sun Mar 24 19:03:06 2013
+++ src/external/bsd/dhcp/dist/server/dhcpleasequery.c Tue Mar 26 20:38:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dhcpleasequery.c,v 1.3 2013/03/24 23:03:06 christos Exp $ */
+/* $NetBSD: dhcpleasequery.c,v 1.4 2013/03/27 00:38:09 christos Exp $ */
/*
* Copyright (C) 2011-2012 by Internet Systems Consortium, Inc. ("ISC")
@@ -17,6 +17,10 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: dhcpleasequery.c,v 1.4 2013/03/27 00:38:09 christos Exp $");
+
+
#include "dhcpd.h"
/*
Index: src/external/bsd/dhcp/dist/server/dhcpv6.c
diff -u src/external/bsd/dhcp/dist/server/dhcpv6.c:1.3 src/external/bsd/dhcp/dist/server/dhcpv6.c:1.4
--- src/external/bsd/dhcp/dist/server/dhcpv6.c:1.3 Sun Mar 24 19:03:06 2013
+++ src/external/bsd/dhcp/dist/server/dhcpv6.c Tue Mar 26 20:38:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dhcpv6.c,v 1.3 2013/03/24 23:03:06 christos Exp $ */
+/* $NetBSD: dhcpv6.c,v 1.4 2013/03/27 00:38:09 christos Exp $ */
/*
* Copyright (C) 2006-2012 by Internet Systems Consortium, Inc. ("ISC")
@@ -16,6 +16,10 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: dhcpv6.c,v 1.4 2013/03/27 00:38:09 christos Exp $");
+
+
#include "dhcpd.h"
#ifdef DHCPv6
Index: src/external/bsd/dhcp/dist/server/mdb6.c
diff -u src/external/bsd/dhcp/dist/server/mdb6.c:1.3 src/external/bsd/dhcp/dist/server/mdb6.c:1.4
--- src/external/bsd/dhcp/dist/server/mdb6.c:1.3 Sun Mar 24 19:03:06 2013
+++ src/external/bsd/dhcp/dist/server/mdb6.c Tue Mar 26 20:38:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mdb6.c,v 1.3 2013/03/24 23:03:06 christos Exp $ */
+/* $NetBSD: mdb6.c,v 1.4 2013/03/27 00:38:09 christos Exp $ */
/*
* Copyright (C) 2007-2012 by Internet Systems Consortium, Inc. ("ISC")
@@ -16,6 +16,10 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: mdb6.c,v 1.4 2013/03/27 00:38:09 christos Exp $");
+
+
/*!
* \todo assert()
* \todo simplify functions, as pool is now in iaaddr
