Follow upstream's lead and remove third and fourth clauses (except on

from usr.sbin/mopd/common/pf.c, where only the ad clause is removed, because it has a shared UCB copyright) on Mats O Jansson's files. thorpej OK'd usr.sbin/rpc.yppasswdd/yppasswdd_mkpw.c, where he shares copyright.
2026-02-04 15:33:11 +00:00 · 2009-10-20 00:51:13 +00:00
parent fe7d874daf
commit 59ff02bd7c
37 changed files with 71 additions and 254 deletions
--- a/common/cmp.c
+++ b/common/cmp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cmp.c,v 1.3 1997/10/16 23:24:21 lukem Exp $	*/
+/*	$NetBSD: cmp.c,v 1.4 2009/10/20 00:51:13 snj 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
@@ -31,7 +26,7 @@

 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: cmp.c,v 1.3 1997/10/16 23:24:21 lukem Exp $");
+__RCSID("$NetBSD: cmp.c,v 1.4 2009/10/20 00:51:13 snj Exp $");
 #endif

 #include "os.h"
--- a/common/cmp.h
+++ b/common/cmp.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: cmp.h,v 1.4 2001/01/16 02:50:31 cgd Exp $	*/
+/*	$NetBSD: cmp.h,v 1.5 2009/10/20 00:51:13 snj 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.
 *
- *	$NetBSD: cmp.h,v 1.4 2001/01/16 02:50:31 cgd Exp $
+ *	$NetBSD: cmp.h,v 1.5 2009/10/20 00:51:13 snj Exp $
 *
 */

--- a/common/common.h
+++ b/common/common.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: common.h,v 1.6 2002/06/06 22:52:25 thorpej Exp $	*/
+/*	$NetBSD: common.h,v 1.7 2009/10/20 00:51:13 snj 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.
 *
- *	$NetBSD: common.h,v 1.6 2002/06/06 22:52:25 thorpej Exp $
+ *	$NetBSD: common.h,v 1.7 2009/10/20 00:51:13 snj Exp $
 *
 */

--- a/common/device.c
+++ b/common/device.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: device.c,v 1.9 2003/11/10 08:51:52 wiz Exp $	*/
+/*	$NetBSD: device.c,v 1.10 2009/10/20 00:51:13 snj 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
@@ -31,7 +26,7 @@

 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: device.c,v 1.9 2003/11/10 08:51:52 wiz Exp $");
+__RCSID("$NetBSD: device.c,v 1.10 2009/10/20 00:51:13 snj Exp $");
 #endif

 #include "os.h"
--- a/common/device.h
+++ b/common/device.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: device.h,v 1.4 2001/01/16 02:50:31 cgd Exp $	*/
+/*	$NetBSD: device.h,v 1.5 2009/10/20 00:51:13 snj 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.
 *
- *	$NetBSD: device.h,v 1.4 2001/01/16 02:50:31 cgd Exp $
+ *	$NetBSD: device.h,v 1.5 2009/10/20 00:51:13 snj Exp $
 *
 */

--- a/common/dl.c
+++ b/common/dl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dl.c,v 1.5 2009/04/17 04:16:57 lukem Exp $	*/
+/*	$NetBSD: dl.c,v 1.6 2009/10/20 00:51:13 snj 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
@@ -31,7 +26,7 @@

 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: dl.c,v 1.5 2009/04/17 04:16:57 lukem Exp $");
+__RCSID("$NetBSD: dl.c,v 1.6 2009/10/20 00:51:13 snj Exp $");
 #endif

 #include "os.h"
--- a/common/dl.h
+++ b/common/dl.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: dl.h,v 1.4 2001/01/16 02:50:31 cgd Exp $	*/
+/*	$NetBSD: dl.h,v 1.5 2009/10/20 00:51:13 snj 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.
 *
- *	$NetBSD: dl.h,v 1.4 2001/01/16 02:50:31 cgd Exp $
+ *	$NetBSD: dl.h,v 1.5 2009/10/20 00:51:13 snj Exp $
 *
 */

--- a/common/file.c
+++ b/common/file.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: file.c,v 1.11 2009/04/17 04:16:57 lukem Exp $	*/
+/*	$NetBSD: file.c,v 1.12 2009/10/20 00:51:13 snj 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
@@ -31,7 +26,7 @@

 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: file.c,v 1.11 2009/04/17 04:16:57 lukem Exp $");
+__RCSID("$NetBSD: file.c,v 1.12 2009/10/20 00:51:13 snj Exp $");
 #endif

 #include "os.h"
--- a/common/file.h
+++ b/common/file.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: file.h,v 1.5 2002/06/06 22:52:25 thorpej Exp $	*/
+/*	$NetBSD: file.h,v 1.6 2009/10/20 00:51:13 snj 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.
 *
- *	$NetBSD: file.h,v 1.5 2002/06/06 22:52:25 thorpej Exp $
+ *	$NetBSD: file.h,v 1.6 2009/10/20 00:51:13 snj Exp $
 *
 */

