From: Greg Hudson <ghudson@mit.edu>
Date: Thu, 26 Mar 2020 05:01:32 +0000 (-0400)
Subject: make regen
X-Git-Tag: krb5-1.19-beta1~99
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5c911946ba98b2e90db6456e822788f678bdade;p=thirdparty%2Fkrb5.git

make regen
---

diff --git a/src/clients/kvno/deps b/src/clients/kvno/deps
index e9d597a8a6..d37d764cbe 100644
--- a/src/clients/kvno/deps
+++ b/src/clients/kvno/deps
@@ -3,11 +3,12 @@
 #
 $(OUTPRE)kvno.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
-  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h \
-  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
-  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
-  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
-  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
-  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
-  $(top_srcdir)/include/socket-utils.h kvno.c
+  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-base64.h \
+  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+  kvno.c
diff --git a/src/lib/krb5/krb/deps b/src/lib/krb5/krb/deps
index fc2a16ed5f..439ca02725 100644
--- a/src/lib/krb5/krb/deps
+++ b/src/lib/krb5/krb/deps
@@ -48,14 +48,15 @@ appdefault.so appdefault.po $(OUTPRE)appdefault.$(OBJEXT): \
 auth_con.so auth_con.po $(OUTPRE)auth_con.$(OBJEXT): \
   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
   $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
-  $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
-  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
-  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
-  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
-  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
-  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
-  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
-  auth_con.c auth_con.h int-proto.h
+  $(COM_ERR_DEPS) $(srcdir)/../rcache/memrcache.h $(top_srcdir)/include/k5-buf.h \
+  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
+  $(top_srcdir)/include/socket-utils.h auth_con.c auth_con.h \
+  int-proto.h
 cammac_util.so cammac_util.po $(OUTPRE)cammac_util.$(OBJEXT): \
   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
   $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
@@ -70,39 +71,39 @@ cammac_util.so cammac_util.po $(OUTPRE)cammac_util.$(OBJEXT): \
 ai_authdata.so ai_authdata.po $(OUTPRE)ai_authdata.$(OBJEXT): \
   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
   $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
-  $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
-  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
-  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
-  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
-  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/k5-utf8.h \
-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
-  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
-  $(top_srcdir)/include/socket-utils.h ai_authdata.c \
-  auth_con.h authdata.h int-proto.h
+  $(COM_ERR_DEPS) $(srcdir)/../rcache/memrcache.h $(top_srcdir)/include/k5-buf.h \
+  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+  $(top_srcdir)/include/k5-utf8.h $(top_srcdir)/include/krb5.h \
+  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+  ai_authdata.c auth_con.h authdata.h int-proto.h
 authdata.so authdata.po $(OUTPRE)authdata.$(OBJEXT): \
   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
   $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
-  $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
-  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
-  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
-  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
-  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/k5-utf8.h \
-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
-  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
-  $(top_srcdir)/include/socket-utils.h auth_con.h authdata.c \
-  authdata.h int-proto.h
+  $(COM_ERR_DEPS) $(srcdir)/../rcache/memrcache.h $(top_srcdir)/include/k5-buf.h \
+  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+  $(top_srcdir)/include/k5-utf8.h $(top_srcdir)/include/krb5.h \
+  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+  auth_con.h authdata.c authdata.h int-proto.h
 authdata_exp.so authdata_exp.po $(OUTPRE)authdata_exp.$(OBJEXT): \
   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
   $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
-  $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
-  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
-  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
-  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
-  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/k5-utf8.h \
-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
-  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
-  $(top_srcdir)/include/socket-utils.h auth_con.h authdata.h \
-  authdata_exp.c int-proto.h
+  $(COM_ERR_DEPS) $(srcdir)/../rcache/memrcache.h $(top_srcdir)/include/k5-buf.h \
+  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+  $(top_srcdir)/include/k5-utf8.h $(top_srcdir)/include/krb5.h \
+  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+  auth_con.h authdata.h authdata_exp.c int-proto.h
 authdata_enc.so authdata_enc.po $(OUTPRE)authdata_enc.$(OBJEXT): \
   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
   $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
@@ -162,16 +163,16 @@ chk_trans.so chk_trans.po $(OUTPRE)chk_trans.$(OBJEXT): \
   chk_trans.c
 chpw.so chpw.po $(OUTPRE)chpw.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
-  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h \
-  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
-  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
-  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
-  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
-  $(top_srcdir)/include/k5-unicode.h $(top_srcdir)/include/k5-utf8.h \
-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
-  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
-  $(top_srcdir)/include/socket-utils.h auth_con.h chpw.c \
-  int-proto.h
+  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../rcache/memrcache.h \
+  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/k5-unicode.h \
+  $(top_srcdir)/include/k5-utf8.h $(top_srcdir)/include/krb5.h \
+  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+  auth_con.h chpw.c int-proto.h
 conv_creds.so conv_creds.po $(OUTPRE)conv_creds.$(OBJEXT): \
   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
   $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
@@ -219,14 +220,14 @@ copy_auth.so copy_auth.po $(OUTPRE)copy_auth.$(OBJEXT): \
 copy_athctr.so copy_athctr.po $(OUTPRE)copy_athctr.$(OBJEXT): \
   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
   $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
-  $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
-  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
-  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
-  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
-  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
-  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
-  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
-  auth_con.h copy_athctr.c
+  $(COM_ERR_DEPS) $(srcdir)/../rcache/memrcache.h $(top_srcdir)/include/k5-buf.h \
+  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
+  $(top_srcdir)/include/socket-utils.h auth_con.h copy_athctr.c
 copy_cksum.so copy_cksum.po $(OUTPRE)copy_cksum.$(OBJEXT): \
   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
   $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
@@ -449,14 +450,15 @@ gen_subkey.so gen_subkey.po $(OUTPRE)gen_subkey.$(OBJEXT): \
 gen_save_subkey.so gen_save_subkey.po $(OUTPRE)gen_save_subkey.$(OBJEXT): \
   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
   $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
-  $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
-  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
-  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
-  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
-  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
-  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
-  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
-  auth_con.h gen_save_subkey.c int-proto.h
+  $(COM_ERR_DEPS) $(srcdir)/../rcache/memrcache.h $(top_srcdir)/include/k5-buf.h \
+  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
+  $(top_srcdir)/include/socket-utils.h auth_con.h gen_save_subkey.c \
+  int-proto.h
 get_creds.so get_creds.po $(OUTPRE)get_creds.$(OBJEXT): \
   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
   $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
@@ -621,15 +623,15 @@ libdef_parse.so libdef_parse.po $(OUTPRE)libdef_parse.$(OBJEXT): \
   int-proto.h libdef_parse.c
 mk_cred.so mk_cred.po $(OUTPRE)mk_cred.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
-  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h \
-  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
-  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
-  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
-  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
-  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
-  $(top_srcdir)/include/socket-utils.h auth_con.h int-proto.h \
-  mk_cred.c
+  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../rcache/memrcache.h \
+  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+  auth_con.h int-proto.h mk_cred.c
 mk_error.so mk_error.po $(OUTPRE)mk_error.$(OBJEXT): \
   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
   $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
@@ -643,50 +645,41 @@ mk_error.so mk_error.po $(OUTPRE)mk_error.$(OBJEXT): \
   mk_error.c
 mk_priv.so mk_priv.po $(OUTPRE)mk_priv.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
-  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h \
-  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
-  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
-  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
-  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
-  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
-  $(top_srcdir)/include/socket-utils.h auth_con.h int-proto.h \
-  mk_priv.c
+  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../rcache/memrcache.h \
+  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+  auth_con.h int-proto.h mk_priv.c
 mk_rep.so mk_rep.po $(OUTPRE)mk_rep.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
-  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h \
-  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
-  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
-  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
-  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
-  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
-  $(top_srcdir)/include/socket-utils.h auth_con.h int-proto.h \
-  mk_rep.c
+  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../rcache/memrcache.h \
+  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+  auth_con.h int-proto.h mk_rep.c
 mk_req.so mk_req.po $(OUTPRE)mk_req.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
-  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h \
-  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
-  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
-  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
-  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
-  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
-  $(top_srcdir)/include/socket-utils.h auth_con.h mk_req.c
-mk_req_ext.so mk_req_ext.po $(OUTPRE)mk_req_ext.$(OBJEXT): \
-  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
-  $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
-  $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../rcache/memrcache.h \
+  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
   $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
   $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
   $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
   $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
   $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
   $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
-  auth_con.h int-proto.h mk_req_ext.c
-mk_safe.so mk_safe.po $(OUTPRE)mk_safe.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
-  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
-  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h \
+  auth_con.h mk_req.c
+mk_req_ext.so mk_req_ext.po $(OUTPRE)mk_req_ext.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
+  $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
+  $(COM_ERR_DEPS) $(srcdir)/../rcache/memrcache.h $(top_srcdir)/include/k5-buf.h \
   $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
   $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
   $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
@@ -694,7 +687,18 @@ mk_safe.so mk_safe.po $(OUTPRE)mk_safe.$(OBJEXT): $(BUILDTOP)/include/autoconf.h
   $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
   $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
   $(top_srcdir)/include/socket-utils.h auth_con.h int-proto.h \
-  mk_safe.c
+  mk_req_ext.c
+mk_safe.so mk_safe.po $(OUTPRE)mk_safe.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
+  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../rcache/memrcache.h \
+  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+  auth_con.h int-proto.h mk_safe.c
 pac.so pac.po $(OUTPRE)pac.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
   $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h \
@@ -717,6 +721,16 @@ pac_sign.so pac_sign.po $(OUTPRE)pac_sign.$(OBJEXT): \
   $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
   $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
   $(top_srcdir)/include/socket-utils.h authdata.h pac_sign.c
+padata.so padata.po $(OUTPRE)padata.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
+  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h \
+  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
+  $(top_srcdir)/include/socket-utils.h padata.c
 parse.so parse.po $(OUTPRE)parse.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
   $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h \
@@ -848,14 +862,15 @@ princ_comp.so princ_comp.po $(OUTPRE)princ_comp.$(OBJEXT): \
 privsafe.so privsafe.po $(OUTPRE)privsafe.$(OBJEXT): \
   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
   $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
-  $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
-  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
-  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
-  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
-  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
-  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
-  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
-  auth_con.h int-proto.h privsafe.c
+  $(COM_ERR_DEPS) $(srcdir)/../rcache/memrcache.h $(top_srcdir)/include/k5-buf.h \
+  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
+  $(top_srcdir)/include/socket-utils.h auth_con.h int-proto.h \
+  privsafe.c
 random_str.so random_str.po $(OUTPRE)random_str.$(OBJEXT): \
   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
   $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
@@ -869,15 +884,15 @@ random_str.so random_str.po $(OUTPRE)random_str.$(OBJEXT): \
   random_str.c
 rd_cred.so rd_cred.po $(OUTPRE)rd_cred.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
-  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h \
-  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
-  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
-  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
-  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
-  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
-  $(top_srcdir)/include/socket-utils.h auth_con.h int-proto.h \
-  rd_cred.c
+  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../rcache/memrcache.h \
+  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+  auth_con.h int-proto.h rd_cred.c
 rd_error.so rd_error.po $(OUTPRE)rd_error.$(OBJEXT): \
   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
   $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
@@ -891,69 +906,71 @@ rd_error.so rd_error.po $(OUTPRE)rd_error.$(OBJEXT): \
   rd_error.c
 rd_priv.so rd_priv.po $(OUTPRE)rd_priv.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
-  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h \
-  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
-  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
-  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
-  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
-  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
-  $(top_srcdir)/include/socket-utils.h auth_con.h int-proto.h \
-  rd_priv.c
+  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../rcache/memrcache.h \
+  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+  auth_con.h int-proto.h rd_priv.c
 rd_rep.so rd_rep.po $(OUTPRE)rd_rep.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
-  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h \
-  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
-  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
-  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
-  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
-  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
-  $(top_srcdir)/include/socket-utils.h auth_con.h rd_rep.c
+  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../rcache/memrcache.h \
+  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+  auth_con.h rd_rep.c
 rd_req.so rd_req.po $(OUTPRE)rd_req.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
-  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h \
-  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
-  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
-  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
-  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
-  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
-  $(top_srcdir)/include/socket-utils.h auth_con.h rd_req.c
-rd_req_dec.so rd_req_dec.po $(OUTPRE)rd_req_dec.$(OBJEXT): \
-  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
-  $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
-  $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../rcache/memrcache.h \
+  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
   $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
   $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
   $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
-  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/k5-utf8.h \
-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
-  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
-  $(top_srcdir)/include/socket-utils.h auth_con.h authdata.h \
-  int-proto.h rd_req_dec.c
-rd_safe.so rd_safe.po $(OUTPRE)rd_safe.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
-  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
-  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h \
+  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+  auth_con.h rd_req.c
+rd_req_dec.so rd_req_dec.po $(OUTPRE)rd_req_dec.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
+  $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
+  $(COM_ERR_DEPS) $(srcdir)/../rcache/memrcache.h $(top_srcdir)/include/k5-buf.h \
   $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
   $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
   $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
   $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
-  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
-  $(top_srcdir)/include/socket-utils.h auth_con.h int-proto.h \
-  rd_safe.c
-recvauth.so recvauth.po $(OUTPRE)recvauth.$(OBJEXT): \
-  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
-  $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
-  $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+  $(top_srcdir)/include/k5-utf8.h $(top_srcdir)/include/krb5.h \
+  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+  auth_con.h authdata.h int-proto.h rd_req_dec.c
+rd_safe.so rd_safe.po $(OUTPRE)rd_safe.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
+  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../rcache/memrcache.h \
+  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
   $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
   $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
   $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
   $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
   $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
   $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
-  auth_con.h recvauth.c
+  auth_con.h int-proto.h rd_safe.c
+recvauth.so recvauth.po $(OUTPRE)recvauth.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
+  $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
+  $(COM_ERR_DEPS) $(srcdir)/../rcache/memrcache.h $(top_srcdir)/include/k5-buf.h \
+  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
+  $(top_srcdir)/include/socket-utils.h auth_con.h recvauth.c
 response_items.so response_items.po $(OUTPRE)response_items.$(OBJEXT): \
   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
   $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
@@ -968,15 +985,15 @@ response_items.so response_items.po $(OUTPRE)response_items.$(OBJEXT): \
 s4u_authdata.so s4u_authdata.po $(OUTPRE)s4u_authdata.$(OBJEXT): \
   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
   $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
-  $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
-  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
-  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
-  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
-  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/k5-utf8.h \
-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
-  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
-  $(top_srcdir)/include/socket-utils.h auth_con.h authdata.h \
-  int-proto.h s4u_authdata.c
+  $(COM_ERR_DEPS) $(srcdir)/../rcache/memrcache.h $(top_srcdir)/include/k5-buf.h \
+  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+  $(top_srcdir)/include/k5-utf8.h $(top_srcdir)/include/krb5.h \
+  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+  auth_con.h authdata.h int-proto.h s4u_authdata.c
 s4u_creds.so s4u_creds.po $(OUTPRE)s4u_creds.$(OBJEXT): \
   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
   $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
@@ -991,15 +1008,15 @@ s4u_creds.so s4u_creds.po $(OUTPRE)s4u_creds.$(OBJEXT): \
 sendauth.so sendauth.po $(OUTPRE)sendauth.$(OBJEXT): \
   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
   $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
-  $(COM_ERR_DEPS) $(srcdir)/../os/os-proto.h $(top_srcdir)/include/k5-buf.h \
-  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
-  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
-  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
-  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
-  $(top_srcdir)/include/krb5/locate_plugin.h $(top_srcdir)/include/krb5/plugin.h \
-  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
-  auth_con.h sendauth.c
+  $(COM_ERR_DEPS) $(srcdir)/../os/os-proto.h $(srcdir)/../rcache/memrcache.h \
+  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/locate_plugin.h \
+  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
+  $(top_srcdir)/include/socket-utils.h auth_con.h sendauth.c
 send_tgs.so send_tgs.po $(OUTPRE)send_tgs.$(OBJEXT): \
   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
   $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
@@ -1014,14 +1031,15 @@ send_tgs.so send_tgs.po $(OUTPRE)send_tgs.$(OBJEXT): \
 ser_actx.so ser_actx.po $(OUTPRE)ser_actx.$(OBJEXT): \
   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
   $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
-  $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
-  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
-  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
-  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
-  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
-  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
-  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
-  auth_con.h int-proto.h ser_actx.c
+  $(COM_ERR_DEPS) $(srcdir)/../rcache/memrcache.h $(top_srcdir)/include/k5-buf.h \
+  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
+  $(top_srcdir)/include/socket-utils.h auth_con.h int-proto.h \
+  ser_actx.c
 ser_adata.so ser_adata.po $(OUTPRE)ser_adata.$(OBJEXT): \
   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
   $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
@@ -1262,14 +1280,15 @@ t_kerb.so t_kerb.po $(OUTPRE)t_kerb.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(top_srcdir)/include/socket-utils.h t_kerb.c
 t_ser.so t_ser.po $(OUTPRE)t_ser.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
-  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h \
-  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
-  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
-  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
-  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
-  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
-  $(top_srcdir)/include/socket-utils.h auth_con.h t_ser.c
+  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../rcache/memrcache.h \
+  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+  auth_con.h t_ser.c
 t_deltat.so t_deltat.po $(OUTPRE)t_deltat.$(OBJEXT): \
   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
   $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
diff --git a/src/lib/krb5/os/deps b/src/lib/krb5/os/deps
index 9e4e210b10..aed7792a70 100644
--- a/src/lib/krb5/os/deps
+++ b/src/lib/krb5/os/deps
@@ -40,15 +40,15 @@ changepw.so changepw.po $(OUTPRE)changepw.$(OBJEXT): \
   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
   $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
   $(COM_ERR_DEPS) $(srcdir)/../krb/auth_con.h $(srcdir)/../krb/int-proto.h \
-  $(top_srcdir)/include/fake-addrinfo.h $(top_srcdir)/include/k5-buf.h \
-  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
-  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
-  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
-  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
-  $(top_srcdir)/include/krb5/locate_plugin.h $(top_srcdir)/include/krb5/plugin.h \
-  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
-  changepw.c os-proto.h
+  $(srcdir)/../rcache/memrcache.h $(top_srcdir)/include/fake-addrinfo.h \
+  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/locate_plugin.h \
+  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
+  $(top_srcdir)/include/socket-utils.h changepw.c os-proto.h
 dnsglue.so dnsglue.po $(OUTPRE)dnsglue.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
   $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h \
diff --git a/src/man/k5identity.man b/src/man/k5identity.man
index b3222ae441..8728dbfbe3 100644
--- a/src/man/k5identity.man
+++ b/src/man/k5identity.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "K5IDENTITY" "5" " " "1.17" "MIT Kerberos"
+.TH "K5IDENTITY" "5" " " "1.19" "MIT Kerberos"
 .SH NAME
 k5identity \- Kerberos V5 client principal selection rules
 .
@@ -98,6 +98,6 @@ kerberos(1), krb5.conf(5)
 .SH AUTHOR
 MIT
 .SH COPYRIGHT
-1985-2018, MIT
+1985-2020, MIT
 .\" Generated by docutils manpage writer.
 .
diff --git a/src/man/k5login.man b/src/man/k5login.man
index a87cba4aec..691f9e6dda 100644
--- a/src/man/k5login.man
+++ b/src/man/k5login.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "K5LOGIN" "5" " " "1.17" "MIT Kerberos"
+.TH "K5LOGIN" "5" " " "1.19" "MIT Kerberos"
 .SH NAME
 k5login \- Kerberos V5 acl file for host access
 .
@@ -91,6 +91,6 @@ kerberos(1)
 .SH AUTHOR
 MIT
 .SH COPYRIGHT
-1985-2018, MIT
+1985-2020, MIT
 .\" Generated by docutils manpage writer.
 .
diff --git a/src/man/k5srvutil.man b/src/man/k5srvutil.man
index d2316cdf85..9584f32baf 100644
--- a/src/man/k5srvutil.man
+++ b/src/man/k5srvutil.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "K5SRVUTIL" "1" " " "1.17" "MIT Kerberos"
+.TH "K5SRVUTIL" "1" " " "1.19" "MIT Kerberos"
 .SH NAME
 k5srvutil \- host key table (keytab) manipulation utility
 .
@@ -90,6 +90,6 @@ kadmin(1), ktutil(1), kerberos(7)
 .SH AUTHOR
 MIT
 .SH COPYRIGHT
-1985-2018, MIT
+1985-2020, MIT
 .\" Generated by docutils manpage writer.
 .
diff --git a/src/man/kadm5.acl.man b/src/man/kadm5.acl.man
index fb1169c461..10e2165c2c 100644
--- a/src/man/kadm5.acl.man
+++ b/src/man/kadm5.acl.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KADM5.ACL" "5" " " "1.17" "MIT Kerberos"
+.TH "KADM5.ACL" "5" " " "1.19" "MIT Kerberos"
 .SH NAME
 kadm5.acl \- Kerberos ACL file
 .
@@ -274,6 +274,6 @@ kdc.conf(5), kadmind(8)
 .SH AUTHOR
 MIT
 .SH COPYRIGHT
-1985-2018, MIT
+1985-2020, MIT
 .\" Generated by docutils manpage writer.
 .
diff --git a/src/man/kadmin.man b/src/man/kadmin.man
index b514fe2793..43f4c226b9 100644
--- a/src/man/kadmin.man
+++ b/src/man/kadmin.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KADMIN" "1" " " "1.18" "MIT Kerberos"
+.TH "KADMIN" "1" " " "1.19" "MIT Kerberos"
 .SH NAME
 kadmin \- Kerberos V5 database administration program
 .
@@ -1081,6 +1081,6 @@ kpasswd(1), kadmind(8), kerberos(7)
 .SH AUTHOR
 MIT
 .SH COPYRIGHT
-1985-2019, MIT
+1985-2020, MIT
 .\" Generated by docutils manpage writer.
 .
diff --git a/src/man/kadmind.man b/src/man/kadmind.man
index f624b013f1..6bed419c11 100644
--- a/src/man/kadmind.man
+++ b/src/man/kadmind.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KADMIND" "8" " " "1.18" "MIT Kerberos"
+.TH "KADMIND" "8" " " "1.19" "MIT Kerberos"
 .SH NAME
 kadmind \- KADM5 administration server
 .
@@ -148,6 +148,6 @@ kdb5_ldap_util(8), kadm5.acl(5), kerberos(7)
 .SH AUTHOR
 MIT
 .SH COPYRIGHT
