summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJun-ichiro itojun Hagino <itojun@cvs.openbsd.org>2003-12-12 06:57:13 +0000
committerJun-ichiro itojun Hagino <itojun@cvs.openbsd.org>2003-12-12 06:57:13 +0000
commitcbaa86c060229e92a4505efd6db4897aac90a6e9 (patch)
tree8c6cbe4a1f651a49b59390a06c87d015fdfe43df /sys
parent547093d7490dbcaaf67906f215a86d82a56fc4a8 (diff)
niels kindly dropped clause 3/4 from the license. tnx!
Diffstat (limited to 'sys')
-rw-r--r--sys/netinet/ip_id.c7
-rw-r--r--sys/netinet6/ip6_id.c7
2 files changed, 2 insertions, 12 deletions
diff --git a/sys/netinet/ip_id.c b/sys/netinet/ip_id.c
index d92ba8c25ea..a8accf641d9 100644
--- a/sys/netinet/ip_id.c
+++ b/sys/netinet/ip_id.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_id.c,v 1.10 2003/12/12 02:50:44 itojun Exp $ */
+/* $OpenBSD: ip_id.c,v 1.11 2003/12/12 06:57:12 itojun Exp $ */
/*
* Copyright 1998 Niels Provos <provos@citi.umich.edu>
@@ -17,11 +17,6 @@
* 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 Niels Provos.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sys/netinet6/ip6_id.c b/sys/netinet6/ip6_id.c
index 5b6151a246a..fd36e46f3c3 100644
--- a/sys/netinet6/ip6_id.c
+++ b/sys/netinet6/ip6_id.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip6_id.c,v 1.2 2003/12/10 07:21:01 itojun Exp $ */
+/* $OpenBSD: ip6_id.c,v 1.3 2003/12/12 06:57:12 itojun Exp $ */
/* $NetBSD: ip6_id.c,v 1.7 2003/09/13 21:32:59 itojun Exp $ */
/* $KAME: ip6_id.c,v 1.8 2003/09/06 13:41:06 itojun Exp $ */
@@ -48,11 +48,6 @@
* 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 Niels Provos.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES