Merge tag 'upstream/1.0' into debian

Upstream version 1.0

3 files changed, 13 insertions, 2 deletions

diff --git a/NEWS b/NEWS
index 7371780..5d36863 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,13 @@ wallet 1.0 (2013-03-27)
     this ACL type for an existing wallet database, use wallet-admin to
     register the new verifier.
 
+    A new object type, wa-keyring (Wallet::Object::WAKeyring), is now
+    supported.  This stores a WebAuth keyring and handles both key
+    rotation and garbage collection of old keys on retrieval of the
+    keyring.  The WebAuth Perl module is required to use this object
+    type.  To enable this object type for an existing wallet database, use
+    wallet-admin to register the new object.
+
     Add a new acl check command which, given an ACL ID, prints yes if that
     ACL already exists and no otherwise.  This is parallel to the check
     command for objects.
diff --git a/README b/README
index a199516..2a96bd0 100644
--- a/README
+++ b/README
@@ -101,6 +101,9 @@ REQUIREMENTS
   binary that supports the -norandkey option to ktadd.  This option is
   included in MIT Kerberos 1.7 and later.
 
+  The WebAuth keyring object support in the wallet server requires the
+  WebAuth Perl module from WebAuth 4.4.0 or later.
+
   To support the LDAP attribute ACL verifier, the Authen::SASL and
   Net::LDAP Perl modules must be installed on the server.  This verifier
   only works with LDAP servers that support GSS-API binds.
diff --git a/perl/Wallet/Admin.pm b/perl/Wallet/Admin.pm
index 97a2c15..42476e9 100644
--- a/perl/Wallet/Admin.pm
+++ b/perl/Wallet/Admin.pm
@@ -125,8 +125,9 @@ sub default_data {
 
     # types default rows.
     my @record = ([ qw/ty_name ty_class/ ],
-               [ 'file', 'Wallet::Object::File' ],
-               [ 'keytab', 'Wallet::Object::Keytab' ]);
+               [ 'file',       'Wallet::Object::File' ],
+               [ 'keytab',     'Wallet::Object::Keytab' ],
+               [ 'wa-keyring', 'Wallet::Object::WAKeyring' ]);
     ($r1) = $self->{schema}->resultset('Type')->populate (\@record);
     warn "default Type not installed" unless defined $r1;