--- a/common/get.c
+++ b/common/get.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: get.c,v 1.4 2009/04/17 04:16:57 lukem Exp $	*/
+/*	$NetBSD: get.c,v 1.5 2009/10/20 00:51:13 snj 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
@@ -31,7 +26,7 @@

 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: get.c,v 1.4 2009/04/17 04:16:57 lukem Exp $");
+__RCSID("$NetBSD: get.c,v 1.5 2009/10/20 00:51:13 snj Exp $");
 #endif

 #include "os.h"
--- a/common/get.h
+++ b/common/get.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: get.h,v 1.3 1997/10/16 23:24:40 lukem Exp $	*/
+/*	$NetBSD: get.h,v 1.4 2009/10/20 00:51:13 snj 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.
 *
- *	$NetBSD: get.h,v 1.3 1997/10/16 23:24:40 lukem Exp $
+ *	$NetBSD: get.h,v 1.4 2009/10/20 00:51:13 snj Exp $
 *
 */

--- a/common/loop-bsd.c
+++ b/common/loop-bsd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: loop-bsd.c,v 1.9 2006/10/07 17:27:57 elad Exp $	*/
+/*	$NetBSD: loop-bsd.c,v 1.10 2009/10/20 00:51:13 snj 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
@@ -31,7 +26,7 @@

 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: loop-bsd.c,v 1.9 2006/10/07 17:27:57 elad Exp $");
+__RCSID("$NetBSD: loop-bsd.c,v 1.10 2009/10/20 00:51:13 snj Exp $");
 #endif

 #include <errno.h>
--- a/common/mopdef.c
+++ b/common/mopdef.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mopdef.c,v 1.3 1997/10/16 23:24:46 lukem Exp $	*/
+/*	$NetBSD: mopdef.c,v 1.4 2009/10/20 00:51:13 snj 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
@@ -31,7 +26,7 @@

 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mopdef.c,v 1.3 1997/10/16 23:24:46 lukem Exp $");
+__RCSID("$NetBSD: mopdef.c,v 1.4 2009/10/20 00:51:13 snj Exp $");
 #endif

 #define MOPDEF_SURPESS_EXTERN
--- a/common/mopdef.h
+++ b/common/mopdef.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: mopdef.h,v 1.3 2001/01/16 02:50:31 cgd Exp $	*/
+/*	$NetBSD: mopdef.h,v 1.4 2009/10/20 00:51:13 snj 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.
 *
- *	$NetBSD: mopdef.h,v 1.3 2001/01/16 02:50:31 cgd Exp $
+ *	$NetBSD: mopdef.h,v 1.4 2009/10/20 00:51:13 snj Exp $
 *
 */

--- a/common/nma.c
+++ b/common/nma.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: nma.c,v 1.4 2009/04/17 04:16:57 lukem Exp $	*/
+/*	$NetBSD: nma.c,v 1.5 2009/10/20 00:51:13 snj 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
@@ -31,7 +26,7 @@

 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: nma.c,v 1.4 2009/04/17 04:16:57 lukem Exp $");
+__RCSID("$NetBSD: nma.c,v 1.5 2009/10/20 00:51:13 snj Exp $");
 #endif

 #include "os.h"
--- a/common/nma.h
+++ b/common/nma.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: nma.h,v 1.5 2009/04/17 04:16:57 lukem Exp $	*/
+/*	$NetBSD: nma.h,v 1.6 2009/10/20 00:51:13 snj 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.
 *
- *	$NetBSD: nma.h,v 1.5 2009/04/17 04:16:57 lukem Exp $
+ *	$NetBSD: nma.h,v 1.6 2009/10/20 00:51:13 snj Exp $
 *
 */

--- a/common/nmadef.h
+++ b/common/nmadef.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: nmadef.h,v 1.3 2001/12/31 19:46:57 thorpej Exp $	*/
+/*	$NetBSD: nmadef.h,v 1.4 2009/10/20 00:51:13 snj 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.
 *
- *	$NetBSD: nmadef.h,v 1.3 2001/12/31 19:46:57 thorpej Exp $
+ *	$NetBSD: nmadef.h,v 1.4 2009/10/20 00:51:13 snj Exp $
 *
 */

