[src/trunk]: src Niels Provos kindly agreed to drop clauses 3 and 4 from the

[wiz <wiz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ade39794f6ea
branches:  trunk
changeset: 556767:ade39794f6ea
user:      wiz <wiz%NetBSD.org@localhost>
date:      Fri Dec 26 19:04:55 2003 +0000

description:
Niels Provos kindly agreed to drop clauses 3 and 4 from the
license -- thanks.
Based on OpenBSD commit and hints by itojun.

diffstat:

 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(-)

diffs (90 lines):

diff -r 53a9ba7e9b22 -r ade39794f6ea lib/libc/gen/randomid.c
--- a/lib/libc/gen/randomid.c   Fri Dec 26 18:08:34 2003 +0000
+++ b/lib/libc/gen/randomid.c   Fri Dec 26 19:04:55 2003 +0000
@@ -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 -r 53a9ba7e9b22 -r ade39794f6ea sys/netinet/ip_id.c
--- a/sys/netinet/ip_id.c       Fri Dec 26 18:08:34 2003 +0000
+++ b/sys/netinet/ip_id.c       Fri Dec 26 19:04:55 2003 +0000
@@ -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 -r 53a9ba7e9b22 -r ade39794f6ea sys/netinet6/ip6_id.c
--- a/sys/netinet6/ip6_id.c     Fri Dec 26 18:08:34 2003 +0000
+++ b/sys/netinet6/ip6_id.c     Fri Dec 26 19:04:55 2003 +0000
@@ -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>