From df08f0309a1fa861ddfdcab049f7fa6d47497ce6 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Wed, 27 Mar 2013 17:23:45 -0700 Subject: Skip the wa-keyring tests if WebAuth is too old If the WebAuth module is too old, don't just fail the tests. Skip them instead. This will let the Debian package build in unstable. Change-Id: I84c97f23ff7fbf89f2fd797898ebb4ab5e58eee6 Reviewed-on: https://gerrit.stanford.edu/987 Reviewed-by: Russ Allbery Tested-by: Russ Allbery --- perl/t/wa-keyring.t | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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'); -- cgit v1.2.3 From 0002bc7ed9ff15f6c3f2b457509d5ef0f2b5a4a4 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Wed, 27 Mar 2013 17:27:39 -0700 Subject: Add NEWS entry and doc reference to Wallet::Policy::Stanford Change-Id: If833e4a6434362e04e738274a6f7fb276a9efe51 Reviewed-on: https://gerrit.stanford.edu/988 Reviewed-by: Russ Allbery Tested-by: Russ Allbery --- NEWS | 7 +++++++ docs/stanford-naming | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3