Merge tag 'upstream/1.0' into debian

Upstream version 1.0

1 files changed, 29 insertions, 12 deletions

diff --git a/server/keytab-backend b/server/keytab-backend
index 7b6adb4..b0116c7 100755
--- a/server/keytab-backend
+++ b/server/keytab-backend
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# keytab-backend -- Extract keytabs from the KDC without changing the key.
+# Extract keytabs from the KDC without changing the key.
 #
 # This is a remctl backend that extracts existing keys from a KDC database
 # using kadmin.local.  It requires a patched version of kadmin.local that
@@ -15,12 +15,6 @@
 # do any additional authorization checks itself.
 #
 # The keytab for the extracted principal will be printed to standard output.
-#
-# Written by Russ Allbery <rra@stanford.edu>
-# Copyright 2006, 2007, 2008, 2010
-#     Board of Trustees, Leland Stanford Jr. University
-#
-# See LICENSE for licensing terms.
 
 ##############################################################################
 # Declarations and site configuration
@@ -158,7 +152,7 @@ __END__
 
 =for stopwords
 keytab-backend keytabs KDC keytab kadmin.local -norandkey ktadd remctld
-auth Allbery rekeying
+auth Allbery rekeying MERCHANTABILITY NONINFRINGEMENT sublicense
 
 =head1 NAME
 
@@ -215,6 +209,33 @@ standard output.
 
 =back
 
+=head1 AUTHOR
+
+Russ Allbery <rra@stanford.edu>
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright 2006, 2007, 2008, 2010, 2013 The Board of Trustees of the Leland
+Stanford Junior University
+
+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 AUTHORS OR COPYRIGHT HOLDERS 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.
+
 =head1 SEE ALSO
 
 kadmin.local(8), remctld(8)
@@ -222,8 +243,4 @@ kadmin.local(8), remctld(8)
 This program is part of the wallet system.  The current version is
 available from L<http://www.eyrie.org/~eagle/software/wallet/>.
 
-=head1 AUTHOR
-
-Russ Allbery <rra@stanford.edu>
-
 =cut