remove clause 3 and 4. -moj

41 files changed, 81 insertions, 286 deletions

diff --git a/usr.sbin/mopd/common/cmp.c b/usr.sbin/mopd/common/cmp.c
index 1903adacede..dab8acf63a5 100644
--- a/usr.sbin/mopd/common/cmp.c
+++ b/usr.sbin/mopd/common/cmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmp.c,v 1.4 2002/03/14 16:44:25 mpech Exp $ */
+/*	$OpenBSD: cmp.c,v 1.5 2003/06/02 21:38:39 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: cmp.c,v 1.4 2002/03/14 16:44:25 mpech Exp $";
+static char rcsid[] = "$OpenBSD: cmp.c,v 1.5 2003/06/02 21:38:39 maja Exp $";
 #endif
 
 #include "os.h"
diff --git a/usr.sbin/mopd/common/cmp.h b/usr.sbin/mopd/common/cmp.h
index f1a2e57756a..353d6b12781 100644
--- a/usr.sbin/mopd/common/cmp.h
+++ b/usr.sbin/mopd/common/cmp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmp.h,v 1.5 2002/06/10 21:05:25 maja Exp $ */
+/*	$OpenBSD: cmp.h,v 1.6 2003/06/02 21:38:39 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: cmp.h,v 1.5 2002/06/10 21:05:25 maja Exp $
+ *	$OpenBSD: cmp.h,v 1.6 2003/06/02 21:38:39 maja Exp $
  *
  */
 
diff --git a/usr.sbin/mopd/common/common.h b/usr.sbin/mopd/common/common.h
index de4871f4ea6..f3af6f91216 100644
--- a/usr.sbin/mopd/common/common.h
+++ b/usr.sbin/mopd/common/common.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: common.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */
+/*	$OpenBSD: common.h,v 1.4 2003/06/02 21:38:39 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: common.h,v 1.3 2001/08/12 12:03:03 heko Exp $
+ *	$OpenBSD: common.h,v 1.4 2003/06/02 21:38:39 maja Exp $
  *
  */
 
diff --git a/usr.sbin/mopd/common/device.c b/usr.sbin/mopd/common/device.c
index a58334c2a2b..30e6b5b0c09 100644
--- a/usr.sbin/mopd/common/device.c
+++ b/usr.sbin/mopd/common/device.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: device.c,v 1.6 2002/09/07 08:09:49 maja Exp $ */
+/*	$OpenBSD: device.c,v 1.7 2003/06/02 21:38:39 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: device.c,v 1.6 2002/09/07 08:09:49 maja Exp $";
+static char rcsid[] = "$OpenBSD: device.c,v 1.7 2003/06/02 21:38:39 maja Exp $";
 #endif
 
 #include "os.h"
diff --git a/usr.sbin/mopd/common/device.h b/usr.sbin/mopd/common/device.h
index f830f1f0972..a3e1a972cae 100644
--- a/usr.sbin/mopd/common/device.h
+++ b/usr.sbin/mopd/common/device.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: device.h,v 1.5 2002/06/10 21:05:25 maja Exp $ */
+/*	$OpenBSD: device.h,v 1.6 2003/06/02 21:38:39 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: device.h,v 1.5 2002/06/10 21:05:25 maja Exp $
+ *	$OpenBSD: device.h,v 1.6 2003/06/02 21:38:39 maja Exp $
  *
  */
 
diff --git a/usr.sbin/mopd/common/dl.c b/usr.sbin/mopd/common/dl.c
index 23c98e1d7bc..ce7a469ba87 100644
--- a/usr.sbin/mopd/common/dl.c
+++ b/usr.sbin/mopd/common/dl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dl.c,v 1.2 1996/09/21 19:11:26 maja Exp $ */
+/*	$OpenBSD: dl.c,v 1.3 2003/06/02 21:38:39 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: dl.c,v 1.2 1996/09/21 19:11:26 maja Exp $";
+static char rcsid[] = "$OpenBSD: dl.c,v 1.3 2003/06/02 21:38:39 maja Exp $";
 #endif
 
 #include "os.h"
diff --git a/usr.sbin/mopd/common/dl.h b/usr.sbin/mopd/common/dl.h
index f360b098f8c..46cad6c49c8 100644
--- a/usr.sbin/mopd/common/dl.h
+++ b/usr.sbin/mopd/common/dl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dl.h,v 1.5 2002/06/10 21:05:25 maja Exp $ */
+/*	$OpenBSD: dl.h,v 1.6 2003/06/02 21:38:39 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: dl.h,v 1.5 2002/06/10 21:05:25 maja Exp $
+ *	$OpenBSD: dl.h,v 1.6 2003/06/02 21:38:39 maja Exp $
  *
  */
 
