new joint ISC/BSDI copyright message as requested by

Paul Borman <prb@bsdi.com>
This commit is contained in:
Andreas Gustafsson
2000-07-03 17:44:22 +00:00
parent 6f21eab314
commit 855bda3de3
4 changed files with 36 additions and 19 deletions

View File

@@ -1,28 +1,26 @@
/*
* Portions Copyright (C) 1999, 2000 Internet Software Consortium.
* Copyright (C) 1999, 2000 Internet Software Consortium.
*
* This code is derived from software contributed to Internet Software
* Consortium by Berkeley Software Design, Inc.
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
* ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
* CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
* PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
* SOFTWARE.
*/
/*-
* Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
* The Berkeley Software Design Inc. software License Agreement specifies
* the terms and conditions for redistribution.
*
* BSDI $Id: getaddrinfo.c,v 1.27 2000/06/27 00:41:13 bwelling Exp $
* THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM AND
* BERKELEY SOFTWARE DESIGN, INC DISCLAIM ALL WARRANTIES WITH REGARD TO
* THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE CONSORTIUM OR BERKELEY
* SOFTWARE DESIGN, INC BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
* USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: getaddrinfo.c,v 1.28 2000/07/03 17:38:43 gson Exp $ */
#include <config.h>
#include <sys/types.h>

18
util/COPYRIGHT.BSDI Normal file
View File

@@ -0,0 +1,18 @@
Copyright (C) @YEARS@ Internet Software Consortium.
This code is derived from software contributed to Internet Software
Consortium by Berkeley Software Design, Inc.
Permission to use, copy, modify, and distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM AND
BERKELEY SOFTWARE DESIGN, INC DISCLAIM ALL WARRANTIES WITH REGARD TO
THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE CONSORTIUM OR BERKELEY
SOFTWARE DESIGN, INC BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR
CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.

View File

@@ -1156,7 +1156,7 @@
./lib/lwres/context.c C 2000
./lib/lwres/context_p.h C 2000
./lib/lwres/gai_strerror.c C 2000
./lib/lwres/getaddrinfo.c C.PORTION 1999,2000
./lib/lwres/getaddrinfo.c C.BSDI 1999,2000
./lib/lwres/gethost.c C 2000
./lib/lwres/getipnode.c C 1999,2000
./lib/lwres/getnameinfo.c C.PORTION 1999,2000

View File

@@ -15,7 +15,7 @@
# ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
# SOFTWARE.
# $Id: update_copyrights,v 1.15 2000/06/28 19:26:53 tale Exp $
# $Id: update_copyrights,v 1.16 2000/07/03 17:39:23 gson Exp $
require 5.002;
@@ -26,6 +26,7 @@ require 5.002;
my %owner2filename = (
"" => "util/COPYRIGHT",
"NAI" => "util/COPYRIGHT.NAI",
"BSDI" => "util/COPYRIGHT.BSDI",
"BRIEF" => "util/COPYRIGHT.BRIEF",
"PORTION" => "util/COPYRIGHT.PORTION",
);