summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjason <jason@openbsd.org>2003-06-03 00:21:04 +0000
committerjason <jason@openbsd.org>2003-06-03 00:21:04 +0000
commitd4b611c413bed6be4a99dd2360967749ac598d5b (patch)
treebb8c1151d3a27f50ad19fe54aa3db796254f3306
parentRemove the advertising clause in the UCB license which Berkeley (diff)
downloadwireguard-openbsd-d4b611c413bed6be4a99dd2360967749ac598d5b.tar.xz
wireguard-openbsd-d4b611c413bed6be4a99dd2360967749ac598d5b.zip
last bit of clause 3 & 4 nuking for me.
-rw-r--r--usr.sbin/tcpdump/print-etherip.c9
-rw-r--r--usr.sbin/tcpdump/print-gre.c7
-rw-r--r--usr.sbin/tcpdump/print-stp.c7
3 files changed, 4 insertions, 19 deletions
diff --git a/usr.sbin/tcpdump/print-etherip.c b/usr.sbin/tcpdump/print-etherip.c
index 15d7f661183..04512b75feb 100644
--- a/usr.sbin/tcpdump/print-etherip.c
+++ b/usr.sbin/tcpdump/print-etherip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-etherip.c,v 1.1 2001/02/05 15:18:47 jason Exp $ */
+/* $OpenBSD: print-etherip.c,v 1.2 2003/06/03 00:21:04 jason Exp $ */
/*
* Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -12,11 +12,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 Jason L. Wright
- * 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
@@ -37,7 +32,7 @@
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /home/cvs/src/usr.sbin/tcpdump/print-etherip.c,v 1.1 2001/02/05 15:18:47 jason Exp $";
+ "@(#) $Header: /home/cvs/src/usr.sbin/tcpdump/print-etherip.c,v 1.2 2003/06/03 00:21:04 jason Exp $";
#endif
#include <sys/param.h>
diff --git a/usr.sbin/tcpdump/print-gre.c b/usr.sbin/tcpdump/print-gre.c
index dd2c9c38959..b4511d1f60f 100644
--- a/usr.sbin/tcpdump/print-gre.c
+++ b/usr.sbin/tcpdump/print-gre.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-gre.c,v 1.6 2002/10/30 03:04:04 fgsch Exp $ */
+/* $OpenBSD: print-gre.c,v 1.7 2003/06/03 00:21:04 jason Exp $ */
/*
* Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -12,11 +12,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 Jason L. Wright
- * 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
diff --git a/usr.sbin/tcpdump/print-stp.c b/usr.sbin/tcpdump/print-stp.c
index 4fd6237bf85..81068541249 100644
--- a/usr.sbin/tcpdump/print-stp.c
+++ b/usr.sbin/tcpdump/print-stp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-stp.c,v 1.2 2002/02/19 19:39:40 millert Exp $ */
+/* $OpenBSD: print-stp.c,v 1.3 2003/06/03 00:21:04 jason Exp $ */
/*
* Copyright (c) 2000 Jason L. Wright (jason@thought.net)
@@ -12,11 +12,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 Jason L. Wright
- * 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