diff --git a/usr.sbin/mopd/common/file.c b/usr.sbin/mopd/common/file.c
index 808cfd83ad0..e160e2e1fcb 100644
--- a/usr.sbin/mopd/common/file.c
+++ b/usr.sbin/mopd/common/file.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: file.c,v 1.5 2002/09/07 07:58:21 maja Exp $ */
+/*	$OpenBSD: file.c,v 1.6 2003/06/02 21:38:39 maja Exp $ */
 
 /*
  * Copyright (c) 1995-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: file.c,v 1.5 2002/09/07 07:58:21 maja Exp $";
+static char rcsid[] = "$OpenBSD: file.c,v 1.6 2003/06/02 21:38:39 maja Exp $";
 #endif
 
 #include "os.h"
diff --git a/usr.sbin/mopd/common/file.h b/usr.sbin/mopd/common/file.h
index 6314e95e8da..c25dd044bf7 100644
--- a/usr.sbin/mopd/common/file.h
+++ b/usr.sbin/mopd/common/file.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: file.h,v 1.6 2002/06/10 21:05:25 maja Exp $ */
+/*	$OpenBSD: file.h,v 1.7 2003/06/02 21:38:39 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: file.h,v 1.6 2002/06/10 21:05:25 maja Exp $
+ *	$OpenBSD: file.h,v 1.7 2003/06/02 21:38:39 maja Exp $
  *
  */
 
diff --git a/usr.sbin/mopd/common/get.c b/usr.sbin/mopd/common/get.c
index 70fcf4350b2..d203d5c7bf6 100644
--- a/usr.sbin/mopd/common/get.c
+++ b/usr.sbin/mopd/common/get.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: get.c,v 1.3 2002/03/14 16:44:25 mpech Exp $ */
+/*	$OpenBSD: get.c,v 1.4 2003/06/02 21:38:39 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: get.c,v 1.3 2002/03/14 16:44:25 mpech Exp $";
+static char rcsid[] = "$OpenBSD: get.c,v 1.4 2003/06/02 21:38:39 maja Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/usr.sbin/mopd/common/get.h b/usr.sbin/mopd/common/get.h
index 80db5f814d6..2e554c80e9e 100644
--- a/usr.sbin/mopd/common/get.h
+++ b/usr.sbin/mopd/common/get.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: get.h,v 1.6 2002/06/10 21:05:25 maja Exp $ */
+/*	$OpenBSD: get.h,v 1.7 2003/06/02 21:38:39 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: get.h,v 1.6 2002/06/10 21:05:25 maja Exp $
+ *	$OpenBSD: get.h,v 1.7 2003/06/02 21:38:39 maja Exp $
  *
  */
 
diff --git a/usr.sbin/mopd/common/loop-bsd.c b/usr.sbin/mopd/common/loop-bsd.c
index f67383a8826..750a0660693 100644
--- a/usr.sbin/mopd/common/loop-bsd.c
+++ b/usr.sbin/mopd/common/loop-bsd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: loop-bsd.c,v 1.6 2002/03/14 16:44:25 mpech Exp $ */
+/*	$OpenBSD: loop-bsd.c,v 1.7 2003/06/02 21:38:39 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-bsd.c,v 1.6 2002/03/14 16:44:25 mpech Exp $";
+static char rcsid[] = "$OpenBSD: loop-bsd.c,v 1.7 2003/06/02 21:38:39 maja Exp $";
 #endif
 
 #include <stdlib.h>
diff --git a/usr.sbin/mopd/common/mopdef.c b/usr.sbin/mopd/common/mopdef.c
index 988c955b4e1..708d5365670 100644
--- a/usr.sbin/mopd/common/mopdef.c
+++ b/usr.sbin/mopd/common/mopdef.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mopdef.c,v 1.3 2002/09/07 07:58:21 maja Exp $ */
+/*	$OpenBSD: mopdef.c,v 1.4 2003/06/02 21:38:39 maja Exp $ */
 
 /*
  * Copyright (c) 1995 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: mopdef.c,v 1.3 2002/09/07 07:58:21 maja Exp $";
+static char rcsid[] = "$OpenBSD: mopdef.c,v 1.4 2003/06/02 21:38:39 maja Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/usr.sbin/mopd/common/mopdef.h b/usr.sbin/mopd/common/mopdef.h
index 33c34f51937..389656ce9f1 100644
--- a/usr.sbin/mopd/common/mopdef.h
+++ b/usr.sbin/mopd/common/mopdef.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mopdef.h,v 1.4 2002/09/07 07:58:21 maja Exp $ */
+/*	$OpenBSD: mopdef.h,v 1.5 2003/06/02 21:38:39 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: mopdef.h,v 1.4 2002/09/07 07:58:21 maja Exp $
+ *	$OpenBSD: mopdef.h,v 1.5 2003/06/02 21:38:39 maja Exp $
  *
  */
 
