From 1a868936e612a78e58a52676ce0c8a131d3e571c Mon Sep 17 00:00:00 2001
From: snj <snj@NetBSD.org>
Date: Wed, 21 Oct 2009 00:01:56 +0000
Subject: [PATCH] Remove 3rd and 4th clauses.  Approved by Mats O Jansson
 (copyright holder).

---
 usr.sbin/rpc.yppasswdd/yppasswdd_xdr.c | 9 ++-------
 usr.sbin/sup/source/read_line.c        | 9 ++-------
 usr.sbin/ypserv/yppush/yppush_svc.c    | 9 ++-------
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_xdr.c b/usr.sbin/rpc.yppasswdd/yppasswdd_xdr.c
index 3a149a91d922..20bcf1f55b68 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_xdr.c
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_xdr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: yppasswdd_xdr.c,v 1.2 2000/08/03 08:22:34 ad Exp $	*/
+/*	$NetBSD: yppasswdd_xdr.c,v 1.3 2009/10/21 00:01:56 snj Exp $	*/
 
 /*
  * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -12,11 +12,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by 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
@@ -33,7 +28,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: yppasswdd_xdr.c,v 1.2 2000/08/03 08:22:34 ad Exp $");
+__RCSID("$NetBSD: yppasswdd_xdr.c,v 1.3 2009/10/21 00:01:56 snj Exp $");
 #endif /* not lint */
 
 #include <rpc/rpc.h>
diff --git a/usr.sbin/sup/source/read_line.c b/usr.sbin/sup/source/read_line.c
index 0c27503bac1a..195991eaf624 100644
--- a/usr.sbin/sup/source/read_line.c
+++ b/usr.sbin/sup/source/read_line.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: read_line.c,v 1.8 2003/10/16 06:26:06 itojun Exp $	*/
+/*	$NetBSD: read_line.c,v 1.9 2009/10/21 00:01:57 snj Exp $	*/
 
 /*
  * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -12,11 +12,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by 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
@@ -33,7 +28,7 @@
 
 #include <sys/cdefs.h>
 #if defined(lint) && defined(__RCSID)
-__RCSID("$NetBSD: read_line.c,v 1.8 2003/10/16 06:26:06 itojun Exp $");
+__RCSID("$NetBSD: read_line.c,v 1.9 2009/10/21 00:01:57 snj Exp $");
 #endif
 
 #include <sys/param.h>
diff --git a/usr.sbin/ypserv/yppush/yppush_svc.c b/usr.sbin/ypserv/yppush/yppush_svc.c
index 8e1b6e234dfc..f9650c1225dc 100644
--- a/usr.sbin/ypserv/yppush/yppush_svc.c
+++ b/usr.sbin/ypserv/yppush/yppush_svc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: yppush_svc.c,v 1.8 2009/04/19 06:06:40 lukem Exp $	*/
+/*	$NetBSD: yppush_svc.c,v 1.9 2009/10/21 00:01:57 snj Exp $	*/
 
 /*
  * Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se>
@@ -12,11 +12,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by 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
@@ -33,7 +28,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: yppush_svc.c,v 1.8 2009/04/19 06:06:40 lukem Exp $");
+__RCSID("$NetBSD: yppush_svc.c,v 1.9 2009/10/21 00:01:57 snj Exp $");
 #endif
 
 /*