Imported Upstream version 0.12

1 files changed, 249 insertions, 166 deletions

diff --git a/Makefile.in b/Makefile.in
index c08f7fa..5e2331f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -42,7 +42,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-bin_PROGRAMS = client/wallet$(EXEEXT)
+bin_PROGRAMS = client/wallet$(EXEEXT) client/wallet-rekey$(EXEEXT)
 check_PROGRAMS = tests/runtests$(EXEEXT) \
 	tests/portable/asprintf-t$(EXEEXT) \
 	tests/portable/mkstemp-t$(EXEEXT) \
@@ -59,7 +59,8 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
 	$(top_srcdir)/configure $(top_srcdir)/perl/Makefile.PL.in \
 	$(top_srcdir)/tests/client/basic-t.in \
 	$(top_srcdir)/tests/client/full-t.in \
-	$(top_srcdir)/tests/client/prompt-t.in NEWS TODO \
+	$(top_srcdir)/tests/client/prompt-t.in \
+	$(top_srcdir)/tests/client/rekey-t.in NEWS TODO \
 	build-aux/compile build-aux/depcomp build-aux/install-sh \
 	build-aux/missing portable/asprintf.c portable/mkstemp.c \
 	portable/setenv.c portable/snprintf.c portable/strlcat.c \
@@ -77,7 +78,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = perl/Makefile.PL tests/client/basic-t \
-	tests/client/full-t tests/client/prompt-t
+	tests/client/full-t tests/client/prompt-t tests/client/rekey-t
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 AR = ar
@@ -88,10 +89,20 @@ am__v_AR_0 = @echo "  AR    " $@;
 AM_V_at = $(am__v_at_$(V))
 am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
 am__v_at_0 = @
+client_libwallet_a_AR = $(AR) $(ARFLAGS)
+client_libwallet_a_LIBADD =
+am__dirstamp = $(am__leading_dot)dirstamp
+am_client_libwallet_a_OBJECTS =  \
+	client/client_libwallet_a-file.$(OBJEXT) \
+	client/client_libwallet_a-keytab.$(OBJEXT) \
+	client/client_libwallet_a-krb5.$(OBJEXT) \
+	client/client_libwallet_a-options.$(OBJEXT) \
+	client/client_libwallet_a-remctl.$(OBJEXT) \
+	client/client_libwallet_a-srvtab.$(OBJEXT)
+client_libwallet_a_OBJECTS = $(am_client_libwallet_a_OBJECTS)
 portable_libportable_a_AR = $(AR) $(ARFLAGS)
 LIBOBJDIR = portable/
 portable_libportable_a_DEPENDENCIES = $(LIBOBJS)
-am__dirstamp = $(am__leading_dot)dirstamp
 am_portable_libportable_a_OBJECTS =  \
 	portable/portable_libportable_a-dummy.$(OBJEXT) \
 	portable/portable_libportable_a-krb5-extra.$(OBJEXT)
@@ -114,18 +125,22 @@ util_libutil_a_OBJECTS = $(am_util_libutil_a_OBJECTS)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" \
 	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"
 PROGRAMS = $(bin_PROGRAMS)
-am_client_wallet_OBJECTS = client/client_wallet-file.$(OBJEXT) \
-	client/client_wallet-keytab.$(OBJEXT) \
-	client/client_wallet-krb5.$(OBJEXT) \
-	client/client_wallet-remctl.$(OBJEXT) \
-	client/client_wallet-srvtab.$(OBJEXT) \
-	client/client_wallet-wallet.$(OBJEXT)
-client_wallet_OBJECTS = $(am_client_wallet_OBJECTS)
+client_wallet_SOURCES = client/wallet.c
+client_wallet_OBJECTS = client/client_wallet-wallet.$(OBJEXT)
 am__DEPENDENCIES_1 =
-client_wallet_DEPENDENCIES = util/libutil.a portable/libportable.a \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+client_wallet_DEPENDENCIES = client/libwallet.a util/libutil.a \
+	portable/libportable.a $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 client_wallet_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(client_wallet_LDFLAGS) $(LDFLAGS) -o $@
+client_wallet_rekey_SOURCES = client/wallet-rekey.c
+client_wallet_rekey_OBJECTS =  \
+	client/client_wallet_rekey-wallet-rekey.$(OBJEXT)
+client_wallet_rekey_DEPENDENCIES = client/libwallet.a util/libutil.a \
+	portable/libportable.a $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+client_wallet_rekey_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(client_wallet_rekey_LDFLAGS) $(LDFLAGS) -o $@
 am_tests_portable_asprintf_t_OBJECTS =  \
 	tests/portable/asprintf-t.$(OBJEXT) \
 	tests/portable/asprintf.$(OBJEXT)
@@ -231,9 +246,11 @@ am__v_CCLD_0 = @echo "  CCLD  " $@;
 AM_V_GEN = $(am__v_GEN_$(V))
 am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
 am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(portable_libportable_a_SOURCES) \
+SOURCES = $(client_libwallet_a_SOURCES) \
+	$(portable_libportable_a_SOURCES) \
 	$(tests_tap_libtap_a_SOURCES) $(util_libutil_a_SOURCES) \
-	$(client_wallet_SOURCES) $(tests_portable_asprintf_t_SOURCES) \
+	client/wallet.c client/wallet-rekey.c \
+	$(tests_portable_asprintf_t_SOURCES) \
 	$(tests_portable_mkstemp_t_SOURCES) \
 	$(tests_portable_setenv_t_SOURCES) \
 	$(tests_portable_snprintf_t_SOURCES) \
