[v4_2] Remove vix.com and nominum.com

    Remove old information from copyrights and
    man pages.

diff --git a/client/clparse.c b/client/clparse.c
index a9406a29fbbd1a0e02d83bb91ca24ceb70f75717..646229f18525cd122005ee3f3eb69d911345c319 100644 (file)
--- a/client/clparse.c
+++ b/client/clparse.c
@@ -3,7 +3,7 @@
    Parser for dhclient config and lease files... */
 
 /*
- * Copyright (c) 2004-2013 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/client/dhclient-script.8 b/client/dhclient-script.8
index 09b921ebbabace9b1bc5aad57d46f46106892c7f..5df832b34c1bcf5d3b14c79f28867a0e6c22d093 100644 (file)
--- a/client/dhclient-script.8
+++ b/client/dhclient-script.8
@@ -1,6 +1,6 @@
 .\"    dhclient-script.8
 .\"
-.\" Copyright (c) 2012 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (c) 2012,2014 by Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (c) 2009-2010 by Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (c) 2004-2005 by Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (c) 1996-2003 by Internet Software Consortium
@@ -23,9 +23,6 @@
 .\"   <info@isc.org>
 .\"   https://www.isc.org/
 .\"
-.\" This software has been written for Internet Systems Consortium
-.\" by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
-.\"
 .\" Support and other services are available for ISC products - see
 .\" https://www.isc.org for more information or to learn more about ISC.
 .\"
@@ -231,11 +228,6 @@ dhclient(8), dhcpd(8), dhcrelay(8), dhclient.conf(5) and
 dhclient.leases(5).
 .SH AUTHOR
 .B dhclient-script(8)
-has been written for Internet Systems Consortium
-by Ted Lemon in cooperation with Vixie
-Enterprises.  To learn more about Internet Systems Consortium,
+To learn more about Internet Systems Consortium,
 see
 .B https://www.isc.org.
-To learn more about Vixie
-Enterprises, see
-.B http://www.vix.com.

diff --git a/client/dhclient.8 b/client/dhclient.8
index 453bbdc614e0db0895c6f1ee5a0d11f020ca1f16..0aa11192c484bf0d3a0b54df0b85dc3537598d73 100644 (file)
--- a/client/dhclient.8
+++ b/client/dhclient.8
@@ -1,6 +1,6 @@
 .\"    $Id: dhclient.8,v 1.32.24.4 2011/04/15 22:12:50 sar Exp $
 .\"
-.\" Copyright (c) 2004,2007-2012 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (c) 2004,2007-2014 by Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (c) 1996-2003 by Internet Software Consortium
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -459,14 +459,9 @@ dhcpd(8), dhcrelay(8), dhclient-script(8), dhclient.conf(5),
 dhclient.leases(5), dhcp-eval(5).
 .SH AUTHOR
 .B dhclient(8)
-has been written for Internet Systems Consortium
-by Ted Lemon in cooperation with Vixie
-Enterprises.  To learn more about Internet Systems Consortium,
+To learn more about Internet Systems Consortium,
 see
 .B https://www.isc.org
-To learn more about Vixie
-Enterprises, see
-.B http://www.vix.com.
 .PP
 This client was substantially modified and enhanced by Elliot Poger
 for use on Linux while he was working on the MosquitoNet project at

diff --git a/client/dhclient.conf.5 b/client/dhclient.conf.5
index 1b430b25a01c34cbdef982e2cd5411fd7c3f01c2..0f3beaf10e59ad77215e72cdca0d91a8d7d1a6ab 100644 (file)
--- a/client/dhclient.conf.5
+++ b/client/dhclient.conf.5
@@ -1,6 +1,6 @@
 .\"    $Id: dhclient.conf.5,v 1.25.24.10 2012/04/16 17:17:48 sar Exp $
 .\"
-.\" Copyright (c) 2009-2012 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (c) 2009-2012,2014 by Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (c) 2004,2007 by Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (c) 1996-2003 by Internet Software Consortium
 .\"
@@ -22,9 +22,6 @@
 .\"   <info@isc.org>
 .\"   https://www.isc.org/
 .\"
-.\" This software has been written for Internet Software Consortium
-.\" by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
-.\" 
 .\" Support and other services are available for ISC products - see
 .\" https://www.isc.org for more information or to learn more about ISC.
 .\"
@@ -733,8 +730,5 @@ dhcp-options(5), dhcp-eval(5), dhclient.leases(5), dhcpd(8), dhcpd.conf(5),
 RFC2132, RFC2131.
 .SH AUTHOR
 .B dhclient(8)
-was written by Ted Lemon
-under a contract with Vixie Labs.  Funding
-for this project was provided by Internet Systems Consortium.
 Information about Internet Systems Consortium can be found at
 .B https://www.isc.org.

diff --git a/client/dhclient.leases.5 b/client/dhclient.leases.5
index 443c5b6c0675ceae9d2beb17e59cb5f66523164e..8c175a20e70e0b698e08faa2dc834584740cc3f9 100644 (file)
--- a/client/dhclient.leases.5
+++ b/client/dhclient.leases.5
@@ -22,9 +22,6 @@
 .\"   <info@isc.org>
 .\"   https://www.isc.org/
 .\"
-.\" This software has been written for Internet Systems Consortium
-.\" by Ted Lemon in cooperation with Vixie Enterprises.
-.\"
 .\" Support and other services are available for ISC products - see
 .\" https://www.isc.org for more information or to learn more about ISC.
 .\"
@@ -50,8 +47,5 @@ dhclient(8), dhcp-options(5), dhclient.conf(5), dhcpd(8),
 dhcpd.conf(5), RFC2132, RFC2131.
 .SH AUTHOR
 .B dhclient(8)
-was written by Ted Lemon
-under a contract with Vixie Labs.   Funding
-for this project was provided by Internet Systems Consortium.
 Information about Internet Systems Consortium can be found at
 .B https://www.isc.org.

diff --git a/common/alloc.c b/common/alloc.c
index ddff848b0a6605581106b19bf4b13e7decfd4456..0280cbc469c7042064496abc0e127d3acd6d9dc2 100644 (file)
--- a/common/alloc.c
+++ b/common/alloc.c
@@ -3,7 +3,7 @@
    Memory allocation... */
 
 /*
- * Copyright (c) 2009,2013 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2009,2013-2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2004-2007 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
@@ -25,12 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/common/comapi.c b/common/comapi.c
index a9ae043c64b52ad8072df16139ef340493aa39f4..ee1c7ec5ba474c8817b145aa2b9ee0539d4cffdb 100644 (file)
--- a/common/comapi.c
+++ b/common/comapi.c
@@ -3,7 +3,7 @@
    OMAPI object interfaces for the DHCP server. */
 
 /*
- * Copyright (c) 2012 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2012,2014 Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2004-2007,2009 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1999-2003 by Internet Software Consortium
  *
@@ -25,12 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 /* Many, many thanks to Brian Murrell and BCtel for this code - BCtel

diff --git a/common/conflex.c b/common/conflex.c
index 71c7e6a3e40c20620abb8706bc7dfcef8f12bc6c..c39e91de43c15b9e925d5c2b7907e4bfad333c43 100644 (file)
--- a/common/conflex.c
+++ b/common/conflex.c
@@ -3,7 +3,7 @@
    Lexical scanner for dhcpd config file... */
 
 /*
- * Copyright (c) 2004-2013 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1995-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/common/ctrace.c b/common/ctrace.c
index 0bc133e86853c5fa81a03ca30c432af792876698..578ea5e7b97598450ea7eb20f526b5539836e979 100644 (file)
--- a/common/ctrace.c
+++ b/common/ctrace.c
@@ -3,7 +3,7 @@
    Subroutines that support dhcp tracing... */
 
 /*
- * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2007,2009,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2001-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,10 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon, as part of a project for Nominum, Inc.   To learn more
- * about Internet Systems Consortium, see https://www.isc.org/.  To
- * learn more about Nominum, Inc., see ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/common/dhcp-eval.5 b/common/dhcp-eval.5
index e78471e26f0eccad05cff92bf07d101e5ef87f8a..95c367277a60f4f9cb9d567ea603164bc83e72a3 100644 (file)
--- a/common/dhcp-eval.5
+++ b/common/dhcp-eval.5
@@ -1,6 +1,6 @@
 .\"    $Id: dhcp-eval.5,v 1.29.24.4 2012/05/17 15:51:20 sar Exp $
 .\"
-.\" Copyright (c) 2009-2012 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (c) 2009-2012,2014 by Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (c) 2004,2007 by Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (c) 1996-2003 by Internet Software Consortium
 .\"
@@ -22,9 +22,6 @@
 .\"   <info@isc.org>
 .\"   https://www.isc.org/
 .\"
-.\" This software has been written for Internet Systems Consortium
-.\" by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
-.\"
 .\" Support and other services are available for ISC products - see
 .\" https://www.isc.org for more information or to learn more about ISC.
 .\"
@@ -503,8 +500,5 @@ about DDNS.
 dhcpd.conf(5), dhcpd.leases(5), dhclient.conf(5), dhcp-options(5), dhcpd(8),
 dhclient(8), RFC2132, RFC2131.
 .SH AUTHOR
-The Internet Systems Consortium DHCP Distribution was written by Ted
-Lemon under a contract with Vixie Labs.  Funding for
-this project was provided through Internet Systems Consortium.
 Information about Internet Systems Consortium can be found at
 .B https://www.isc.org.

diff --git a/common/dhcp-options.5 b/common/dhcp-options.5
index af848d2054a612cc4fe96dc8fa5f2b394e95a344..0357e957ac74b4b038a8541da295b29d8129df71 100644 (file)
--- a/common/dhcp-options.5
+++ b/common/dhcp-options.5
@@ -22,9 +22,6 @@
 .\"   <info@isc.org>
 .\"   https://www.isc.org/
 .\"
-.\" This software has been written for Internet Systems Consortium
-.\" by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
-.\"
 .\" Support and other services are available for ISC products - see
 .\" https://www.isc.org for more information or to learn more about ISC.
 .\"
@@ -2135,8 +2132,5 @@ transmitted to the same client), so it is not necessary to configure this.
 dhcpd.conf(5), dhcpd.leases(5), dhclient.conf(5), dhcp-eval(5), dhcpd(8),
 dhclient(8), RFC2132, RFC2131, RFC3046, RFC3315.
 .SH AUTHOR
-The Internet Systems Consortium DHCP Distribution was written by Ted
-Lemon under a contract with Vixie Labs.  Funding for
-this project was provided through Internet Systems Consortium.
 Information about Internet Systems Consortium can be found at
 .B https://www.isc.org.

diff --git a/common/discover.c b/common/discover.c
index 1150068a33eebba18907c5f9b6a7f9408f254584..4b40a70ae3881ef9168d767977c30f466fdb9541 100644 (file)
--- a/common/discover.c
+++ b/common/discover.c
@@ -3,6 +3,7 @@
    Find and identify the network interfaces. */
 
 /*
+ * Copyright (c) 2013-2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2004-2009,2011 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1995-2003 by Internet Software Consortium
  *
@@ -24,12 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/common/dns.c b/common/dns.c
index cd73eeb11c9db4a30ea0f06136999c5cc795cc90..ebf6212f0425d440dc2dab606c08fba8f0c222d2 100644 (file)
--- a/common/dns.c
+++ b/common/dns.c
@@ -3,7 +3,7 @@
    Domain Name Service subroutines. */
 
 /*
- * Copyright (c) 2009-2012 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2009-2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2004-2007 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2001-2003 by Internet Software Consortium
  *
@@ -25,9 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * The original software was written for Internet Systems Consortium
- * by Ted Lemon it has since been extensively modified to use the
- * asynchronous DNS routines.
  */
 
 #include "dhcpd.h"

