summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE158
-rw-r--r--Makefile.am2
-rw-r--r--client/file.c2
-rw-r--r--client/internal.h2
-rw-r--r--client/keytab.c2
-rw-r--r--client/remctl.c2
-rw-r--r--client/srvtab.c2
-rw-r--r--client/wallet.c2
-rw-r--r--configure.ac4
-rw-r--r--kasetkey/kasetkey.c2
-rw-r--r--m4/snprintf.m42
-rw-r--r--m4/vamacros.m42
-rw-r--r--perl/Wallet/ACL.pm2
-rw-r--r--perl/Wallet/ACL/Base.pm2
-rw-r--r--perl/Wallet/ACL/Krb5.pm2
-rw-r--r--perl/Wallet/Config.pm2
-rw-r--r--perl/Wallet/Object/Base.pm2
-rw-r--r--perl/Wallet/Object/Keytab.pm2
-rw-r--r--perl/Wallet/Schema.pm2
-rw-r--r--perl/Wallet/Server.pm2
-rwxr-xr-xperl/t/acl.t5
-rwxr-xr-xperl/t/init.t5
-rwxr-xr-xperl/t/keytab.t5
-rwxr-xr-xperl/t/object.t5
-rwxr-xr-xperl/t/pod.t5
-rwxr-xr-xperl/t/schema.t5
-rwxr-xr-xperl/t/server.t5
-rwxr-xr-xperl/t/verifier.t5
-rwxr-xr-xserver/keytab-backend32
-rwxr-xr-xserver/wallet-backend2
-rw-r--r--system.h5
-rw-r--r--tests/client/basic-t.in2
-rwxr-xr-xtests/data/cmd-fake4
-rwxr-xr-xtests/data/fake-kadmin4
-rw-r--r--tests/libtest.c2
-rw-r--r--tests/libtest.h20
-rw-r--r--tests/portable/asprintf-t.c2
-rw-r--r--tests/server/backend-t.in6
-rw-r--r--tests/server/keytab-t.in6
-rw-r--r--tests/util/xmalloc-t.in20
-rw-r--r--util/util.h15
41 files changed, 300 insertions, 58 deletions
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..b894818
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,158 @@
+The wallet package as a whole is:
+
+ Copyright 2006, 2007 Board of Trustees, Leland Stanford Jr. University.
+ All rights reserved.
+
+and covered under the following license:
+
+ Permission to use, copy, modify, and distribute this software and its
+ documentation for any purpose and without fee is hereby granted,
+ provided that the above copyright notice appear in all copies and that
+ both that copyright notice and this permission notice appear in
+ supporting documentation, and that the name of Stanford University not
+ be used in advertising or publicity pertaining to distribution of the
+ software without specific, written prior permission. Stanford
+ University makes no representations about the suitability of this
+ software for any purpose. It is provided "as is" without express or
+ implied warranty.
+
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+All individual files with no other license statement are covered under
+this license. Some files have additional copyright dates from earlier
+releases or may be owned by other copyright holders as noted in those
+files.
+
+Collected copyright notices for the entire package:
+
+ Copyright 1994, 1998, 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007
+ Board of Trustees, Leland Stanford Jr. University.
+ Copyright 2000, 2001, 2004 Russ Allbery <rra@stanford.edu>
+ Copyright 2004, 2005, 2006
+ by Internet Systems Consortium, Inc. ("ISC")
+ Copyright 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+ 2002, 2003 by The Internet Software Consortium and Rich Salz
+ Copyright 1995 Patrick Powell
+ Copyright 1996, 1997 Brandon Long <blong@fiction.net>
+ Copyright 1998 Thomas Roessler <roessler@guug.de>
+ Copyright 1998 Michael Elkins <me@cs.hmc.edu>
+ Copyright 1998 Andrew Tridgell <tridge@samba.org>
+ Copyright 2000, 2005 Hrvoje Niksic <hniksic@xemacs.org>
+ Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ Copyright 1994 X Consortium
+
+The file portable/snprintf.c is covered by the following license:
+
+ This code is based on code written by Patrick Powell (papowell@astart.com)
+ It may be used for any purpose as long as this notice remains intact
+ on all source code distributions
+
+The files portable/asprintf.c, portable/dummy.c and util/concat.c have
+been placed in the public domain by their author.
+
+The files tests/libtest.c, tests/libtest.h, tests/portable/snprintf-t.c,
+tests/util/concat-t.c, tests/util/messages-t.c, tests/util/xmalloc-t,
+and tests/util/xmalloc.c are covered by the following copyright and
+license:
+
+ Copyright (c) 2004, 2005, 2006
+ by Internet Systems Consortium, Inc. ("ISC")
+ Copyright (c) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+ 2002, 2003 by The Internet Software Consortium and Rich Salz
+
+ This code is derived from software contributed to the Internet Software
+ Consortium by Rich Salz.
+
+ 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 ISC DISCLAIMS ALL WARRANTIES WITH
+ REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC 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.
+
+The files Makefile.in and aclocal.m4 are generated by GNU Automake and
+covered by the following copyright and license:
+
+ Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+ 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ This file is free software; the Free Software Foundation
+ gives unlimited permission to copy and/or distribute it,
+ with or without modifications, as long as this notice is preserved.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE.
+
+The file configure is generated by GNU Autoconf and is covered by the
+following copyright and license:
+
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+
+The files tools/compile, tools/depcomp, and tools/missing are taken from
+GNU Automake and are covered by the following copyright and license:
+
+ Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+ Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 2, or (at your option) any
+ later version.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ As a special exception to the GNU General Public License, if you
+ distribute this file as part of a program that contains a configuration
+ script generated by Autoconf, you may include it under the same
+ distribution terms that you use for the rest of that program.
+
+For the wallet distribution, the option described in the last paragraph
+has been accepted and these files are distributed under the same terms as
+the wallet package as a whole, as described at the top of this file.
+
+The file tools/install-sh is covered by the following copyright and
+license:
+
+ Copyright (C) 1994 X Consortium
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+
+ Except as contained in this notice, the name of the X Consortium shall
+ not be used in advertising or otherwise to promote the sale, use or
+ other dealings in this Software without prior written authorization
+ from the X Consortium.
diff --git a/Makefile.am b/Makefile.am
index 2c9f032..67a1cb5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
#
# Written by Russ Allbery <rra@stanford.edu>
# Copyright 2006, 2007 Board of Trustees, Leland Stanford Jr. University
-# See README for licensing terms.
+# See LICENSE for licensing terms.
AUTOMAKE_OPTIONS = foreign subdir-objects
ACLOCAL_AMFLAGS = -I m4
diff --git a/client/file.c b/client/file.c
index 621b49d..5002d01 100644
--- a/client/file.c
+++ b/client/file.c
@@ -5,7 +5,7 @@
** Written by Russ Allbery <rra@stanford.edu>
** Copyright 2007 Board of Trustees, Leland Stanford Jr. University
**
-** See README for licensing terms.
+** See LICENSE for licensing terms.
*/
#include <config.h>
diff --git a/client/internal.h b/client/internal.h
index 7980fef..a32ed23 100644
--- a/client/internal.h
+++ b/client/internal.h
@@ -5,7 +5,7 @@
** Written by Russ Allbery <rra@stanford.edu>
** Copyright 2007 Board of Trustees, Leland Stanford Jr. University
**
-** See README for licensing terms.
+** See LICENSE for licensing terms.
*/
#ifndef CLIENT_INTERNAL_H
diff --git a/client/keytab.c b/client/keytab.c
index 02533f8..1137c45 100644
--- a/client/keytab.c
+++ b/client/keytab.c
@@ -5,7 +5,7 @@
** Written by Russ Allbery <rra@stanford.edu>
** Copyright 2007 Board of Trustees, Leland Stanford Jr. University
**
-** See README for licensing terms.
+** See LICENSE for licensing terms.
*/
#include <config.h>
diff --git a/client/remctl.c b/client/remctl.c
index 089d7f4..6d80bf2 100644
--- a/client/remctl.c
+++ b/client/remctl.c
@@ -5,7 +5,7 @@
** Written by Russ Allbery <rra@stanford.edu>
** Copyright 2007 Board of Trustees, Leland Stanford Jr. University
**
-** See README for licensing terms.
+** See LICENSE for licensing terms.
*/
#include <config.h>
diff --git a/client/srvtab.c b/client/srvtab.c
index e6b9e0d..dd1cd58 100644
--- a/client/srvtab.c
+++ b/client/srvtab.c
@@ -5,7 +5,7 @@
** Written by Russ Allbery <rra@stanford.edu>
** Copyright 2007 Board of Trustees, Leland Stanford Jr. University
**
-** See README for licensing terms.
+** See LICENSE for licensing terms.
*/
#include <config.h>
diff --git a/client/wallet.c b/client/wallet.c
index 9aa2cee..4a99794 100644
--- a/client/wallet.c
+++ b/client/wallet.c
@@ -5,7 +5,7 @@
** Written by Russ Allbery <rra@stanford.edu>
** Copyright 2006, 2007 Board of Trustees, Leland Stanford Jr. University
**
-** See README for licensing terms.
+** See LICENSE for licensing terms.
*/
#include <config.h>
diff --git a/configure.ac b/configure.ac
index 1df3b21..b5b27e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,9 +2,9 @@ dnl Process this file with Autoconf to produce a configure script.
dnl $Id$
dnl
dnl Written by Russ Allbery <rra@stanford.edu>
-dnl Copyright 2006 Board of Trustees, Leland Stanford Jr. University
+dnl Copyright 2006, 2007 Board of Trustees, Leland Stanford Jr. University
dnl
-dnl See README for licensing terms.
+dnl See LICENSE for licensing terms.
AC_REVISION([$Revision$])
AC_PREREQ([2.61])
diff --git a/kasetkey/kasetkey.c b/kasetkey/kasetkey.c
index 945d5a9..19c1ffd 100644
--- a/kasetkey/kasetkey.c
+++ b/kasetkey/kasetkey.c
@@ -8,6 +8,8 @@
** Copyright 1994, 1998, 1999, 2000, 2006, 2007
** Board of Trustees, Leland Stanford Jr. University
**
+** See LICENSE for licensing terms.
+**
** Sets the key of a principal in the AFS kaserver given a srvtab. This
** program is now used for synchronization of K5 and K4 and nothing else.
** It will no longer be used once K4 is retired.
diff --git a/m4/snprintf.m4 b/m4/snprintf.m4
index a09833f..335a937 100644
--- a/m4/snprintf.m4
+++ b/m4/snprintf.m4
@@ -12,7 +12,7 @@ dnl fully working snprintf is found.
dnl
dnl Written by Russ Allbery <rra@stanford.edu>
dnl Copyright 2006 Board of Trustees, Leland Stanford Jr. University
-dnl See README for licensing terms.
+dnl See LICENSE for licensing terms.
dnl Source used by RRA_FUNC_SNPRINTF.
define([_RRA_FUNC_SNPRINTF_SOURCE],
diff --git a/m4/vamacros.m4 b/m4/vamacros.m4
index 1dd0f9f..c343d9f 100644
--- a/m4/vamacros.m4
+++ b/m4/vamacros.m4
@@ -16,7 +16,7 @@ dnl They set HAVE_C99_VAMACROS or HAVE_GNU_VAMACROS as appropriate.
dnl
dnl Written by Russ Allbery <rra@stanford.edu>
dnl Copyright 2006 Board of Trustees, Leland Stanford Jr. University
-dnl See README for licensing terms.
+dnl See LICENSE for licensing terms.
AC_DEFUN([RRA_C_C99_VAMACROS],
[AC_CACHE_CHECK([for C99 variadic macros], [rra_cv_c_c99_vamacros],
diff --git a/perl/Wallet/ACL.pm b/perl/Wallet/ACL.pm
index 4a9bd88..a5ea6f3 100644
--- a/perl/Wallet/ACL.pm
+++ b/perl/Wallet/ACL.pm
@@ -4,7 +4,7 @@
# Written by Russ Allbery <rra@stanford.edu>
# Copyright 2007 Board of Trustees, Leland Stanford Jr. University
#
-# See README for licensing terms.
+# See LICENSE for licensing terms.
##############################################################################
# Modules and declarations
diff --git a/perl/Wallet/ACL/Base.pm b/perl/Wallet/ACL/Base.pm
index a03086d..87df824 100644
--- a/perl/Wallet/ACL/Base.pm
+++ b/perl/Wallet/ACL/Base.pm
@@ -4,7 +4,7 @@
# Written by Russ Allbery <rra@stanford.edu>
# Copyright 2007 Board of Trustees, Leland Stanford Jr. University
#
-# See README for licensing terms.
+# See LICENSE for licensing terms.
##############################################################################
# Modules and declarations
diff --git a/perl/Wallet/ACL/Krb5.pm b/perl/Wallet/ACL/Krb5.pm
index eab0c28..8c0610b 100644
--- a/perl/Wallet/ACL/Krb5.pm
+++ b/perl/Wallet/ACL/Krb5.pm
@@ -4,7 +4,7 @@
# Written by Russ Allbery <rra@stanford.edu>
# Copyright 2007 Board of Trustees, Leland Stanford Jr. University
#
-# See README for licensing terms.
+# See LICENSE for licensing terms.
##############################################################################
# Modules and declarations
diff --git a/perl/Wallet/Config.pm b/perl/Wallet/Config.pm
index 0c22d2b..1b36658 100644
--- a/perl/Wallet/Config.pm
+++ b/perl/Wallet/Config.pm
@@ -4,7 +4,7 @@
# Written by Russ Allbery <rra@stanford.edu>
# Copyright 2007 Board of Trustees, Leland Stanford Jr. University
#
-# See README for licensing terms.
+# See LICENSE for licensing terms.
package Wallet::Config;
require 5.006;
diff --git a/perl/Wallet/Object/Base.pm b/perl/Wallet/Object/Base.pm
index 478382e..527a146 100644
--- a/perl/Wallet/Object/Base.pm
+++ b/perl/Wallet/Object/Base.pm
@@ -4,7 +4,7 @@
# Written by Russ Allbery <rra@stanford.edu>
# Copyright 2007 Board of Trustees, Leland Stanford Jr. University
#
-# See README for licensing terms.
+# See LICENSE for licensing terms.
##############################################################################
# Modules and declarations
diff --git a/perl/Wallet/Object/Keytab.pm b/perl/Wallet/Object/Keytab.pm
index 4ae7818..34f580f 100644
--- a/perl/Wallet/Object/Keytab.pm
+++ b/perl/Wallet/Object/Keytab.pm
@@ -4,7 +4,7 @@
# Written by Russ Allbery <rra@stanford.edu>
# Copyright 2007 Board of Trustees, Leland Stanford Jr. University
#
-# See README for licensing terms.
+# See LICENSE for licensing terms.
##############################################################################
# Modules and declarations
diff --git a/perl/Wallet/Schema.pm b/perl/Wallet/Schema.pm
index 352f497..46a5ef7 100644
--- a/perl/Wallet/Schema.pm
+++ b/perl/Wallet/Schema.pm
@@ -4,7 +4,7 @@
# Written by Russ Allbery <rra@stanford.edu>
# Copyright 2007 Board of Trustees, Leland Stanford Jr. University
#
-# See README for licensing terms.
+# See LICENSE for licensing terms.
##############################################################################
# Modules and declarations
diff --git a/perl/Wallet/Server.pm b/perl/Wallet/Server.pm
index 138a576..172cdf1 100644
--- a/perl/Wallet/Server.pm
+++ b/perl/Wallet/Server.pm
@@ -4,7 +4,7 @@
# Written by Russ Allbery <rra@stanford.edu>
# Copyright 2007 Board of Trustees, Leland Stanford Jr. University
#
-# See README for licensing terms.
+# See LICENSE for licensing terms.
##############################################################################
# Modules and declarations
diff --git a/perl/t/acl.t b/perl/t/acl.t
index a3a9214..644ea3e 100755
--- a/perl/t/acl.t
+++ b/perl/t/acl.t
@@ -2,6 +2,11 @@
# $Id$
#
# t/api.t -- Tests for the wallet ACL API.
+#
+# Written by Russ Allbery <rra@stanford.edu>
+# Copyright 2007 Board of Trustees, Leland Stanford Jr. University
+#
+# See LICENSE for licensing terms.
use Test::More tests => 100;
diff --git a/perl/t/init.t b/perl/t/init.t
index 3f447d0..3fa026f 100755
--- a/perl/t/init.t
+++ b/perl/t/init.t
@@ -2,6 +2,11 @@
# $Id$
#
# t/init.t -- Tests for database initialization.
+#
+# Written by Russ Allbery <rra@stanford.edu>
+# Copyright 2007 Board of Trustees, Leland Stanford Jr. University
+#
+# See LICENSE for licensing terms.
use Test::More tests => 8;
diff --git a/perl/t/keytab.t b/perl/t/keytab.t
index c419806..abe7bf5 100755
--- a/perl/t/keytab.t
+++ b/perl/t/keytab.t
@@ -2,6 +2,11 @@
# $Id$
#
# t/keytab.t -- Tests for the keytab object implementation.
+#
+# Written by Russ Allbery <rra@stanford.edu>
+# Copyright 2007 Board of Trustees, Leland Stanford Jr. University
+#
+# See LICENSE for licensing terms.
use Test::More tests => 160;
diff --git a/perl/t/object.t b/perl/t/object.t
index a69101e..e2ae5ca 100755
--- a/perl/t/object.t
+++ b/perl/t/object.t
@@ -2,6 +2,11 @@
# $Id$
#
# t/object.t -- Tests for the basic object implementation.
+#
+# Written by Russ Allbery <rra@stanford.edu>
+# Copyright 2007 Board of Trustees, Leland Stanford Jr. University
+#
+# See LICENSE for licensing terms.
use Test::More tests => 129;
diff --git a/perl/t/pod.t b/perl/t/pod.t
index 8fe30cc..da4d0d3 100755
--- a/perl/t/pod.t
+++ b/perl/t/pod.t
@@ -2,6 +2,11 @@
# $Id$
#
# t/pod.t -- Test POD formatting for the wallet Perl modules.
+#
+# Written by Russ Allbery <rra@stanford.edu>
+# Copyright 2007 Board of Trustees, Leland Stanford Jr. University
+#
+# See LICENSE for licensing terms.
eval 'use Test::Pod 1.00';
if ($@) {
diff --git a/perl/t/schema.t b/perl/t/schema.t
index 02993ae..01b2b88 100755
--- a/perl/t/schema.t
+++ b/perl/t/schema.t
@@ -2,6 +2,11 @@
# $Id$
#
# t/schema.t -- Tests for the wallet schema class.
+#
+# Written by Russ Allbery <rra@stanford.edu>
+# Copyright 2007 Board of Trustees, Leland Stanford Jr. University
+#
+# See LICENSE for licensing terms.
use Test::More tests => 5;
diff --git a/perl/t/server.t b/perl/t/server.t
index 3da5461..f2c6dc5 100755
--- a/perl/t/server.t
+++ b/perl/t/server.t
@@ -2,6 +2,11 @@
# $Id$
#
# t/server.t -- Tests for the wallet server API.
+#
+# Written by Russ Allbery <rra@stanford.edu>
+# Copyright 2007 Board of Trustees, Leland Stanford Jr. University
+#
+# See LICENSE for licensing terms.
use Test::More tests => 286;
diff --git a/perl/t/verifier.t b/perl/t/verifier.t
index 79bb16b..713c495 100755
--- a/perl/t/verifier.t
+++ b/perl/t/verifier.t
@@ -2,6 +2,11 @@
# $Id$
#
# t/verifier.t -- Tests for the basic wallet ACL verifiers.
+#
+# Written by Russ Allbery <rra@stanford.edu>
+# Copyright 2007 Board of Trustees, Leland Stanford Jr. University
+#
+# See LICENSE for licensing terms.
use Test::More tests => 13;
diff --git a/server/keytab-backend b/server/keytab-backend
index 86dece6..87868d5 100755
--- a/server/keytab-backend
+++ b/server/keytab-backend
@@ -20,19 +20,7 @@ our $ID = q$Id$;
# Written by Russ Allbery <rra@stanford.edu>
# Copyright 2006, 2007 Board of Trustees, Leland Stanford Jr. University
#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose and without fee is hereby granted, provided
-# that the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of Stanford University not be used in
-# advertising or publicity pertaining to distribution of the software without
-# specific, written prior permission. Stanford University makes no
-# representations about the suitability of this software for any purpose. It
-# is provided "as is" without express or implied warranty.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+# See LICENSE for licensing terms.
##############################################################################
# Declarations and site configuration
@@ -211,22 +199,4 @@ from L<http://www.eyrie.org/~eagle/software/wallet/>.
Russ Allbery <rra@stanford.edu>
-=head1 COPYRIGHT AND LICENSE
-
-Copyright 2006, 2007 Board of Trustees, Leland Stanford Jr. University
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted, provided
-that the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Stanford University not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. Stanford University makes no
-representations about the suitability of this software for any purpose. It
-is provided "as is" without express or implied warranty.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
=cut
diff --git a/server/wallet-backend b/server/wallet-backend
index b6c0dfb..c3e43ed 100755
--- a/server/wallet-backend
+++ b/server/wallet-backend
@@ -6,7 +6,7 @@ our $ID = q$Id$;
# Written by Russ Allbery <rra@stanford.edu>
# Copyright 2007 Board of Trustees, Leland Stanford Jr. University
#
-# See README for licensing terms.
+# See LICENSE for licensing terms.
##############################################################################
# Declarations and site configuration
diff --git a/system.h b/system.h
index 064fecb..cbe555f 100644
--- a/system.h
+++ b/system.h
@@ -14,6 +14,11 @@
**
** Missing functions are provided via #define or prototyped if available from
** the util helper library. Also provides some standard #defines.
+**
+** Written by Russ Allbery <rra@stanford.edu>
+** Copyright 2006, 2007 Board of Trustees, Leland Stanford Jr. University
+**
+** See LICENSE for licensing terms.
*/
#ifndef SYSTEM_H
diff --git a/tests/client/basic-t.in b/tests/client/basic-t.in
index 2a19b46..4d9b796 100644
--- a/tests/client/basic-t.in
+++ b/tests/client/basic-t.in
@@ -5,7 +5,7 @@
#
# Written by Russ Allbery <rra@stanford.edu>
# Copyright 2006, 2007 Board of Trustees, Leland Stanford Jr. University
-# See README for licensing terms.
+# See LICENSE for licensing terms.
# The count starts at 1 and is updated each time ok is printed. printcount
# takes "ok" or "not ok".
diff --git a/tests/data/cmd-fake b/tests/data/cmd-fake
index 7cde65e..4e95bd8 100755
--- a/tests/data/cmd-fake
+++ b/tests/data/cmd-fake
@@ -3,6 +3,10 @@
#
# This is a fake wallet backend that returns bogus data for verification by
# the client test suite. It doesn't test any of the wallet server code.
+#
+# Written by Russ Allbery <rra@stanford.edu>
+# Copyright 2007 Board of Trustees, Leland Stanford Jr. University
+# See LICENSE for licensing terms.
command="$1"
shift
diff --git a/tests/data/fake-kadmin b/tests/data/fake-kadmin
index e1e1892..039d8b2 100755
--- a/tests/data/fake-kadmin
+++ b/tests/data/fake-kadmin
@@ -2,6 +2,10 @@
# $Id$
#
# fake-kadmin -- Fake kadmin.local used to test the keytab backend.
+#
+# Written by Russ Allbery <rra@stanford.edu>
+# Copyright 2007 Board of Trustees, Leland Stanford Jr. University
+# See LICENSE for licensing terms.
unless ($ARGV[0] eq '-q' && @ARGV == 2) {
die "invalid arguments\n";
diff --git a/tests/libtest.c b/tests/libtest.c
index 727fc81..10e6024 100644
--- a/tests/libtest.c
+++ b/tests/libtest.c
@@ -9,8 +9,6 @@
** test number. Other utility routines help in constructing more complex
** tests.
**
-** Copyright 2006
-** Board of Trustees, Leland Stanford Jr. University
** Copyright (c) 2004, 2005, 2006
** by Internet Systems Consortium, Inc. ("ISC")
** Copyright (c) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
diff --git a/tests/libtest.h b/tests/libtest.h
index aedbaa6..7c4aca7 100644
--- a/tests/libtest.h
+++ b/tests/libtest.h
@@ -1,6 +1,26 @@
/* $Id$
**
** Some utility routines for writing tests.
+**
+** Copyright (c) 2004, 2005, 2006
+** by Internet Systems Consortium, Inc. ("ISC")
+** Copyright (c) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+** 2002, 2003 by The Internet Software Consortium and Rich Salz
+**
+** This code is derived from software contributed to the Internet Software
+** Consortium by Rich Salz.
+**
+** 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 ISC DISCLAIMS ALL WARRANTIES WITH
+** REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+** MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC 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.
*/
#ifndef LIBTEST_H
diff --git a/tests/portable/asprintf-t.c b/tests/portable/asprintf-t.c
index a362755..a79c7f4 100644
--- a/tests/portable/asprintf-t.c
+++ b/tests/portable/asprintf-t.c
@@ -3,7 +3,7 @@
/* Written by Russ Allbery <rra@stanford.edu>
Copyright 2006 Board of Trustees, Leland Stanford Jr. University
- See README for licensing terms. */
+ See LICENSE for licensing terms. */
#include <config.h>
#include <system.h>
diff --git a/tests/server/backend-t.in b/tests/server/backend-t.in
index c844d5e..e8558f5 100644
--- a/tests/server/backend-t.in
+++ b/tests/server/backend-t.in
@@ -1,7 +1,11 @@
#!/usr/bin/perl -w
# $Id$
#
-# t/backend.t -- Tests for the wallet-backend dispatch code.
+# Tests for the wallet-backend dispatch code.
+#
+# Written by Russ Allbery <rra@stanford.edu>
+# Copyright 2006, 2007 Board of Trustees, Leland Stanford Jr. University
+# See LICENSE for licensing terms.
use strict;
use IO::String;
diff --git a/tests/server/keytab-t.in b/tests/server/keytab-t.in
index 4a8be77..30229e8 100644
--- a/tests/server/keytab-t.in
+++ b/tests/server/keytab-t.in
@@ -1,7 +1,11 @@
#!/usr/bin/perl -w
# $Id: backend-t.in 3547 2007-09-14 23:18:48Z rra $
#
-# t/keytab.t -- Tests for the keytab-backend dispatch code.
+# Tests for the keytab-backend dispatch code.
+#
+# Written by Russ Allbery <rra@stanford.edu>
+# Copyright 2006, 2007 Board of Trustees, Leland Stanford Jr. University
+# See LICENSE for licensing terms.
use strict;
use vars qw($CONFIG $KADMIN $SYSLOG $TMP);
diff --git a/tests/util/xmalloc-t.in b/tests/util/xmalloc-t.in
index e4e971d..504bbaa 100644
--- a/tests/util/xmalloc-t.in
+++ b/tests/util/xmalloc-t.in
@@ -2,6 +2,26 @@
# $Id$
#
# Test suite for xmalloc and friends.
+#
+# Copyright (c) 2004, 2005, 2006
+# by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (c) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+# 2002, 2003 by The Internet Software Consortium and Rich Salz
+#
+# This code is derived from software contributed to the Internet Software
+# Consortium by Rich Salz.
+#
+# 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 ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS. IN NO EVENT SHALL ISC 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.
# The count starts at 1 and is updated each time ok is printed. printcount
# takes "ok" or "not ok".
diff --git a/util/util.h b/util/util.h
index 386bdd5..7fc4c96 100644
--- a/util/util.h
+++ b/util/util.h
@@ -13,7 +13,20 @@
** Copyright (c) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
** 2002, 2003 by The Internet Software Consortium and Rich Salz
**
-** See README for licensing terms.
+** This code is derived from software contributed to the Internet Software
+** Consortium by Rich Salz.
+**
+** 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 ISC DISCLAIMS ALL WARRANTIES WITH
+** REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+** MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC 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.
*/
#ifndef UTIL_UTIL_H