@@ -241,9 +258,11 @@ SOURCES = $(portable_libportable_a_SOURCES) \
 	$(tests_portable_strlcpy_t_SOURCES) tests/runtests.c \
 	tests/util/concat-t.c tests/util/messages-krb5-t.c \
 	tests/util/messages-t.c tests/util/xmalloc.c
-DIST_SOURCES = $(portable_libportable_a_SOURCES) \
+DIST_SOURCES = $(client_libwallet_a_SOURCES) \
+	$(portable_libportable_a_SOURCES) \
 	$(tests_tap_libtap_a_SOURCES) $(util_libutil_a_SOURCES) \
-	$(client_wallet_SOURCES) $(tests_portable_asprintf_t_SOURCES) \
+	client/wallet.c client/wallet-rekey.c \
+	$(tests_portable_asprintf_t_SOURCES) \
 	$(tests_portable_mkstemp_t_SOURCES) \
 	$(tests_portable_setenv_t_SOURCES) \
 	$(tests_portable_snprintf_t_SOURCES) \
@@ -373,43 +392,47 @@ top_srcdir = @top_srcdir@
 # and are not generated or touched by configure.  They're listed here to be
 # added to EXTRA_DIST and so that they can be copied over properly for
 # builddir != srcdir builds.
-PERL_FILES = perl/Wallet/ACL.pm perl/Wallet/ACL/Base.pm			    \
-	perl/Wallet/ACL/Krb5.pm perl/Wallet/ACL/NetDB.pm		    \
-	perl/Wallet/ACL/NetDB/Root.pm perl/Wallet/Admin.pm		    \
-	perl/Wallet/Config.pm perl/Wallet/Database.pm perl/Wallet/Kadmin.pm \
-	perl/Wallet/Kadmin/Heimdal.pm perl/Wallet/Kadmin/MIT.pm		    \
-	perl/Wallet/Object/Base.pm perl/Wallet/Object/File.pm		    \
-	perl/Wallet/Object/Keytab.pm perl/Wallet/Report.pm		    \
-	perl/Wallet/Schema.pm perl/Wallet/Server.pm perl/t/acl.t	    \
-	perl/t/admin.t perl/t/config.t perl/t/data/README		    \
-	perl/t/data/keytab-fake perl/t/data/keytab.conf			    \
-	perl/t/data/netdb.conf perl/t/data/netdb-fake perl/t/file.t	    \
-	perl/t/init.t perl/t/kadmin.t perl/t/keytab.t perl/t/lib/Util.pm    \
-	perl/t/object.t perl/t/pod-spelling.t perl/t/pod.t perl/t/report.t  \
-	perl/t/schema.t perl/t/server.t perl/t/verifier-netdb.t		    \
+PERL_FILES = perl/Wallet/ACL.pm perl/Wallet/ACL/Base.pm			   \
+	perl/Wallet/ACL/Krb5.pm perl/Wallet/ACL/Krb5/Regex.pm		   \
+	perl/Wallet/ACL/NetDB.pm perl/Wallet/ACL/NetDB/Root.pm		   \
+	perl/Wallet/Admin.pm perl/Wallet/Config.pm perl/Wallet/Database.pm \
+	perl/Wallet/Kadmin.pm perl/Wallet/Kadmin/Heimdal.pm		   \
+	perl/Wallet/Kadmin/MIT.pm perl/Wallet/Object/Base.pm		   \
+	perl/Wallet/Object/File.pm perl/Wallet/Object/Keytab.pm		   \
+	perl/Wallet/Report.pm perl/Wallet/Schema.pm perl/Wallet/Server.pm  \
+	perl/t/acl.t perl/t/admin.t perl/t/config.t perl/t/data/README	   \
+	perl/t/data/keytab-fake perl/t/data/keytab.conf			   \
+	perl/t/data/netdb.conf perl/t/data/netdb-fake perl/t/file.t	   \
+	perl/t/init.t perl/t/kadmin.t perl/t/keytab.t perl/t/lib/Util.pm   \
+	perl/t/object.t perl/t/pod-spelling.t perl/t/pod.t perl/t/report.t \
+	perl/t/schema.t perl/t/server.t perl/t/verifier-netdb.t		   \
 	perl/t/verifier.t
 
 AUTOMAKE_OPTIONS = foreign subdir-objects
 ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = .gitignore LICENSE autogen client/wallet.pod		   \