diff --git a/common/ethernet.c b/common/ethernet.c
index 7b8a22c9ccd2cd0600aee69e963095a6d9d69820..cd67ae2ef45158512fcc39501bc3cad8dd3edbc5 100644 (file)
--- a/common/ethernet.c
+++ b/common/ethernet.c
@@ -3,7 +3,7 @@
    Packet assembly code, originally contributed by Archie Cobbs. */
 
 /*
- * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2007,2009,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/common/execute.c b/common/execute.c
index d4c8066d4d4d9759e27cb39e97b0221b5d3b8b47..d0313929dee2d52053d638c6bd4d69fe8aef42c5 100644 (file)
--- a/common/execute.c
+++ b/common/execute.c
@@ -3,7 +3,7 @@
    Support for executable statements. */
 
 /*
- * Copyright (c) 2009,2013 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2009,2013,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2004-2007 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1998-2003 by Internet Software Consortium
  *
@@ -25,12 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/common/fddi.c b/common/fddi.c
index eef85c2a7271dcdaa3d9aae00fc6f652a41931c4..d99819379561aa216cdfe180c2c834703083c076 100644 (file)
--- a/common/fddi.c
+++ b/common/fddi.c
@@ -3,7 +3,7 @@
    Packet assembly code, originally contributed by Archie Cobbs. */
 
 /*
- * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2007,2009,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/common/icmp.c b/common/icmp.c
index ce72c78356a137642361cc2e5d9fd38d89061253..6f97f6776a4e8d8e34e02e5c4bab3b8e8dda8b56 100644 (file)
--- a/common/icmp.c
+++ b/common/icmp.c
@@ -4,7 +4,7 @@
    responses. */
 
 /*
- * Copyright (c) 2011,2013 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2011,2013,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
@@ -26,12 +26,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/common/inet.c b/common/inet.c
index ac390477232447abe074409d40baa2b5d164d012..0cff19d0dc61bdc071c41e3ea00b36ac22001b45 100644 (file)
--- a/common/inet.c
+++ b/common/inet.c
@@ -4,7 +4,7 @@
    way... */
 
 /*
- * Copyright (c) 2011,2013 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2011,2013,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2007-2009 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2004,2005 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1995-2003 by Internet Software Consortium
@@ -27,12 +27,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/common/memory.c b/common/memory.c
index 0e741597a14c697b77c8b11e72d0c5b66607278a..03a0d2ecf3c1c134b47af8c9eeb2358d4bb034c1 100644 (file)
--- a/common/memory.c
+++ b/common/memory.c
@@ -3,7 +3,7 @@
    Memory-resident database... */
 
 /*
- * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2007,2009,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1995-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/common/nit.c b/common/nit.c
index 3822206bd1c18e8602ecbe95ae3494d2efd1a302..a43bcf3e5e7f9dd102184f35fb1a38ada5cd0a78 100644 (file)
--- a/common/nit.c
+++ b/common/nit.c
@@ -4,7 +4,7 @@
    with one crucial tidbit of help from Stu Grossmen. */
 
 /*
- * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2007,2009,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -25,12 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/common/options.c b/common/options.c
index cafb77f95266a607c472015381b5e75575906102..56bb151cf4a4de9dbcbff48b9e2a6958bc2f115a 100644 (file)
--- a/common/options.c
+++ b/common/options.c
@@ -3,7 +3,7 @@
    DHCP options parsing and reassembly. */
 
 /*
- * Copyright (c) 2004-2012 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2012,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1995-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #define DHCP_OPTION_DATA

diff --git a/common/parse.c b/common/parse.c
index ad31f8ab459e96d3c0f378d0150fbd6530975eab..fa357619a49c4f8912fbcbc7477ea8a987514a27 100644 (file)
--- a/common/parse.c
+++ b/common/parse.c
@@ -3,7 +3,7 @@
    Common parser code for dhcpd and dhclient. */
 
 /*
- * Copyright (c) 2004-2013 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1995-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/common/print.c b/common/print.c
index 04c453a4383bc9873b6f3743678134ba495ddcca..dfe0593bcff8fde86bcb38a3fade2269298e1e06 100644 (file)
--- a/common/print.c
+++ b/common/print.c
@@ -3,7 +3,7 @@
    Turn data structures into printable text. */
 
 /*
- * Copyright (c) 2009-2013 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2009-2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2004-2007 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1995-2003 by Internet Software Consortium
  *
@@ -25,12 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/common/raw.c b/common/raw.c
index 4730e8edc64a3a248372138f6d63b676ec00fc69..a15f8eef00e0f7bc1f7f4e5bcc65e06db4b2b04e 100644 (file)
--- a/common/raw.c
+++ b/common/raw.c
@@ -16,7 +16,7 @@
    Sigh. */
 
 /*
- * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2007,2009,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1995-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -37,12 +37,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/common/resolv.c b/common/resolv.c
index 902817e78e963fcf6db4e59e1a9322339c269b68..526cebf4761d79e8836bcba634eb13003ed03b63 100644 (file)
--- a/common/resolv.c
+++ b/common/resolv.c
@@ -3,7 +3,7 @@
    Parser for /etc/resolv.conf file. */
 
 /*
- * Copyright (c) 2009,2013 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2009,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2004-2007 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
@@ -25,12 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/common/socket.c b/common/socket.c
index 8f9af4333d1e12bb80170ce9bc46d8656b3096d0..e111d8267c6c4b4b7603e8213ae1149904094ac9 100644 (file)
--- a/common/socket.c
+++ b/common/socket.c
@@ -3,7 +3,7 @@
    BSD socket interface code... */
 
 /*
- * Copyright (c) 2004-2013 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1995-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 /* SO_BINDTODEVICE support added by Elliot Poger (poger@leland.stanford.edu).

diff --git a/common/tables.c b/common/tables.c
index d224dc1b007adc2036736a69e8b3ed733fc1514a..ccd970107c14718428f036e1b5b7383a06a7946b 100644 (file)
--- a/common/tables.c
+++ b/common/tables.c
@@ -25,12 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/common/tree.c b/common/tree.c
index b9a88b9f55179ccee4f11e7e4483a0bdda7c42c2..e0839a6aa6e36b852b2cecda2dcabb04064376fc 100644 (file)
--- a/common/tree.c
+++ b/common/tree.c
@@ -25,12 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/common/upf.c b/common/upf.c
index feb82a2bf0d7bf5bef2a948df99479be0f468b8e..de2129e73297fa6dfb16bd35dbdee4d738eff15d 100644 (file)
--- a/common/upf.c
+++ b/common/upf.c
@@ -3,7 +3,7 @@
    Ultrix PacketFilter interface code. */
 
 /*
- * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2007,2009,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/dhcpctl/callback.c b/dhcpctl/callback.c
index b9033f433f06378a69e7202c4061e8ad860ba0c0..2027a2d0b388d27db5cbd42bc73cdedac8d728e8 100644 (file)
--- a/dhcpctl/callback.c
+++ b/dhcpctl/callback.c
@@ -3,7 +3,7 @@
    The dhcpctl callback object. */
 
 /*
- * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2007,2009,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1999-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/dhcpctl/dhcpctl.3 b/dhcpctl/dhcpctl.3
index 83f9974e91b0ca6f2908a4bced116aa61fb8078e..ae42a71574ffdb5ceea09ac7745ebbeb9b2ccfdf 100644 (file)
--- a/dhcpctl/dhcpctl.3
+++ b/dhcpctl/dhcpctl.3
@@ -4,7 +4,7 @@
 .\" File:         dhcpctl.3
 .\" RCSId:        $Id: dhcpctl.3,v 1.7.24.2 2011/04/25 23:49:52 sar Exp $
 .\" 
-.\" Copyright (c) 2011 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (c) 2011,2014 by Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (c) 2000-2003 by Internet Software Consortium
 .\" Copyright (c) 2000 Nominum, Inc.
@@ -489,5 +489,7 @@ int main (int argc, char **argv) {
 omapi(3), omshell(1), dhcpd(8), dhclient(8), dhcpd.conf(5), dhclient.conf(5).
 .Sh AUTHOR
 .Em dhcpctl
-was written by Ted Lemon of Nominum, Inc.
-This preliminary documentation was written by James Brister of Nominum, Inc.
+is maintained by ISC.  To learn more about Internet Systems Consortium,
+see
+.B https://www.isc.org
+

diff --git a/dhcpctl/dhcpctl.c b/dhcpctl/dhcpctl.c
index 5ec617adf712369b4f6df45173bb160766302bd8..a4aee7ffc13ecf21ced081932443ef2e0b42c2fc 100644 (file)
--- a/dhcpctl/dhcpctl.c
+++ b/dhcpctl/dhcpctl.c
@@ -3,7 +3,8 @@
    Subroutines providing general support for objects. */
 
 /*
- * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2009,2013,2014 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2007 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1999-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/dhcpctl/dhcpctl.h b/dhcpctl/dhcpctl.h
index a0cce0edc6f6ef2e75dc3e46f6cfbe1cf84f46f1..bfdb0cb44b08bf6e9ab342cc095173a9b7ca114b 100644 (file)
--- a/dhcpctl/dhcpctl.h
+++ b/dhcpctl/dhcpctl.h
@@ -3,7 +3,7 @@
    Subroutines providing general support for objects. */
 
 /*
- * Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2009,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1999-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #ifndef _DHCPCTL_H_

diff --git a/dhcpctl/omshell.1 b/dhcpctl/omshell.1
index b7feec2ed1701dd855f8011a669f23a4dc522ee1..af6fa49f2039fce1313bc9d84764ae18d3c41a4e 100644 (file)
--- a/dhcpctl/omshell.1
+++ b/dhcpctl/omshell.1
@@ -1,6 +1,6 @@
 .\"    $Id: omshell.1,v 1.5.24.1 2009/11/20 01:49:01 sar Exp $
 .\"
-.\" Copyright (c) 2012 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (c) 2012,2014 by Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (c) 2001-2003 by Internet Software Consortium
 .\"
@@ -22,12 +22,6 @@
 .\"   <info@isc.org>
 .\"   https://www.isc.org/
 .\"
-.\" This software has been written for Internet Systems Consortium
-.\" by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
-.\" To learn more about Internet Systems Consortium, see
-.\" ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
-.\" see ``http://www.vix.com''.  To learn more about Nominum, Inc., see
-.\" ``http://www.nominum.com''.
 .TH omshell 1
 .SH NAME
 omshell - OMAPI Command Shell
@@ -55,9 +49,9 @@ been underwritten by various organizations, including the ISC and
 Vixie Enterprises.  The development of 3.0 has been funded almost
 entirely by Nominum, Inc.
 .PP
-At this point development is being shepherded by Ted Lemon, and hosted
-by the ISC, but the future of this project depends on you.  If you
-have features you want, please consider implementing them.
+At this point development is hosted by the ISC, but the future of
+this project depends on you.  If you have features you want, please
+consider implementing them.
 .SH LOCAL AND REMOTE OBJECTS
 .PP
 Throughout this document, there are references to local and remote objects.
@@ -328,8 +322,7 @@ omshell, with some syntax pointers.
 dhcpctl(3), omapi(3), dhcpd(8), dhclient(8), dhcpd.conf(5), dhclient.conf(5).
 .SH AUTHOR
 .B omshell
-was written by Ted Lemon of Nominum, Inc.  Information about Nominum
-can be found at
-.B http://www.nominum.com.
-This preliminary documentation was written by Wendy Verschoor of Nominum,
-Inc., while she was testing omshell.
+is maintained by ISC.  To learn more about Internet Systems Consortium,
+see
+.B https://www.isc.org
+

diff --git a/dhcpctl/omshell.c b/dhcpctl/omshell.c
index 07411b8285cf55923e2e38ebb668d4b6bc213a7a..47e5d0bea0c8e5bd61954c00ba32233c2a84b344 100644 (file)
--- a/dhcpctl/omshell.c
+++ b/dhcpctl/omshell.c
@@ -3,7 +3,7 @@
    Examine and modify omapi objects. */
 
 /*
- * Copyright (c) 2009-2011,2013 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2009-2011,2013,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2004-2007 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2001-2003 by Internet Software Consortium
  *
@@ -25,12 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "config.h"

diff --git a/dhcpctl/remote.c b/dhcpctl/remote.c
index e4e870bd2c4a75a3b4b601b62dcc2424a1c4ead8..c8f278db6af216d493d6b1e31dc36cd19a1d8ce9 100644 (file)
--- a/dhcpctl/remote.c
+++ b/dhcpctl/remote.c
@@ -3,7 +3,7 @@
    The dhcpctl remote object. */
 
 /*
- * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2007,2009,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1999-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/includes/ctrace.h b/includes/ctrace.h
index c3f0314dc31c1354951b778b486ea4a97cf5cc7f..306e6895cf1bff7f636223526466ff1f2996f8a4 100644 (file)
--- a/includes/ctrace.h
+++ b/includes/ctrace.h
@@ -3,7 +3,7 @@
    Definitions for dhcp tracing facility... */
 
 /*
- * Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2009,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2001-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,10 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon, as part of a project for Nominum, Inc.   To learn more
- * about Internet Systems Consortium, see https://www.isc.org/.  To
- * learn more about Nominum, Inc., see ``http://www.nominum.com''.
  */
 
 typedef struct {

diff --git a/includes/dhcp.h b/includes/dhcp.h
index 5eb1ad8b6a2fffa527ecb15e54071b12499d832b..f916468db46ba6492338d8cd08f21a6ad23a3249 100644 (file)
--- a/includes/dhcp.h
+++ b/includes/dhcp.h
@@ -3,7 +3,7 @@
    Protocol structures... */
 
 /*
- * Copyright (c) 2011-2012 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2011-2012,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2004-2009 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1995-2003 by Internet Software Consortium
  *
@@ -25,10 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises.  To learn more
- * about Internet Systems Consortium, see ``https://www.isc.org''.
- * To learn more about Vixie Enterprises, see ``http://www.vix.com''.
  */
 
 #ifndef DHCP_H

diff --git a/includes/dhcpd.h b/includes/dhcpd.h
index 5268025e4c640fe0056b67a80f95c1b869291e3f..b0f73fb47c94ea766d06e3455786a3e3feb016e7 100644 (file)
--- a/includes/dhcpd.h
+++ b/includes/dhcpd.h
@@ -3,7 +3,7 @@
    Definitions for dhcpd... */
 
 /*
- * Copyright (c) 2004-2013 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "config.h"

diff --git a/includes/dhctoken.h b/includes/dhctoken.h
index 6815da4ae82ef1a5ba9e4fe71ce674cfa015e99d..b72010da0335f962ce4c2803e7955881997417de 100644 (file)
--- a/includes/dhctoken.h
+++ b/includes/dhctoken.h
@@ -3,7 +3,8 @@
    Tokens for config file lexer and parser. */
 
 /*
- * Copyright (c) 2004,2007-2012 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2011-2014 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2007-2009 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 enum dhcp_token {

diff --git a/includes/failover.h b/includes/failover.h
index 1db0e687ae7a95e591cf2944f65752c349dda5c6..090daee540556dafa851ade54915352cda4f81de 100644 (file)
--- a/includes/failover.h
+++ b/includes/failover.h
@@ -3,7 +3,7 @@
    Definitions for address trees... */
 
 /*
- * Copyright (c) 2004,2005,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2005,2007,2009,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2000-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #if defined (FAILOVER_PROTOCOL)

diff --git a/includes/inet.h b/includes/inet.h
index a59099df3db1c60c6f60319bae0827d66af2320b..4493e3e2c3856c760a144f5966f9c90aa96cc129 100644 (file)
--- a/includes/inet.h
+++ b/includes/inet.h
@@ -3,7 +3,7 @@
    Portable definitions for internet addresses */
 
 /*
- * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2007,2009,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 /* An internet address of up to 128 bits. */

diff --git a/includes/omapip/alloc.h b/includes/omapip/alloc.h
index b9e6b85c3a2b7830715bf61f8f3a149698fe6e2c..407f5901dddba90f1eebe6838756777ccb0b51ba 100644 (file)
--- a/includes/omapip/alloc.h
+++ b/includes/omapip/alloc.h
@@ -3,7 +3,7 @@
    Definitions for the object management API protocol memory allocation... */
 
 /*
- * Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2009,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 isc_result_t omapi_buffer_new (omapi_buffer_t **, const char *, int);

diff --git a/includes/omapip/buffer.h b/includes/omapip/buffer.h
index ada82e0d6b59f4de9f471ad30dd68471fb8b6115..f31aa99dd4f75de7eb8b2a87597d33520f7a10dd 100644 (file)
--- a/includes/omapip/buffer.h
+++ b/includes/omapip/buffer.h
@@ -3,7 +3,7 @@
    Definitions for the object management API protocol buffering... */
 
 /*
- * Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2009,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 /* OMAPI buffers are ring buffers, which means that the beginning of the

diff --git a/includes/omapip/convert.h b/includes/omapip/convert.h
index 73b3ca3d8da474fdd749f52661da2a98e82f13a1..589594a0fa2a9a99af9440716cc0644ae97ff71e 100644 (file)
--- a/includes/omapip/convert.h
+++ b/includes/omapip/convert.h
@@ -3,7 +3,7 @@
    Safe copying of integers into and out of a non-aligned memory buffer. */
 
 /*
- * Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2009,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #ifndef OMAPI_CONVERT_H

diff --git a/includes/omapip/hash.h b/includes/omapip/hash.h
index 9914561262c3fec8860a6beba07cc98b053d3131..4e7a413c232062b022c37714be1b7d8c2596044b 100644 (file)
--- a/includes/omapip/hash.h
+++ b/includes/omapip/hash.h
@@ -3,7 +3,7 @@
    Definitions for hashing... */
 
 /*
- * Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2009,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1995-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #ifndef OMAPI_HASH_H

diff --git a/includes/omapip/omapip.h b/includes/omapip/omapip.h
index cbdc40d4f768d7cdc4b0a2f1c8c1cd46f918b25b..c4724e31f5266066f0ad0db5fe04c99803d22403 100644 (file)
--- a/includes/omapip/omapip.h
+++ b/includes/omapip/omapip.h
@@ -3,7 +3,8 @@
    Definitions for the object management API and protocol... */
 
 /*
- * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2009,2013-2014 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2007 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #ifndef _OMAPIP_H_

diff --git a/includes/omapip/omapip_p.h b/includes/omapip/omapip_p.h
index 51a7b90c19f1133821f23dd1471f88ec1d7591fd..30a778eda70ad441655913e5bb617497b5398e84 100644 (file)
--- a/includes/omapip/omapip_p.h
+++ b/includes/omapip/omapip_p.h
@@ -3,7 +3,7 @@
    Private master include file for the OMAPI library. */
 
 /*
- * Copyright (c) 2009-2010 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2009-2010,2014 by Internet Systems Consortium, Inc. ("ISC") 
  * Copyright (c) 2004,2007 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
@@ -25,12 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #ifndef __OMAPIP_OMAPIP_P_H__

diff --git a/includes/omapip/trace.h b/includes/omapip/trace.h
index fc5906c7a63928ccb8ab773cd1dd5435b96bc285..d55587b7d28c8356005e8daf0d63f018dc0eafc2 100644 (file)
--- a/includes/omapip/trace.h
+++ b/includes/omapip/trace.h
@@ -3,7 +3,7 @@
    Definitions for omapi tracing facility... */
 
 /*
- * Copyright (c) 2004,2005,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2005,2007,2009,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2001-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,10 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon, as part of a project for Nominum, Inc.   To learn more
- * about Internet Systems Consortium, see https://www.isc.org/.  To
- * learn more about Nominum, Inc., see ``http://www.nominum.com''.
  */
 
 #define TRACEFILE_MAGIC                0x64484370UL    /* dHCp */

diff --git a/includes/osdep.h b/includes/osdep.h
index a8d8bb787840195da940cb0fdb5c6e496c4f567a..0d1c05dbce2a46685759114f4833a0d9b6314331 100644 (file)
--- a/includes/osdep.h
+++ b/includes/osdep.h
@@ -3,8 +3,8 @@
    Operating system dependencies... */
 
 /*
- * Copyright (c) 2004-2005,2007-2010 by Internet Systems Consortium,
- *                                      Inc. ("ISC")
+ * Copyright (c) 2004-2005,2007-2010,2014 by Internet Systems Consortium,
+ *                                        Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -25,12 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #if !defined (__ISC_DHCP_OSDEP_H__)

diff --git a/includes/statement.h b/includes/statement.h
index 2d30b89dd3d9d341937805b74cfa9935f43122c3..3acdd79c55614d1edb63ed9c1b3aa08a45e238c9 100644 (file)
--- a/includes/statement.h
+++ b/includes/statement.h
@@ -3,7 +3,7 @@
    Definitions for executable statements... */
 
 /*
- * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2007,2009,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 struct executable_statement {

diff --git a/includes/tree.h b/includes/tree.h
index 291c0f6d58c9a615e4825c0763e6e7f15e5c55be..574165e74ffa8c01f6db0c1f76381d426d8fcc17 100644 (file)
--- a/includes/tree.h
+++ b/includes/tree.h
@@ -3,7 +3,7 @@
    Definitions for address trees... */
 
 /*
- * Copyright (c) 2011 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2011,2013,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2004,2007-2009 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
@@ -25,12 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 /* A pair of pointers, suitable for making a linked list. */

diff --git a/omapip/alloc.c b/omapip/alloc.c
index df695fb89997569a5395a84dd7570d81ef0e8ba8..a70fe21d4ecbbee5fc40222fc4cea66dcb3d526b 100644 (file)
--- a/omapip/alloc.c
+++ b/omapip/alloc.c
@@ -4,7 +4,7 @@
    protocol... */
 
 /*
- * Copyright (c) 2012 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2012,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2009-2010 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2004-2007 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1999-2003 by Internet Software Consortium
@@ -27,12 +27,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/omapip/array.c b/omapip/array.c
index 0a3ac619065e32ed74f32af13736b5f244d85fc9..5e67d2766e22c8282bdcadbfdbb7b87321d9f260 100644 (file)
--- a/omapip/array.c
+++ b/omapip/array.c
@@ -3,7 +3,7 @@
    Subroutines that support the omapi extensible array type. */
 
 /*
- * Copyright (c) 2004-2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2007,2009,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2001-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/omapip/auth.c b/omapip/auth.c
index 1269afd2d6860341f67150d01f32e4d37a1a3d2e..1f400d0dae53039dc5b9733fed2f5724ca92b9e4 100644 (file)
--- a/omapip/auth.c
+++ b/omapip/auth.c
@@ -3,7 +3,7 @@
    Subroutines having to do with authentication. */
 
 /*
- * Copyright (c) 2009-2010 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2009-2010,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2004,2007 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1998-2003 by Internet Software Consortium
  *
@@ -25,12 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/omapip/buffer.c b/omapip/buffer.c
index 4104cfb7f4f5013ee3ffecf23f7e97b5fefd2b5c..36bc8b9e531e0f6b602595fde67f50356523587b 100644 (file)
--- a/omapip/buffer.c
+++ b/omapip/buffer.c
@@ -3,7 +3,7 @@
    Buffer access functions for the object management protocol... */
 
 /*
- * Copyright (c) 2009,2012 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2009,2012-2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2004,2005,2007 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1999-2003 by Internet Software Consortium
  *
@@ -25,12 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/omapip/connection.c b/omapip/connection.c
index 66aa24f6592d965ea1ae404d111230239a34afef..58b08c690b487abda01b6dae20f8b732d0b41c4c 100644 (file)
--- a/omapip/connection.c
+++ b/omapip/connection.c
@@ -3,7 +3,7 @@
    Subroutines for dealing with connections. */
 
 /*
- * Copyright (c) 2009-2013 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2009-2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2004,2007 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1999-2003 by Internet Software Consortium
  *
@@ -25,12 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/omapip/convert.c b/omapip/convert.c
index 10b4b457e9d56746e03527dd64399d7e2dc04669..3482a9a48448825cc2cc0650daed7dd938bfd115 100644 (file)
--- a/omapip/convert.c
+++ b/omapip/convert.c
@@ -4,7 +4,7 @@
    can't be assumed to be aligned. */
 
 /*
- * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2007,2009,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -25,12 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/omapip/dispatch.c b/omapip/dispatch.c
index dcef3248247f0e2370223251f5a89503c674c676..be3918b68e04187e11777d57c5f4098bdc8808e8 100644 (file)
--- a/omapip/dispatch.c
+++ b/omapip/dispatch.c
@@ -3,7 +3,7 @@
    I/O dispatcher. */
 
 /*
- * Copyright (c) 2004,2007-2009,2013 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2007-2009,2013-2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1999-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/omapip/generic.c b/omapip/generic.c
index 26e9361de98bbf4b691b3fe998cae1abcee6611a..6dee8019b3bab2eaa8bbcad6074d061c41257c5a 100644 (file)
--- a/omapip/generic.c
+++ b/omapip/generic.c
@@ -3,7 +3,7 @@
    Subroutines that support the generic object. */
 
 /*
- * Copyright (c) 2004-2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2007,2009,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1999-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/omapip/handle.c b/omapip/handle.c
index 8405acfd9985805328df3fc95e219090e1dba64f..cae5ec25d638dcba23d47a00b8ba32a6c05fffbc 100644 (file)
--- a/omapip/handle.c
+++ b/omapip/handle.c
@@ -3,7 +3,7 @@
    Functions for maintaining handles on objects. */
 
 /*
- * Copyright (c) 2009-2010,2012 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2009-2010,2012,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2004-2007 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1999-2003 by Internet Software Consortium
  *
@@ -25,12 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/omapip/hash.c b/omapip/hash.c
index c3aa737c2b308a755baa79a02738e3ed2f5b7577..b75d102b0257389a1dacc76e3d9b2e55623fc849 100644 (file)
--- a/omapip/hash.c
+++ b/omapip/hash.c
@@ -3,7 +3,7 @@
    Routines for manipulating hash tables... */
 
 /*
- * Copyright (c) 2009-2010 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2009-2010,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2004-2007 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1995-2003 by Internet Software Consortium
  *
@@ -25,12 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/omapip/listener.c b/omapip/listener.c
index 138b0f23bb446e884c36611842a09db01d484e62..8bdcdbd7ffe9049518491841f932dec16ca6c5bf 100644 (file)
--- a/omapip/listener.c
+++ b/omapip/listener.c
@@ -3,7 +3,7 @@
    Subroutines that support the generic listener object. */
 
 /*
- * Copyright (c) 2012 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2012,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1999-2003 by Internet Software Consortium
  *
@@ -25,12 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/omapip/message.c b/omapip/message.c
index 3bd60ef78583c619a31acf90067a8c03e053d0e3..59ccdc2c05cf8b58fce53cb198d22642ab1e4c3e 100644 (file)
--- a/omapip/message.c
+++ b/omapip/message.c
@@ -3,7 +3,7 @@
    Subroutines for dealing with message objects. */
 
 /*
- * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2007,2009,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1999-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/omapip/omapi.3 b/omapip/omapi.3
index 4868d7c1aae8efa0147384de3e27a06ed261d72e..8fa81052144414ec21f220aab09872546f21298d 100644 (file)
--- a/omapip/omapi.3
+++ b/omapip/omapi.3
@@ -1,6 +1,6 @@
 .\"    omapi.3
 .\"
-.\" Copyright (c) 2009-2010 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (c) 2009-2010,2014 by Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (c) 2000-2003 by Internet Software Consortium
 .\"
@@ -243,5 +243,7 @@ with the given secret string using the specified algorithm.
 dhcpctl(3), omshell(1), dhcpd(8), dhclient(8), dhcpd.conf(5), dhclient.conf(5).
 .SH AUTHOR
 .B omapi
-was created by Ted Lemon of Nominum, Inc. This documentation was
-written by James Brister of Nominum, Inc. 
+is maintained by ISC.  To learn more about Internet Systems Consortium,
+see
+.B https://www.isc.org
+

diff --git a/omapip/protocol.c b/omapip/protocol.c
index 112bf128ffbfc18383a3cd055889c493e5baac04..908bccef2bdd866b0055c4d57e0e235715eda480 100644 (file)
--- a/omapip/protocol.c
+++ b/omapip/protocol.c
@@ -3,7 +3,7 @@
    Functions supporting the object management protocol... */
 
 /*
- * Copyright (c) 2009,2012 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2009,2012,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2004-2007 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1999-2003 by Internet Software Consortium
  *
@@ -25,12 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/omapip/support.c b/omapip/support.c
index ed348c2f712243aa43cea611c9e4febc08927bdc..48592d4b5bad22a007599384449f8b10bef1fa5c 100644 (file)
--- a/omapip/support.c
+++ b/omapip/support.c
@@ -3,7 +3,7 @@
    Subroutines providing general support for objects. */
 
 /*
- * Copyright (c) 2012 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2012,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2009-2010 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2004-2007 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1999-2003 by Internet Software Consortium
@@ -26,12 +26,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/omapip/test.c b/omapip/test.c
index 1171317b989abcc4a2404975b85059edd877532c..e97a61fca8aaffe93c95373b78b8a48c7ce985cd 100644 (file)
--- a/omapip/test.c
+++ b/omapip/test.c
@@ -3,7 +3,7 @@
    Test code for omapip... */
 
 /*
- * Copyright (c) 2009-2010 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2009-2010,2013-2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1999-2003 by Internet Software Consortium
  *
@@ -25,12 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "config.h"

diff --git a/omapip/toisc.c b/omapip/toisc.c
index 11669a880552af8cb8ec2a373ae293d7c05f6fe2..07aa251077cba178a5677765f3e99fdb1e03ab44 100644 (file)
--- a/omapip/toisc.c
+++ b/omapip/toisc.c
@@ -3,7 +3,7 @@
    Convert non-ISC result codes to ISC result codes. */
 
 /*
- * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2007,2009,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2001-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/omapip/trace.c b/omapip/trace.c
index 8e203cd47d968dde47260e22b0b5f7b94230f3f0..23e4e50606ede8183802332a97c02ce1f966ec3a 100644 (file)
--- a/omapip/trace.c
+++ b/omapip/trace.c
@@ -5,7 +5,7 @@
    transactions... */
 
 /*
- * Copyright (c) 2012 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2012,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2009-2010 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2004-2007 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2001-2003 by Internet Software Consortium
@@ -28,10 +28,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon, as part of a project for Nominum, Inc.   To learn more
- * about Internet Systems Consortium, see https://www.isc.org/.  To
- * learn more about Nominum, Inc., see ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
index b3ffbf4e18124ba2fd0080a75ae9ef29fe334854..6f42927d3c38e5e4dbcf1ad8be2a447a6998ed4c 100644 (file)
--- a/relay/dhcrelay.c
+++ b/relay/dhcrelay.c
@@ -24,12 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/server/bootp.c b/server/bootp.c
index f0b787c166e91c63c77a564802769ba49a6a89d8..d6dd96a27745fffedbc31bb54fc638b3248bc1f3 100644 (file)
--- a/server/bootp.c
+++ b/server/bootp.c
@@ -3,7 +3,7 @@
    BOOTP Protocol support. */
 
 /*
- * Copyright (c) 2009,2012 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2009,2012-2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2004,2005,2007 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1995-2003 by Internet Software Consortium
  *
@@ -25,12 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/server/class.c b/server/class.c
index b8eac87ceff90115a3724f6b3a063f492f2729ae..1fbe7d4534ba3de03ec30f638f04e79beb57a8b2 100644 (file)
--- a/server/class.c
+++ b/server/class.c
@@ -3,7 +3,7 @@
    Handling for client classes. */
 
 /*
- * Copyright (c) 2009,2012 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2009,2012-2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2004,2007 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1998-2003 by Internet Software Consortium
  *
@@ -25,12 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/server/confpars.c b/server/confpars.c
index 47422e5dfad821f0e0ed74da79f058a69414838b..684f9c12b9aa8df9b838c11e9f7297d0079e37ee 100644 (file)
--- a/server/confpars.c
+++ b/server/confpars.c
@@ -3,7 +3,7 @@
    Parser for dhcpd config file... */
 
 /*
- * Copyright (c) 2004-2013 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1995-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/server/db.c b/server/db.c
index 5f7059b280259a99c2d6f21533e7129d6c54a547..82f3841fe870042883abd44be31242656c48bbd5 100644 (file)
--- a/server/db.c
+++ b/server/db.c
@@ -3,7 +3,8 @@
    Persistent database management routines for DHCPD... */
 
 /*
- * Copyright (c) 2004-2010,2012 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2012-2014 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2010 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1995-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/server/ddns.c b/server/ddns.c
index 7d6bb49878c84ea56cf3dd973d84714b1b4cc867..c6689e0d2cd77a147a472d296bd799fe6199cf1c 100644 (file)
--- a/server/ddns.c
+++ b/server/ddns.c
@@ -3,7 +3,8 @@
    Dynamic DNS updates. */
 
 /*
- * Copyright (c) 2009-2012 by Internet Systems Consortium, Inc. ("ISC")
+ * 
+ * Copyright (c) 2009-2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2004-2007 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2000-2003 by Internet Software Consortium
  *

diff --git a/server/dhcp.c b/server/dhcp.c
index 726dcb403f79d150ae92323b4a12cb73b8d9299c..e81b88d409a98cebc734afbe8d252254de715d50 100644 (file)
--- a/server/dhcp.c
+++ b/server/dhcp.c
@@ -3,7 +3,7 @@
    DHCP Protocol engine. */
 
 /*
- * Copyright (c) 2004-2013 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1995-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/server/dhcpd.c b/server/dhcpd.c
index 198da082203471f6548be7ccff6c7519a46adc27..7dc7dd2ab92f3658d3f8841f0437863ea8e4785b 100644 (file)
--- a/server/dhcpd.c
+++ b/server/dhcpd.c
@@ -24,12 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 static const char copyright[] =

diff --git a/server/dhcpd.conf.5 b/server/dhcpd.conf.5
index f21786486192183eccd75c50473d8ce50cb43a60..e639db6e5b8850d68f2ad04d892ce11b3305fdae 100644 (file)
--- a/server/dhcpd.conf.5
+++ b/server/dhcpd.conf.5
@@ -3001,8 +3001,6 @@ manual page.
 dhcpd(8), dhcpd.leases(5), dhcp-options(5), dhcp-eval(5), RFC2132, RFC2131.
 .SH AUTHOR
 .B dhcpd.conf(5)
-was written by Ted Lemon
-under a contract with Vixie Labs.  Funding
-for this project was provided by Internet Systems Consortium.
+is maintained by ISC.
 Information about Internet Systems Consortium can be found at
 .B https://www.isc.org.

diff --git a/server/dhcpd.leases.5 b/server/dhcpd.leases.5
index 82bd23158b9b2f1efd2a2023c0cf6d5c319e5702..d5f1227cbf63ff609dc931643a168e774cb7b2ee 100644 (file)
--- a/server/dhcpd.leases.5
+++ b/server/dhcpd.leases.5
@@ -1,6 +1,6 @@
 .\"    dhcpd.leases.5
 .\"
-.\" Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (c) 2004,2009,2014 by Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (c) 1996-2003 by Internet Software Consortium
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -21,13 +21,6 @@
 .\"   <info@isc.org>
 .\"   https://www.isc.org/
 .\"
-.\" This software has been written for Internet Systems Consortium
-.\" by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
-.\" To learn more about Internet Systems Consortium, see
-.\" ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
-.\" see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
-.\" ``http://www.nominum.com''.
-.\"
 .\" $Id: dhcpd.leases.5,v 1.14.24.3 2011/09/19 00:24:22 sar Exp $
 .\"
 .TH dhcpd.leases 5
@@ -284,8 +277,6 @@ possible: \fBunknown-state\fR, \fBpartner-down\fR, \fBnormal\fR,
 dhcpd(8), dhcp-options(5), dhcp-eval(5), dhcpd.conf(5), RFC2132, RFC2131.
 .SH AUTHOR
 .B dhcpd(8)
-was written by Ted Lemon
-under a contract with Vixie Labs.   Funding
-for this project was provided by Internet Systems Consortium.
+is maintained by ISC.
 Information about Internet Systems Consortium can be found at:
 .B https://www.isc.org/

diff --git a/server/failover.c b/server/failover.c
index 7a9ae9e226ce34736db855dea2d212b298a5a410..9d7e51c18cc0b9cf03133418ae85b6b15e196667 100644 (file)
--- a/server/failover.c
+++ b/server/failover.c
@@ -3,7 +3,7 @@
    Failover protocol support code... */
 
 /*
- * Copyright (c) 2004-2013 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1999-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "cdefs.h"

diff --git a/server/mdb.c b/server/mdb.c
index 2d02a713a9bea55077608ec85d58a17e62b0f023..a692bef7c254d7edd8cc450300b26955547ebc2c 100644 (file)
--- a/server/mdb.c
+++ b/server/mdb.c
@@ -3,7 +3,8 @@
    Server-specific in-memory database support. */
 
 /*
- * Copyright (c) 2004-2012 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2011-2014 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2009 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/server/omapi.c b/server/omapi.c
index 5c9f209549d2f3c07de50156136c9f7dce9c9b5f..27bd97b1f5f2dcfbcdc87718c6d26695bebb6dd7 100644 (file)
--- a/server/omapi.c
+++ b/server/omapi.c
@@ -3,7 +3,8 @@
    OMAPI object interfaces for the DHCP server. */
 
 /*
- * Copyright (c) 2004-2010,2012,2013 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2012-2014 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2010 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1999-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 /* Many, many thanks to Brian Murrell and BCtel for this code - BCtel

diff --git a/server/salloc.c b/server/salloc.c
index 547188922263a60fc6af5f4c2e6a403f561393e5..47ff7abf3f8efb614db01171ffdef0e8029438b1 100644 (file)
--- a/server/salloc.c
+++ b/server/salloc.c
@@ -3,7 +3,7 @@
    Memory allocation for the DHCP server... */
 
 /*
- * Copyright (c) 2009,2012 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2009,2012,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2004-2007 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
@@ -25,12 +25,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"

diff --git a/server/stables.c b/server/stables.c
index 7ac5994d91a00a9df279abf96c45232710a75979..da2576407152af6dd6b4698a8d9a298274e750b8 100644 (file)
--- a/server/stables.c
+++ b/server/stables.c
@@ -3,7 +3,7 @@
    Tables of information only used by server... */
 
 /*
- * Copyright (c) 2004-2011 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2011,2013-2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1995-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,12 +24,6 @@
  *   <info@isc.org>
  *   https://www.isc.org/
  *
- * This software has been written for Internet Systems Consortium
- * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc.
- * To learn more about Internet Systems Consortium, see
- * ``https://www.isc.org/''.  To learn more about Vixie Enterprises,
- * see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
- * ``http://www.nominum.com''.
  */
 
 #include "dhcpd.h"