summaryrefslogtreecommitdiff
path: root/sys/net
diff options
context:
space:
mode:
authorJason Wright <jason@cvs.openbsd.org>2003-06-02 18:42:57 +0000
committerJason Wright <jason@cvs.openbsd.org>2003-06-02 18:42:57 +0000
commita1f25a0b0903b9732fa8acb6518f1e0988d47e5f (patch)
treeb9cce0c1a2483ad38078e15e7d0b62d9b2456b07 /sys/net
parentaef2ced8fb01e7f6c996292e0d113f8c07ff4299 (diff)
nuke clause 3 & 4
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/bridgestp.c7
-rw-r--r--sys/net/if_bridge.c7
-rw-r--r--sys/net/if_bridge.h7
3 files changed, 3 insertions, 18 deletions
diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c
index 2b826b2cd75..e9df62f152e 100644
--- a/sys/net/bridgestp.c
+++ b/sys/net/bridgestp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bridgestp.c,v 1.14 2002/12/10 13:22:55 markus Exp $ */
+/* $OpenBSD: bridgestp.c,v 1.15 2003/06/02 18:42:56 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
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index 0b1b34a154e..f4d9c30db7d 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bridge.c,v 1.117 2003/05/30 21:15:41 henning Exp $ */
+/* $OpenBSD: if_bridge.c,v 1.118 2003/06/02 18:42:56 jason Exp $ */
/*
* Copyright (c) 1999, 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
diff --git a/sys/net/if_bridge.h b/sys/net/if_bridge.h
index 3069f1de69d..308afdcef88 100644
--- a/sys/net/if_bridge.h
+++ b/sys/net/if_bridge.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bridge.h,v 1.22 2003/05/30 21:15:41 henning Exp $ */
+/* $OpenBSD: if_bridge.h,v 1.23 2003/06/02 18:42:56 jason Exp $ */
/*
* Copyright (c) 1999, 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