-1985-2019, MIT
+1985-2020, MIT
 .\" Generated by docutils manpage writer.
 .
diff --git a/src/man/kdb5_ldap_util.man b/src/man/kdb5_ldap_util.man
index 0522de404d..e2a8beb7e6 100644
--- a/src/man/kdb5_ldap_util.man
+++ b/src/man/kdb5_ldap_util.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KDB5_LDAP_UTIL" "8" " " "1.18" "MIT Kerberos"
+.TH "KDB5_LDAP_UTIL" "8" " " "1.19" "MIT Kerberos"
 .SH NAME
 kdb5_ldap_util \- Kerberos configuration utility
 .
@@ -522,6 +522,6 @@ kadmin(1), kerberos(7)
 .SH AUTHOR
 MIT
 .SH COPYRIGHT
-1985-2019, MIT
+1985-2020, MIT
 .\" Generated by docutils manpage writer.
 .
diff --git a/src/man/kdb5_util.man b/src/man/kdb5_util.man
index 46772a236a..64348bd791 100644
--- a/src/man/kdb5_util.man
+++ b/src/man/kdb5_util.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KDB5_UTIL" "8" " " "1.18" "MIT Kerberos"
+.TH "KDB5_UTIL" "8" " " "1.19" "MIT Kerberos"
 .SH NAME
 kdb5_util \- Kerberos database maintenance utility
 .
@@ -554,6 +554,6 @@ kadmin(1), kerberos(7)
 .SH AUTHOR
 MIT
 .SH COPYRIGHT
-1985-2019, MIT
+1985-2020, MIT
 .\" Generated by docutils manpage writer.
 .
diff --git a/src/man/kdc.conf.man b/src/man/kdc.conf.man
index 7843ec463c..7b1b7c73e4 100644
--- a/src/man/kdc.conf.man
+++ b/src/man/kdc.conf.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KDC.CONF" "5" " " "1.18" "MIT Kerberos"
+.TH "KDC.CONF" "5" " " "1.19" "MIT Kerberos"
 .SH NAME
 kdc.conf \- Kerberos V5 KDC configuration file
 .
@@ -480,7 +480,7 @@ specified multiple times.  New in release 1.17.
 (List of \fIkey\fP:\fIsalt\fP strings.)  Specifies the default key/salt
 combinations of principals for this realm.  Any principals created
 through kadmin(1) will have keys of these types.  The
-default value for this tag is \fBaes256\-cts\-hmac\-sha1\-96:normal aes128\-cts\-hmac\-sha1\-96:normal des3\-cbc\-sha1:normal arcfour\-hmac\-md5:normal\fP\&.  For lists of
+default value for this tag is \fBaes256\-cts\-hmac\-sha1\-96:normal aes128\-cts\-hmac\-sha1\-96:normal\fP\&.  For lists of
 possible values, see \fI\%Keysalt lists\fP\&.
 .UNINDENT
 .SS [dbdefaults]
@@ -1179,6 +1179,6 @@ krb5.conf(5), krb5kdc(8), kadm5.acl(5)
 .SH AUTHOR
 MIT
 .SH COPYRIGHT
-1985-2019, MIT
+1985-2020, MIT
 .\" Generated by docutils manpage writer.
 .
diff --git a/src/man/kdestroy.man b/src/man/kdestroy.man
index 7b4b2174b5..52c604c13d 100644
--- a/src/man/kdestroy.man
+++ b/src/man/kdestroy.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KDESTROY" "1" " " "1.17" "MIT Kerberos"
+.TH "KDESTROY" "1" " " "1.19" "MIT Kerberos"
 .SH NAME
 kdestroy \- destroy Kerberos tickets
 .
@@ -89,6 +89,6 @@ kinit(1), klist(1), kerberos(7)
 .SH AUTHOR
 MIT
 .SH COPYRIGHT
-1985-2018, MIT
+1985-2020, MIT
 .\" Generated by docutils manpage writer.
 .
diff --git a/src/man/kerberos.man b/src/man/kerberos.man
index effdd8e756..ea4fce109a 100644
--- a/src/man/kerberos.man
+++ b/src/man/kerberos.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KERBEROS" "7" " " "1.18" "MIT Kerberos"
+.TH "KERBEROS" "7" " " "1.19" "MIT Kerberos"
 .SH NAME
 kerberos \- Overview of using Kerberos
 .
@@ -212,6 +212,6 @@ Institute of Technology
 .SH AUTHOR
 MIT
 .SH COPYRIGHT
-1985-2019, MIT
+1985-2020, MIT
 .\" Generated by docutils manpage writer.
 .
diff --git a/src/man/kinit.man b/src/man/kinit.man
index a3dcfe26cc..4ff4a19353 100644
--- a/src/man/kinit.man
+++ b/src/man/kinit.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KINIT" "1" " " "1.18" "MIT Kerberos"
+.TH "KINIT" "1" " " "1.19" "MIT Kerberos"
 .SH NAME
 kinit \- obtain and cache Kerberos ticket-granting ticket
 .
@@ -246,6 +246,6 @@ klist(1), kdestroy(1), kerberos(7)
 .SH AUTHOR
 MIT
 .SH COPYRIGHT
-1985-2019, MIT
+1985-2020, MIT
 .\" Generated by docutils manpage writer.
 .
diff --git a/src/man/klist.man b/src/man/klist.man
index 8f3b4df5b6..76791a0b92 100644
--- a/src/man/klist.man
+++ b/src/man/klist.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KLIST" "1" " " "1.17" "MIT Kerberos"
+.TH "KLIST" "1" " " "1.19" "MIT Kerberos"
 .SH NAME
 klist \- list cached Kerberos tickets
 .
@@ -149,6 +149,6 @@ kinit(1), kdestroy(1), kerberos(7)
 .SH AUTHOR
 MIT
 .SH COPYRIGHT
-1985-2018, MIT
+1985-2020, MIT
 .\" Generated by docutils manpage writer.
 .
diff --git a/src/man/kpasswd.man b/src/man/kpasswd.man
index ef12654a88..a19b5775b0 100644
--- a/src/man/kpasswd.man
+++ b/src/man/kpasswd.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KPASSWD" "1" " " "1.17" "MIT Kerberos"
+.TH "KPASSWD" "1" " " "1.19" "MIT Kerberos"
 .SH NAME
 kpasswd \- change a user's Kerberos password
 .
@@ -63,6 +63,6 @@ kadmin(1), kadmind(8), kerberos(7)
 .SH AUTHOR
 MIT
 .SH COPYRIGHT
-1985-2018, MIT
+1985-2020, MIT
 .\" Generated by docutils manpage writer.
 .
diff --git a/src/man/kprop.man b/src/man/kprop.man
index 7bbc5c1e17..7486596d27 100644
--- a/src/man/kprop.man
+++ b/src/man/kprop.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KPROP" "8" " " "1.17" "MIT Kerberos"
+.TH "KPROP" "8" " " "1.19" "MIT Kerberos"
 .SH NAME
 kprop \- propagate a Kerberos V5 principal database to a replica server
 .
@@ -77,6 +77,6 @@ kerberos(7)
 .SH AUTHOR
 MIT
 .SH COPYRIGHT
-1985-2018, MIT
+1985-2020, MIT
 .\" Generated by docutils manpage writer.
 .
diff --git a/src/man/kpropd.man b/src/man/kpropd.man
index 262a8ef5cd..e2bf30a22c 100644
--- a/src/man/kpropd.man
+++ b/src/man/kpropd.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KPROPD" "8" " " "1.17" "MIT Kerberos"
+.TH "KPROPD" "8" " " "1.19" "MIT Kerberos"
 .SH NAME
 kpropd \- Kerberos V5 replica KDC update server
 .
@@ -167,6 +167,6 @@ kerberos(7), inetd(8)
 .SH AUTHOR
 MIT
 .SH COPYRIGHT
-1985-2018, MIT
+1985-2020, MIT
 .\" Generated by docutils manpage writer.
 .
diff --git a/src/man/kproplog.man b/src/man/kproplog.man
index 88d089cd69..3c364cd2a0 100644
--- a/src/man/kproplog.man
+++ b/src/man/kproplog.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KPROPLOG" "8" " " "1.17" "MIT Kerberos"
+.TH "KPROPLOG" "8" " " "1.19" "MIT Kerberos"
 .SH NAME
 kproplog \- display the contents of the Kerberos principal update log
 .
@@ -109,6 +109,6 @@ kpropd(8), kerberos(7)
 .SH AUTHOR
 MIT
 .SH COPYRIGHT
-1985-2018, MIT
+1985-2020, MIT
 .\" Generated by docutils manpage writer.
 .
diff --git a/src/man/krb5-config.man b/src/man/krb5-config.man
index 59a151f03e..ae97238a4a 100644
--- a/src/man/krb5-config.man
+++ b/src/man/krb5-config.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KRB5-CONFIG" "1" " " "1.17" "MIT Kerberos"
+.TH "KRB5-CONFIG" "1" " " "1.19" "MIT Kerberos"
 .SH NAME
 krb5-config \- tool for linking against MIT Kerberos libraries
 .
@@ -136,6 +136,6 @@ kerberos(7), cc(1)
 .SH AUTHOR
 MIT
 .SH COPYRIGHT
-1985-2018, MIT
+1985-2020, MIT
 .\" Generated by docutils manpage writer.
 .
diff --git a/src/man/krb5.conf.man b/src/man/krb5.conf.man
index 7b6ada5673..4005f4cc1c 100644
--- a/src/man/krb5.conf.man
+++ b/src/man/krb5.conf.man
@@ -405,6 +405,15 @@ which forces libkrb5 to attempt to use PKINIT if it is supported.
 If this flag is true, initial tickets will be proxiable by
 default, if allowed by the KDC.  The default value is false.
 .TP
