remove clause 3 and 4. -moj

5 files changed, 9 insertions, 34 deletions

diff --git a/usr.sbin/mopd/otherOS/loop-linux2.c b/usr.sbin/mopd/otherOS/loop-linux2.c
index 62b500f71ea..8278bac0b83 100644
--- a/usr.sbin/mopd/otherOS/loop-linux2.c
+++ b/usr.sbin/mopd/otherOS/loop-linux2.c
@@ -9,11 +9,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 Mats O Jansson.
- * 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
@@ -28,7 +23,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$Id: loop-linux2.c,v 1.2 2002/02/16 21:28:04 millert Exp $";
+static char rcsid[] = "$Id: loop-linux2.c,v 1.3 2003/06/02 21:38:40 maja Exp $";
 #endif
 
 #include <stdlib.h>
diff --git a/usr.sbin/mopd/otherOS/loop.c b/usr.sbin/mopd/otherOS/loop.c
index 59e86a848be..1eb83bac9af 100644
--- a/usr.sbin/mopd/otherOS/loop.c
+++ b/usr.sbin/mopd/otherOS/loop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: loop.c,v 1.3 1998/07/07 17:32:44 art Exp $ */
+/*	$OpenBSD: loop.c,v 1.4 2003/06/02 21:38:40 maja Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -11,11 +11,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 Mats O Jansson.
- * 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
@@ -30,7 +25,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: loop.c,v 1.3 1998/07/07 17:32:44 art Exp $";
+static char rcsid[] = "$OpenBSD: loop.c,v 1.4 2003/06/02 21:38:40 maja Exp $";
 #endif
 
 #include "os.h"
diff --git a/usr.sbin/mopd/otherOS/os-linux2.h b/usr.sbin/mopd/otherOS/os-linux2.h
index d2658be2d5c..5251257e8de 100644
--- a/usr.sbin/mopd/otherOS/os-linux2.h
+++ b/usr.sbin/mopd/otherOS/os-linux2.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: os-linux2.h,v 1.1 1999/03/27 14:31:22 maja Exp $ */
+/*	$OpenBSD: os-linux2.h,v 1.2 2003/06/02 21:38:40 maja Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -11,11 +11,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 Mats O Jansson.
- * 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
@@ -28,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * @(#) $OpenBSD: os-linux2.h,v 1.1 1999/03/27 14:31:22 maja Exp $
+ * @(#) $OpenBSD: os-linux2.h,v 1.2 2003/06/02 21:38:40 maja Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/mopd/otherOS/os-sunos4.h b/usr.sbin/mopd/otherOS/os-sunos4.h
index e1c57ac0b89..9b94114e427 100644
--- a/usr.sbin/mopd/otherOS/os-sunos4.h
+++ b/usr.sbin/mopd/otherOS/os-sunos4.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: os-sunos4.h,v 1.2 1996/09/21 19:12:47 maja Exp $ */
+/*	$OpenBSD: os-sunos4.h,v 1.3 2003/06/02 21:38:40 maja Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -11,11 +11,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 Mats O Jansson.
- * 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
@@ -28,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * @(#) $OpenBSD: os-sunos4.h,v 1.2 1996/09/21 19:12:47 maja Exp $
+ * @(#) $OpenBSD: os-sunos4.h,v 1.3 2003/06/02 21:38:40 maja Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/mopd/otherOS/pf-snit.c b/usr.sbin/mopd/otherOS/pf-snit.c
index 5414b2c01d7..0eec3970515 100644
--- a/usr.sbin/mopd/otherOS/pf-snit.c
+++ b/usr.sbin/mopd/otherOS/pf-snit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf-snit.c,v 1.4 2002/03/14 16:44:25 mpech Exp $ */
+/*	$OpenBSD: pf-snit.c,v 1.5 2003/06/02 21:38:40 maja Exp $ */
 
 /*
  * Copyright (c) 1993-96 Mats O Jansson.  All rights reserved.
@@ -11,11 +11,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 Mats O Jansson.
- * 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
@@ -30,7 +25,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: pf-snit.c,v 1.4 2002/03/14 16:44:25 mpech Exp $";
+static char rcsid[] = "$OpenBSD: pf-snit.c,v 1.5 2003/06/02 21:38:40 maja Exp $";
 #endif
 
 #include <stdio.h>