-	config/allow-extract config/keytab config/keytab.acl config/wallet \
-	docs/design contrib/README contrib/convert-srvtab-db		   \
-	contrib/used-principals contrib/wallet-contacts			   \
-	contrib/wallet-summary contrib/wallet-summary.8 docs/design-acl	   \
-	docs/design-api docs/netdb-role-api docs/notes docs/setup	   \
-	docs/stanford-naming examples/stanford.conf tests/TESTS		   \
-	tests/data/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/fake-keytab-2 tests/data/fake-keytab-merge		   \
-	tests/data/fake-keytab-old tests/data/fake-srvtab		   \
-	tests/data/full.conf tests/data/wallet.conf			   \
-	tests/docs/pod-spelling-t tests/docs/pod-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/remctl.sh	   \
+EXTRA_DIST = .gitignore 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/convert-srvtab-db contrib/used-principals     \
+	contrib/wallet-contacts contrib/wallet-summary			     \
+	contrib/wallet-summary.8 contrib/wallet-unknown-hosts		     \
+	docs/design-acl docs/design-api docs/netdb-role-api docs/notes	     \
+	docs/setup docs/stanford-naming examples/stanford.conf tests/TESTS   \
+	tests/data/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/fake-keytab-2 tests/data/fake-keytab-foreign		     \
+	tests/data/fake-keytab-merge tests/data/fake-keytab-old		     \
+	tests/data/fake-keytab-partial tests/data/fake-keytab-partial-result \
+	tests/data/fake-keytab-rekey tests/data/fake-keytab-unknown	     \
+	tests/data/fake-srvtab tests/data/full.conf tests/data/wallet.conf   \
+	tests/docs/pod-spelling-t tests/docs/pod-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/remctl.sh	     \
 	tests/util/xmalloc-t $(PERL_FILES)
 
-noinst_LIBRARIES = portable/libportable.a util/libutil.a
+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
@@ -421,25 +444,36 @@ util_libutil_a_SOURCES = util/concat.c util/concat.h util/macros.h	\
 	util/messages.h util/xmalloc.c util/xmalloc.h
 
 util_libutil_a_CPPFLAGS = $(KRB5_CPPFLAGS)
+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 \
 	server/wallet-backend server/wallet-report
 
-client_wallet_SOURCES = client/file.c client/internal.h client/keytab.c \
-	client/krb5.c client/remctl.c client/srvtab.c client/wallet.c
-
 client_wallet_CPPFLAGS = $(REMCTL_CPPFLAGS) $(KRB5_CPPFLAGS)
 client_wallet_LDFLAGS = $(REMCTL_LDFLAGS) $(KRB5_LDFLAGS)
-client_wallet_LDADD = util/libutil.a portable/libportable.a $(REMCTL_LIBS) \
-	$(KRB5_LIBS)
+client_wallet_LDADD = client/libwallet.a util/libutil.a \
+	portable/libportable.a $(REMCTL_LIBS) $(KRB5_LIBS)
 
-dist_man_MANS = client/wallet.1 server/keytab-backend.8 \
+client_wallet_rekey_CPPFLAGS = $(REMCTL_CPPFLAGS) $(KRB5_CPPFLAGS)
+client_wallet_rekey_LDFLAGS = $(REMCTL_LDFLAGS) $(KRB5_LDFLAGS)
+client_wallet_rekey_LDADD = client/libwallet.a util/libutil.a \
+	portable/libportable.a $(REMCTL_LIBS) $(KRB5_LIBS)
+
+dist_man_MANS = client/wallet.1 client/wallet-rekey.1 server/keytab-backend.8 \
 	server/wallet-admin.8 server/wallet-backend.8 server/wallet-report.8
 
 
 # A set of flags for warnings.  Add -O because gcc won't find some warnings
-# without optimization turned on, and add -DDEBUG=1 so we'll also compile all
-# debugging code and test it.
-WARNINGS = -g -O -DDEBUG=1 -Wall -W -Wendif-labels -Wpointer-arith \
+# 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.4 (2010-08-15).
+WARNINGS = -g -O -Wall -Wextra -Wendif-labels -Wformat=2 -Winit-self \
+	-Wswitch-enum -Wdeclaration-after-statement -Wshadow -Wpointer-arith \
 	-Wbad-function-cast -Wwrite-strings -Wstrict-prototypes \
 	-Wmissing-prototypes -Wnested-externs -Werror
 
@@ -563,12 +597,36 @@ tests/client/full-t: $(top_builddir)/config.status $(top_srcdir)/tests/client/fu
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 tests/client/prompt-t: $(top_builddir)/config.status $(top_srcdir)/tests/client/prompt-t.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
+tests/client/rekey-t: $(top_builddir)/config.status $(top_srcdir)/tests/client/rekey-t.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 
 clean-checkLIBRARIES:
 	-test -z "$(check_LIBRARIES)" || rm -f $(check_LIBRARIES)
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+client/$(am__dirstamp):
+	@$(MKDIR_P) client
+	@: > client/$(am__dirstamp)
+client/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) client/$(DEPDIR)
+	@: > client/$(DEPDIR)/$(am__dirstamp)
+client/client_libwallet_a-file.$(OBJEXT): client/$(am__dirstamp) \
+	client/$(DEPDIR)/$(am__dirstamp)
+client/client_libwallet_a-keytab.$(OBJEXT): client/$(am__dirstamp) \
+	client/$(DEPDIR)/$(am__dirstamp)
+client/client_libwallet_a-krb5.$(OBJEXT): client/$(am__dirstamp) \
+	client/$(DEPDIR)/$(am__dirstamp)
+client/client_libwallet_a-options.$(OBJEXT): client/$(am__dirstamp) \
+	client/$(DEPDIR)/$(am__dirstamp)
+client/client_libwallet_a-remctl.$(OBJEXT): client/$(am__dirstamp) \
+	client/$(DEPDIR)/$(am__dirstamp)
+client/client_libwallet_a-srvtab.$(OBJEXT): client/$(am__dirstamp) \
+	client/$(DEPDIR)/$(am__dirstamp)
+client/libwallet.a: $(client_libwallet_a_OBJECTS) $(client_libwallet_a_DEPENDENCIES) client/$(am__dirstamp)
+	$(AM_V_at)-rm -f client/libwallet.a
+	$(AM_V_AR)$(client_libwallet_a_AR) client/libwallet.a $(client_libwallet_a_OBJECTS) $(client_libwallet_a_LIBADD)
+	$(AM_V_at)$(RANLIB) client/libwallet.a
 portable/$(am__dirstamp):
 	@$(MKDIR_P) portable
 	@: > portable/$(am__dirstamp)