diff --git a/usr.sbin/mopd/common/nma.c b/usr.sbin/mopd/common/nma.c
index a61fede09db..280fe18858c 100644
--- a/usr.sbin/mopd/common/nma.c
+++ b/usr.sbin/mopd/common/nma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nma.c,v 1.2 1996/09/21 19:11:45 maja Exp $ */
+/*	$OpenBSD: nma.c,v 1.3 2003/06/02 21:38:39 maja Exp $ */
 
 /*
  * Copyright (c) 1995 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: nma.c,v 1.2 1996/09/21 19:11:45 maja Exp $";
+static char rcsid[] = "$OpenBSD: nma.c,v 1.3 2003/06/02 21:38:39 maja Exp $";
 #endif
 
 #include <stddef.h>
diff --git a/usr.sbin/mopd/common/nma.h b/usr.sbin/mopd/common/nma.h
index 45f75e36b34..353ebb09c41 100644
--- a/usr.sbin/mopd/common/nma.h
+++ b/usr.sbin/mopd/common/nma.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nma.h,v 1.5 2002/06/10 21:05:25 maja Exp $ */
+/*	$OpenBSD: nma.h,v 1.6 2003/06/02 21:38:39 maja Exp $ */
 
 /*
  * Copyright (c) 1995 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: nma.h,v 1.5 2002/06/10 21:05:25 maja Exp $
+ *	$OpenBSD: nma.h,v 1.6 2003/06/02 21:38:39 maja Exp $
  *
  */
 
diff --git a/usr.sbin/mopd/common/nmadef.h b/usr.sbin/mopd/common/nmadef.h
index 2df827ba62d..ae090e6f73d 100644
--- a/usr.sbin/mopd/common/nmadef.h
+++ b/usr.sbin/mopd/common/nmadef.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nmadef.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */
+/*	$OpenBSD: nmadef.h,v 1.4 2003/06/02 21:38:39 maja Exp $ */
 
 /*
  * Copyright (c) 1995 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: nmadef.h,v 1.3 2001/08/12 12:03:03 heko Exp $
+ *	$OpenBSD: nmadef.h,v 1.4 2003/06/02 21:38:39 maja Exp $
  *
  */
 
diff --git a/usr.sbin/mopd/common/os.h b/usr.sbin/mopd/common/os.h
index e2fda75175b..feddd40365c 100644
--- a/usr.sbin/mopd/common/os.h
+++ b/usr.sbin/mopd/common/os.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: os.h,v 1.4 2001/08/12 12:03:03 heko Exp $ */
+/*	$OpenBSD: os.h,v 1.5 2003/06/02 21:38:39 maja Exp $ */
 
 /*
  * Copyright (c) 1994-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.h,v 1.4 2001/08/12 12:03:03 heko Exp $
+ *	$OpenBSD: os.h,v 1.5 2003/06/02 21:38:39 maja Exp $
  *
  */
 
diff --git a/usr.sbin/mopd/common/pf.h b/usr.sbin/mopd/common/pf.h
index 95ee7fa2647..c9e57255ba3 100644
--- a/usr.sbin/mopd/common/pf.h
+++ b/usr.sbin/mopd/common/pf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf.h,v 1.5 2002/06/10 21:05:25 maja Exp $ */
+/*	$OpenBSD: pf.h,v 1.6 2003/06/02 21:38:39 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: pf.h,v 1.5 2002/06/10 21:05:25 maja Exp $
+ *	$OpenBSD: pf.h,v 1.6 2003/06/02 21:38:39 maja Exp $
  *
  */
 