+\fBqualify_shortname\fP
+If this string is set, it determines the domain suffix for
+single\-component hostnames when DNS canonicalization is not used
+(either because \fBdns_canonicalize_hostname\fP is false or because
+forward canonicalization failed).  The default value is the first
+search domain of the system\(aqs DNS configuration.  To disable
+qualification of shortnames, set this relation to the empty string
+with \fBqualify_shortname = ""\fP\&.  (New in release 1.18.)
+.TP
 \fBrdns\fP
 If this flag is true, reverse name lookup will be used in addition
 to forward name lookup to canonicalizing hostnames for use in
@@ -1474,6 +1483,6 @@ syslog(3)
 .SH AUTHOR
 MIT
 .SH COPYRIGHT
-1985-2019, MIT
+1985-2020, MIT
 .\" Generated by docutils manpage writer.
 .
diff --git a/src/man/krb5kdc.man b/src/man/krb5kdc.man
index e0cc519daf..986e805f30 100644
--- a/src/man/krb5kdc.man
+++ b/src/man/krb5kdc.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KRB5KDC" "8" " " "1.18" "MIT Kerberos"
+.TH "KRB5KDC" "8" " " "1.19" "MIT Kerberos"
 .SH NAME
 krb5kdc \- Kerberos V5 KDC
 .
@@ -135,6 +135,6 @@ kdb5_ldap_util(8), kerberos(7)
 .SH AUTHOR
 MIT
 .SH COPYRIGHT
-1985-2019, MIT
+1985-2020, MIT
 .\" Generated by docutils manpage writer.
 .
diff --git a/src/man/ksu.man b/src/man/ksu.man
index a35e53a7ee..f2b1ac0c63 100644
--- a/src/man/ksu.man
+++ b/src/man/ksu.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KSU" "1" " " "1.17" "MIT Kerberos"
+.TH "KSU" "1" " " "1.19" "MIT Kerberos"
 .SH NAME
 ksu \- Kerberized super-user
 .
@@ -38,7 +38,8 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 [ \fB\-c\fP \fIsource_cache_name\fP ]
 [ \fB\-k\fP ]
 [ \fB\-r\fP time ]
-[ \fB\-pf\fP ]
+[ \fB\-p\fP | \fB\-P\fP]
+[ \fB\-f\fP | \fB\-F\fP]
 [ \fB\-l\fP \fIlifetime\fP ]
 [ \fB\-z | Z\fP ]
 [ \fB\-q\fP ]
@@ -289,7 +290,7 @@ Suppress the printing of status messages.
 Ticket granting ticket options:
 .INDENT 0.0
 .TP
-\fB\-l\fP \fIlifetime\fP \fB\-r\fP \fItime\fP \fB\-pf\fP
+\fB\-l\fP \fIlifetime\fP \fB\-r\fP \fItime\fP \fB\-p\fP \fB\-P\fP \fB\-f\fP \fB\-F\fP
 The ticket granting ticket options only apply to the case where
 there are no appropriate tickets in the cache to authenticate the
 source user.  In this case if ksu is configured to prompt users
@@ -311,10 +312,20 @@ total lifetime of the ticket.
 specifies that the \fBproxiable\fP option should be requested for
 the ticket.
 .TP
+\fB\-P\fP
+specifies that the \fBproxiable\fP option should not be requested
+for the ticket, even if the default configuration is to ask for
+proxiable tickets.
+.TP
 \fB\-f\fP
 option specifies that the \fBforwardable\fP option should be
 requested for the ticket.
 .TP
+\fB\-F\fP
+option specifies that the \fBforwardable\fP option should not be
+requested for the ticket, even if the default configuration is to
+ask for forwardable tickets.
+.TP
 \fB\-e\fP \fIcommand\fP [\fIargs\fP ...]
 ksu proceeds exactly the same as if it was invoked without the
 \fB\-e\fP option, except instead of executing the target shell, ksu
@@ -463,6 +474,6 @@ kerberos(7), kinit(1)
 .SH AUTHOR
 MIT
 .SH COPYRIGHT
-1985-2018, MIT
+1985-2020, MIT
 .\" Generated by docutils manpage writer.
 .
diff --git a/src/man/kswitch.man b/src/man/kswitch.man
index 96325220d8..5d2f95fd08 100644
--- a/src/man/kswitch.man
+++ b/src/man/kswitch.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KSWITCH" "1" " " "1.17" "MIT Kerberos"
+.TH "KSWITCH" "1" " " "1.19" "MIT Kerberos"
 .SH NAME
 kswitch \- switch primary ticket cache
 .
@@ -66,6 +66,6 @@ kerberos(7)
 .SH AUTHOR
 MIT
 .SH COPYRIGHT
-1985-2018, MIT
+1985-2020, MIT
 .\" Generated by docutils manpage writer.
 .
diff --git a/src/man/ktutil.man b/src/man/ktutil.man
index 2333294689..a3eb57f7cd 100644
--- a/src/man/ktutil.man
+++ b/src/man/ktutil.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KTUTIL" "1" " " "1.18" "MIT Kerberos"
+.TH "KTUTIL" "1" " " "1.19" "MIT Kerberos"
 .SH NAME
 ktutil \- Kerberos keytab file maintenance utility
 .
@@ -157,6 +157,6 @@ kadmin(1), kdb5_util(8), kerberos(7)
 .SH AUTHOR
 MIT
 .SH COPYRIGHT
-1985-2019, MIT
+1985-2020, MIT
 .\" Generated by docutils manpage writer.
 .
diff --git a/src/man/kvno.man b/src/man/kvno.man
index 129c9f2e24..aac6e2669a 100644
--- a/src/man/kvno.man
+++ b/src/man/kvno.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KVNO" "1" " " "1.18" "MIT Kerberos"
+.TH "KVNO" "1" " " "1.19" "MIT Kerberos"
 .SH NAME
 kvno \- print key version numbers of Kerberos principals
 .
@@ -117,6 +117,6 @@ kinit(1), kdestroy(1), kerberos(7)
 .SH AUTHOR
 MIT
 .SH COPYRIGHT
-1985-2019, MIT
+1985-2020, MIT
 .\" Generated by docutils manpage writer.
 .
diff --git a/src/man/sclient.man b/src/man/sclient.man
index f042918d33..e59ee47639 100644
--- a/src/man/sclient.man
+++ b/src/man/sclient.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SCLIENT" "1" " " "1.17" "MIT Kerberos"
+.TH "SCLIENT" "1" " " "1.19" "MIT Kerberos"
 .SH NAME
 sclient \- sample Kerberos version 5 client
 .
@@ -49,6 +49,6 @@ kinit(1), sserver(8), kerberos(7)
 .SH AUTHOR
 MIT
 .SH COPYRIGHT
-1985-2018, MIT
+1985-2020, MIT
 .\" Generated by docutils manpage writer.
 .
diff --git a/src/man/sserver.man b/src/man/sserver.man
index 6fa92a8f34..de597953ad 100644
--- a/src/man/sserver.man
+++ b/src/man/sserver.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SSERVER" "8" " " "1.17" "MIT Kerberos"
+.TH "SSERVER" "8" " " "1.19" "MIT Kerberos"
 .SH NAME
 sserver \- sample Kerberos version 5 server
 .
@@ -193,6 +193,6 @@ sclient(1), kerberos(7), services(5), inetd(8)
 .SH AUTHOR
 MIT
 .SH COPYRIGHT
-1985-2018, MIT
+1985-2020, MIT
 .\" Generated by docutils manpage writer.
 .
diff --git a/src/plugins/certauth/test/deps b/src/plugins/certauth/test/deps
index 2974b3b57e..f826105412 100644
--- a/src/plugins/certauth/test/deps
+++ b/src/plugins/certauth/test/deps
@@ -8,7 +8,7 @@ main.so main.po $(OUTPRE)main.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
   $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
   $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
-  $(top_srcdir)/include/krb5/certauth_plugin.h $(top_srcdir)/include/krb5/plugin.h \
-  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
-  main.c
+  $(top_srcdir)/include/kdb.h $(top_srcdir)/include/krb5.h \
+  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/certauth_plugin.h \
+  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
+  $(top_srcdir)/include/socket-utils.h main.c
diff --git a/src/po/mit-krb5.pot b/src/po/mit-krb5.pot
index b940699912..c3e64e47e6 100644
--- a/src/po/mit-krb5.pot
+++ b/src/po/mit-krb5.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: mit-krb5 1.17-prerelease\n"
+"Project-Id-Version: mit-krb5 1.19-prerelease\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-26 19:09-0400\n"
+"POT-Creation-Date: 2020-03-26 00:26-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -55,7 +55,7 @@ msgid "Other credential caches present, use -A to destroy all\n"
 msgstr ""
 
 #: ../../src/clients/kdestroy/kdestroy.c:110
-#: ../../src/clients/kinit/kinit.c:346 ../../src/clients/ksu/main.c:288
+#: ../../src/clients/kinit/kinit.c:346 ../../src/clients/ksu/main.c:295
 #, c-format
 msgid "Only one -c option allowed\n"
 msgstr ""
@@ -79,8 +79,8 @@ msgstr ""
 #: ../../src/clients/kdestroy/kdestroy.c:150
 #: ../../src/clients/klist/klist.c:239 ../../src/clients/ksu/main.c:134
 #: ../../src/clients/ksu/main.c:140 ../../src/clients/kswitch/kswitch.c:94
-#: ../../src/kadmin/ktutil/ktutil.c:52 ../../src/kdc/main.c:939
-#: ../../src/kprop/kprop.c:102 ../../src/kprop/kpropd.c:1058
+#: ../../src/kadmin/ktutil/ktutil.c:52 ../../src/kdc/main.c:953
+#: ../../src/kprop/kprop.c:102 ../../src/kprop/kpropd.c:1057
 msgid "while initializing krb5"
 msgstr ""
 
@@ -99,9 +99,9 @@ msgid "while destroying cache %s"
 msgstr ""
 
 #: ../../src/clients/kdestroy/kdestroy.c:190
-#: ../../src/clients/kswitch/kswitch.c:107 ../../src/clients/kvno/kvno.c:189
-#: ../../src/clients/kvno/kvno.c:373 ../../src/kadmin/cli/keytab.c:373
-#: ../../src/kadmin/dbutil/kdb5_util.c:547
+#: ../../src/clients/kswitch/kswitch.c:107 ../../src/clients/kvno/kvno.c:295
+#: ../../src/clients/kvno/kvno.c:482 ../../src/kadmin/cli/keytab.c:373
+#: ../../src/kadmin/dbutil/kdb5_util.c:544
 #, c-format
 msgid "while parsing principal name %s"
 msgstr ""
@@ -116,7 +116,7 @@ msgstr ""
 msgid "while resolving ccache"
 msgstr ""
 
-#: ../../src/clients/kdestroy/kdestroy.c:211 ../../src/clients/ksu/main.c:990
+#: ../../src/clients/kdestroy/kdestroy.c:211 ../../src/clients/ksu/main.c:997
 msgid "while destroying cache"
 msgstr ""
 
@@ -323,14 +323,14 @@ msgid "while getting default ccache"
 msgstr ""
 
 #: ../../src/clients/kinit/kinit.c:476 ../../src/clients/kinit/kinit.c:555
-#: ../../src/clients/kpasswd/kpasswd.c:30 ../../src/clients/ksu/main.c:241
+#: ../../src/clients/kpasswd/kpasswd.c:30 ../../src/clients/ksu/main.c:248
 #, c-format
 msgid "when parsing name %s"
 msgstr ""
 
-#: ../../src/clients/kinit/kinit.c:484 ../../src/kadmin/dbutil/kdb5_util.c:311
+#: ../../src/clients/kinit/kinit.c:484 ../../src/kadmin/dbutil/kdb5_util.c:309
 #: ../../src/kprop/kprop.c:156
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:391
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:395
 msgid "while getting default realm"
 msgstr ""
 
@@ -411,7 +411,7 @@ msgstr ""
 msgid "while setting up KDB keytab for realm %s"
 msgstr ""
 
-#: ../../src/clients/kinit/kinit.c:733 ../../src/clients/kvno/kvno.c:363
+#: ../../src/clients/kinit/kinit.c:733 ../../src/clients/kvno/kvno.c:473
 #, c-format
 msgid "resolving keytab %s"
 msgstr ""
@@ -604,7 +604,7 @@ msgid "while starting keytab scan"
 msgstr ""
 
 #: ../../src/clients/klist/klist.c:326 ../../src/clients/klist/klist.c:482
-#: ../../src/clients/ksu/ccache.c:455 ../../src/kadmin/dbutil/dump.c:564
+#: ../../src/clients/ksu/ccache.c:455 ../../src/kadmin/dbutil/dump.c:487
 #: ../../src/kadmin/dbutil/tabdump.c:549
 msgid "while unparsing principal name"
 msgstr ""
@@ -645,61 +645,70 @@ msgstr ""
 msgid "while retrieving a ticket"
 msgstr ""
 
-#: ../../src/clients/klist/klist.c:665 ../../src/clients/ksu/ccache.c:440
-#: ../../src/kprop/kpropd.c:1209 ../../src/kprop/kpropd.c:1269
+#: ../../src/clients/klist/klist.c:672 ../../src/clients/ksu/ccache.c:440
+#: ../../src/kprop/kpropd.c:1204 ../../src/kprop/kpropd.c:1269
 msgid "while unparsing client name"
 msgstr ""
 
-#: ../../src/clients/klist/klist.c:670 ../../src/clients/ksu/ccache.c:445
+#: ../../src/clients/klist/klist.c:677 ../../src/clients/ksu/ccache.c:445
 #: ../../src/kprop/kprop.c:190
 msgid "while unparsing server name"
 msgstr ""
 
-#: ../../src/clients/klist/klist.c:700 ../../src/clients/ksu/ccache.c:470
+#: ../../src/clients/klist/klist.c:708 ../../src/clients/ksu/ccache.c:470
 #, c-format
 msgid "\tfor client %s"
 msgstr ""
 
-#: ../../src/clients/klist/klist.c:712 ../../src/clients/ksu/ccache.c:479
+#: ../../src/clients/klist/klist.c:720 ../../src/clients/ksu/ccache.c:479
 msgid "renew until "
 msgstr ""
 
-#: ../../src/clients/klist/klist.c:729 ../../src/clients/ksu/ccache.c:489
+#: ../../src/clients/klist/klist.c:732 ../../src/clients/ksu/ccache.c:489
 #, c-format
 msgid "Flags: %s"
 msgstr ""
 
-#: ../../src/clients/klist/klist.c:748
+#: ../../src/clients/klist/klist.c:747
 #, c-format
 msgid "Etype (skey, tkt): %s, "
 msgstr ""
 
-#: ../../src/clients/klist/klist.c:764
+#: ../../src/clients/klist/klist.c:759
 #, c-format
 msgid "AD types: "
 msgstr ""
 
-#: ../../src/clients/klist/klist.c:780
+#: ../../src/clients/klist/klist.c:775
 #, c-format
 msgid "\tAddresses: (none)\n"
 msgstr ""
 
-#: ../../src/clients/klist/klist.c:782
+#: ../../src/clients/klist/klist.c:777
 #, c-format
 msgid "\tAddresses: "
 msgstr ""
 
-#: ../../src/clients/klist/klist.c:816 ../../src/clients/klist/klist.c:826
+#: ../../src/clients/klist/klist.c:795
+msgid "while unparsing ticket server name"
+msgstr ""
+
+#: ../../src/clients/klist/klist.c:798
+#, c-format
+msgid "\tTicket server: %s\n"
+msgstr ""
+
+#: ../../src/clients/klist/klist.c:826 ../../src/clients/klist/klist.c:836
 #, c-format
 msgid "broken address (type %d length %d)"
 msgstr ""
 
-#: ../../src/clients/klist/klist.c:835
+#: ../../src/clients/klist/klist.c:845
 #, c-format
 msgid "unknown addrtype %d"
 msgstr ""
 
-#: ../../src/clients/klist/klist.c:844
+#: ../../src/clients/klist/klist.c:854
 #, c-format
 msgid "unprintable address (type %d, error %d %s)"
 msgstr ""
@@ -842,7 +851,7 @@ msgstr ""
 msgid "         in remotely using an unsecure (non-encrypted) channel. \n"
 msgstr ""
 
-#: ../../src/clients/ksu/krb_auth_su.c:114 ../../src/clients/ksu/main.c:473
+#: ../../src/clients/ksu/krb_auth_su.c:114 ../../src/clients/ksu/main.c:480
 msgid "while reclaiming root uid"
 msgstr ""
 
@@ -874,22 +883,22 @@ msgstr ""
 msgid "while reading password for '%s'\n"
 msgstr ""
 
-#: ../../src/clients/ksu/krb_auth_su.c:191
+#: ../../src/clients/ksu/krb_auth_su.c:190
 #, c-format
 msgid "No password given\n"
 msgstr ""
 
-#: ../../src/clients/ksu/krb_auth_su.c:205
+#: ../../src/clients/ksu/krb_auth_su.c:203
 #, c-format
 msgid "%s: Password incorrect\n"
 msgstr ""
 
-#: ../../src/clients/ksu/krb_auth_su.c:207
+#: ../../src/clients/ksu/krb_auth_su.c:205
 msgid "while getting initial credentials"
 msgstr ""
 
-#: ../../src/clients/ksu/krb_auth_su.c:227
-#: ../../src/clients/ksu/krb_auth_su.c:241
+#: ../../src/clients/ksu/krb_auth_su.c:225
+#: ../../src/clients/ksu/krb_auth_su.c:239
 #, c-format
 msgid " %s while unparsing name\n"
 msgstr ""
@@ -898,7 +907,8 @@ msgstr ""
 #, c-format
 msgid ""
 "Usage: %s [target user] [-n principal] [-c source cachename] [-k] [-r time] "
-"[-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n"
+"[-p|-P] [-f|-F] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a "
+"[args... ] ]\n"
 msgstr ""
 
 #: ../../src/clients/ksu/main.c:150
@@ -914,261 +924,261 @@ msgstr ""
 msgid "while setting euid to source user"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:199 ../../src/clients/ksu/main.c:234
+#: ../../src/clients/ksu/main.c:200 ../../src/clients/ksu/main.c:241
 #, c-format
 msgid "Bad lifetime value (%s hours?)\n"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:211 ../../src/clients/ksu/main.c:296
+#: ../../src/clients/ksu/main.c:212 ../../src/clients/ksu/main.c:303
 msgid "when gathering parameters"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:255
+#: ../../src/clients/ksu/main.c:262
 #, c-format
 msgid "-z option is mutually exclusive with -Z.\n"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:263
+#: ../../src/clients/ksu/main.c:270
 #, c-format
 msgid "-Z option is mutually exclusive with -z.\n"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:276
+#: ../../src/clients/ksu/main.c:283
 #, c-format
 msgid "while looking for credentials cache %s"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:282
+#: ../../src/clients/ksu/main.c:289
 #, c-format
 msgid "malformed credential cache name %s\n"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:340
+#: ../../src/clients/ksu/main.c:347
 #, c-format
 msgid "ksu: who are you?\n"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:344
+#: ../../src/clients/ksu/main.c:351
 #, c-format
 msgid "Your uid doesn't match your passwd entry?!\n"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:359
+#: ../../src/clients/ksu/main.c:366
 #, c-format
 msgid "ksu: unknown login %s\n"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:379
+#: ../../src/clients/ksu/main.c:386
 msgid "while getting source cache"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:388
+#: ../../src/clients/ksu/main.c:395
 msgid "while selecting the best principal"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:396
+#: ../../src/clients/ksu/main.c:403
 msgid "while returning to source uid after finding best principal"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:416
+#: ../../src/clients/ksu/main.c:423
 #, c-format
 msgid "account %s: authorization failed\n"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:451
+#: ../../src/clients/ksu/main.c:458
 msgid "while parsing temporary name"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:456
+#: ../../src/clients/ksu/main.c:463
 msgid "while creating temporary cache"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:462 ../../src/clients/ksu/main.c:702
+#: ../../src/clients/ksu/main.c:469 ../../src/clients/ksu/main.c:709
 #, c-format
 msgid "while copying cache %s to %s"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:480
+#: ../../src/clients/ksu/main.c:487
 #, c-format
 msgid ""
 "WARNING: Your password may be exposed if you enter it here and are logged\n"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:482
+#: ../../src/clients/ksu/main.c:489
 #, c-format
 msgid "         in remotely using an unsecure (non-encrypted) channel.\n"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:488
+#: ../../src/clients/ksu/main.c:495
 #, c-format
 msgid "Goodbye\n"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:492
+#: ../../src/clients/ksu/main.c:499
 #, c-format
 msgid "Could not get a tgt for "
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:514
+#: ../../src/clients/ksu/main.c:521
 #, c-format
 msgid "Authentication failed.\n"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:522
+#: ../../src/clients/ksu/main.c:529
 msgid "When unparsing name"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:526
+#: ../../src/clients/ksu/main.c:533
 #, c-format
 msgid "Authenticated %s\n"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:533
+#: ../../src/clients/ksu/main.c:540
 msgid "while switching to target for authorization check"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:540
+#: ../../src/clients/ksu/main.c:547
 msgid "while checking authorization"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:546
+#: ../../src/clients/ksu/main.c:553
 msgid "while switching back from target after authorization check"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:553
+#: ../../src/clients/ksu/main.c:560
 #, c-format
 msgid "Account %s: authorization for %s for execution of\n"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:555
+#: ../../src/clients/ksu/main.c:562
 #, c-format
 msgid "               %s successful\n"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:561
+#: ../../src/clients/ksu/main.c:568
 #, c-format
 msgid "Account %s: authorization for %s successful\n"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:573
+#: ../../src/clients/ksu/main.c:580
 #, c-format
 msgid "Account %s: authorization for %s for execution of %s failed\n"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:581
+#: ../../src/clients/ksu/main.c:588
 #, c-format
 msgid "Account %s: authorization of %s failed\n"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:596
+#: ../../src/clients/ksu/main.c:603
 msgid "while calling cc_filter"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:604
+#: ../../src/clients/ksu/main.c:611
 msgid "while erasing target cache"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:624
+#: ../../src/clients/ksu/main.c:631
 #, c-format
 msgid "ksu: permission denied (shell).\n"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:633
+#: ../../src/clients/ksu/main.c:640
 #, c-format
 msgid "ksu: couldn't set environment variable USER\n"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:639
+#: ../../src/clients/ksu/main.c:646
 #, c-format
 msgid "ksu: couldn't set environment variable HOME\n"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:644
+#: ../../src/clients/ksu/main.c:651
 #, c-format
 msgid "ksu: couldn't set environment variable SHELL\n"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:655
+#: ../../src/clients/ksu/main.c:662
 #, c-format
 msgid "ksu: initgroups failed.\n"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:660
+#: ../../src/clients/ksu/main.c:667
 #, c-format
 msgid "Leaving uid as %s (%ld)\n"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:663
+#: ../../src/clients/ksu/main.c:670
 #, c-format
 msgid "Changing uid to %s (%ld)\n"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:689
+#: ../../src/clients/ksu/main.c:696
 msgid "while getting name of target ccache"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:709
+#: ../../src/clients/ksu/main.c:716
 #, c-format
 msgid "%s does not have correct permissions for %s, %s aborted"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:730
+#: ../../src/clients/ksu/main.c:737
 #, c-format
 msgid "Internal error: command %s did not get resolved\n"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:747 ../../src/clients/ksu/main.c:783
+#: ../../src/clients/ksu/main.c:754 ../../src/clients/ksu/main.c:790
 #, c-format
 msgid "while trying to execv %s"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:773
+#: ../../src/clients/ksu/main.c:780
 msgid "while calling waitpid"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:778
+#: ../../src/clients/ksu/main.c:785
 msgid "while trying to fork."
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:800
+#: ../../src/clients/ksu/main.c:807
 msgid "while reading cache name from ccache"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:806
+#: ../../src/clients/ksu/main.c:813
 #, c-format
 msgid "ksu: couldn't set environment variable %s\n"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:832
+#: ../../src/clients/ksu/main.c:839
 msgid "while resetting target ccache name"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:846
+#: ../../src/clients/ksu/main.c:853
 msgid "while determining target ccache name"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:885
+#: ../../src/clients/ksu/main.c:892
 msgid "while generating part of the target ccache name"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:891
+#: ../../src/clients/ksu/main.c:898
 msgid "while allocating memory for the target ccache name"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:910
+#: ../../src/clients/ksu/main.c:917
 msgid "while creating new target ccache"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:916
+#: ../../src/clients/ksu/main.c:923
 msgid "while initializing target cache"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:956
+#: ../../src/clients/ksu/main.c:963
 #, c-format
 msgid "terminal name %s too long\n"
 msgstr ""
 
-#: ../../src/clients/ksu/main.c:984
+#: ../../src/clients/ksu/main.c:991
 msgid "while changing to target uid for destroying ccache"
 msgstr ""
 
@@ -1201,99 +1211,116 @@ msgstr ""
 msgid "while switching to credential cache"
 msgstr ""
 
-#: ../../src/clients/kvno/kvno.c:41
+#: ../../src/clients/kvno/kvno.c:44
 #, c-format
 msgid "usage: %s [-C] [-u] [-c ccache] [-e etype]\n"
 msgstr ""
 
-#: ../../src/clients/kvno/kvno.c:42
+#: ../../src/clients/kvno/kvno.c:45
 #, c-format
-msgid "\t[-k keytab] [-S sname] [-U for_user [-P]]\n"
+msgid "\t[-k keytab] [-S sname] [{-I | -U} for_user | [-F cert_file] [-P]]\n"
 msgstr ""
 
-#: ../../src/clients/kvno/kvno.c:43
+#: ../../src/clients/kvno/kvno.c:47
 #, c-format
 msgid "\t[--u2u ccache] service1 service2 ...\n"
 msgstr ""
 
-#: ../../src/clients/kvno/kvno.c:102 ../../src/clients/kvno/kvno.c:110
+#: ../../src/clients/kvno/kvno.c:110 ../../src/clients/kvno/kvno.c:118
 #, c-format
 msgid "Options -u and -S are mutually exclusive\n"
 msgstr ""
 
-#: ../../src/clients/kvno/kvno.c:127
+#: ../../src/clients/kvno/kvno.c:146
 #, c-format
-msgid "Options --u2u and -P are mutually exclusive\n"
+msgid "Options --u2u and -I|-U|-F are mutually exclusive\n"
 msgstr ""
 
-#: ../../src/clients/kvno/kvno.c:133
+#: ../../src/clients/kvno/kvno.c:152
 #, c-format
-msgid "Option -P (constrained delegation) requires keytab to be specified\n"
+msgid ""
+"Option -P (constrained delegation) requires option -I|-U|-F (protocol "
+"transition)\n"
 msgstr ""
 
-#: ../../src/clients/kvno/kvno.c:137
-#, c-format
-msgid ""
-"Option -P (constrained delegation) requires option -U (protocol transition)\n"
+#: ../../src/clients/kvno/kvno.c:226
+msgid "No begin line not found"
+msgstr ""
+
+#: ../../src/clients/kvno/kvno.c:238
+msgid "No end line found"
+msgstr ""
+
+#: ../../src/clients/kvno/kvno.c:249
+msgid "Unexpected header line"
 msgstr ""
 
-#: ../../src/clients/kvno/kvno.c:197
+#: ../../src/clients/kvno/kvno.c:259
+msgid "Invalid base64"
+msgstr ""
+
+#: ../../src/clients/kvno/kvno.c:303
 #, c-format
 msgid "while formatting parsed principal name for '%s'"
 msgstr ""
 
-#: ../../src/clients/kvno/kvno.c:211
+#: ../../src/clients/kvno/kvno.c:317
 msgid "client and server principal names must match"
 msgstr ""
 
-#: ../../src/clients/kvno/kvno.c:227
+#: ../../src/clients/kvno/kvno.c:334
 #, c-format
 msgid "while getting credentials for %s"
 msgstr ""
 
-#: ../../src/clients/kvno/kvno.c:234
+#: ../../src/clients/kvno/kvno.c:341
 #, c-format
 msgid "while decoding ticket for %s"
 msgstr ""
 
-#: ../../src/clients/kvno/kvno.c:245
+#: ../../src/clients/kvno/kvno.c:352
 #, c-format
 msgid "while decrypting ticket for %s"
 msgstr ""
 
-#: ../../src/clients/kvno/kvno.c:249
+#: ../../src/clients/kvno/kvno.c:356
 #, c-format
 msgid "%s: kvno = %d, keytab entry valid\n"
 msgstr ""
 
-#: ../../src/clients/kvno/kvno.c:263
+#: ../../src/clients/kvno/kvno.c:361
 #, c-format
-msgid "%s: constrained delegation failed"
+msgid "%s: kvno = %d\n"
 msgstr ""
 
-#: ../../src/clients/kvno/kvno.c:270
+#: ../../src/clients/kvno/kvno.c:376
 #, c-format
-msgid "%s: kvno = %d\n"
+msgid "%s: constrained delegation failed"
 msgstr ""
 
-#: ../../src/clients/kvno/kvno.c:337 ../../src/kadmin/cli/kadmin.c:311
+#: ../../src/clients/kvno/kvno.c:447 ../../src/kadmin/cli/kadmin.c:311
 msgid "while initializing krb5 library"
 msgstr ""
 
-#: ../../src/clients/kvno/kvno.c:344
+#: ../../src/clients/kvno/kvno.c:454
 msgid "while converting etype"
 msgstr ""
 
-#: ../../src/clients/kvno/kvno.c:356
+#: ../../src/clients/kvno/kvno.c:466
 msgid "while opening ccache"
 msgstr ""
 
-#: ../../src/clients/kvno/kvno.c:381
+#: ../../src/clients/kvno/kvno.c:490
+#, c-format
+msgid "while reading certificate file %s"
+msgstr ""
+
+#: ../../src/clients/kvno/kvno.c:500
 #, c-format
 msgid "while getting user-to-user ticket from %s"
 msgstr ""
 
-#: ../../src/clients/kvno/kvno.c:390
+#: ../../src/clients/kvno/kvno.c:509
 msgid "while getting client principal name"
 msgstr ""
 
@@ -1324,8 +1351,8 @@ msgid "%s: Cannot initialize. Not enough memory\n"
 msgstr ""
 
 #: ../../src/kadmin/cli/kadmin.c:380 ../../src/kadmin/cli/kadmin.c:840
-#: ../../src/kadmin/cli/kadmin.c:1105 ../../src/kadmin/cli/kadmin.c:1620
-#: ../../src/kadmin/cli/keytab.c:148 ../../src/kadmin/dbutil/kdb5_util.c:562
+#: ../../src/kadmin/cli/kadmin.c:1109 ../../src/kadmin/cli/kadmin.c:1630
+#: ../../src/kadmin/cli/keytab.c:148 ../../src/kadmin/dbutil/kdb5_util.c:559
 #, c-format
 msgid "while parsing keysalts %s"
 msgstr ""
@@ -1356,7 +1383,7 @@ msgid "%s: out of memory\n"
 msgstr ""
 
 #: ../../src/kadmin/cli/kadmin.c:468 ../../src/kadmin/cli/kadmin.c:483
-#: ../../src/kprop/kpropd.c:680
+#: ../../src/kprop/kpropd.c:679
 msgid "while canonicalizing principal name"
 msgstr ""
 
@@ -1403,7 +1430,7 @@ msgstr ""
 msgid "Authenticating as principal %s with password.\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:580 ../../src/kprop/kpropd.c:727
+#: ../../src/kadmin/cli/kadmin.c:580 ../../src/kprop/kpropd.c:726
 #, c-format
 msgid "while initializing %s interface"
 msgstr ""
@@ -1429,15 +1456,15 @@ msgstr ""
 msgid "usage: delete_principal [-force] principal\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:680 ../../src/kadmin/cli/kadmin.c:855
+#: ../../src/kadmin/cli/kadmin.c:680 ../../src/kadmin/cli/kadmin.c:859
 msgid "while parsing principal name"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:686 ../../src/kadmin/cli/kadmin.c:861
-#: ../../src/kadmin/cli/kadmin.c:1214 ../../src/kadmin/cli/kadmin.c:1339
-#: ../../src/kadmin/cli/kadmin.c:1409 ../../src/kadmin/cli/kadmin.c:1843
-#: ../../src/kadmin/cli/kadmin.c:1887 ../../src/kadmin/cli/kadmin.c:1933
-#: ../../src/kadmin/cli/kadmin.c:1973
+#: ../../src/kadmin/cli/kadmin.c:686 ../../src/kadmin/cli/kadmin.c:865
+#: ../../src/kadmin/cli/kadmin.c:1218 ../../src/kadmin/cli/kadmin.c:1343
+#: ../../src/kadmin/cli/kadmin.c:1413 ../../src/kadmin/cli/kadmin.c:1853
+#: ../../src/kadmin/cli/kadmin.c:1897 ../../src/kadmin/cli/kadmin.c:1943
+#: ../../src/kadmin/cli/kadmin.c:1983
 msgid "while canonicalizing principal"
 msgstr ""
 
@@ -1536,70 +1563,79 @@ msgstr ""
 msgid "change_password: missing keysaltlist arg"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:849
+#: ../../src/kadmin/cli/kadmin.c:844
+#, c-format
+msgid "unrecognized option %s"
+msgstr ""
+
+#: ../../src/kadmin/cli/kadmin.c:851
 msgid "missing principal name"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:873 ../../src/kadmin/cli/kadmin.c:910
+#: ../../src/kadmin/cli/kadmin.c:853
+msgid "too many arguments"
+msgstr ""
+
+#: ../../src/kadmin/cli/kadmin.c:877 ../../src/kadmin/cli/kadmin.c:914
 #, c-format
 msgid "while changing password for \"%s\"."
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:876 ../../src/kadmin/cli/kadmin.c:913
+#: ../../src/kadmin/cli/kadmin.c:880 ../../src/kadmin/cli/kadmin.c:917
 #, c-format
 msgid "Password for \"%s\" changed.\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:882 ../../src/kadmin/cli/kadmin.c:1290
+#: ../../src/kadmin/cli/kadmin.c:886 ../../src/kadmin/cli/kadmin.c:1294
 #, c-format
 msgid "while randomizing key for \"%s\"."
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:885
+#: ../../src/kadmin/cli/kadmin.c:889
 #, c-format
 msgid "Key for \"%s\" randomized.\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:890 ../../src/kadmin/cli/kadmin.c:1250
+#: ../../src/kadmin/cli/kadmin.c:894 ../../src/kadmin/cli/kadmin.c:1254
 #, c-format
 msgid "Enter password for principal \"%s\""
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:892 ../../src/kadmin/cli/kadmin.c:1252
+#: ../../src/kadmin/cli/kadmin.c:896 ../../src/kadmin/cli/kadmin.c:1256
 #, c-format
 msgid "Re-enter password for principal \"%s\""
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:897 ../../src/kadmin/cli/kadmin.c:1256
+#: ../../src/kadmin/cli/kadmin.c:901 ../../src/kadmin/cli/kadmin.c:1260
 #, c-format
 msgid "while reading password for \"%s\"."
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:951
+#: ../../src/kadmin/cli/kadmin.c:955
 msgid "Not enough memory\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:981 ../../src/kadmin/dbutil/kdb5_util.c:594
+#: ../../src/kadmin/cli/kadmin.c:985 ../../src/kadmin/dbutil/kdb5_util.c:591
 msgid "while getting time"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1122 ../../src/kadmin/cli/kadmin.c:1333
-#: ../../src/kadmin/cli/kadmin.c:1404 ../../src/kadmin/cli/kadmin.c:1837
-#: ../../src/kadmin/cli/kadmin.c:1881 ../../src/kadmin/cli/kadmin.c:1927
-#: ../../src/kadmin/cli/kadmin.c:1967
+#: ../../src/kadmin/cli/kadmin.c:1126 ../../src/kadmin/cli/kadmin.c:1337
+#: ../../src/kadmin/cli/kadmin.c:1408 ../../src/kadmin/cli/kadmin.c:1847
+#: ../../src/kadmin/cli/kadmin.c:1891 ../../src/kadmin/cli/kadmin.c:1937
+#: ../../src/kadmin/cli/kadmin.c:1977
 msgid "while parsing principal"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1131
+#: ../../src/kadmin/cli/kadmin.c:1135
 msgid "usage: add_principal [options] principal\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1132 ../../src/kadmin/cli/kadmin.c:1156
-#: ../../src/kadmin/cli/kadmin.c:1643
+#: ../../src/kadmin/cli/kadmin.c:1136 ../../src/kadmin/cli/kadmin.c:1160
+#: ../../src/kadmin/cli/kadmin.c:1653
 msgid "\toptions are:\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1133
+#: ../../src/kadmin/cli/kadmin.c:1137
 msgid ""
 "\t\t[-randkey|-nokey] [-x db_princ_args]* [-expire expdate] [-pwexpire "
 "pwexpdate] [-maxlife maxtixlife]\n"
@@ -1609,11 +1645,11 @@ msgid ""
 "\t\t[{+|-}attribute]\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1138 ../../src/kadmin/cli/kadmin.c:1161
+#: ../../src/kadmin/cli/kadmin.c:1142 ../../src/kadmin/cli/kadmin.c:1165
 msgid "\tattributes are:\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1139 ../../src/kadmin/cli/kadmin.c:1162
+#: ../../src/kadmin/cli/kadmin.c:1143 ../../src/kadmin/cli/kadmin.c:1166
 msgid ""
 "\t\tallow_postdated allow_forwardable allow_tgs_req allow_renewable\n"
 "\t\tallow_proxiable allow_dup_skey allow_tix requires_preauth\n"
@@ -1626,11 +1662,11 @@ msgid ""
 "\t\t\tLook at each database documentation for supported arguments\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1155
+#: ../../src/kadmin/cli/kadmin.c:1159
 msgid "usage: modify_principal [options] principal\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1157
+#: ../../src/kadmin/cli/kadmin.c:1161
 msgid ""
 "\t\t[-x db_princ_args]* [-expire expdate] [-pwexpire pwexpdate] [-maxlife "
 "maxtixlife]\n"
@@ -1638,170 +1674,170 @@ msgid ""
 "\t\t[-maxrenewlife maxrenewlife] [-unlock] [{+|-}attribute]\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1221 ../../src/kadmin/cli/kadmin.c:1362
+#: ../../src/kadmin/cli/kadmin.c:1225 ../../src/kadmin/cli/kadmin.c:1366
 #, c-format
 msgid "WARNING: policy \"%s\" does not exist\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1228
+#: ../../src/kadmin/cli/kadmin.c:1232
 #, c-format
 msgid "No policy specified for %s; assigning \"default\"\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1234
+#: ../../src/kadmin/cli/kadmin.c:1238
 #, c-format
 msgid "No policy specified for %s; defaulting to no policy\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1276
+#: ../../src/kadmin/cli/kadmin.c:1280
 #, c-format
 msgid "Admin server does not support -nokey while creating \"%s\"\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1298
+#: ../../src/kadmin/cli/kadmin.c:1302
 #, c-format
 msgid "while clearing DISALLOW_ALL_TIX for \"%s\"."
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1345
+#: ../../src/kadmin/cli/kadmin.c:1349
 #, c-format
 msgid "while getting \"%s\"."
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1371
+#: ../../src/kadmin/cli/kadmin.c:1375
 #, c-format
 msgid "while modifying \"%s\"."
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1375
+#: ../../src/kadmin/cli/kadmin.c:1379
 #, c-format
 msgid "Principal \"%s\" modified.\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1396
+#: ../../src/kadmin/cli/kadmin.c:1400
 msgid "usage: get_principal [-terse] principal\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1415
+#: ../../src/kadmin/cli/kadmin.c:1419
 #, c-format
 msgid "while retrieving \"%s\"."
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1420 ../../src/kadmin/cli/kadmin.c:1425
+#: ../../src/kadmin/cli/kadmin.c:1424 ../../src/kadmin/cli/kadmin.c:1429
 msgid "while unparsing principal"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1429
+#: ../../src/kadmin/cli/kadmin.c:1433
 #, c-format
 msgid "Principal: %s\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1430
+#: ../../src/kadmin/cli/kadmin.c:1434
 #, c-format
 msgid "Expiration date: %s\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1431 ../../src/kadmin/cli/kadmin.c:1433
-#: ../../src/kadmin/cli/kadmin.c:1436 ../../src/kadmin/cli/kadmin.c:1444
+#: ../../src/kadmin/cli/kadmin.c:1435 ../../src/kadmin/cli/kadmin.c:1437
+#: ../../src/kadmin/cli/kadmin.c:1440 ../../src/kadmin/cli/kadmin.c:1448
 msgid "[never]"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1432
+#: ../../src/kadmin/cli/kadmin.c:1436
 #, c-format
 msgid "Last password change: %s\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1434
+#: ../../src/kadmin/cli/kadmin.c:1438
 #, c-format
 msgid "Password expiration date: %s\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1437
+#: ../../src/kadmin/cli/kadmin.c:1441
 #, c-format
 msgid "Maximum ticket life: %s\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1438
+#: ../../src/kadmin/cli/kadmin.c:1442
 #, c-format
 msgid "Maximum renewable life: %s\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1440
+#: ../../src/kadmin/cli/kadmin.c:1444
 #, c-format
 msgid "Last modified: %s (%s)\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1442
+#: ../../src/kadmin/cli/kadmin.c:1446
 #, c-format
 msgid "Last successful authentication: %s\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1448
+#: ../../src/kadmin/cli/kadmin.c:1452
 #, c-format
 msgid "Failed password attempts: %d\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1450
+#: ../../src/kadmin/cli/kadmin.c:1454
 #, c-format
 msgid "Number of keys: %d\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1457
+#: ../../src/kadmin/cli/kadmin.c:1462
 #, c-format
 msgid "<Encryption type 0x%x>"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1464
+#: ../../src/kadmin/cli/kadmin.c:1474
 #, c-format
 msgid "<Salt type 0x%x>"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1470
+#: ../../src/kadmin/cli/kadmin.c:1480
 #, c-format
 msgid "MKey: vno %d\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1472
+#: ../../src/kadmin/cli/kadmin.c:1482
 #, c-format
 msgid "Attributes:"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1475
+#: ../../src/kadmin/cli/kadmin.c:1485
 msgid "while printing flags"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1484
+#: ../../src/kadmin/cli/kadmin.c:1494
 msgid "[none]"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1486
+#: ../../src/kadmin/cli/kadmin.c:1496
 msgid " [does not exist]"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1487
+#: ../../src/kadmin/cli/kadmin.c:1497
 #, c-format
 msgid "Policy: %s%s\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1523
+#: ../../src/kadmin/cli/kadmin.c:1533
 msgid "usage: get_principals [expression]\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1528 ../../src/kadmin/cli/kadmin.c:1779
+#: ../../src/kadmin/cli/kadmin.c:1538 ../../src/kadmin/cli/kadmin.c:1789
 msgid "while retrieving list."
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1633
+#: ../../src/kadmin/cli/kadmin.c:1643
 #, c-format
 msgid "%s: parser lost count!\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1642
+#: ../../src/kadmin/cli/kadmin.c:1652
 #, c-format
 msgid "usage; %s [options] policy\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1644
+#: ../../src/kadmin/cli/kadmin.c:1654
 msgid ""
 "\t\t[-maxlife time] [-minlife time] [-minlength length]\n"
 "\t\t[-minclasses number] [-history number]\n"
@@ -1809,172 +1845,172 @@ msgid ""
 "\t\t[-allowedkeysalts keysalts]\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1648
+#: ../../src/kadmin/cli/kadmin.c:1658
 msgid "\t\t[-lockoutduration time]\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1667
+#: ../../src/kadmin/cli/kadmin.c:1677
 #, c-format
 msgid "while creating policy \"%s\"."
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1688
+#: ../../src/kadmin/cli/kadmin.c:1698
 #, c-format
 msgid "while modifying policy \"%s\"."
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1700
+#: ../../src/kadmin/cli/kadmin.c:1710
 msgid "usage: delete_policy [-force] policy\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1704
+#: ../../src/kadmin/cli/kadmin.c:1714
 #, c-format
 msgid "Are you sure you want to delete the policy \"%s\"? (yes/no): "
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1708
+#: ../../src/kadmin/cli/kadmin.c:1718
 #, c-format
 msgid "Policy \"%s\" not deleted.\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1714
+#: ../../src/kadmin/cli/kadmin.c:1724
 #, c-format
 msgid "while deleting policy \"%s\""
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1726
+#: ../../src/kadmin/cli/kadmin.c:1736
 msgid "usage: get_policy [-terse] policy\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1731
+#: ../../src/kadmin/cli/kadmin.c:1741
 #, c-format
 msgid "while retrieving policy \"%s\"."
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1736
+#: ../../src/kadmin/cli/kadmin.c:1746
 #, c-format
 msgid "Policy: %s\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1737
+#: ../../src/kadmin/cli/kadmin.c:1747
 #, c-format
 msgid "Maximum password life: %s\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1738
+#: ../../src/kadmin/cli/kadmin.c:1748
 #, c-format
 msgid "Minimum password life: %s\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1739
+#: ../../src/kadmin/cli/kadmin.c:1749
 #, c-format
 msgid "Minimum password length: %ld\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1740
+#: ../../src/kadmin/cli/kadmin.c:1750
 #, c-format
 msgid "Minimum number of password character classes: %ld\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1742
+#: ../../src/kadmin/cli/kadmin.c:1752
 #, c-format
 msgid "Number of old keys kept: %ld\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1743
+#: ../../src/kadmin/cli/kadmin.c:1753
 #, c-format
 msgid "Maximum password failures before lockout: %lu\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1745
+#: ../../src/kadmin/cli/kadmin.c:1755
 #, c-format
 msgid "Password failure count reset interval: %s\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1747
+#: ../../src/kadmin/cli/kadmin.c:1757
 #, c-format
 msgid "Password lockout duration: %s\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1750
+#: ../../src/kadmin/cli/kadmin.c:1760
 #, c-format
 msgid "Allowed key/salt types: %s\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1774
+#: ../../src/kadmin/cli/kadmin.c:1784
 msgid "usage: get_policies [expression]\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1796
+#: ../../src/kadmin/cli/kadmin.c:1806
 msgid "usage: get_privs\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1801
+#: ../../src/kadmin/cli/kadmin.c:1811
 msgid "while retrieving privileges"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1804
+#: ../../src/kadmin/cli/kadmin.c:1814
 #, c-format
 msgid "current privileges:"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1830
+#: ../../src/kadmin/cli/kadmin.c:1840
 msgid "usage: purgekeys [-all|-keepkvno oldest_kvno_to_keep] principal\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1850
+#: ../../src/kadmin/cli/kadmin.c:1860
 #, c-format
 msgid "while purging keys for principal \"%s\""
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1855
+#: ../../src/kadmin/cli/kadmin.c:1865
 #, c-format
 msgid "All keys for principal \"%s\" removed.\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1857
+#: ../../src/kadmin/cli/kadmin.c:1867
 #, c-format
 msgid "Old keys for principal \"%s\" purged.\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1874
+#: ../../src/kadmin/cli/kadmin.c:1884
 msgid "usage: get_strings principal\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1894
+#: ../../src/kadmin/cli/kadmin.c:1904
 #, c-format
 msgid "while getting attributes for principal \"%s\""
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1899
+#: ../../src/kadmin/cli/kadmin.c:1909
 #, c-format
 msgid "(No string attributes.)\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1918
+#: ../../src/kadmin/cli/kadmin.c:1928
 msgid "usage: set_string principal key value\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1940
+#: ../../src/kadmin/cli/kadmin.c:1950
 #, c-format
 msgid "while setting attribute on principal \"%s\""
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1944
+#: ../../src/kadmin/cli/kadmin.c:1954
 #, c-format
 msgid "Attribute set for principal \"%s\".\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1959
+#: ../../src/kadmin/cli/kadmin.c:1969
 msgid "usage: del_string principal key\n"
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1980
+#: ../../src/kadmin/cli/kadmin.c:1990
 #, c-format
 msgid "while deleting attribute from principal \"%s\""
 msgstr ""
 
-#: ../../src/kadmin/cli/kadmin.c:1984
+#: ../../src/kadmin/cli/kadmin.c:1994
 #, c-format
 msgid "Attribute removed from principal \"%s\".\n"
 msgstr ""
@@ -2121,239 +2157,231 @@ msgstr ""
 msgid "%s: tagged data list inconsistency for %s (counted %d, stored %d)\n"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:532
-#, c-format
-msgid ""
-"Warning!  Multiple DES-CBC-CRC keys for principal %s; skipping duplicates.\n"
-msgstr ""
-
-#: ../../src/kadmin/dbutil/dump.c:543
-#, c-format
-msgid ""
-"Warning!  No DES-CBC-CRC key for principal %s, cannot generate OV-compatible "
-"record; skipping\n"
-msgstr ""
-
-#: ../../src/kadmin/dbutil/dump.c:572
+#: ../../src/kadmin/dbutil/dump.c:495
 #, c-format
 msgid "while converting %s to new master key"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:593
+#: ../../src/kadmin/dbutil/dump.c:516
 #, c-format
 msgid "%s(%d): %s\n"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:636
+#: ../../src/kadmin/dbutil/dump.c:559
 #, c-format
 msgid "%s(%d): ignoring trash at end of line: "
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:699
+#: ../../src/kadmin/dbutil/dump.c:622
 msgid "cannot read tagged data type and length"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:703
+#: ../../src/kadmin/dbutil/dump.c:626
 msgid "data type or length overflowed"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:710
+#: ../../src/kadmin/dbutil/dump.c:633
 msgid "cannot read tagged data contents"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:743
+#: ../../src/kadmin/dbutil/dump.c:666
 msgid "cannot match size tokens"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:754
+#: ../../src/kadmin/dbutil/dump.c:677
 msgid "cannot allocate tl_data (too large)"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:776
+#: ../../src/kadmin/dbutil/dump.c:699
 msgid "cannot read name string"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:781
+#: ../../src/kadmin/dbutil/dump.c:704
 #, c-format
 msgid "while parsing name %s"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:789
+#: ../../src/kadmin/dbutil/dump.c:712
 msgid "cannot read principal attributes"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:842
+#: ../../src/kadmin/dbutil/dump.c:765
 msgid "cannot read key size and version"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:846
+#: ../../src/kadmin/dbutil/dump.c:769
 msgid "unsupported key_data_ver version"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:857
+#: ../../src/kadmin/dbutil/dump.c:780
 msgid "cannot read key type and length"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:863
+#: ../../src/kadmin/dbutil/dump.c:786
 msgid "cannot read key data"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:873
+#: ../../src/kadmin/dbutil/dump.c:796
 msgid "cannot read extra data"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:882
+#: ../../src/kadmin/dbutil/dump.c:805
 #, c-format
 msgid "while storing %s"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:921 ../../src/kadmin/dbutil/dump.c:960
-#: ../../src/kadmin/dbutil/dump.c:1006 ../../src/kadmin/dbutil/dump.c:1025
+#: ../../src/kadmin/dbutil/dump.c:844 ../../src/kadmin/dbutil/dump.c:883
+#: ../../src/kadmin/dbutil/dump.c:929 ../../src/kadmin/dbutil/dump.c:948
 #, c-format
 msgid "cannot parse policy (%d read)\n"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:929 ../../src/kadmin/dbutil/dump.c:968
-#: ../../src/kadmin/dbutil/dump.c:1046
+#: ../../src/kadmin/dbutil/dump.c:852 ../../src/kadmin/dbutil/dump.c:891
+#: ../../src/kadmin/dbutil/dump.c:969
 msgid "while creating policy"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:933
+#: ../../src/kadmin/dbutil/dump.c:856
 #, c-format
 msgid "created policy %s\n"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:1083
+#: ../../src/kadmin/dbutil/dump.c:1006
 #, c-format
 msgid "unknown record type \"%s\"\n"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:1212
+#: ../../src/kadmin/dbutil/dump.c:1117
 #, c-format
 msgid "%s: Unknown iprop dump version %d\n"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:1316 ../../src/kadmin/dbutil/dump.c:1544
+#: ../../src/kadmin/dbutil/dump.c:1201 ../../src/kadmin/dbutil/dump.c:1439
+#, c-format
+msgid "OV dump format not supported\n"
+msgstr ""
+
+#: ../../src/kadmin/dbutil/dump.c:1222 ../../src/kadmin/dbutil/dump.c:1450
 #, c-format
 msgid "Iprop not enabled\n"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:1353
+#: ../../src/kadmin/dbutil/dump.c:1259
 msgid "Conditional dump is an undocumented option for use only for iprop dumps"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:1366
+#: ../../src/kadmin/dbutil/dump.c:1272
 msgid "Database not currently opened!"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:1380 ../../src/kadmin/dbutil/kdb5_stash.c:116
-#: ../../src/kadmin/dbutil/kdb5_util.c:448
+#: ../../src/kadmin/dbutil/dump.c:1286 ../../src/kadmin/dbutil/kdb5_stash.c:116
+#: ../../src/kadmin/dbutil/kdb5_util.c:445
 msgid "while reading master key"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:1386
+#: ../../src/kadmin/dbutil/dump.c:1292
 msgid "while verifying master key"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:1405 ../../src/kadmin/dbutil/dump.c:1415
+#: ../../src/kadmin/dbutil/dump.c:1311 ../../src/kadmin/dbutil/dump.c:1321
 msgid "while reading new master key"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:1409
+#: ../../src/kadmin/dbutil/dump.c:1315
 #, c-format
 msgid "Please enter new master key....\n"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:1433
+#: ../../src/kadmin/dbutil/dump.c:1339
 #, c-format
 msgid "while opening %s for writing"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:1448
+#: ../../src/kadmin/dbutil/dump.c:1354
 msgid "while reading update log header"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:1463 ../../src/kadmin/dbutil/dump.c:1471
+#: ../../src/kadmin/dbutil/dump.c:1369 ../../src/kadmin/dbutil/dump.c:1377
 #, c-format
 msgid "performing %s dump"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:1501
+#: ../../src/kadmin/dbutil/dump.c:1407
 #, c-format
 msgid "%s: error processing line %d of %s\n"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:1553
+#: ../../src/kadmin/dbutil/dump.c:1459
 msgid "while parsing options"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:1568
+#: ../../src/kadmin/dbutil/dump.c:1474
 #, c-format
 msgid "while opening %s"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:1573 ../../src/kadmin/dbutil/dump.c:1672
+#: ../../src/kadmin/dbutil/dump.c:1479 ../../src/kadmin/dbutil/dump.c:1575
 msgid "standard input"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:1578
+#: ../../src/kadmin/dbutil/dump.c:1484
 #, c-format
 msgid "%s: can't read dump header in %s\n"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:1586 ../../src/kadmin/dbutil/dump.c:1603
+#: ../../src/kadmin/dbutil/dump.c:1492 ../../src/kadmin/dbutil/dump.c:1506
 #, c-format
 msgid "%s: dump header bad in %s\n"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:1612
+#: ../../src/kadmin/dbutil/dump.c:1515
 #, c-format
 msgid "Could not open iprop ulog\n"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:1617
+#: ../../src/kadmin/dbutil/dump.c:1520
 #, c-format
 msgid "%s: dump version %s can only be loaded with the -update flag\n"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:1626 ../../src/kadmin/dbutil/dump.c:1631
+#: ../../src/kadmin/dbutil/dump.c:1529 ../../src/kadmin/dbutil/dump.c:1534
 msgid "computing parameters for database"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:1637
+#: ../../src/kadmin/dbutil/dump.c:1540
 msgid "while creating database"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:1646
+#: ../../src/kadmin/dbutil/dump.c:1549
 msgid "while opening database"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:1656
+#: ../../src/kadmin/dbutil/dump.c:1559
 msgid "while permanently locking database"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:1674
+#: ../../src/kadmin/dbutil/dump.c:1577
 #, c-format
 msgid "%s: %s restore failed\n"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:1679
+#: ../../src/kadmin/dbutil/dump.c:1582
 msgid "while unlocking database"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:1689 ../../src/kadmin/dbutil/dump.c:1708
+#: ../../src/kadmin/dbutil/dump.c:1592 ../../src/kadmin/dbutil/dump.c:1611
 msgid "while reinitializing update log"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:1699
+#: ../../src/kadmin/dbutil/dump.c:1602
 msgid "while making newly loaded database live"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:1715
+#: ../../src/kadmin/dbutil/dump.c:1618
 msgid "while writing update log header"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/dump.c:1729
+#: ../../src/kadmin/dbutil/dump.c:1632
 #, c-format
 msgid "while deleting bad database %s"
 msgstr ""
@@ -2389,96 +2417,96 @@ msgstr ""
 msgid "while creating principal %s"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/kdb5_create.c:191
+#: ../../src/kadmin/dbutil/kdb5_create.c:181
 #, c-format
 msgid "Loading random data\n"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/kdb5_create.c:194
+#: ../../src/kadmin/dbutil/kdb5_create.c:184
 msgid "Loading random data"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/kdb5_create.c:204
-#: ../../src/kadmin/dbutil/kdb5_util.c:392
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:608
+#: ../../src/kadmin/dbutil/kdb5_create.c:194
+#: ../../src/kadmin/dbutil/kdb5_util.c:389
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:607
 msgid "while setting up master key name"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/kdb5_create.c:215
+#: ../../src/kadmin/dbutil/kdb5_create.c:205
 #, c-format
 msgid ""
 "Initializing database '%s' for realm '%s',\n"
 "master key name '%s'\n"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/kdb5_create.c:220
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:517
+#: ../../src/kadmin/dbutil/kdb5_create.c:210
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:516
 #, c-format
 msgid "You will be prompted for the database Master Password.\n"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/kdb5_create.c:221
+#: ../../src/kadmin/dbutil/kdb5_create.c:211
 #: ../../src/kadmin/dbutil/kdb5_mkey.c:255
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:518
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:517
 #, c-format
 msgid "It is important that you NOT FORGET this password.\n"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/kdb5_create.c:227
+#: ../../src/kadmin/dbutil/kdb5_create.c:217
 #: ../../src/kadmin/dbutil/kdb5_mkey.c:261
 msgid "while creating new master key"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/kdb5_create.c:235
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:528
+#: ../../src/kadmin/dbutil/kdb5_create.c:225
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:527
 msgid "while reading master key from keyboard"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/kdb5_create.c:245
+#: ../../src/kadmin/dbutil/kdb5_create.c:235
 #: ../../src/kadmin/dbutil/kdb5_mkey.c:280
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:620
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:619
 msgid "while calculating master key salt"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/kdb5_create.c:253
+#: ../../src/kadmin/dbutil/kdb5_create.c:243
 #: ../../src/kadmin/dbutil/kdb5_mkey.c:289
-#: ../../src/kadmin/dbutil/kdb5_util.c:434
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:632
+#: ../../src/kadmin/dbutil/kdb5_util.c:431
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:631
 msgid "while transforming master key from password"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/kdb5_create.c:263
+#: ../../src/kadmin/dbutil/kdb5_create.c:253
 msgid "while initializing random key generator"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/kdb5_create.c:268
+#: ../../src/kadmin/dbutil/kdb5_create.c:258
 #, c-format
 msgid "while creating database '%s'"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/kdb5_create.c:286
+#: ../../src/kadmin/dbutil/kdb5_create.c:276
 msgid "while creating update log"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/kdb5_create.c:297
+#: ../../src/kadmin/dbutil/kdb5_create.c:287
 msgid "while initializing update log"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/kdb5_create.c:312
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:644
+#: ../../src/kadmin/dbutil/kdb5_create.c:302
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:643
 msgid "while adding entries to the database"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/kdb5_create.c:340
+#: ../../src/kadmin/dbutil/kdb5_create.c:330
 #: ../../src/kadmin/dbutil/kdb5_mkey.c:333
 #: ../../src/kadmin/dbutil/kdb5_stash.c:133
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:669
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:668
 msgid "while storing key"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/kdb5_create.c:341
+#: ../../src/kadmin/dbutil/kdb5_create.c:331
 #: ../../src/kadmin/dbutil/kdb5_mkey.c:334
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:670
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:669
 #, c-format
 msgid "Warning: couldn't stash master key.\n"
 msgstr ""
@@ -2491,7 +2519,7 @@ msgstr ""
 #: ../../src/kadmin/dbutil/kdb5_destroy.c:71
 #: ../../src/kadmin/dbutil/kdb5_mkey.c:1111
 #: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_policy.c:360
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:1476
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:1475
 #, c-format
 msgid "(type 'yes' to confirm)? "
 msgstr ""
@@ -2546,19 +2574,19 @@ msgstr ""
 #: ../../src/kadmin/dbutil/kdb5_mkey.c:305
 #: ../../src/kadmin/dbutil/kdb5_mkey.c:390
 #: ../../src/kadmin/dbutil/kdb5_mkey.c:806
-#: ../../src/kadmin/dbutil/kdb5_mkey.c:1307
+#: ../../src/kadmin/dbutil/kdb5_mkey.c:1305
 msgid "while getting current time"
 msgstr ""
 
 #: ../../src/kadmin/dbutil/kdb5_mkey.c:312
 #: ../../src/kadmin/dbutil/kdb5_mkey.c:522
-#: ../../src/kadmin/dbutil/kdb5_mkey.c:1314
+#: ../../src/kadmin/dbutil/kdb5_mkey.c:1312
 msgid "while updating the master key principal modification time"
 msgstr ""
 
 #: ../../src/kadmin/dbutil/kdb5_mkey.c:319
 #: ../../src/kadmin/dbutil/kdb5_mkey.c:530
-#: ../../src/kadmin/dbutil/kdb5_mkey.c:1324
+#: ../../src/kadmin/dbutil/kdb5_mkey.c:1322
 msgid "while adding master key entry to the database"
 msgstr ""
 
@@ -2589,7 +2617,7 @@ msgid "there must be one master key currently active"
 msgstr ""
 
 #: ../../src/kadmin/dbutil/kdb5_mkey.c:515
-#: ../../src/kadmin/dbutil/kdb5_mkey.c:1293
+#: ../../src/kadmin/dbutil/kdb5_mkey.c:1291
 msgid "while updating actkvno data for master principal entry"
 msgstr ""
 
@@ -2792,17 +2820,17 @@ msgstr ""
 msgid "while allocating key_data"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/kdb5_mkey.c:1301
+#: ../../src/kadmin/dbutil/kdb5_mkey.c:1299
 msgid "while updating mkey_aux data for master principal entry"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/kdb5_mkey.c:1328
+#: ../../src/kadmin/dbutil/kdb5_mkey.c:1326
 #, c-format
 msgid "%d key(s) purged.\n"
 msgstr ""
 
 #: ../../src/kadmin/dbutil/kdb5_stash.c:97
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:538
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:542
 #, c-format
 msgid "while setting up enctype %d"
 msgstr ""
@@ -2825,10 +2853,10 @@ msgid ""
 "\tcreate  [-s]\n"
 "\tdestroy [-f]\n"
 "\tstash   [-f keyfile]\n"
-"\tdump    [-old|-ov|-b6|-b7|-r13|-r18] [-verbose]\n"
+"\tdump    [-old|-b6|-b7|-r13|-r18] [-verbose]\n"
 "\t        [-mkey_convert] [-new_mkey_file mkey_file]\n"
 "\t        [-rev] [-recurse] [filename [princs...]]\n"
-"\tload    [-old|-ov|-b6|-b7|-r13|-r18] [-verbose] [-update] filename\n"
+"\tload    [-old|-b6|-b7|-r13|-r18] [-verbose] [-update] filename\n"
 "\tark     [-e etype_list] principal\n"
 "\tadd_mkey [-e etype] [-s]\n"
 "\tuse_mkey kvno [time]\n"
@@ -2848,12 +2876,12 @@ msgid ""
 msgstr ""
 
 #: ../../src/kadmin/dbutil/kdb5_util.c:215
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:260
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:264
 msgid "while initializing Kerberos code"
 msgstr ""
 
 #: ../../src/kadmin/dbutil/kdb5_util.c:221
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:267
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:271
 msgid "while creating sub-command arguments"
 msgstr ""
 
@@ -2867,78 +2895,78 @@ msgid "while parsing command arguments\n"
 msgstr ""
 
 #: ../../src/kadmin/dbutil/kdb5_util.c:263
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:291
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:295
 msgid "while setting default realm name"
 msgstr ""
 
 #: ../../src/kadmin/dbutil/kdb5_util.c:268
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:298
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:302
 #, c-format
 msgid ": %s is an invalid enctype"
 msgstr ""
 
 #: ../../src/kadmin/dbutil/kdb5_util.c:276
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:307
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:311
 #, c-format
 msgid ": %s is an invalid mkeyVNO"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/kdb5_util.c:321
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:431
+#: ../../src/kadmin/dbutil/kdb5_util.c:319
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:435
 msgid "while retreiving configuration parameters"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/kdb5_util.c:381
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:883
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:1491
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:564
+#: ../../src/kadmin/dbutil/kdb5_util.c:378
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:882
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:1490
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:568
 msgid "while initializing database"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/kdb5_util.c:398
+#: ../../src/kadmin/dbutil/kdb5_util.c:395
 msgid "while retrieving master entry"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/kdb5_util.c:417
+#: ../../src/kadmin/dbutil/kdb5_util.c:414
 msgid "while calculated master key salt"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/kdb5_util.c:449
+#: ../../src/kadmin/dbutil/kdb5_util.c:446
 msgid "Warning: proceeding without master key"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/kdb5_util.c:467
+#: ../../src/kadmin/dbutil/kdb5_util.c:464
 msgid "while seeding random number generator"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/kdb5_util.c:477
+#: ../../src/kadmin/dbutil/kdb5_util.c:474
 #, c-format
 msgid "%s: Could not map log\n"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/kdb5_util.c:506
+#: ../../src/kadmin/dbutil/kdb5_util.c:503
 msgid "while closing database"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/kdb5_util.c:553
+#: ../../src/kadmin/dbutil/kdb5_util.c:550
 #, c-format
 msgid "while fetching principal %s"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/kdb5_util.c:576
+#: ../../src/kadmin/dbutil/kdb5_util.c:573
 msgid "while finding mkey"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/kdb5_util.c:601
+#: ../../src/kadmin/dbutil/kdb5_util.c:598
 msgid "while setting changetime"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/kdb5_util.c:609
+#: ../../src/kadmin/dbutil/kdb5_util.c:606
 #, c-format
 msgid "while saving principal %s"
 msgstr ""
 
-#: ../../src/kadmin/dbutil/kdb5_util.c:613
+#: ../../src/kadmin/dbutil/kdb5_util.c:610
 #, c-format
 msgid "%s changed\n"
 msgstr ""
@@ -2971,62 +2999,57 @@ msgstr ""
 msgid "while reading keytab \"%s\""
 msgstr ""
 
-#: ../../src/kadmin/ktutil/ktutil.c:104
+#: ../../src/kadmin/ktutil/ktutil.c:101
 #, c-format
-msgid "%s: must specify the srvtab to read\n"
+msgid "%s: reading srvtabs is no longer supported\n"
 msgstr ""
 
-#: ../../src/kadmin/ktutil/ktutil.c:109
-#, c-format
-msgid "while reading srvtab \"%s\""
-msgstr ""
-
-#: ../../src/kadmin/ktutil/ktutil.c:119
+#: ../../src/kadmin/ktutil/ktutil.c:112
 #, c-format
 msgid "%s: must specify keytab to write\n"
 msgstr ""
 
-#: ../../src/kadmin/ktutil/ktutil.c:124
+#: ../../src/kadmin/ktutil/ktutil.c:117
 #, c-format
 msgid "while writing keytab \"%s\""
 msgstr ""
 
-#: ../../src/kadmin/ktutil/ktutil.c:131
+#: ../../src/kadmin/ktutil/ktutil.c:124
 #, c-format
 msgid "%s: writing srvtabs is no longer supported\n"
 msgstr ""
 
-#: ../../src/kadmin/ktutil/ktutil.c:178
+#: ../../src/kadmin/ktutil/ktutil.c:171
 #, c-format
 msgid ""
 "usage: %s (-key | -password) -p principal -k kvno [-e enctype] [-f|-s salt]\n"
 msgstr ""
 
-#: ../../src/kadmin/ktutil/ktutil.c:183
+#: ../../src/kadmin/ktutil/ktutil.c:176
 #, c-format
 msgid "enctype must be specified if not using -f\n"
 msgstr ""
 
-#: ../../src/kadmin/ktutil/ktutil.c:190
+#: ../../src/kadmin/ktutil/ktutil.c:183
 msgid "while adding new entry"
 msgstr ""
 
-#: ../../src/kadmin/ktutil/ktutil.c:200
+#: ../../src/kadmin/ktutil/ktutil.c:193
 #, c-format
 msgid "%s: must specify entry to delete\n"
 msgstr ""
 
-#: ../../src/kadmin/ktutil/ktutil.c:205
+#: ../../src/kadmin/ktutil/ktutil.c:198
 #, c-format
 msgid "while deleting entry %d"
 msgstr ""
 
-#: ../../src/kadmin/ktutil/ktutil.c:233
+#: ../../src/kadmin/ktutil/ktutil.c:226
 #, c-format
 msgid "%s: usage: %s [-t] [-k] [-e]\n"
 msgstr ""
 
-#: ../../src/kadmin/ktutil/ktutil.c:272
+#: ../../src/kadmin/ktutil/ktutil.c:265
 msgid "While converting enctype to string"
 msgstr ""
 
@@ -3098,19 +3121,19 @@ msgid "Request: %s, %s, %s, client=%s, service=%s, addr=%s"
 msgstr ""
 
 #: ../../src/kadmin/server/ipropd_svc.c:164
-#: ../../src/kadmin/server/ipropd_svc.c:283
+#: ../../src/kadmin/server/ipropd_svc.c:281
 #, c-format
 msgid "%s: server handle is NULL"
 msgstr ""
 
 #: ../../src/kadmin/server/ipropd_svc.c:174
-#: ../../src/kadmin/server/ipropd_svc.c:296
+#: ../../src/kadmin/server/ipropd_svc.c:294
 #, c-format
 msgid "%s: setup_gss_names failed"
 msgstr ""
 
 #: ../../src/kadmin/server/ipropd_svc.c:182
-#: ../../src/kadmin/server/ipropd_svc.c:305
+#: ../../src/kadmin/server/ipropd_svc.c:303
 #, c-format
 msgid "%s: out of memory recording principal names"
 msgstr ""
@@ -3125,79 +3148,79 @@ msgstr ""
 msgid "%s; Incoming SerialNo=%lu; Outgoing SerialNo=N/A"
 msgstr ""
 
-#: ../../src/kadmin/server/ipropd_svc.c:326
+#: ../../src/kadmin/server/ipropd_svc.c:324
 #, c-format
 msgid "%s: getclhoststr failed"
 msgstr ""
 
-#: ../../src/kadmin/server/ipropd_svc.c:348
+#: ../../src/kadmin/server/ipropd_svc.c:346
 #, c-format
 msgid "%s: cannot construct kdb5 util dump string too long; out of memory"
 msgstr ""
 
-#: ../../src/kadmin/server/ipropd_svc.c:368
+#: ../../src/kadmin/server/ipropd_svc.c:366
 #, c-format
 msgid "%s: fork failed: %s"
 msgstr ""
 
-#: ../../src/kadmin/server/ipropd_svc.c:380
+#: ../../src/kadmin/server/ipropd_svc.c:378
 #, c-format
 msgid "%s: popen failed: %s"
 msgstr ""
 
-#: ../../src/kadmin/server/ipropd_svc.c:394
+#: ../../src/kadmin/server/ipropd_svc.c:392
 #, c-format
 msgid "%s: pclose(popen) failed: %s"
 msgstr ""
 
-#: ../../src/kadmin/server/ipropd_svc.c:414
+#: ../../src/kadmin/server/ipropd_svc.c:412
 #, c-format
 msgid "%s: exec failed: %s"
 msgstr ""
 
-#: ../../src/kadmin/server/ipropd_svc.c:430
+#: ../../src/kadmin/server/ipropd_svc.c:428
 #, c-format
 msgid "Request: %s, spawned resync process %d, client=%s, service=%s, addr=%s"
 msgstr ""
 
-#: ../../src/kadmin/server/ipropd_svc.c:494
-#: ../../src/kadmin/server/kadm_rpc_svc.c:306
+#: ../../src/kadmin/server/ipropd_svc.c:490
+#: ../../src/kadmin/server/kadm_rpc_svc.c:299
 #, c-format
 msgid "check_rpcsec_auth: failed inquire_context, stat=%u"
 msgstr ""
 
-#: ../../src/kadmin/server/ipropd_svc.c:524
-#: ../../src/kadmin/server/kadm_rpc_svc.c:335
+#: ../../src/kadmin/server/ipropd_svc.c:520
+#: ../../src/kadmin/server/kadm_rpc_svc.c:328
 #, c-format
 msgid "bad service principal %.*s%s"
 msgstr ""
 
-#: ../../src/kadmin/server/ipropd_svc.c:547
+#: ../../src/kadmin/server/ipropd_svc.c:543
 #, c-format
 msgid "authentication attempt failed: %s, RPC authentication flavor %d"
 msgstr ""
 
-#: ../../src/kadmin/server/ipropd_svc.c:581
+#: ../../src/kadmin/server/ipropd_svc.c:577
 #, c-format
 msgid "RPC unknown request: %d (%s)"
 msgstr ""
 
-#: ../../src/kadmin/server/ipropd_svc.c:589
+#: ../../src/kadmin/server/ipropd_svc.c:585
 #, c-format
 msgid "RPC svc_getargs failed (%s)"
 msgstr ""
 
-#: ../../src/kadmin/server/ipropd_svc.c:599
+#: ../../src/kadmin/server/ipropd_svc.c:595
 #, c-format
 msgid "RPC svc_sendreply failed (%s)"
 msgstr ""
 
-#: ../../src/kadmin/server/ipropd_svc.c:605
+#: ../../src/kadmin/server/ipropd_svc.c:601
 #, c-format
 msgid "RPC svc_freeargs failed (%s)"
 msgstr ""
 
-#: ../../src/kadmin/server/kadm_rpc_svc.c:356
+#: ../../src/kadmin/server/kadm_rpc_svc.c:349
 #, c-format
 msgid "gss_to_krb5_name: failed display_name status %d"
 msgstr ""
@@ -3350,7 +3373,7 @@ msgstr ""
 msgid "starting"
 msgstr ""
 
-#: ../../src/kadmin/server/ovsec_kadmd.c:546 ../../src/kdc/main.c:1047
+#: ../../src/kadmin/server/ovsec_kadmd.c:546 ../../src/kdc/main.c:1061
 #, c-format
 msgid "%s: starting...\n"
 msgstr ""
@@ -3382,7 +3405,7 @@ msgstr ""
 
 #: ../../src/kadmin/server/server_stubs.c:415
 #: ../../src/kadmin/server/server_stubs.c:693
-#: ../../src/kadmin/server/server_stubs.c:1618
+#: ../../src/kadmin/server/server_stubs.c:1568
 msgid "success"
 msgstr ""
 
@@ -3405,50 +3428,50 @@ msgid ""
 "service=%.*s%s, addr=%s"
 msgstr ""
 
-#: ../../src/kadmin/server/server_stubs.c:1614
+#: ../../src/kadmin/server/server_stubs.c:1564
 #, c-format
 msgid ""
 "Request: kadm5_init, %.*s%s, %s, client=%.*s%s, service=%.*s%s, addr=%s, "
 "vers=%d, flavor=%d"
 msgstr ""
 
-#: ../../src/kdc/do_as_req.c:301
+#: ../../src/kdc/do_as_req.c:291
 #, c-format
 msgid "AS_REQ : handle_authdata (%d)"
 msgstr ""
 
-#: ../../src/kdc/do_tgs_req.c:643
+#: ../../src/kdc/do_tgs_req.c:631
 msgid "not checking transit path"
 msgstr ""
 
-#: ../../src/kdc/do_tgs_req.c:666
+#: ../../src/kdc/do_tgs_req.c:648
 #, c-format
 msgid "TGS_REQ : handle_authdata (%d)"
 msgstr ""
 
-#: ../../src/kdc/fast_util.c:55
+#: ../../src/kdc/fast_util.c:56
 #, c-format
 msgid "%s while handling ap-request armor"
 msgstr ""
 
-#: ../../src/kdc/fast_util.c:64
+#: ../../src/kdc/fast_util.c:65
 msgid "ap-request armor for something other than the local TGS"
 msgstr ""
 
-#: ../../src/kdc/fast_util.c:73
+#: ../../src/kdc/fast_util.c:74
 msgid "ap-request armor without subkey"
 msgstr ""
 
-#: ../../src/kdc/fast_util.c:161
+#: ../../src/kdc/fast_util.c:162
 msgid "Ap-request armor not permitted with TGS"
 msgstr ""
 
-#: ../../src/kdc/fast_util.c:168
+#: ../../src/kdc/fast_util.c:169
 #, c-format
 msgid "Unknown FAST armor type %d"
 msgstr ""
 
-#: ../../src/kdc/fast_util.c:182
+#: ../../src/kdc/fast_util.c:183
 msgid "No armor key but FAST armored request present"
 msgstr ""
 
@@ -3470,32 +3493,32 @@ msgstr ""
 msgid "while loading authdata module %s"
 msgstr ""
 
-#: ../../src/kdc/kdc_log.c:84
+#: ../../src/kdc/kdc_log.c:83
 #, c-format
 msgid "AS_REQ (%s) %s: ISSUE: authtime %u, %s, %s for %s"
 msgstr ""
 
-#: ../../src/kdc/kdc_log.c:90
+#: ../../src/kdc/kdc_log.c:91
 #, c-format
 msgid "AS_REQ (%s) %s: %s: %s for %s%s%s"
 msgstr ""
 
-#: ../../src/kdc/kdc_log.c:154
+#: ../../src/kdc/kdc_log.c:153
 #, c-format
 msgid "TGS_REQ (%s) %s: %s: authtime %u, %s%s %s for %s%s%s"
 msgstr ""
 
-#: ../../src/kdc/kdc_log.c:161
+#: ../../src/kdc/kdc_log.c:162
 #, c-format
 msgid "... PROTOCOL-TRANSITION s4u-client=%s"
 msgstr ""
 
-#: ../../src/kdc/kdc_log.c:165
+#: ../../src/kdc/kdc_log.c:166
 #, c-format
 msgid "... CONSTRAINED-DELEGATION s4u-client=%s"
 msgstr ""
 
-#: ../../src/kdc/kdc_log.c:169
+#: ../../src/kdc/kdc_log.c:170
 #, c-format
 msgid "TGS_REQ %s: %s: authtime %u, %s for %s, 2nd tkt client %s"
 msgstr ""
@@ -3529,7 +3552,7 @@ msgstr ""
 msgid "preauth %s failed to setup loop: %s"
 msgstr ""
 
-#: ../../src/kdc/kdc_preauth.c:914
+#: ../../src/kdc/kdc_preauth.c:894
 #, c-format
 msgid "%spreauth required but hint list is empty"
 msgstr ""
@@ -3542,89 +3565,99 @@ msgstr ""
 msgid "Incorrect password in encrypted challenge"
 msgstr ""
 
-#: ../../src/kdc/kdc_util.c:236
+#: ../../src/kdc/kdc_util.c:197
 msgid "TGS_REQ: SESSION KEY or MUTUAL"
 msgstr ""
 
-#: ../../src/kdc/kdc_util.c:314
+#: ../../src/kdc/kdc_util.c:272
 msgid "PROCESS_TGS: failed lineage check"
 msgstr ""
 
-#: ../../src/kdc/kdc_util.c:468
+#: ../../src/kdc/kdc_util.c:424
 #, c-format
 msgid "TGS_REQ: UNKNOWN SERVER: server='%s'"
 msgstr ""
 
-#: ../../src/kdc/kdc_util.c:798
+#: ../../src/kdc/kdc_util.c:784
 #, c-format
 msgid "Required auth indicators not present in ticket: %s"
 msgstr ""
 
-#: ../../src/kdc/main.c:230
+#: ../../src/kdc/main.c:226
+#, c-format
+msgid "Requested master password enctype %s in %s is DEPRECATED!\n"
+msgstr ""
+
+#: ../../src/kdc/main.c:242
 #, c-format
 msgid "while getting context for realm %s"
 msgstr ""
 
-#: ../../src/kdc/main.c:338
+#: ../../src/kdc/main.c:344
 #, c-format
 msgid "while setting default realm to %s"
 msgstr ""
 
-#: ../../src/kdc/main.c:346
+#: ../../src/kdc/main.c:352
 #, c-format
 msgid "while initializing database for realm %s"
 msgstr ""
 
-#: ../../src/kdc/main.c:355
+#: ../../src/kdc/main.c:361
 #, c-format
 msgid "while setting up master key name %s for realm %s"
 msgstr ""
 
-#: ../../src/kdc/main.c:368
+#: ../../src/kdc/main.c:374
 #, c-format
 msgid "while fetching master key %s for realm %s"
 msgstr ""
 
-#: ../../src/kdc/main.c:376
+#: ../../src/kdc/main.c:383
+#, c-format
+msgid "Stash file %s uses DEPRECATED enctype %s!\n"
+msgstr ""
+
+#: ../../src/kdc/main.c:390
 #, c-format
 msgid "while fetching master keys list for realm %s"
 msgstr ""
 
-#: ../../src/kdc/main.c:385
+#: ../../src/kdc/main.c:399
 #, c-format
 msgid "while resolving kdb keytab for realm %s"
 msgstr ""
 
-#: ../../src/kdc/main.c:394
+#: ../../src/kdc/main.c:408
 #, c-format
 msgid "while building TGS name for realm %s"
 msgstr ""
 
-#: ../../src/kdc/main.c:512
+#: ../../src/kdc/main.c:526
 #, c-format
 msgid "creating %d worker processes"
 msgstr ""
 
-#: ../../src/kdc/main.c:522
+#: ../../src/kdc/main.c:536
 msgid "Unable to reinitialize main loop"
 msgstr ""
 
-#: ../../src/kdc/main.c:527
+#: ../../src/kdc/main.c:541
 #, c-format
 msgid "Unable to initialize signal handlers in pid %d"
 msgstr ""
 
-#: ../../src/kdc/main.c:557
+#: ../../src/kdc/main.c:571
 #, c-format
 msgid "worker %ld exited with status %d"
 msgstr ""
 
-#: ../../src/kdc/main.c:581
+#: ../../src/kdc/main.c:595
 #, c-format
 msgid "signal %d received in supervisor"
 msgstr ""
 
-#: ../../src/kdc/main.c:593
+#: ../../src/kdc/main.c:607
 #, c-format
 msgid ""
 "usage: %s [-x db_args]* [-d dbpathname] [-r dbrealmname]\n"
@@ -3638,86 +3671,86 @@ msgid ""
 "arguments\n"
 msgstr ""
 
-#: ../../src/kdc/main.c:668 ../../src/kdc/main.c:675 ../../src/kdc/main.c:790
+#: ../../src/kdc/main.c:682 ../../src/kdc/main.c:689 ../../src/kdc/main.c:804
 #, c-format
 msgid " KDC cannot initialize. Not enough memory\n"
 msgstr ""
 
-#: ../../src/kdc/main.c:694 ../../src/kdc/main.c:737 ../../src/kdc/main.c:748
+#: ../../src/kdc/main.c:708 ../../src/kdc/main.c:751 ../../src/kdc/main.c:762
 #, c-format
 msgid "%s: KDC cannot initialize. Not enough memory\n"
 msgstr ""
 
-#: ../../src/kdc/main.c:714 ../../src/kdc/main.c:827
+#: ../../src/kdc/main.c:728 ../../src/kdc/main.c:841
 #, c-format
 msgid "%s: cannot initialize realm %s - see log file for details\n"
 msgstr ""
 
-#: ../../src/kdc/main.c:725
+#: ../../src/kdc/main.c:739
 #, c-format
 msgid "%s: cannot initialize realm %s. Not enough memory\n"
 msgstr ""
 
-#: ../../src/kdc/main.c:776
+#: ../../src/kdc/main.c:790
 #, c-format
 msgid "invalid enctype %s"
 msgstr ""
 
-#: ../../src/kdc/main.c:815
+#: ../../src/kdc/main.c:829
 msgid "while attempting to retrieve default realm"
 msgstr ""
 
-#: ../../src/kdc/main.c:817
+#: ../../src/kdc/main.c:831
 #, c-format
 msgid "%s: %s, attempting to retrieve default realm\n"
 msgstr ""
 
-#: ../../src/kdc/main.c:925
+#: ../../src/kdc/main.c:939
 #, c-format
 msgid "%s: cannot get memory for realm list\n"
 msgstr ""
 
-#: ../../src/kdc/main.c:960
+#: ../../src/kdc/main.c:974
 msgid "while initializing lookaside cache"
 msgstr ""
 
-#: ../../src/kdc/main.c:968
+#: ../../src/kdc/main.c:982
 msgid "while creating main loop"
 msgstr ""
 
-#: ../../src/kdc/main.c:977
+#: ../../src/kdc/main.c:991
 msgid "while loading KDC policy plugin"
 msgstr ""
 
-#: ../../src/kdc/main.c:1002
+#: ../../src/kdc/main.c:1016
 msgid "while initializing signal handlers"
 msgstr ""
 
-#: ../../src/kdc/main.c:1010
+#: ../../src/kdc/main.c:1024
 msgid "while initializing network"
 msgstr ""
 
-#: ../../src/kdc/main.c:1015
+#: ../../src/kdc/main.c:1029
 msgid "while detaching from tty"
 msgstr ""
 
-#: ../../src/kdc/main.c:1022
+#: ../../src/kdc/main.c:1036
 msgid "while creating PID file"
 msgstr ""
 
-#: ../../src/kdc/main.c:1031
+#: ../../src/kdc/main.c:1045
 msgid "creating worker processes"
 msgstr ""
 
-#: ../../src/kdc/main.c:1041
+#: ../../src/kdc/main.c:1055
 msgid "while loading audit plugin module(s)"
 msgstr ""
 
-#: ../../src/kdc/main.c:1045
+#: ../../src/kdc/main.c:1059
 msgid "commencing operation"
 msgstr ""
 
-#: ../../src/kdc/main.c:1053
+#: ../../src/kdc/main.c:1067
 msgid "shutting down"
 msgstr ""
 
@@ -3730,7 +3763,7 @@ msgstr ""
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [-r realm] [-f file] [-d] [-P port] [-s srvtab] replica_host\n"
+"Usage: %s [-r realm] [-f file] [-d] [-P port] [-s keytab] replica_host\n"
 "\n"
 msgstr ""
 
@@ -3767,7 +3800,7 @@ msgstr ""
 msgid "while connecting to server"
 msgstr ""
 
-#: ../../src/kprop/kprop.c:274 ../../src/kprop/kpropd.c:1199
+#: ../../src/kprop/kprop.c:274 ../../src/kprop/kpropd.c:1194
 msgid "while getting local socket address"
 msgstr ""
 
@@ -3784,7 +3817,7 @@ msgid "while authenticating to server"
 msgstr ""
 
 #: ../../src/kprop/kprop.c:314 ../../src/kprop/kprop.c:513
-#: ../../src/kprop/kpropd.c:1505
+#: ../../src/kprop/kpropd.c:1506
 #, c-format
 msgid "Generic remote error: %s\n"
 msgstr ""
@@ -3812,7 +3845,7 @@ msgstr ""
 msgid "database locked"
 msgstr ""
 
-#: ../../src/kprop/kprop.c:366 ../../src/kprop/kpropd.c:552
+#: ../../src/kprop/kprop.c:366 ../../src/kprop/kpropd.c:551
 #, c-format
 msgid "while trying to lock '%s'"
 msgstr ""
@@ -3879,403 +3912,403 @@ msgstr ""
 msgid "while creating 'last_prop' file, '%s'"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:171
+#: ../../src/kprop/kpropd.c:170
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [-r realm] [-s srvtab] [-dS] [-f replica_file]\n"
+"Usage: %s [-r realm] [-s keytab] [-dS] [-f replica_file]\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:173
+#: ../../src/kprop/kpropd.c:172
 #, c-format
 msgid "\t[-F kerberos_db_file ] [-p kdb5_util_pathname]\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:174
+#: ../../src/kprop/kpropd.c:173
 #, c-format
 msgid "\t[-x db_args]* [-P port] [-a acl_file]\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:175
+#: ../../src/kprop/kpropd.c:174
 #, c-format
 msgid "\t[-A admin_server] [--pid-file=pid_file]\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:231
+#: ../../src/kprop/kpropd.c:230
 #, c-format
 msgid "Killing fullprop child (%d)\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:260
+#: ../../src/kprop/kpropd.c:259
 msgid "while checking if stdin is a socket"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:278
+#: ../../src/kprop/kpropd.c:277
 #, c-format
 msgid "ready\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:284
+#: ../../src/kprop/kpropd.c:283
 #, c-format
 msgid "Could not write pid file %s: %s"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:296
+#: ../../src/kprop/kpropd.c:295
 #, c-format
 msgid "Could not open /dev/null: %s"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:303
+#: ../../src/kprop/kpropd.c:302
 #, c-format
 msgid "Could not dup the inetd socket: %s"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:338 ../../src/kprop/kpropd.c:351
+#: ../../src/kprop/kpropd.c:337 ../../src/kprop/kpropd.c:350
 msgid "do_iprop failed.\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:390
+#: ../../src/kprop/kpropd.c:389
 #, c-format
 msgid "getaddrinfo: %s\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:396
+#: ../../src/kprop/kpropd.c:395
 msgid "while obtaining socket"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:402
+#: ../../src/kprop/kpropd.c:401
 msgid "while setting SO_REUSEADDR option"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:410
+#: ../../src/kprop/kpropd.c:409
 msgid "while unsetting IPV6_V6ONLY option"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:415
+#: ../../src/kprop/kpropd.c:414
 msgid "while binding listener socket"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:426
+#: ../../src/kprop/kpropd.c:425
 #, c-format
 msgid "waiting for a kprop connection\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:432
+#: ../../src/kprop/kpropd.c:431
 msgid "while accepting connection"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:438
+#: ../../src/kprop/kpropd.c:437
 msgid "while forking"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:453
+#: ../../src/kprop/kpropd.c:452
 #, c-format
 msgid "waitpid() failed to wait for doit() (%d %s)\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:457
+#: ../../src/kprop/kpropd.c:456
 msgid "while waiting to receive database"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:461
+#: ../../src/kprop/kpropd.c:460
 #, c-format
 msgid "Database load process for full propagation completed.\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:499
+#: ../../src/kprop/kpropd.c:498
 #, c-format
 msgid ""
 "%s: Standard input does not appear to be a network socket.\n"
 "\t(Not run from inetd, and missing the -S option?)\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:512
+#: ../../src/kprop/kpropd.c:511
 msgid "while attempting setsockopt (SO_KEEPALIVE)"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:517
+#: ../../src/kprop/kpropd.c:516
 #, c-format
 msgid "Connection from %s"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:537
+#: ../../src/kprop/kpropd.c:536
 #, c-format
 msgid "Rejected connection from unauthorized principal %s\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:541
+#: ../../src/kprop/kpropd.c:540
 #, c-format
 msgid "Rejected connection from unauthorized principal %s"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:558
+#: ../../src/kprop/kpropd.c:557
 #, c-format
 msgid "while opening database file, '%s'"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:564
+#: ../../src/kprop/kpropd.c:563
 #, c-format
 msgid "while renaming %s to %s"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:570
+#: ../../src/kprop/kpropd.c:569
 #, c-format
 msgid "while downgrading lock on '%s'"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:577
+#: ../../src/kprop/kpropd.c:576
 #, c-format
 msgid "while unlocking '%s'"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:589
+#: ../../src/kprop/kpropd.c:588
 msgid "while sending # of received bytes"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:595
+#: ../../src/kprop/kpropd.c:594
 msgid "while trying to close database file"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:650
+#: ../../src/kprop/kpropd.c:649
 #, c-format
 msgid "Incremental propagation enabled\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:661
+#: ../../src/kprop/kpropd.c:660
 #, c-format
 msgid "%s: unable to get kiprop host based service name for realm %s\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:672
+#: ../../src/kprop/kpropd.c:671
 msgid "while trying to construct host service principal"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:691
+#: ../../src/kprop/kpropd.c:690
 #, c-format
 msgid "Initializing kadm5 as client %s\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:705
+#: ../../src/kprop/kpropd.c:704
 #, c-format
 msgid "kadm5 initialization failed!\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:714
+#: ../../src/kprop/kpropd.c:713
 msgid "while attempting to connect to master KDC ... retrying"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:718
+#: ../../src/kprop/kpropd.c:717
 #, c-format
 msgid "Sleeping %d seconds to re-initialize kadm5 (RPC ERROR)\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:734
+#: ../../src/kprop/kpropd.c:733
 #, c-format
 msgid "while initializing %s interface, retrying"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:738
+#: ../../src/kprop/kpropd.c:737
 #, c-format
 msgid "Sleeping %d seconds to re-initialize kadm5 (krb5kdc not running?)\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:748
+#: ../../src/kprop/kpropd.c:747
 #, c-format
 msgid "kadm5 initialization succeeded\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:770
+#: ../../src/kprop/kpropd.c:769
 msgid "reading update log header"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:781
+#: ../../src/kprop/kpropd.c:780
 #, c-format
 msgid "Calling iprop_get_updates_1 (sno=%u sec=%u usec=%u)\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:791
+#: ../../src/kprop/kpropd.c:790
 msgid "iprop_get_updates call failed"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:797
+#: ../../src/kprop/kpropd.c:796
 #, c-format
 msgid "Reinitializing iprop because get updates failed\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:818
+#: ../../src/kprop/kpropd.c:817
 #, c-format
 msgid "Still waiting for full resync\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:823
+#: ../../src/kprop/kpropd.c:822
 #, c-format
 msgid "Full resync needed\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:824
+#: ../../src/kprop/kpropd.c:823
 msgid "kpropd: Full resync needed."
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:829
+#: ../../src/kprop/kpropd.c:828
 msgid "iprop_full_resync call failed"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:840
+#: ../../src/kprop/kpropd.c:839
 #, c-format
 msgid "Full resync request granted\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:841
+#: ../../src/kprop/kpropd.c:840
 msgid "Full resync request granted."
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:850
+#: ../../src/kprop/kpropd.c:849
 #, c-format
 msgid "Exponential backoff\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:856
+#: ../../src/kprop/kpropd.c:855
 #, c-format
 msgid "Full resync permission denied\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:857
+#: ../../src/kprop/kpropd.c:856
 msgid "Full resync, permission denied."
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:862
+#: ../../src/kprop/kpropd.c:861
 #, c-format
 msgid "Full resync error from master\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:863
+#: ../../src/kprop/kpropd.c:862
 msgid " Full resync, error returned from master KDC."
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:871
+#: ../../src/kprop/kpropd.c:870
 #, c-format
 msgid "Full resync invalid result from master\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:873
+#: ../../src/kprop/kpropd.c:872
 msgid "Full resync, invalid return from master KDC."
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:889
+#: ../../src/kprop/kpropd.c:888
 #, c-format
 msgid "Got incremental updates (sno=%u sec=%u usec=%u)\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:901
+#: ../../src/kprop/kpropd.c:900
 #, c-format
 msgid "ulog_replay failed (%s), updates not registered\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:904
+#: ../../src/kprop/kpropd.c:903
 #, c-format
 msgid "ulog_replay failed (%s), updates not registered."
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:913
+#: ../../src/kprop/kpropd.c:912
 #, c-format
 msgid "Incremental updates: %d updates / %lu us"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:916
+#: ../../src/kprop/kpropd.c:915
 #, c-format
 msgid "Incremental updates: %d updates / %lu us\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:924
+#: ../../src/kprop/kpropd.c:923
 #, c-format
 msgid "get_updates permission denied\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:925
+#: ../../src/kprop/kpropd.c:924
 msgid "get_updates, permission denied."
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:930
+#: ../../src/kprop/kpropd.c:929
 #, c-format
 msgid "get_updates error from master\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:931
+#: ../../src/kprop/kpropd.c:930
 msgid "get_updates, error returned from master KDC."
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:939
+#: ../../src/kprop/kpropd.c:938
 #, c-format
 msgid "get_updates master busy; backoff\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:948
+#: ../../src/kprop/kpropd.c:947
 #, c-format
 msgid "KDC is synchronized with master.\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:956
+#: ../../src/kprop/kpropd.c:955
 #, c-format
 msgid "get_updates invalid result from master\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:957
+#: ../../src/kprop/kpropd.c:956
 msgid "get_updates, invalid return from master KDC."
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:972
+#: ../../src/kprop/kpropd.c:971
 #, c-format
 msgid "Busy signal received from master, backoff for %d secs\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:979
+#: ../../src/kprop/kpropd.c:978
 #, c-format
 msgid "Waiting for %d seconds before checking for updates again\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:990
+#: ../../src/kprop/kpropd.c:989
 #, c-format
 msgid "ERROR returned by master, bailing\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:991
+#: ../../src/kprop/kpropd.c:990
 msgid "ERROR returned by master KDC, bailing.\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:1108
+#: ../../src/kprop/kpropd.c:1107
 msgid "copying db args"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:1133
+#: ../../src/kprop/kpropd.c:1132
 msgid "Unable to get default realm"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:1140
+#: ../../src/kprop/kpropd.c:1139
 msgid "Unable to set default realm"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:1150
+#: ../../src/kprop/kpropd.c:1149
 msgid "while trying to construct my service name"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:1157
+#: ../../src/kprop/kpropd.c:1156
 msgid "while allocating filename for temp file"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:1165
+#: ../../src/kprop/kpropd.c:1164
 msgid "while initializing"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:1173
+#: ../../src/kprop/kpropd.c:1172
 msgid "Unable to map log!\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:1219
+#: ../../src/kprop/kpropd.c:1214
 #, c-format
 msgid "Error in krb5_auth_con_ini: %s"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:1227
+#: ../../src/kprop/kpropd.c:1222
 #, c-format
 msgid "Error in krb5_auth_con_setflags: %s"
 msgstr ""
@@ -4300,76 +4333,76 @@ msgstr ""
 msgid "Error in krb5_copy_prinicpal: %s"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:1275
+#: ../../src/kprop/kpropd.c:1276
 msgid "while unparsing ticket etype"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:1279
+#: ../../src/kprop/kpropd.c:1280
 #, c-format
 msgid "authenticated client: %s (etype == %s)\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:1358
+#: ../../src/kprop/kpropd.c:1359
 msgid "while reading size of database from client"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:1368
+#: ../../src/kprop/kpropd.c:1369
 msgid "while decoding database size from client"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:1381
+#: ../../src/kprop/kpropd.c:1382
 msgid "while initializing i_vector"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:1386
+#: ../../src/kprop/kpropd.c:1387
 #, c-format
 msgid "Full propagation transfer started.\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:1439
+#: ../../src/kprop/kpropd.c:1440
 #, c-format
 msgid "Full propagation transfer finished.\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:1500
+#: ../../src/kprop/kpropd.c:1501
 msgid "while decoding error packet from client"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:1509
+#: ../../src/kprop/kpropd.c:1510
 msgid "signaled from server"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:1511
+#: ../../src/kprop/kpropd.c:1512
 #, c-format
 msgid "Error text from client: %s\n"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:1560
+#: ../../src/kprop/kpropd.c:1561
 #, c-format
 msgid "while trying to fork %s"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:1564
+#: ../../src/kprop/kpropd.c:1565
 #, c-format
 msgid "while trying to exec %s"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:1571
+#: ../../src/kprop/kpropd.c:1572
 #, c-format
 msgid "while waiting for %s"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:1577
+#: ../../src/kprop/kpropd.c:1578
 #, c-format
 msgid "%s load terminated"
 msgstr ""
 
-#: ../../src/kprop/kpropd.c:1583
+#: ../../src/kprop/kpropd.c:1584
 #, c-format
 msgid "%s returned a bad exit status (%d)"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:28
+#: ../../src/kprop/kproplog.c:29
 #, c-format
 msgid ""
 "\n"
@@ -4378,542 +4411,542 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:132
+#: ../../src/kprop/kproplog.c:112
 #, c-format
 msgid ""
 "\n"
 "Couldn't allocate memory"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:226
+#: ../../src/kprop/kproplog.c:206
 #, c-format
 msgid "\t\tAttribute flags\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:231
+#: ../../src/kprop/kproplog.c:211
 #, c-format
 msgid "\t\tMaximum ticket life\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:236
+#: ../../src/kprop/kproplog.c:216
 #, c-format
 msgid "\t\tMaximum renewable life\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:241
+#: ../../src/kprop/kproplog.c:221
 #, c-format
 msgid "\t\tPrincipal expiration\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:246
+#: ../../src/kprop/kproplog.c:226
 #, c-format
 msgid "\t\tPassword expiration\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:251
+#: ../../src/kprop/kproplog.c:231
 #, c-format
 msgid "\t\tLast successful auth\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:256
+#: ../../src/kprop/kproplog.c:236
 #, c-format
 msgid "\t\tLast failed auth\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:261
+#: ../../src/kprop/kproplog.c:241
 #, c-format
 msgid "\t\tFailed passwd attempt\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:266
+#: ../../src/kprop/kproplog.c:246
 #, c-format
 msgid "\t\tPrincipal\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:271
+#: ../../src/kprop/kproplog.c:251
 #, c-format
 msgid "\t\tKey data\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:278
+#: ../../src/kprop/kproplog.c:258
 #, c-format
 msgid "\t\tTL data\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:285
+#: ../../src/kprop/kproplog.c:265
 #, c-format
 msgid "\t\tLength\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:290
+#: ../../src/kprop/kproplog.c:270
 #, c-format
 msgid "\t\tPassword last changed\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:295
+#: ../../src/kprop/kproplog.c:275
 #, c-format
 msgid "\t\tModifying principal\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:300
+#: ../../src/kprop/kproplog.c:280
 #, c-format
 msgid "\t\tModification time\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:305
+#: ../../src/kprop/kproplog.c:285
 #, c-format
 msgid "\t\tModified where\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:310
+#: ../../src/kprop/kproplog.c:290
 #, c-format
 msgid "\t\tPassword policy\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:315
+#: ../../src/kprop/kproplog.c:295
 #, c-format
 msgid "\t\tPassword policy switch\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:320
+#: ../../src/kprop/kproplog.c:300
 #, c-format
 msgid "\t\tPassword history KVNO\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:325
+#: ../../src/kprop/kproplog.c:305
 #, c-format
 msgid "\t\tPassword history\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:359
+#: ../../src/kprop/kproplog.c:339
 #, c-format
 msgid ""
 "Corrupt update entry\n"
 "\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:364
+#: ../../src/kprop/kproplog.c:344
 #, c-format
 msgid "Update Entry\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:366
+#: ../../src/kprop/kproplog.c:346
 #, c-format
 msgid "\tUpdate serial # : %u\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:370
+#: ../../src/kprop/kproplog.c:350
 #, c-format
 msgid "\tDummy entry\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:378
+#: ../../src/kprop/kproplog.c:358
 #, c-format
 msgid ""
 "Entry data decode failure\n"
 "\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:382
+#: ../../src/kprop/kproplog.c:362
 #, c-format
 msgid "\tUpdate operation : "
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:384
+#: ../../src/kprop/kproplog.c:364
 #, c-format
 msgid "Delete\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:386
+#: ../../src/kprop/kproplog.c:366
 #, c-format
 msgid "Add\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:390
+#: ../../src/kprop/kproplog.c:370
 #, c-format
 msgid ""
 "Could not allocate principal name\n"
 "\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:396
+#: ../../src/kprop/kproplog.c:376
 #, c-format
 msgid "\tUpdate principal : %s\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:398
+#: ../../src/kprop/kproplog.c:378
 #, c-format
 msgid "\tUpdate size : %u\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:399
+#: ../../src/kprop/kproplog.c:379
 #, c-format
 msgid "\tUpdate committed : %s\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:403
+#: ../../src/kprop/kproplog.c:383
 #, c-format
 msgid "\tUpdate time stamp : None\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:405
+#: ../../src/kprop/kproplog.c:385
 #, c-format
 msgid "\tUpdate time stamp : %s"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:409
+#: ../../src/kprop/kproplog.c:389
 #, c-format
 msgid "\tAttributes changed : %d\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:474
+#: ../../src/kprop/kproplog.c:454
 #, c-format
 msgid ""
 "Unable to initialize Kerberos\n"
 "\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:481
+#: ../../src/kprop/kproplog.c:461
 #, c-format
 msgid ""
 "Couldn't read database_name\n"
 "\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:485
+#: ../../src/kprop/kproplog.c:465
 #, c-format
 msgid ""
 "\n"
 "Kerberos update log (%s)\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:489 ../../src/kprop/kproplog.c:505
+#: ../../src/kprop/kproplog.c:469 ../../src/kprop/kproplog.c:485
 #, c-format
 msgid ""
 "Unable to map log file %s\n"
 "\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:494
+#: ../../src/kprop/kproplog.c:474
 #, c-format
 msgid ""
 "Couldn't reinitialize ulog file %s\n"
 "\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:498
+#: ../../src/kprop/kproplog.c:478
 #, c-format
 msgid "Reinitialized the ulog.\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:511
+#: ../../src/kprop/kproplog.c:491
 #, c-format
 msgid ""
 "Corrupt header log, exiting\n"
 "\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:515
+#: ../../src/kprop/kproplog.c:495
 #, c-format
 msgid "Update log dump :\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:516
+#: ../../src/kprop/kproplog.c:496
 #, c-format
 msgid "\tLog version # : %u\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:517
+#: ../../src/kprop/kproplog.c:497
 #, c-format
 msgid "\tLog state : "
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:520
+#: ../../src/kprop/kproplog.c:500
 #, c-format
 msgid "Stable\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:523
+#: ../../src/kprop/kproplog.c:503
 #, c-format
 msgid "Unstable\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:526
+#: ../../src/kprop/kproplog.c:506
 #, c-format
 msgid "Corrupt\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:529
+#: ../../src/kprop/kproplog.c:509
 #, c-format
 msgid "Unknown state: %d\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:532
+#: ../../src/kprop/kproplog.c:512
 #, c-format
 msgid "\tEntry block size : %u\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:533
+#: ../../src/kprop/kproplog.c:513
 #, c-format
 msgid "\tNumber of entries : %u\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:536
+#: ../../src/kprop/kproplog.c:516
 #, c-format
 msgid "\tLast serial # : None\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:539
+#: ../../src/kprop/kproplog.c:519
 #, c-format
 msgid "\tFirst serial # : None\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:541
+#: ../../src/kprop/kproplog.c:521
 #, c-format
 msgid "\tFirst serial # : "
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:545
+#: ../../src/kprop/kproplog.c:525
 #, c-format
 msgid "\tLast serial # : "
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:550
+#: ../../src/kprop/kproplog.c:530
 #, c-format
 msgid "\tLast time stamp : None\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:553
+#: ../../src/kprop/kproplog.c:533
 #, c-format
 msgid "\tFirst time stamp : None\n"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:555
+#: ../../src/kprop/kproplog.c:535
 #, c-format
 msgid "\tFirst time stamp : %s"
 msgstr ""
 
-#: ../../src/kprop/kproplog.c:559
+#: ../../src/kprop/kproplog.c:539
 #, c-format
 msgid "\tLast time stamp : %s\n"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:221
+#: ../../src/lib/apputils/net-server.c:231
 msgid "Got signal to request exit"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:235
+#: ../../src/lib/apputils/net-server.c:245
 msgid "Got signal to reset"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:301
+#: ../../src/lib/apputils/net-server.c:311
 #, c-format
 msgid "Invalid port %d"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:314
+#: ../../src/lib/apputils/net-server.c:324
 #, c-format
 msgid "Removing address %s since wildcard address is being added"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:321
+#: ../../src/lib/apputils/net-server.c:331
 msgid "Address already added to server"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:484
+#: ../../src/lib/apputils/net-server.c:494
 #, c-format
 msgid "closing down fd %d"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:498
+#: ../../src/lib/apputils/net-server.c:508
 #, c-format
 msgid "descriptor %d closed but still in svc_fdset"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:524
+#: ../../src/lib/apputils/net-server.c:534
 msgid "cannot create io event"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:529
+#: ../../src/lib/apputils/net-server.c:539
 msgid "cannot save event"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:549
+#: ../../src/lib/apputils/net-server.c:559
 #, c-format
 msgid "file descriptor number %d too high"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:556
+#: ../../src/lib/apputils/net-server.c:566
 msgid "cannot allocate storage for connection info"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:591
+#: ../../src/lib/apputils/net-server.c:601
 #, c-format
 msgid "Cannot create TCP server socket on %s"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:600
+#: ../../src/lib/apputils/net-server.c:610
 #, c-format
 msgid "TCP socket fd number %d (for %s) too high"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:607
+#: ../../src/lib/apputils/net-server.c:617
 #, c-format
 msgid "Cannot enable SO_REUSEADDR on fd %d"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:612
+#: ../../src/lib/apputils/net-server.c:622
 #, c-format
 msgid "setsockopt(%d,IPV6_V6ONLY,1) failed"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:615
+#: ../../src/lib/apputils/net-server.c:625
 #, c-format
 msgid "setsockopt(%d,IPV6_V6ONLY,1) worked"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:618
+#: ../../src/lib/apputils/net-server.c:628
 msgid "no IPV6_V6ONLY socket option support"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:624
+#: ../../src/lib/apputils/net-server.c:634
 #, c-format
 msgid "Cannot bind server socket on %s"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:694
+#: ../../src/lib/apputils/net-server.c:704
 #, c-format
 msgid "Setting up %s socket for address %s"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:707
+#: ../../src/lib/apputils/net-server.c:717
 #, c-format
 msgid "Cannot listen on %s server socket on %s"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:716
+#: ../../src/lib/apputils/net-server.c:726
 #, c-format
 msgid "cannot set listening %s socket on %s non-blocking"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:724
+#: ../../src/lib/apputils/net-server.c:734
 #, c-format
 msgid "cannot set SO_LINGER on %s socket on %s"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:731
+#: ../../src/lib/apputils/net-server.c:741
 #, c-format
 msgid "Setting pktinfo on socket %s"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:736
+#: ../../src/lib/apputils/net-server.c:746
 #, c-format
 msgid "Cannot request packet info for UDP socket address %s port %d"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:738
+#: ../../src/lib/apputils/net-server.c:748
 msgid ""
 "System does not support pktinfo yet binding to a wildcard address.  Packets "
 "are not guaranteed to return on the received address."
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:750
+#: ../../src/lib/apputils/net-server.c:760
 msgid "Error attempting to add verto event"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:759
+#: ../../src/lib/apputils/net-server.c:769
 #, c-format
 msgid "Cannot create RPC service: %s"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:769
+#: ../../src/lib/apputils/net-server.c:779
 #, c-format
 msgid "Cannot register RPC service: %s"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:813
+#: ../../src/lib/apputils/net-server.c:823
 msgid "No addresses added to the net server"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:832
+#: ../../src/lib/apputils/net-server.c:842
 #, c-format
 msgid "Failed getting address info (for %s): %s"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:862
+#: ../../src/lib/apputils/net-server.c:872
 #, c-format
 msgid "Failed setting up a %s socket (for %s)"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:903
+#: ../../src/lib/apputils/net-server.c:913
 msgid "setting up network..."
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:906
+#: ../../src/lib/apputils/net-server.c:916
 msgid "Error setting up network"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:909
+#: ../../src/lib/apputils/net-server.c:919
 #, c-format
 msgid "set up %d sockets"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:912
+#: ../../src/lib/apputils/net-server.c:922
 msgid "no sockets set up?"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:975
-#: ../../src/lib/apputils/net-server.c:1029
+#: ../../src/lib/apputils/net-server.c:985
+#: ../../src/lib/apputils/net-server.c:1039
 msgid "while dispatching (udp)"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:1004
+#: ../../src/lib/apputils/net-server.c:1014
 #, c-format
 msgid "while sending reply to %s/%s from %s"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:1009
+#: ../../src/lib/apputils/net-server.c:1019
 #, c-format
 msgid "short reply write %d vs %d\n"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:1054
+#: ../../src/lib/apputils/net-server.c:1064
 msgid "while receiving from network"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:1097
+#: ../../src/lib/apputils/net-server.c:1107
 msgid "too many connections"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:1115
+#: ../../src/lib/apputils/net-server.c:1125
 #, c-format
 msgid "dropping %s fd %d from %s"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:1185
+#: ../../src/lib/apputils/net-server.c:1195
 #, c-format
 msgid "allocating buffer for new TCP session from %s"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:1217
+#: ../../src/lib/apputils/net-server.c:1227
 msgid "while dispatching (tcp)"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:1249
+#: ../../src/lib/apputils/net-server.c:1259
 msgid "error allocating tcp dispatch private!"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:1296
+#: ../../src/lib/apputils/net-server.c:1306
 #, c-format
 msgid "TCP client %s wants %lu bytes, cap is %lu"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:1304
+#: ../../src/lib/apputils/net-server.c:1314
 #, c-format
 msgid "error constructing KRB_ERR_FIELD_TOOLONG error! %s"
 msgstr ""
 
-#: ../../src/lib/apputils/net-server.c:1343
+#: ../../src/lib/apputils/net-server.c:1353
 #, c-format
 msgid "getsockname failed: %s"
 msgstr ""
@@ -5117,15 +5150,15 @@ msgstr ""
 msgid "An expected per-message token was not received"
 msgstr ""
 
-#: ../../src/lib/gssapi/spnego/spnego_mech.c:1813
+#: ../../src/lib/gssapi/spnego/spnego_mech.c:1822
 msgid "SPNEGO cannot find mechanisms to negotiate"
 msgstr ""
 
-#: ../../src/lib/gssapi/spnego/spnego_mech.c:1818
+#: ../../src/lib/gssapi/spnego/spnego_mech.c:1824
 msgid "SPNEGO failed to acquire creds"
 msgstr ""
 
-#: ../../src/lib/gssapi/spnego/spnego_mech.c:1823
+#: ../../src/lib/gssapi/spnego/spnego_mech.c:1826
 msgid "SPNEGO acceptor did not select a mechanism"
 msgstr ""
 
@@ -5133,10 +5166,66 @@ msgstr ""
 msgid "SPNEGO failed to negotiate a mechanism"
 msgstr ""
 
-#: ../../src/lib/gssapi/spnego/spnego_mech.c:1833
+#: ../../src/lib/gssapi/spnego/spnego_mech.c:1830
 msgid "SPNEGO acceptor did not return a valid token"
 msgstr ""
 
+#: ../../src/lib/gssapi/spnego/spnego_mech.c:1832
+msgid "Invalid NegoEx signature"
+msgstr ""
+
+#: ../../src/lib/gssapi/spnego/spnego_mech.c:1834
+msgid "Invalid NegoEx message type"
+msgstr ""
+
+#: ../../src/lib/gssapi/spnego/spnego_mech.c:1836
+msgid "Invalid NegoEx message size"
+msgstr ""
+
+#: ../../src/lib/gssapi/spnego/spnego_mech.c:1838
+msgid "Invalid NegoEx conversation ID"
+msgstr ""
+
+#: ../../src/lib/gssapi/spnego/spnego_mech.c:1840
+msgid "NegoEx authentication scheme not found"
+msgstr ""
+
+#: ../../src/lib/gssapi/spnego/spnego_mech.c:1842
+msgid "Missing NegoEx negotiate message"
+msgstr ""
+
+#: ../../src/lib/gssapi/spnego/spnego_mech.c:1844
+msgid "Missing NegoEx authentication protocol request message"
+msgstr ""
+
+#: ../../src/lib/gssapi/spnego/spnego_mech.c:1846
+msgid "No mutually supported NegoEx authentication schemes"
+msgstr ""
+
+#: ../../src/lib/gssapi/spnego/spnego_mech.c:1848
+msgid "No NegoEx verify key"
+msgstr ""
+
+#: ../../src/lib/gssapi/spnego/spnego_mech.c:1850
+msgid "Unknown NegoEx checksum scheme"
+msgstr ""
+
+#: ../../src/lib/gssapi/spnego/spnego_mech.c:1852
+msgid "Invalid NegoEx checksum"
+msgstr ""
+
+#: ../../src/lib/gssapi/spnego/spnego_mech.c:1854
+msgid "Unsupported critical NegoEx extension"
+msgstr ""
+
+#: ../../src/lib/gssapi/spnego/spnego_mech.c:1856
+msgid "Unsupported NegoEx version"
+msgstr ""
+
+#: ../../src/lib/gssapi/spnego/spnego_mech.c:1858
+msgid "NegoEx message out of sequence"
+msgstr ""
+
 #: ../../src/lib/kadm5/logger.c:54
 #, c-format
 msgid "%s: cannot parse <%s>\n"
@@ -5233,65 +5322,65 @@ msgstr ""
 msgid "No default realm set; cannot initialize KDB"
 msgstr ""
 
-#: ../../src/lib/kdb/kdb5.c:368
+#: ../../src/lib/kdb/kdb5.c:372
 #, c-format
 msgid "Unable to find requested database type: %s"
 msgstr ""
 
-#: ../../src/lib/kdb/kdb5.c:448 ../lib/krb5/error_tables/kdb5_err.c:55
+#: ../../src/lib/kdb/kdb5.c:452 ../lib/krb5/error_tables/kdb5_err.c:55
 msgid "Unable to find requested database type"
 msgstr ""
 
-#: ../../src/lib/kdb/kdb5.c:456
+#: ../../src/lib/kdb/kdb5.c:460
 msgid "plugin symbol 'kdb_function_table' lookup failed"
 msgstr ""
 
-#: ../../src/lib/kdb/kdb5.c:464
+#: ../../src/lib/kdb/kdb5.c:468
 #, c-format
 msgid ""
 "Unable to load requested database module '%s': plugin symbol "
 "'kdb_function_table' not found"
 msgstr ""
 
-#: ../../src/lib/kdb/kdb5.c:602
+#: ../../src/lib/kdb/kdb5.c:606
 msgid "Cannot initialize database library"
 msgstr ""
 
-#: ../../src/lib/kdb/kdb5.c:1762
+#: ../../src/lib/kdb/kdb5.c:1765
 #, c-format
 msgid "Illegal version number for KRB5_TL_MKEY_AUX %d\n"
 msgstr ""
 
-#: ../../src/lib/kdb/kdb5.c:1934
+#: ../../src/lib/kdb/kdb5.c:1937
 #, c-format
 msgid "Illegal version number for KRB5_TL_ACTKVNO %d\n"
 msgstr ""
 
-#: ../../src/lib/kdb/kdb_default.c:164
+#: ../../src/lib/kdb/kdb_default.c:137
 #, c-format
 msgid "keyfile (%s) is not a regular file: %s"
 msgstr ""
 
-#: ../../src/lib/kdb/kdb_default.c:177
+#: ../../src/lib/kdb/kdb_default.c:150
 msgid "Could not create temp keytab file name."
 msgstr ""
 
-#: ../../src/lib/kdb/kdb_default.c:202
+#: ../../src/lib/kdb/kdb_default.c:175
 #, c-format
 msgid "Temporary stash file already exists: %s."
 msgstr ""
 
-#: ../../src/lib/kdb/kdb_default.c:230
+#: ../../src/lib/kdb/kdb_default.c:203
 #, c-format
 msgid "rename of temporary keyfile (%s) to (%s) failed: %s"
 msgstr ""
 
-#: ../../src/lib/kdb/kdb_default.c:415
+#: ../../src/lib/kdb/kdb_default.c:388
 #, c-format
 msgid "Can not fetch master key (error: %s)."
 msgstr ""
 
-#: ../../src/lib/kdb/kdb_default.c:483
+#: ../../src/lib/kdb/kdb_default.c:456
 msgid "Unable to decrypt latest master key with the provided master key\n"
 msgstr ""
 
@@ -5334,47 +5423,47 @@ msgid ""
 "collection"
 msgstr ""
 
-#: ../../src/lib/krb5/ccache/cc_kcm.c:757
+#: ../../src/lib/krb5/ccache/cc_kcm.c:740
 #, c-format
 msgid "Credentials cache 'KCM:%s' not found"
 msgstr ""
 
-#: ../../src/lib/krb5/ccache/cc_keyring.c:1151
+#: ../../src/lib/krb5/ccache/cc_keyring.c:1149
 msgid ""
 "Can't create new subsidiary cache because default cache is already a "
 "subsidiary"
 msgstr ""
 
-#: ../../src/lib/krb5/ccache/cc_keyring.c:1219
+#: ../../src/lib/krb5/ccache/cc_keyring.c:1217
 #, c-format
 msgid "Credentials cache keyring '%s' not found"
 msgstr ""
 
-#: ../../src/lib/krb5/ccache/cccursor.c:213
+#: ../../src/lib/krb5/ccache/cccursor.c:178
 #, c-format
 msgid "Can't find client principal %s in cache collection"
 msgstr ""
 
-#: ../../src/lib/krb5/ccache/cccursor.c:293
+#: ../../src/lib/krb5/ccache/cccursor.c:258
 msgid "No Kerberos credentials available"
 msgstr ""
 
-#: ../../src/lib/krb5/ccache/cccursor.c:299
+#: ../../src/lib/krb5/ccache/cccursor.c:264
 #, c-format
 msgid "No Kerberos credentials available (default cache: %s)"
 msgstr ""
 
-#: ../../src/lib/krb5/keytab/kt_file.c:406
+#: ../../src/lib/krb5/keytab/kt_file.c:389
 #, c-format
 msgid "No key table entry found for %s"
 msgstr ""
 
-#: ../../src/lib/krb5/keytab/kt_file.c:823
-#: ../../src/lib/krb5/keytab/kt_file.c:856
+#: ../../src/lib/krb5/keytab/kt_file.c:537
+#: ../../src/lib/krb5/keytab/kt_file.c:570
 msgid "Cannot change keytab with keytab iterators active"
 msgstr ""
 
-#: ../../src/lib/krb5/keytab/kt_file.c:1046
+#: ../../src/lib/krb5/keytab/kt_file.c:757
 #, c-format
 msgid "Key table file '%s' not found"
 msgstr ""
@@ -5489,16 +5578,16 @@ msgstr ""
 msgid "Reply has wrong form of session key for anonymous request"
 msgstr ""
 
-#: ../../src/lib/krb5/krb/get_in_tkt.c:1704
+#: ../../src/lib/krb5/krb/get_in_tkt.c:1689
 msgid "Failed to store credentials"
 msgstr ""
 
-#: ../../src/lib/krb5/krb/get_in_tkt.c:1793
+#: ../../src/lib/krb5/krb/get_in_tkt.c:1778
 #, c-format
 msgid "Client '%s' not found in Kerberos database"
 msgstr ""
 
-#: ../../src/lib/krb5/krb/gic_keytab.c:207
+#: ../../src/lib/krb5/krb/gic_keytab.c:203
 #, c-format
 msgid "Keytab contains no suitable keys for %s"
 msgstr ""
@@ -5565,11 +5654,11 @@ msgstr ""
 msgid "Pre-authentication failed"
 msgstr ""
 
-#: ../../src/lib/krb5/krb/preauth2.c:1098
+#: ../../src/lib/krb5/krb/preauth2.c:1046
 msgid "Unable to initialize preauth context"
 msgstr ""
 
-#: ../../src/lib/krb5/krb/preauth2.c:1111
+#: ../../src/lib/krb5/krb/preauth2.c:1059
 #, c-format
 msgid "Preauth module %s"
 msgstr ""
@@ -5639,7 +5728,7 @@ msgstr ""
 msgid "Challenge from authentication server"
 msgstr ""
 
-#: ../../src/lib/krb5/krb/preauth_sam2.c:166
+#: ../../src/lib/krb5/krb/preauth_sam2.c:164
 msgid "SAM Authentication"
 msgstr ""
 
@@ -5711,11 +5800,15 @@ msgid ""
 "decrypt ticket"
 msgstr ""
 
-#: ../../src/lib/krb5/krb/rd_req_dec.c:871
+#: ../../src/lib/krb5/krb/rd_req_dec.c:856
 #, c-format
 msgid "Encryption type %s not permitted"
 msgstr ""
 
+#: ../../src/lib/krb5/krb/s4u_creds.c:1041
+msgid "Realm specified but S4U2Proxy must use referral realm"
+msgstr ""
+
 #: ../../src/lib/krb5/os/expand_path.c:316
 #, c-format
 msgid "Can't find username for uid %lu"
@@ -5740,60 +5833,6 @@ msgstr ""
 msgid "Cannot contact any KDC for realm '%.*s'"
 msgstr ""
 
-#: ../../src/lib/krb5/rcache/rc_io.c:106
-#, c-format
-msgid "Cannot fstat replay cache file %s: %s"
-msgstr ""
-
-#: ../../src/lib/krb5/rcache/rc_io.c:112
-#, c-format
-msgid ""
-"Insecure mkstemp() file mode for replay cache file %s; try running this "
-"program with umask 077"
-msgstr ""
-
-#: ../../src/lib/krb5/rcache/rc_io.c:140
-#, c-format
-msgid "Cannot %s replay cache file %s: %s"
-msgstr ""
-
-#: ../../src/lib/krb5/rcache/rc_io.c:145
-#, c-format
-msgid "Cannot %s replay cache: %s"
-msgstr ""
-
-#: ../../src/lib/krb5/rcache/rc_io.c:268
-#, c-format
-msgid "Insecure file mode for replay cache file %s"
-msgstr ""
-
-#: ../../src/lib/krb5/rcache/rc_io.c:274
-#, c-format
-msgid "rcache not owned by %d"
-msgstr ""
-
-#: ../../src/lib/krb5/rcache/rc_io.c:398 ../../src/lib/krb5/rcache/rc_io.c:402
-#: ../../src/lib/krb5/rcache/rc_io.c:407
-#, c-format
-msgid "Can't write to replay cache: %s"
-msgstr ""
-
-#: ../../src/lib/krb5/rcache/rc_io.c:428
-#, c-format
-msgid "Cannot sync replay cache file: %s"
-msgstr ""
-
-#: ../../src/lib/krb5/rcache/rc_io.c:447
-#, c-format
-msgid "Can't read from replay cache: %s"
-msgstr ""
-
-#: ../../src/lib/krb5/rcache/rc_io.c:478 ../../src/lib/krb5/rcache/rc_io.c:484
-#: ../../src/lib/krb5/rcache/rc_io.c:489
-#, c-format
-msgid "Can't destroy replay cache: %s"
-msgstr ""
-
 #: ../../src/plugins/kdb/db2/kdb_db2.c:245
 #: ../../src/plugins/kdb/db2/kdb_db2.c:819
 #, c-format
@@ -5814,9 +5853,9 @@ msgid "Recursive iteration not supported in this version of libdb"
 msgstr ""
 
 #: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_policy.c:69
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:893
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:1094
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:1501
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:892
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:1093
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:1500
 msgid "while reading kerberos container information"
 msgstr ""
 
@@ -5824,8 +5863,8 @@ msgstr ""
 #: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_policy.c:143
 #: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_policy.c:504
 #: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_policy.c:518
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:151
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:166
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:150
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:165
 msgid "while providing time specification"
 msgstr ""
 
@@ -5835,7 +5874,7 @@ msgid "while creating policy object"
 msgstr ""
 
 #: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_policy.c:279
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:1509
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:1508
 msgid "while reading realm information"
 msgstr ""
 
@@ -5872,142 +5911,142 @@ msgstr ""
 msgid "while listing policy objects"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:453
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:452
 #, c-format
 msgid "for subtree while creating realm '%s'"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:465
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:464
 #, c-format
 msgid "for container reference while creating realm '%s'"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:490
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:489
 #, c-format
 msgid "invalid search scope while creating realm '%s'"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:505
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:829
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:504
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:828
 #, c-format
 msgid "'%s' is an invalid option\n"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:513
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:512
 #, c-format
 msgid "Initializing database for realm '%s'\n"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:537
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:698
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:536
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:697
 #, c-format
 msgid "while creating realm '%s'"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:557
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:556
 #, c-format
 msgid "Enter DN of Kerberos container: "
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:592
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:900
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:591
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:899
 #, c-format
 msgid "while reading information of realm '%s'"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:736
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:735
 msgid "while reading Kerberos container information"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:779
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:778
 #, c-format
 msgid "for subtree while modifying realm '%s'"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:790
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:789
 #, c-format
 msgid "for container reference while modifying realm '%s'"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:818
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:817
 #, c-format
 msgid "specified for search scope while modifying information of realm '%s'"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:857
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:856
 #, c-format
 msgid "while modifying information of realm '%s'"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:946
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:945
 msgid "Realm Name"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:949
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:948
 msgid "Subtree"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:952
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:951
 msgid "Principal Container Reference"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:957
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:959
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:956
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:958
 msgid "SearchScope"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:957
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:956
 msgid "Invalid !"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:964
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:963
 msgid "KDC Services"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:979
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:978
 msgid "Admin Services"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:994
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:993
 msgid "Passwd Services"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:1010
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:1009
 msgid "Maximum Ticket Life"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:1015
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:1014
 msgid "Maximum Renewable Life"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:1022
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:1021
 msgid "Ticket flags"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:1101
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:1100
 msgid "while listing realms"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:1433
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:1432
 msgid "while adding entries to database"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:1474
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:1473
 #, c-format
 msgid "Deleting KDC database of '%s', are you sure?\n"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:1485
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:1484
 #, c-format
 msgid "OK, deleting database of '%s'...\n"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:1518
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:1517
 #, c-format
 msgid "deleting database of '%s'"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:1523
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c:1522
 #, c-format
 msgid "** Database of '%s' destroyed.\n"
 msgstr ""
@@ -6018,55 +6057,54 @@ msgstr ""
 
 #: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:124
 #: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:131
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:139
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:145
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:173
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:243
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:141
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:169
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:239
 msgid "while setting service object password"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:152
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:148
 msgid "while getting service password filename"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:165
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:477
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:161
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:481
 #, c-format
 msgid "Password for \"%s\""
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:168
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:164
 #, c-format
 msgid "Re-enter password for \"%s\""
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:179
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:175
 #, c-format
 msgid "%s: Invalid password\n"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:189
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:185
 msgid "Failed to convert the password to hexadecimal"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:199
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:195
 #, c-format
 msgid "Failed to open file %s: %s"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:221
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:263
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:272
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:299
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:217
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:259
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:268
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:295
 msgid "Failed to write service object password to file"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:227
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:284
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:223
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:280
 msgid "Error reading service object password file"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:252
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c:248
 #, c-format
 msgid "Error creating file %s"
 msgstr ""
@@ -6074,62 +6112,63 @@ msgstr ""
 #: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:105
 #, c-format
 msgid ""
-"Usage: kdb5_ldap_util [-D user_dn [-w passwd]] [-H ldapuri]\n"
+"Usage: kdb5_ldap_util [-D user_dn [-w passwd]] [-H ldapuri] [-r realm]\n"
 "\tcmd [cmd_options]\n"
-"create          [-subtrees subtree_dn_list] [-sscope search_scope] [-"
-"containerref container_reference_dn]\n"
-"\t\t[-m|-P password|-sf stashfilename] [-k mkeytype] [-kv mkeyVNO] [-s]\n"
-"\t\t[-maxtktlife max_ticket_life] [-maxrenewlife max_renewable_ticket_life]\n"
-"\t\t[ticket_flags] [-r realm]\n"
-"modify          [-subtrees subtree_dn_list] [-sscope search_scope] [-"
-"containerref container_reference_dn]\n"
-"\t\t[-maxtktlife max_ticket_life] [-maxrenewlife max_renewable_ticket_life]\n"
-"\t\t[ticket_flags] [-r realm]\n"
-"view            [-r realm]\n"
-"destroy                [-f] [-r realm]\n"
+"create          [-subtrees subtree_dn_list] [-sscope search_scope]\n"
+"\t\t[-containerref container_reference_dn]\n"
+"\t\t[-m|-P password|-sf stashfilename] [-s]\n"
+"\t\t[-k mkeytype] [-kv mkeyVNO] [-M mkeyname]\n"
+"\t\t[-maxtktlife max_ticket_life]\n"
+"\t\t[-maxrenewlife max_renewable_ticket_life] [ticket_flags]\n"
+"modify          [-subtrees subtree_dn_list] [-sscope search_scope]\n"
+"\t\t[-containerref container_reference_dn]\n"
+"\t\t[-maxtktlife max_ticket_life]\n"
+"\t\t[-maxrenewlife max_renewable_ticket_life] [ticket_flags]\n"
+"view\n"
+"destroy         [-f]\n"
 "list\n"
 "stashsrvpw      [-f filename] service_dn\n"
-"create_policy   [-r realm] [-maxtktlife max_ticket_life]\n"
+"create_policy   [-maxtktlife max_ticket_life]\n"
 "\t\t[-maxrenewlife max_renewable_ticket_life] [ticket_flags] policy\n"
-"modify_policy   [-r realm] [-maxtktlife max_ticket_life]\n"
+"modify_policy   [-maxtktlife max_ticket_life]\n"
 "\t\t[-maxrenewlife max_renewable_ticket_life] [ticket_flags] policy\n"
-"view_policy     [-r realm] policy\n"
-"destroy_policy  [-r realm] [-force] policy\n"
-"list_policy     [-r realm]\n"
+"view_policy     policy\n"
+"destroy_policy  [-force] policy\n"
+"list_policy\n"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:325
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:333
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:341
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:329
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:337
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:345
 msgid "while reading ldap parameters"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:439
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:443
 msgid "while initializing error handling"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:447
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:451
 msgid "while initializing ldap handle"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:461
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:470
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:483
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:525
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:465
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:474
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:487
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:529
 msgid "while retrieving ldap configuration"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:500
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:507
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:516
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:504
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:511
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:520
 msgid "while initializing server list"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:547
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:551
 msgid "while setting up lib handle"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:556
+#: ../../src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c:560
 msgid "while reading ldap configuration"
 msgstr ""
 
@@ -6142,12 +6181,12 @@ msgid "Unable to read Realm"
 msgstr ""
 
 #: ../../src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.c:214
-#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_create.c:73
+#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_create.c:72
 msgid "Error processing LDAP DB params"
 msgstr ""
 
 #: ../../src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.c:220
-#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_create.c:79
+#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_create.c:78
 msgid "Error reading LDAP server params"
 msgstr ""
 
@@ -6182,10 +6221,6 @@ msgstr ""
 msgid "Cannot create LDAP handle for '%s': %s"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_create.c:129
-msgid "could not complete roll-back, error deleting Kerberos Container"
-msgstr ""
-
 #: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_krbcontainer.c:56
 #: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_krbcontainer.c:67
 msgid "Error reading kerberos container location from krb5.conf"
@@ -6218,15 +6253,15 @@ msgstr ""
 msgid "Minimum connections required per server is 2"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.c:159
+#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.c:160
 msgid "Default realm not set"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.c:261
+#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.c:262
 msgid "DN information missing"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.c:473
+#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.c:474
 msgid "dn information missing"
 msgstr ""
 
@@ -6234,94 +6269,94 @@ msgstr ""
 msgid "Principal does not belong to realm"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:308
-#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:317
-#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:325
+#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:305
+#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:314
+#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:322
 #, c-format
 msgid "%s option not supported"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:332
+#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:329
 #, c-format
 msgid "unknown option: %s"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:339
-#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:346
+#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:336
+#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:343
 #, c-format
 msgid "%s option value missing"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:671
+#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:676
 msgid "DN is out of the realm subtree"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:703
+#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:708
 msgid "ldap object is already kerberized"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:797
+#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:802
 msgid "Principal does not belong to the default realm"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:865
+#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:870
 #, c-format
 msgid ""
 "operation can not continue, more than one entry with principal name \"%s\" "
 "found"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:928
+#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:933
 #, c-format
 msgid "'%s' not found"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:992
+#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:997
 #, c-format
 msgid ""
 "link information can not be set/updated as the kerberos principal belongs to "
 "an ldap object"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:1007
+#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:1012
 #, c-format
 msgid "Failed getting object references"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:1014
+#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:1019
 #, c-format
 msgid "kerberos principal is already linked to a ldap object"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:1352
+#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:1345
 msgid "ticket policy object value: "
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:1400
+#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:1393
 #, c-format
 msgid "Principal delete failed (trying to replace entry): %s"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:1410
+#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:1403
 #, c-format
 msgid "Principal add failed: %s"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:1448
+#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:1441
 #, c-format
 msgid "User modification failed: %s"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:1521
+#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:1514
 #: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_realm.c:294
 msgid "Error reading ticket policy"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:1651
+#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:1644
 msgid "unable to decode stored principal key data"
 msgstr ""
 
-#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:1709
+#: ../../src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c:1702
 msgid "unable to decode stored principal pw history"
 msgstr ""
 
@@ -6483,146 +6518,146 @@ msgstr ""
 msgid "LMDB lockout update failure"
 msgstr ""
 
-#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:500
+#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:496
 #, c-format
 msgid "%s: %s"
 msgstr ""
 
-#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:530
+#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:526
 #, c-format
 msgid "%s (depth %d): %s"
 msgstr ""
 
-#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:773
-#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:4324
+#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:769
+#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:4193
 msgid "Pass phrase for"
 msgstr ""
 
+#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:1093
 #: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:1103
-#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:1113
-#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:1380
-#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:1390
-#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:1931
+#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:1359
+#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:1369
+#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:1846
 msgid "Failed to DER encode PKCS7"
 msgstr ""
 
-#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:1204
+#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:1194
 msgid "Failed to verify own certificate"
 msgstr ""
 
-#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:1364
+#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:1343
 msgid "Failed to add digest attribute"
 msgstr ""
 
-#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:1492
+#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:1465
 msgid "Failed to decode CMS message"
 msgstr ""
 
-#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:1510
+#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:1483
 msgid "Invalid pkinit packet: octet string expected"
 msgstr ""
 
-#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:1528
+#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:1501
 msgid "wrong oid\n"
 msgstr ""
 
-#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:1680
+#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:1653
 msgid "Failed to verify received certificate"
 msgstr ""
 
-#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:1718
+#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:1689
 msgid "Failed to verify CMS message"
 msgstr ""
 
-#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:1906
+#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:1834
 msgid "Failed to encrypt PKCS7 object"
 msgstr ""
 
-#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:1981
+#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:1892
 msgid "Failed to decode PKCS7"
 msgstr ""
 
-#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:1998
+#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:1908
 msgid "Failed to decrypt PKCS7 message"
 msgstr ""
 
-#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:4444
+#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:4313
 #, c-format
 msgid "Cannot read certificate file '%s'"
 msgstr ""
 
-#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:4451
+#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:4320
 #, c-format
 msgid "Cannot read key file '%s'"
 msgstr ""
 
-#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:5313
+#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:5182
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr ""
 
-#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:5320
+#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:5189
 #, c-format
 msgid "Cannot read file '%s'"
 msgstr ""
 
-#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:5995
+#: ../../src/plugins/preauth/pkinit/pkinit_crypto_openssl.c:5799
 #, c-format
 msgid "unknown code 0x%x"
 msgstr ""
 
-#: ../../src/plugins/preauth/pkinit/pkinit_identity.c:419
+#: ../../src/plugins/preauth/pkinit/pkinit_identity.c:413
 #, c-format
 msgid "Unsupported type while processing '%s'\n"
 msgstr ""
 
-#: ../../src/plugins/preauth/pkinit/pkinit_identity.c:453
+#: ../../src/plugins/preauth/pkinit/pkinit_identity.c:448
 msgid "Internal error parsing X509_user_identity\n"
 msgstr ""
 
-#: ../../src/plugins/preauth/pkinit/pkinit_identity.c:544
+#: ../../src/plugins/preauth/pkinit/pkinit_identity.c:539
 msgid "No user identity options specified"
 msgstr ""
 
-#: ../../src/plugins/preauth/pkinit/pkinit_srv.c:405
+#: ../../src/plugins/preauth/pkinit/pkinit_srv.c:401
 #, c-format
 msgid "PKINIT: no freshness token, rejecting auth from %s"
 msgstr ""
 
-#: ../../src/plugins/preauth/pkinit/pkinit_srv.c:409
+#: ../../src/plugins/preauth/pkinit/pkinit_srv.c:405
 #, c-format
 msgid "PKINIT: freshness token received from %s"
 msgstr ""
 
-#: ../../src/plugins/preauth/pkinit/pkinit_srv.c:411
+#: ../../src/plugins/preauth/pkinit/pkinit_srv.c:407
 #, c-format
 msgid "PKINIT: no freshness token received from %s"
 msgstr ""
 
-#: ../../src/plugins/preauth/pkinit/pkinit_srv.c:542
+#: ../../src/plugins/preauth/pkinit/pkinit_srv.c:510
 msgid "Pkinit request not signed, but client not anonymous."
 msgstr ""
 
-#: ../../src/plugins/preauth/pkinit/pkinit_srv.c:580
+#: ../../src/plugins/preauth/pkinit/pkinit_srv.c:544
 msgid "Anonymous pkinit without DH public value not supported."
 msgstr ""
 
-#: ../../src/plugins/preauth/pkinit/pkinit_srv.c:1304
+#: ../../src/plugins/preauth/pkinit/pkinit_srv.c:1086
 #, c-format
 msgid "No pkinit_identity supplied for realm %s"
 msgstr ""
 
-#: ../../src/plugins/preauth/pkinit/pkinit_srv.c:1315
+#: ../../src/plugins/preauth/pkinit/pkinit_srv.c:1097
 #, c-format
 msgid "No pkinit_anchors supplied for realm %s"
 msgstr ""
 
-#: ../../src/plugins/preauth/pkinit/pkinit_srv.c:1335
+#: ../../src/plugins/preauth/pkinit/pkinit_srv.c:1117
 #, c-format
 msgid "OCSP is not supported: (realm: %s)"
 msgstr ""
 
-#: ../../src/plugins/preauth/pkinit/pkinit_srv.c:1736
+#: ../../src/plugins/preauth/pkinit/pkinit_srv.c:1518
 msgid "No realms configured correctly for pkinit support"
 msgstr ""
 
@@ -6635,7 +6670,7 @@ msgstr ""
 msgid "SPAKE challenge group not a permitted group: %s"
 msgstr ""
 
-#: ../../src/plugins/preauth/spake/spake_kdc.c:536
+#: ../../src/plugins/preauth/spake/spake_kdc.c:529
 msgid "Unknown SPAKE request type"
 msgstr ""
 
@@ -6643,31 +6678,35 @@ msgstr ""
 msgid "Kerberos library initialization failure"
 msgstr ""
 
-#: ../../src/util/support/errors.c:93
+#: ../../src/util/support/errors.c:83
+msgid "Error code translation unavailable"
+msgstr ""
+
+#: ../../src/util/support/errors.c:92
 #, c-format
 msgid "error %ld"
 msgstr ""
 
-#: ../../src/util/support/plugins.c:186
+#: ../../src/util/support/plugins.c:200
 #, c-format
 msgid "unable to find plugin [%s]: %s"
 msgstr ""
 
-#: ../../src/util/support/plugins.c:274
+#: ../../src/util/support/plugins.c:288
 msgid "unknown failure"
 msgstr ""
 
-#: ../../src/util/support/plugins.c:277
+#: ../../src/util/support/plugins.c:291
 #, c-format
 msgid "unable to load plugin [%s]: %s"
 msgstr ""
 
-#: ../../src/util/support/plugins.c:300
+#: ../../src/util/support/plugins.c:314
 #, c-format
 msgid "unable to load DLL [%s]"
 msgstr ""
 
-#: ../../src/util/support/plugins.c:316
+#: ../../src/util/support/plugins.c:330
 #, c-format
 msgid "plugin unavailable: %s"
 msgstr ""
@@ -7259,6 +7298,10 @@ msgstr ""
 msgid "No KCM server found"
 msgstr ""
 
+#: ../lib/krb5/error_tables/k5e1_err.c:35
+msgid "Authorize and set hw-authent ticket flag"
+msgstr ""
+
 #: ../lib/krb5/error_tables/krb5_err.c:24
 msgid "Client's entry in database has expired"
 msgstr ""
diff --git a/src/tests/deps b/src/tests/deps
index a7f1515bd7..80284308c2 100644
--- a/src/tests/deps
+++ b/src/tests/deps
@@ -125,12 +125,34 @@ $(OUTPRE)plugorder.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
   $(top_srcdir)/include/krb5/pwqual_plugin.h $(top_srcdir)/include/port-sockets.h \
   $(top_srcdir)/include/socket-utils.h plugorder.c
+$(OUTPRE)rdreq.$(OBJEXT): $(BUILDTOP)/include/krb5/krb5.h \
+  $(COM_ERR_DEPS) $(top_srcdir)/include/krb5.h rdreq.c
+$(OUTPRE)replay.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
+  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h \
+  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
+  $(top_srcdir)/include/socket-utils.h replay.c
 $(OUTPRE)responder.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(BUILDTOP)/include/krb5/krb5.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-json.h \
   $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \
   $(top_srcdir)/include/krb5.h responder.c
 $(OUTPRE)s2p.$(OBJEXT): $(BUILDTOP)/include/krb5/krb5.h \
   $(COM_ERR_DEPS) $(top_srcdir)/include/krb5.h s2p.c
+$(OUTPRE)s4u2self.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
+  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h \
+  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \
+  $(top_srcdir)/include/socket-utils.h s4u2self.c
 $(OUTPRE)s4u2proxy.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
   $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h \
diff --git a/src/tests/resolve/deps b/src/tests/resolve/deps
index 158110682d..762d9adab7 100644
--- a/src/tests/resolve/deps
+++ b/src/tests/resolve/deps
@@ -2,6 +2,7 @@
 # Generated makefile dependencies follow.
 #
 $(OUTPRE)resolve.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \
   resolve.c
 $(OUTPRE)addrinfo-test.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \
diff --git a/src/util/support/deps b/src/util/support/deps
index 1fc042ba39..4b0f71bb89 100644
--- a/src/util/support/deps
+++ b/src/util/support/deps
@@ -111,3 +111,6 @@ getopt.so getopt.po $(OUTPRE)getopt.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
 getopt_long.so getopt_long.po $(OUTPRE)getopt_long.$(OBJEXT): \
   $(BUILDTOP)/include/autoconf.h $(top_srcdir)/include/k5-platform.h \
   $(top_srcdir)/include/k5-thread.h getopt_long.c
+secure_getenv.so secure_getenv.po $(OUTPRE)secure_getenv.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(top_srcdir)/include/k5-platform.h \
+  $(top_srcdir)/include/k5-thread.h secure_getenv.c