@@ -659,27 +717,16 @@ clean-binPROGRAMS:
 
 clean-checkPROGRAMS:
 	-test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS)
-client/$(am__dirstamp):
-	@$(MKDIR_P) client
-	@: > client/$(am__dirstamp)
-client/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) client/$(DEPDIR)
-	@: > client/$(DEPDIR)/$(am__dirstamp)
-client/client_wallet-file.$(OBJEXT): client/$(am__dirstamp) \
-	client/$(DEPDIR)/$(am__dirstamp)
-client/client_wallet-keytab.$(OBJEXT): client/$(am__dirstamp) \
-	client/$(DEPDIR)/$(am__dirstamp)
-client/client_wallet-krb5.$(OBJEXT): client/$(am__dirstamp) \
-	client/$(DEPDIR)/$(am__dirstamp)
-client/client_wallet-remctl.$(OBJEXT): client/$(am__dirstamp) \
-	client/$(DEPDIR)/$(am__dirstamp)
-client/client_wallet-srvtab.$(OBJEXT): client/$(am__dirstamp) \
-	client/$(DEPDIR)/$(am__dirstamp)
 client/client_wallet-wallet.$(OBJEXT): client/$(am__dirstamp) \
 	client/$(DEPDIR)/$(am__dirstamp)
 client/wallet$(EXEEXT): $(client_wallet_OBJECTS) $(client_wallet_DEPENDENCIES) client/$(am__dirstamp)
 	@rm -f client/wallet$(EXEEXT)
 	$(AM_V_CCLD)$(client_wallet_LINK) $(client_wallet_OBJECTS) $(client_wallet_LDADD) $(LIBS)
+client/client_wallet_rekey-wallet-rekey.$(OBJEXT):  \
+	client/$(am__dirstamp) client/$(DEPDIR)/$(am__dirstamp)
+client/wallet-rekey$(EXEEXT): $(client_wallet_rekey_OBJECTS) $(client_wallet_rekey_DEPENDENCIES) client/$(am__dirstamp)
+	@rm -f client/wallet-rekey$(EXEEXT)
+	$(AM_V_CCLD)$(client_wallet_rekey_LINK) $(client_wallet_rekey_OBJECTS) $(client_wallet_rekey_LDADD) $(LIBS)
 tests/portable/$(am__dirstamp):
 	@$(MKDIR_P) tests/portable
 	@: > tests/portable/$(am__dirstamp)
@@ -803,12 +850,14 @@ uninstall-dist_sbinSCRIPTS:
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
-	-rm -f client/client_wallet-file.$(OBJEXT)
-	-rm -f client/client_wallet-keytab.$(OBJEXT)
-	-rm -f client/client_wallet-krb5.$(OBJEXT)
-	-rm -f client/client_wallet-remctl.$(OBJEXT)
-	-rm -f client/client_wallet-srvtab.$(OBJEXT)
+	-rm -f client/client_libwallet_a-file.$(OBJEXT)
+	-rm -f client/client_libwallet_a-keytab.$(OBJEXT)
+	-rm -f client/client_libwallet_a-krb5.$(OBJEXT)
+	-rm -f client/client_libwallet_a-options.$(OBJEXT)
+	-rm -f client/client_libwallet_a-remctl.$(OBJEXT)
+	-rm -f client/client_libwallet_a-srvtab.$(OBJEXT)
 	-rm -f client/client_wallet-wallet.$(OBJEXT)
+	-rm -f client/client_wallet_rekey-wallet-rekey.$(OBJEXT)
 	-rm -f portable/portable_libportable_a-dummy.$(OBJEXT)
 	-rm -f portable/portable_libportable_a-krb5-extra.$(OBJEXT)
 	-rm -f tests/portable/asprintf-t.$(OBJEXT)
@@ -840,12 +889,14 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@client/$(DEPDIR)/client_wallet-file.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@client/$(DEPDIR)/client_wallet-keytab.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@client/$(DEPDIR)/client_wallet-krb5.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@client/$(DEPDIR)/client_wallet-remctl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@client/$(DEPDIR)/client_wallet-srvtab.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@client/$(DEPDIR)/client_libwallet_a-file.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@client/$(DEPDIR)/client_libwallet_a-keytab.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@client/$(DEPDIR)/client_libwallet_a-krb5.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@client/$(DEPDIR)/client_libwallet_a-options.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@client/$(DEPDIR)/client_libwallet_a-remctl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@client/$(DEPDIR)/client_libwallet_a-srvtab.Po@am__quote@
 @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)/mkstemp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@portable/$(DEPDIR)/portable_libportable_a-dummy.Po@am__quote@