diff --git a/usr.sbin/mopd/common/print.c b/usr.sbin/mopd/common/print.c
index b8f3cb05e4e..7c9dae8dbc4 100644
--- a/usr.sbin/mopd/common/print.c
+++ b/usr.sbin/mopd/common/print.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print.c,v 1.4 2002/09/07 07:58:21 maja Exp $ */
+/*	$OpenBSD: print.c,v 1.5 2003/06/02 21:38:39 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: print.c,v 1.4 2002/09/07 07:58:21 maja Exp $";
+static char rcsid[] = "$OpenBSD: print.c,v 1.5 2003/06/02 21:38:39 maja Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/usr.sbin/mopd/common/print.h b/usr.sbin/mopd/common/print.h
index 0e73f9c9cb6..9591d436972 100644
--- a/usr.sbin/mopd/common/print.h
+++ b/usr.sbin/mopd/common/print.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print.h,v 1.6 2002/06/10 21:05:25 maja Exp $ */
+/*	$OpenBSD: print.h,v 1.7 2003/06/02 21:38:39 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: print.h,v 1.6 2002/06/10 21:05:25 maja Exp $
+ *	$OpenBSD: print.h,v 1.7 2003/06/02 21:38:39 maja Exp $
  *
  */
 
diff --git a/usr.sbin/mopd/common/put.c b/usr.sbin/mopd/common/put.c
index c4be4b0a817..4afef270829 100644
--- a/usr.sbin/mopd/common/put.c
+++ b/usr.sbin/mopd/common/put.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: put.c,v 1.3 2002/03/14 16:44:25 mpech Exp $ */
+/*	$OpenBSD: put.c,v 1.4 2003/06/02 21:38:39 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: put.c,v 1.3 2002/03/14 16:44:25 mpech Exp $";
+static char rcsid[] = "$OpenBSD: put.c,v 1.4 2003/06/02 21:38:39 maja Exp $";
 #endif
 
 #include <stddef.h>
diff --git a/usr.sbin/mopd/common/put.h b/usr.sbin/mopd/common/put.h
index 2e714ec8e90..9dc2c9634c2 100644
--- a/usr.sbin/mopd/common/put.h
+++ b/usr.sbin/mopd/common/put.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: put.h,v 1.5 2002/06/10 21:05:25 maja Exp $ */
+/*	$OpenBSD: put.h,v 1.6 2003/06/02 21:38:39 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: put.h,v 1.5 2002/06/10 21:05:25 maja Exp $
+ *	$OpenBSD: put.h,v 1.6 2003/06/02 21:38:39 maja Exp $
  *
  */
 
diff --git a/usr.sbin/mopd/common/rc.c b/usr.sbin/mopd/common/rc.c
index 16ab85b68fe..27cc3f83c21 100644
--- a/usr.sbin/mopd/common/rc.c
+++ b/usr.sbin/mopd/common/rc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rc.c,v 1.2 1996/09/21 19:12:06 maja Exp $ */
+/*	$OpenBSD: rc.c,v 1.3 2003/06/02 21:38:39 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: rc.c,v 1.2 1996/09/21 19:12:06 maja Exp $";
+static char rcsid[] = "$OpenBSD: rc.c,v 1.3 2003/06/02 21:38:39 maja Exp $";
 #endif
 
 #include "os.h"
diff --git a/usr.sbin/mopd/common/rc.h b/usr.sbin/mopd/common/rc.h
index e411b64044d..6366f459909 100644
--- a/usr.sbin/mopd/common/rc.h
+++ b/usr.sbin/mopd/common/rc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rc.h,v 1.5 2002/06/10 21:05:25 maja Exp $ */
+/*	$OpenBSD: rc.h,v 1.6 2003/06/02 21:38:39 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: rc.h,v 1.5 2002/06/10 21:05:25 maja Exp $
+ *	$OpenBSD: rc.h,v 1.6 2003/06/02 21:38:39 maja Exp $
  *
  */
 
diff --git a/usr.sbin/mopd/mopa.out/mopa.out.1 b/usr.sbin/mopd/mopa.out/mopa.out.1
index 184c3f98ad8..10bab843807 100644
--- a/usr.sbin/mopd/mopa.out/mopa.out.1
+++ b/usr.sbin/mopd/mopa.out/mopa.out.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mopa.out.1,v 1.9 2000/11/08 19:37:35 aaron Exp $
+.\"	$OpenBSD: mopa.out.1,v 1.10 2003/06/02 21:38:39 maja Exp $
 .\"
 .\" Copyright (c) 1996 Mats O Jansson.  All rights reserved.
 .\"
