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

3 files changed, 8 insertions, 5 deletions

diff --git a/tests/data/cmd-fake b/tests/data/cmd-fake
index 11791a6..f889edd 100755
--- a/tests/data/cmd-fake
+++ b/tests/data/cmd-fake
@@ -3,7 +3,7 @@
 # This is a fake wallet backend that returns bogus data for verification by
 # the client test suite.  It doesn't test any of the wallet server code.
 #
-# Written by Russ Allbery <rra@stanford.edu>
+# Written by Russ Allbery <eagle@eyrie.org>
 # Copyright 2007, 2008, 2010
 #     The Board of Trustees of the Leland Stanford Junior University
 #
diff --git a/tests/data/cmd-wrapper b/tests/data/cmd-wrapper
index 79b1943..b5b6d26 100755
--- a/tests/data/cmd-wrapper
+++ b/tests/data/cmd-wrapper
@@ -5,4 +5,4 @@
 
 WALLET_CONFIG="$SOURCE/data/wallet.conf"
 export WALLET_CONFIG
-exec perl -I"$SOURCE/../perl" "$SOURCE/../server/wallet-backend" -q "$@"
+exec perl -I"$SOURCE/../perl/lib" "$SOURCE/../server/wallet-backend" -q "$@"
diff --git a/tests/data/fake-kadmin b/tests/data/fake-kadmin
index c073ea5..ff90f88 100755
--- a/tests/data/fake-kadmin
+++ b/tests/data/fake-kadmin
@@ -1,13 +1,16 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 #
 # Fake kadmin.local used to test the keytab backend.
 #
-# Written by Russ Allbery <rra@stanford.edu>
-# Copyright 2007
+# Written by Russ Allbery <eagle@eyrie.org>
+# Copyright 2007, 2014
 #     The Board of Trustees of the Leland Stanford Junior University
 #
 # See LICENSE for licensing terms.
 
+use strict;
+use warnings;
+
 unless ($ARGV[0] eq '-q' && @ARGV == 2) {
     die "invalid arguments\n";
 }