New upstream version 1.4

1 files changed, 96 insertions, 100 deletions

diff --git a/Makefile.in b/Makefile.in
index 360d0e7..3820705 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -17,11 +17,11 @@
 # Automake makefile for wallet.
 #
 # Written by Russ Allbery <eagle@eyrie.org>
-# Copyright 2016 Russ Allbery <eagle@eyrie.org>
-# Copyright 2006, 2007, 2008, 2010, 2013, 2014
+# Copyright 2016, 2018 Russ Allbery <eagle@eyrie.org>
+# Copyright 2006-2008, 2010, 2013-2014
 #     The Board of Trustees of the Leland Stanford Junior University
 #
-# See LICENSE for licensing terms.
+# SPDX-License-Identifier: MIT
 
 
 
@@ -108,17 +108,17 @@ check_PROGRAMS = tests/runtests$(EXEEXT) \
 	tests/util/messages-t$(EXEEXT) tests/util/xmalloc$(EXEEXT)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/clang.m4 \
-	$(top_srcdir)/m4/gssapi.m4 $(top_srcdir)/m4/krb5-config.m4 \
-	$(top_srcdir)/m4/krb5.m4 $(top_srcdir)/m4/lib-depends.m4 \
-	$(top_srcdir)/m4/lib-pathname.m4 $(top_srcdir)/m4/remctl.m4 \
-	$(top_srcdir)/m4/snprintf.m4 $(top_srcdir)/m4/vamacros.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/cc-flags.m4 \
+	$(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/gssapi.m4 \
+	$(top_srcdir)/m4/krb5-config.m4 $(top_srcdir)/m4/krb5.m4 \
+	$(top_srcdir)/m4/lib-depends.m4 \
+	$(top_srcdir)/m4/lib-pathname.m4 $(top_srcdir)/m4/perl.m4 \
+	$(top_srcdir)/m4/remctl.m4 $(top_srcdir)/m4/snprintf.m4 \
+	$(top_srcdir)/m4/vamacros.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
-	$(am__configure_deps) $(dist_sbin_SCRIPTS) \
-	$(dist_pkgdata_DATA) $(am__DIST_COMMON)
+	$(am__configure_deps) $(dist_pkgdata_DATA) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
@@ -147,8 +147,7 @@ portable_libportable_a_AR = $(AR) $(ARFLAGS)
 LIBOBJDIR = portable/
 portable_libportable_a_DEPENDENCIES = $(LIBOBJS)
 am_portable_libportable_a_OBJECTS =  \
-	portable/portable_libportable_a-dummy.$(OBJEXT) \
-	portable/portable_libportable_a-krb5-extra.$(OBJEXT)
+	portable/portable_libportable_a-dummy.$(OBJEXT)
 portable_libportable_a_OBJECTS = $(am_portable_libportable_a_OBJECTS)
 tests_tap_libtap_a_AR = $(AR) $(ARFLAGS)
 tests_tap_libtap_a_LIBADD =
@@ -258,7 +257,7 @@ am__uninstall_files_from_dir = { \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
-SCRIPTS = $(dist_sbin_SCRIPTS)
+SCRIPTS = $(sbin_SCRIPTS)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -350,6 +349,8 @@ am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \
 	$(top_srcdir)/build-aux/install-sh \
 	$(top_srcdir)/build-aux/missing \
 	$(top_srcdir)/portable/asprintf.c \
+	$(top_srcdir)/portable/krb5-extra.c \
+	$(top_srcdir)/portable/krb5-profile.c \
 	$(top_srcdir)/portable/mkstemp.c \
 	$(top_srcdir)/portable/reallocarray.c \
 	$(top_srcdir)/portable/setenv.c \
@@ -357,7 +358,7 @@ am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \
 	$(top_srcdir)/tests/client/basic-t.in \
 	$(top_srcdir)/tests/client/full-t.in \
 	$(top_srcdir)/tests/client/prompt-t.in \
-	$(top_srcdir)/tests/client/rekey-t.in NEWS README TODO \
+	$(top_srcdir)/tests/client/rekey-t.in NEWS README THANKS TODO \
 	build-aux/ar-lib build-aux/compile build-aux/depcomp \
 	build-aux/install-sh build-aux/missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -428,6 +429,7 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_KRB5_CONFIG = @PATH_KRB5_CONFIG@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
 RANLIB = @RANLIB@
 REMCTLD = @REMCTLD@
 REMCTL_CPPFLAGS = @REMCTL_CPPFLAGS@
@@ -437,6 +439,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+WARNINGS_CFLAGS = @WARNINGS_CFLAGS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -568,20 +571,24 @@ PERL_DIRECTORIES = perl perl/lib perl/lib/Wallet perl/lib/Wallet/ACL	    \
 	perl/t/policy perl/t/style perl/t/util perl/t/verifier
 
 ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = .gitignore .travis.yml LICENSE autogen client/wallet.pod	    \
-	client/wallet-rekey.pod config/allow-extract config/keytab	    \
-	config/keytab.acl config/wallet config/wallet-report.acl	    \
-	docs/design contrib/README contrib/commerzbank/wallet-history	    \
+EXTRA_DIST = .gitignore .travis.yml LICENSE README.md bootstrap		    \
+	client/wallet.pod client/wallet-rekey.pod config/allow-extract	    \
+	config/keytab config/keytab.acl config/wallet			    \
+	config/wallet-report.acl docs/design contrib/README		    \
+	contrib/ad-keytab contrib/commerzbank/wallet-history		    \
 	contrib/convert-srvtab-db contrib/used-principals		    \
 	contrib/wallet-contacts contrib/wallet-rekey-periodic		    \
 	contrib/wallet-rekey-periodic.8 contrib/wallet-summary		    \
 	contrib/wallet-summary.8 contrib/wallet-unknown-hosts		    \
 	contrib/wallet-unknown-hosts.8 docs/design-acl docs/design-api	    \
-	docs/netdb-role-api docs/notes docs/objects-and-schemes docs/setup  \
-	docs/stanford-naming examples/stanford.conf tests/HOWTO tests/TESTS \
+	docs/metadata docs/netdb-role-api docs/notes			    \
+	docs/objects-and-schemes docs/setup docs/stanford-naming	    \
+	examples/stanford.conf server/keytab-backend.in			    \
+	server/wallet-admin.in server/wallet-backend.in			    \
+	server/wallet-report.in tests/README tests/TESTS		    \
 	tests/config/README tests/data/allow-extract tests/data/basic.conf  \
-	tests/data/cmd-fake tests/data/cmd-wrapper tests/data/fake-data	    \
-	tests/data/fake-kadmin tests/data/fake-keytab			    \
+	tests/data/cmd-fake tests/data/cmd-wrapper tests/data/cppcheck.supp \
+	tests/data/fake-data tests/data/fake-kadmin tests/data/fake-keytab  \
 	tests/data/fake-keytab-2 tests/data/fake-keytab-foreign		    \
 	tests/data/fake-keytab-merge tests/data/fake-keytab-old		    \
 	tests/data/fake-keytab-partial					    \
@@ -589,11 +596,12 @@ EXTRA_DIST = .gitignore .travis.yml LICENSE autogen client/wallet.pod	    \
 	tests/data/fake-keytab-unknown tests/data/fake-srvtab		    \
 	tests/data/full.conf tests/data/perl.conf tests/data/wallet.conf    \
 	tests/docs/pod-spelling-t tests/docs/pod-t			    \
-	tests/perl/minimum-version-t tests/perl/module-version-t	    \
-	tests/perl/strict-t tests/server/admin-t tests/server/backend-t	    \
-	tests/server/keytab-t tests/server/report-t tests/tap/kerberos.sh   \
-	tests/tap/libtap.sh tests/tap/perl/Test/RRA.pm			    \
-	tests/tap/perl/Test/RRA/Automake.pm				    \
+	tests/docs/spdx-license-t tests/perl/minimum-version-t		    \
+	tests/perl/module-version-t tests/perl/strict-t			    \
+	tests/server/admin-t tests/server/backend-t tests/server/keytab-t   \
+	tests/server/report-t tests/style/obsolete-strings-t		    \
+	tests/tap/kerberos.sh tests/tap/libtap.sh			    \
+	tests/tap/perl/Test/RRA.pm tests/tap/perl/Test/RRA/Automake.pm	    \
 	tests/tap/perl/Test/RRA/Config.pm				    \
 	tests/tap/perl/Test/RRA/ModuleVersion.pm tests/tap/remctl.sh	    \
 	tests/util/xmalloc-t $(PERL_FILES)
@@ -604,9 +612,9 @@ EXTRA_DIST = .gitignore .travis.yml LICENSE autogen client/wallet.pod	    \
 # The private library used by both wallet and wallet-rekey.
 noinst_LIBRARIES = portable/libportable.a util/libutil.a \
 	client/libwallet.a
-portable_libportable_a_SOURCES = portable/dummy.c portable/krb5-extra.c	\
-	portable/krb5.h portable/macros.h portable/stdbool.h		\
-	portable/system.h portable/uio.h
+portable_libportable_a_SOURCES = portable/dummy.c portable/krb5.h	\
+	portable/macros.h portable/stdbool.h portable/system.h		\
+	portable/uio.h
 
 portable_libportable_a_CPPFLAGS = $(KRB5_CPPFLAGS)
 portable_libportable_a_LIBADD = $(LIBOBJS)
@@ -619,7 +627,7 @@ client_libwallet_a_SOURCES = client/file.c client/internal.h client/keytab.c \
 	client/krb5.c client/options.c client/remctl.c client/srvtab.c
 
 client_libwallet_a_CPPFLAGS = $(REMCTL_CPPFLAGS) $(KRB5_CPPFLAGS)
-dist_sbin_SCRIPTS = server/keytab-backend server/wallet-admin \
+sbin_SCRIPTS = server/keytab-backend server/wallet-admin \
 	server/wallet-backend server/wallet-report
 
 client_wallet_CPPFLAGS = $(REMCTL_CPPFLAGS) $(KRB5_CPPFLAGS)
@@ -653,30 +661,11 @@ dist_pkgdata_DATA = perl/sql/Wallet-Schema-0.07-0.08-MySQL.sql	\
 	perl/sql/Wallet-Schema-0.09-PostgreSQL.sql		\
 	perl/sql/Wallet-Schema-0.09-SQLite.sql
 
-@WARNINGS_CLANG_TRUE@WARNINGS = -Weverything -Wno-padded
-
-# A set of flags for warnings.  Add -O because gcc won't find some warnings
-# without optimization turned on.  Desirable warnings that can't be turned
-# on due to other problems:
-#
-#     -Wconversion      http://bugs.debian.org/488884 (htons warnings)
-#
-# Last checked against gcc 4.8.2 (2014-04-12).  -D_FORTIFY_SOURCE=2 enables
-# warn_unused_result attribute markings on glibc functions on Linux, which
-# catches a few more issues.
-@WARNINGS_GCC_TRUE@WARNINGS = -g -O -fstrict-overflow -fstrict-aliasing -D_FORTIFY_SOURCE=2 \
-@WARNINGS_GCC_TRUE@        -Wall -Wextra -Wendif-labels -Wformat=2 -Winit-self -Wswitch-enum    \
-@WARNINGS_GCC_TRUE@        -Wstrict-overflow=5 -Wmissing-format-attribute -Wfloat-equal         \
-@WARNINGS_GCC_TRUE@        -Wdeclaration-after-statement -Wshadow -Wpointer-arith               \
-@WARNINGS_GCC_TRUE@        -Wbad-function-cast -Wcast-align -Wwrite-strings -Wjump-misses-init  \
-@WARNINGS_GCC_TRUE@        -Wlogical-op -Wstrict-prototypes -Wold-style-definition              \
-@WARNINGS_GCC_TRUE@        -Wmissing-prototypes -Wnormalized=nfc -Wpacked -Wredundant-decls     \
-@WARNINGS_GCC_TRUE@        -Wnested-externs -Winline -Wvla -Werror
-
 
 # Remove some additional files.
-CLEANFILES = perl/t/lib/Test/RRA.pm perl/t/lib/Test/RRA/Automake.pm \
-	perl/t/lib/Test/RRA/Config.pm
+CLEANFILES = perl/t/lib/Test/RRA.pm perl/t/lib/Test/RRA/Automake.pm	\
+	perl/t/lib/Test/RRA/Config.pm server/keytab-backend		\
+	server/wallet-admin server/wallet-backend server/wallet-report
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 build-aux/compile		     \
 	build-aux/depcomp build-aux/install-sh build-aux/missing	     \
@@ -684,8 +673,8 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 build-aux/compile		     \
 	contrib/wallet-report.8 server/keytab-backend.8			     \
 	server/wallet-admin.8 server/wallet-backend.8 server/wallet-report.8
 
-tests_runtests_CPPFLAGS = -DSOURCE='"$(abs_top_srcdir)/tests"' \
-	-DBUILD='"$(abs_top_builddir)/tests"'
+tests_runtests_CPPFLAGS = -DC_TAP_SOURCE='"$(abs_top_srcdir)/tests"' \
+	-DC_TAP_BUILD='"$(abs_top_builddir)/tests"'
 
 check_LIBRARIES = tests/tap/libtap.a
 tests_tap_libtap_a_CPPFLAGS = -I$(abs_top_srcdir)/tests $(KRB5_CPPFLAGS)
@@ -819,8 +808,6 @@ portable/$(DEPDIR)/$(am__dirstamp):
 	@: > portable/$(DEPDIR)/$(am__dirstamp)
 portable/portable_libportable_a-dummy.$(OBJEXT):  \
 	portable/$(am__dirstamp) portable/$(DEPDIR)/$(am__dirstamp)
-portable/portable_libportable_a-krb5-extra.$(OBJEXT):  \
-	portable/$(am__dirstamp) portable/$(DEPDIR)/$(am__dirstamp)
 
 portable/libportable.a: $(portable_libportable_a_OBJECTS) $(portable_libportable_a_DEPENDENCIES) $(EXTRA_portable_libportable_a_DEPENDENCIES) portable/$(am__dirstamp)
 	$(AM_V_at)-rm -f portable/libportable.a
@@ -996,9 +983,9 @@ tests/util/xmalloc.$(OBJEXT): tests/util/$(am__dirstamp) \
 tests/util/xmalloc$(EXEEXT): $(tests_util_xmalloc_OBJECTS) $(tests_util_xmalloc_DEPENDENCIES) $(EXTRA_tests_util_xmalloc_DEPENDENCIES) tests/util/$(am__dirstamp)
 	@rm -f tests/util/xmalloc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(tests_util_xmalloc_OBJECTS) $(tests_util_xmalloc_LDADD) $(LIBS)
-install-dist_sbinSCRIPTS: $(dist_sbin_SCRIPTS)
+install-sbinSCRIPTS: $(sbin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	@list='$(dist_sbin_SCRIPTS)'; test -n "$(sbindir)" || list=; \
+	@list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || list=; \
 	if test -n "$$list"; then \
 	  echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
 	  $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
@@ -1025,9 +1012,9 @@ install-dist_sbinSCRIPTS: $(dist_sbin_SCRIPTS)
 	     } \
 	; done
 
-uninstall-dist_sbinSCRIPTS:
+uninstall-sbinSCRIPTS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_sbin_SCRIPTS)'; test -n "$(sbindir)" || exit 0; \
+	@list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
 	dir='$(DESTDIR)$(sbindir)'; $(am__uninstall_files_from_dir)
@@ -1054,9 +1041,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@client/$(DEPDIR)/client_wallet-wallet.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@client/$(DEPDIR)/client_wallet_rekey-wallet-rekey.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@portable/$(DEPDIR)/asprintf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@portable/$(DEPDIR)/krb5-extra.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@portable/$(DEPDIR)/krb5-profile.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@portable/$(DEPDIR)/mkstemp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@portable/$(DEPDIR)/portable_libportable_a-dummy.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@portable/$(DEPDIR)/portable_libportable_a-krb5-extra.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@portable/$(DEPDIR)/reallocarray.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@portable/$(DEPDIR)/setenv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@portable/$(DEPDIR)/snprintf.Po@am__quote@
@@ -1195,20 +1183,6 @@ portable/portable_libportable_a-dummy.obj: portable/dummy.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(portable_libportable_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portable/portable_libportable_a-dummy.obj `if test -f 'portable/dummy.c'; then $(CYGPATH_W) 'portable/dummy.c'; else $(CYGPATH_W) '$(srcdir)/portable/dummy.c'; fi`
 
-portable/portable_libportable_a-krb5-extra.o: portable/krb5-extra.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(portable_libportable_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portable/portable_libportable_a-krb5-extra.o -MD -MP -MF portable/$(DEPDIR)/portable_libportable_a-krb5-extra.Tpo -c -o portable/portable_libportable_a-krb5-extra.o `test -f 'portable/krb5-extra.c' || echo '$(srcdir)/'`portable/krb5-extra.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) portable/$(DEPDIR)/portable_libportable_a-krb5-extra.Tpo portable/$(DEPDIR)/portable_libportable_a-krb5-extra.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='portable/krb5-extra.c' object='portable/portable_libportable_a-krb5-extra.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(portable_libportable_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portable/portable_libportable_a-krb5-extra.o `test -f 'portable/krb5-extra.c' || echo '$(srcdir)/'`portable/krb5-extra.c
-
-portable/portable_libportable_a-krb5-extra.obj: portable/krb5-extra.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(portable_libportable_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT portable/portable_libportable_a-krb5-extra.obj -MD -MP -MF portable/$(DEPDIR)/portable_libportable_a-krb5-extra.Tpo -c -o portable/portable_libportable_a-krb5-extra.obj `if test -f 'portable/krb5-extra.c'; then $(CYGPATH_W) 'portable/krb5-extra.c'; else $(CYGPATH_W) '$(srcdir)/portable/krb5-extra.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) portable/$(DEPDIR)/portable_libportable_a-krb5-extra.Tpo portable/$(DEPDIR)/portable_libportable_a-krb5-extra.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='portable/krb5-extra.c' object='portable/portable_libportable_a-krb5-extra.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(portable_libportable_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o portable/portable_libportable_a-krb5-extra.obj `if test -f 'portable/krb5-extra.c'; then $(CYGPATH_W) 'portable/krb5-extra.c'; else $(CYGPATH_W) '$(srcdir)/portable/krb5-extra.c'; fi`
-
 tests/tap/tests_tap_libtap_a-basic.o: tests/tap/basic.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_tap_libtap_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/tap/tests_tap_libtap_a-basic.o -MD -MP -MF tests/tap/$(DEPDIR)/tests_tap_libtap_a-basic.Tpo -c -o tests/tap/tests_tap_libtap_a-basic.o `test -f 'tests/tap/basic.c' || echo '$(srcdir)/'`tests/tap/basic.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/tap/$(DEPDIR)/tests_tap_libtap_a-basic.Tpo tests/tap/$(DEPDIR)/tests_tap_libtap_a-basic.Po
@@ -1589,7 +1563,7 @@ distdir: $(DISTFILES)
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
 	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
@@ -1614,7 +1588,7 @@ dist-shar: distdir
 	@echo WARNING: "Support for shar distribution archives is" \
 	               "deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
 
 dist-zip: distdir
@@ -1632,7 +1606,7 @@ dist dist-all:
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lz*) \
@@ -1642,7 +1616,7 @@ distcheck: dist
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
@@ -1782,7 +1756,7 @@ install-dvi: install-dvi-am
 
 install-dvi-am:
 
-install-exec-am: install-binPROGRAMS install-dist_sbinSCRIPTS
+install-exec-am: install-binPROGRAMS install-sbinSCRIPTS
 
 install-html: install-html-am
 
@@ -1824,7 +1798,7 @@ ps: ps-am
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-dist_pkgdataDATA \
-	uninstall-dist_sbinSCRIPTS uninstall-man
+	uninstall-man uninstall-sbinSCRIPTS
 
 uninstall-man: uninstall-man1 uninstall-man8
 
@@ -1841,17 +1815,16 @@ uninstall-man: uninstall-man1 uninstall-man8
 	distdir distuninstallcheck dvi dvi-am html html-am info \
 	info-am install install-am install-binPROGRAMS install-data \
 	install-data-am install-data-local install-dist_pkgdataDATA \
-	install-dist_sbinSCRIPTS install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-man1 \
-	install-man8 install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
-	ps ps-am tags tags-am uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-dist_pkgdataDATA \
-	uninstall-dist_sbinSCRIPTS uninstall-man uninstall-man1 \
-	uninstall-man8
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-man1 install-man8 install-pdf \
+	install-pdf-am install-ps install-ps-am install-sbinSCRIPTS \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
+	uninstall-dist_pkgdataDATA uninstall-man uninstall-man1 \
+	uninstall-man8 uninstall-sbinSCRIPTS
 
 .PRECIOUS: Makefile
 
@@ -1864,11 +1837,29 @@ uninstall-man: uninstall-man1 uninstall-man8
 # the Makefile.
 WALLET_PERL_FLAGS ?=
 
+# Separate target for a human to request building everything with as many
+# compiler warnings enabled as possible.
 warnings:
-	$(MAKE) V=0 CFLAGS='$(WARNINGS)' KRB5_CPPFLAGS='$(KRB5_CPPFLAGS_GCC)'
-	$(MAKE) V=0 CFLAGS='$(WARNINGS)' \
+	$(MAKE) V=0 CFLAGS='$(WARNINGS_CFLAGS) $(AM_CFLAGS)' \
+	    KRB5_CPPFLAGS='$(KRB5_CPPFLAGS_GCC)'
+	$(MAKE) V=0 CFLAGS='$(WARNINGS_CFLAGS) $(AM_CFLAGS)' \
 	    KRB5_CPPFLAGS='$(KRB5_CPPFLAGS_GCC)' $(check_PROGRAMS)
 
+# For each of the Perl scripts, we need to fill in the path to the Perl
+# binary that was located during configuration.
+server/keytab-backend: $(srcdir)/server/keytab-backend.in Makefile
+	sed 's|\@PERL\@|$(PERL)|' <$(srcdir)/server/keytab-backend.in >$@
+	chmod a+x $@
+server/wallet-admin: $(srcdir)/server/wallet-admin.in Makefile
+	sed 's|\@PERL\@|$(PERL)|' <$(srcdir)/server/wallet-admin.in >$@
+	chmod a+x $@
+server/wallet-backend: $(srcdir)/server/wallet-backend.in Makefile
+	sed 's|\@PERL\@|$(PERL)|' <$(srcdir)/server/wallet-backend.in >$@
+	chmod a+x $@
+server/wallet-report: $(srcdir)/server/wallet-report.in Makefile
+	sed 's|\@PERL\@|$(PERL)|' <$(srcdir)/server/wallet-report.in >$@
+	chmod a+x $@
+
 # Take appropriate actions in the Perl directory as well.  We don't want to
 # always build the Perl directory in all-local, since otherwise Automake does
 # this for every target, which overrides some hacks we have to do for Debian
@@ -1888,7 +1879,7 @@ perl/blib/lib/Wallet/Config.pm: $(srcdir)/perl/lib/Wallet/Config.pm
 	$(INSTALL_DATA) $(srcdir)/tests/tap/perl/Test/RRA.pm perl/t/lib/Test/
 	$(INSTALL_DATA) $(srcdir)/tests/tap/perl/Test/RRA/Config.pm \
 	    perl/t/lib/Test/RRA/
-	cd perl && perl Build.PL $(WALLET_PERL_FLAGS)
+	cd perl && $(PERL) Build.PL $(WALLET_PERL_FLAGS)
 	cd perl && ./Build
 
 # This is a really ugly hack to only honor prefix when running make install
@@ -1906,7 +1897,6 @@ install-data-local:
 	esac ;								\
 	cd perl && ./Build install $$flags --destdir '$(DESTDIR)'
 
-# ExtUtils::MakeMaker really likes moving the Makefile aside.
 clean-local:
 	set -e; if [ -f "perl/Build" ] ; then		\
 	    cd perl && ./Build realclean ;		\
@@ -1927,6 +1917,12 @@ check-local: $(check_PROGRAMS)
 	@echo ''
 	cd perl && ./Build test
 
+# Used by maintainers to check the source code with cppcheck.
+check-cppcheck:
+	cd $(abs_top_srcdir) && cppcheck -q --error-exitcode=2	\
+	    --suppressions-list=tests/data/cppcheck.supp	\
+	    --enable=warning,performance,portability,style .
+
 # Alas, we have to disable this check because there's no way to do an
 # uninstall from Perl.
 distuninstallcheck: