diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2003-06-02 19:38:26 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2003-06-02 19:38:26 +0000 |
| commit | a1a0db84c7d8a997b325d86bbf1f7e36eca0dc23 (patch) | |
| tree | 57828e46383942757ff4b855d36cee49e11a384c | |
| parent | cf90e013341666c35f57592908848255caa2c6fe (diff) | |
Remove the advertising clause in the UCB license which Berkeley
rescinded 22 July 1999. Proofed by myself and Theo.
78 files changed, 175 insertions, 487 deletions
diff --git a/libexec/comsat/comsat.8 b/libexec/comsat/comsat.8 index 95de4c549e8..15fd9e62247 100644 --- a/libexec/comsat/comsat.8 +++ b/libexec/comsat/comsat.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: comsat.8,v 1.4 2001/01/28 19:34:27 niklas Exp $ +.\" $OpenBSD: comsat.8,v 1.5 2003/06/02 19:38:24 millert Exp $ .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. .\" @@ -10,11 +10,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 the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/libexec/comsat/comsat.c b/libexec/comsat/comsat.c index ea000a0d3be..b9c2c121c5d 100644 --- a/libexec/comsat/comsat.c +++ b/libexec/comsat/comsat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: comsat.c,v 1.26 2002/09/06 19:43:54 deraadt Exp $ */ +/* $OpenBSD: comsat.c,v 1.27 2003/06/02 19:38:24 millert Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -41,7 +37,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)comsat.c 8.1 (Berkeley) 6/4/93";*/ -static char rcsid[] = "$OpenBSD: comsat.c,v 1.26 2002/09/06 19:43:54 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: comsat.c,v 1.27 2003/06/02 19:38:24 millert Exp $"; #endif /* not lint */ #include <sys/limits.h> diff --git a/libexec/fingerd/fingerd.8 b/libexec/fingerd/fingerd.8 index 10e0800190c..280a017c24f 100644 --- a/libexec/fingerd/fingerd.8 +++ b/libexec/fingerd/fingerd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: fingerd.8,v 1.12 2001/11/13 14:06:09 mpech Exp $ +.\" $OpenBSD: fingerd.8,v 1.13 2003/06/02 19:38:24 millert Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -11,11 +11,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 the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" @@ -32,7 +28,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)fingerd.8 8.1 (Berkeley) 6/4/93 -.\" $Id: fingerd.8,v 1.12 2001/11/13 14:06:09 mpech Exp $ +.\" $Id: fingerd.8,v 1.13 2003/06/02 19:38:24 millert Exp $ .\" .Dd June 4, 1993 .Dt FINGERD 8 diff --git a/libexec/fingerd/fingerd.c b/libexec/fingerd/fingerd.c index c2b434e53ce..b7501cdeefe 100644 --- a/libexec/fingerd/fingerd.c +++ b/libexec/fingerd/fingerd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fingerd.c,v 1.29 2002/09/06 19:43:54 deraadt Exp $ */ +/* $OpenBSD: fingerd.c,v 1.30 2003/06/02 19:38:24 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ static char copyright[] = #if 0 static char sccsid[] = "from: @(#)fingerd.c 8.1 (Berkeley) 6/4/93"; #else -static char rcsid[] = "$OpenBSD: fingerd.c,v 1.29 2002/09/06 19:43:54 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: fingerd.c,v 1.30 2003/06/02 19:38:24 millert Exp $"; #endif #endif /* not lint */ diff --git a/libexec/fingerd/pathnames.h b/libexec/fingerd/pathnames.h index 8fb12a8c856..c95a2cb009b 100644 --- a/libexec/fingerd/pathnames.h +++ b/libexec/fingerd/pathnames.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pathnames.h,v 1.3 2001/01/28 19:34:27 niklas Exp $*/ +/* $OpenBSD: pathnames.h,v 1.4 2003/06/02 19:38:24 millert Exp $*/ /* * Copyright (c) 1989, 1993 @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/libexec/ftp-proxy/getline.c b/libexec/ftp-proxy/getline.c index 635a668694c..161685e27b8 100644 --- a/libexec/ftp-proxy/getline.c +++ b/libexec/ftp-proxy/getline.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getline.c,v 1.13 2003/01/26 19:29:45 couderc Exp $ */ +/* $OpenBSD: getline.c,v 1.14 2003/06/02 19:38:24 millert Exp $ */ /* * Copyright (c) 1985, 1988 Regents of the University of California. @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/libexec/ftpd/extern.h b/libexec/ftpd/extern.h index cf5737b0a32..bf994bce487 100644 --- a/libexec/ftpd/extern.h +++ b/libexec/ftpd/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.10 2002/06/13 06:58:57 millert Exp $ */ +/* $OpenBSD: extern.h,v 1.11 2003/06/02 19:38:24 millert Exp $ */ /* $NetBSD: extern.h,v 1.2 1995/04/11 02:44:49 cgd Exp $ */ /* @@ -42,11 +42,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y index 32e4c5f08a7..6a31c1f302b 100644 --- a/libexec/ftpd/ftpcmd.y +++ b/libexec/ftpd/ftpcmd.y @@ -1,4 +1,4 @@ -/* $OpenBSD: ftpcmd.y,v 1.41 2002/07/02 18:09:53 danh Exp $ */ +/* $OpenBSD: ftpcmd.y,v 1.42 2003/06/02 19:38:24 millert Exp $ */ /* $NetBSD: ftpcmd.y,v 1.7 1996/04/08 19:03:11 jtc Exp $ */ /* @@ -13,11 +13,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -48,7 +44,7 @@ static const char sccsid[] = "@(#)ftpcmd.y 8.3 (Berkeley) 4/6/94"; #else static const char rcsid[] = - "$OpenBSD: ftpcmd.y,v 1.41 2002/07/02 18:09:53 danh Exp $"; + "$OpenBSD: ftpcmd.y,v 1.42 2003/06/02 19:38:24 millert Exp $"; #endif #endif /* not lint */ diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8 index 3a7ffb14208..b08a060d85f 100644 --- a/libexec/ftpd/ftpd.8 +++ b/libexec/ftpd/ftpd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ftpd.8,v 1.58 2003/06/02 12:50:25 jmc Exp $ +.\" $OpenBSD: ftpd.8,v 1.59 2003/06/02 19:38:24 millert Exp $ .\" $NetBSD: ftpd.8,v 1.8 1996/01/14 20:55:23 thorpej Exp $ .\" .\" Copyright (c) 1985, 1988, 1991, 1993 @@ -12,11 +12,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 the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index aedf8b01927..2b9405e84eb 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ftpd.c,v 1.141 2003/04/10 00:04:58 millert Exp $ */ +/* $OpenBSD: ftpd.c,v 1.142 2003/06/02 19:38:24 millert Exp $ */ /* $NetBSD: ftpd.c,v 1.15 1995/06/03 22:46:47 mycroft Exp $ */ /* @@ -42,11 +42,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -74,7 +70,7 @@ static const char copyright[] = static const char sccsid[] = "@(#)ftpd.c 8.4 (Berkeley) 4/16/94"; #else static const char rcsid[] = - "$OpenBSD: ftpd.c,v 1.141 2003/04/10 00:04:58 millert Exp $"; + "$OpenBSD: ftpd.c,v 1.142 2003/06/02 19:38:24 millert Exp $"; #endif #endif /* not lint */ diff --git a/libexec/ftpd/logwtmp.c b/libexec/ftpd/logwtmp.c index 0f62d1e5a78..d385f26abbc 100644 --- a/libexec/ftpd/logwtmp.c +++ b/libexec/ftpd/logwtmp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: logwtmp.c,v 1.5 2002/07/02 18:09:54 danh Exp $ */ +/* $OpenBSD: logwtmp.c,v 1.6 2003/06/02 19:38:24 millert Exp $ */ /* $NetBSD: logwtmp.c,v 1.4 1995/04/11 02:44:58 cgd Exp $ */ /* @@ -13,11 +13,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -40,7 +36,7 @@ static const char sccsid[] = "@(#)logwtmp.c 8.1 (Berkeley) 6/4/93"; #else static const char rcsid[] = - "$OpenBSD: logwtmp.c,v 1.5 2002/07/02 18:09:54 danh Exp $"; + "$OpenBSD: logwtmp.c,v 1.6 2003/06/02 19:38:24 millert Exp $"; #endif #endif /* not lint */ diff --git a/libexec/ftpd/pathnames.h b/libexec/ftpd/pathnames.h index 18a5451db40..d2395a27ebe 100644 --- a/libexec/ftpd/pathnames.h +++ b/libexec/ftpd/pathnames.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pathnames.h,v 1.5 2001/12/01 23:27:20 miod Exp $ */ +/* $OpenBSD: pathnames.h,v 1.6 2003/06/02 19:38:24 millert Exp $ */ /* $NetBSD: pathnames.h,v 1.5 1995/04/11 02:44:59 cgd Exp $ */ /* @@ -13,11 +13,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/libexec/ftpd/popen.c b/libexec/ftpd/popen.c index 6cba0c2fb20..a83d7081698 100644 --- a/libexec/ftpd/popen.c +++ b/libexec/ftpd/popen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: popen.c,v 1.17 2002/07/02 18:09:54 danh Exp $ */ +/* $OpenBSD: popen.c,v 1.18 2003/06/02 19:38:24 millert Exp $ */ /* $NetBSD: popen.c,v 1.5 1995/04/11 02:45:00 cgd Exp $ */ /* @@ -16,11 +16,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ static const char sccsid[] = "@(#)popen.c 8.3 (Berkeley) 4/6/94"; #else static const char rcsid[] = - "$OpenBSD: popen.c,v 1.17 2002/07/02 18:09:54 danh Exp $"; + "$OpenBSD: popen.c,v 1.18 2003/06/02 19:38:24 millert Exp $"; #endif #endif /* not lint */ diff --git a/libexec/getNAME/getNAME.c b/libexec/getNAME/getNAME.c index 059199f90b0..666d89a53e4 100644 --- a/libexec/getNAME/getNAME.c +++ b/libexec/getNAME/getNAME.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getNAME.c,v 1.11 2003/04/06 00:45:12 deraadt Exp $ */ +/* $OpenBSD: getNAME.c,v 1.12 2003/06/02 19:38:24 millert Exp $ */ /* $NetBSD: getNAME.c,v 1.7.2.1 1997/11/10 19:54:46 thorpej Exp $ */ /*- @@ -13,11 +13,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -44,7 +40,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)getNAME.c 8.1 (Berkeley) 6/30/93"; #else -static char rcsid[] = "$OpenBSD: getNAME.c,v 1.11 2003/04/06 00:45:12 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: getNAME.c,v 1.12 2003/06/02 19:38:24 millert Exp $"; #endif #endif /* not lint */ diff --git a/libexec/getty/extern.h b/libexec/getty/extern.h index 9ed1e4a6554..f4601462eb0 100644 --- a/libexec/getty/extern.h +++ b/libexec/getty/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.4 2002/02/16 21:27:30 millert Exp $*/ +/* $OpenBSD: extern.h,v 1.5 2003/06/02 19:38:24 millert Exp $*/ /* * Copyright (c) 1993 @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/libexec/getty/getty.8 b/libexec/getty/getty.8 index 722621be9b5..510a16093b4 100644 --- a/libexec/getty/getty.8 +++ b/libexec/getty/getty.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: getty.8,v 1.10 2003/06/02 12:55:59 jmc Exp $ +.\" $OpenBSD: getty.8,v 1.11 2003/06/02 19:38:24 millert Exp $ .\" Copyright (c) 1980, 1991, 1993 .\" The Regents of the University of California. All rights reserved. .\" @@ -10,11 +10,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 the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/libexec/getty/gettytab.5 b/libexec/getty/gettytab.5 index 4422dd02bc9..49717e770db 100644 --- a/libexec/getty/gettytab.5 +++ b/libexec/getty/gettytab.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: gettytab.5,v 1.15 2003/06/02 12:55:59 jmc Exp $ +.\" $OpenBSD: gettytab.5,v 1.16 2003/06/02 19:38:24 millert Exp $ .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. .\" @@ -10,11 +10,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 the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/libexec/getty/gettytab.h b/libexec/getty/gettytab.h index faee8e2a714..fa77a9b99c5 100644 --- a/libexec/getty/gettytab.h +++ b/libexec/getty/gettytab.h @@ -1,4 +1,4 @@ -/* $OpenBSD: gettytab.h,v 1.5 2002/02/16 21:27:30 millert Exp $*/ +/* $OpenBSD: gettytab.h,v 1.6 2003/06/02 19:38:24 millert Exp $*/ /* * Copyright (c) 1983, 1993, 1994 @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/libexec/getty/init.c b/libexec/getty/init.c index baa1d2d4365..43fa0637ae1 100644 --- a/libexec/getty/init.c +++ b/libexec/getty/init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init.c,v 1.5 2002/07/07 08:54:50 jufi Exp $ */ +/* $OpenBSD: init.c,v 1.6 2003/06/02 19:38:24 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -35,7 +31,7 @@ #ifndef lint /*static char sccsid[] = "from: @(#)init.c 8.1 (Berkeley) 6/4/93";*/ -static char rcsid[] = "$OpenBSD: init.c,v 1.5 2002/07/07 08:54:50 jufi Exp $"; +static char rcsid[] = "$OpenBSD: init.c,v 1.6 2003/06/02 19:38:24 millert Exp $"; #endif /* not lint */ /* diff --git a/libexec/getty/main.c b/libexec/getty/main.c index 67b4f039d7c..420e0990d64 100644 --- a/libexec/getty/main.c +++ b/libexec/getty/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.24 2002/07/03 23:39:03 deraadt Exp $ */ +/* $OpenBSD: main.c,v 1.25 2003/06/02 19:38:24 millert Exp $ */ /*- * Copyright (c) 1980, 1993 @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -41,7 +37,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)main.c 8.1 (Berkeley) 6/20/93";*/ -static char rcsid[] = "$OpenBSD: main.c,v 1.24 2002/07/03 23:39:03 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.25 2003/06/02 19:38:24 millert Exp $"; #endif /* not lint */ #include <sys/param.h> diff --git a/libexec/getty/pathnames.h b/libexec/getty/pathnames.h index e8e9bbf36b5..2237c13cb5e 100644 --- a/libexec/getty/pathnames.h +++ b/libexec/getty/pathnames.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pathnames.h,v 1.2 2001/01/28 19:34:28 niklas Exp $*/ +/* $OpenBSD: pathnames.h,v 1.3 2003/06/02 19:38:24 millert Exp $*/ /* * Copyright (c) 1989, 1993 @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/libexec/getty/subr.c b/libexec/getty/subr.c index e2e12de162f..ea51a45f8c7 100644 --- a/libexec/getty/subr.c +++ b/libexec/getty/subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr.c,v 1.17 2002/07/03 23:39:03 deraadt Exp $ */ +/* $OpenBSD: subr.c,v 1.18 2003/06/02 19:38:24 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -35,7 +31,7 @@ #ifndef lint /*static char sccsid[] = "from: @(#)subr.c 8.1 (Berkeley) 6/4/93";*/ -static char rcsid[] = "$OpenBSD: subr.c,v 1.17 2002/07/03 23:39:03 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: subr.c,v 1.18 2003/06/02 19:38:24 millert Exp $"; #endif /* not lint */ /* diff --git a/libexec/getty/ttys.5 b/libexec/getty/ttys.5 index a71b3cacb67..47aa1cf3772 100644 --- a/libexec/getty/ttys.5 +++ b/libexec/getty/ttys.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ttys.5,v 1.8 2003/06/02 12:55:59 jmc Exp $ +.\" $OpenBSD: ttys.5,v 1.9 2003/06/02 19:38:24 millert Exp $ .\" Copyright (c) 1985, 1991, 1993 .\" The Regents of the University of California. All rights reserved. .\" @@ -10,11 +10,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 the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/libexec/ld.so/dir.c b/libexec/ld.so/dir.c index a9b2707b7db..921d174567f 100644 --- a/libexec/ld.so/dir.c +++ b/libexec/ld.so/dir.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dir.c,v 1.6 2003/02/02 16:57:58 deraadt Exp $ */ +/* $OpenBSD: dir.c,v 1.7 2003/06/02 19:38:24 millert Exp $ */ /* * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. @@ -11,11 +11,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/libexec/ld.so/dir.h b/libexec/ld.so/dir.h index 15b87551f0f..ab476fda7fb 100644 --- a/libexec/ld.so/dir.h +++ b/libexec/ld.so/dir.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dir.h,v 1.1 2002/07/12 20:18:30 drahn Exp $ */ +/* $OpenBSD: dir.h,v 1.2 2003/06/02 19:38:24 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/libexec/ld.so/dl_printf.c b/libexec/ld.so/dl_printf.c index 200d9a26052..8d3a80f1980 100644 --- a/libexec/ld.so/dl_printf.c +++ b/libexec/ld.so/dl_printf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dl_printf.c,v 1.11 2003/02/02 16:57:58 deraadt Exp $ */ +/* $OpenBSD: dl_printf.c,v 1.12 2003/06/02 19:38:24 millert Exp $ */ /*- * Copyright (c) 1993 @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/libexec/lfs_cleanerd/clean.h b/libexec/lfs_cleanerd/clean.h index d8692e2ef3c..6ded4838e64 100644 --- a/libexec/lfs_cleanerd/clean.h +++ b/libexec/lfs_cleanerd/clean.h @@ -1,4 +1,4 @@ -/* $OpenBSD: clean.h,v 1.4 2002/02/17 19:42:26 millert Exp $ */ +/* $OpenBSD: clean.h,v 1.5 2003/06/02 19:38:24 millert Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/libexec/lfs_cleanerd/cleanerd.c b/libexec/lfs_cleanerd/cleanerd.c index d885d87296c..73e53c15fcc 100644 --- a/libexec/lfs_cleanerd/cleanerd.c +++ b/libexec/lfs_cleanerd/cleanerd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cleanerd.c,v 1.10 2002/06/11 06:16:36 jsyn Exp $ */ +/* $OpenBSD: cleanerd.c,v 1.11 2003/06/02 19:38:24 millert Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -41,7 +37,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "@(#)cleanerd.c 8.5 (Berkeley) 6/10/95";*/ -static char rcsid[] = "$OpenBSD: cleanerd.c,v 1.10 2002/06/11 06:16:36 jsyn Exp $"; +static char rcsid[] = "$OpenBSD: cleanerd.c,v 1.11 2003/06/02 19:38:24 millert Exp $"; #endif /* not lint */ #include <sys/param.h> diff --git a/libexec/lfs_cleanerd/lfs_cleanerd.8 b/libexec/lfs_cleanerd/lfs_cleanerd.8 index e886799f5e4..d3a25bf05ef 100644 --- a/libexec/lfs_cleanerd/lfs_cleanerd.8 +++ b/libexec/lfs_cleanerd/lfs_cleanerd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: lfs_cleanerd.8,v 1.7 2000/03/14 21:31:39 aaron Exp $ +.\" $OpenBSD: lfs_cleanerd.8,v 1.8 2003/06/02 19:38:24 millert Exp $ .\" .\" Copyright (c) 1993 .\" The Regents of the University of California. All rights reserved. @@ -11,11 +11,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 the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/libexec/lfs_cleanerd/library.c b/libexec/lfs_cleanerd/library.c index 3b898e46c19..c295b546367 100644 --- a/libexec/lfs_cleanerd/library.c +++ b/libexec/lfs_cleanerd/library.c @@ -1,4 +1,4 @@ -/* $OpenBSD: library.c,v 1.9 2002/07/07 08:54:50 jufi Exp $ */ +/* $OpenBSD: library.c,v 1.10 2003/06/02 19:38:24 millert Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -35,7 +31,7 @@ #ifndef lint /*static char sccsid[] = "@(#)library.c 8.3 (Berkeley) 5/24/95";*/ -static char rcsid[] = "$OpenBSD: library.c,v 1.9 2002/07/07 08:54:50 jufi Exp $"; +static char rcsid[] = "$OpenBSD: library.c,v 1.10 2003/06/02 19:38:24 millert Exp $"; #endif /* not lint */ #include <sys/param.h> diff --git a/libexec/lfs_cleanerd/misc.c b/libexec/lfs_cleanerd/misc.c index 7ae3203e4b6..5037318ab41 100644 --- a/libexec/lfs_cleanerd/misc.c +++ b/libexec/lfs_cleanerd/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.4 2002/02/19 19:39:38 millert Exp $ */ +/* $OpenBSD: misc.c,v 1.5 2003/06/02 19:38:24 millert Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -35,7 +31,7 @@ #ifndef lint /*static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/4/93";*/ -static char rcsid[] = "$OpenBSD: misc.c,v 1.4 2002/02/19 19:39:38 millert Exp $"; +static char rcsid[] = "$OpenBSD: misc.c,v 1.5 2003/06/02 19:38:24 millert Exp $"; #endif /* not lint */ #include <sys/types.h> diff --git a/libexec/lfs_cleanerd/print.c b/libexec/lfs_cleanerd/print.c index 86b491cc5ec..ecddf2245ab 100644 --- a/libexec/lfs_cleanerd/print.c +++ b/libexec/lfs_cleanerd/print.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print.c,v 1.3 2001/07/27 20:34:36 pvalchev Exp $ */ +/* $OpenBSD: print.c,v 1.4 2003/06/02 19:38:24 millert Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -35,7 +31,7 @@ #ifndef lint /*static char sccsid[] = "@(#)print.c 8.2 (Berkeley) 5/24/95";*/ -static char rcsid[] = "$OpenBSD: print.c,v 1.3 2001/07/27 20:34:36 pvalchev Exp $"; +static char rcsid[] = "$OpenBSD: print.c,v 1.4 2003/06/02 19:38:24 millert Exp $"; #endif /* not lint */ #include <sys/param.h> diff --git a/libexec/mail.local/mail.local.8 b/libexec/mail.local/mail.local.8 index e04f128d995..8808f85e1ef 100644 --- a/libexec/mail.local/mail.local.8 +++ b/libexec/mail.local/mail.local.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mail.local.8,v 1.23 2002/03/27 15:45:57 mpech Exp $ +.\" $OpenBSD: mail.local.8,v 1.24 2003/06/02 19:38:24 millert Exp $ .\" Copyright (c) 1990 The Regents of the University of California. .\" All rights reserved. .\" @@ -10,11 +10,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 the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/libexec/mail.local/mail.local.c b/libexec/mail.local/mail.local.c index da300c66f66..217f3433713 100644 --- a/libexec/mail.local/mail.local.c +++ b/libexec/mail.local/mail.local.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mail.local.c,v 1.24 2002/07/03 23:39:03 deraadt Exp $ */ +/* $OpenBSD: mail.local.c,v 1.25 2003/06/02 19:38:24 millert Exp $ */ /*- * Copyright (c) 1996-1998 Theo de Raadt <deraadt@theos.com> @@ -14,11 +14,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -45,7 +41,7 @@ char copyright[] = #if 0 static char sccsid[] = "from: @(#)mail.local.c 5.6 (Berkeley) 6/19/91"; #else -static char rcsid[] = "$OpenBSD: mail.local.c,v 1.24 2002/07/03 23:39:03 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: mail.local.c,v 1.25 2003/06/02 19:38:24 millert Exp $"; #endif #endif /* not lint */ diff --git a/libexec/mail.local/mail.local.h b/libexec/mail.local/mail.local.h index 1b24dfd5e95..f259c6c9222 100644 --- a/libexec/mail.local/mail.local.h +++ b/libexec/mail.local/mail.local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mail.local.h,v 1.3 2002/02/16 21:27:30 millert Exp $ */ +/* $OpenBSD: mail.local.h,v 1.4 2003/06/02 19:38:24 millert Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/libexec/mail.local/pathnames.h b/libexec/mail.local/pathnames.h index e8787bdd6db..b405a048ec6 100644 --- a/libexec/mail.local/pathnames.h +++ b/libexec/mail.local/pathnames.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pathnames.h,v 1.4 2001/01/28 19:34:30 niklas Exp $*/ +/* $OpenBSD: pathnames.h,v 1.5 2003/06/02 19:38:24 millert Exp $*/ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/libexec/rpc.rstatd/rpc.rstatd.8 b/libexec/rpc.rstatd/rpc.rstatd.8 index 949d96d720b..29f9e271476 100644 --- a/libexec/rpc.rstatd/rpc.rstatd.8 +++ b/libexec/rpc.rstatd/rpc.rstatd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: rpc.rstatd.8,v 1.7 2002/06/29 08:13:13 deraadt Exp $ +.\" $OpenBSD: rpc.rstatd.8,v 1.8 2003/06/02 19:38:24 millert Exp $ .\" .\" Copyright (c) 1985, 1991 The Regents of the University of California. .\" All rights reserved. @@ -11,11 +11,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 the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" @@ -31,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $OpenBSD: rpc.rstatd.8,v 1.7 2002/06/29 08:13:13 deraadt Exp $ +.\" $OpenBSD: rpc.rstatd.8,v 1.8 2003/06/02 19:38:24 millert Exp $ .\" .Dd June 7, 1993 .Dt RPC.RSTATD 8 diff --git a/libexec/rpc.rusersd/rpc.rusersd.8 b/libexec/rpc.rusersd/rpc.rusersd.8 index 5df94ead1e1..131e6a06d66 100644 --- a/libexec/rpc.rusersd/rpc.rusersd.8 +++ b/libexec/rpc.rusersd/rpc.rusersd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: rpc.rusersd.8,v 1.5 2002/06/29 08:13:13 deraadt Exp $ +.\" $OpenBSD: rpc.rusersd.8,v 1.6 2003/06/02 19:38:24 millert Exp $ .\" .\" Copyright (c) 1985, 1991 The Regents of the University of California. .\" All rights reserved. @@ -11,11 +11,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 the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" @@ -31,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: rpc.rusersd.8,v 1.5 2002/06/29 08:13:13 deraadt Exp $ +.\" $Id: rpc.rusersd.8,v 1.6 2003/06/02 19:38:24 millert Exp $ .\" .Dd June 7, 1993 .Dt RPC.RUSERSD 8 diff --git a/libexec/rpc.rwalld/rpc.rwalld.8 b/libexec/rpc.rwalld/rpc.rwalld.8 index 323813d9612..0cc88d8a708 100644 --- a/libexec/rpc.rwalld/rpc.rwalld.8 +++ b/libexec/rpc.rwalld/rpc.rwalld.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: rpc.rwalld.8,v 1.5 2000/10/30 17:46:15 aaron Exp $ +.\" $OpenBSD: rpc.rwalld.8,v 1.6 2003/06/02 19:38:24 millert Exp $ .\" .\" Copyright (c) 1985, 1991 The Regents of the University of California. .\" All rights reserved. @@ -11,11 +11,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 the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" @@ -31,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: rpc.rwalld.8,v 1.5 2000/10/30 17:46:15 aaron Exp $ +.\" $Id: rpc.rwalld.8,v 1.6 2003/06/02 19:38:24 millert Exp $ .\" .Dd June 7, 1993 .Dt RPC.RWALLD 8 diff --git a/libexec/rshd/rshd.8 b/libexec/rshd/rshd.8 index 1161219d875..1b6e4bc5349 100644 --- a/libexec/rshd/rshd.8 +++ b/libexec/rshd/rshd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: rshd.8,v 1.14 2003/02/11 07:26:20 jmc Exp $ +.\" $OpenBSD: rshd.8,v 1.15 2003/06/02 19:38:24 millert Exp $ .\" Copyright (c) 1983, 1989, 1991, 1993 .\" The Regents of the University of California. All rights reserved. .\" @@ -10,11 +10,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 the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/libexec/rshd/rshd.c b/libexec/rshd/rshd.c index 0991eeccfac..7463211ce62 100644 --- a/libexec/rshd/rshd.c +++ b/libexec/rshd/rshd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rshd.c,v 1.48 2002/09/06 19:43:54 deraadt Exp $ */ +/* $OpenBSD: rshd.c,v 1.49 2003/06/02 19:38:24 millert Exp $ */ /*- * Copyright (c) 1988, 1989, 1992, 1993, 1994 @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -41,7 +37,7 @@ static char copyright[] = #ifndef lint /* from: static char sccsid[] = "@(#)rshd.c 8.2 (Berkeley) 4/6/94"; */ -static char *rcsid = "$OpenBSD: rshd.c,v 1.48 2002/09/06 19:43:54 deraadt Exp $"; +static char *rcsid = "$OpenBSD: rshd.c,v 1.49 2003/06/02 19:38:24 millert Exp $"; #endif /* not lint */ /* diff --git a/libexec/talkd/announce.c b/libexec/talkd/announce.c index 357d3e3b938..154d795f338 100644 --- a/libexec/talkd/announce.c +++ b/libexec/talkd/announce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: announce.c,v 1.16 2002/11/25 07:40:09 itojun Exp $ */ +/* $OpenBSD: announce.c,v 1.17 2003/06/02 19:38:24 millert Exp $ */ /* * Copyright (c) 1983 Regents of the University of California. @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -35,7 +31,7 @@ #ifndef lint /*static char sccsid[] = "from: @(#)announce.c 5.9 (Berkeley) 2/26/91";*/ -static char rcsid[] = "$Id: announce.c,v 1.16 2002/11/25 07:40:09 itojun Exp $"; +static char rcsid[] = "$Id: announce.c,v 1.17 2003/06/02 19:38:24 millert Exp $"; #endif /* not lint */ #include <sys/param.h> diff --git a/libexec/talkd/print.c b/libexec/talkd/print.c index 0d5ce1b0e80..47fab76aaf4 100644 --- a/libexec/talkd/print.c +++ b/libexec/talkd/print.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print.c,v 1.5 2002/11/25 07:40:09 itojun Exp $ */ +/* $OpenBSD: print.c,v 1.6 2003/06/02 19:38:24 millert Exp $ */ /* * Copyright (c) 1983 Regents of the University of California. @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -35,7 +31,7 @@ #ifndef lint /*static char sccsid[] = "from: @(#)print.c 5.8 (Berkeley) 2/26/91";*/ -static char rcsid[] = "$Id: print.c,v 1.5 2002/11/25 07:40:09 itojun Exp $"; +static char rcsid[] = "$Id: print.c,v 1.6 2003/06/02 19:38:24 millert Exp $"; #endif /* not lint */ /* debug print routines */ diff --git a/libexec/talkd/process.c b/libexec/talkd/process.c index 5e4f465cdf4..e1515428dd4 100644 --- a/libexec/talkd/process.c +++ b/libexec/talkd/process.c @@ -1,4 +1,4 @@ -/* $OpenBSD: process.c,v 1.14 2002/11/25 07:40:09 itojun Exp $ */ +/* $OpenBSD: process.c,v 1.15 2003/06/02 19:38:24 millert Exp $ */ /* * Copyright (c) 1983 Regents of the University of California. @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -35,7 +31,7 @@ #ifndef lint /*static char sccsid[] = "from: @(#)process.c 5.10 (Berkeley) 2/26/91";*/ -static char rcsid[] = "$Id: process.c,v 1.14 2002/11/25 07:40:09 itojun Exp $"; +static char rcsid[] = "$Id: process.c,v 1.15 2003/06/02 19:38:24 millert Exp $"; #endif /* not lint */ /* diff --git a/libexec/talkd/table.c b/libexec/talkd/table.c index 14925978567..1e06eaa4576 100644 --- a/libexec/talkd/table.c +++ b/libexec/talkd/table.c @@ -1,4 +1,4 @@ -/* $OpenBSD: table.c,v 1.8 2002/02/16 21:27:31 millert Exp $ */ +/* $OpenBSD: table.c,v 1.9 2003/06/02 19:38:24 millert Exp $ */ /* * Copyright (c) 1983 Regents of the University of California. @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -35,7 +31,7 @@ #ifndef lint /*static char sccsid[] = "from: @(#)table.c 5.7 (Berkeley) 2/26/91";*/ -static char rcsid[] = "$Id: table.c,v 1.8 2002/02/16 21:27:31 millert Exp $"; +static char rcsid[] = "$Id: table.c,v 1.9 2003/06/02 19:38:24 millert Exp $"; #endif /* not lint */ /* diff --git a/libexec/talkd/talkd.8 b/libexec/talkd/talkd.8 index ee4ba72478e..53b2e40158c 100644 --- a/libexec/talkd/talkd.8 +++ b/libexec/talkd/talkd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: talkd.8,v 1.4 2002/05/22 19:07:43 deraadt Exp $ +.\" $OpenBSD: talkd.8,v 1.5 2003/06/02 19:38:24 millert Exp $ .\" .\" Copyright (c) 1983, 1991 The Regents of the University of California. .\" All rights reserved. @@ -11,11 +11,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 the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" @@ -32,7 +28,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)talkd.8 6.5 (Berkeley) 3/16/91 -.\" $Id: talkd.8,v 1.4 2002/05/22 19:07:43 deraadt Exp $ +.\" $Id: talkd.8,v 1.5 2003/06/02 19:38:24 millert Exp $ .\" .Dd March 16, 1991 .Dt TALKD 8 diff --git a/libexec/talkd/talkd.c b/libexec/talkd/talkd.c index 16dae7ac3f4..fab7483adfc 100644 --- a/libexec/talkd/talkd.c +++ b/libexec/talkd/talkd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: talkd.c,v 1.17 2002/11/25 07:40:09 itojun Exp $ */ +/* $OpenBSD: talkd.c,v 1.18 2003/06/02 19:38:24 millert Exp $ */ /* * Copyright (c) 1983 Regents of the University of California. @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -41,7 +37,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)talkd.c 5.8 (Berkeley) 2/26/91";*/ -static char rcsid[] = "$Id: talkd.c,v 1.17 2002/11/25 07:40:09 itojun Exp $"; +static char rcsid[] = "$Id: talkd.c,v 1.18 2003/06/02 19:38:24 millert Exp $"; #endif /* not lint */ /* diff --git a/libexec/talkd/talkd.h b/libexec/talkd/talkd.h index fca8c054bdd..b84fa828bb9 100644 --- a/libexec/talkd/talkd.h +++ b/libexec/talkd/talkd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: talkd.h,v 1.7 2002/11/25 07:40:09 itojun Exp $ */ +/* $OpenBSD: talkd.h,v 1.8 2003/06/02 19:38:24 millert Exp $ */ /* * Copyright (c) 1983 Regents of the University of California. @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/libexec/telnetd/auth-proto.h b/libexec/telnetd/auth-proto.h index fc159cf8be2..fb6487ab206 100644 --- a/libexec/telnetd/auth-proto.h +++ b/libexec/telnetd/auth-proto.h @@ -10,11 +10,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -31,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)auth-proto.h 8.1 (Berkeley) 6/4/93 - * $OpenBSD: auth-proto.h,v 1.1 2003/05/14 01:46:51 hin Exp $ + * $OpenBSD: auth-proto.h,v 1.2 2003/06/02 19:38:24 millert Exp $ * $NetBSD: auth-proto.h,v 1.5 1996/02/24 01:15:16 jtk Exp $ */ diff --git a/libexec/telnetd/auth.c b/libexec/telnetd/auth.c index 6ed8393075b..18705da78e7 100644 --- a/libexec/telnetd/auth.c +++ b/libexec/telnetd/auth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth.c,v 1.1 2003/05/14 01:46:51 hin Exp $ */ +/* $OpenBSD: auth.c,v 1.2 2003/06/02 19:38:24 millert Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/libexec/telnetd/auth.h b/libexec/telnetd/auth.h index b7c87116842..888e4e9a407 100644 --- a/libexec/telnetd/auth.h +++ b/libexec/telnetd/auth.h @@ -10,11 +10,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -31,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)auth.h 8.1 (Berkeley) 6/4/93 - * $OpenBSD: auth.h,v 1.1 2003/05/14 01:46:51 hin Exp $ + * $OpenBSD: auth.h,v 1.2 2003/06/02 19:38:24 millert Exp $ * $NetBSD: auth.h,v 1.5 1996/02/24 01:15:18 jtk Exp $ */ diff --git a/libexec/telnetd/authenc.c b/libexec/telnetd/authenc.c index 45eb90acc8a..3e91789e34d 100644 --- a/libexec/telnetd/authenc.c +++ b/libexec/telnetd/authenc.c @@ -10,11 +10,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/libexec/telnetd/defs.h b/libexec/telnetd/defs.h index deb6ccdce59..50948a83576 100644 --- a/libexec/telnetd/defs.h +++ b/libexec/telnetd/defs.h @@ -10,11 +10,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/libexec/telnetd/enc-proto.h b/libexec/telnetd/enc-proto.h index 6fe5181e0de..586e236ea78 100644 --- a/libexec/telnetd/enc-proto.h +++ b/libexec/telnetd/enc-proto.h @@ -10,11 +10,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/libexec/telnetd/enc_des.c b/libexec/telnetd/enc_des.c index b69d18bc09a..8919d4b91a3 100644 --- a/libexec/telnetd/enc_des.c +++ b/libexec/telnetd/enc_des.c @@ -1,4 +1,4 @@ -/* $OpenBSD: enc_des.c,v 1.1 2003/05/14 01:46:51 hin Exp $ */ +/* $OpenBSD: enc_des.c,v 1.2 2003/06/02 19:38:25 millert Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/libexec/telnetd/encrypt.c b/libexec/telnetd/encrypt.c index bcda1bbbcdf..f587c3a2c1f 100644 --- a/libexec/telnetd/encrypt.c +++ b/libexec/telnetd/encrypt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: encrypt.c,v 1.1 2003/05/14 01:46:51 hin Exp $ */ +/* $OpenBSD: encrypt.c,v 1.2 2003/06/02 19:38:25 millert Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/libexec/telnetd/encrypt.h b/libexec/telnetd/encrypt.h index ac55be9392a..eeeff06e07b 100644 --- a/libexec/telnetd/encrypt.h +++ b/libexec/telnetd/encrypt.h @@ -10,11 +10,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -31,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)encrypt.h 8.1 (Berkeley) 6/4/93 - * $OpenBSD: encrypt.h,v 1.1 2003/05/14 01:46:51 hin Exp $ + * $OpenBSD: encrypt.h,v 1.2 2003/06/02 19:38:25 millert Exp $ * $NetBSD: encrypt.h,v 1.4 1996/02/24 01:15:20 jtk Exp $ */ diff --git a/libexec/telnetd/ext.h b/libexec/telnetd/ext.h index 0139a6bf6be..a2ffa2b2d37 100644 --- a/libexec/telnetd/ext.h +++ b/libexec/telnetd/ext.h @@ -10,11 +10,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/libexec/telnetd/genget.c b/libexec/telnetd/genget.c index ee740a1508f..49503c238ea 100644 --- a/libexec/telnetd/genget.c +++ b/libexec/telnetd/genget.c @@ -1,4 +1,4 @@ -/* $OpenBSD: genget.c,v 1.1 2003/05/14 01:46:51 hin Exp $ */ +/* $OpenBSD: genget.c,v 1.2 2003/06/02 19:38:25 millert Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -36,7 +32,7 @@ #ifndef lint /* from: static char sccsid[] = "@(#)genget.c 8.2 (Berkeley) 5/30/95"; */ /* from: static char *rcsid = "$NetBSD: genget.c,v 1.5 1996/02/24 01:15:21 jtk Exp $"; */ -static char *rcsid = "$OpenBSD: genget.c,v 1.1 2003/05/14 01:46:51 hin Exp $"; +static char *rcsid = "$OpenBSD: genget.c,v 1.2 2003/06/02 19:38:25 millert Exp $"; #endif /* not lint */ /* $KTH: genget.c,v 1.6 1997/05/04 09:01:34 assar Exp $ */ diff --git a/libexec/telnetd/global.c b/libexec/telnetd/global.c index 5004c008a2c..841fbb5ae80 100644 --- a/libexec/telnetd/global.c +++ b/libexec/telnetd/global.c @@ -10,11 +10,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/libexec/telnetd/kerberos.c b/libexec/telnetd/kerberos.c index 15037144b1d..dde320a055f 100644 --- a/libexec/telnetd/kerberos.c +++ b/libexec/telnetd/kerberos.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kerberos.c,v 1.1 2003/05/14 01:46:51 hin Exp $ */ +/* $OpenBSD: kerberos.c,v 1.2 2003/06/02 19:38:25 millert Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/libexec/telnetd/kerberos5.c b/libexec/telnetd/kerberos5.c index 30baa33b8ce..d0ff32dcf78 100644 --- a/libexec/telnetd/kerberos5.c +++ b/libexec/telnetd/kerberos5.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kerberos5.c,v 1.1 2003/05/14 01:46:51 hin Exp $ */ +/* $OpenBSD: kerberos5.c,v 1.2 2003/06/02 19:38:25 millert Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/libexec/telnetd/misc-proto.h b/libexec/telnetd/misc-proto.h index 2afafc0b9ec..978e3b8446a 100644 --- a/libexec/telnetd/misc-proto.h +++ b/libexec/telnetd/misc-proto.h @@ -10,11 +10,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -31,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)misc-proto.h 8.1 (Berkeley) 6/4/93 - * $OpenBSD: misc-proto.h,v 1.1 2003/05/14 01:46:51 hin Exp $ + * $OpenBSD: misc-proto.h,v 1.2 2003/06/02 19:38:25 millert Exp $ * $NetBSD: misc-proto.h,v 1.5 1996/02/24 01:15:23 jtk Exp $ */ diff --git a/libexec/telnetd/misc.c b/libexec/telnetd/misc.c index 8c5d99fb31c..69b049c6302 100644 --- a/libexec/telnetd/misc.c +++ b/libexec/telnetd/misc.c @@ -10,11 +10,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -34,7 +30,7 @@ #ifndef lint /* from: static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/4/93"; */ /* from: static char rcsid[] = "$NetBSD: misc.c,v 1.5 1996/02/24 01:15:25 jtk Exp $"; */ -static char rcsid[] = "$OpenBSD: misc.c,v 1.1 2003/05/14 01:46:51 hin Exp $"; +static char rcsid[] = "$OpenBSD: misc.c,v 1.2 2003/06/02 19:38:25 millert Exp $"; #endif /* not lint */ /* $KTH: misc.c,v 1.15 2000/01/25 23:24:58 assar Exp $ */ diff --git a/libexec/telnetd/misc.h b/libexec/telnetd/misc.h index 25370b46aad..f98e78ad23d 100644 --- a/libexec/telnetd/misc.h +++ b/libexec/telnetd/misc.h @@ -10,11 +10,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -31,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)misc.h 8.1 (Berkeley) 6/4/93 - * $OpenBSD: misc.h,v 1.1 2003/05/14 01:46:51 hin Exp $ + * $OpenBSD: misc.h,v 1.2 2003/06/02 19:38:25 millert Exp $ * $NetBSD: misc.h,v 1.4 1996/02/24 01:15:27 jtk Exp $ */ diff --git a/libexec/telnetd/slc.c b/libexec/telnetd/slc.c index 519c0de9bc0..ea82b3373ec 100644 --- a/libexec/telnetd/slc.c +++ b/libexec/telnetd/slc.c @@ -10,11 +10,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/libexec/telnetd/state.c b/libexec/telnetd/state.c index 21d16889d60..ec38a51060f 100644 --- a/libexec/telnetd/state.c +++ b/libexec/telnetd/state.c @@ -10,11 +10,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/libexec/telnetd/sys_term.c b/libexec/telnetd/sys_term.c index 0d05a0da07f..2f548b2a45e 100644 --- a/libexec/telnetd/sys_term.c +++ b/libexec/telnetd/sys_term.c @@ -10,11 +10,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/libexec/telnetd/telnetd.8 b/libexec/telnetd/telnetd.8 index 49ee72aac96..6e75fba15d5 100644 --- a/libexec/telnetd/telnetd.8 +++ b/libexec/telnetd/telnetd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: telnetd.8,v 1.29 2003/06/02 14:37:35 jmc Exp $ +.\" $OpenBSD: telnetd.8,v 1.30 2003/06/02 19:38:25 millert Exp $ .\" .\" Copyright (c) 1983, 1993 .\" The Regents of the University of California. All rights reserved. @@ -11,11 +11,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 the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/libexec/telnetd/telnetd.c b/libexec/telnetd/telnetd.c index 701fd8e545e..e31286bcb50 100644 --- a/libexec/telnetd/telnetd.c +++ b/libexec/telnetd/telnetd.c @@ -10,11 +10,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/libexec/telnetd/telnetd.h b/libexec/telnetd/telnetd.h index 2726906d361..f16fb0013ed 100644 --- a/libexec/telnetd/telnetd.h +++ b/libexec/telnetd/telnetd.h @@ -10,11 +10,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/libexec/telnetd/termstat.c b/libexec/telnetd/termstat.c index b8479446d20..1fc796435c2 100644 --- a/libexec/telnetd/termstat.c +++ b/libexec/telnetd/termstat.c @@ -10,11 +10,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/libexec/telnetd/utility.c b/libexec/telnetd/utility.c index a16bc3ae340..f0a7202c590 100644 --- a/libexec/telnetd/utility.c +++ b/libexec/telnetd/utility.c @@ -10,11 +10,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/libexec/tftpd/tftpd.8 b/libexec/tftpd/tftpd.8 index fa9de4842b5..1b294883e36 100644 --- a/libexec/tftpd/tftpd.8 +++ b/libexec/tftpd/tftpd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: tftpd.8,v 1.12 2003/06/02 14:39:30 jmc Exp $ +.\" $OpenBSD: tftpd.8,v 1.13 2003/06/02 19:38:25 millert Exp $ .\" .\" Copyright (c) 1983, 1991 The Regents of the University of California. .\" All rights reserved. @@ -11,11 +11,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 the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" @@ -32,7 +28,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)tftpd.8 6.7 (Berkeley) 5/13/91 -.\" $OpenBSD: tftpd.8,v 1.12 2003/06/02 14:39:30 jmc Exp $ +.\" $OpenBSD: tftpd.8,v 1.13 2003/06/02 19:38:25 millert Exp $ .\" .Dd June 11, 1997 .Dt TFTPD 8 diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c index 9c150ac59d7..d8ab453c8a5 100644 --- a/libexec/tftpd/tftpd.c +++ b/libexec/tftpd/tftpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tftpd.c,v 1.26 2002/09/06 19:43:54 deraadt Exp $ */ +/* $OpenBSD: tftpd.c,v 1.27 2003/06/02 19:38:25 millert Exp $ */ /* * Copyright (c) 1983 Regents of the University of California. @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -41,7 +37,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)tftpd.c 5.13 (Berkeley) 2/26/91";*/ -static char rcsid[] = "$OpenBSD: tftpd.c,v 1.26 2002/09/06 19:43:54 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: tftpd.c,v 1.27 2003/06/02 19:38:25 millert Exp $"; #endif /* not lint */ /* diff --git a/libexec/uucpd/pathnames.h b/libexec/uucpd/pathnames.h index 3c7087e5fd0..6e3bc44f1bc 100644 --- a/libexec/uucpd/pathnames.h +++ b/libexec/uucpd/pathnames.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pathnames.h,v 1.3 2003/03/12 19:37:56 jmc Exp $*/ +/* $OpenBSD: pathnames.h,v 1.4 2003/06/02 19:38:25 millert Exp $*/ /* * Copyright (c) 1989 The Regents of the University of California. @@ -12,11 +12,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/libexec/uucpd/uucpd.c b/libexec/uucpd/uucpd.c index d65a1ebd9b1..8da2b61d975 100644 --- a/libexec/uucpd/uucpd.c +++ b/libexec/uucpd/uucpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uucpd.c,v 1.25 2002/09/06 19:43:54 deraadt Exp $ */ +/* $OpenBSD: uucpd.c,v 1.26 2003/06/02 19:38:25 millert Exp $ */ /* * Copyright (c) 1985 The Regents of the University of California. @@ -15,11 +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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -44,7 +40,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)uucpd.c 5.10 (Berkeley) 2/26/91";*/ -static char rcsid[] = "$OpenBSD: uucpd.c,v 1.25 2002/09/06 19:43:54 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: uucpd.c,v 1.26 2003/06/02 19:38:25 millert Exp $"; #endif /* not lint */ /* diff --git a/regress/lib/libc/db/dbtest.c b/regress/lib/libc/db/dbtest.c index a48e19c452b..0cefba3e1f8 100644 --- a/regress/lib/libc/db/dbtest.c +++ b/regress/lib/libc/db/dbtest.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dbtest.c,v 1.9 2002/02/19 19:39:38 millert Exp $ */ +/* $OpenBSD: dbtest.c,v 1.10 2003/06/02 19:38:25 millert Exp $ */ /* $NetBSD: dbtest.c,v 1.8 1996/05/03 21:57:48 cgd Exp $ */ /*- @@ -13,11 +13,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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -44,7 +40,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)dbtest.c 8.17 (Berkeley) 9/1/94"; #else -static char rcsid[] = "$OpenBSD: dbtest.c,v 1.9 2002/02/19 19:39:38 millert Exp $"; +static char rcsid[] = "$OpenBSD: dbtest.c,v 1.10 2003/06/02 19:38:25 millert Exp $"; #endif #endif /* not lint */ |