summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE3
-rw-r--r--README17
-rw-r--r--RELNOTES4
-rw-r--r--includes/arpa/nameser.h6
-rw-r--r--includes/arpa/nameser_compat.h6
-rw-r--r--includes/netinet/if_ether.h6
-rw-r--r--includes/netinet/ip.h6
-rw-r--r--includes/netinet/ip_icmp.h6
-rw-r--r--includes/netinet/udp.h6
-rw-r--r--minires/res_comp.c6
-rw-r--r--minires/res_init.c6
-rw-r--r--minires/res_mkquery.c6
-rw-r--r--minires/res_query.c6
-rw-r--r--minires/res_send.c6
-rw-r--r--omapip/inet_addr.c6
15 files changed, 36 insertions, 60 deletions
diff --git a/LICENSE b/LICENSE
index eef341e1..dc09c0aa 100644
--- a/LICENSE
+++ b/LICENSE
@@ -18,3 +18,6 @@
# Redwood City, CA 94063
# <info@isc.org>
# https://www.isc.org/
+
+See the specific source files for any additional copyright or
+license statements.
diff --git a/README b/README
index bef92d8b..3a3a2d3d 100644
--- a/README
+++ b/README
@@ -40,6 +40,7 @@ the ISC DHCP Distribution.
5.10 MacOS X
6 SUPPORT
6.1 HOW TO REPORT BUGS
+ 7 HISTORY
WHERE TO FIND DOCUMENTATION
@@ -699,3 +700,19 @@ bug reports are more likely to get handled more quickly overall.
Please see https://www.isc.org/software/dhcp/ for details on how to subscribe
to the ISC DHCP mailing lists.
+ HISTORY
+
+ISC DHCP was originally written by Ted Lemon under a contract with
+Vixie Labs with the goal of being a complete reference implementation
+of the DHCP protocol. Funding for this project was provided by
+Internet Systems Consortium. The first release of the ISC DHCP
+distribution in December 1997 included just the DHCP server.
+Release 2 in June 1999 added a DHCP client and a BOOTP/DHCP relay
+agent. DHCP 3 was released in October 2001 and included DHCP failover
+support, OMAPI, Dynamic DNS, conditional behaviour, client classing,
+and more. Version 3 of the DHCP server was funded by Nominum, Inc.
+The 4.0 release in December 2007 introduced DHCPv6 protocol support
+for the server and client.
+
+This product includes cryptographic software written
+by Eric Young (eay@cryptsoft.com).
diff --git a/RELNOTES b/RELNOTES
index 94b3459e..4e72ad5e 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -48,6 +48,10 @@ The system has only been tested on Linux, FreeBSD, and Solaris, and may not
work on other platforms. Please report any problems and suggested fixes to
<dhcp-users@isc.org>.
+ISC DHCP is open source software maintained by Internet Systems
+Consortium. This product includes cryptographic software written
+by Eric Young (eay@cryptsoft.com).
+
Changes since 4.2.0 (new features)
- If a client renews before 'dhcp-cache-threshold' percent of its lease
diff --git a/includes/arpa/nameser.h b/includes/arpa/nameser.h
index d96139d2..eaa95f9e 100644
--- a/includes/arpa/nameser.h
+++ b/includes/arpa/nameser.h
@@ -10,11 +10,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/includes/arpa/nameser_compat.h b/includes/arpa/nameser_compat.h
index 3ae17f0e..fa30d99a 100644
--- a/includes/arpa/nameser_compat.h
+++ b/includes/arpa/nameser_compat.h
@@ -9,11 +9,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/includes/netinet/if_ether.h b/includes/netinet/if_ether.h
index 8de80235..a1337100 100644
--- a/includes/netinet/if_ether.h
+++ b/includes/netinet/if_ether.h
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/includes/netinet/ip.h b/includes/netinet/ip.h
index 0a1e3584..9d20e5f0 100644
--- a/includes/netinet/ip.h
+++ b/includes/netinet/ip.h
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/includes/netinet/ip_icmp.h b/includes/netinet/ip_icmp.h
index 8fffb58b..0f40c3bb 100644
--- a/includes/netinet/ip_icmp.h
+++ b/includes/netinet/ip_icmp.h
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/includes/netinet/udp.h b/includes/netinet/udp.h
index 5f1cd7d2..d86cf447 100644
--- a/includes/netinet/udp.h
+++ b/includes/netinet/udp.h
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/minires/res_comp.c b/minires/res_comp.c
index 5b683907..5c4c73d5 100644
--- a/minires/res_comp.c
+++ b/minires/res_comp.c
@@ -10,11 +10,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/minires/res_init.c b/minires/res_init.c
index 05118497..2163039c 100644
--- a/minires/res_init.c
+++ b/minires/res_init.c
@@ -10,11 +10,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/minires/res_mkquery.c b/minires/res_mkquery.c
index d24a177b..1a58d1a9 100644
--- a/minires/res_mkquery.c
+++ b/minires/res_mkquery.c
@@ -10,11 +10,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/minires/res_query.c b/minires/res_query.c
index 9036697e..124d1dde 100644
--- a/minires/res_query.c
+++ b/minires/res_query.c
@@ -10,11 +10,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/minires/res_send.c b/minires/res_send.c
index 8513d7df..a26e0ef5 100644
--- a/minires/res_send.c
+++ b/minires/res_send.c
@@ -10,11 +10,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/omapip/inet_addr.c b/omapip/inet_addr.c
index c5ccc79f..c7d7ffe9 100644
--- a/omapip/inet_addr.c
+++ b/omapip/inet_addr.c
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*