From ea30661d639896f7aa04e091171b740c9eb8af8d Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Sun, 27 Oct 1996 16:33:53 +0000 Subject: [PATCH] Fix copyright git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@900 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/kafs/afslib.c | 4 ++-- lib/kafs/afssys.c | 4 ++-- lib/kafs/afssysdefs.h | 4 ++-- lib/kafs/kafs.h | 4 ++-- lib/otp/otp.c | 4 ++-- lib/otp/otp.h | 4 ++-- lib/otp/otp_challenge.c | 4 ++-- lib/otp/otp_db.c | 4 ++-- lib/otp/otp_locl.h | 4 ++-- lib/otp/otp_md.c | 4 ++-- lib/otp/otp_md.h | 4 ++-- lib/otp/otp_parse.c | 4 ++-- lib/otp/otp_print.c | 4 ++-- lib/otp/otp_verify.c | 4 ++-- lib/roken/err.c | 25 ++++++++++--------------- lib/roken/err.h | 38 -------------------------------------- lib/roken/err.hin | 38 -------------------------------------- lib/roken/errx.c | 25 ++++++++++--------------- lib/roken/getcwd.c | 4 ++-- lib/roken/getdtablesize.c | 4 ++-- lib/roken/gettimeofday.c | 4 ++-- lib/roken/hstrerror.c | 4 ++-- lib/roken/inaddr2str.c | 4 ++-- lib/roken/inet_aton.c | 4 ++-- lib/roken/k_getpwnam.c | 4 ++-- lib/roken/k_getpwuid.c | 4 ++-- lib/roken/memmove.c | 4 ++-- lib/roken/mini_inetd.c | 6 +++--- lib/roken/putenv.c | 4 ++-- lib/roken/roken.h | 4 ++-- lib/roken/roken.h.in | 4 ++-- lib/roken/setegid.c | 4 ++-- lib/roken/setenv.c | 4 ++-- lib/roken/seteuid.c | 4 ++-- lib/roken/signal.c | 4 ++-- lib/roken/strdup.c | 4 ++-- lib/roken/strerror.c | 4 ++-- lib/roken/strnlen.c | 4 ++-- lib/roken/swab.c | 4 ++-- lib/roken/tm2time.c | 4 ++-- lib/roken/unsetenv.c | 4 ++-- lib/roken/verify.c | 4 ++-- lib/roken/verr.c | 25 ++++++++++--------------- lib/roken/verrx.c | 25 ++++++++++--------------- lib/roken/vwarn.c | 25 ++++++++++--------------- lib/roken/vwarnx.c | 25 ++++++++++--------------- lib/roken/warn.c | 25 ++++++++++--------------- lib/roken/warnx.c | 25 ++++++++++--------------- 48 files changed, 157 insertions(+), 273 deletions(-) diff --git a/lib/kafs/afslib.c b/lib/kafs/afslib.c index 600a23a7c..6cb5cb46b 100644 --- a/lib/kafs/afslib.c +++ b/lib/kafs/afslib.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/kafs/afssys.c b/lib/kafs/afssys.c index 662fd3c04..319d9601d 100644 --- a/lib/kafs/afssys.c +++ b/lib/kafs/afssys.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/kafs/afssysdefs.h b/lib/kafs/afssysdefs.h index 95fa2855e..f155d0623 100644 --- a/lib/kafs/afssysdefs.h +++ b/lib/kafs/afssysdefs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/kafs/kafs.h b/lib/kafs/kafs.h index a810a060e..23e5919d9 100644 --- a/lib/kafs/kafs.h +++ b/lib/kafs/kafs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/otp/otp.c b/lib/otp/otp.c index 693faf8e3..5ee1f558c 100644 --- a/lib/otp/otp.c +++ b/lib/otp/otp.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/otp/otp.h b/lib/otp/otp.h index 76b6685f2..0d8de1072 100644 --- a/lib/otp/otp.h +++ b/lib/otp/otp.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/otp/otp_challenge.c b/lib/otp/otp_challenge.c index 76a60c808..7dee1d44c 100644 --- a/lib/otp/otp_challenge.c +++ b/lib/otp/otp_challenge.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/otp/otp_db.c b/lib/otp/otp_db.c index 127269d77..d93397291 100644 --- a/lib/otp/otp_db.c +++ b/lib/otp/otp_db.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/otp/otp_locl.h b/lib/otp/otp_locl.h index dc76fe79c..4d08add2a 100644 --- a/lib/otp/otp_locl.h +++ b/lib/otp/otp_locl.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/otp/otp_md.c b/lib/otp/otp_md.c index 46030d6e9..ab7128980 100644 --- a/lib/otp/otp_md.c +++ b/lib/otp/otp_md.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/otp/otp_md.h b/lib/otp/otp_md.h index c40ea3043..5d99508a0 100644 --- a/lib/otp/otp_md.h +++ b/lib/otp/otp_md.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/otp/otp_parse.c b/lib/otp/otp_parse.c index 67f61e6f5..6db5841c6 100644 --- a/lib/otp/otp_parse.c +++ b/lib/otp/otp_parse.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/otp/otp_print.c b/lib/otp/otp_print.c index e93de8409..0ed0d7b4a 100644 --- a/lib/otp/otp_print.c +++ b/lib/otp/otp_print.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/otp/otp_verify.c b/lib/otp/otp_verify.c index dc00f8b52..8a865102f 100644 --- a/lib/otp/otp_verify.c +++ b/lib/otp/otp_verify.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/roken/err.c b/lib/roken/err.c index 4169d3ccd..36aafe6ab 100644 --- a/lib/roken/err.c +++ b/lib/roken/err.c @@ -1,32 +1,27 @@ -/* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute - * of Technology, Stockholm, Sweden). - * All rights reserved. - * +/*- + * Copyright (c) 1993 + * The Regents of the University of California. All rights reserved. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. - * - * 4. Neither the name of the Institute nor the names of its contributors + * 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 * may be used to endorse or promote products derived from this software * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) diff --git a/lib/roken/err.h b/lib/roken/err.h index 627b01390..f84a16c0f 100644 --- a/lib/roken/err.h +++ b/lib/roken/err.h @@ -1,41 +1,3 @@ -/* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute - * of Technology, Stockholm, Sweden). - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. - * - * 4. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - /* $Id$ */ #ifndef __ERR_H__ diff --git a/lib/roken/err.hin b/lib/roken/err.hin index 627b01390..f84a16c0f 100644 --- a/lib/roken/err.hin +++ b/lib/roken/err.hin @@ -1,41 +1,3 @@ -/* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute - * of Technology, Stockholm, Sweden). - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. - * - * 4. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - /* $Id$ */ #ifndef __ERR_H__ diff --git a/lib/roken/errx.c b/lib/roken/errx.c index 98f1c5ea8..256833645 100644 --- a/lib/roken/errx.c +++ b/lib/roken/errx.c @@ -1,32 +1,27 @@ -/* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute - * of Technology, Stockholm, Sweden). - * All rights reserved. - * +/*- + * Copyright (c) 1993 + * The Regents of the University of California. All rights reserved. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. - * - * 4. Neither the name of the Institute nor the names of its contributors + * 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 * may be used to endorse or promote products derived from this software * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) diff --git a/lib/roken/getcwd.c b/lib/roken/getcwd.c index 3ad5979ec..281267a92 100644 --- a/lib/roken/getcwd.c +++ b/lib/roken/getcwd.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/roken/getdtablesize.c b/lib/roken/getdtablesize.c index 029016c15..ebe5d41db 100644 --- a/lib/roken/getdtablesize.c +++ b/lib/roken/getdtablesize.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/roken/gettimeofday.c b/lib/roken/gettimeofday.c index 00f218fde..163c073ae 100644 --- a/lib/roken/gettimeofday.c +++ b/lib/roken/gettimeofday.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/roken/hstrerror.c b/lib/roken/hstrerror.c index 214d24ace..0b3a25e54 100644 --- a/lib/roken/hstrerror.c +++ b/lib/roken/hstrerror.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/roken/inaddr2str.c b/lib/roken/inaddr2str.c index 803f65234..7075e5b9c 100644 --- a/lib/roken/inaddr2str.c +++ b/lib/roken/inaddr2str.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/roken/inet_aton.c b/lib/roken/inet_aton.c index fe72f916a..2a2003a62 100644 --- a/lib/roken/inet_aton.c +++ b/lib/roken/inet_aton.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/roken/k_getpwnam.c b/lib/roken/k_getpwnam.c index 30835183c..bc5d87a80 100644 --- a/lib/roken/k_getpwnam.c +++ b/lib/roken/k_getpwnam.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/roken/k_getpwuid.c b/lib/roken/k_getpwuid.c index bc98b0afe..bab49c501 100644 --- a/lib/roken/k_getpwuid.c +++ b/lib/roken/k_getpwuid.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/roken/memmove.c b/lib/roken/memmove.c index 6afaf11f4..bd07f8dbd 100644 --- a/lib/roken/memmove.c +++ b/lib/roken/memmove.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/roken/mini_inetd.c b/lib/roken/mini_inetd.c index 99b3f2d18..fee9f0d8b 100644 --- a/lib/roken/mini_inetd.c +++ b/lib/roken/mini_inetd.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software @@ -91,6 +91,6 @@ mini_inetd (int port) close(s); dup2(s2, STDIN_FILENO); dup2(s2, STDOUT_FILENO); - dup2(s2, STDERR_FILENO); + /* dup2(s2, STDERR_FILENO); */ close(s2); } diff --git a/lib/roken/putenv.c b/lib/roken/putenv.c index fd6b74cf9..ed6875b32 100644 --- a/lib/roken/putenv.c +++ b/lib/roken/putenv.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/roken/roken.h b/lib/roken/roken.h index 5b4f7ac6b..e52f53c7d 100644 --- a/lib/roken/roken.h +++ b/lib/roken/roken.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/roken/roken.h.in b/lib/roken/roken.h.in index 5b4f7ac6b..e52f53c7d 100644 --- a/lib/roken/roken.h.in +++ b/lib/roken/roken.h.in @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/roken/setegid.c b/lib/roken/setegid.c index d49c5cea6..92b64e113 100644 --- a/lib/roken/setegid.c +++ b/lib/roken/setegid.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/roken/setenv.c b/lib/roken/setenv.c index 1e99a7d1a..9cbc598d2 100644 --- a/lib/roken/setenv.c +++ b/lib/roken/setenv.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/roken/seteuid.c b/lib/roken/seteuid.c index e5f340422..e14458939 100644 --- a/lib/roken/seteuid.c +++ b/lib/roken/seteuid.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/roken/signal.c b/lib/roken/signal.c index 3292c47dc..b0060a98a 100644 --- a/lib/roken/signal.c +++ b/lib/roken/signal.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/roken/strdup.c b/lib/roken/strdup.c index ee77ca7d9..92c92ed4c 100644 --- a/lib/roken/strdup.c +++ b/lib/roken/strdup.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/roken/strerror.c b/lib/roken/strerror.c index 9be39dee5..9954aed98 100644 --- a/lib/roken/strerror.c +++ b/lib/roken/strerror.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/roken/strnlen.c b/lib/roken/strnlen.c index 564f1a6e5..3b93ad739 100644 --- a/lib/roken/strnlen.c +++ b/lib/roken/strnlen.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/roken/swab.c b/lib/roken/swab.c index c9af7349c..5b8c5fbf0 100644 --- a/lib/roken/swab.c +++ b/lib/roken/swab.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/roken/tm2time.c b/lib/roken/tm2time.c index 4c86be3da..0e91da0b2 100644 --- a/lib/roken/tm2time.c +++ b/lib/roken/tm2time.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/roken/unsetenv.c b/lib/roken/unsetenv.c index 7b8d2aaa4..f8fa1f681 100644 --- a/lib/roken/unsetenv.c +++ b/lib/roken/unsetenv.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/roken/verify.c b/lib/roken/verify.c index d36a2f30f..1d4f0739c 100644 --- a/lib/roken/verify.c +++ b/lib/roken/verify.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute + * Copyright (c) 1995, 1996 Kungliga Tekniska Högskolan (Royal Institute * of Technology, Stockholm, Sweden). * All rights reserved. * @@ -17,7 +17,7 @@ * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. + * Högskolan and its contributors. * * 4. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/lib/roken/verr.c b/lib/roken/verr.c index b82a3c626..141a1b93e 100644 --- a/lib/roken/verr.c +++ b/lib/roken/verr.c @@ -1,32 +1,27 @@ -/* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute - * of Technology, Stockholm, Sweden). - * All rights reserved. - * +/*- + * Copyright (c) 1993 + * The Regents of the University of California. All rights reserved. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. - * - * 4. Neither the name of the Institute nor the names of its contributors + * 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 * may be used to endorse or promote products derived from this software * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) diff --git a/lib/roken/verrx.c b/lib/roken/verrx.c index 167be81d9..9d163779f 100644 --- a/lib/roken/verrx.c +++ b/lib/roken/verrx.c @@ -1,32 +1,27 @@ -/* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute - * of Technology, Stockholm, Sweden). - * All rights reserved. - * +/*- + * Copyright (c) 1993 + * The Regents of the University of California. All rights reserved. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. - * - * 4. Neither the name of the Institute nor the names of its contributors + * 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 * may be used to endorse or promote products derived from this software * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) diff --git a/lib/roken/vwarn.c b/lib/roken/vwarn.c index 6fb9d2269..10f3e1b4c 100644 --- a/lib/roken/vwarn.c +++ b/lib/roken/vwarn.c @@ -1,32 +1,27 @@ -/* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute - * of Technology, Stockholm, Sweden). - * All rights reserved. - * +/*- + * Copyright (c) 1993 + * The Regents of the University of California. All rights reserved. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. - * - * 4. Neither the name of the Institute nor the names of its contributors + * 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 * may be used to endorse or promote products derived from this software * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) diff --git a/lib/roken/vwarnx.c b/lib/roken/vwarnx.c index de5ae89dd..9b596e83f 100644 --- a/lib/roken/vwarnx.c +++ b/lib/roken/vwarnx.c @@ -1,32 +1,27 @@ -/* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute - * of Technology, Stockholm, Sweden). - * All rights reserved. - * +/*- + * Copyright (c) 1993 + * The Regents of the University of California. All rights reserved. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. - * - * 4. Neither the name of the Institute nor the names of its contributors + * 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 * may be used to endorse or promote products derived from this software * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) diff --git a/lib/roken/warn.c b/lib/roken/warn.c index c6c03815e..d5be33052 100644 --- a/lib/roken/warn.c +++ b/lib/roken/warn.c @@ -1,32 +1,27 @@ -/* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute - * of Technology, Stockholm, Sweden). - * All rights reserved. - * +/*- + * Copyright (c) 1993 + * The Regents of the University of California. All rights reserved. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. - * - * 4. Neither the name of the Institute nor the names of its contributors + * 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 * may be used to endorse or promote products derived from this software * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) diff --git a/lib/roken/warnx.c b/lib/roken/warnx.c index 8e6dcc982..ae33ba00f 100644 --- a/lib/roken/warnx.c +++ b/lib/roken/warnx.c @@ -1,32 +1,27 @@ -/* - * Copyright (c) 1995, 1996 Kungliga Tekniska Hoegskolan (Royal Institute - * of Technology, Stockholm, Sweden). - * All rights reserved. - * +/*- + * Copyright (c) 1993 + * The Regents of the University of California. All rights reserved. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the Kungliga Tekniska - * Hoegskolan and its contributors. - * - * 4. Neither the name of the Institute nor the names of its contributors + * 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 * may be used to endorse or promote products derived from this software * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)