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.
This commit is contained in:
snj
2009-10-20 00:51:13 +00:00
parent fe7d874daf
commit 59ff02bd7c
37 changed files with 71 additions and 254 deletions

View File

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