diff options
| author | Russ Allbery <eagle@eyrie.org> | 2014-07-16 13:46:50 -0700 |
|---|---|---|
| committer | Russ Allbery <eagle@eyrie.org> | 2014-07-16 13:46:50 -0700 |
| commit | 1796d631f0846ec98cd286bc4284898a7300ee78 (patch) | |
| tree | 6fd42de6dc858ef06c6d270410c32ec61f39e593 /contrib/used-principals | |
| parent | f5194217566a6f4cdeffbae551153feb1412210d (diff) | |
| parent | 6409733ee3b7b1910dc1c166a392cc628834146c (diff) | |
Merge tag 'upstream/1.1' into debian
Upstream version 1.1
Conflicts:
NEWS
README
client/keytab.c
perl/lib/Wallet/ACL.pm
perl/sql/Wallet-Schema-0.08-PostgreSQL.sql
perl/t/general/admin.t
perl/t/verifier/ldap-attr.t
Change-Id: I1a1dc09b97c9258e61f1c8877d0837193c8ae2c6
Diffstat (limited to 'contrib/used-principals')
| -rwxr-xr-x | contrib/used-principals | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/used-principals b/contrib/used-principals index ca431e3..7169f0b 100755 --- a/contrib/used-principals +++ b/contrib/used-principals @@ -2,7 +2,7 @@ # # used-principals -- Report which Kerberos v5 principals are in use. # -# Written by Russ Allbery <rra@stanford.edu> +# Written by Russ Allbery <eagle@eyrie.org> # Copyright 2008 # The Board of Trustees of the Leland Stanford Junior University # @@ -108,7 +108,7 @@ __END__ ############################################################################## =for stopwords -KDC bzip2 +KDC bzip2 Allbery =head1 NAME @@ -178,6 +178,6 @@ purposes may require some tweaking. =head1 AUTHOR -Russ Allbery <rra@stanford.edu> +Russ Allbery <eagle@eyrie.org> =cut |