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

4 files changed, 28 insertions, 20 deletions

diff --git a/tests/client/basic-t.in b/tests/client/basic-t.in
index 836f394..974b636 100644
--- a/tests/client/basic-t.in
+++ b/tests/client/basic-t.in
@@ -2,7 +2,7 @@
 #
 # Test suite for the wallet command-line client.
 #
-# Written by Russ Allbery <rra@stanford.edu>
+# Written by Russ Allbery <eagle@eyrie.org>
 # Copyright 2006, 2007, 2008, 2010
 #     The Board of Trustees of the Leland Stanford Junior University
 #
diff --git a/tests/client/full-t.in b/tests/client/full-t.in
index ebdba03..4861723 100644
--- a/tests/client/full-t.in
+++ b/tests/client/full-t.in
@@ -1,21 +1,23 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 #
 # End-to-end tests for the wallet client.
 #
-# Written by Russ Allbery <rra@stanford.edu>
-# Copyright 2008, 2010
+# Written by Russ Allbery <eagle@eyrie.org>
+# Copyright 2008, 2010, 2014
 #     The Board of Trustees of the Leland Stanford Junior University
 #
 # See LICENSE for licensing terms.
 
+use strict;
+use warnings;
+
 # Point to our server configuration.  This must be done before Wallet::Config
 # is loaded, and it's pulled in as a prerequisite for Wallet::Admin.
 BEGIN { $ENV{WALLET_CONFIG} = "$ENV{SOURCE}/data/wallet.conf" }
 
-BEGIN { our $total = 59 }
-use Test::More tests => $total;
+use Test::More tests => 59;
 
-use lib "$ENV{SOURCE}/../perl";
+use lib "$ENV{SOURCE}/../perl/lib";
 use Wallet::Admin;
 
 use lib "$ENV{SOURCE}/../perl/t/lib";
@@ -56,10 +58,10 @@ sub wallet {
 chdir "$ENV{SOURCE}" or die "Cannot chdir to $ENV{SOURCE}: $!\n";
 
 SKIP: {
-    skip 'no keytab configuration', $total
+    skip 'no keytab configuration', 59
         unless -f "$ENV{BUILD}/config/keytab";
     my $remctld = '@REMCTLD@';
-    skip 'remctld not found', $total unless $remctld;
+    skip 'remctld not found', 59 unless $remctld;
 
     # Spawn remctld and get local tickets.  Don't destroy the user's Kerberos
     # ticket cache.
@@ -188,8 +190,12 @@ SKIP: {
     # All done.
     remctld_stop;
     $admin->destroy;
-    unlink ('wallet-db', 'krb5cc_test', 'test-pid');
     if (-d 'test-files') {
         system ('rm', '-r', 'test-files');
     }
 }
+
+# Clean up the database and other test files at the end of the test.
+END {
+    unlink ('wallet-db', 'krb5cc_test', 'test-pid');
+}
diff --git a/tests/client/prompt-t.in b/tests/client/prompt-t.in
index 06991cc..686cc88 100644
--- a/tests/client/prompt-t.in
+++ b/tests/client/prompt-t.in
@@ -1,17 +1,19 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 #
 # Password prompting tests for the wallet client.
 #
-# Written by Russ Allbery <rra@stanford.edu>
-# Copyright 2008, 2010
+# Written by Russ Allbery <eagle@eyrie.org>
+# Copyright 2008, 2010, 2014
 #     The Board of Trustees of the Leland Stanford Junior University
 #
 # See LICENSE for licensing terms.
 
-BEGIN { our $total = 5 }
-use Test::More tests => $total;
+use strict;
+use warnings;
 
-use lib "$ENV{SOURCE}/..//perl";
+use Test::More tests => 5;
+
+use lib "$ENV{SOURCE}/../perl/lib";
 use Wallet::Admin;
 
 use lib "$ENV{SOURCE}/../perl/t/lib";
@@ -21,12 +23,12 @@ use Util;
 chdir "$ENV{SOURCE}" or die "Cannot chdir to $ENV{SOURCE}: $!\n";
 
 SKIP: {
-    skip 'no password configuration', $total
+    skip 'no password configuration', 5
         unless -f "$ENV{BUILD}/config/password";
     my $remctld = '@REMCTLD@';
-    skip 'remctld not found', $total unless $remctld;
+    skip 'remctld not found', 5 unless $remctld;
     eval { require Expect };
-    skip 'Expect module not found', $total if $@;
+    skip 'Expect module not found', 5 if $@;
 
     # Disable sending of wallet's output to our standard output.  Do this
     # twice to avoid Perl warnings.
diff --git a/tests/client/rekey-t.in b/tests/client/rekey-t.in
index c6d0e41..c93b8eb 100644
--- a/tests/client/rekey-t.in
+++ b/tests/client/rekey-t.in
@@ -2,7 +2,7 @@
 #
 # Test suite for the wallet-rekey command-line client.
 #
-# Written by Russ Allbery <rra@stanford.edu>
+# Written by Russ Allbery <eagle@eyrie.org>
 # Copyright 2006, 2007, 2008, 2010
 #     The Board of Trustees of the Leland Stanford Junior University
 #