Merge tag 'upstream/1.0' into debian

Upstream version 1.0

4 files changed, 16 insertions, 14 deletions

diff --git a/tests/client/basic-t.in b/tests/client/basic-t.in
index 11f0bce..836f394 100644
--- a/tests/client/basic-t.in
+++ b/tests/client/basic-t.in
@@ -4,7 +4,7 @@
 #
 # Written by Russ Allbery <rra@stanford.edu>
 # Copyright 2006, 2007, 2008, 2010
-#     Board of Trustees, Leland Stanford Jr. University
+#     The Board of Trustees of the Leland Stanford Junior University
 #
 # See LICENSE for licensing terms.
 
diff --git a/tests/client/full-t.in b/tests/client/full-t.in
index ce2789d..ebdba03 100644
--- a/tests/client/full-t.in
+++ b/tests/client/full-t.in
@@ -3,7 +3,8 @@
 # End-to-end tests for the wallet client.
 #
 # Written by Russ Allbery <rra@stanford.edu>
-# Copyright 2008, 2010 Board of Trustees, Leland Stanford Jr. University
+# Copyright 2008, 2010
+#     The Board of Trustees of the Leland Stanford Junior University
 #
 # See LICENSE for licensing terms.
 
@@ -56,19 +57,19 @@ chdir "$ENV{SOURCE}" or die "Cannot chdir to $ENV{SOURCE}: $!\n";
 
 SKIP: {
     skip 'no keytab configuration', $total
-        unless -f "$ENV{BUILD}/data/test.keytab";
+        unless -f "$ENV{BUILD}/config/keytab";
     my $remctld = '@REMCTLD@';
     skip 'remctld not found', $total unless $remctld;
 
     # Spawn remctld and get local tickets.  Don't destroy the user's Kerberos
     # ticket cache.
     unlink ('krb5cc_test', 'test-pid');
-    my $principal = contents ("$ENV{BUILD}/data/test.principal");
+    my $principal = contents ("$ENV{BUILD}/config/principal");
     remctld_spawn ($remctld, $principal,
-                   "$ENV{BUILD}/data/test.keytab",
+                   "$ENV{BUILD}/config/keytab",
                    "$ENV{SOURCE}/data/full.conf");
     $ENV{KRB5CCNAME} = 'krb5cc_test';
-    getcreds ("$ENV{BUILD}/data/test.keytab", $principal);
+    getcreds ("$ENV{BUILD}/config/keytab", $principal);
 
     # Use Wallet::Admin to set up the database.
     db_setup;
diff --git a/tests/client/prompt-t.in b/tests/client/prompt-t.in
index 1d8b079..06991cc 100644
--- a/tests/client/prompt-t.in
+++ b/tests/client/prompt-t.in
@@ -3,7 +3,8 @@
 # Password prompting tests for the wallet client.
 #
 # Written by Russ Allbery <rra@stanford.edu>
-# Copyright 2008, 2010 Board of Trustees, Leland Stanford Jr. University
+# Copyright 2008, 2010
+#     The Board of Trustees of the Leland Stanford Junior University
 #
 # See LICENSE for licensing terms.
 
@@ -21,11 +22,11 @@ chdir "$ENV{SOURCE}" or die "Cannot chdir to $ENV{SOURCE}: $!\n";
 
 SKIP: {
     skip 'no password configuration', $total
-        unless -f "$ENV{BUILD}/data/test.password";
+        unless -f "$ENV{BUILD}/config/password";
     my $remctld = '@REMCTLD@';
     skip 'remctld not found', $total unless $remctld;
     eval { require Expect };
-    skip 'Exepct module not found', $total if $@;
+    skip 'Expect module not found', $total if $@;
 
     # Disable sending of wallet's output to our standard output.  Do this
     # twice to avoid Perl warnings.
@@ -34,14 +35,14 @@ SKIP: {
 
     # Spawn remctld and set up with a different ticket cache.
     unlink ('krb5cc_test', 'test-pid');
-    my $principal = contents ("$ENV{BUILD}/data/test.principal");
-    remctld_spawn ($remctld, $principal, "$ENV{BUILD}/data/test.keytab",
+    my $principal = contents ("$ENV{BUILD}/config/principal");
+    remctld_spawn ($remctld, $principal, "$ENV{BUILD}/config/keytab",
                    "$ENV{SOURCE}/data/basic.conf");
     $ENV{KRB5CCNAME} = 'krb5cc_test';
 
     # Read in the principal and password.
-    open (PASS, '<', "$ENV{BUILD}/data/test.password")
-        or die "Cannot open $ENV{BUILD}/data/test.password: $!\n";
+    open (PASS, '<', "$ENV{BUILD}/config/password")
+        or die "Cannot open $ENV{BUILD}/config/password: $!\n";
     my $user = <PASS>;
     my $password = <PASS>;
     close PASS;
diff --git a/tests/client/rekey-t.in b/tests/client/rekey-t.in
index 390a362..0cfcb5d 100644
--- a/tests/client/rekey-t.in
+++ b/tests/client/rekey-t.in
@@ -4,7 +4,7 @@
 #
 # Written by Russ Allbery <rra@stanford.edu>
 # Copyright 2006, 2007, 2008, 2010
-#     Board of Trustees, Leland Stanford Jr. University
+#     The Board of Trustees of the Leland Stanford Junior University
 #
 # See LICENSE for licensing terms.