diff options
| author | agc <agc@NetBSD.org> | 2003-12-10 12:06:25 +0000 |
|---|---|---|
| committer | agc <agc@NetBSD.org> | 2003-12-10 12:06:25 +0000 |
| commit | 7db1d33cbaa4cb9495a31533db2cb6debf45ed0a (patch) | |
| tree | 4aafaba4a673085212a1af306cb8e0a78375336d /lib/libc | |
| parent | aa8a6718f04420c2621ccb75de2e2ffa08869d43 (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 'lib/libc')
| -rw-r--r-- | lib/libc/yp/xdryp.c | 35 | ||||
| -rw-r--r-- | lib/libc/yp/yp_all.c | 9 | ||||
| -rw-r--r-- | lib/libc/yp/yp_first.c | 9 | ||||
| -rw-r--r-- | lib/libc/yp/yp_maplist.c | 9 | ||||
| -rw-r--r-- | lib/libc/yp/yp_master.c | 9 | ||||
| -rw-r--r-- | lib/libc/yp/yp_match.c | 9 | ||||
| -rw-r--r-- | lib/libc/yp/yp_order.c | 9 | ||||
| -rw-r--r-- | lib/libc/yp/yperr_string.c | 9 | ||||
| -rw-r--r-- | lib/libc/yp/yplib.c | 9 | ||||
| -rw-r--r-- | lib/libc/yp/ypprot_err.c | 9 |
10 files changed, 47 insertions, 69 deletions
diff --git a/lib/libc/yp/xdryp.c b/lib/libc/yp/xdryp.c index 27a4670c3f4..fccd9622a5a 100644 --- a/lib/libc/yp/xdryp.c +++ b/lib/libc/yp/xdryp.c @@ -1,12 +1,9 @@ -/* $NetBSD: xdryp.c,v 1.27 2003/12/04 23:39:18 keihan Exp $ */ +/* $NetBSD: xdryp.c,v 1.28 2003/12/10 12:06:25 agc Exp $ */ /* * Copyright (c) 1996 Jason R. Thorpe <thorpej@NetBSD.org>. * All rights reserved. * - * 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: @@ -17,7 +14,6 @@ * 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. * This product includes software developed for the NetBSD Project * by Jason R. Thorpe. * 4. The name of the author may not be used to endorse or promote products @@ -36,9 +32,36 @@ * SUCH DAMAGE. */ +/* + * 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. + */ + #include <sys/cdefs.h> #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: xdryp.c,v 1.27 2003/12/04 23:39:18 keihan Exp $"); +__RCSID("$NetBSD: xdryp.c,v 1.28 2003/12/10 12:06:25 agc Exp $"); #endif /* diff --git a/lib/libc/yp/yp_all.c b/lib/libc/yp/yp_all.c index 9fc567bea61..6d97ce73d75 100644 --- a/lib/libc/yp/yp_all.c +++ b/lib/libc/yp/yp_all.c @@ -1,4 +1,4 @@ -/* $NetBSD: yp_all.c,v 1.11 2000/07/06 03:14:05 christos Exp $ */ +/* $NetBSD: yp_all.c,v 1.12 2003/12/10 12:06:25 agc Exp $ */ /* * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca> @@ -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> #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: yp_all.c,v 1.11 2000/07/06 03:14:05 christos Exp $"); +__RCSID("$NetBSD: yp_all.c,v 1.12 2003/12/10 12:06:25 agc Exp $"); #endif #include "namespace.h" diff --git a/lib/libc/yp/yp_first.c b/lib/libc/yp/yp_first.c index 1494f2afd99..482faafaa69 100644 --- a/lib/libc/yp/yp_first.c +++ b/lib/libc/yp/yp_first.c @@ -1,4 +1,4 @@ -/* $NetBSD: yp_first.c,v 1.13 2000/07/06 03:14:05 christos Exp $ */ +/* $NetBSD: yp_first.c,v 1.14 2003/12/10 12:06:25 agc Exp $ */ /* * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca> @@ -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> #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: yp_first.c,v 1.13 2000/07/06 03:14:05 christos Exp $"); +__RCSID("$NetBSD: yp_first.c,v 1.14 2003/12/10 12:06:25 agc Exp $"); #endif #include "namespace.h" diff --git a/lib/libc/yp/yp_maplist.c b/lib/libc/yp/yp_maplist.c index 78410e954fb..b8143127cee 100644 --- a/lib/libc/yp/yp_maplist.c +++ b/lib/libc/yp/yp_maplist.c @@ -1,4 +1,4 @@ -/* $NetBSD: yp_maplist.c,v 1.10 2000/07/06 03:14:05 christos Exp $ */ +/* $NetBSD: yp_maplist.c,v 1.11 2003/12/10 12:06:25 agc Exp $ */ /* * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca> @@ -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> #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: yp_maplist.c,v 1.10 2000/07/06 03:14:05 christos Exp $"); +__RCSID("$NetBSD: yp_maplist.c,v 1.11 2003/12/10 12:06:25 agc Exp $"); #endif #include "namespace.h" diff --git a/lib/libc/yp/yp_master.c b/lib/libc/yp/yp_master.c index 7441d7b14c3..7eaa96f5f3d 100644 --- a/lib/libc/yp/yp_master.c +++ b/lib/libc/yp/yp_master.c @@ -1,4 +1,4 @@ -/* $NetBSD: yp_master.c,v 1.12 2000/07/06 03:14:05 christos Exp $ */ +/* $NetBSD: yp_master.c,v 1.13 2003/12/10 12:06:25 agc Exp $ */ /* * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca> @@ -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> #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: yp_master.c,v 1.12 2000/07/06 03:14:05 christos Exp $"); +__RCSID("$NetBSD: yp_master.c,v 1.13 2003/12/10 12:06:25 agc Exp $"); #endif #include "namespace.h" diff --git a/lib/libc/yp/yp_match.c b/lib/libc/yp/yp_match.c index a3f95aa9361..891e1180470 100644 --- a/lib/libc/yp/yp_match.c +++ b/lib/libc/yp/yp_match.c @@ -1,4 +1,4 @@ -/* $NetBSD: yp_match.c,v 1.15 2000/07/06 03:14:05 christos Exp $ */ +/* $NetBSD: yp_match.c,v 1.16 2003/12/10 12:06:25 agc Exp $ */ /* * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca> @@ -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> #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: yp_match.c,v 1.15 2000/07/06 03:14:05 christos Exp $"); +__RCSID("$NetBSD: yp_match.c,v 1.16 2003/12/10 12:06:25 agc Exp $"); #endif #include "namespace.h" diff --git a/lib/libc/yp/yp_order.c b/lib/libc/yp/yp_order.c index 8b39eecfc20..ad7d963ac9f 100644 --- a/lib/libc/yp/yp_order.c +++ b/lib/libc/yp/yp_order.c @@ -1,4 +1,4 @@ -/* $NetBSD: yp_order.c,v 1.11 2000/07/06 03:14:05 christos Exp $ */ +/* $NetBSD: yp_order.c,v 1.12 2003/12/10 12:06:25 agc Exp $ */ /* * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca> @@ -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> #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: yp_order.c,v 1.11 2000/07/06 03:14:05 christos Exp $"); +__RCSID("$NetBSD: yp_order.c,v 1.12 2003/12/10 12:06:25 agc Exp $"); #endif #include "namespace.h" diff --git a/lib/libc/yp/yperr_string.c b/lib/libc/yp/yperr_string.c index c54a997d028..3f267071fc7 100644 --- a/lib/libc/yp/yperr_string.c +++ b/lib/libc/yp/yperr_string.c @@ -1,4 +1,4 @@ -/* $NetBSD: yperr_string.c,v 1.5 2000/01/22 22:19:22 mycroft Exp $ */ +/* $NetBSD: yperr_string.c,v 1.6 2003/12/10 12:06:25 agc Exp $ */ /* * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca> @@ -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> #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: yperr_string.c,v 1.5 2000/01/22 22:19:22 mycroft Exp $"); +__RCSID("$NetBSD: yperr_string.c,v 1.6 2003/12/10 12:06:25 agc Exp $"); #endif #include "namespace.h" diff --git a/lib/libc/yp/yplib.c b/lib/libc/yp/yplib.c index 51e4a0fadd8..23402b10737 100644 --- a/lib/libc/yp/yplib.c +++ b/lib/libc/yp/yplib.c @@ -1,4 +1,4 @@ -/* $NetBSD: yplib.c,v 1.39 2002/11/17 01:51:26 itojun Exp $ */ +/* $NetBSD: yplib.c,v 1.40 2003/12/10 12:06:25 agc Exp $ */ /* * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca> @@ -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> #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: yplib.c,v 1.39 2002/11/17 01:51:26 itojun Exp $"); +__RCSID("$NetBSD: yplib.c,v 1.40 2003/12/10 12:06:25 agc Exp $"); #endif #include "namespace.h" diff --git a/lib/libc/yp/ypprot_err.c b/lib/libc/yp/ypprot_err.c index dc08dd3dbfc..84cb119a1db 100644 --- a/lib/libc/yp/ypprot_err.c +++ b/lib/libc/yp/ypprot_err.c @@ -1,4 +1,4 @@ -/* $NetBSD: ypprot_err.c,v 1.4 2000/01/22 22:19:22 mycroft Exp $ */ +/* $NetBSD: ypprot_err.c,v 1.5 2003/12/10 12:06:25 agc Exp $ */ /* * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca> @@ -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> #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: ypprot_err.c,v 1.4 2000/01/22 22:19:22 mycroft Exp $"); +__RCSID("$NetBSD: ypprot_err.c,v 1.5 2003/12/10 12:06:25 agc Exp $"); #endif #include "namespace.h" |
