diff --git a/util/COPYRIGHT.NAI b/util/COPYRIGHT.NAI new file mode 100644 index 0000000000..6ed86f5751 --- /dev/null +++ b/util/COPYRIGHT.NAI @@ -0,0 +1,15 @@ +Portions Copyright (C) 1999, 2000 Internet Software Consortium. + +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 +NETWORK ASSOCIATES DISCLAIM ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE CONSORTIUM OR NETWORK +ASSOCIATES 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. diff --git a/util/copyrights b/util/copyrights index 0d83f42cbf..ef555e32ef 100644 --- a/util/copyrights +++ b/util/copyrights @@ -562,8 +562,16 @@ ./lib/dns/sec/dnssafe/Makefile.in MAKE 1998,1999,2000 ./lib/dns/sec/dst/.cvsignore X 1999,2000 ./lib/dns/sec/dst/Makefile.in MAKE 1998,1999,2000 +./lib/dns/sec/dst/bsafe_lin.c C.NAI 1999,2000 +./lib/dns/sec/dst/dst_api.c C.NAI 1999,2000 +./lib/dns/sec/dst/dst_parse.c C.NAI 1999,2000 ./lib/dns/sec/dst/dst_lib.c C 1999,2000 +./lib/dns/sec/dst/dst_support.c C.NAI 1999,2000 ./lib/dns/sec/dst/dst_result.c C 1999,2000 +./lib/dns/sec/dst/hmac_link.c C.NAI 1999,2000 +./lib/dns/sec/dst/openssl_link.c C.NAI 1999,2000 +./lib/dns/sec/dst/openssldh_link.c C.NAI 1999,2000 +./lib/dns/sec/dst/opensslmd5_link.c C.NAI 1999,2000 ./lib/dns/sec/dst/include/.cvsignore X 2000 ./lib/dns/sec/dst/include/Makefile.in MAKE 1998,1999,2000 ./lib/dns/sec/dst/include/dst/.cvsignore X 2000 diff --git a/util/update_copyrights b/util/update_copyrights index eb456fc250..b3dd6c0b09 100644 --- a/util/update_copyrights +++ b/util/update_copyrights @@ -31,10 +31,14 @@ while (<>) { print "$file: missing\n"; next; } - if ($type eq "X") { - if ( ! -f $file ) { - print "$file: type X, but missing\n"; - } + + next if $type eq "X"; + + if ($type =~ /\.NAI$/) { + # XXX Not handled yet; co-copyrighted with Network Associates. + # lib/isc/commandline.c should probably also have special handling. + print "$file: co-copyrighted with Network Associates; ", + "update manually\n"; next; }