Imported Upstream version 1.0

3 files changed, 18 insertions, 3 deletions

diff --git a/NEWS b/NEWS
index 5d36863..f364260 100644
--- a/NEWS
+++ b/NEWS
@@ -45,6 +45,13 @@ wallet 1.0 (2013-03-27)
     Add docs/objects-and-schemes, which provides a brief summary of the
     current supported object types and ACL schemes.
 
+    The Stanford wallet object and ACL naming policy is now available in
+    code form as the Wallet::Policy::Stanford module, which is installed
+    as part of the server.  As-is, it is only useful for sites that want
+    to adopt an identical naming policy (and will still require overriding
+    some of the internal data, like group names), but it may provide a
+    useful code example for others wanting to do something similar.
+
     Update to rra-c-util 4.8:
 
     * Look for krb5-config in /usr/kerberos/bin after the user's PATH.
diff --git a/docs/stanford-naming b/docs/stanford-naming
index bdf5027..81c752c 100644
--- a/docs/stanford-naming
+++ b/docs/stanford-naming
@@ -6,7 +6,8 @@ Introduction
     wallet objects.  They may not be appropriate for every site using
     wallet, but they can serve as a starting point for your site-local
     conventions.  They are the conventions enforced by
-    examples/stanford.conf (to the extent it's possible to enforce them).
+    Wallet::Policy::Stanford (to the extent it's possible to enforce
+    them).
 
 Object Naming
 
diff --git a/perl/t/wa-keyring.t b/perl/t/wa-keyring.t
index 3011d54..7ba5723 100755
--- a/perl/t/wa-keyring.t
+++ b/perl/t/wa-keyring.t
@@ -11,13 +11,20 @@
 use strict;
 use warnings;
 
+use Test::More;
+
+BEGIN {
+    eval 'use WebAuth 3.06 qw(WA_KEY_AES WA_AES_128)';
+    plan skip_all => 'WebAuth 3.06 required for testing wa-keyring'
+      if $@;
+}
+
 use POSIX qw(strftime);
-use Test::More tests => 68;
-use WebAuth 3.06 qw(WA_KEY_AES WA_AES_128);
 use WebAuth::Key 1.01 ();
 use WebAuth::Keyring 1.02 ();
 
 BEGIN {
+    plan tests => 68;
     use_ok('Wallet::Admin');
     use_ok('Wallet::Config');
     use_ok('Wallet::Object::WAKeyring');