From d46bc9420020ebd80d345434d39a0d75bf85e43e Mon Sep 17 00:00:00 2001
From: wiz <wiz@NetBSD.org>
Date: Fri, 26 Dec 2003 19:04:55 +0000
Subject: [PATCH] Niels Provos kindly agreed to drop clauses 3 and 4 from the
 license -- thanks. Based on OpenBSD commit and hints by itojun.

---
 lib/libc/gen/randomid.c | 9 ++-------
 sys/netinet/ip_id.c     | 9 ++-------
 sys/netinet6/ip6_id.c   | 9 ++-------
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/lib/libc/gen/randomid.c b/lib/libc/gen/randomid.c
index 558312c479a3..07527ebba671 100644
--- a/lib/libc/gen/randomid.c
+++ b/lib/libc/gen/randomid.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: randomid.c,v 1.10 2003/12/10 05:22:18 itojun Exp $	*/
+/*	$NetBSD: randomid.c,v 1.11 2003/12/26 19:04:56 wiz Exp $	*/
 /*	$KAME: ip6_id.c,v 1.8 2003/09/06 13:41:06 itojun Exp $	*/
 /*	$OpenBSD: ip_id.c,v 1.6 2002/03/15 18:19:52 millert 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
@@ -88,7 +83,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: randomid.c,v 1.10 2003/12/10 05:22:18 itojun Exp $");
+__RCSID("$NetBSD: randomid.c,v 1.11 2003/12/26 19:04:56 wiz Exp $");
 #endif
 
 #include "namespace.h"
diff --git a/sys/netinet/ip_id.c b/sys/netinet/ip_id.c
index d25e4641480b..8daaef251771 100644
--- a/sys/netinet/ip_id.c
+++ b/sys/netinet/ip_id.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_id.c,v 1.5 2003/12/10 05:22:18 itojun Exp $	*/
+/*	$NetBSD: ip_id.c,v 1.6 2003/12/26 19:04:55 wiz Exp $	*/
 /*	$OpenBSD: ip_id.c,v 1.6 2002/03/15 18:19:52 millert Exp $	*/
 
 /*
@@ -18,11 +18,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
@@ -57,7 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_id.c,v 1.5 2003/12/10 05:22:18 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_id.c,v 1.6 2003/12/26 19:04:55 wiz Exp $");
 
 #include "opt_inet.h"
 
diff --git a/sys/netinet6/ip6_id.c b/sys/netinet6/ip6_id.c
index 02f2713ec567..0036aff2277e 100644
--- a/sys/netinet6/ip6_id.c
+++ b/sys/netinet6/ip6_id.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip6_id.c,v 1.11 2003/12/10 05:22:18 itojun Exp $	*/
+/*	$NetBSD: ip6_id.c,v 1.12 2003/12/26 19:04:56 wiz Exp $	*/
 /*	$KAME: ip6_id.c,v 1.8 2003/09/06 13:41:06 itojun Exp $	*/
 /*	$OpenBSD: ip_id.c,v 1.6 2002/03/15 18:19:52 millert 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
@@ -87,7 +82,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_id.c,v 1.11 2003/12/10 05:22:18 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_id.c,v 1.12 2003/12/26 19:04:56 wiz Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>