summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authoragc <agc@NetBSD.org>2003-12-10 12:06:25 +0000
committeragc <agc@NetBSD.org>2003-12-10 12:06:25 +0000
commit7db1d33cbaa4cb9495a31533db2cb6debf45ed0a (patch)
tree4aafaba4a673085212a1af306cb8e0a78375336d /usr.sbin
parentaa8a6718f04420c2621ccb75de2e2ffa08869d43 (diff)
Modify the licences of code written by Theo De Raadt from a 4-clause
to a 2-clause licence (retaining UCB clauses (1) and (2)), per PR 22409 from Joel Baker, approved by Theo de Raadt, and ratified by myself - the only discrepancy being the handling of the original clause 3 in src/usr.sbin/yppoll/yppoll.c.
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/ypbind/ypbind.c10
-rw-r--r--usr.sbin/yppoll/yppoll.c32
-rw-r--r--usr.sbin/ypserv/common/yplib_host.c9
-rw-r--r--usr.sbin/ypserv/common/yplib_host.h7
-rw-r--r--usr.sbin/ypset/ypset.c10
5 files changed, 35 insertions, 33 deletions
diff --git a/usr.sbin/ypbind/ypbind.c b/usr.sbin/ypbind/ypbind.c
index e9d66c92ee7..7503bea6c8e 100644
--- a/usr.sbin/ypbind/ypbind.c
+++ b/usr.sbin/ypbind/ypbind.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ypbind.c,v 1.49 2003/11/17 21:29:21 bouyer Exp $ */
+/* $NetBSD: ypbind.c,v 1.50 2003/12/10 12:06:26 agc Exp $ */
/*
* Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca>
@@ -12,12 +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 Theo de Raadt.
- * 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
@@ -34,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef LINT
-__RCSID("$NetBSD: ypbind.c,v 1.49 2003/11/17 21:29:21 bouyer Exp $");
+__RCSID("$NetBSD: ypbind.c,v 1.50 2003/12/10 12:06:26 agc Exp $");
#endif
#include <sys/param.h>
diff --git a/usr.sbin/yppoll/yppoll.c b/usr.sbin/yppoll/yppoll.c
index 9262a6104f4..5715e691d1e 100644
--- a/usr.sbin/yppoll/yppoll.c
+++ b/usr.sbin/yppoll/yppoll.c
@@ -1,7 +1,32 @@
-/* $NetBSD: yppoll.c,v 1.11 2002/12/06 15:24:08 thorpej Exp $ */
+/* $NetBSD: yppoll.c,v 1.12 2003/12/10 12:06:26 agc Exp $ */
/*
* Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
* Copyright (c) 1992, 1993 John Brezak
* All rights reserved.
*
@@ -15,8 +40,7 @@
* 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 Theo de Raadt and
- * John Brezak.
+ * This product includes software developed by John Brezak.
* 4. The name of the author may not be used to endorse or promote
* products derived from this software without specific prior written
* permission.
@@ -36,7 +60,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: yppoll.c,v 1.11 2002/12/06 15:24:08 thorpej Exp $");
+__RCSID("$NetBSD: yppoll.c,v 1.12 2003/12/10 12:06:26 agc Exp $");
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.sbin/ypserv/common/yplib_host.c b/usr.sbin/ypserv/common/yplib_host.c
index 96289f5bc8d..5545d216276 100644
--- a/usr.sbin/ypserv/common/yplib_host.c
+++ b/usr.sbin/ypserv/common/yplib_host.c
@@ -1,4 +1,4 @@
-/* $NetBSD: yplib_host.c,v 1.5 2002/07/06 21:39:25 wiz Exp $ */
+/* $NetBSD: yplib_host.c,v 1.6 2003/12/10 12:06:26 agc Exp $ */
/*
* Copyright (c) 1992, 1993 Theo de Raadt <deraadt@theos.com>
@@ -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 Theo de Raadt.
- * 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: yplib_host.c,v 1.5 2002/07/06 21:39:25 wiz Exp $");
+__RCSID("$NetBSD: yplib_host.c,v 1.6 2003/12/10 12:06:26 agc Exp $");
#endif
#include <sys/param.h>
diff --git a/usr.sbin/ypserv/common/yplib_host.h b/usr.sbin/ypserv/common/yplib_host.h
index a7166b93272..ebd224bed5e 100644
--- a/usr.sbin/ypserv/common/yplib_host.h
+++ b/usr.sbin/ypserv/common/yplib_host.h
@@ -1,4 +1,4 @@
-/* $NetBSD: yplib_host.h,v 1.2 2002/07/06 21:39:25 wiz Exp $ */
+/* $NetBSD: yplib_host.h,v 1.3 2003/12/10 12:06:26 agc Exp $ */
/*
* Copyright (c) 1992, 1993 Theo de Raadt <deraadt@theos.com>
@@ -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 Theo de Raadt.
- * 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
diff --git a/usr.sbin/ypset/ypset.c b/usr.sbin/ypset/ypset.c
index d5ffb0c3275..f7aa930e9cc 100644
--- a/usr.sbin/ypset/ypset.c
+++ b/usr.sbin/ypset/ypset.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ypset.c,v 1.14 2002/07/20 08:40:22 grant Exp $ */
+/* $NetBSD: ypset.c,v 1.15 2003/12/10 12:06:26 agc Exp $ */
/*
* Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca>
@@ -12,12 +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 Theo de Raadt.
- * 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
@@ -34,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: ypset.c,v 1.14 2002/07/20 08:40:22 grant Exp $");
+__RCSID("$NetBSD: ypset.c,v 1.15 2003/12/10 12:06:26 agc Exp $");
#endif
#include <sys/param.h>