@@ -898,6 +949,102 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
+client/client_libwallet_a-file.o: client/file.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_libwallet_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT client/client_libwallet_a-file.o -MD -MP -MF client/$(DEPDIR)/client_libwallet_a-file.Tpo -c -o client/client_libwallet_a-file.o `test -f 'client/file.c' || echo '$(srcdir)/'`client/file.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) client/$(DEPDIR)/client_libwallet_a-file.Tpo client/$(DEPDIR)/client_libwallet_a-file.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='client/file.c' object='client/client_libwallet_a-file.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_libwallet_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o client/client_libwallet_a-file.o `test -f 'client/file.c' || echo '$(srcdir)/'`client/file.c
+
+client/client_libwallet_a-file.obj: client/file.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_libwallet_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT client/client_libwallet_a-file.obj -MD -MP -MF client/$(DEPDIR)/client_libwallet_a-file.Tpo -c -o client/client_libwallet_a-file.obj `if test -f 'client/file.c'; then $(CYGPATH_W) 'client/file.c'; else $(CYGPATH_W) '$(srcdir)/client/file.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) client/$(DEPDIR)/client_libwallet_a-file.Tpo client/$(DEPDIR)/client_libwallet_a-file.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='client/file.c' object='client/client_libwallet_a-file.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_libwallet_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o client/client_libwallet_a-file.obj `if test -f 'client/file.c'; then $(CYGPATH_W) 'client/file.c'; else $(CYGPATH_W) '$(srcdir)/client/file.c'; fi`
+
+client/client_libwallet_a-keytab.o: client/keytab.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_libwallet_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT client/client_libwallet_a-keytab.o -MD -MP -MF client/$(DEPDIR)/client_libwallet_a-keytab.Tpo -c -o client/client_libwallet_a-keytab.o `test -f 'client/keytab.c' || echo '$(srcdir)/'`client/keytab.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) client/$(DEPDIR)/client_libwallet_a-keytab.Tpo client/$(DEPDIR)/client_libwallet_a-keytab.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='client/keytab.c' object='client/client_libwallet_a-keytab.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_libwallet_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o client/client_libwallet_a-keytab.o `test -f 'client/keytab.c' || echo '$(srcdir)/'`client/keytab.c
+
+client/client_libwallet_a-keytab.obj: client/keytab.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_libwallet_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT client/client_libwallet_a-keytab.obj -MD -MP -MF client/$(DEPDIR)/client_libwallet_a-keytab.Tpo -c -o client/client_libwallet_a-keytab.obj `if test -f 'client/keytab.c'; then $(CYGPATH_W) 'client/keytab.c'; else $(CYGPATH_W) '$(srcdir)/client/keytab.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) client/$(DEPDIR)/client_libwallet_a-keytab.Tpo client/$(DEPDIR)/client_libwallet_a-keytab.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='client/keytab.c' object='client/client_libwallet_a-keytab.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_libwallet_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o client/client_libwallet_a-keytab.obj `if test -f 'client/keytab.c'; then $(CYGPATH_W) 'client/keytab.c'; else $(CYGPATH_W) '$(srcdir)/client/keytab.c'; fi`
+
+client/client_libwallet_a-krb5.o: client/krb5.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_libwallet_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT client/client_libwallet_a-krb5.o -MD -MP -MF client/$(DEPDIR)/client_libwallet_a-krb5.Tpo -c -o client/client_libwallet_a-krb5.o `test -f 'client/krb5.c' || echo '$(srcdir)/'`client/krb5.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) client/$(DEPDIR)/client_libwallet_a-krb5.Tpo client/$(DEPDIR)/client_libwallet_a-krb5.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='client/krb5.c' object='client/client_libwallet_a-krb5.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_libwallet_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o client/client_libwallet_a-krb5.o `test -f 'client/krb5.c' || echo '$(srcdir)/'`client/krb5.c
+
+client/client_libwallet_a-krb5.obj: client/krb5.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_libwallet_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT client/client_libwallet_a-krb5.obj -MD -MP -MF client/$(DEPDIR)/client_libwallet_a-krb5.Tpo -c -o client/client_libwallet_a-krb5.obj `if test -f 'client/krb5.c'; then $(CYGPATH_W) 'client/krb5.c'; else $(CYGPATH_W) '$(srcdir)/client/krb5.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) client/$(DEPDIR)/client_libwallet_a-krb5.Tpo client/$(DEPDIR)/client_libwallet_a-krb5.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='client/krb5.c' object='client/client_libwallet_a-krb5.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_libwallet_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o client/client_libwallet_a-krb5.obj `if test -f 'client/krb5.c'; then $(CYGPATH_W) 'client/krb5.c'; else $(CYGPATH_W) '$(srcdir)/client/krb5.c'; fi`
+
+client/client_libwallet_a-options.o: client/options.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_libwallet_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT client/client_libwallet_a-options.o -MD -MP -MF client/$(DEPDIR)/client_libwallet_a-options.Tpo -c -o client/client_libwallet_a-options.o `test -f 'client/options.c' || echo '$(srcdir)/'`client/options.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) client/$(DEPDIR)/client_libwallet_a-options.Tpo client/$(DEPDIR)/client_libwallet_a-options.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='client/options.c' object='client/client_libwallet_a-options.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_libwallet_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o client/client_libwallet_a-options.o `test -f 'client/options.c' || echo '$(srcdir)/'`client/options.c
+
+client/client_libwallet_a-options.obj: client/options.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_libwallet_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT client/client_libwallet_a-options.obj -MD -MP -MF client/$(DEPDIR)/client_libwallet_a-options.Tpo -c -o client/client_libwallet_a-options.obj `if test -f 'client/options.c'; then $(CYGPATH_W) 'client/options.c'; else $(CYGPATH_W) '$(srcdir)/client/options.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) client/$(DEPDIR)/client_libwallet_a-options.Tpo client/$(DEPDIR)/client_libwallet_a-options.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='client/options.c' object='client/client_libwallet_a-options.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_libwallet_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o client/client_libwallet_a-options.obj `if test -f 'client/options.c'; then $(CYGPATH_W) 'client/options.c'; else $(CYGPATH_W) '$(srcdir)/client/options.c'; fi`
+
+client/client_libwallet_a-remctl.o: client/remctl.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_libwallet_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT client/client_libwallet_a-remctl.o -MD -MP -MF client/$(DEPDIR)/client_libwallet_a-remctl.Tpo -c -o client/client_libwallet_a-remctl.o `test -f 'client/remctl.c' || echo '$(srcdir)/'`client/remctl.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) client/$(DEPDIR)/client_libwallet_a-remctl.Tpo client/$(DEPDIR)/client_libwallet_a-remctl.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='client/remctl.c' object='client/client_libwallet_a-remctl.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_libwallet_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o client/client_libwallet_a-remctl.o `test -f 'client/remctl.c' || echo '$(srcdir)/'`client/remctl.c
+
+client/client_libwallet_a-remctl.obj: client/remctl.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_libwallet_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT client/client_libwallet_a-remctl.obj -MD -MP -MF client/$(DEPDIR)/client_libwallet_a-remctl.Tpo -c -o client/client_libwallet_a-remctl.obj `if test -f 'client/remctl.c'; then $(CYGPATH_W) 'client/remctl.c'; else $(CYGPATH_W) '$(srcdir)/client/remctl.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) client/$(DEPDIR)/client_libwallet_a-remctl.Tpo client/$(DEPDIR)/client_libwallet_a-remctl.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='client/remctl.c' object='client/client_libwallet_a-remctl.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_libwallet_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o client/client_libwallet_a-remctl.obj `if test -f 'client/remctl.c'; then $(CYGPATH_W) 'client/remctl.c'; else $(CYGPATH_W) '$(srcdir)/client/remctl.c'; fi`
+
+client/client_libwallet_a-srvtab.o: client/srvtab.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_libwallet_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT client/client_libwallet_a-srvtab.o -MD -MP -MF client/$(DEPDIR)/client_libwallet_a-srvtab.Tpo -c -o client/client_libwallet_a-srvtab.o `test -f 'client/srvtab.c' || echo '$(srcdir)/'`client/srvtab.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) client/$(DEPDIR)/client_libwallet_a-srvtab.Tpo client/$(DEPDIR)/client_libwallet_a-srvtab.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='client/srvtab.c' object='client/client_libwallet_a-srvtab.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_libwallet_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o client/client_libwallet_a-srvtab.o `test -f 'client/srvtab.c' || echo '$(srcdir)/'`client/srvtab.c
+
+client/client_libwallet_a-srvtab.obj: client/srvtab.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_libwallet_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT client/client_libwallet_a-srvtab.obj -MD -MP -MF client/$(DEPDIR)/client_libwallet_a-srvtab.Tpo -c -o client/client_libwallet_a-srvtab.obj `if test -f 'client/srvtab.c'; then $(CYGPATH_W) 'client/srvtab.c'; else $(CYGPATH_W) '$(srcdir)/client/srvtab.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) client/$(DEPDIR)/client_libwallet_a-srvtab.Tpo client/$(DEPDIR)/client_libwallet_a-srvtab.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='client/srvtab.c' object='client/client_libwallet_a-srvtab.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_libwallet_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o client/client_libwallet_a-srvtab.obj `if test -f 'client/srvtab.c'; then $(CYGPATH_W) 'client/srvtab.c'; else $(CYGPATH_W) '$(srcdir)/client/srvtab.c'; fi`
+
 portable/portable_libportable_a-dummy.o: portable/dummy.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-dummy.o -MD -MP -MF portable/$(DEPDIR)/portable_libportable_a-dummy.Tpo -c -o portable/portable_libportable_a-dummy.o `test -f 'portable/dummy.c' || echo '$(srcdir)/'`portable/dummy.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) portable/$(DEPDIR)/portable_libportable_a-dummy.Tpo portable/$(DEPDIR)/portable_libportable_a-dummy.Po