--- a/common/os.h
+++ b/common/os.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: os.h,v 1.5 2003/08/18 05:39:52 itojun Exp $	*/
+/*	$NetBSD: os.h,v 1.6 2009/10/20 00:51:13 snj 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.
 *
- *	$NetBSD: os.h,v 1.5 2003/08/18 05:39:52 itojun Exp $
+ *	$NetBSD: os.h,v 1.6 2009/10/20 00:51:13 snj Exp $
 *
 */

--- a/common/pf.c
+++ b/common/pf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pf.c,v 1.10 2004/12/01 23:15:08 christos Exp $	*/
+/*	$NetBSD: pf.c,v 1.11 2009/10/20 00:51:13 snj Exp $	*/

 /*
 * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -15,10 +15,7 @@
 * 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
+ * 3. 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
@@ -35,7 +32,7 @@

 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: pf.c,v 1.10 2004/12/01 23:15:08 christos Exp $");
+__RCSID("$NetBSD: pf.c,v 1.11 2009/10/20 00:51:13 snj Exp $");
 #endif

 #include "os.h"
--- a/common/pf.h
+++ b/common/pf.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pf.h,v 1.4 2001/01/16 02:50:31 cgd Exp $	*/
+/*	$NetBSD: pf.h,v 1.5 2009/10/20 00:51:13 snj 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.
 *
- *	$NetBSD: pf.h,v 1.4 2001/01/16 02:50:31 cgd Exp $
+ *	$NetBSD: pf.h,v 1.5 2009/10/20 00:51:13 snj Exp $
 *
 */

--- a/common/print.c
+++ b/common/print.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: print.c,v 1.4 2009/04/17 04:16:57 lukem Exp $	*/
+/*	$NetBSD: print.c,v 1.5 2009/10/20 00:51:13 snj 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
@@ -31,7 +26,7 @@

 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: print.c,v 1.4 2009/04/17 04:16:57 lukem Exp $");
+__RCSID("$NetBSD: print.c,v 1.5 2009/10/20 00:51:13 snj Exp $");
 #endif

 #include <sys/types.h>
--- a/common/print.h
+++ b/common/print.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: print.h,v 1.4 2001/01/16 02:50:31 cgd Exp $	*/
+/*	$NetBSD: print.h,v 1.5 2009/10/20 00:51:13 snj 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.
 *
- *	$NetBSD: print.h,v 1.4 2001/01/16 02:50:31 cgd Exp $
+ *	$NetBSD: print.h,v 1.5 2009/10/20 00:51:13 snj Exp $
 *
 */

--- a/common/put.c
+++ b/common/put.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: put.c,v 1.4 2009/04/17 04:16:57 lukem Exp $	*/
+/*	$NetBSD: put.c,v 1.5 2009/10/20 00:51:13 snj 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
@@ -31,7 +26,7 @@

 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: put.c,v 1.4 2009/04/17 04:16:57 lukem Exp $");
+__RCSID("$NetBSD: put.c,v 1.5 2009/10/20 00:51:13 snj Exp $");
 #endif

 #include "os.h"
--- a/common/put.h
+++ b/common/put.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: put.h,v 1.4 2009/04/17 04:16:57 lukem Exp $	*/
+/*	$NetBSD: put.h,v 1.5 2009/10/20 00:51:13 snj 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.
 *
- *	$NetBSD: put.h,v 1.4 2009/04/17 04:16:57 lukem Exp $
+ *	$NetBSD: put.h,v 1.5 2009/10/20 00:51:13 snj Exp $
 *
 */

--- a/common/rc.c
+++ b/common/rc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rc.c,v 1.4 2009/04/17 04:16:57 lukem Exp $	*/
+/*	$NetBSD: rc.c,v 1.5 2009/10/20 00:51:13 snj 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
@@ -31,7 +26,7 @@

 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: rc.c,v 1.4 2009/04/17 04:16:57 lukem Exp $");
+__RCSID("$NetBSD: rc.c,v 1.5 2009/10/20 00:51:13 snj Exp $");
 #endif

 #include "os.h"
--- a/common/rc.h
+++ b/common/rc.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rc.h,v 1.4 2001/01/16 02:50:32 cgd Exp $	*/
+/*	$NetBSD: rc.h,v 1.5 2009/10/20 00:51:13 snj 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.
 *
- *	$NetBSD: rc.h,v 1.4 2001/01/16 02:50:32 cgd Exp $
+ *	$NetBSD: rc.h,v 1.5 2009/10/20 00:51:13 snj Exp $
 *
 */