@@ -10,11 +10,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
@@ -27,7 +22,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: mopa.out.1,v 1.9 2000/11/08 19:37:35 aaron Exp $
+.\" @(#) $OpenBSD: mopa.out.1,v 1.10 2003/06/02 21:38:39 maja Exp $
 .\"
 .Dd August 11, 1996
 .Dt MOPA.OUT 1
diff --git a/usr.sbin/mopd/mopchk/mopchk.1 b/usr.sbin/mopd/mopchk/mopchk.1
index 1329718458c..ef101471999 100644
--- a/usr.sbin/mopd/mopchk/mopchk.1
+++ b/usr.sbin/mopd/mopchk/mopchk.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mopchk.1,v 1.8 2000/11/09 17:53:16 aaron Exp $
+.\"	$OpenBSD: mopchk.1,v 1.9 2003/06/02 21:38:39 maja Exp $
 .\"
 .\" Copyright (c) 1996 Mats O Jansson.  All rights reserved.
 .\"
@@ -10,11 +10,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
@@ -27,7 +22,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: mopchk.1,v 1.8 2000/11/09 17:53:16 aaron Exp $
+.\" @(#) $OpenBSD: mopchk.1,v 1.9 2003/06/02 21:38:39 maja Exp $
 .\"
 .Dd October 2, 1995
 .Dt MOPCHK 1
diff --git a/usr.sbin/mopd/mopchk/mopchk.c b/usr.sbin/mopd/mopchk/mopchk.c
index 663229a8503..c522fca7adf 100644
--- a/usr.sbin/mopd/mopchk/mopchk.c
+++ b/usr.sbin/mopd/mopchk/mopchk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mopchk.c,v 1.8 2003/04/19 17:42:57 avsm Exp $	*/
+/*	$OpenBSD: mopchk.c,v 1.9 2003/06/02 21:38:39 maja Exp $	*/
 
 /*
  * Copyright (c) 1995-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: mopchk.c,v 1.8 2003/04/19 17:42:57 avsm Exp $";
+static char rcsid[] = "$OpenBSD: mopchk.c,v 1.9 2003/06/02 21:38:39 maja Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/mopd/mopd/mopd.8 b/usr.sbin/mopd/mopd/mopd.8
index 8892abbe7cb..0b7e7ec4424 100644
--- a/usr.sbin/mopd/mopd/mopd.8
+++ b/usr.sbin/mopd/mopd/mopd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mopd.8,v 1.10 2000/11/09 17:53:17 aaron Exp $
+.\"	$OpenBSD: mopd.8,v 1.11 2003/06/02 21:38:39 maja Exp $
 .\"
 .\" Copyright (c) 1993-96 Mats O Jansson.  All rights reserved.
 .\"
@@ -10,11 +10,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
@@ -27,7 +22,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: mopd.8,v 1.10 2000/11/09 17:53:17 aaron Exp $
+.\" @(#) $OpenBSD: mopd.8,v 1.11 2003/06/02 21:38:39 maja Exp $
 .\"
 .Dd September 24, 1995
 .Dt MOPD 8
diff --git a/usr.sbin/mopd/mopd/mopd.c b/usr.sbin/mopd/mopd/mopd.c
index d83116051fc..4dd80d51ab7 100644
--- a/usr.sbin/mopd/mopd/mopd.c
+++ b/usr.sbin/mopd/mopd/mopd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mopd.c,v 1.7 2002/06/10 21:05:25 maja Exp $ */
+/*	$OpenBSD: mopd.c,v 1.8 2003/06/02 21:38:39 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: mopd.c,v 1.7 2002/06/10 21:05:25 maja Exp $";
+static char rcsid[] = "$OpenBSD: mopd.c,v 1.8 2003/06/02 21:38:39 maja Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/mopd/mopd/process.c b/usr.sbin/mopd/mopd/process.c
index 46da70c919a..65f41cbb14b 100644
--- a/usr.sbin/mopd/mopd/process.c
+++ b/usr.sbin/mopd/mopd/process.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: process.c,v 1.10 2002/09/07 07:58:21 maja Exp $ */
+/*	$OpenBSD: process.c,v 1.11 2003/06/02 21:38:39 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: process.c,v 1.10 2002/09/07 07:58:21 maja Exp $";
+static char rcsid[] = "$OpenBSD: process.c,v 1.11 2003/06/02 21:38:39 maja Exp $";
 #endif
 
 #include "os.h"
diff --git a/usr.sbin/mopd/mopd/process.h b/usr.sbin/mopd/mopd/process.h
index f53bafb0e02..36c3bd12d20 100644
--- a/usr.sbin/mopd/mopd/process.h
+++ b/usr.sbin/mopd/mopd/process.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: process.h,v 1.5 2002/06/10 21:05:25 maja Exp $ */
+/*	$OpenBSD: process.h,v 1.6 2003/06/02 21:38:39 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: process.h,v 1.5 2002/06/10 21:05:25 maja Exp $
+ *	$OpenBSD: process.h,v 1.6 2003/06/02 21:38:39 maja Exp $
  *
  */
 
