summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Allbery <eagle@eyrie.org>2014-07-11 18:22:39 -0700
committerRuss Allbery <rra@stanford.edu>2014-07-11 19:03:09 -0700
commit90a32a39fc996999f0ee6938a6fe90950cb839f9 (patch)
tree6c2664951830b0c8a9b9664d68e0dfeaf2ca4717
parentbbd3ee78bac4ca7851cafd1cb2730f545ef6415d (diff)
Fix verifier-netdb test for Heimdal, email address
Undo the email address renaming for verifier-netdb as well, since this has to use rra@stanford.edu for right now. Adjust so that the test is not skipped with Heimdal Kerberos user space. Change-Id: I0a0e16e1044fe6057a310cc419477a34052ffcda Reviewed-on: https://gerrit.stanford.edu/1522 Reviewed-by: Russ Allbery <rra@stanford.edu> Tested-by: Russ Allbery <rra@stanford.edu>
-rwxr-xr-xperl/t/verifier-netdb.t6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl/t/verifier-netdb.t b/perl/t/verifier-netdb.t
index 3e34966..6a91cb3 100755
--- a/perl/t/verifier-netdb.t
+++ b/perl/t/verifier-netdb.t
@@ -7,7 +7,7 @@
# environments.
#
# Written by Russ Allbery <eagle@eyrie.org>
-# Copyright 2008
+# Copyright 2008, 2014
# The Board of Trustees of the Leland Stanford Junior University
#
# See LICENSE for licensing terms.
@@ -21,13 +21,13 @@ use Util;
my $netdb = 'netdb-node-roles-rc.stanford.edu';
my $host = 'windlord.stanford.edu';
-my $user = 'eagle@eyrie.org';
+my $user = 'rra@stanford.edu';
# Determine the local principal.
my $klist = `klist 2>&1` || '';
SKIP: {
skip "tests useful only with Stanford Kerberos tickets", 4
- unless ($klist =~ /^Default principal: \S+\@stanford\.edu$/m);
+ unless ($klist =~ /^(Default p|\s+P)rincipal: \S+\@stanford\.edu$/m);
# Set up our configuration.
$Wallet::Config::NETDB_REALM = 'stanford.edu';