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

1 files changed, 6 insertions, 6 deletions

diff --git a/tests/server/admin-t b/tests/server/admin-t
index 6846609..f025d98 100755
--- a/tests/server/admin-t
+++ b/tests/server/admin-t
@@ -2,8 +2,8 @@
 #
 # Tests for the wallet-admin dispatch code.
 #
-# Written by Russ Allbery <rra@stanford.edu>
-# Copyright 2008, 2009, 2010, 2011
+# Written by Russ Allbery <eagle@eyrie.org>
+# Copyright 2008, 2009, 2010, 2011, 2014
 #     The Board of Trustees of the Leland Stanford Junior University
 #
 # See LICENSE for licensing terms.
@@ -140,9 +140,9 @@ seek (STDIN, 0, 0);
 ($out, $err) = run_admin ('initialize', 'rra');
 is ($err, "invalid admin principal rra\n", 'Initialize requires a principal');
 is ($out, "new\n", ' and nothing was run');
-($out, $err) = run_admin ('initialize', 'rra@stanford.edu');
+($out, $err) = run_admin ('initialize', 'eagle@eyrie.org');
 is ($err, '', 'Initialize succeeds with a principal');
-is ($out, "new\ninitialize rra\@stanford.edu\n", ' and runs the right code');
+is ($out, "new\ninitialize eagle\@eyrie.org\n", ' and runs the right code');
 
 # Test register.
 ($out, $err) = run_admin ('register', 'foo', 'foo', 'Foo::Bar');
@@ -170,9 +170,9 @@ is ($err, "some error\n", 'Error handling succeeds for destroy');
 is ($out, "new\n"
     . 'This will delete all data in the wallet database.'
     . '  Are you sure (N/y)? ' . "destroy\n", ' and calls the right methods');
-($out, $err) = run_admin ('initialize', 'rra@stanford.edu');
+($out, $err) = run_admin ('initialize', 'eagle@eyrie.org');
 is ($err, "some error\n", 'Error handling succeeds for initialize');
-is ($out, "new\ninitialize rra\@stanford.edu\n",
+is ($out, "new\ninitialize eagle\@eyrie.org\n",
     ' and calls the right methods');
 ($out, $err) = run_admin ('register', 'object', 'foo', 'Foo::Object');
 is ($err, "some error\n", 'Error handling succeeds for register object');