diff --git a/usr.sbin/mopd/mopprobe/mopprobe.1 b/usr.sbin/mopd/mopprobe/mopprobe.1
index 843e4ae7db3..30e60712631 100644
--- a/usr.sbin/mopd/mopprobe/mopprobe.1
+++ b/usr.sbin/mopd/mopprobe/mopprobe.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mopprobe.1,v 1.11 2002/11/09 02:55:45 fgsch Exp $
+.\"	$OpenBSD: mopprobe.1,v 1.12 2003/06/02 21:38:39 maja Exp $
 .\"
 .\" Copyright (c) 1996 Mats O Jansson.  All rights reserved.
 .\"
@@ -10,11 +10,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
@@ -27,7 +22,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: mopprobe.1,v 1.11 2002/11/09 02:55:45 fgsch Exp $
+.\" @(#) $OpenBSD: mopprobe.1,v 1.12 2003/06/02 21:38:39 maja Exp $
 .\"
 .Dd October 2, 1995
 .Dt MOPPROBE 1
diff --git a/usr.sbin/mopd/mopprobe/mopprobe.c b/usr.sbin/mopd/mopprobe/mopprobe.c
index 856fb333435..07393a3ef58 100644
--- a/usr.sbin/mopd/mopprobe/mopprobe.c
+++ b/usr.sbin/mopd/mopprobe/mopprobe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mopprobe.c,v 1.7 2002/06/10 21:05:25 maja Exp $ */
+/*	$OpenBSD: mopprobe.c,v 1.8 2003/06/02 21:38:39 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: mopprobe.c,v 1.7 2002/06/10 21:05:25 maja Exp $";
+static char rcsid[] = "$OpenBSD: mopprobe.c,v 1.8 2003/06/02 21:38:39 maja Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/mopd/moptrace/moptrace.1 b/usr.sbin/mopd/moptrace/moptrace.1
index 97365c4ef7e..46cde7fbb13 100644
--- a/usr.sbin/mopd/moptrace/moptrace.1
+++ b/usr.sbin/mopd/moptrace/moptrace.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: moptrace.1,v 1.7 2000/11/09 17:53:18 aaron Exp $
+.\"	$OpenBSD: moptrace.1,v 1.8 2003/06/02 21:38:40 maja Exp $
 .\"
 .\" Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
 .\"
@@ -10,11 +10,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
@@ -27,7 +22,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: moptrace.1,v 1.7 2000/11/09 17:53:18 aaron Exp $
+.\" @(#) $OpenBSD: moptrace.1,v 1.8 2003/06/02 21:38:40 maja Exp $
 .\"
 .Dd October 2, 1995
 .Dt MOPTRACE 1
diff --git a/usr.sbin/mopd/moptrace/moptrace.c b/usr.sbin/mopd/moptrace/moptrace.c
index 73c1b345154..7ba388ae4a1 100644
--- a/usr.sbin/mopd/moptrace/moptrace.c
+++ b/usr.sbin/mopd/moptrace/moptrace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: moptrace.c,v 1.6 2002/06/10 21:05:25 maja Exp $ */
+/*	$OpenBSD: moptrace.c,v 1.7 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: moptrace.c,v 1.6 2002/06/10 21:05:25 maja Exp $";
+static char rcsid[] = "$OpenBSD: moptrace.c,v 1.7 2003/06/02 21:38:40 maja Exp $";
 #endif
 
 /*
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>