@@ -1058,86 +1205,6 @@ util/util_libutil_a-xmalloc.obj: util/xmalloc.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(util_libutil_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o util/util_libutil_a-xmalloc.obj `if test -f 'util/xmalloc.c'; then $(CYGPATH_W) 'util/xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/util/xmalloc.c'; fi`
 
-client/client_wallet-file.o: client/file.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_wallet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT client/client_wallet-file.o -MD -MP -MF client/$(DEPDIR)/client_wallet-file.Tpo -c -o client/client_wallet-file.o `test -f 'client/file.c' || echo '$(srcdir)/'`client/file.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) client/$(DEPDIR)/client_wallet-file.Tpo client/$(DEPDIR)/client_wallet-file.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='client/file.c' object='client/client_wallet-file.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_wallet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o client/client_wallet-file.o `test -f 'client/file.c' || echo '$(srcdir)/'`client/file.c
-
-client/client_wallet-file.obj: client/file.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_wallet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT client/client_wallet-file.obj -MD -MP -MF client/$(DEPDIR)/client_wallet-file.Tpo -c -o client/client_wallet-file.obj `if test -f 'client/file.c'; then $(CYGPATH_W) 'client/file.c'; else $(CYGPATH_W) '$(srcdir)/client/file.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) client/$(DEPDIR)/client_wallet-file.Tpo client/$(DEPDIR)/client_wallet-file.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='client/file.c' object='client/client_wallet-file.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_wallet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o client/client_wallet-file.obj `if test -f 'client/file.c'; then $(CYGPATH_W) 'client/file.c'; else $(CYGPATH_W) '$(srcdir)/client/file.c'; fi`
-
-client/client_wallet-keytab.o: client/keytab.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_wallet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT client/client_wallet-keytab.o -MD -MP -MF client/$(DEPDIR)/client_wallet-keytab.Tpo -c -o client/client_wallet-keytab.o `test -f 'client/keytab.c' || echo '$(srcdir)/'`client/keytab.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) client/$(DEPDIR)/client_wallet-keytab.Tpo client/$(DEPDIR)/client_wallet-keytab.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='client/keytab.c' object='client/client_wallet-keytab.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_wallet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o client/client_wallet-keytab.o `test -f 'client/keytab.c' || echo '$(srcdir)/'`client/keytab.c
-
-client/client_wallet-keytab.obj: client/keytab.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_wallet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT client/client_wallet-keytab.obj -MD -MP -MF client/$(DEPDIR)/client_wallet-keytab.Tpo -c -o client/client_wallet-keytab.obj `if test -f 'client/keytab.c'; then $(CYGPATH_W) 'client/keytab.c'; else $(CYGPATH_W) '$(srcdir)/client/keytab.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) client/$(DEPDIR)/client_wallet-keytab.Tpo client/$(DEPDIR)/client_wallet-keytab.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='client/keytab.c' object='client/client_wallet-keytab.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_wallet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o client/client_wallet-keytab.obj `if test -f 'client/keytab.c'; then $(CYGPATH_W) 'client/keytab.c'; else $(CYGPATH_W) '$(srcdir)/client/keytab.c'; fi`
-
-client/client_wallet-krb5.o: client/krb5.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_wallet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT client/client_wallet-krb5.o -MD -MP -MF client/$(DEPDIR)/client_wallet-krb5.Tpo -c -o client/client_wallet-krb5.o `test -f 'client/krb5.c' || echo '$(srcdir)/'`client/krb5.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) client/$(DEPDIR)/client_wallet-krb5.Tpo client/$(DEPDIR)/client_wallet-krb5.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='client/krb5.c' object='client/client_wallet-krb5.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_wallet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o client/client_wallet-krb5.o `test -f 'client/krb5.c' || echo '$(srcdir)/'`client/krb5.c
-
-client/client_wallet-krb5.obj: client/krb5.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_wallet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT client/client_wallet-krb5.obj -MD -MP -MF client/$(DEPDIR)/client_wallet-krb5.Tpo -c -o client/client_wallet-krb5.obj `if test -f 'client/krb5.c'; then $(CYGPATH_W) 'client/krb5.c'; else $(CYGPATH_W) '$(srcdir)/client/krb5.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) client/$(DEPDIR)/client_wallet-krb5.Tpo client/$(DEPDIR)/client_wallet-krb5.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='client/krb5.c' object='client/client_wallet-krb5.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_wallet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o client/client_wallet-krb5.obj `if test -f 'client/krb5.c'; then $(CYGPATH_W) 'client/krb5.c'; else $(CYGPATH_W) '$(srcdir)/client/krb5.c'; fi`
-
-client/client_wallet-remctl.o: client/remctl.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_wallet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT client/client_wallet-remctl.o -MD -MP -MF client/$(DEPDIR)/client_wallet-remctl.Tpo -c -o client/client_wallet-remctl.o `test -f 'client/remctl.c' || echo '$(srcdir)/'`client/remctl.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) client/$(DEPDIR)/client_wallet-remctl.Tpo client/$(DEPDIR)/client_wallet-remctl.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='client/remctl.c' object='client/client_wallet-remctl.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_wallet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o client/client_wallet-remctl.o `test -f 'client/remctl.c' || echo '$(srcdir)/'`client/remctl.c
-
-client/client_wallet-remctl.obj: client/remctl.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_wallet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT client/client_wallet-remctl.obj -MD -MP -MF client/$(DEPDIR)/client_wallet-remctl.Tpo -c -o client/client_wallet-remctl.obj `if test -f 'client/remctl.c'; then $(CYGPATH_W) 'client/remctl.c'; else $(CYGPATH_W) '$(srcdir)/client/remctl.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) client/$(DEPDIR)/client_wallet-remctl.Tpo client/$(DEPDIR)/client_wallet-remctl.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='client/remctl.c' object='client/client_wallet-remctl.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_wallet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o client/client_wallet-remctl.obj `if test -f 'client/remctl.c'; then $(CYGPATH_W) 'client/remctl.c'; else $(CYGPATH_W) '$(srcdir)/client/remctl.c'; fi`
-
-client/client_wallet-srvtab.o: client/srvtab.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_wallet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT client/client_wallet-srvtab.o -MD -MP -MF client/$(DEPDIR)/client_wallet-srvtab.Tpo -c -o client/client_wallet-srvtab.o `test -f 'client/srvtab.c' || echo '$(srcdir)/'`client/srvtab.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) client/$(DEPDIR)/client_wallet-srvtab.Tpo client/$(DEPDIR)/client_wallet-srvtab.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='client/srvtab.c' object='client/client_wallet-srvtab.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_wallet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o client/client_wallet-srvtab.o `test -f 'client/srvtab.c' || echo '$(srcdir)/'`client/srvtab.c
-
-client/client_wallet-srvtab.obj: client/srvtab.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_wallet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT client/client_wallet-srvtab.obj -MD -MP -MF client/$(DEPDIR)/client_wallet-srvtab.Tpo -c -o client/client_wallet-srvtab.obj `if test -f 'client/srvtab.c'; then $(CYGPATH_W) 'client/srvtab.c'; else $(CYGPATH_W) '$(srcdir)/client/srvtab.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) client/$(DEPDIR)/client_wallet-srvtab.Tpo client/$(DEPDIR)/client_wallet-srvtab.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='client/srvtab.c' object='client/client_wallet-srvtab.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_wallet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o client/client_wallet-srvtab.obj `if test -f 'client/srvtab.c'; then $(CYGPATH_W) 'client/srvtab.c'; else $(CYGPATH_W) '$(srcdir)/client/srvtab.c'; fi`
-
 client/client_wallet-wallet.o: client/wallet.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_wallet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT client/client_wallet-wallet.o -MD -MP -MF client/$(DEPDIR)/client_wallet-wallet.Tpo -c -o client/client_wallet-wallet.o `test -f 'client/wallet.c' || echo '$(srcdir)/'`client/wallet.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) client/$(DEPDIR)/client_wallet-wallet.Tpo client/$(DEPDIR)/client_wallet-wallet.Po
@@ -1154,6 +1221,22 @@ client/client_wallet-wallet.obj: client/wallet.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_wallet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o client/client_wallet-wallet.obj `if test -f 'client/wallet.c'; then $(CYGPATH_W) 'client/wallet.c'; else $(CYGPATH_W) '$(srcdir)/client/wallet.c'; fi`
 
+client/client_wallet_rekey-wallet-rekey.o: client/wallet-rekey.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_wallet_rekey_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT client/client_wallet_rekey-wallet-rekey.o -MD -MP -MF client/$(DEPDIR)/client_wallet_rekey-wallet-rekey.Tpo -c -o client/client_wallet_rekey-wallet-rekey.o `test -f 'client/wallet-rekey.c' || echo '$(srcdir)/'`client/wallet-rekey.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) client/$(DEPDIR)/client_wallet_rekey-wallet-rekey.Tpo client/$(DEPDIR)/client_wallet_rekey-wallet-rekey.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='client/wallet-rekey.c' object='client/client_wallet_rekey-wallet-rekey.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_wallet_rekey_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o client/client_wallet_rekey-wallet-rekey.o `test -f 'client/wallet-rekey.c' || echo '$(srcdir)/'`client/wallet-rekey.c
+
+client/client_wallet_rekey-wallet-rekey.obj: client/wallet-rekey.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_wallet_rekey_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT client/client_wallet_rekey-wallet-rekey.obj -MD -MP -MF client/$(DEPDIR)/client_wallet_rekey-wallet-rekey.Tpo -c -o client/client_wallet_rekey-wallet-rekey.obj `if test -f 'client/wallet-rekey.c'; then $(CYGPATH_W) 'client/wallet-rekey.c'; else $(CYGPATH_W) '$(srcdir)/client/wallet-rekey.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) client/$(DEPDIR)/client_wallet_rekey-wallet-rekey.Tpo client/$(DEPDIR)/client_wallet_rekey-wallet-rekey.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='client/wallet-rekey.c' object='client/client_wallet_rekey-wallet-rekey.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(client_wallet_rekey_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o client/client_wallet_rekey-wallet-rekey.obj `if test -f 'client/wallet-rekey.c'; then $(CYGPATH_W) 'client/wallet-rekey.c'; else $(CYGPATH_W) '$(srcdir)/client/wallet-rekey.c'; fi`
+
 tests/tests_runtests-runtests.o: tests/runtests.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_runtests_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/tests_runtests-runtests.o -MD -MP -MF tests/$(DEPDIR)/tests_runtests-runtests.Tpo -c -o tests/tests_runtests-runtests.o `test -f 'tests/runtests.c' || echo '$(srcdir)/'`tests/runtests.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/tests_runtests-runtests.Tpo tests/$(DEPDIR)/tests_runtests-runtests.Po
@@ -1634,9 +1717,9 @@ all-local: perl/blib/lib/Wallet/Config.pm
 
 perl/blib/lib/Wallet/Config.pm:
 	set -e; if [ x"$(builddir)" != x"$(srcdir)" ] ; then \
-	    mkdir perl/Wallet perl/Wallet/ACL perl/Wallet/ACL/NetDB \
-		perl/Wallet/Kadmin perl/Wallet/Object perl/t perl/t/data \
-		perl/t/lib 2>/dev/null || true ; \
+	    mkdir perl/Wallet perl/Wallet/ACL perl/Wallet/ACL/Krb5 \
+		perl/Wallet/ACL/NetDB perl/Wallet/Kadmin perl/Wallet/Object \
+		perl/t perl/t/data perl/t/lib 2>/dev/null || true ; \
 	    for f in $(PERL_FILES) ; do \
 		cp "$(srcdir)/$$f" "$(builddir)/$$f" ; \
 	    done \