Import of Heimdal 0.5.1.

Approved by:	re

110 files changed, 1246 insertions, 1442 deletions

diff --git a/crypto/heimdal/ChangeLog b/crypto/heimdal/ChangeLog
index 700a53e..4773b98 100644
--- a/crypto/heimdal/ChangeLog
+++ b/crypto/heimdal/ChangeLog
@@ -1,18 +1,43 @@
-2002-09-16  Jacques Vidrine  <nectar@kth.se>
+2002-10-21  Johan Danielsson  <joda@pdc.kth.se>
 
-	* lib/krb5/kuserok.c, lib/krb5/prompter_posix.c: use strcspn
-	to convert the newline to NUL in fgets results.
+	* lib/krb5/store_emem.c: pull up 1.13; limit how much we allocate
 
-2002-09-13  Johan Danielsson  <joda@pdc.kth.se>
+	* lib/krb5/principal.c: pull up 1.82; don't allow trailing
+	backslashes in components
 
-	* kuser/kinit.1: remove unneeded Ns
+	* lib/krb5/keytab_keyfile.c: pull up 1.15; more strcspn
 
-	* lib/krb5/krb5_appdefault.3: remove extra "application"
+	* lib/krb5/keytab_any.c: pull up 1.7; properly close the open
+	keytabs
 
-	* fix-export: remove autom4ate.cache
+	* kdc/connect.c: pull up 1.87; check that %-quotes are followed by
+	two hex digits
+
+	* lib/krb5/prompter_posix.c: pull up 1.7; use strcspn to convert
+	the newline to NUL in fgets results.
+
+	* lib/krb5/kuserok.c: pull up 1.6; use strcspn to convert the
+	newline to NUL in fgets results.
+
+	* lib/krb5/keytab_file.c: pull up 1.12; check return value from
+	start_seq_get
+
+	* lib/krb5/context.c: pull up 1.82; return ENXIO instead of ENOENT
+	when "unconfigured"
+
+	* lib/krb5/changepw.c: pull up 1.38; fix reply length check
+	calculation
+
+	* kuser/klist.c: pull up 1.68; allow tokens up to size of buffer
+
+	* kdc/kaserver.c: pull up 1.21; make sure life is positive
+
+	* fix-export: pull up 1.28; remove autom4ate.cache
 
 2002-09-10  Johan Danielsson  <joda@pdc.kth.se>
 
+	* Release 0.5
+
 	* include/make_crypto.c: don't use function macros if possible
 
 	* lib/krb5/krb5_locl.h: get limits.h for UINT_MAX
diff --git a/crypto/heimdal/Makefile.in b/crypto/heimdal/Makefile.in
index 4fc034c2..2670fc7 100644
--- a/crypto/heimdal/Makefile.in
+++ b/crypto/heimdal/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -237,9 +236,6 @@ all: all-recursive
 
 .SUFFIXES:
 .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c
-
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno
 $(srcdir)/Makefile.in:  Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  Makefile
@@ -375,7 +371,7 @@ distcleancheck_listfiles = find . -type f -print
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -489,7 +485,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -499,7 +495,7 @@ clean: clean-recursive
 clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -f config.status config.cache config.log
 distclean-am: clean-am distclean-generic distclean-libtool \
 	distclean-tags
 
@@ -524,8 +520,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf autom4te.cache
+
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
diff --git a/crypto/heimdal/NEWS b/crypto/heimdal/NEWS
index 49e2aff..79d5cdc 100644
--- a/crypto/heimdal/NEWS
+++ b/crypto/heimdal/NEWS
@@ -1,3 +1,17 @@
+Changes in release 0.5.1
+
+ * kadmind: fix remote exploit
+
+ * kadmind: add option to disable kerberos 4
+
+ * kdc: make sure kaserver token life is positive
+
+ * telnet: use the session key if there is no subkey
+
+ * fix EPSV parsing in ftp
+
+ * other bug fixes
+
 Changes in release 0.5
 
  * add --detach option to kdc
diff --git a/crypto/heimdal/aclocal.m4 b/crypto/heimdal/aclocal.m4
index 8b7a282..e672474 100644
--- a/crypto/heimdal/aclocal.m4
+++ b/crypto/heimdal/aclocal.m4
@@ -1,4 +1,4 @@
-# aclocal.m4t generated automatically by aclocal 1.6.3 -*- Autoconf -*-
+# aclocal.m4t generated automatically by aclocal 1.6.1 -*- Autoconf -*-
 
 # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
@@ -241,7 +241,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"])
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.6.3])])
+	 [AM_AUTOMAKE_VERSION([1.6.1])])
 
 # Helper functions for option handling.                    -*- Autoconf -*-
 
@@ -573,7 +573,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl
 
 ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
        [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc']
        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
                    [depcc="$$1"   am_compiler_list=])
 
@@ -698,13 +698,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 [for mf in $CONFIG_FILES; do
   # Strip MF so we end up with the name of the file.
   mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+  if (sed 1q $mf | fgrep 'generated by automake') > /dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
     continue
@@ -6725,7 +6719,7 @@ AH_BOTTOM([
 ])
 
 dnl
-dnl $Id: sunos.m4,v 1.1 2002/08/28 19:53:51 joda Exp $
+dnl $Id: sunos.m4,v 1.1.4.1 2002/10/21 14:29:36 joda Exp $
 dnl
 
 AC_DEFUN([rk_SUNOS],[
@@ -6737,7 +6731,7 @@ case "$host" in
 *-*-solaris2.7)
 	sunos=57
 	;;
-*-*-solaris2.[89])
+*-*-solaris2.[[89]])
 	sunos=58
 	;;
 *-*-solaris2*)
diff --git a/crypto/heimdal/admin/Makefile.in b/crypto/heimdal/admin/Makefile.in
index a931495..87497ab 100644
--- a/crypto/heimdal/admin/Makefile.in
+++ b/crypto/heimdal/admin/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -283,7 +282,8 @@ install-sbinPROGRAMS: $(sbin_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f; \
 	  else :; fi; \
@@ -292,17 +292,14 @@ install-sbinPROGRAMS: $(sbin_PROGRAMS)
 uninstall-sbinPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \
 	  rm -f $(DESTDIR)$(sbindir)/$$f; \
 	done
 
 clean-sbinPROGRAMS:
-	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
 ktutil$(EXEEXT): $(ktutil_OBJECTS) $(ktutil_DEPENDENCIES) 
 	@rm -f ktutil$(EXEEXT)
 	$(LINK) $(ktutil_LDFLAGS) $(ktutil_OBJECTS) $(ktutil_LDADD) $(LIBS)
@@ -347,10 +344,6 @@ install-man8: $(man8_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    8*) ;; \
-	    *) ext='8' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -416,7 +409,7 @@ top_distdir = ..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -466,7 +459,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/admin/ktutil.cat8 b/crypto/heimdal/admin/ktutil.cat8
index 9387161..8cfd856 100644
--- a/crypto/heimdal/admin/ktutil.cat8
+++ b/crypto/heimdal/admin/ktutil.cat8
@@ -1,11 +1,11 @@
-KTUTIL(8)               FreeBSD System Manager's Manual              KTUTIL(8)
+KTUTIL(8)               NetBSD System Manager's Manual               KTUTIL(8)
 
 NNAAMMEE
      kkttuuttiill - manage Kerberos keytabs
 
 SSYYNNOOPPSSIISS
-     kkttuuttiill [--kk _k_e_y_t_a_b | ----kkeeyyttaabb==_k_e_y_t_a_b] [--vv | ----vveerrbboossee] [----vveerrssiioonn]
-            [--hh | ----hheellpp] _c_o_m_m_a_n_d [_a_r_g_s]
+     kkttuuttiill [--kk _k_e_y_t_a_b | ----kkeeyyttaabb==_k_e_y_t_a_b] [--vv | ----vveerrbboossee] [----vveerrssiioonn] [--hh |
+     ----hheellpp] _c_o_m_m_a_n_d [_a_r_g_s]
 
 DDEESSCCRRIIPPTTIIOONN
      kkttuuttiill is a program for managing keytabs.  _c_o_m_m_a_n_d can be one of the fol-
@@ -47,13 +47,13 @@ DDEESSCCRRIIPPTTIIOONN
 
      remove [--pp _p_r_i_n_c_i_p_a_l] [----pprriinncciippaall==_p_r_i_n_c_i_p_a_l] [--VV --kkvvnnoo] [----kkvvnnoo==_k_v_n_o]
                  [--ee --eennccttyyppee] [----eennccttyyppee==_e_n_c_t_y_p_e]
-                 Removes the specified key or keys. Not specifying a _k_v_n_o
-                 removes keys with any version number. Not specifying a
-                 _e_n_c_t_y_p_e removes keys of any type.
+                 Removes the specified key or keys. Not specifying a _k_v_n_o re-
+                 moves keys with any version number. Not specifying a _e_n_c_t_y_p_e
+                 removes keys of any type.
 
      rename _f_r_o_m_-_p_r_i_n_c_i_p_a_l _t_o_-_p_r_i_n_c_i_p_a_l
-                 Renames all entries in the keytab that match the
-                 _f_r_o_m_-_p_r_i_n_c_i_p_a_l to _t_o_-_p_r_i_n_c_i_p_a_l.
+                 Renames all entries in the keytab that match the _f_r_o_m_-
+                 _p_r_i_n_c_i_p_a_l to _t_o_-_p_r_i_n_c_i_p_a_l.
 
      purge [----aaggee==_a_g_e]
                  Removes all old entries (for which there is a newer version)
@@ -78,4 +78,4 @@ DDEESSCCRRIIPPTTIIOONN
 SSEEEE AALLSSOO
      kadmin(8)
 
-HEIMDAL                        December 16, 2000                       HEIMDAL
+ HEIMDAL                       December 16, 2000                             2
diff --git a/crypto/heimdal/appl/Makefile.in b/crypto/heimdal/appl/Makefile.in
index f412240..ba2d1a3 100644
--- a/crypto/heimdal/appl/Makefile.in
+++ b/crypto/heimdal/appl/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -365,7 +364,7 @@ top_distdir = ..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -427,7 +426,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/appl/afsutil/Makefile.in b/crypto/heimdal/appl/afsutil/Makefile.in
index e2538f4..2e57083 100644
--- a/crypto/heimdal/appl/afsutil/Makefile.in
+++ b/crypto/heimdal/appl/afsutil/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -280,7 +279,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
@@ -289,17 +289,14 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
 	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done
 
 clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 afslog$(EXEEXT): $(afslog_OBJECTS) $(afslog_DEPENDENCIES) 
 	@rm -f afslog$(EXEEXT)
 	$(LINK) $(afslog_LDFLAGS) $(afslog_OBJECTS) $(afslog_LDADD) $(LIBS)
@@ -373,7 +370,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -423,7 +420,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/appl/ftp/ChangeLog b/crypto/heimdal/appl/ftp/ChangeLog
index 92e0041..d6bbfdd 100644
--- a/crypto/heimdal/appl/ftp/ChangeLog
+++ b/crypto/heimdal/appl/ftp/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-21  Johan Danielsson  <joda@pdc.kth.se>
+
+	* ftp/ftp.c: pull up 1.75; fix parsing of epsv ports
+
 2002-09-05  Johan Danielsson  <joda@pdc.kth.se>
 
 	* ftp/security.c (sec_vfprintf): free encoded data
diff --git a/crypto/heimdal/appl/ftp/Makefile.in b/crypto/heimdal/appl/ftp/Makefile.in
index b7b22cb..c3bada8 100644
--- a/crypto/heimdal/appl/ftp/Makefile.in
+++ b/crypto/heimdal/appl/ftp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -346,7 +345,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -408,7 +407,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/appl/ftp/common/Makefile.in b/crypto/heimdal/appl/ftp/common/Makefile.in
index 6970b1f..48d9b22 100644
--- a/crypto/heimdal/appl/ftp/common/Makefile.in
+++ b/crypto/heimdal/appl/ftp/common/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -324,7 +323,7 @@ top_distdir = ../../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -373,7 +372,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/appl/ftp/ftp/Makefile.in b/crypto/heimdal/appl/ftp/ftp/Makefile.in
index 0619c4d..1764c13 100644
--- a/crypto/heimdal/appl/ftp/ftp/Makefile.in
+++ b/crypto/heimdal/appl/ftp/ftp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -300,7 +299,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
@@ -309,17 +309,14 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
 	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done
 
 clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 ftp$(EXEEXT): $(ftp_OBJECTS) $(ftp_DEPENDENCIES) 
 	@rm -f ftp$(EXEEXT)
 	$(LINK) $(ftp_LDFLAGS) $(ftp_OBJECTS) $(ftp_LDADD) $(LIBS)
@@ -364,10 +361,6 @@ install-man1: $(man1_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    1*) ;; \
-	    *) ext='1' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -433,7 +426,7 @@ top_distdir = ../../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -483,7 +476,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/appl/ftp/ftp/ftp.c b/crypto/heimdal/appl/ftp/ftp/ftp.c
index fcf0bc4..186aba8 100644
--- a/crypto/heimdal/appl/ftp/ftp/ftp.c
+++ b/crypto/heimdal/appl/ftp/ftp/ftp.c
@@ -32,7 +32,7 @@
  */
 
 #include "ftp_locl.h"
-RCSID ("$Id: ftp.c,v 1.74 2002/09/04 22:00:12 joda Exp $");
+RCSID ("$Id: ftp.c,v 1.74.4.1 2002/10/21 14:26:31 joda Exp $");
 
 struct sockaddr_storage hisctladdr_ss;
 struct sockaddr *hisctladdr = (struct sockaddr *)&hisctladdr_ss;
@@ -396,6 +396,9 @@ getreply (int expecteof)
 			if (p) {
 			    p++;
 			    strlcpy(pasv, p, sizeof(pasv));
+			    p = strrchr(pasv, ')');
+			    if (p)
+				*p = '\0';
 			}
 		    }
 		    return code / 100;
diff --git a/crypto/heimdal/appl/ftp/ftp/ftp.cat1 b/crypto/heimdal/appl/ftp/ftp/ftp.cat1
index 6c7b5f6..83323cc 100644
--- a/crypto/heimdal/appl/ftp/ftp/ftp.cat1
+++ b/crypto/heimdal/appl/ftp/ftp/ftp.cat1
@@ -1,4 +1,4 @@
-FTP(1)                  FreeBSD General Commands Manual                 FTP(1)
+FTP(1)                      NetBSD Reference Manual                     FTP(1)
 
 NNAAMMEE
      ffttpp - ARPANET file transfer program
@@ -23,8 +23,8 @@ DDEESSCCRRIIPPTTIIOONN
            server, as well as report on data transfer statistics.
 
      --nn    Restrains ffttpp from attempting ``auto-login'' upon initial connec-
-           tion.  If auto-login is enabled, ffttpp will check the _._n_e_t_r_c (see
-           below) file in the user's home directory for an entry describing an
+           tion.  If auto-login is enabled, ffttpp will check the _._n_e_t_r_c (see be-
+           low) file in the user's home directory for an entry describing an
            account on the remote machine.  If no entry exists, ffttpp will prompt
            for the remote machine login name (default is the user identity on
            the local machine), and, if necessary, prompt for a password and an
@@ -44,8 +44,8 @@ DDEESSCCRRIIPPTTIIOONN
      command line.  If this is done, ffttpp will immediately attempt to establish
      a connection to an FTP server on that host; otherwise, ffttpp will enter its
      command interpreter and await instructions from the user.  When ffttpp is
-     awaiting commands from the user the prompt `ftp>' is provided to the
-     user.  The following commands are recognized by ffttpp:
+     awaiting commands from the user the prompt `ftp>' is provided to the us-
+     er.  The following commands are recognized by ffttpp:
 
      !! [_c_o_m_m_a_n_d [_a_r_g_s]]
                  Invoke an interactive shell on the local machine.  If there
@@ -69,8 +69,8 @@ DDEESSCCRRIIPPTTIIOONN
                  or nnmmaapp setting.  File transfer uses the current settings for
                  ttyyppee, ffoorrmmaatt, mmooddee, and ssttrruuccttuurree.
 
-     aasscciiii       Set the file transfer ttyyppee to network ASCII.  This is the
-                 default type.
+     aasscciiii       Set the file transfer ttyyppee to network ASCII.  This is the de-
+                 fault type.
 
      bbeellll        Arrange that a bell be sounded after each file transfer com-
                  mand is completed.
@@ -78,8 +78,8 @@ DDEESSCCRRIIPPTTIIOONN
      bbiinnaarryy      Set the file transfer ttyyppee to support binary image transfer.
 
      bbyyee         Terminate the FTP session with the remote server and exit
-                 ffttpp.  An end of file will also terminate the session and
-                 exit.
+                 ffttpp.  An end of file will also terminate the session and ex-
+                 it.
 
      ccaassee        Toggle remote computer file name case mapping during mmggeett
                  commands.  When ccaassee is on (default is off), remote computer
@@ -87,21 +87,21 @@ DDEESSCCRRIIPPTTIIOONN
                  local directory with the letters mapped to lower case.
 
      ccdd _r_e_m_o_t_e_-_d_i_r_e_c_t_o_r_y
-                 Change the working directory on the remote machine to
-                 _r_e_m_o_t_e_-_d_i_r_e_c_t_o_r_y.
+                 Change the working directory on the remote machine to _r_e_m_o_t_e_-
+                 _d_i_r_e_c_t_o_r_y.
 
      ccdduupp        Change the remote machine working directory to the parent of
                  the current remote machine working directory.
 
      cchhmmoodd _m_o_d_e _f_i_l_e_-_n_a_m_e
-                 Change the permission modes of the file _f_i_l_e_-_n_a_m_e on the
-                 remote sytem to _m_o_d_e.
+                 Change the permission modes of the file _f_i_l_e_-_n_a_m_e on the re-
+                 mote sytem to _m_o_d_e.
 
      cclloossee       Terminate the FTP session with the remote server, and return
                  to the command interpreter.  Any defined macros are erased.
 
-     ccrr          Toggle carriage return stripping during ascii type file
-                 retrieval.  Records are denoted by a carriage return/linefeed
+     ccrr          Toggle carriage return stripping during ascii type file re-
+                 trieval.  Records are denoted by a carriage return/linefeed
                  sequence during ascii type file transfer.  When ccrr is on (the
                  default), carriage returns are stripped from this sequence to
                  conform with the UNIX single linefeed record delimiter.
@@ -125,9 +125,9 @@ DDEESSCCRRIIPPTTIIOONN
                  _l_o_c_a_l_-_f_i_l_e.  If interactive prompting is on, ffttpp will prompt
                  the user to verify that the last argument is indeed the tar-
                  get local file for receiving ddiirr output.  If no directory is
-                 specified, the current working directory on the remote
-                 machine is used.  If no local file is specified, or
-                 _l_o_c_a_l_-_f_i_l_e is --, output comes to the terminal.
+                 specified, the current working directory on the remote ma-
+                 chine is used.  If no local file is specified, or _l_o_c_a_l_-_f_i_l_e
+                 is --, output comes to the terminal.
 
      ddiissccoonnnneecctt  A synonym for _c_l_o_s_e.
 
@@ -153,12 +153,12 @@ DDEESSCCRRIIPPTTIIOONN
                  exact result depends on the foreign operating system and ftp
                  server, and can be previewed by doing `mls remote-files -'.
                  As a security measure, remotely globbed files that starts
-                 with `/' or contains `../', will not be automatically
-                 received. If you have interactive prompting turned off, these
+                 with `/' or contains `../', will not be automatically re-
+                 ceived. If you have interactive prompting turned off, these
                  filenames will be ignored.  Note: mmggeett and mmppuutt are not meant
                  to transfer entire directory subtrees of files.  That can be
-                 done by transferring a tar(1) archive of the subtree (in
-                 binary mode).
+                 done by transferring a tar(1) archive of the subtree (in bi-
+                 nary mode).
 
      hhaasshh        Toggle hash-sign (``#'') printing for each data block trans-
                  ferred.  The size of a data block is 1024 bytes.
@@ -182,7 +182,7 @@ DDEESSCCRRIIPPTTIIOONN
                  machine.  The listing includes any system-dependent informa-
                  tion that the server chooses to include; for example, most
                  UNIX systems will produce output from the command `ls -l'.
-                 (See also nnlliisstt.)  If _r_e_m_o_t_e_-_d_i_r_e_c_t_o_r_y is left unspecified,
+                 (See also nnlliisstt.) If _r_e_m_o_t_e_-_d_i_r_e_c_t_o_r_y is left unspecified,
                  the current working directory is used.  If interactive
                  prompting is on, ffttpp will prompt the user to verify that the
                  last argument is indeed the target local file for receiving
@@ -194,18 +194,17 @@ DDEESSCCRRIIPPTTIIOONN
                  _m_a_c_r_o_-_n_a_m_e; a null line (consecutive newline characters in a
                  file or carriage returns from the terminal) terminates macro
                  input mode.  There is a limit of 16 macros and 4096 total
-                 characters in all defined macros.  Macros remain defined
-                 until a cclloossee command is executed.  The macro processor
-                 interprets `$' and `\' as special characters.  A `$' followed
-                 by a number (or numbers) is replaced by the corresponding
-                 argument on the macro invocation command line.  A `$' fol-
-                 lowed by an `i' signals that macro processor that the execut-
-                 ing macro is to be looped.  On the first pass `$i' is
-                 replaced by the first argument on the macro invocation com-
-                 mand line, on the second pass it is replaced by the second
-                 argument, and so on.  A `\' followed by any character is
-                 replaced by that character.  Use the `\' to prevent special
-                 treatment of the `$'.
+                 characters in all defined macros.  Macros remain defined un-
+                 til a cclloossee command is executed.  The macro processor inter-
+                 prets `$' and `\' as special characters.  A `$' followed by a
+                 number (or numbers) is replaced by the corresponding argument
+                 on the macro invocation command line.  A `$' followed by an
+                 `i' signals that macro processor that the executing macro is
+                 to be looped.  On the first pass `$i' is replaced by the
+                 first argument on the macro invocation command line, on the
+                 second pass it is replaced by the second argument, and so on.
+                 A `\' followed by any character is replaced by that charac-
+                 ter.  Use the `\' to prevent special treatment of the `$'.
 
      mmddeelleettee [_r_e_m_o_t_e_-_f_i_l_e_s]
                  Delete the _r_e_m_o_t_e_-_f_i_l_e_s on the remote machine.
@@ -240,8 +239,8 @@ DDEESSCCRRIIPPTTIIOONN
                  ``stream'' mode.
 
      mmooddttiimmee _f_i_l_e_-_n_a_m_e
-                 Show the last modification time of the file on the remote
-                 machine.
+                 Show the last modification time of the file on the remote ma-
+                 chine.
 
      mmppuutt _l_o_c_a_l_-_f_i_l_e_s
                  Expand wild cards in the list of local files given as argu-
@@ -257,20 +256,20 @@ DDEESSCCRRIIPPTTIIOONN
                  _g_e_t.
 
      nnlliisstt [_r_e_m_o_t_e_-_d_i_r_e_c_t_o_r_y] [_l_o_c_a_l_-_f_i_l_e]
-                 Print a  list of the files in a directory on the remote
-                 machine.  If _r_e_m_o_t_e_-_d_i_r_e_c_t_o_r_y is left unspecified, the cur-
-                 rent working directory is used.  If interactive prompting is
-                 on, ffttpp will prompt the user to verify that the last argument
-                 is indeed the target local file for receiving nnlliisstt output.
-                 If no local file is specified, or if _l_o_c_a_l_-_f_i_l_e is --, the
-                 output is sent to the terminal.
+                 Print a  list of the files in a directory on the remote ma-
+                 chine.  If _r_e_m_o_t_e_-_d_i_r_e_c_t_o_r_y is left unspecified, the current
+                 working directory is used.  If interactive prompting is on,
+                 ffttpp will prompt the user to verify that the last argument is
+                 indeed the target local file for receiving nnlliisstt output.  If
+                 no local file is specified, or if _l_o_c_a_l_-_f_i_l_e is --, the output
+                 is sent to the terminal.
 
      nnmmaapp [_i_n_p_a_t_t_e_r_n _o_u_t_p_a_t_t_e_r_n]
                  Set or unset the filename mapping mechanism.  If no arguments
                  are specified, the filename mapping mechanism is unset.  If
                  arguments are specified, remote filenames are mapped during
-                 mmppuutt commands and ppuutt commands issued without a specified
-                 remote target filename.  If arguments are specified, local
+                 mmppuutt commands and ppuutt commands issued without a specified re-
+                 mote target filename.  If arguments are specified, local
                  filenames are mapped during mmggeett commands and ggeett commands
                  issued without a specified local target filename.  This com-
                  mand is useful when connecting to a non-UNIX remote computer
@@ -281,24 +280,24 @@ DDEESSCCRRIIPPTTIIOONN
                  settings).  Variable templating is accomplished by including
                  the sequences `$1', `$2', ..., `$9' in _i_n_p_a_t_t_e_r_n.  Use `\' to
                  prevent this special treatment of the `$' character.  All
-                 other characters are treated literally, and are used to
-                 determine the nnmmaapp [_i_n_p_a_t_t_e_r_n] variable values.  For example,
+                 other characters are treated literally, and are used to de-
+                 termine the nnmmaapp [_i_n_p_a_t_t_e_r_n] variable values.  For example,
                  given _i_n_p_a_t_t_e_r_n $1.$2 and the remote file name "mydata.data",
                  $1 would have the value "mydata", and $2 would have the value
                  "data".  The _o_u_t_p_a_t_t_e_r_n determines the resulting mapped file-
                  name.  The sequences `$1', `$2', ...., `$9' are replaced by
-                 any value resulting from the _i_n_p_a_t_t_e_r_n template.  The
-                 sequence `$0' is replace by the original filename.  Addition-
-                 ally, the sequence `[_s_e_q_1, _s_e_q_2]' is replaced by [_s_e_q_1] if
-                 _s_e_q_1 is not a null string; otherwise it is replaced by _s_e_q_2.
-                 For example, the command
+                 any value resulting from the _i_n_p_a_t_t_e_r_n template.  The se-
+                 quence `$0' is replace by the original filename.  Additional-
+                 ly, the sequence `[_s_e_q_1, _s_e_q_2]' is replaced by [_s_e_q_1] if _s_e_q_1
+                 is not a null string; otherwise it is replaced by _s_e_q_2.  For
+                 example, the command
 
                        nmap $1.$2.$3 [$1,$2].[$2,file]
 
                  would yield the output filename "myfile.data" for input file-
                  names "myfile.data" and "myfile.data.old", "myfile.file" for
-                 the input filename "myfile", and "myfile.myfile" for the
-                 input filename ".myfile".  Spaces may be included in
+                 the input filename "myfile", and "myfile.myfile" for the in-
+                 put filename ".myfile".  Spaces may be included in
                  _o_u_t_p_a_t_t_e_r_n, as in the example: `nmap $1 sed "s/  *$//" > $1'
                  .  Use the `\' character to prevent special treatment of the
                  `$','[','[', and `,' characters.
@@ -309,8 +308,8 @@ DDEESSCCRRIIPPTTIIOONN
                  lation mechanism is unset.  If arguments are specified, char-
                  acters in remote filenames are translated during mmppuutt com-
                  mands and ppuutt commands issued without a specified remote tar-
-                 get filename.  If arguments are specified, characters in
-                 local filenames are translated during mmggeett commands and ggeett
+                 get filename.  If arguments are specified, characters in lo-
+                 cal filenames are translated during mmggeett commands and ggeett
                  commands issued without a specified local target filename.
                  This command is useful when connecting to a non-UNIX remote
                  computer with different file naming conventions or practices.
@@ -322,9 +321,9 @@ DDEESSCCRRIIPPTTIIOONN
      ooppeenn _h_o_s_t [_p_o_r_t]
                  Establish a connection to the specified _h_o_s_t FTP server.  An
                  optional port number may be supplied, in which case, ffttpp will
-                 attempt to contact an FTP server at that port.  If the
-                 aauuttoo--llooggiinn option is on (default), ffttpp will also attempt to
-                 automatically log the user in to the FTP server (see below).
+                 attempt to contact an FTP server at that port.  If the aauuttoo--
+                 llooggiinn option is on (default), ffttpp will also attempt to auto-
+                 matically log the user in to the FTP server (see below).
 
      ppaassssiivvee     Toggle passive mode.  If passive mode is turned on (default
                  is off), the ftp client will send a PASV command for all data
@@ -336,9 +335,8 @@ DDEESSCCRRIIPPTTIIOONN
                  tens on a port and sends that address to the remote server,
                  who connects back to it.  Passive mode is useful when using
                  ffttpp through a gateway router or host that controls the direc-
-                 tionality of traffic.  (Note that though ftp servers are
-                 required to support the PASV command by RFC 1123, some do
-                 not.)
+                 tionality of traffic.  (Note that though ftp servers are re-
+                 quired to support the PASV command by RFC 1123, some do not.)
 
      pprroommpptt      Toggle interactive prompting.  Interactive prompting occurs
                  during multiple file transfers to allow the user to selec-
@@ -354,15 +352,15 @@ DDEESSCCRRIIPPTTIIOONN
                  ondary control connection.  Enter the command "proxy ?" to
                  see other ftp commands executable on the secondary connec-
                  tion.  The following commands behave differently when pref-
-                 aced by pprrooxxyy: ooppeenn will not define new macros during the
-                 auto-login process, cclloossee will not erase existing macro defi-
-                 nitions, ggeett and mmggeett transfer files from the host on the
-                 primary control connection to the host on the secondary con-
-                 trol connection, and ppuutt, mmppuutt, and aappppeenndd transfer files
-                 from the host on the secondary control connection to the host
-                 on the primary control connection.  Third party file trans-
-                 fers depend upon support of the ftp protocol PASV command by
-                 the server on the secondary control connection.
+                 aced by pprrooxxyy: ooppeenn will not define new macros during the au-
+                 to-login process, cclloossee will not erase existing macro defini-
+                 tions, ggeett and mmggeett transfer files from the host on the pri-
+                 mary control connection to the host on the secondary control
+                 connection, and ppuutt, mmppuutt, and aappppeenndd transfer files from the
+                 host on the secondary control connection to the host on the
+                 primary control connection.  Third party file transfers de-
+                 pend upon support of the ftp protocol PASV command by the
+                 server on the secondary control connection.
 
      ppuutt _l_o_c_a_l_-_f_i_l_e [_r_e_m_o_t_e_-_f_i_l_e]
                  Store a local file on the remote machine.  If _r_e_m_o_t_e_-_f_i_l_e is
@@ -396,22 +394,22 @@ DDEESSCCRRIIPPTTIIOONN
                  is specified it is supplied to the server as well.
 
      rreemmootteessttaattuuss [_f_i_l_e_-_n_a_m_e]
-                 With no arguments, show status of remote machine.  If
-                 _f_i_l_e_-_n_a_m_e is specified, show status of _f_i_l_e_-_n_a_m_e on remote
-                 machine.
+                 With no arguments, show status of remote machine.  If _f_i_l_e_-
+                 _n_a_m_e is specified, show status of _f_i_l_e_-_n_a_m_e on remote ma-
+                 chine.
 
      rreennaammee [_f_r_o_m] [_t_o]
                  Rename the file _f_r_o_m on the remote machine, to the file _t_o.
 
-     rreesseett       Clear reply queue.  This command re-synchronizes com-
-                 mand/reply sequencing with the remote ftp server.  Resynchro-
-                 nization may be necessary following a violation of the ftp
-                 protocol by the remote server.
+     rreesseett       Clear reply queue.  This command re-synchronizes command/re-
+                 ply sequencing with the remote ftp server.  Resynchronization
+                 may be necessary following a violation of the ftp protocol by
+                 the remote server.
 
      rreessttaarrtt _m_a_r_k_e_r
                  Restart the immediately following ggeett or ppuutt at the indicated
-                 _m_a_r_k_e_r.  On UNIX systems, marker is usually a byte offset
-                 into the file.
+                 _m_a_r_k_e_r.  On UNIX systems, marker is usually a byte offset in-
+                 to the file.
 
      rrmmddiirr _d_i_r_e_c_t_o_r_y_-_n_a_m_e
                  Delete a directory on the remote machine.
@@ -424,14 +422,14 @@ DDEESSCCRRIIPPTTIIOONN
                  this process continues up to ".99", an error message is
                  printed, and the transfer does not take place.  The generated
                  unique filename will be reported.  Note that rruunniiqquuee will not
-                 affect local files generated from a shell command (see
-                 below).  The default value is off.
+                 affect local files generated from a shell command (see be-
+                 low).  The default value is off.
 
      sseenndd _l_o_c_a_l_-_f_i_l_e [_r_e_m_o_t_e_-_f_i_l_e]
                  A synonym for put.
 
-     sseennddppoorrtt    Toggle the use of PORT commands.  By default, ffttpp will
-                 attempt to use a PORT command when establishing a connection
+     sseennddppoorrtt    Toggle the use of PORT commands.  By default, ffttpp will at-
+                 tempt to use a PORT command when establishing a connection
                  for each data transfer.  The use of PORT commands can prevent
                  delays when performing multiple file transfers.  If the PORT
                  command fails, ffttpp will use the default data port.  When the
@@ -455,11 +453,11 @@ DDEESSCCRRIIPPTTIIOONN
 
      ssuunniiqquuee     Toggle storing of files on remote machine under unique file
                  names.  Remote ftp server must support ftp protocol STOU com-
-                 mand for successful completion.  The remote server will
-                 report unique name.  Default value is off.
+                 mand for successful completion.  The remote server will re-
+                 port unique name.  Default value is off.
 
-     ssyysstteemm      Show the type of operating system running on the remote
-                 machine.
+     ssyysstteemm      Show the type of operating system running on the remote ma-
+                 chine.
 
      tteenneexx       Set the file transfer type to that needed to talk to TENEX
                  machines.
@@ -489,9 +487,9 @@ DDEESSCCRRIIPPTTIIOONN
 
      vveerrbboossee     Toggle verbose mode.  In verbose mode, all responses from the
                  FTP server are displayed to the user.  In addition, if ver-
-                 bose is on, when a file transfer completes, statistics
-                 regarding the efficiency of the transfer are reported.  By
-                 default, verbose is on.
+                 bose is on, when a file transfer completes, statistics re-
+                 garding the efficiency of the transfer are reported.  By de-
+                 fault, verbose is on.
 
      ?? [_c_o_m_m_a_n_d]
                  A synonym for help.
@@ -513,20 +511,19 @@ DDEESSCCRRIIPPTTIIOONN
 AABBOORRTTIINNGG AA FFIILLEE TTRRAANNSSFFEERR
      To abort a file transfer, use the terminal interrupt key (usually Ctrl-
      C).  Sending transfers will be immediately halted.  Receiving transfers
-     will be halted by sending a ftp protocol ABOR command to the remote
-     server, and discarding any further data received.  The speed at which
-     this is accomplished depends upon the remote server's support for ABOR
-     processing.  If the remote server does not support the ABOR command, an
-     `ftp>' prompt will not appear until the remote server has completed send-
-     ing the requested file.
-
-     The terminal interrupt key sequence will be ignored when ffttpp has com-
-     pleted any local processing and is awaiting a reply from the remote
-     server.  A long delay in this mode may result from the ABOR processing
-     described above, or from unexpected behavior by the remote server,
-     including violations of the ftp protocol.  If the delay results from
-     unexpected remote server behavior, the local ffttpp program must be killed
-     by hand.
+     will be halted by sending a ftp protocol ABOR command to the remote serv-
+     er, and discarding any further data received.  The speed at which this is
+     accomplished depends upon the remote server's support for ABOR process-
+     ing.  If the remote server does not support the ABOR command, an `ftp>'
+     prompt will not appear until the remote server has completed sending the
+     requested file.
+
+     The terminal interrupt key sequence will be ignored when ffttpp has complet-
+     ed any local processing and is awaiting a reply from the remote server.
+     A long delay in this mode may result from the ABOR processing described
+     above, or from unexpected behavior by the remote server, including viola-
+     tions of the ftp protocol.  If the delay results from unexpected remote
+     server behavior, the local ffttpp program must be killed by hand.
 
 FFIILLEE NNAAMMIINNGG CCOONNVVEENNTTIIOONNSS
      Files specified as arguments to ffttpp commands are processed according to
@@ -539,8 +536,8 @@ FFIILLEE NNAAMMIINNGG CCOONNVVEENNTTIIOONNSS
           argument is interpreted as a shell command.  FFttpp then forks a shell,
           using popen(3) with the argument supplied, and reads (writes) from
           the stdout (stdin).  If the shell command includes spaces, the argu-
-          ment must be quoted; e.g.  ``" ls -lt"''.  A particularly useful
-          example of this mechanism is: ``dir more''.
+          ment must be quoted; e.g.  ``" ls -lt"''.  A particularly useful ex-
+          ample of this mechanism is: ``dir more''.
 
      3.   Failing the above checks, if ``globbing'' is enabled, local file
           names are expanded according to the rules used in the csh(1); c.f.
@@ -549,14 +546,14 @@ FFIILLEE NNAAMMIINNGG CCOONNVVEENNTTIIOONNSS
           operation is used.
 
      4.   For mmggeett commands and ggeett commands with unspecified local file
-          names, the local filename is the remote filename, which may be
-          altered by a ccaassee, nnttrraannss, or nnmmaapp setting.  The resulting filename
+          names, the local filename is the remote filename, which may be al-
+          tered by a ccaassee, nnttrraannss, or nnmmaapp setting.  The resulting filename
           may then be altered if rruunniiqquuee is on.
 
      5.   For mmppuutt commands and ppuutt commands with unspecified remote file
-          names, the remote filename is the local filename, which may be
-          altered by a nnttrraannss or nnmmaapp setting.  The resulting filename may
-          then be altered by the remote server if ssuunniiqquuee is on.
+          names, the remote filename is the local filename, which may be al-
+          tered by a nnttrraannss or nnmmaapp setting.  The resulting filename may then
+          be altered by the remote server if ssuunniiqquuee is on.
 
 FFIILLEE TTRRAANNSSFFEERR PPAARRAAMMEETTEERRSS
      The FTP specification specifies many parameters which may affect a file
@@ -565,8 +562,8 @@ FFIILLEE TTRRAANNSSFFEERR PPAARRAAMMEETTEERRSS
      FFttpp supports the ascii and image types of file transfer, plus local byte
      size 8 for tteenneexx mode transfers.
 
-     FFttpp supports only the default values for the remaining file transfer
-     parameters: mmooddee, ffoorrmm, and ssttrruucctt.
+     FFttpp supports only the default values for the remaining file transfer pa-
+     rameters: mmooddee, ffoorrmm, and ssttrruucctt.
 
 TTHHEE ..nneettrrcc FFIILLEE
      The _._n_e_t_r_c file contains login and initialization information used by the
@@ -575,12 +572,12 @@ TTHHEE ..nneettrrcc FFIILLEE
      new-lines:
 
      mmaacchhiinnee _n_a_m_e
-               Identify a remote machine _n_a_m_e.  The auto-login process
-               searches the _._n_e_t_r_c file for a mmaacchhiinnee token that matches the
-               remote machine specified on the ffttpp command line or as an ooppeenn
-               command argument.  Once a match is made, the subsequent _._n_e_t_r_c
-               tokens are processed, stopping when the end of file is reached
-               or another mmaacchhiinnee or a ddeeffaauulltt token is encountered.
+               Identify a remote machine _n_a_m_e.  The auto-login process search-
+               es the _._n_e_t_r_c file for a mmaacchhiinnee token that matches the remote
+               machine specified on the ffttpp command line or as an ooppeenn command
+               argument.  Once a match is made, the subsequent _._n_e_t_r_c tokens
+               are processed, stopping when the end of file is reached or an-
+               other mmaacchhiinnee or a ddeeffaauulltt token is encountered.
 
      ddeeffaauulltt   This is the same as mmaacchhiinnee _n_a_m_e except that ddeeffaauulltt matches
                any name.  There can be only one ddeeffaauulltt token, and it must be
@@ -588,9 +585,9 @@ TTHHEE ..nneettrrcc FFIILLEE
 
                      default login anonymous password user@site
 
-               thereby giving the user _a_u_t_o_m_a_t_i_c anonymous ftp login to
-               machines not specified in _._n_e_t_r_c.  This can be overridden by
-               using the --nn flag to disable auto-login.
+               thereby giving the user _a_u_t_o_m_a_t_i_c anonymous ftp login to ma-
+               chines not specified in _._n_e_t_r_c.  This can be overridden by us-
+               ing the --nn flag to disable auto-login.
 
      llooggiinn _n_a_m_e
                Identify a user on the remote machine.  If this token is pre-
@@ -644,4 +641,4 @@ BBUUGGSS
      rect transfers of binary files to and from 4.2BSD servers using the ascii
      type.  Avoid this problem by using the binary image type.
 
-4.2 Berkeley Distribution       April 27, 1996       4.2 Berkeley Distribution
+4.2 Berkeley Distribution       April 27, 1996                              10
diff --git a/crypto/heimdal/appl/ftp/ftpd/Makefile.in b/crypto/heimdal/appl/ftp/ftpd/Makefile.in
index ceefd1f..90f8209 100644
--- a/crypto/heimdal/appl/ftp/ftpd/Makefile.in
+++ b/crypto/heimdal/appl/ftp/ftpd/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -306,7 +305,8 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f; \
 	  else :; fi; \
@@ -315,17 +315,14 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS)
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \
 	  rm -f $(DESTDIR)$(libexecdir)/$$f; \
 	done
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS)
 ftpd$(EXEEXT): $(ftpd_OBJECTS) $(ftpd_DEPENDENCIES) 
 	@rm -f ftpd$(EXEEXT)
 	$(LINK) $(ftpd_LDFLAGS) $(ftpd_OBJECTS) $(ftpd_LDADD) $(LIBS)
@@ -390,10 +387,6 @@ install-man5: $(man5_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    5*) ;; \
-	    *) ext='5' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -433,10 +426,6 @@ install-man8: $(man8_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    8*) ;; \
-	    *) ext='8' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -502,7 +491,7 @@ top_distdir = ../../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -553,12 +542,11 @@ clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "ftpcmd.c" || rm -f ftpcmd.c
 clean: clean-am
 
 clean-am: clean-generic clean-libexecPROGRAMS clean-libtool \
diff --git a/crypto/heimdal/appl/ftp/ftpd/ftpd.cat8 b/crypto/heimdal/appl/ftp/ftpd/ftpd.cat8
index b47920f..4951f6a 100644
--- a/crypto/heimdal/appl/ftp/ftpd/ftpd.cat8
+++ b/crypto/heimdal/appl/ftp/ftpd/ftpd.cat8
@@ -1,12 +1,11 @@
-FTPD(8)                 FreeBSD System Manager's Manual                FTPD(8)
+FTPD(8)                 NetBSD System Manager's Manual                 FTPD(8)
 
 NNAAMMEE
      ffttppdd - Internet File Transfer Protocol server
 
 SSYYNNOOPPSSIISS
-     ffttppdd [--aa _a_u_t_h_m_o_d_e] [--ddiillvvUU] [--gg _u_m_a_s_k] [--pp _p_o_r_t] [--TT _m_a_x_t_i_m_e_o_u_t]
-          [--tt _t_i_m_e_o_u_t] [--uu _d_e_f_a_u_l_t _u_m_a_s_k] [--BB | ----bbuuiillttiinn--llss]
-          [----ggoooodd--cchhaarrss==_s_t_r_i_n_g]
+     ffttppdd [--aa _a_u_t_h_m_o_d_e] [--ddiillvvUU] [--gg _u_m_a_s_k] [--pp _p_o_r_t] [--TT _m_a_x_t_i_m_e_o_u_t] [--tt
+     _t_i_m_e_o_u_t] [--uu _d_e_f_a_u_l_t _u_m_a_s_k] [--BB | ----bbuuiillttiinn--llss] [----ggoooodd--cchhaarrss==_s_t_r_i_n_g]
 
 DDEESSCCRRIIPPTTIIOONN
      FFttppdd is the Internet File Transfer Protocol server process.  The server
@@ -18,8 +17,7 @@ DDEESSCCRRIIPPTTIIOONN
      --aa      Select the level of authentication required.  Kerberised login
              can not be turned off. The default is to only allow kerberised
              login.  Other possibilities can be turned on by giving a string
-             of comma separated flags as argument to --aa.  Recognised flags
-             are:
+             of comma separated flags as argument to --aa. Recognised flags are:
 
              _p_l_a_i_n  Allow logging in with plaintext password. The password can
                     be a(n) OTP or an ordinary password.
@@ -28,8 +26,8 @@ DDEESSCCRRIIPPTTIIOONN
 
              _f_t_p    Allow anonymous login.
 
-             The following combination modes exists for backwards compatibil-
-             ity:
+             The following combination modes exists for backwards compatibili-
+             ty:
 
              _n_o_n_e   Same as _p_l_a_i_n_,_f_t_p.
 
@@ -57,17 +55,17 @@ DDEESSCCRRIIPPTTIIOONN
              period allowed may be set to _t_i_m_e_o_u_t seconds with the --TT option.
              The default limit is 2 hours.
 
-     --tt      The inactivity timeout period is set to _t_i_m_e_o_u_t seconds (the
-             default is 15 minutes).
+     --tt      The inactivity timeout period is set to _t_i_m_e_o_u_t seconds (the de-
+             fault is 15 minutes).
 
      --uu      Set the initial umask to something else than the default 027.
 
-     --UU      In previous versions of ffttppdd, when a passive mode client
-             requested a data connection to the server, the server would use
-             data ports in the range 1024..4999.  Now, by default, if the sys-
-             tem supports the IP_PORTRANGE socket option, the server will use
-             data ports in the range 49152..65535.  Specifying this option
-             will revert to the old behavior.
+     --UU      In previous versions of ffttppdd, when a passive mode client request-
+             ed a data connection to the server, the server would use data
+             ports in the range 1024..4999.  Now, by default, if the system
+             supports the IP_PORTRANGE socket option, the server will use data
+             ports in the range 49152..65535.  Specifying this option will re-
+             vert to the old behavior.
 
      --vv      Verbose mode.
 
@@ -77,8 +75,8 @@ DDEESSCCRRIIPPTTIIOONN
      ----ggoooodd--cchhaarrss==_s_t_r_i_n_g
              allowed anonymous upload filename chars
 
-     The file _/_e_t_c_/_n_o_l_o_g_i_n can be used to disable ftp access.  If the file
-     exists, ffttppdd displays it and exits.  If the file _/_e_t_c_/_f_t_p_w_e_l_c_o_m_e exists,
+     The file _/_e_t_c_/_n_o_l_o_g_i_n can be used to disable ftp access.  If the file ex-
+     ists, ffttppdd displays it and exits.  If the file _/_e_t_c_/_f_t_p_w_e_l_c_o_m_e exists,
      ffttppdd prints it before issuing the ``ready'' message.  If the file
      _/_e_t_c_/_m_o_t_d exists, ffttppdd prints it after a successful login.
 
@@ -140,9 +138,9 @@ DDEESSCCRRIIPPTTIIOONN
      The following non-standard or UNIX specific commands are supported by the
      SITE request.
 
-           UMASK      change umask, (e.g. SSIITTEE UUMMAASSKK 000022)
-           IDLE       set idle-timer, (e.g. SSIITTEE IIDDLLEE 6600)
-           CHMOD      change mode of a file (e.g. SSIITTEE CCHHMMOODD 775555 ffiilleennaammee)
+           UMASK      change umask, (e.g.  SSIITTEE UUMMAASSKK 000022)
+           IDLE       set idle-timer, (e.g.  SSIITTEE IIDDLLEE 6600)
+           CHMOD      change mode of a file (e.g.  SSIITTEE CCHHMMOODD 775555 ffiilleennaammee)
            FIND       quickly find a specific file with GNU locate(1).
            HELP       give help information.
 
@@ -167,8 +165,8 @@ DDEESSCCRRIIPPTTIIOONN
      FFttppdd authenticates users according to these rules.
 
            1.   If Kerberos authentication is used, the user must pass valid
-                tickets and the principal must be allowed to login as the
-                remote user.
+                tickets and the principal must be allowed to login as the re-
+                mote user.
 
            2.   The login name must be in the password data base, and not have
                 a null password (if kerberos is used the password field is not
@@ -177,8 +175,8 @@ DDEESSCCRRIIPPTTIIOONN
                 user has an OTP key, the response from a successful USER com-
                 mand will include an OTP challenge. The client may choose to
                 respond with a PASS command giving either a standard password
-                or an OTP one-time password. The server will automatically
-                determine which type of password it has been given and attempt
+                or an OTP one-time password. The server will automatically de-
+                termine which type of password it has been given and attempt
                 to authenticate accordingly. See otp(1) for more information
                 on OTP authentication.
 
@@ -204,8 +202,8 @@ DDEESSCCRRIIPPTTIIOONN
      In the last case, ffttppdd takes special measures to restrict the client's
      access privileges.  The server performs a chroot(2) to the home directory
      of the ``ftp'' user.  In order that system security is not breached, it
-     is recommended that the ``ftp'' subtree be constructed with care, con-
-     sider following these guidelines for anonymous ftp.
+     is recommended that the ``ftp'' subtree be constructed with care, consid-
+     er following these guidelines for anonymous ftp.
 
      In general all files should be owned by ``root'', and have non-write per-
      missions (644 or 755 depending on the kind of file). No files should be
@@ -253,8 +251,8 @@ DDEESSCCRRIIPPTTIIOONN
            _~_f_t_p_/_p_u_b  Traditional place to put whatever you want to make pub-
                      lic.
 
-     If you want guests to be able to upload files, create a _~_f_t_p_/_i_n_c_o_m_i_n_g
-     directory owned by ``root'', and group ``ftp'' with mode 730 (make sure
+     If you want guests to be able to upload files, create a _~_f_t_p_/_i_n_c_o_m_i_n_g di-
+     rectory owned by ``root'', and group ``ftp'' with mode 730 (make sure
      ``ftp'' is member of group ``ftp'').  The following restrictions apply to
      anonymous users:
 
@@ -267,8 +265,8 @@ DDEESSCCRRIIPPTTIIOONN
          and SSIITTEE CCHHMMOODD.
 
      ++oo   Filenames must start with an alpha-numeric character, and consist of
-         alpha-numeric characters or any of the following: + (plus), -
-         (minus), = (equal), _ (underscore), . (period), and , (comma).
+         alpha-numeric characters or any of the following: + (plus), - (mi-
+         nus), = (equal), _ (underscore), .  (period), and , (comma).
 
 FFIILLEESS
      /etc/ftpusers    Access list for users.
@@ -296,4 +294,4 @@ BBUUGGSS
 HHIISSTTOORRYY
      The ffttppdd command appeared in 4.2BSD.
 
-4.2 Berkeley Distribution       April 19, 1997       4.2 Berkeley Distribution
+4.2 Berkeley Distribution       April 19, 1997                               5
diff --git a/crypto/heimdal/appl/ftp/ftpd/ftpusers.cat5 b/crypto/heimdal/appl/ftp/ftpd/ftpusers.cat5
index 5a9b626..2957aee 100644
--- a/crypto/heimdal/appl/ftp/ftpd/ftpusers.cat5
+++ b/crypto/heimdal/appl/ftp/ftpd/ftpusers.cat5
@@ -1,4 +1,4 @@
-FTPUSERS(5)               FreeBSD File Formats Manual              FTPUSERS(5)
+FTPUSERS(5)               NetBSD Programmer's Manual               FTPUSERS(5)
 
 NNAAMMEE
      _/_e_t_c_/_f_t_p_u_s_e_r_s - FTP access list file
@@ -6,8 +6,8 @@ NNAAMMEE
 DDEESSCCRRIIPPTTIIOONN
      _/_e_t_c_/_f_t_p_u_s_e_r_s contains a list of users that should be allowed or denied
      FTP access. Each line contains a user, optionally followed by ``allow''
-     (anything but ``allow'' is ignored).  The semi-user ``*'' matches any
-     user.  Users that has an explicit ``allow'', or that does not match any
+     (anything but ``allow'' is ignored).  The semi-user ``*'' matches any us-
+     er.  Users that has an explicit ``allow'', or that does not match any
      line, are allowed access. Anyone else is denied access.
 
      Note that this is compatible with the old format, where this file con-
@@ -23,4 +23,4 @@ EEXXAAMMPPLLEESS
 SSEEEE AALLSSOO
      ftpd(8)
 
-KTH-KRB                           May 7, 1997                          KTH-KRB
+ KTH-KRB                          May 7, 1997                                1
diff --git a/crypto/heimdal/appl/kf/Makefile.in b/crypto/heimdal/appl/kf/Makefile.in
index f624bca..c932138 100644
--- a/crypto/heimdal/appl/kf/Makefile.in
+++ b/crypto/heimdal/appl/kf/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -276,7 +275,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
@@ -285,17 +285,14 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
 	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done
 
 clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -305,7 +302,8 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f; \
 	  else :; fi; \
@@ -314,17 +312,14 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS)
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \
 	  rm -f $(DESTDIR)$(libexecdir)/$$f; \
 	done
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS)
 kf$(EXEEXT): $(kf_OBJECTS) $(kf_DEPENDENCIES) 
 	@rm -f kf$(EXEEXT)
 	$(LINK) $(kf_LDFLAGS) $(kf_OBJECTS) $(kf_LDADD) $(LIBS)
@@ -372,10 +367,6 @@ install-man1: $(man1_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    1*) ;; \
-	    *) ext='1' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -415,10 +406,6 @@ install-man8: $(man8_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    8*) ;; \
-	    *) ext='8' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -484,7 +471,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -534,7 +521,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/appl/kf/kf.cat1 b/crypto/heimdal/appl/kf/kf.cat1
index 24653e4..30ae354 100644
--- a/crypto/heimdal/appl/kf/kf.cat1
+++ b/crypto/heimdal/appl/kf/kf.cat1
@@ -1,12 +1,12 @@
-KF(1)                   FreeBSD General Commands Manual                  KF(1)
+KF(1)                       NetBSD Reference Manual                      KF(1)
 
 NNAAMMEE
      kkff - securly forward tickets
 
 SSYYNNOOPPSSIISS
      kkff [--pp _p_o_r_t | ----ppoorrtt=_p_o_r_t] [--ll _l_o_g_i_n | ----llooggiinn=_l_o_g_i_n] [--cc _c_c_a_c_h_e |
-        ----ccccaacchhee=_c_c_a_c_h_e] [--FF | ----ffoorrwwaarrddaabbllee] [--GG | ----nnoo--ffoorrwwaarrddaabbllee]
-        [--hh | ----hheellpp] [----vveerrssiioonn] _h_o_s_t _._._.
+     ----ccccaacchhee=_c_c_a_c_h_e] [--FF | ----ffoorrwwaarrddaabbllee] [--GG | ----nnoo--ffoorrwwaarrddaabbllee] [--hh |
+     ----hheellpp] [----vveerrssiioonn] _h_o_s_t _._._.
 
 DDEESSCCRRIIPPTTIIOONN
      The kkff program forwards tickets to a remove host through an authenticated
@@ -42,4 +42,4 @@ DDEESSCCRRIIPPTTIIOONN
 SSEEEE AALLSSOO
      kinit(1), telnet(1), kfd(8)
 
-Heimdal                          July 2, 2000                          Heimdal
+ Heimdal                         July 2, 2000                                1
diff --git a/crypto/heimdal/appl/kf/kfd.cat8 b/crypto/heimdal/appl/kf/kfd.cat8
index cd82a71..65ec8ac 100644
--- a/crypto/heimdal/appl/kf/kfd.cat8
+++ b/crypto/heimdal/appl/kf/kfd.cat8
@@ -1,11 +1,11 @@
-KFD(8)                  FreeBSD System Manager's Manual                 KFD(8)
+KFD(8)                  NetBSD System Manager's Manual                  KFD(8)
 
 NNAAMMEE
      kkffdd - receive forwarded tickets
 
 SSYYNNOOPPSSIISS
      kkffdd [--pp _p_o_r_t | ----ppoorrtt=_p_o_r_t] [--ii | ----iinneettdd] [--RR _r_e_g_p_a_g | ----rreeggppaagg=_r_e_g_p_a_g]
-         [--hh | ----hheellpp] [----vveerrssiioonn]
+     [--hh | ----hheellpp] [----vveerrssiioonn]
 
 DDEESSCCRRIIPPTTIIOONN
      This is the daemon for kf(1).  Supported options:
@@ -27,4 +27,4 @@ EEXXAAMMPPLLEESS
 SSEEEE AALLSSOO
      kf(1)
 
-Heimdal                          July 2, 2000                          Heimdal
+ Heimdal                         July 2, 2000                                1
diff --git a/crypto/heimdal/appl/login/Makefile.in b/crypto/heimdal/appl/login/Makefile.in
index 9fe40aa..a120639 100644
--- a/crypto/heimdal/appl/login/Makefile.in
+++ b/crypto/heimdal/appl/login/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -287,7 +286,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
@@ -296,17 +296,14 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
 	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done
 
 clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 login$(EXEEXT): $(login_OBJECTS) $(login_DEPENDENCIES) 
 	@rm -f login$(EXEEXT)
 	$(LINK) $(login_LDFLAGS) $(login_OBJECTS) $(login_LDADD) $(LIBS)
@@ -377,7 +374,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -427,7 +424,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/appl/push/Makefile.in b/crypto/heimdal/appl/push/Makefile.in
index 7c905cb..699a33a 100644
--- a/crypto/heimdal/appl/push/Makefile.in
+++ b/crypto/heimdal/appl/push/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -275,7 +274,8 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f; \
 	  else :; fi; \
@@ -284,37 +284,35 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS)
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \
 	  rm -f $(DESTDIR)$(libexecdir)/$$f; \
 	done
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS)
 push$(EXEEXT): $(push_OBJECTS) $(push_DEPENDENCIES) 
 	@rm -f push$(EXEEXT)
 	$(LINK) $(push_LDFLAGS) $(push_OBJECTS) $(push_LDADD) $(LIBS)
-binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f $$d$$p; then \
-	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \
-	    $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \
+	  f="`echo $$p|sed '$(transform)'`"; \
+	  if test -f $$p; then \
+	    echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/$$f"; \
+	    $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/$$f; \
+	  elif test -f $(srcdir)/$$p; then \
+	    echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/$$f"; \
+	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
 	done
 
 uninstall-binSCRIPTS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	  f="`echo $$p|sed '$(transform)'`"; \
 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
 	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done
@@ -359,10 +357,6 @@ install-man1: $(man1_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    1*) ;; \
-	    *) ext='1' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -402,10 +396,6 @@ install-man8: $(man8_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    8*) ;; \
-	    *) ext='8' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -471,7 +461,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -522,7 +512,7 @@ clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/appl/push/pfrom.cat1 b/crypto/heimdal/appl/push/pfrom.cat1
index e982084..a9f31cd 100644
--- a/crypto/heimdal/appl/push/pfrom.cat1
+++ b/crypto/heimdal/appl/push/pfrom.cat1
@@ -1,11 +1,11 @@
-PFROM(1)                FreeBSD General Commands Manual               PFROM(1)
+PFROM(1)                    NetBSD Reference Manual                   PFROM(1)
 
 NNAAMMEE
      ppffrroomm - fetch a list of the current mail via POP
 
 SSYYNNOOPPSSIISS
      ppffrroomm [--44 | ----kkrrbb44] [--55 | ----kkrrbb55] [--vv | ----vveerrbboossee] [--cc | ----ccoouunntt]
-           [----hheeaaddeerr] [--pp _p_o_r_t_-_s_p_e_c | ----ppoorrtt==_p_o_r_t_-_s_p_e_c]
+     [----hheeaaddeerr] [--pp _p_o_r_t_-_s_p_e_c | ----ppoorrtt==_p_o_r_t_-_s_p_e_c]
 
 DDEESSCCRRIIPPTTIIOONN
      ppffrroomm is a script that does push --from.
@@ -13,4 +13,4 @@ DDEESSCCRRIIPPTTIIOONN
 SSEEEE AALLSSOO
      push(8)
 
-HEIMDAL                          March 4, 2000                         HEIMDAL
+ HEIMDAL                         March 4, 2000                               1
diff --git a/crypto/heimdal/appl/push/push.cat8 b/crypto/heimdal/appl/push/push.cat8
index d0c8d6d..7ddb72d 100644
--- a/crypto/heimdal/appl/push/push.cat8
+++ b/crypto/heimdal/appl/push/push.cat8
@@ -1,12 +1,12 @@
-PUSH(8)                 FreeBSD System Manager's Manual                PUSH(8)
+PUSH(8)                 NetBSD System Manager's Manual                 PUSH(8)
 
 NNAAMMEE
      ppuusshh - fetch mail via POP
 
 SSYYNNOOPPSSIISS
-     ppuusshh [--44 | ----kkrrbb44] [--55 | ----kkrrbb55] [--vv | ----vveerrbboossee] [--ff | ----ffoorrkk]
-          [--ll | ----lleeaavvee] [----ffrroomm] [--cc | ----ccoouunntt] [----hheeaaddeerrss=_h_e_a_d_e_r_s] [--pp
-          _p_o_r_t_-_s_p_e_c | ----ppoorrtt=_p_o_r_t_-_s_p_e_c] _p_o_-_b_o_x _f_i_l_e_n_a_m_e
+     ppuusshh [--44 | ----kkrrbb44] [--55 | ----kkrrbb55] [--vv | ----vveerrbboossee] [--ff | ----ffoorrkk] [--ll |
+     ----lleeaavvee] [----ffrroomm] [--cc | ----ccoouunntt] [----hheeaaddeerrss=_h_e_a_d_e_r_s] [--pp _p_o_r_t_-_s_p_e_c |
+     ----ppoorrtt=_p_o_r_t_-_s_p_e_c] _p_o_-_b_o_x _f_i_l_e_n_a_m_e
 
 DDEESSCCRRIIPPTTIIOONN
      ppuusshh retrieves mail from the post office box _p_o_-_b_o_x, and stores the mail
@@ -73,4 +73,4 @@ SSEEEE AALLSSOO
 HHIISSTTOORRYY
      ppuusshh was written while waiting for mmoovveemmaaiill to finish getting the mail.
 
-HEIMDAL                          May 31, 1998                          HEIMDAL
+ HEIMDAL                         May 31, 1998                                2
diff --git a/crypto/heimdal/appl/rcp/Makefile.in b/crypto/heimdal/appl/rcp/Makefile.in
index 921764f..2efb884 100644
--- a/crypto/heimdal/appl/rcp/Makefile.in
+++ b/crypto/heimdal/appl/rcp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -257,7 +256,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
@@ -266,17 +266,14 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
 	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done
 
 clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 rcp$(EXEEXT): $(rcp_OBJECTS) $(rcp_DEPENDENCIES) 
 	@rm -f rcp$(EXEEXT)
 	$(LINK) $(rcp_LDFLAGS) $(rcp_OBJECTS) $(rcp_LDADD) $(LIBS)
@@ -347,7 +344,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -397,7 +394,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/appl/rsh/Makefile.in b/crypto/heimdal/appl/rsh/Makefile.in
index bd4d285..c51a16e 100644
--- a/crypto/heimdal/appl/rsh/Makefile.in
+++ b/crypto/heimdal/appl/rsh/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -322,7 +321,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
@@ -331,17 +331,14 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
 	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done
 
 clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -351,7 +348,8 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f; \
 	  else :; fi; \
@@ -360,17 +358,14 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS)
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \
 	  rm -f $(DESTDIR)$(libexecdir)/$$f; \
 	done
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS)
 rsh$(EXEEXT): $(rsh_OBJECTS) $(rsh_DEPENDENCIES) 
 	@rm -f rsh$(EXEEXT)
 	$(LINK) $(rsh_LDFLAGS) $(rsh_OBJECTS) $(rsh_LDADD) $(LIBS)
@@ -418,10 +413,6 @@ install-man1: $(man1_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    1*) ;; \
-	    *) ext='1' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -461,10 +452,6 @@ install-man8: $(man8_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    8*) ;; \
-	    *) ext='8' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -530,7 +517,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -580,7 +567,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/appl/su/Makefile.in b/crypto/heimdal/appl/su/Makefile.in
index ac3a372..e5e7af8 100644
--- a/crypto/heimdal/appl/su/Makefile.in
+++ b/crypto/heimdal/appl/su/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -267,7 +266,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
@@ -276,17 +276,14 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
 	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done
 
 clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 su$(EXEEXT): $(su_OBJECTS) $(su_DEPENDENCIES) 
 	@rm -f su$(EXEEXT)
 	$(LINK) $(su_LDFLAGS) $(su_OBJECTS) $(su_LDADD) $(LIBS)
@@ -357,7 +354,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -407,7 +404,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/appl/telnet/ChangeLog b/crypto/heimdal/appl/telnet/ChangeLog
index f696871..d0c8894 100644
--- a/crypto/heimdal/appl/telnet/ChangeLog
+++ b/crypto/heimdal/appl/telnet/ChangeLog
@@ -1,3 +1,10 @@
+2002-10-21  Johan Danielsson  <joda@pdc.kth.se>
+
+	* libtelnet/kerberos5.c: pull up 1.52-1.53; also try to use the
+	session key (if this is really correct is beyond me, RFC2942 in
+	unclear on this point;
+	(kerberos5_is): check that the subkey is non-NULL
+
 2002-09-02  Johan Danielsson  <joda@pdc.kth.se>
 
 	* libtelnet/kerberos5.c: set AP_OPTS_USE_SUBKEY
diff --git a/crypto/heimdal/appl/telnet/Makefile.in b/crypto/heimdal/appl/telnet/Makefile.in
index 81ef436..943254d 100644
--- a/crypto/heimdal/appl/telnet/Makefile.in
+++ b/crypto/heimdal/appl/telnet/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -348,7 +347,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -410,7 +409,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/appl/telnet/libtelnet/Makefile.in b/crypto/heimdal/appl/telnet/libtelnet/Makefile.in
index 828a450..2b78505 100644
--- a/crypto/heimdal/appl/telnet/libtelnet/Makefile.in
+++ b/crypto/heimdal/appl/telnet/libtelnet/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -338,7 +337,7 @@ top_distdir = ../../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -387,7 +386,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/appl/telnet/libtelnet/kerberos5.c b/crypto/heimdal/appl/telnet/libtelnet/kerberos5.c
index 8a4bf69..a4316fb 100644
--- a/crypto/heimdal/appl/telnet/libtelnet/kerberos5.c
+++ b/crypto/heimdal/appl/telnet/libtelnet/kerberos5.c
@@ -53,7 +53,7 @@
 
 #include <config.h>
 
-RCSID("$Id: kerberos5.c,v 1.51 2002/09/02 15:33:20 joda Exp $");
+RCSID("$Id: kerberos5.c,v 1.51.4.1 2002/10/21 14:28:31 joda Exp $");
 
 #ifdef	KRB5
 
@@ -425,6 +425,29 @@ kerberos5_is(Authenticator *ap, unsigned char *data, int cnt)
 	    return;
 	}
 
+	if (key_block == NULL) {
+	    ret = krb5_auth_con_getkey(context,
+				       auth_context,
+				       &key_block);
+	}
+	if (ret) {
+	    Data(ap, KRB_REJECT, "krb5_auth_con_getkey failed", -1);
+	    auth_finished(ap, AUTH_REJECT);
+	    if (auth_debug_mode)
+		printf("Kerberos V5: "
+		       "krb5_auth_con_getkey failed (%s)\r\n",
+		       krb5_get_err_text(context, ret));
+	    return;
+	}
+	if (key_block == NULL) {
+	    Data(ap, KRB_REJECT, "no subkey received", -1);
+	    auth_finished(ap, AUTH_REJECT);
+	    if (auth_debug_mode)
+		printf("Kerberos V5: "
+		       "krb5_auth_con_getremotesubkey returned NULL key\r\n");
+	    return;
+	}
+
 	if ((ap->way & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL) {
 	    ret = krb5_mk_rep(context, auth_context, &outbuf);
 	    if (ret) {
diff --git a/crypto/heimdal/appl/telnet/telnet/Makefile.in b/crypto/heimdal/appl/telnet/telnet/Makefile.in
index 8becca6..897cf3e 100644
--- a/crypto/heimdal/appl/telnet/telnet/Makefile.in
+++ b/crypto/heimdal/appl/telnet/telnet/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -283,7 +282,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
@@ -292,17 +292,14 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
 	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done
 
 clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 telnet$(EXEEXT): $(telnet_OBJECTS) $(telnet_DEPENDENCIES) 
 	@rm -f telnet$(EXEEXT)
 	$(LINK) $(telnet_LDFLAGS) $(telnet_OBJECTS) $(telnet_LDADD) $(LIBS)
@@ -347,10 +344,6 @@ install-man1: $(man1_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    1*) ;; \
-	    *) ext='1' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -416,7 +409,7 @@ top_distdir = ../../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -466,7 +459,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/appl/telnet/telnet/telnet.cat1 b/crypto/heimdal/appl/telnet/telnet/telnet.cat1
index 4cfd2cc..5bf4a64 100644
--- a/crypto/heimdal/appl/telnet/telnet/telnet.cat1
+++ b/crypto/heimdal/appl/telnet/telnet/telnet.cat1
@@ -1,4 +1,4 @@
-TELNET(1)               FreeBSD General Commands Manual              TELNET(1)
+TELNET(1)                   NetBSD Reference Manual                  TELNET(1)
 
 NNAAMMEE
      tteellnneett - user interface to the TELNET protocol
@@ -9,8 +9,8 @@ SSYYNNOOPPSSIISS
 
 DDEESSCCRRIIPPTTIIOONN
      The tteellnneett command is used to communicate with another host using the
-     TELNET protocol.  If tteellnneett is invoked without the _h_o_s_t argument, it
-     enters command mode, indicated by its prompt (tteellnneett>>).  In this mode, it
+     TELNET protocol.  If tteellnneett is invoked without the _h_o_s_t argument, it en-
+     ters command mode, indicated by its prompt (tteellnneett>>).  In this mode, it
      accepts and executes the commands listed below.  If it is invoked with
      arguments, it performs an ooppeenn command with those arguments.
 
@@ -24,9 +24,9 @@ DDEESSCCRRIIPPTTIIOONN
      --EE      Stops any character from being recognized as an escape character.
 
      --FF      If Kerberos V5 authentication is being used, the --FF option allows
-             the local credentials to be forwarded to the remote system,
-             including any credentials that have already been forwarded into
-             the local environment.
+             the local credentials to be forwarded to the remote system, in-
+             cluding any credentials that have already been forwarded into the
+             local environment.
 
      --KK      Specifies no automatic login to the remote system.
 
@@ -42,10 +42,10 @@ DDEESSCCRRIIPPTTIIOONN
              Disables the _a_t_y_p_e type of authentication.
 
      --aa      Attempt automatic login.  Currently, this sends the user name via
-             the USER variable of the ENVIRON option if supported by the
-             remote system.  The name used is that of the current user as
-             returned by getlogin(2) if it agrees with the current user ID,
-             otherwise it is the name associated with the user ID.
+             the USER variable of the ENVIRON option if supported by the re-
+             mote system.  The name used is that of the current user as re-
+             turned by getlogin(2) if it agrees with the current user ID, oth-
+             erwise it is the name associated with the user ID.
 
      --cc      Disables the reading of the user's _._t_e_l_n_e_t_r_c file.  (See the
              ttooggggllee sskkiipprrcc command on this man page.)
@@ -62,8 +62,8 @@ DDEESSCCRRIIPPTTIIOONN
 
      --kk _r_e_a_l_m
              If Kerberos authentication is being used, the --kk option requests
-             that telnet obtain tickets for the remote host in realm realm
-             instead of the remote host's realm, as determined by
+             that telnet obtain tickets for the remote host in realm realm in-
+             stead of the remote host's realm, as determined by
              krb_realmofhost(3).
 
      --ll _u_s_e_r
@@ -119,14 +119,14 @@ DDEESSCCRRIIPPTTIIOONN
 
      If the LINEMODE option is enabled, or if the llooccaallcchhaarrss toggle is TRUE
      (the default for ``old line by line``; see below), the user's qquuiitt, iinnttrr,
-     and fflluusshh characters are trapped locally, and sent as TELNET protocol
-     sequences to the remote side.  If LINEMODE has ever been enabled, then
-     the user's ssuusspp and eeooff are also sent as TELNET protocol sequences, and
-     qquuiitt is sent as a TELNET ABORT instead of BREAK There are options (see
-     ttooggggllee aauuttoofflluusshh and ttooggggllee aauuttoossyynncchh below) which cause this action to
-     flush subsequent output to the terminal (until the remote host acknowl-
-     edges the TELNET sequence) and flush previous terminal input (in the case
-     of qquuiitt and iinnttrr).
+     and fflluusshh characters are trapped locally, and sent as TELNET protocol se-
+     quences to the remote side.  If LINEMODE has ever been enabled, then the
+     user's ssuusspp and eeooff are also sent as TELNET protocol sequences, and qquuiitt
+     is sent as a TELNET ABORT instead of BREAK There are options (see ttooggggllee
+     aauuttoofflluusshh and ttooggggllee aauuttoossyynncchh below) which cause this action to flush
+     subsequent output to the terminal (until the remote host acknowledges the
+     TELNET sequence) and flush previous terminal input (in the case of qquuiitt
+     and iinnttrr).
 
      While connected to a remote host, tteellnneett command mode may be entered by
      typing the tteellnneett ``escape character'' (initially ``^]'').  When in com-
@@ -155,8 +155,8 @@ DDEESSCCRRIIPPTTIIOONN
      cclloossee      Close a TELNET session and return to command mode.
 
      ddiissppllaayy _a_r_g_u_m_e_n_t _._._.
-                Displays all, or some, of the sseett and ttooggggllee values (see
-                below).
+                Displays all, or some, of the sseett and ttooggggllee values (see be-
+                low).
 
      eennccrryypptt _a_r_g_u_m_e_n_t _._._.
                 The encrypt command manipulates the information sent through
@@ -233,8 +233,8 @@ DDEESSCCRRIIPPTTIIOONN
                             remote side.
 
                 uunneexxppoorrtt _v_a_r_i_a_b_l_e
-                            Mark the variable _v_a_r_i_a_b_l_e to not be exported
-                            unless explicitly asked for by the remote side.
+                            Mark the variable _v_a_r_i_a_b_l_e to not be exported un-
+                            less explicitly asked for by the remote side.
 
                 lliisstt        List the current set of environment variables.
                             Those marked with a ** will be sent automatically,
@@ -256,17 +256,17 @@ DDEESSCCRRIIPPTTIIOONN
 
      mmooddee _t_y_p_e  _T_y_p_e is one of several options, depending on the state of the
                 TELNET session.  The remote host is asked for permission to go
-                into the requested mode.  If the remote host is capable of
-                entering that mode, the requested mode will be entered.
+                into the requested mode.  If the remote host is capable of en-
+                tering that mode, the requested mode will be entered.
 
                 cchhaarraacctteerr     Disable the TELNET LINEMODE option, or, if the
-                              remote side does not understand the LINEMODE
-                              option, then enter ``character at a time`` mode.
+                              remote side does not understand the LINEMODE op-
+                              tion, then enter ``character at a time`` mode.
 
                 lliinnee          Enable the TELNET LINEMODE option, or, if the
-                              remote side does not understand the LINEMODE
-                              option, then attempt to enter ``old-line-by-
-                              line`` mode.
+                              remote side does not understand the LINEMODE op-
+                              tion, then attempt to enter ``old-line-by-line``
+                              mode.
 
                 iissiigg (--iissiigg)  Attempt to enable (disable) the TRAPSIG mode of
                               the LINEMODE option.  This requires that the
@@ -298,15 +298,15 @@ DDEESSCCRRIIPPTTIIOONN
                 to specify the user name to be passed to the remote system via
                 the ENVIRON option.  When connecting to a non-standard port,
                 tteellnneett omits any automatic initiation of TELNET options.  When
-                the port number is preceded by a minus sign, the initial
-                option negotiation is done.  After establishing a connection,
+                the port number is preceded by a minus sign, the initial op-
+                tion negotiation is done.  After establishing a connection,
                 the file _._t_e_l_n_e_t_r_c in the users home directory is opened.
                 Lines beginning with a # are comment lines.  Blank lines are
                 ignored.  Lines that begin without white space are the start
                 of a machine entry.  The first thing on the line is the name
                 of the machine that is being connected to.  The rest of the
-                line, and successive lines that begin with white space are
-                assumed to be tteellnneett commands and are processed as if they had
+                line, and successive lines that begin with white space are as-
+                sumed to be tteellnneett commands and are processed as if they had
                 been typed in manually to the tteellnneett command prompt.
 
      qquuiitt       Close any open TELNET session and exit tteellnneett.  An end of file
@@ -324,8 +324,8 @@ DDEESSCCRRIIPPTTIIOONN
                         _f_r_o_m the remote system _t_o the user's terminal.
 
                 aayytt     Sends the TELNET AYT (Are You There) sequence, to
-                        which the remote system may or may not choose to
-                        respond.
+                        which the remote system may or may not choose to re-
+                        spond.
 
                 bbrrkk     Sends the TELNET BRK (Break) sequence, which may have
                         significance to the remote system.
@@ -363,9 +363,9 @@ DDEESSCCRRIIPPTTIIOONN
 
                 ssyynncchh   Sends the TELNET SYNCH sequence.  This sequence causes
                         the remote system to discard all previously typed (but
-                        not yet read) input.  This sequence is sent as TCP
-                        urgent data (and may not work if the remote system is
-                        a 4.2BSD system -- if it doesn't work, a lower case
+                        not yet read) input.  This sequence is sent as TCP ur-
+                        gent data (and may not work if the remote system is a
+                        4.2BSD system -- if it doesn't work, a lower case
                         ``r'' may be echoed on the terminal).
 
                 ddoo _c_m_d
@@ -397,17 +397,17 @@ DDEESSCCRRIIPPTTIIOONN
                 the ttooggggllee command may be explicitly set or unset using the
                 sseett and uunnsseett commands.
 
-                aayytt     If TELNET is in localchars mode, or LINEMODE is
-                        enabled, and the status character is typed, a TELNET
-                        AYT sequence (see sseenndd aayytt preceding) is sent to the
-                        remote host.  The initial value for the "Are You
-                        There" character is the terminal's status character.
+                aayytt     If TELNET is in localchars mode, or LINEMODE is en-
+                        abled, and the status character is typed, a TELNET AYT
+                        sequence (see sseenndd aayytt preceding) is sent to the re-
+                        mote host.  The initial value for the "Are You There"
+                        character is the terminal's status character.
 
                 eecchhoo    This is the value (initially ``^E'') which, when in
                         ``line by line'' mode, toggles between doing local
                         echoing of entered characters (for normal processing),
-                        and suppressing echoing of entered characters (for
-                        entering, say, a password).
+                        and suppressing echoing of entered characters (for en-
+                        tering, say, a password).
 
                 eeooff     If tteellnneett is operating in LINEMODE or ``old line by
                         line'' mode, entering this character as the first
@@ -483,23 +483,23 @@ DDEESSCCRRIIPPTTIIOONN
                         suspends the telnet command.  The initial state is to
                         disable the rlogin escape character.
 
-                ssttaarrtt   If the TELNET TOGGLE-FLOW-CONTROL option has been
-                        enabled, then this character is taken to be the termi-
+                ssttaarrtt   If the TELNET TOGGLE-FLOW-CONTROL option has been en-
+                        abled, then this character is taken to be the termi-
                         nal's ssttaarrtt character.  The initial value for the kill
                         character is taken to be the terminal's ssttaarrtt charac-
                         ter.
 
-                ssttoopp    If the TELNET TOGGLE-FLOW-CONTROL option has been
-                        enabled, then this character is taken to be the termi-
+                ssttoopp    If the TELNET TOGGLE-FLOW-CONTROL option has been en-
+                        abled, then this character is taken to be the termi-
                         nal's ssttoopp character.  The initial value for the kill
                         character is taken to be the terminal's ssttoopp charac-
                         ter.
 
-                ssuusspp    If tteellnneett is in llooccaallcchhaarrss mode, or LINEMODE is
-                        enabled, and the ssuussppeenndd character is typed, a TELNET
-                        SUSP sequence (see sseenndd ssuusspp above) is sent to the
-                        remote host.  The initial value for the suspend char-
-                        acter is taken to be the terminal's ssuussppeenndd character.
+                ssuusspp    If tteellnneett is in llooccaallcchhaarrss mode, or LINEMODE is en-
+                        abled, and the ssuussppeenndd character is typed, a TELNET
+                        SUSP sequence (see sseenndd ssuusspp above) is sent to the re-
+                        mote host.  The initial value for the suspend charac-
+                        ter is taken to be the terminal's ssuussppeenndd character.
 
                 ttrraacceeffiillee
                         This is the file to which the output, caused by
@@ -562,8 +562,8 @@ DDEESSCCRRIIPPTTIIOONN
                               above for details), tteellnneett refuses to display
                               any data on the user's terminal until the remote
                               system acknowledges (via a TELNET TIMING MARK
-                              option) that it has processed those TELNET
-                              sequences.  The initial value for this toggle is
+                              option) that it has processed those TELNET se-
+                              quences.  The initial value for this toggle is
                               TRUE if the terminal user had not done an "stty
                               noflsh", otherwise FALSE (see stty(1)).
 
@@ -581,8 +581,8 @@ DDEESSCCRRIIPPTTIIOONN
                 aauuttoollooggiinn     If the remote side supports the TELNET
                               AUTHENTICATION option TELNET attempts to use it
                               to perform automatic authentication.  If the
-                              AUTHENTICATION option is not supported, the
-                              user's login name are propagated through the
+                              AUTHENTICATION option is not supported, the us-
+                              er's login name are propagated through the
                               TELNET ENVIRON option.  This command is the same
                               as specifying _a option on the ooppeenn command.
 
@@ -612,15 +612,15 @@ DDEESSCCRRIIPPTTIIOONN
                               initial value for this toggle is FALSE.
 
                 ccrrmmoodd         Toggle carriage return mode.  When this mode is
-                              enabled, most carriage return characters
-                              received from the remote host will be mapped
-                              into a carriage return followed by a line feed.
-                              This mode does not affect those characters typed
-                              by the user, only those received from the remote
+                              enabled, most carriage return characters re-
+                              ceived from the remote host will be mapped into
+                              a carriage return followed by a line feed.  This
+                              mode does not affect those characters typed by
+                              the user, only those received from the remote
                               host.  This mode is not very useful unless the
-                              remote host only sends carriage return, but
-                              never line feed.  The initial value for this
-                              toggle is FALSE.
+                              remote host only sends carriage return, but nev-
+                              er line feed.  The initial value for this toggle
+                              is FALSE.
 
                 ddeebbuugg         Toggles socket level debugging (useful only to
                               the ssuuppeerr uusseerr).  The initial value for this
@@ -648,8 +648,8 @@ DDEESSCCRRIIPPTTIIOONN
                               toggle is FALSE.
 
                 ooppttiioonnss       Toggles the display of some internal tteellnneett pro-
-                              tocol processing (having to do with TELNET
-                              options).  The initial value for this toggle is
+                              tocol processing (having to do with TELNET op-
+                              tions).  The initial value for this toggle is
                               FALSE.
 
                 pprreettttyydduummpp    When the nneettddaattaa toggle is enabled, if
@@ -671,21 +671,21 @@ DDEESSCCRRIIPPTTIIOONN
 
                 vveerrbboossee__eennccrryypptt
                               When the vveerrbboossee__eennccrryypptt toggle is TRUE, TELNET
-                              prints out a message each time encryption is
-                              enabled or disabled.  The initial value for this
+                              prints out a message each time encryption is en-
+                              abled or disabled.  The initial value for this
                               toggle is FALSE.  Note:  Because of export con-
                               trols, data encryption is not supported outside
                               of the United States and Canada.
 
                 ??             Displays the legal ttooggggllee commands.
 
-     zz          Suspend tteellnneett.  This command only works when the user is
-                using the csh(1).
+     zz          Suspend tteellnneett.  This command only works when the user is us-
+                ing the csh(1).
 
      !! [_c_o_m_m_a_n_d]
                 Execute a single command in a subshell on the local system.
-                If ccoommmmaanndd is omitted, then an interactive subshell is
-                invoked.
+                If ccoommmmaanndd is omitted, then an interactive subshell is in-
+                voked.
 
      ?? [_c_o_m_m_a_n_d]
                 Get help.  With no arguments, tteellnneett prints a help summary.
@@ -711,4 +711,4 @@ NNOOTTEESS
      only recognized (and sent to the remote system) when it is the first
      character on a line.
 
-4.2 Berkeley Distribution        June 1, 1994        4.2 Berkeley Distribution
+4.2 Berkeley Distribution        June 1, 1994                               11
diff --git a/crypto/heimdal/appl/telnet/telnetd/Makefile.in b/crypto/heimdal/appl/telnet/telnetd/Makefile.in
index 9941aac..a947205 100644
--- a/crypto/heimdal/appl/telnet/telnetd/Makefile.in
+++ b/crypto/heimdal/appl/telnet/telnetd/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -286,7 +285,8 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f; \
 	  else :; fi; \
@@ -295,17 +295,14 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS)
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \
 	  rm -f $(DESTDIR)$(libexecdir)/$$f; \
 	done
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS)
 telnetd$(EXEEXT): $(telnetd_OBJECTS) $(telnetd_DEPENDENCIES) 
 	@rm -f telnetd$(EXEEXT)
 	$(LINK) $(telnetd_LDFLAGS) $(telnetd_OBJECTS) $(telnetd_LDADD) $(LIBS)
@@ -350,10 +347,6 @@ install-man8: $(man8_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    8*) ;; \
-	    *) ext='8' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -419,7 +412,7 @@ top_distdir = ../../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -469,7 +462,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/appl/telnet/telnetd/telnetd.cat8 b/crypto/heimdal/appl/telnet/telnetd/telnetd.cat8
index b2056b2..ce4c714 100644
--- a/crypto/heimdal/appl/telnet/telnetd/telnetd.cat8
+++ b/crypto/heimdal/appl/telnet/telnetd/telnetd.cat8
@@ -1,4 +1,4 @@
-TELNETD(8)              FreeBSD System Manager's Manual             TELNETD(8)
+TELNETD(8)              NetBSD System Manager's Manual              TELNETD(8)
 
 NNAAMMEE
      tteellnneettdd - DARPA TELNET protocol server
@@ -34,8 +34,8 @@ DDEESSCCRRIIPPTTIIOONN
                   valid  Only allow connections when the remote user can pro-
                          vide valid authentication information to identify the
                          remote user.  The login(1) command will provide any
-                         additional user verification needed if the remote
-                         user is not allowed automatic access to the specified
+                         additional user verification needed if the remote us-
+                         er is not allowed automatic access to the specified
                          account.
 
                   other  Only allow connections that supply some authentica-
@@ -105,22 +105,22 @@ DDEESSCCRRIIPPTTIIOONN
      --SS _t_o_s
 
      --uu _l_e_n       This option is used to specify the size of the field in the
-                  utmp structure that holds the remote host name.  If the
-                  resolved host name is longer than _l_e_n, the dotted decimal
-                  value will be used instead.  This allows hosts with very
-                  long host names that overflow this field to still be
-                  uniquely identified.  Specifying --uu00 indicates that only
-                  dotted decimal addresses should be put into the _u_t_m_p file.
+                  utmp structure that holds the remote host name.  If the re-
+                  solved host name is longer than _l_e_n, the dotted decimal val-
+                  ue will be used instead.  This allows hosts with very long
+                  host names that overflow this field to still be uniquely
+                  identified.  Specifying --uu00 indicates that only dotted deci-
+                  mal addresses should be put into the _u_t_m_p file.
 
-     --UU           This option causes tteellnneettdd to refuse connections from
-                  addresses that cannot be mapped back into a symbolic name
-                  via the gethostbyaddr(3) routine.
+     --UU           This option causes tteellnneettdd to refuse connections from ad-
+                  dresses that cannot be mapped back into a symbolic name via
+                  the gethostbyaddr(3) routine.
 
      --XX _a_u_t_h_t_y_p_e  This option is only valid if tteellnneettdd has been built with
                   support for the authentication option.  It disables the use
                   of _a_u_t_h_t_y_p_e authentication, and can be used to temporarily
-                  disable a specific authentication type without having to
-                  recompile tteellnneettdd.
+                  disable a specific authentication type without having to re-
+                  compile tteellnneettdd.
 
      --LL _p_a_t_h_n_a_m_e  Specify pathname to an alternative login program.
 
@@ -175,8 +175,8 @@ DDEESSCCRRIIPPTTIIOONN
      WILL SGA           Indicates that it will not be sending IAC GA, go
                         ahead, commands.
 
-     WILL STATUS        Indicates a willingness to send the client, upon
-                        request, of the current status of all TELNET options.
+     WILL STATUS        Indicates a willingness to send the client, upon re-
+                        quest, of the current status of all TELNET options.
 
      WILL TIMING-MARK   Whenever a DO TIMING-MARK command is received, it is
                         always responded to with a WILL TIMING-MARK
@@ -197,8 +197,8 @@ DDEESSCCRRIIPPTTIIOONN
                         ters remotely.
 
      DO ECHO            This is not really supported, but is sent to identify
-                        a 4.2BSD telnet(1) client, which will improperly
-                        respond with WILL ECHO.  If a WILL ECHO is received, a
+                        a 4.2BSD telnet(1) client, which will improperly re-
+                        spond with WILL ECHO.  If a WILL ECHO is received, a
                         DONT ECHO will be sent in response.
 
      DO TERMINAL-TYPE   Indicates a desire to be able to request the name of
@@ -236,8 +236,8 @@ DDEESSCCRRIIPPTTIIOONN
                         linemode.  Note that the [--kk] option can be used to
                         disable this.
 
-     DO AUTHENTICATION  Only sent if tteellnneettdd is compiled with support for
-                        authentication, and indicates a willingness to receive
+     DO AUTHENTICATION  Only sent if tteellnneettdd is compiled with support for au-
+                        thentication, and indicates a willingness to receive
                         authentication information for automatic login.
 
      DO ENCRYPT         Only sent if tteellnneettdd is compiled with support for data
@@ -290,4 +290,4 @@ BBUUGGSS
 
      TTeellnneettdd never sends TELNET IAC GA (go ahead) commands.
 
-4.2 Berkeley Distribution        June 1, 1994        4.2 Berkeley Distribution
+4.2 Berkeley Distribution        June 1, 1994                                5
diff --git a/crypto/heimdal/appl/test/Makefile.in b/crypto/heimdal/appl/test/Makefile.in
index 713f291..932b267 100644
--- a/crypto/heimdal/appl/test/Makefile.in
+++ b/crypto/heimdal/appl/test/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -335,11 +334,7 @@ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
 
 clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
 gssapi_client$(EXEEXT): $(gssapi_client_OBJECTS) $(gssapi_client_DEPENDENCIES) 
 	@rm -f gssapi_client$(EXEEXT)
 	$(LINK) $(gssapi_client_LDFLAGS) $(gssapi_client_OBJECTS) $(gssapi_client_LDADD) $(LIBS)
@@ -431,7 +426,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -480,7 +475,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/cf/sunos.m4 b/crypto/heimdal/cf/sunos.m4
index 4a4400e..c093278 100644
--- a/crypto/heimdal/cf/sunos.m4
+++ b/crypto/heimdal/cf/sunos.m4
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: sunos.m4,v 1.1 2002/08/28 19:53:51 joda Exp $
+dnl $Id: sunos.m4,v 1.1.4.1 2002/10/21 14:29:36 joda Exp $
 dnl
 
 AC_DEFUN([rk_SUNOS],[
@@ -11,7 +11,7 @@ case "$host" in
 *-*-solaris2.7)
 	sunos=57
 	;;
-*-*-solaris2.[89])
+*-*-solaris2.[[89]])
 	sunos=58
 	;;
 *-*-solaris2*)
diff --git a/crypto/heimdal/config.guess b/crypto/heimdal/config.guess
index fd30ab0..ed2e03b 100755
--- a/crypto/heimdal/config.guess
+++ b/crypto/heimdal/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002 Free Software Foundation, Inc.
 
-timestamp='2002-07-23'
+timestamp='2002-03-20'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -88,40 +88,30 @@ if test $# != 0; then
   exit 1
 fi
 
-trap 'exit 1' 1 2 15
 
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
+dummy=dummy-$$
+trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
 
+# CC_FOR_BUILD -- compiler used by this script.
 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
 # use `HOST_CC' if defined, but it is deprecated.
 
-# This shell variable is my proudest work .. or something. --bje
-
-set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ;
-(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old)
-   || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ;
-dummy=$tmpdir/dummy ;
-files="$dummy.c $dummy.o $dummy.rel $dummy" ;
-trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
+set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int dummy(){}" > $dummy.c ;
 	for c in cc gcc c89 c99 ; do
-	  if ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; then
+	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
+	  if test $? = 0 ; then
 	     CC_FOR_BUILD="$c"; break ;
 	  fi ;
 	done ;
-	rm -f $files ;
+	rm -f $dummy.c $dummy.o $dummy.rel ;
 	if test x"$CC_FOR_BUILD" = x ; then
 	  CC_FOR_BUILD=no_compiler_found ;
 	fi
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;
-unset files'
+esac'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -152,7 +142,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
 	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
 	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
@@ -231,7 +220,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	eval $set_cc_for_build
 	cat <<EOF >$dummy.s
 	.data
 \$Lformat:
@@ -257,9 +245,10 @@ main:
 	jsr \$26,exit
 	.end main
 EOF
+	eval $set_cc_for_build
 	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 	if test "$?" = 0 ; then
-		case `$dummy` in
+		case `./$dummy` in
 			0-0)
 				UNAME_MACHINE="alpha"
 				;;
@@ -281,12 +270,9 @@ EOF
 			2-1307)
 				UNAME_MACHINE="alphaev68"
 				;;
-			3-1307)
-				UNAME_MACHINE="alphaev7"
-				;;
 		esac
 	fi
-	rm -f $dummy.s $dummy && rmdir $tmpdir
+	rm -f $dummy.s $dummy
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 	exit 0 ;;
     Alpha\ *:Windows_NT*:*)
@@ -327,10 +313,6 @@ EOF
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
 	exit 0 ;;
-    DRS?6000:UNIX_SV:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
-	esac ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
@@ -438,17 +420,14 @@ EOF
 	}
 EOF
 	$CC_FOR_BUILD $dummy.c -o $dummy \
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-	rm -f $dummy.c $dummy && rmdir $tmpdir
+	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && rm -f $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
 	echo mips-mips-riscos${UNAME_RELEASE}
 	exit 0 ;;
     Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
 	exit 0 ;;
-    Night_Hawk:*:*:PowerMAX_OS)
-	echo powerpc-harris-powermax
-	exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
 	exit 0 ;;
@@ -521,8 +500,8 @@ EOF
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-		rm -f $dummy.c $dummy && rmdir $tmpdir
+		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+		rm -f $dummy.c $dummy
 		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
@@ -620,9 +599,9 @@ EOF
                   exit (0);
               }
 EOF
-		    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`$dummy`
+		    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
 		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-		    rm -f $dummy.c $dummy && rmdir $tmpdir
+		    rm -f $dummy.c $dummy
 		fi ;;
 	esac
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -658,8 +637,8 @@ EOF
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-	rm -f $dummy.c $dummy && rmdir $tmpdir
+	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
 	echo unknown-hitachi-hiuxwe2
 	exit 0 ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@ -742,19 +721,7 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
     *:FreeBSD:*:*)
-	# Determine whether the default compiler uses glibc.
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#if __GLIBC__ >= 2
-	LIBC=gnu
-	#else
-	LIBC=
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	rm -f $dummy.c && rmdir $tmpdir
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -815,7 +782,7 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	rm -f $dummy.c && rmdir $tmpdir
+	rm -f $dummy.c
 	test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
 	;;
     ppc:Linux:*:*)
@@ -878,7 +845,7 @@ EOF
 		;;
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;
+		exit 0 ;;		
 	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
 		exit 0 ;;
@@ -911,7 +878,7 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	rm -f $dummy.c && rmdir $tmpdir
+	rm -f $dummy.c
 	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 	;;
@@ -950,13 +917,13 @@ EOF
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
 		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
 			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
 			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
 			&& UNAME_MACHINE=i686
 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
 	else
@@ -991,7 +958,7 @@ EOF
 	exit 0 ;;
     M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1274,8 +1241,8 @@ main ()
 }
 EOF
 
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-rm -f $dummy.c $dummy && rmdir $tmpdir
+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
+rm -f $dummy.c $dummy
 
 # Apollos put the system type in the environment.
 
diff --git a/crypto/heimdal/config.sub b/crypto/heimdal/config.sub
index 9ff085e..f365797 100755
--- a/crypto/heimdal/config.sub
+++ b/crypto/heimdal/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002 Free Software Foundation, Inc.
 
-timestamp='2002-07-03'
+timestamp='2002-03-07'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -118,7 +118,7 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -230,31 +230,23 @@ case $basic_machine in
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
 	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
+	| d10v | d30v | dsp16xx \
+	| fr30 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
-	| ip2k \
 	| m32r | m68000 | m68k | m88k | mcore \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipstx39 | mipstx39el \
+	| mips | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
+	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
+	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
+	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
+	| mipsisa32 | mipsisa64 \
 	| mn10200 | mn10300 \
 	| ns16k | ns32k \
 	| openrisc | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
+	| sh | sh[34] | sh[34]eb | shbe | shle | sh64 \
 	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
 	| strongarm \
 	| tahoe | thumb | tic80 | tron \
@@ -289,40 +281,31 @@ case $basic_machine in
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| arm-*  | armbe-* | armle-* | armv*-* \
 	| avr-* \
 	| bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c54x-* \
 	| clipper-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
+	| d10v-* | d30v-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fr30-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* \
 	| m32r-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | mcore-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipstx39 | mipstx39el \
+	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
+	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
+	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \
 	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
 	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
@@ -1013,7 +996,7 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
+	sh3 | sh4 | sh3eb | sh4eb)
 		basic_machine=sh-unknown
 		;;
 	sh64)
@@ -1107,7 +1090,7 @@ case $os in
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*)
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1426,7 +1409,7 @@ case $basic_machine in
 			-ptx*)
 				vendor=sequent
 				;;
-			-vxsim* | -vxworks* | -windiss*)
+			-vxsim* | -vxworks*)
 				vendor=wrs
 				;;
 			-aux*)
diff --git a/crypto/heimdal/configure b/crypto/heimdal/configure
index 0225d4c..59c2541 100755
--- a/crypto/heimdal/configure
+++ b/crypto/heimdal/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.in Revision: 1.325 .
+# From configure.in Revision: 1.325.2.2 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.53 for Heimdal 0.4f.
+# Generated by GNU Autoconf 2.53 for Heimdal 0.5.1.
 #
 # Report bugs to <heimdal-bugs@pdc.kth.se>.
 #
@@ -416,8 +416,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='Heimdal'
 PACKAGE_TARNAME='heimdal'
-PACKAGE_VERSION='0.4f'
-PACKAGE_STRING='Heimdal 0.4f'
+PACKAGE_VERSION='0.5.1'
+PACKAGE_STRING='Heimdal 0.5.1'
 PACKAGE_BUGREPORT='heimdal-bugs@pdc.kth.se'
 
 ac_unique_file="kuser/kinit.c"
@@ -923,7 +923,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Heimdal 0.4f to adapt to many kinds of systems.
+\`configure' configures Heimdal 0.5.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -993,7 +993,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Heimdal 0.4f:";;
+     short | recursive ) echo "Configuration of Heimdal 0.5.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1127,7 +1127,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-Heimdal configure 0.4f
+Heimdal configure 0.5.1
 generated by GNU Autoconf 2.53
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -1142,7 +1142,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Heimdal $as_me 0.4f, which was
+It was created by Heimdal $as_me 0.5.1, which was
 generated by GNU Autoconf 2.53.  Invocation command line was
 
   $ $0 $@
@@ -2812,7 +2812,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=heimdal
- VERSION=0.4f
+ VERSION=0.5.1
 
 
 cat >>confdefs.h <<_ACEOF
@@ -29181,7 +29181,7 @@ case "$host" in
 *-*-solaris2.7)
 	sunos=57
 	;;
-*-*-solaris2.89)
+*-*-solaris2.[89])
 	sunos=58
 	;;
 *-*-solaris2*)
@@ -36240,7 +36240,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by Heimdal $as_me 0.4f, which was
+This file was extended by Heimdal $as_me 0.5.1, which was
 generated by GNU Autoconf 2.53.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -36302,7 +36302,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-Heimdal config.status 0.4f
+Heimdal config.status 0.5.1
 configured by $0, generated by GNU Autoconf 2.53,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -37194,13 +37194,7 @@ echo "$as_me: executing $ac_dest commands" >&6;}
     depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
   # Strip MF so we end up with the name of the file.
   mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+  if (sed 1q $mf | fgrep 'generated by automake') > /dev/null 2>&1; then
     dirpart=`(dirname "$mf") 2>/dev/null ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
          X"$mf" : 'X\(//\)[^/]' \| \
@@ -37311,7 +37305,7 @@ fi
 
 cat > include/newversion.h.in <<EOF
 const char *heimdal_long_version = "@(#)\$Version: $PACKAGE_STRING by @USER@ on @HOST@ ($host) @DATE@ \$";
-const char *heimdal_version = "Heimdal 0.4f";
+const char *heimdal_version = "Heimdal 0.5.1";
 EOF
 
 if test -f include/version.h && cmp -s include/newversion.h.in include/version.h.in; then
diff --git a/crypto/heimdal/configure.in b/crypto/heimdal/configure.in
index 3ef2a59..a7700af 100644
--- a/crypto/heimdal/configure.in
+++ b/crypto/heimdal/configure.in
@@ -1,8 +1,8 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Revision: 1.325 $)
+AC_REVISION($Revision: 1.325.2.2 $)
 AC_PREREQ(2.53)
 #test -z "$CFLAGS" && CFLAGS="-g"
-AC_INIT(Heimdal, 0.4f, heimdal-bugs@pdc.kth.se)
+AC_INIT(Heimdal, 0.5.1, heimdal-bugs@pdc.kth.se)
 AC_CONFIG_SRCDIR([kuser/kinit.c])
 AM_CONFIG_HEADER(include/config.h)
 
diff --git a/crypto/heimdal/doc/Makefile.in b/crypto/heimdal/doc/Makefile.in
index fb923fc..43e3c93 100644
--- a/crypto/heimdal/doc/Makefile.in
+++ b/crypto/heimdal/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -300,12 +299,12 @@ dist-info: $(INFO_DEPS)
 
 mostlyclean-aminfo:
 	-rm -f heimdal.aux heimdal.cp heimdal.cps heimdal.dvi heimdal.fn heimdal.ky \
-	  heimdal.log heimdal.pg heimdal.ps heimdal.tmp heimdal.toc \
-	  heimdal.tp heimdal.vr
+	  heimdal.log heimdal.pg heimdal.ps heimdal.toc heimdal.tp \
+	  heimdal.vr
 
 maintainer-clean-aminfo:
 	cd $(srcdir) && \
-	list='$(INFO_DEPS)'; for i in $$list; do \
+	for i in $(INFO_DEPS); do \
 	  rm -f $$i; \
 	  if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \
 	    rm -f $$i-[0-9]*; \
@@ -320,7 +319,7 @@ top_distdir = ..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -370,7 +369,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/include/Makefile.in b/crypto/heimdal/include/Makefile.in
index 1eed888..8e9f5a6 100644
--- a/crypto/heimdal/include/Makefile.in
+++ b/crypto/heimdal/include/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -319,14 +318,10 @@ $(srcdir)/config.h.in:  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	touch $(srcdir)/config.h.in
 
 distclean-hdr:
-	-rm -f config.h stamp-h1
+	-rm -f config.h
 
 clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
 bits$(EXEEXT): $(bits_OBJECTS) $(bits_DEPENDENCIES) 
 	@rm -f bits$(EXEEXT)
 	$(LINK) $(bits_LDFLAGS) $(bits_OBJECTS) $(bits_LDADD) $(LIBS)
@@ -478,7 +473,7 @@ top_distdir = ..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -542,7 +537,7 @@ clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/include/kadm5/Makefile.in b/crypto/heimdal/include/kadm5/Makefile.in
index 0452c67..38d14fa 100644
--- a/crypto/heimdal/include/kadm5/Makefile.in
+++ b/crypto/heimdal/include/kadm5/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -247,7 +246,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -297,7 +296,7 @@ clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/include/make_crypto.c b/crypto/heimdal/include/make_crypto.c
index d1b633c..9e38cb7 100644
--- a/crypto/heimdal/include/make_crypto.c
+++ b/crypto/heimdal/include/make_crypto.c
@@ -33,7 +33,7 @@
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id");
+RCSID("$Id: make_crypto.c,v 1.2.2.1 2002/10/21 14:30:04 joda Exp $");
 #endif
 #include <stdio.h>
 #include <string.h>
diff --git a/crypto/heimdal/install-sh b/crypto/heimdal/install-sh
index 11870f1..398a88e 100755
--- a/crypto/heimdal/install-sh
+++ b/crypto/heimdal/install-sh
@@ -128,7 +128,7 @@ else
 # might cause directories to be created, which would be especially bad 
 # if $src (and thus $dsttmp) contains '*'.
 
-	if [ -f "$src" ] || [ -d "$src" ]
+	if [ -f $src -o -d $src ]
 	then
 		:
 	else
diff --git a/crypto/heimdal/kadmin/ChangeLog b/crypto/heimdal/kadmin/ChangeLog
index 6e625f8..a457753 100644
--- a/crypto/heimdal/kadmin/ChangeLog
+++ b/crypto/heimdal/kadmin/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-21  Johan Danielsson  <joda@pdc.kth.se>
+
+	* version4.c: pull up 1.27; check size of rlen
+
 2002-09-10  Johan Danielsson  <joda@pdc.kth.se>
 
 	* server.c: constify match_appl_version()
diff --git a/crypto/heimdal/kadmin/Makefile.in b/crypto/heimdal/kadmin/Makefile.in
index dbf49d8..d2578f5 100644
--- a/crypto/heimdal/kadmin/Makefile.in
+++ b/crypto/heimdal/kadmin/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -305,8 +304,8 @@ kadmin_DEPENDENCIES = $(top_builddir)/lib/kadm5/libkadm5clnt.la \
 	$(top_builddir)/lib/krb5/libkrb5.la \
 	$(top_builddir)/lib/asn1/libasn1.la
 kadmin_LDFLAGS =
-@KRB4_TRUE@am__objects_1 = version4.$(OBJEXT)
-am_kadmind_OBJECTS = kadmind.$(OBJEXT) server.$(OBJEXT) $(am__objects_1) \
+@KRB4_TRUE@am__objects_4 = version4.$(OBJEXT)
+am_kadmind_OBJECTS = kadmind.$(OBJEXT) server.$(OBJEXT) $(am__objects_4) \
 	kadm_conn.$(OBJEXT)
 kadmind_OBJECTS = $(am_kadmind_OBJECTS)
 @KRB4_TRUE@kadmind_DEPENDENCIES = \
@@ -360,7 +359,8 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f; \
 	  else :; fi; \
@@ -369,24 +369,17 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS)
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \
 	  rm -f $(DESTDIR)$(libexecdir)/$$f; \
 	done
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS)
 
 clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
 sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 install-sbinPROGRAMS: $(sbin_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -396,7 +389,8 @@ install-sbinPROGRAMS: $(sbin_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f; \
 	  else :; fi; \
@@ -405,17 +399,14 @@ install-sbinPROGRAMS: $(sbin_PROGRAMS)
 uninstall-sbinPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \
 	  rm -f $(DESTDIR)$(sbindir)/$$f; \
 	done
 
 clean-sbinPROGRAMS:
-	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
 add_random_users$(EXEEXT): $(add_random_users_OBJECTS) $(add_random_users_DEPENDENCIES) 
 	@rm -f add_random_users$(EXEEXT)
 	$(LINK) $(add_random_users_LDFLAGS) $(add_random_users_OBJECTS) $(add_random_users_LDADD) $(LIBS)
@@ -466,10 +457,6 @@ install-man8: $(man8_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    8*) ;; \
-	    *) ext='8' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -535,7 +522,7 @@ top_distdir = ..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -585,7 +572,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/kadmin/kadm_conn.c b/crypto/heimdal/kadmin/kadm_conn.c
index 3914822..f2b54de 100644
--- a/crypto/heimdal/kadmin/kadm_conn.c
+++ b/crypto/heimdal/kadmin/kadm_conn.c
@@ -36,7 +36,7 @@
 #include <sys/wait.h>
 #endif
 
-RCSID("$Id: kadm_conn.c,v 1.13 2001/05/16 22:06:44 assar Exp $");
+RCSID("$Id: kadm_conn.c,v 1.13.6.1 2002/10/21 14:53:39 joda Exp $");
 
 struct kadm_port {
     char *port;
@@ -62,12 +62,15 @@ add_kadm_port(krb5_context context, const char *service, unsigned int port)
     kadm_ports = p;
 }
 
+extern int do_kerberos4;
+
 static void
 add_standard_ports (krb5_context context)
 {
     add_kadm_port(context, "kerberos-adm", 749);
 #ifdef KRB4
-    add_kadm_port(context, "kerberos-master", 751);
+    if(do_kerberos4)
+	add_kadm_port(context, "kerberos-master", 751);
 #endif
 }
 
diff --git a/crypto/heimdal/kadmin/kadmin.cat8 b/crypto/heimdal/kadmin/kadmin.cat8
index 8a3a32c..2155533 100644
--- a/crypto/heimdal/kadmin/kadmin.cat8
+++ b/crypto/heimdal/kadmin/kadmin.cat8
@@ -1,19 +1,19 @@
-KADMIN(8)               FreeBSD System Manager's Manual              KADMIN(8)
+KADMIN(8)               NetBSD System Manager's Manual               KADMIN(8)
 
 NNAAMMEE
      kkaaddmmiinn - Kerberos administration utility
 
 SSYYNNOOPPSSIISS
      kkaaddmmiinn [--pp _s_t_r_i_n_g | ----pprriinncciippaall==_s_t_r_i_n_g] [--KK _s_t_r_i_n_g | ----kkeeyyttaabb==_s_t_r_i_n_g] [--cc
-            _f_i_l_e | ----ccoonnffiigg--ffiillee==_f_i_l_e] [--kk _f_i_l_e | ----kkeeyy--ffiillee==_f_i_l_e] [--rr _r_e_a_l_m |
-            ----rreeaallmm==_r_e_a_l_m] [--aa _h_o_s_t | ----aaddmmiinn--sseerrvveerr==_h_o_s_t] [--ss _p_o_r_t _n_u_m_b_e_r |
-            ----sseerrvveerr--ppoorrtt==_p_o_r_t _n_u_m_b_e_r] [--ll | ----llooccaall] [--hh | ----hheellpp]
-            [--vv | ----vveerrssiioonn] [_c_o_m_m_a_n_d]
+     _f_i_l_e | ----ccoonnffiigg--ffiillee==_f_i_l_e] [--kk _f_i_l_e | ----kkeeyy--ffiillee==_f_i_l_e] [--rr _r_e_a_l_m |
+     ----rreeaallmm==_r_e_a_l_m] [--aa _h_o_s_t | ----aaddmmiinn--sseerrvveerr==_h_o_s_t] [--ss _p_o_r_t _n_u_m_b_e_r |
+     ----sseerrvveerr--ppoorrtt==_p_o_r_t _n_u_m_b_e_r] [--ll | ----llooccaall] [--hh | ----hheellpp] [--vv | ----vveerrssiioonn]
+     [_c_o_m_m_a_n_d]
 
 DDEESSCCRRIIPPTTIIOONN
      The kkaaddmmiinn program is used to make modification to the Kerberos database,
-     either remotely via the kadmind(8) daemon, or locally (with the --ll
-     option).
+     either remotely via the kadmind(8) daemon, or locally (with the --ll op-
+     tion).
 
      Supported options:
 
@@ -112,10 +112,10 @@ DDEESSCCRRIIPPTTIIOONN
 
            mmeerrggee _f_i_l_e
 
-                 similar to lliisstt but just modifies the database with the
-                 entries in the dump file
+                 similar to lliisstt but just modifies the database with the en-
+                 tries in the dump file
 
 SSEEEE AALLSSOO
      kadmind(8), kdc(8)
 
-HEIMDAL                       September 10, 2000                       HEIMDAL
+ HEIMDAL                      September 10, 2000                             2
diff --git a/crypto/heimdal/kadmin/kadmind.8 b/crypto/heimdal/kadmin/kadmind.8
index f7a3f5b..ac1fcd2 100644
--- a/crypto/heimdal/kadmin/kadmind.8
+++ b/crypto/heimdal/kadmin/kadmind.8
@@ -1,4 +1,4 @@
-.\" $Id: kadmind.8,v 1.10 2002/08/20 17:07:11 joda Exp $
+.\" $Id: kadmind.8,v 1.10.2.1 2002/10/21 14:53:39 joda Exp $
 .\"
 .Dd March 5, 2002
 .Dt KADMIND 8
@@ -26,6 +26,7 @@
 .Fl -ports= Ns Ar port
 .Xc
 .Oc
+.Op Fl -no-kerberos4
 .Sh DESCRIPTION
 .Nm
 listens for requests for changes to the Kerberos database and performs
@@ -118,11 +119,16 @@ enable debugging
 .Fl -ports= Ns Ar port
 .Xc
 ports to listen to. By default, if run as a daemon, it listen to ports
-749, and 751 (if built with Kerberos 4 support), but you can add any
-number of ports with this option. The port string is a whitespace
-separated list of port specifications, with the special string
+749, and 751 (if Kerberos 4 support is built and enabled), but you can
+add any number of ports with this option. The port string is a
+whitespace separated list of port specifications, with the special
+string
 .Dq +
 representing the default set of ports.
+.It Fl -no-kerberos4
+make 
+.Nm 
+ignore Kerberos 4 kadmin requests.
 .El
 .\".Sh ENVIRONMENT
 .Sh FILES
diff --git a/crypto/heimdal/kadmin/kadmind.c b/crypto/heimdal/kadmin/kadmind.c
index c8fe8ec..5ef6349 100644
--- a/crypto/heimdal/kadmin/kadmind.c
+++ b/crypto/heimdal/kadmin/kadmind.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997-2001 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997-2002 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -33,7 +33,7 @@
 
 #include "kadmin_locl.h"
 
-RCSID("$Id: kadmind.c,v 1.27 2001/05/14 06:16:41 assar Exp $");
+RCSID("$Id: kadmind.c,v 1.27.6.1 2002/10/21 14:53:39 joda Exp $");
 
 static char *check_library  = NULL;
 static char *check_function = NULL;
@@ -45,6 +45,9 @@ static int version_flag;
 static int debug_flag;
 static char *port_str;
 char *realm;
+#ifdef KRB4
+int do_kerberos4 = 1;
+#endif
 
 static struct getargs args[] = {
     { 
@@ -71,6 +74,11 @@ static struct getargs args[] = {
     {	"debug",	'd',	arg_flag,   &debug_flag, 
 	"enable debugging" 
     },
+#ifdef KRB4
+    {	"kerberos4", 0, arg_negative_flag, &do_kerberos4,
+	"don't respond to kerberos 4 requests"
+    },
+#endif
     {	"ports",	'p',	arg_string, &port_str, 
 	"ports to listen to", "port" },
     {	"help",		'h',	arg_flag,   &help_flag },
diff --git a/crypto/heimdal/kadmin/kadmind.cat8 b/crypto/heimdal/kadmin/kadmind.cat8
index 4eeefc6..b7172bc 100644
--- a/crypto/heimdal/kadmin/kadmind.cat8
+++ b/crypto/heimdal/kadmin/kadmind.cat8
@@ -1,23 +1,23 @@
-KADMIND(8)              FreeBSD System Manager's Manual             KADMIND(8)
+KADMIND(8)              NetBSD System Manager's Manual              KADMIND(8)
 
 NNAAMMEE
      kkaaddmmiinndd - server for administrative access to kerberos database
 
 SSYYNNOOPPSSIISS
      kkaaddmmiinndd [--cc _f_i_l_e | ----ccoonnffiigg--ffiillee==_f_i_l_e] [--kk _f_i_l_e | ----kkeeyy--ffiillee==_f_i_l_e]
-             [----kkeeyyttaabb==_k_e_y_t_a_b] [--rr _r_e_a_l_m | ----rreeaallmm==_r_e_a_l_m] [--dd | ----ddeebbuugg] [--pp
-             _p_o_r_t | ----ppoorrttss==_p_o_r_t]
+     [----kkeeyyttaabb==_k_e_y_t_a_b] [--rr _r_e_a_l_m | ----rreeaallmm==_r_e_a_l_m] [--dd | ----ddeebbuugg] [--pp _p_o_r_t |
+     ----ppoorrttss==_p_o_r_t] [----nnoo--kkeerrbbeerrooss44]
 
 DDEESSCCRRIIPPTTIIOONN
      kkaaddmmiinndd listens for requests for changes to the Kerberos database and
      performs these, subject to permissions.  When starting, if stdin is a
-     socket it assumes that it has been started by inetd(8), otherwise it
-     behaves as a daemon, forking processes for each new connection. The
-     ----ddeebbuugg option causes kkaaddmmiinndd to accept exactly one connection, which is
-     useful for debugging.
+     socket it assumes that it has been started by inetd(8), otherwise it be-
+     haves as a daemon, forking processes for each new connection. The ----ddeebbuugg
+     option causes kkaaddmmiinndd to accept exactly one connection, which is useful
+     for debugging.
 
-     If built with krb4 support, it implements both the Heimdal Kerberos 5
-     administrative protocol and the Kerberos 4 protocol. Password changes via
+     If built with krb4 support, it implements both the Heimdal Kerberos 5 ad-
+     ministrative protocol and the Kerberos 4 protocol. Password changes via
      the Kerberos 4 protocol are also performed by kkaaddmmiinndd, but the
      kpasswdd(8) daemon is responsible for the Kerberos 5 password changing
      protocol (used by kpasswd(1))
@@ -63,10 +63,14 @@ DDEESSCCRRIIPPTTIIOONN
 
      --pp _p_o_r_t, ----ppoorrttss==_p_o_r_t
              ports to listen to. By default, if run as a daemon, it listen to
-             ports 749, and 751 (if built with Kerberos 4 support), but you
-             can add any number of ports with this option. The port string is
-             a whitespace separated list of port specifications, with the spe-
-             cial string ``+'' representing the default set of ports.
+             ports 749, and 751 (if Kerberos 4 support is built and enabled),
+             but you can add any number of ports with this option. The port
+             string is a whitespace separated list of port specifications,
+             with the special string ``+'' representing the default set of
+             ports.
+
+     ----nnoo--kkeerrbbeerrooss44
+             make kkaaddmmiinndd ignore Kerberos 4 kadmin requests.
 
 FFIILLEESS
      _/_v_a_r_/_h_e_i_m_d_a_l_/_k_a_d_m_i_n_d_._a_c_l
@@ -75,7 +79,7 @@ EEXXAAMMPPLLEESS
      This will cause kkaaddmmiinndd to listen to port 4711 in addition to any com-
      piled in defaults:
 
-           kkaaddmmiinndd ----ppoorrttss="+ 4711" &
+           kkaaddmmiinndd----ppoorrttss="+ 4711" &
 
      This acl file will grant Joe all rights, and allow Mallory to view and
      add host principals.
@@ -86,4 +90,4 @@ EEXXAAMMPPLLEESS
 SSEEEE AALLSSOO
      kpasswd(1), kadmin(8), kdc(8), kpasswdd(8)
 
-HEIMDAL                          March 5, 2002                         HEIMDAL
+ HEIMDAL                         March 5, 2002                               2
diff --git a/crypto/heimdal/kadmin/server.c b/crypto/heimdal/kadmin/server.c
index 143e95d..82050bb 100644
--- a/crypto/heimdal/kadmin/server.c
+++ b/crypto/heimdal/kadmin/server.c
@@ -34,7 +34,7 @@
 #include "kadmin_locl.h"
 #include <krb5-private.h>
 
-RCSID("$Id: server.c,v 1.36 2002/09/10 19:23:28 joda Exp $");
+RCSID("$Id: server.c,v 1.36.2.1 2002/10/21 14:53:39 joda Exp $");
 
 static kadm5_ret_t
 kadmind_dispatch(void *kadm_handle, krb5_boolean initial,
@@ -532,6 +532,8 @@ handle_v5(krb5_context context,
     v5_loop (context, ac, initial, kadm_handle, fd);
 }
 
+extern int do_kerberos4;
+
 krb5_error_code
 kadmind_loop(krb5_context context,
 	     krb5_auth_context ac,
@@ -551,7 +553,10 @@ kadmind_loop(krb5_context context,
     if(len > 0xffff && (len & 0xffff) == ('K' << 8) + 'A') {
 	len >>= 16;
 #ifdef KRB4
-	handle_v4(context, keytab, len, fd);
+	if(do_kerberos4)
+	    handle_v4(context, keytab, len, fd);
+	else
+	    krb5_errx(context, 1, "version 4 kadmin is disabled");
 #else
 	krb5_errx(context, 1, "packet appears to be version 4");
 #endif
diff --git a/crypto/heimdal/kadmin/version4.c b/crypto/heimdal/kadmin/version4.c
index f4c6b08..466ec3a 100644
--- a/crypto/heimdal/kadmin/version4.c
+++ b/crypto/heimdal/kadmin/version4.c
@@ -41,7 +41,7 @@
 #include <krb_err.h>
 #include <kadm_err.h>
 
-RCSID("$Id: version4.c,v 1.27 2002/10/21 12:35:07 joda Exp $");
+RCSID("$Id: version4.c,v 1.26.2.1 2002/10/21 14:52:59 joda Exp $");
 
 #define KADM_NO_OPCODE -1
 #define KADM_NO_ENCRYPT -2
diff --git a/crypto/heimdal/kdc/Makefile.in b/crypto/heimdal/kdc/Makefile.in
index e8f13fd..429deea 100644
--- a/crypto/heimdal/kdc/Makefile.in
+++ b/crypto/heimdal/kdc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -349,7 +348,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
@@ -358,17 +358,14 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
 	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done
 
 clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -378,7 +375,8 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f; \
 	  else :; fi; \
@@ -387,17 +385,14 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS)
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \
 	  rm -f $(DESTDIR)$(libexecdir)/$$f; \
 	done
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS)
 sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 install-sbinPROGRAMS: $(sbin_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -407,7 +402,8 @@ install-sbinPROGRAMS: $(sbin_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f; \
 	  else :; fi; \
@@ -416,17 +412,14 @@ install-sbinPROGRAMS: $(sbin_PROGRAMS)
 uninstall-sbinPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \
 	  rm -f $(DESTDIR)$(sbindir)/$$f; \
 	done
 
 clean-sbinPROGRAMS:
-	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
 hprop$(EXEEXT): $(hprop_OBJECTS) $(hprop_DEPENDENCIES) 
 	@rm -f hprop$(EXEEXT)
 	$(LINK) $(hprop_LDFLAGS) $(hprop_OBJECTS) $(hprop_LDADD) $(LIBS)
@@ -483,10 +476,6 @@ install-man8: $(man8_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    8*) ;; \
-	    *) ext='8' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -552,7 +541,7 @@ top_distdir = ..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -602,7 +591,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/kdc/connect.c b/crypto/heimdal/kdc/connect.c
index 960cfa6..54dff30 100644
--- a/crypto/heimdal/kdc/connect.c
+++ b/crypto/heimdal/kdc/connect.c
@@ -33,7 +33,7 @@
 
 #include "kdc_locl.h"
 
-RCSID("$Id: connect.c,v 1.86 2002/08/12 13:29:48 joda Exp $");
+RCSID("$Id: connect.c,v 1.86.4.1 2002/10/21 16:05:17 joda Exp $");
 
 /*
  * a tuple describing on what to listen
@@ -493,7 +493,7 @@ de_http(char *buf)
 {
     char *p, *q;
     for(p = q = buf; *p; p++, q++) {
-	if(*p == '%') {
+	if(*p == '%' && isxdigit(p[1]) && isxdigit(p[2])) {
 	    unsigned int x;
 	    if(sscanf(p + 1, "%2x", &x) != 1)
 		return -1;
diff --git a/crypto/heimdal/kdc/hprop.cat8 b/crypto/heimdal/kdc/hprop.cat8
index 8ac798ec..0ac37e2 100644
--- a/crypto/heimdal/kdc/hprop.cat8
+++ b/crypto/heimdal/kdc/hprop.cat8
@@ -1,15 +1,15 @@
-HPROP(8)                FreeBSD System Manager's Manual               HPROP(8)
+HPROP(8)                NetBSD System Manager's Manual                HPROP(8)
 
 NNAAMMEE
      hhpprroopp - propagate the KDC database
 
 SSYYNNOOPPSSIISS
      hhpprroopp [--mm _f_i_l_e | ----mmaasstteerr--kkeeyy==_f_i_l_e] [--dd _f_i_l_e | ----ddaattaabbaassee==_f_i_l_e]
-           [----ssoouurrccee==_h_e_i_m_d_a_l_|_m_i_t_-_d_u_m_p_|_k_r_b_4_-_d_u_m_p_|_k_r_b_4_-_d_b_|_k_a_s_e_r_v_e_r] [--rr _s_t_r_i_n_g |
-           ----vv44--rreeaallmm==_s_t_r_i_n_g] [--cc _c_e_l_l | ----cceellll==_c_e_l_l] [--SS | ----kkaassppeecciiaallss] [--kk
-           _k_e_y_t_a_b | ----kkeeyyttaabb==_k_e_y_t_a_b] [--RR _s_t_r_i_n_g | ----vv55--rreeaallmm==_s_t_r_i_n_g]
-           [--DD | ----ddeeccrryypptt] [--EE | ----eennccrryypptt] [--nn | ----ssttddoouutt] [--vv | ----vveerrbboossee]
-           [----vveerrssiioonn] [--hh | ----hheellpp] [_h_o_s_t[:_p_o_r_t]] _._._.
+     [----ssoouurrccee==_h_e_i_m_d_a_l_|_m_i_t_-_d_u_m_p_|_k_r_b_4_-_d_u_m_p_|_k_r_b_4_-_d_b_|_k_a_s_e_r_v_e_r] [--rr _s_t_r_i_n_g |
+     ----vv44--rreeaallmm==_s_t_r_i_n_g] [--cc _c_e_l_l | ----cceellll==_c_e_l_l] [--SS | ----kkaassppeecciiaallss] [--kk _k_e_y_t_a_b
+     | ----kkeeyyttaabb==_k_e_y_t_a_b] [--RR _s_t_r_i_n_g | ----vv55--rreeaallmm==_s_t_r_i_n_g] [--DD | ----ddeeccrryypptt] [--EE |
+     ----eennccrryypptt] [--nn | ----ssttddoouutt] [--vv | ----vveerrbboossee] [----vveerrssiioonn] [--hh | ----hheellpp]
+     [_h_o_s_t[:_p_o_r_t]] _._._.
 
 DDEESSCCRRIIPPTTIIOONN
      hhpprroopp takes a principal database in a specified format and converts it
@@ -95,4 +95,4 @@ EEXXAAMMPPLLEESS
 SSEEEE AALLSSOO
      hpropd(8)
 
-HEIMDAL                          June 19, 2000                         HEIMDAL
+ HEIMDAL                         June 19, 2000                               2
diff --git a/crypto/heimdal/kdc/hpropd.cat8 b/crypto/heimdal/kdc/hpropd.cat8
index 077ab2c..e72b4da 100644
--- a/crypto/heimdal/kdc/hpropd.cat8
+++ b/crypto/heimdal/kdc/hpropd.cat8
@@ -1,11 +1,11 @@
-HPROPD(8)               FreeBSD System Manager's Manual              HPROPD(8)
+HPROPD(8)               NetBSD System Manager's Manual               HPROPD(8)
 
 NNAAMMEE
      hhpprrooppdd - receive a propagated database
 
 SSYYNNOOPPSSIISS
-     hhpprrooppdd [--dd _f_i_l_e | ----ddaattaabbaassee==_f_i_l_e] [--nn | ----ssttddiinn] [----pprriinntt]
-            [--ii | ----nnoo--iinneettdd] [--kk _k_e_y_t_a_b | ----kkeeyyttaabb==_k_e_y_t_a_b] [--44 | ----vv44dduummpp]
+     hhpprrooppdd [--dd _f_i_l_e | ----ddaattaabbaassee==_f_i_l_e] [--nn | ----ssttddiinn] [----pprriinntt] [--ii |
+     ----nnoo--iinneettdd] [--kk _k_e_y_t_a_b | ----kkeeyyttaabb==_k_e_y_t_a_b] [--44 | ----vv44dduummpp]
 
 DDEESSCCRRIIPPTTIIOONN
      hhpprrooppdd receives databases sent by hhpprroopp.  and writes it as a local
@@ -39,4 +39,4 @@ DDEESSCCRRIIPPTTIIOONN
 SSEEEE AALLSSOO
      hprop(8)
 
-HEIMDAL                         August 27, 1997                        HEIMDAL
+ HEIMDAL                        August 27, 1997                              1
diff --git a/crypto/heimdal/kdc/kaserver.c b/crypto/heimdal/kdc/kaserver.c
index a281c00..7eeff8a 100644
--- a/crypto/heimdal/kdc/kaserver.c
+++ b/crypto/heimdal/kdc/kaserver.c
@@ -33,7 +33,7 @@
 
 #include "kdc_locl.h"
 
-RCSID("$Id: kaserver.c,v 1.20 2002/09/09 14:03:02 nectar Exp $");
+RCSID("$Id: kaserver.c,v 1.20.2.1 2002/10/21 14:30:51 joda Exp $");
 
 
 #include <rx.h>
@@ -477,6 +477,10 @@ do_authenticate (struct rx_header *hdr,
 
     /* life */
     max_life = end_time - kdc_time;
+    /* end_time - kdc_time can sometimes be non-positive due to slight
+       time skew between client and server. Let's make sure it is postive */
+    if(max_life < 1)
+	max_life = 1;
     if (client_entry->max_life)
 	max_life = min(max_life, *client_entry->max_life);
     if (server_entry->max_life)
@@ -710,6 +714,10 @@ do_getticket (struct rx_header *hdr,
 
     /* life */
     max_life = end_time - kdc_time;
+    /* end_time - kdc_time can sometimes be non-positive due to slight
+       time skew between client and server. Let's make sure it is postive */
+    if(max_life < 1)
+	max_life = 1;
     if (krbtgt_entry->max_life)
 	max_life = min(max_life, *krbtgt_entry->max_life);
     if (server_entry->max_life)
diff --git a/crypto/heimdal/kdc/kdc.cat8 b/crypto/heimdal/kdc/kdc.cat8
index 53b173b..4d83d59 100644
--- a/crypto/heimdal/kdc/kdc.cat8
+++ b/crypto/heimdal/kdc/kdc.cat8
@@ -1,13 +1,13 @@
-KDC(8)                  FreeBSD System Manager's Manual                 KDC(8)
+KDC(8)                  NetBSD System Manager's Manual                  KDC(8)
 
 NNAAMMEE
      kkddcc - Kerberos 5 server
 
 SSYYNNOOPPSSIISS
      kkddcc [--cc _f_i_l_e | ----ccoonnffiigg--ffiillee==_f_i_l_e] [--pp | ----nnoo--rreeqquuiirree--pprreeaauutthh]
-         [----mmaaxx--rreeqquueesstt==_s_i_z_e] [--HH | ----eennaabbllee--hhttttpp] [--rr _s_t_r_i_n_g |
-         ----vv44--rreeaallmm==_s_t_r_i_n_g] [--KK | ----nnoo--kkaasseerrvveerr] [--rr _r_e_a_l_m] [----vv44--rreeaallmm==_r_e_a_l_m]
-         [--PP _s_t_r_i_n_g | ----ppoorrttss==_s_t_r_i_n_g] [----aaddddrreesssseess==_l_i_s_t _o_f _a_d_d_r_e_s_s_e_s]
+     [----mmaaxx--rreeqquueesstt==_s_i_z_e] [--HH | ----eennaabbllee--hhttttpp] [--rr _s_t_r_i_n_g | ----vv44--rreeaallmm==_s_t_r_i_n_g]
+     [--KK | ----nnoo--kkaasseerrvveerr] [--rr _r_e_a_l_m] [----vv44--rreeaallmm==_r_e_a_l_m] [--PP _s_t_r_i_n_g |
+     ----ppoorrttss==_s_t_r_i_n_g] [----aaddddrreesssseess==_l_i_s_t _o_f _a_d_d_r_e_s_s_e_s]
 
 DDEESSCCRRIIPPTTIIOONN
      kkddcc serves requests for tickets. When it starts, it first checks the
@@ -26,11 +26,11 @@ DDEESSCCRRIIPPTTIIOONN
              REQ for all principals. The use of pre-authentication makes it
              more difficult to do offline password attacks. You might want to
              turn it off if you have clients that doesn't do pre-authentica-
-             tion. Since the version 4 protocol doesn't support any pre-
-             authentication, so serving version 4 clients is just about the
-             same as not requiring pre-athentication. The default is to
-             require pre-authentication. Adding the require-preauth per prin-
-             cipal is a more flexible way of handling this.
+             tion. Since the version 4 protocol doesn't support any pre-au-
+             thentication, so serving version 4 clients is just about the same
+             as not requiring pre-athentication. The default is to require
+             pre-authentication. Adding the require-preauth per principal is a
+             more flexible way of handling this.
 
      ----mmaaxx--rreeqquueesstt==_s_i_z_e
              Gives an upper limit on the size of the requests that the kdc is
@@ -58,16 +58,16 @@ DDEESSCCRRIIPPTTIIOONN
      ----aaddddrreesssseess==_l_i_s_t _o_f _a_d_d_r_e_s_s_e_s
              The list of addresses to listen for requests on.  By default, the
              kdc will listen on all the locally configured addresses.  If only
-             a subset is desired, or the automatic detection fails, this
-             option might be used.
+             a subset is desired, or the automatic detection fails, this op-
+             tion might be used.
 
      All activities , are logged to one or more destinations, see
      krb5.conf(5), and krb5_openlog(3).  The entity used for logging is kkddcc.
 
 CCOONNFFIIGGUURRAATTIIOONN FFIILLEE
      The configuration file has the same syntax as krb5.conf(5), but will be
-     read before _/_e_t_c_/_k_r_b_5_._c_o_n_f, so it may override settings found there.
-     Options specific to the KDC only are found in the ``[kdc]'' section.  All
+     read before _/_e_t_c_/_k_r_b_5_._c_o_n_f, so it may override settings found there. Op-
+     tions specific to the KDC only are found in the ``[kdc]'' section.  All
      the command-line options can preferably be added in the configuration
      file.  The only difference is the pre-authentication flag, that has to be
      specified as:
@@ -80,8 +80,8 @@ CCOONNFFIIGGUURRAATTIIOONN FFIILLEE
      equivalents:
 
            check-ticket-addresses = _b_o_o_l_e_a_n
-                Check the addresses in the ticket when processing TGS
-                requests.  The default is FALSE.
+                Check the addresses in the ticket when processing TGS re-
+                quests.  The default is FALSE.
 
            allow-null-ticket-addresses = _b_o_o_l_e_a_n
                 Permit tickets with no addresses.  This option is only rele-
@@ -123,4 +123,4 @@ BBUUGGSS
 SSEEEE AALLSSOO
      kinit(1), krb5.conf(5)
 
-HEIMDAL                         August 22, 2002                        HEIMDAL
+ HEIMDAL                        August 22, 2002                              2
diff --git a/crypto/heimdal/kdc/kstash.cat8 b/crypto/heimdal/kdc/kstash.cat8
index 2090932..266648e 100644
--- a/crypto/heimdal/kdc/kstash.cat8
+++ b/crypto/heimdal/kdc/kstash.cat8
@@ -1,11 +1,11 @@
-KSTASH(8)               FreeBSD System Manager's Manual              KSTASH(8)
+KSTASH(8)               NetBSD System Manager's Manual               KSTASH(8)
 
 NNAAMMEE
      kkssttaasshh - store the KDC master password in a file
 
 SSYYNNOOPPSSIISS
      kkssttaasshh [--ee _s_t_r_i_n_g | ----eennccttyyppee==_s_t_r_i_n_g] [--kk _f_i_l_e | ----kkeeyy--ffiillee==_f_i_l_e]
-            [----ccoonnvveerrtt--ffiillee] [----mmaasstteerr--kkeeyy--ffdd==_f_d] [--hh | ----hheellpp] [----vveerrssiioonn]
+     [----ccoonnvveerrtt--ffiillee] [----mmaasstteerr--kkeeyy--ffdd==_f_d] [--hh | ----hheellpp] [----vveerrssiioonn]
 
 DDEESSCCRRIIPPTTIIOONN
      kkssttaasshh reads the Kerberos master key and stores it in a file that will be
@@ -30,4 +30,4 @@ DDEESSCCRRIIPPTTIIOONN
 SSEEEE AALLSSOO
      kdc(8)
 
-HEIMDAL                        September 1, 2000                       HEIMDAL
+ HEIMDAL                       September 1, 2000                             1
diff --git a/crypto/heimdal/kdc/string2key.cat8 b/crypto/heimdal/kdc/string2key.cat8
index 4ebf66f..60a819e 100644
--- a/crypto/heimdal/kdc/string2key.cat8
+++ b/crypto/heimdal/kdc/string2key.cat8
@@ -1,13 +1,12 @@
-STRING2KEY(8)           FreeBSD System Manager's Manual          STRING2KEY(8)
+STRING2KEY(8)           NetBSD System Manager's Manual           STRING2KEY(8)
 
 NNAAMMEE
      ssttrriinngg22kkeeyy - map a password into a key
 
 SSYYNNOOPPSSIISS
      ssttrriinngg22kkeeyy [--55 | ----vveerrssiioonn55] [--44 | ----vveerrssiioonn44] [--aa | ----aaffss] [--cc _c_e_l_l |
-                ----cceellll==_c_e_l_l] [--ww _p_a_s_s_w_o_r_d | ----ppaasssswwoorrdd==_p_a_s_s_w_o_r_d] [--pp _p_r_i_n_c_i_p_a_l
-                | ----pprriinncciippaall==_p_r_i_n_c_i_p_a_l] [--kk _s_t_r_i_n_g | ----kkeeyyttyyppee==_s_t_r_i_n_g]
-                _p_a_s_s_w_o_r_d
+     ----cceellll==_c_e_l_l] [--ww _p_a_s_s_w_o_r_d | ----ppaasssswwoorrdd==_p_a_s_s_w_o_r_d] [--pp _p_r_i_n_c_i_p_a_l |
+     ----pprriinncciippaall==_p_r_i_n_c_i_p_a_l] [--kk _s_t_r_i_n_g | ----kkeeyyttyyppee==_s_t_r_i_n_g] _p_a_s_s_w_o_r_d
 
 DDEESSCCRRIIPPTTIIOONN
      ssttrriinngg22kkeeyy performs the string-to-key function.  This is useful when you
@@ -39,4 +38,4 @@ DDEESSCCRRIIPPTTIIOONN
 
      ----hheellpp
 
-HEIMDAL                          March 4, 2000                         HEIMDAL
+ HEIMDAL                         March 4, 2000                               1
diff --git a/crypto/heimdal/kpasswd/Makefile.in b/crypto/heimdal/kpasswd/Makefile.in
index 59c01c2..8a3afd6 100644
--- a/crypto/heimdal/kpasswd/Makefile.in
+++ b/crypto/heimdal/kpasswd/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -297,7 +296,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
@@ -306,17 +306,14 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
 	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done
 
 clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -326,7 +323,8 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f; \
 	  else :; fi; \
@@ -335,24 +333,17 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS)
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \
 	  rm -f $(DESTDIR)$(libexecdir)/$$f; \
 	done
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS)
 
 clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
 kpasswd$(EXEEXT): $(kpasswd_OBJECTS) $(kpasswd_DEPENDENCIES) 
 	@rm -f kpasswd$(EXEEXT)
 	$(LINK) $(kpasswd_LDFLAGS) $(kpasswd_OBJECTS) $(kpasswd_LDADD) $(LIBS)
@@ -403,10 +394,6 @@ install-man1: $(man1_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    1*) ;; \
-	    *) ext='1' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -446,10 +433,6 @@ install-man8: $(man8_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    8*) ;; \
-	    *) ext='8' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -515,7 +498,7 @@ top_distdir = ..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -565,7 +548,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/kpasswd/kpasswd.cat1 b/crypto/heimdal/kpasswd/kpasswd.cat1
index e587fbf..e76e9cc 100644
--- a/crypto/heimdal/kpasswd/kpasswd.cat1
+++ b/crypto/heimdal/kpasswd/kpasswd.cat1
@@ -1,4 +1,4 @@
-KPASSWD(1)              FreeBSD General Commands Manual             KPASSWD(1)
+KPASSWD(1)                  NetBSD Reference Manual                 KPASSWD(1)
 
 NNAAMMEE
      kkppaasssswwdd - Kerberos 5 password changing program
@@ -16,4 +16,4 @@ DDIIAAGGNNOOSSTTIICCSS
 SSEEEE AALLSSOO
      kpasswdd(8)
 
-HEIMDAL                         August 27, 1997                        HEIMDAL
+ HEIMDAL                        August 27, 1997                              1
diff --git a/crypto/heimdal/kpasswd/kpasswdd.cat8 b/crypto/heimdal/kpasswd/kpasswdd.cat8
index ce1c9a1..3330b8e 100644
--- a/crypto/heimdal/kpasswd/kpasswdd.cat8
+++ b/crypto/heimdal/kpasswd/kpasswdd.cat8
@@ -1,12 +1,12 @@
-KPASSWDD(8)             FreeBSD System Manager's Manual            KPASSWDD(8)
+KPASSWDD(8)             NetBSD System Manager's Manual             KPASSWDD(8)
 
 NNAAMMEE
      kkppaasssswwdddd - Kerberos 5 password changing server
 
 SSYYNNOOPPSSIISS
      kkppaasssswwdddd [----cchheecckk--lliibbrraarryy==_l_i_b_r_a_r_y] [----cchheecckk--ffuunnccttiioonn==_f_u_n_c_t_i_o_n] [--kk _k_s_p_e_c
-              | ----kkeeyyttaabb==_k_s_p_e_c] [--rr _r_e_a_l_m | ----rreeaallmm==_r_e_a_l_m] [--pp _s_t_r_i_n_g |
-              ----ppoorrtt==_s_t_r_i_n_g] [----vveerrssiioonn] [----hheellpp]
+     | ----kkeeyyttaabb==_k_s_p_e_c] [--rr _r_e_a_l_m | ----rreeaallmm==_r_e_a_l_m] [--pp _s_t_r_i_n_g | ----ppoorrtt==_s_t_r_i_n_g]
+     [----vveerrssiioonn] [----hheellpp]
 
 DDEESSCCRRIIPPTTIIOONN
      kkppaasssswwdddd serves request for password changes. It listens on UDP port 464
@@ -16,9 +16,9 @@ DDEESSCCRRIIPPTTIIOONN
      Supported options:
 
      ----cchheecckk--lliibbrraarryy==_l_i_b_r_a_r_y
-             If your system has support for dynamic loading of shared
-             libraries, you can use an external function to check password
-             quality. This option specifies which library to load.
+             If your system has support for dynamic loading of shared li-
+             braries, you can use an external function to check password qual-
+             ity. This option specifies which library to load.
 
      ----cchheecckk--ffuunnccttiioonn==_f_u_n_c_t_i_o_n
              This is the function to call in the loaded library. The function
@@ -50,4 +50,4 @@ BBUUGGSS
 SSEEEE AALLSSOO
      kpasswd(1), kdc(8)
 
-HEIMDAL                         April 19, 1999                         HEIMDAL
+ HEIMDAL                        April 19, 1999                               1
diff --git a/crypto/heimdal/kuser/Makefile.in b/crypto/heimdal/kuser/Makefile.in
index 5f8a99c..89ca1b7 100644
--- a/crypto/heimdal/kuser/Makefile.in
+++ b/crypto/heimdal/kuser/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -325,7 +324,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
@@ -334,24 +334,17 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
 	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done
 
 clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 
 clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
 generate-requests$(EXEEXT): $(generate_requests_OBJECTS) $(generate_requests_DEPENDENCIES) 
 	@rm -f generate-requests$(EXEEXT)
 	$(LINK) $(generate_requests_LDFLAGS) $(generate_requests_OBJECTS) $(generate_requests_LDADD) $(LIBS)
@@ -414,10 +407,6 @@ install-man1: $(man1_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    1*) ;; \
-	    *) ext='1' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -483,7 +472,7 @@ top_distdir = ..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -533,7 +522,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/kuser/kdestroy.cat1 b/crypto/heimdal/kuser/kdestroy.cat1
index 85fbaa4..8f7247b 100644
--- a/crypto/heimdal/kuser/kdestroy.cat1
+++ b/crypto/heimdal/kuser/kdestroy.cat1
@@ -1,11 +1,11 @@
-KDESTROY(1)             FreeBSD General Commands Manual            KDESTROY(1)
+KDESTROY(1)                 NetBSD Reference Manual                KDESTROY(1)
 
 NNAAMMEE
      kkddeessttrrooyy - destroy the current ticket file
 
 SSYYNNOOPPSSIISS
      kkddeessttrrooyy [--cc _c_a_c_h_e_f_i_l_e] [----ccaacchhee==_c_a_c_h_e_f_i_l_e] [----nnoo--uunnlloogg] [----nnoo--ddeelleettee--vv44]
-              [----vveerrssiioonn] [----hheellpp]
+     [----vveerrssiioonn] [----hheellpp]
 
 DDEESSCCRRIIPPTTIIOONN
      kkddeessttrrooyy remove the current set of tickets.
@@ -26,4 +26,4 @@ DDEESSCCRRIIPPTTIIOONN
 SSEEEE AALLSSOO
      kinit(1), klist(1)
 
-HEIMDAL                         August 27, 1997                        HEIMDAL
+ HEIMDAL                        August 27, 1997                              1
diff --git a/crypto/heimdal/kuser/kgetcred.cat1 b/crypto/heimdal/kuser/kgetcred.cat1
index ea01d25..f01ed61 100644
--- a/crypto/heimdal/kuser/kgetcred.cat1
+++ b/crypto/heimdal/kuser/kgetcred.cat1
@@ -1,4 +1,4 @@
-KGETCRED(1)             FreeBSD General Commands Manual            KGETCRED(1)
+KGETCRED(1)                 NetBSD Reference Manual                KGETCRED(1)
 
 NNAAMMEE
      kkggeettccrreedd - get a ticket for a particular service
@@ -23,4 +23,4 @@ DDEESSCCRRIIPPTTIIOONN
 SSEEEE AALLSSOO
      kinit(1), klist(1)
 
-HEIMDAL                          May 14, 1999                          HEIMDAL
+ HEIMDAL                         May 14, 1999                                1
diff --git a/crypto/heimdal/kuser/kinit.1 b/crypto/heimdal/kuser/kinit.1
index f020b61..59c2e63 100644
--- a/crypto/heimdal/kuser/kinit.1
+++ b/crypto/heimdal/kuser/kinit.1
@@ -1,4 +1,4 @@
-.\" $Id: kinit.1,v 1.21 2002/09/13 14:50:27 joda Exp $
+.\" $Id: kinit.1,v 1.20 2002/08/28 16:09:36 joda Exp $
 .\"
 .Dd May 29, 1998
 .Dt KINIT 1
@@ -91,7 +91,7 @@ Get ticket that can be forwarded to another host.
 Don't ask for a password, but instead get the key from the specified
 keytab.
 .It Xo
-.Fl l Ar time ,
+.Fl l Ar time Ns ,
 .Fl -lifetime= Ns Ar time
 .Xc
 Specifies the lifetime of the ticket. The argument can either be in
diff --git a/crypto/heimdal/kuser/kinit.cat1 b/crypto/heimdal/kuser/kinit.cat1
index d30f608..c71feb2 100644
--- a/crypto/heimdal/kuser/kinit.cat1
+++ b/crypto/heimdal/kuser/kinit.cat1
@@ -1,4 +1,4 @@
-KINIT(1)                FreeBSD General Commands Manual               KINIT(1)
+KINIT(1)                    NetBSD Reference Manual                   KINIT(1)
 
 NNAAMMEE
      kkiinniitt kkaauutthh - acquire initial tickets
@@ -8,9 +8,9 @@ SSYYNNOOPPSSIISS
            ----ccaacchhee==_c_a_c_h_e_n_a_m_e] [--ff | ----ffoorrwwaarrddaabbllee] [--tt _k_e_y_t_a_b_n_a_m_e |
            ----kkeeyyttaabb==_k_e_y_t_a_b_n_a_m_e] [--ll _t_i_m_e | ----lliiffeettiimmee==_t_i_m_e] [--pp | ----pprrooxxiiaabbllee]
            [--RR | ----rreenneeww] [----rreenneewwaabbllee] [--rr _t_i_m_e | ----rreenneewwaabbllee--lliiffee==_t_i_m_e] [--SS
-           _p_r_i_n_c_i_p_a_l | ----sseerrvveerr==_p_r_i_n_c_i_p_a_l] [--ss _t_i_m_e | ----ssttaarrtt--ttiimmee==_t_i_m_e]
-           [--kk | ----uussee--kkeeyyttaabb] [--vv | ----vvaalliiddaattee] [--ee _e_n_c_t_y_p_e_s |
-           ----eennccttyyppeess==_e_n_c_t_y_p_e_s] [--aa _a_d_d_r_e_s_s_e_s | ----eexxttrraa--aaddddrreesssseess==_a_d_d_r_e_s_s_e_s]
+           _p_r_i_n_c_i_p_a_l | ----sseerrvveerr==_p_r_i_n_c_i_p_a_l] [--ss _t_i_m_e | ----ssttaarrtt--ttiimmee==_t_i_m_e] [--kk |
+           ----uussee--kkeeyyttaabb] [--vv | ----vvaalliiddaattee] [--ee _e_n_c_t_y_p_e_s | ----eennccttyyppeess==_e_n_c_t_y_p_e_s]
+           [--aa _a_d_d_r_e_s_s_e_s | ----eexxttrraa--aaddddrreesssseess==_a_d_d_r_e_s_s_e_s]
            [----ffccaacchhee--vveerrssiioonn==_i_n_t_e_g_e_r] [----nnoo--aaddddrreesssseess] [----aannoonnyymmoouuss]
            [----vveerrssiioonn] [----hheellpp] [_p_r_i_n_c_i_p_a_l [_c_o_m_m_a_n_d]]
 
@@ -74,8 +74,8 @@ DDEESSCCRRIIPPTTIIOONN
              Create a credentials cache of version vveerrssiioonn.
 
      --aa, ----eexxttrraa--aaddddrreesssseess==_e_n_c_t_y_p_e_s
-             Adds a set of addresses that will, in addition to the systems
-             local addresses, be put in the ticket. This can be useful if all
+             Adds a set of addresses that will, in addition to the systems lo-
+             cal addresses, be put in the ticket. This can be useful if all
              addresses a client can use can't be automatically figured out.
              One such example is if the client is behind a firewall. Also set-
              table via libdefaults/extra_addresses in krb5.conf(5).
@@ -124,4 +124,4 @@ EENNVVIIRROONNMMEENNTT
 SSEEEE AALLSSOO
      kdestroy(1), klist(1), krb5_appdefault(3), krb5.conf(5)
 
-HEIMDAL                          May 29, 1998                          HEIMDAL
+ HEIMDAL                         May 29, 1998                                2
diff --git a/crypto/heimdal/kuser/klist.c b/crypto/heimdal/kuser/klist.c
index 639b3fd..dbee058 100644
--- a/crypto/heimdal/kuser/klist.c
+++ b/crypto/heimdal/kuser/klist.c
@@ -34,7 +34,7 @@
 #include "kuser_locl.h"
 #include "rtbl.h"
 
-RCSID("$Id: klist.c,v 1.67 2002/08/20 09:05:18 joda Exp $");
+RCSID("$Id: klist.c,v 1.67.2.1 2002/10/21 14:31:27 joda Exp $");
 
 static char*
 printable_time(time_t t)
@@ -496,7 +496,7 @@ display_tokens(int do_verbose)
 		break;
 	    continue;
 	}
-	if(parms.out_size >= sizeof(t))
+	if(parms.out_size > sizeof(t))
 	    continue;
 	if(parms.out_size < sizeof(size_secret_tok))
 	    continue;
diff --git a/crypto/heimdal/kuser/klist.cat1 b/crypto/heimdal/kuser/klist.cat1
index b24eda7..4a2b647 100644
--- a/crypto/heimdal/kuser/klist.cat1
+++ b/crypto/heimdal/kuser/klist.cat1
@@ -1,12 +1,11 @@
-KLIST(1)                FreeBSD General Commands Manual               KLIST(1)
+KLIST(1)                    NetBSD Reference Manual                   KLIST(1)
 
 NNAAMMEE
      kklliisstt - list Kerberos credentials
 
 SSYYNNOOPPSSIISS
-     kklliisstt [--cc _c_a_c_h_e | ----ccaacchhee==_c_a_c_h_e] [--ss | --tt | ----tteesstt] [--44 | ----vv44]
-           [--TT | ----ttookkeennss] [--55 | ----vv55] [--vv | ----vveerrbboossee] [--ff] [----vveerrssiioonn]
-           [----hheellpp]
+     kklliisstt [--cc _c_a_c_h_e | ----ccaacchhee==_c_a_c_h_e] [--ss | --tt | ----tteesstt] [--44 | ----vv44] [--TT |
+     ----ttookkeennss] [--55 | ----vv55] [--vv | ----vveerrbboossee] [--ff] [----vveerrssiioonn] [----hheellpp]
 
 DDEESSCCRRIIPPTTIIOONN
      kklliisstt reads and displays the current tickets in the crential cache (also
@@ -65,8 +64,8 @@ DDEESSCCRRIIPPTTIIOONN
                          the time the authentication exchange took place
 
                    Start time
-                         the time that this tickets is valid from (only
-                         printed if it's different from the auth time)
+                         the time that this tickets is valid from (only print-
+                         ed if it's different from the auth time)
 
                    End time
                          when the ticket expires, if it has already expired
@@ -85,4 +84,4 @@ DDEESSCCRRIIPPTTIIOONN
 SSEEEE AALLSSOO
      kdestroy(1), kinit(1)
 
-HEIMDAL                          July 8, 2000                          HEIMDAL
+ HEIMDAL                         July 8, 2000                                2
diff --git a/crypto/heimdal/lib/45/Makefile.in b/crypto/heimdal/lib/45/Makefile.in
index ab71360..190945c 100644
--- a/crypto/heimdal/lib/45/Makefile.in
+++ b/crypto/heimdal/lib/45/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -349,7 +348,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -399,7 +398,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/lib/Makefile.in b/crypto/heimdal/lib/Makefile.in
index f3738c3..37a9e6e 100644
--- a/crypto/heimdal/lib/Makefile.in
+++ b/crypto/heimdal/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -353,7 +352,7 @@ top_distdir = ..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -415,7 +414,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/lib/asn1/Makefile.in b/crypto/heimdal/lib/asn1/Makefile.in
index a063c62..8871e79 100644
--- a/crypto/heimdal/lib/asn1/Makefile.in
+++ b/crypto/heimdal/lib/asn1/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -323,7 +322,7 @@ CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(lib_LTLIBRARIES)
 
 libasn1_la_DEPENDENCIES =
-am__objects_1 = asn1_APOptions.lo asn1_AP_REP.lo asn1_AP_REQ.lo \
+am__objects_6 = asn1_APOptions.lo asn1_AP_REP.lo asn1_AP_REQ.lo \
 	asn1_AS_REP.lo asn1_AS_REQ.lo asn1_Authenticator.lo \
 	asn1_AuthorizationData.lo asn1_CKSUMTYPE.lo asn1_Checksum.lo \
 	asn1_ENCTYPE.lo asn1_ETYPE_INFO.lo asn1_ETYPE_INFO_ENTRY.lo \
@@ -341,9 +340,9 @@ am__objects_1 = asn1_APOptions.lo asn1_AP_REP.lo asn1_AP_REQ.lo \
 	asn1_PrincipalName.lo asn1_Realm.lo asn1_TGS_REP.lo \
 	asn1_TGS_REQ.lo asn1_Ticket.lo asn1_TicketFlags.lo \
 	asn1_TransitedEncoding.lo asn1_UNSIGNED.lo
-am__objects_2 = $(am__objects_1) asn1_err.lo
+am__objects_5 = $(am__objects_6) asn1_err.lo
 am_libasn1_la_OBJECTS = der_get.lo der_put.lo der_free.lo der_length.lo \
-	der_copy.lo timegm.lo $(am__objects_2)
+	der_copy.lo timegm.lo $(am__objects_5)
 libasn1_la_OBJECTS = $(am_libasn1_la_OBJECTS)
 check_PROGRAMS = check-der$(EXEEXT)
 noinst_PROGRAMS = asn1_compile$(EXEEXT) asn1_print$(EXEEXT)
@@ -424,33 +423,15 @@ uninstall-libLTLIBRARIES:
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test -z "$dir" && dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
 libasn1.la: $(libasn1_la_OBJECTS) $(libasn1_la_DEPENDENCIES) 
 	$(LINK) -rpath $(libdir) $(libasn1_la_LDFLAGS) $(libasn1_la_OBJECTS) $(libasn1_la_LIBADD) $(LIBS)
 
 clean-checkPROGRAMS:
-	@list='$(check_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS)
 
 clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
 parse.h: parse.c
-	@if test ! -f $@; then \
-	  rm -f parse.c; \
-	  $(MAKE) parse.c; \
-	else :; fi
 asn1_compile$(EXEEXT): $(asn1_compile_OBJECTS) $(asn1_compile_DEPENDENCIES) 
 	@rm -f asn1_compile$(EXEEXT)
 	$(LINK) $(asn1_compile_LDFLAGS) $(asn1_compile_OBJECTS) $(asn1_compile_LDADD) $(LIBS)
@@ -625,7 +606,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -677,12 +658,12 @@ clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "lex.cparse.hparse.c$(BUILT_SOURCES)" || rm -f lex.c parse.h parse.c $(BUILT_SOURCES)
+	-test -z "parse.h$(BUILT_SOURCES)" || rm -f parse.h $(BUILT_SOURCES)
 clean: clean-am
 
 clean-am: clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
diff --git a/crypto/heimdal/lib/auth/Makefile.in b/crypto/heimdal/lib/auth/Makefile.in
index 99007e5..5a41cfd 100644
--- a/crypto/heimdal/lib/auth/Makefile.in
+++ b/crypto/heimdal/lib/auth/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -346,7 +345,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -408,7 +407,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/lib/auth/afskauthlib/Makefile.in b/crypto/heimdal/lib/auth/afskauthlib/Makefile.in
index 1e58e4d..f97a1f0 100644
--- a/crypto/heimdal/lib/auth/afskauthlib/Makefile.in
+++ b/crypto/heimdal/lib/auth/afskauthlib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -294,7 +293,7 @@ top_distdir = ../../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -345,7 +344,7 @@ clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/lib/auth/pam/Makefile.in b/crypto/heimdal/lib/auth/pam/Makefile.in
index c2872b7..e21bf7c 100644
--- a/crypto/heimdal/lib/auth/pam/Makefile.in
+++ b/crypto/heimdal/lib/auth/pam/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -301,7 +300,7 @@ top_distdir = ../../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -352,7 +351,7 @@ clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/lib/auth/sia/Makefile.in b/crypto/heimdal/lib/auth/sia/Makefile.in
index 702e573..95c2e83 100644
--- a/crypto/heimdal/lib/auth/sia/Makefile.in
+++ b/crypto/heimdal/lib/auth/sia/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -331,7 +330,7 @@ top_distdir = ../../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -382,7 +381,7 @@ clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/lib/com_err/Makefile.in b/crypto/heimdal/lib/com_err/Makefile.in
index c4a27a9..34dc1c4 100644
--- a/crypto/heimdal/lib/com_err/Makefile.in
+++ b/crypto/heimdal/lib/com_err/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -296,12 +295,6 @@ uninstall-libLTLIBRARIES:
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test -z "$dir" && dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
 libcom_err.la: $(libcom_err_la_OBJECTS) $(libcom_err_la_DEPENDENCIES) 
 	$(LINK) -rpath $(libdir) $(libcom_err_la_LDFLAGS) $(libcom_err_la_OBJECTS) $(libcom_err_la_LIBADD) $(LIBS)
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
@@ -313,7 +306,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
@@ -322,22 +316,15 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
 	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done
 
 clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 parse.h: parse.c
-	@if test ! -f $@; then \
-	  rm -f parse.c; \
-	  $(MAKE) parse.c; \
-	else :; fi
 compile_et$(EXEEXT): $(compile_et_OBJECTS) $(compile_et_DEPENDENCIES) 
 	@rm -f compile_et$(EXEEXT)
 	$(LINK) $(compile_et_LDFLAGS) $(compile_et_OBJECTS) $(compile_et_LDADD) $(LIBS)
@@ -451,7 +438,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -504,12 +491,12 @@ clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "parse.hparse.clex.c" || rm -f parse.h parse.c lex.c
+	-test -z "parse.h" || rm -f parse.h
 clean: clean-am
 
 clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
diff --git a/crypto/heimdal/lib/gssapi/Makefile.in b/crypto/heimdal/lib/gssapi/Makefile.in
index 68ac3a1..c053595 100644
--- a/crypto/heimdal/lib/gssapi/Makefile.in
+++ b/crypto/heimdal/lib/gssapi/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -321,12 +320,6 @@ uninstall-libLTLIBRARIES:
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test -z "$dir" && dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
 libgssapi.la: $(libgssapi_la_OBJECTS) $(libgssapi_la_DEPENDENCIES) 
 	$(LINK) -rpath $(libdir) $(libgssapi_la_LDFLAGS) $(libgssapi_la_OBJECTS) $(libgssapi_la_LIBADD) $(LIBS)
 
@@ -414,7 +407,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -464,7 +457,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/lib/hdb/Makefile.in b/crypto/heimdal/lib/hdb/Makefile.in
index 2a8e9e2..6581a63 100644
--- a/crypto/heimdal/lib/hdb/Makefile.in
+++ b/crypto/heimdal/lib/hdb/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -246,10 +245,10 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
 
 libhdb_la_DEPENDENCIES = ../krb5/libkrb5.la ../asn1/libasn1.la \
 	../roken/libroken.la
-am__objects_1 = asn1_Key.lo asn1_Event.lo asn1_HDBFlags.lo \
+am__objects_5 = asn1_Key.lo asn1_Event.lo asn1_HDBFlags.lo \
 	asn1_hdb_entry.lo asn1_Salt.lo hdb_err.lo asn1_GENERATION.lo
 am_libhdb_la_OBJECTS = common.lo db.lo db3.lo hdb-ldap.lo hdb.lo \
-	keytab.lo mkey.lo ndbm.lo print.lo $(am__objects_1)
+	keytab.lo mkey.lo ndbm.lo print.lo $(am__objects_5)
 libhdb_la_OBJECTS = $(am_libhdb_la_OBJECTS)
 noinst_PROGRAMS = convert_db$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
@@ -314,21 +313,11 @@ uninstall-libLTLIBRARIES:
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test -z "$dir" && dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
 libhdb.la: $(libhdb_la_OBJECTS) $(libhdb_la_DEPENDENCIES) 
 	$(LINK) -rpath $(libdir) $(libhdb_la_LDFLAGS) $(libhdb_la_OBJECTS) $(libhdb_la_LIBADD) $(LIBS)
 
 clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
 convert_db$(EXEEXT): $(convert_db_OBJECTS) $(convert_db_DEPENDENCIES) 
 	@rm -f convert_db$(EXEEXT)
 	$(LINK) $(convert_db_LDFLAGS) $(convert_db_OBJECTS) $(convert_db_LDADD) $(LIBS)
@@ -417,7 +406,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -468,7 +457,7 @@ clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/lib/kadm5/ChangeLog b/crypto/heimdal/lib/kadm5/ChangeLog
index 9c7f81c..d6fbe0d 100644
--- a/crypto/heimdal/lib/kadm5/ChangeLog
+++ b/crypto/heimdal/lib/kadm5/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-21  Johan Danielsson  <joda@pdc.kth.se>
+
+	* ipropd_slave.c: pull up 1.27; use a temporary database
+
 2002-08-26  Assar Westerlund  <assar@kth.se>
 
 	* ipropd_slave.c (receive_everything): type-correctness calling
diff --git a/crypto/heimdal/lib/kadm5/Makefile.in b/crypto/heimdal/lib/kadm5/Makefile.in
index 7ce2138..7fc233f 100644
--- a/crypto/heimdal/lib/kadm5/Makefile.in
+++ b/crypto/heimdal/lib/kadm5/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -311,21 +310,21 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
 
 libkadm5clnt_la_DEPENDENCIES = ../krb5/libkrb5.la ../hdb/libhdb.la \
 	../roken/libroken.la
-am__objects_1 = chpass_c.lo common_glue.lo create_c.lo delete_c.lo \
+am__objects_9 = chpass_c.lo common_glue.lo create_c.lo delete_c.lo \
 	destroy_c.lo flush_c.lo free.lo get_c.lo get_princs_c.lo \
 	init_c.lo kadm5_err.lo marshall.lo modify_c.lo privs_c.lo \
 	randkey_c.lo rename_c.lo send_recv.lo
-am_libkadm5clnt_la_OBJECTS = $(am__objects_1) client_glue.lo
+am_libkadm5clnt_la_OBJECTS = $(am__objects_9) client_glue.lo
 libkadm5clnt_la_OBJECTS = $(am_libkadm5clnt_la_OBJECTS)
 libkadm5srv_la_DEPENDENCIES = ../krb5/libkrb5.la ../hdb/libhdb.la \
 	../roken/libroken.la
-am__objects_2 = acl.lo bump_pw_expire.lo chpass_s.lo common_glue.lo \
+am__objects_10 = acl.lo bump_pw_expire.lo chpass_s.lo common_glue.lo \
 	context_s.lo create_s.lo delete_s.lo destroy_s.lo ent_setup.lo \
 	error.lo flush_s.lo free.lo get_princs_s.lo get_s.lo init_s.lo \
 	kadm5_err.lo keys.lo log.lo marshall.lo modify_s.lo privs_s.lo \
 	randkey_s.lo rename_s.lo set_keys.lo set_modifier.lo \
 	password_quality.lo
-am_libkadm5srv_la_OBJECTS = $(am__objects_2) server_glue.lo
+am_libkadm5srv_la_OBJECTS = $(am__objects_10) server_glue.lo
 libkadm5srv_la_OBJECTS = $(am_libkadm5srv_la_OBJECTS)
 libexec_PROGRAMS = ipropd-master$(EXEEXT) ipropd-slave$(EXEEXT)
 sbin_PROGRAMS = dump_log$(EXEEXT) replay_log$(EXEEXT) \
@@ -427,12 +426,6 @@ uninstall-libLTLIBRARIES:
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test -z "$dir" && dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
 libkadm5clnt.la: $(libkadm5clnt_la_OBJECTS) $(libkadm5clnt_la_DEPENDENCIES) 
 	$(LINK) -rpath $(libdir) $(libkadm5clnt_la_LDFLAGS) $(libkadm5clnt_la_OBJECTS) $(libkadm5clnt_la_LIBADD) $(LIBS)
 libkadm5srv.la: $(libkadm5srv_la_OBJECTS) $(libkadm5srv_la_DEPENDENCIES) 
@@ -446,7 +439,8 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f; \
 	  else :; fi; \
@@ -455,17 +449,14 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS)
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \
 	  rm -f $(DESTDIR)$(libexecdir)/$$f; \
 	done
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS)
 sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 install-sbinPROGRAMS: $(sbin_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -475,7 +466,8 @@ install-sbinPROGRAMS: $(sbin_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f; \
 	  else :; fi; \
@@ -484,17 +476,14 @@ install-sbinPROGRAMS: $(sbin_PROGRAMS)
 uninstall-sbinPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \
 	  rm -f $(DESTDIR)$(sbindir)/$$f; \
 	done
 
 clean-sbinPROGRAMS:
-	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
 dump_log$(EXEEXT): $(dump_log_OBJECTS) $(dump_log_DEPENDENCIES) 
 	@rm -f dump_log$(EXEEXT)
 	$(LINK) $(dump_log_LDFLAGS) $(dump_log_OBJECTS) $(dump_log_LDADD) $(LIBS)
@@ -595,7 +584,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -646,7 +635,7 @@ clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/lib/kadm5/ipropd_slave.c b/crypto/heimdal/lib/kadm5/ipropd_slave.c
index 98efa24..31ab429 100644
--- a/crypto/heimdal/lib/kadm5/ipropd_slave.c
+++ b/crypto/heimdal/lib/kadm5/ipropd_slave.c
@@ -33,7 +33,7 @@
 
 #include "iprop.h"
 
-RCSID("$Id: ipropd_slave.c,v 1.26 2002/08/26 13:29:37 assar Exp $");
+RCSID("$Id: ipropd_slave.c,v 1.26.2.1 2002/10/21 16:06:25 joda Exp $");
 
 static krb5_log_facility *log_facility;
 
@@ -229,9 +229,24 @@ receive_everything (krb5_context context, int fd,
     int32_t opcode;
     unsigned long tmp;
 
-    ret = server_context->db->open(context,
-				   server_context->db,
-				   O_RDWR | O_CREAT | O_TRUNC, 0600);
+    char *dbname;
+    HDB *mydb;
+  
+    asprintf(&dbname, "%s-NEW", server_context->db->name);
+    ret = hdb_create(context, &mydb, dbname);
+    if(ret)
+	krb5_err(context,1, ret, "hdb_create");
+    free(dbname);
+ 
+    ret = hdb_set_master_keyfile (context,
+				  mydb, server_context->config.stash_file);
+    if(ret)
+	krb5_err(context,1, ret, "hdb_set_master_keyfile");
+ 
+    /* I really want to use O_EXCL here, but given that I can't easily clean
+       up on error, I won't */
+    ret = mydb->open(context, mydb, O_RDWR | O_CREAT | O_TRUNC, 0600);
+
     if (ret)
 	krb5_err (context, 1, ret, "db->open");
 
@@ -255,9 +270,9 @@ receive_everything (krb5_context context, int fd,
 	    ret = hdb_value2entry (context, &fake_data, &entry);
 	    if (ret)
 		krb5_err (context, 1, ret, "hdb_value2entry");
-	    ret = server_context->db->store(server_context->context,
-					    server_context->db,
-					    0, &entry);
+	    ret = mydb->store(server_context->context,
+			      mydb,
+			      0, &entry);
 	    if (ret)
 		krb5_err (context, 1, ret, "hdb_store");
 
@@ -286,9 +301,15 @@ receive_everything (krb5_context context, int fd,
 
     krb5_data_free (&data);
 
-    ret = server_context->db->close (context, server_context->db);
+    ret = mydb->close (context, mydb);
     if (ret)
 	krb5_err (context, 1, ret, "db->close");
+    ret = mydb->rename (context, mydb, server_context->db->name);
+    if (ret)
+	krb5_err (context, 1, ret, "db->rename");
+    ret = mydb->destroy (context, mydb);
+    if (ret)
+	krb5_err (context, 1, ret, "db->destroy");
 }
 
 static char *realm;
diff --git a/crypto/heimdal/lib/kafs/Makefile.in b/crypto/heimdal/lib/kafs/Makefile.in
index da9eef0..974d44c 100644
--- a/crypto/heimdal/lib/kafs/Makefile.in
+++ b/crypto/heimdal/lib/kafs/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -269,16 +268,16 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
 @KRB4_TRUE@@KRB5_TRUE@libkafs_la_DEPENDENCIES = ../krb5/libkrb5.la \
 @KRB4_TRUE@@KRB5_TRUE@	../roken/libroken.la
 @KRB4_TRUE@@KRB5_FALSE@libkafs_la_DEPENDENCIES = ../roken/libroken.la
-@KRB5_TRUE@am__objects_1 = afskrb5.lo
-@AIX_DYNAMIC_AFS_FALSE@@AIX_TRUE@@KRB4_TRUE@am__objects_2 = afslib.lo
-@AIX_DYNAMIC_AFS_TRUE@@AIX_TRUE@@HAVE_DLOPEN_FALSE@@KRB4_TRUE@am__objects_2 = \
+@KRB5_TRUE@am__objects_11 = afskrb5.lo
+@AIX_DYNAMIC_AFS_FALSE@@AIX_TRUE@@KRB4_TRUE@am__objects_12 = afslib.lo
+@AIX_DYNAMIC_AFS_TRUE@@AIX_TRUE@@HAVE_DLOPEN_FALSE@@KRB4_TRUE@am__objects_12 = \
 @AIX_DYNAMIC_AFS_TRUE@@AIX_TRUE@@HAVE_DLOPEN_FALSE@@KRB4_TRUE@	dlfcn.lo
-@AIX_DYNAMIC_AFS_TRUE@@AIX_TRUE@@HAVE_DLOPEN_TRUE@@KRB4_TRUE@am__objects_2 =
-@AIX_FALSE@@KRB4_TRUE@am__objects_2 =
-@do_roken_rename_TRUE@am__objects_3 = resolve.lo strtok_r.lo strlcpy.lo \
+@AIX_DYNAMIC_AFS_TRUE@@AIX_TRUE@@HAVE_DLOPEN_TRUE@@KRB4_TRUE@am__objects_12 =
+@AIX_FALSE@@KRB4_TRUE@am__objects_12 =
+@do_roken_rename_TRUE@am__objects_13 = resolve.lo strtok_r.lo strlcpy.lo \
 @do_roken_rename_TRUE@	strsep.lo
-am_libkafs_la_OBJECTS = afssys.lo afskrb.lo $(am__objects_1) common.lo \
-	$(am__objects_2) $(am__objects_3)
+am_libkafs_la_OBJECTS = afssys.lo afskrb.lo $(am__objects_11) common.lo \
+	$(am__objects_12) $(am__objects_13)
 libkafs_la_OBJECTS = $(am_libkafs_la_OBJECTS)
 
 DEFS = @DEFS@
@@ -336,12 +335,6 @@ uninstall-libLTLIBRARIES:
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test -z "$dir" && dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
 libkafs.la: $(libkafs_la_OBJECTS) $(libkafs_la_DEPENDENCIES) 
 	$(LINK) -rpath $(libdir) $(libkafs_la_LDFLAGS) $(libkafs_la_OBJECTS) $(libkafs_la_LIBADD) $(LIBS)
 
@@ -385,10 +378,6 @@ install-man3: $(man3_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    3*) ;; \
-	    *) ext='3' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -490,7 +479,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -541,7 +530,7 @@ clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/lib/kafs/kafs.cat3 b/crypto/heimdal/lib/kafs/kafs.cat3
index df2e078..ecab780 100644
--- a/crypto/heimdal/lib/kafs/kafs.cat3
+++ b/crypto/heimdal/lib/kafs/kafs.cat3
@@ -1,4 +1,4 @@
-KAFS(3)                FreeBSD Library Functions Manual                KAFS(3)
+KAFS(3)                   NetBSD Programmer's Manual                   KAFS(3)
 
 NNAAMMEE
      kk__hhaassaaffss, kk__ppiiooccttll, kk__uunnlloogg, kk__sseettppaagg, kk__aaffss__cceellll__ooff__ffiillee, kkrrbb__aaffsslloogg,
@@ -56,10 +56,10 @@ DDEESSCCRRIIPPTTIIOONN
 
 RREETTUURRNN VVAALLUUEESS
      kk__hhaassaaffss() returns 1 if AFS is present in the kernel, 0 otherwise.
-     kkrrbb__aaffsslloogg() and kkrrbb__aaffsslloogg__uuiidd() returns 0 on success, or a kerberos
-     error number on failure.  kk__aaffss__cceellll__ooff__ffiillee(), kk__ppiiooccttll(), kk__sseettppaagg(),
-     and kk__uunnlloogg() all return the value of the underlaying system call, 0 on
-     success.
+     kkrrbb__aaffsslloogg() and kkrrbb__aaffsslloogg__uuiidd() returns 0 on success, or a kerberos er-
+     ror number on failure.  kk__aaffss__cceellll__ooff__ffiillee(), kk__ppiiooccttll(), kk__sseettppaagg(), and
+     kk__uunnlloogg() all return the value of the underlaying system call, 0 on suc-
+     cess.
 
 EENNVVIIRROONNMMEENNTT
      The following environment variable affect the mode of operation of kkaaffss:
@@ -94,4 +94,4 @@ SSEEEE AALLSSOO
 BBUUGGSS
      AFS_SYSCALL has no effect under AIX.
 
-KTH-KRB                           May 7, 1997                          KTH-KRB
+ KTH-KRB                          May 7, 1997                                2
diff --git a/crypto/heimdal/lib/krb5/Makefile.am b/crypto/heimdal/lib/krb5/Makefile.am
index ae75808..6332935 100644
--- a/crypto/heimdal/lib/krb5/Makefile.am
+++ b/crypto/heimdal/lib/krb5/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.147 2002/09/03 14:45:13 joda Exp $
+# $Id: Makefile.am,v 1.147.2.1 2002/10/21 15:03:14 joda Exp $
 
 include $(top_srcdir)/Makefile.am.common
 
@@ -130,7 +130,7 @@ libkrb5_la_SOURCES =				\
 	write_message.c				\
 	$(ERR_FILES)
 
-libkrb5_la_LDFLAGS = -version-info 18:3:1
+libkrb5_la_LDFLAGS = -version-info 18:4:1
 
 $(libkrb5_la_OBJECTS): $(srcdir)/krb5-protos.h $(srcdir)/krb5-private.h
 
diff --git a/crypto/heimdal/lib/krb5/Makefile.in b/crypto/heimdal/lib/krb5/Makefile.in
index 80ce39f..4613c46 100644
--- a/crypto/heimdal/lib/krb5/Makefile.in
+++ b/crypto/heimdal/lib/krb5/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.am,v 1.147 2002/09/03 14:45:13 joda Exp $
+# $Id: Makefile.am,v 1.147.2.1 2002/10/21 15:03:14 joda Exp $
 
 # $Id: Makefile.am.common,v 1.5 2002/05/19 18:35:37 joda Exp $
 
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -332,7 +331,7 @@ libkrb5_la_SOURCES = \
 	$(ERR_FILES)
 
 
-libkrb5_la_LDFLAGS = -version-info 18:3:1
+libkrb5_la_LDFLAGS = -version-info 18:4:1
 
 
 #libkrb5_la_LIBADD = ../com_err/error.lo ../com_err/com_err.lo
@@ -378,7 +377,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
 
 libkrb5_la_DEPENDENCIES = ../com_err/error.lo ../com_err/com_err.lo \
 	$(top_builddir)/lib/asn1/libasn1.la
-am__objects_1 = krb5_err.lo heim_err.lo k524_err.lo
+am__objects_14 = krb5_err.lo heim_err.lo k524_err.lo
 am_libkrb5_la_OBJECTS = acl.lo add_et_list.lo addr_families.lo \
 	aname_to_localname.lo appdefault.lo asn1_glue.lo \
 	auth_context.lo build_ap_req.lo build_auth.lo cache.lo \
@@ -402,7 +401,7 @@ am_libkrb5_la_OBJECTS = acl.lo add_et_list.lo addr_families.lo \
 	sendauth.lo set_default_realm.lo sock_principal.lo store.lo \
 	store_emem.lo store_fd.lo store_mem.lo ticket.lo time.lo \
 	transited.lo verify_init.lo verify_user.lo version.lo warn.lo \
-	write_message.lo $(am__objects_1)
+	write_message.lo $(am__objects_14)
 libkrb5_la_OBJECTS = $(am_libkrb5_la_OBJECTS)
 bin_PROGRAMS = verify_krb5_conf$(EXEEXT)
 check_PROGRAMS = n-fold-test$(EXEEXT) string-to-key-test$(EXEEXT) \
@@ -528,12 +527,6 @@ uninstall-libLTLIBRARIES:
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test -z "$dir" && dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
 libkrb5.la: $(libkrb5_la_OBJECTS) $(libkrb5_la_DEPENDENCIES) 
 	$(LINK) -rpath $(libdir) $(libkrb5_la_LDFLAGS) $(libkrb5_la_OBJECTS) $(libkrb5_la_LIBADD) $(LIBS)
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
@@ -545,7 +538,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
@@ -554,31 +548,20 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
 	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done
 
 clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 
 clean-checkPROGRAMS:
-	@list='$(check_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS)
 
 clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
 derived-key-test$(EXEEXT): $(derived_key_test_OBJECTS) $(derived_key_test_DEPENDENCIES) 
 	@rm -f derived-key-test$(EXEEXT)
 	$(LINK) $(derived_key_test_LDFLAGS) $(derived_key_test_OBJECTS) $(derived_key_test_LDADD) $(LIBS)
@@ -650,10 +633,6 @@ install-man3: $(man3_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    3*) ;; \
-	    *) ext='3' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -693,10 +672,6 @@ install-man5: $(man5_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    5*) ;; \
-	    *) ext='5' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -736,10 +711,6 @@ install-man8: $(man8_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    8*) ;; \
-	    *) ext='8' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -878,7 +849,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -932,7 +903,7 @@ clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/lib/krb5/changepw.c b/crypto/heimdal/lib/krb5/changepw.c
index a17bf2b..0dcce13 100644
--- a/crypto/heimdal/lib/krb5/changepw.c
+++ b/crypto/heimdal/lib/krb5/changepw.c
@@ -33,7 +33,7 @@
 
 #include <krb5_locl.h>
 
-RCSID("$Id: changepw.c,v 1.38 2002/09/29 11:48:34 joda Exp $");
+RCSID("$Id: changepw.c,v 1.37.2.1 2002/10/21 14:31:58 joda Exp $");
 
 static krb5_error_code
 send_request (krb5_context context,
diff --git a/crypto/heimdal/lib/krb5/context.c b/crypto/heimdal/lib/krb5/context.c
index 75fe347..096aff2 100644
--- a/crypto/heimdal/lib/krb5/context.c
+++ b/crypto/heimdal/lib/krb5/context.c
@@ -34,7 +34,7 @@
 #include "krb5_locl.h"
 #include <com_err.h>
 
-RCSID("$Id: context.c,v 1.81 2002/09/02 17:03:12 joda Exp $");
+RCSID("$Id: context.c,v 1.81.2.1 2002/10/21 14:33:34 joda Exp $");
 
 #define INIT_FIELD(C, T, E, D, F)					\
     (C)->E = krb5_config_get_ ## T ## _default ((C), NULL, (D), 	\
@@ -259,7 +259,7 @@ krb5_set_config_files(krb5_context context, char **filenames)
     /* with this enabled and if there are no config files, Kerberos is
        considererd disabled */
     if(tmp == NULL)
-	return ENOENT;
+	return ENXIO;
 #endif
     krb5_config_file_free(context, context->cf);
     context->cf = tmp;
diff --git a/crypto/heimdal/lib/krb5/keytab_any.c b/crypto/heimdal/lib/krb5/keytab_any.c
index 268c8df..fe14d62 100644
--- a/crypto/heimdal/lib/krb5/keytab_any.c
+++ b/crypto/heimdal/lib/krb5/keytab_any.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2002 Kungliga Tekniska Högskolan
+ * Copyright (c) 2001-2002 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -33,7 +33,7 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id: keytab_any.c,v 1.6 2002/04/18 14:02:11 joda Exp $");
+RCSID("$Id: keytab_any.c,v 1.6.4.1 2002/10/21 16:07:00 joda Exp $");
 
 struct any_data {
     krb5_keytab kt;
@@ -42,13 +42,15 @@ struct any_data {
 };
 
 static void
-free_list (struct any_data *a)
+free_list (krb5_context context, struct any_data *a)
 {
     struct any_data *next;
 
     for (; a != NULL; a = next) {
 	next = a->next;
 	free (a->name);
+	if(a->kt)
+	    krb5_kt_close(context, a->kt);
 	free (a);
     }
 }
@@ -91,7 +93,7 @@ any_resolve(krb5_context context, const char *name, krb5_keytab id)
     id->data = a0;
     return 0;
  fail:
-    free_list (a0);
+    free_list (context, a0);
     return ret;
 }
 
@@ -112,7 +114,7 @@ any_close (krb5_context context,
 {
     struct any_data *a = id->data;
 
-    free_list (a);
+    free_list (context, a);
     return 0;
 }
 
diff --git a/crypto/heimdal/lib/krb5/keytab_file.c b/crypto/heimdal/lib/krb5/keytab_file.c
index 7655af5..e9d9fd8 100644
--- a/crypto/heimdal/lib/krb5/keytab_file.c
+++ b/crypto/heimdal/lib/krb5/keytab_file.c
@@ -33,7 +33,7 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id: keytab_file.c,v 1.11 2002/05/28 12:57:27 joda Exp $");
+RCSID("$Id: keytab_file.c,v 1.11.4.1 2002/10/21 14:35:47 joda Exp $");
 
 #define KRB5_KT_VNO_1 1
 #define KRB5_KT_VNO_2 2
@@ -303,7 +303,7 @@ fkt_start_seq_get_int(krb5_context context,
     c->fd = open (d->filename, flags);
     if (c->fd < 0) {
 	ret = errno;
-	krb5_set_error_string(context, "open(%s): %s", d->filename,
+	krb5_set_error_string(context, "%s: %s", d->filename,
 			      strerror(ret));
 	return ret;
     }
@@ -441,7 +441,7 @@ fkt_add_entry(krb5_context context,
     
     fd = open (d->filename, O_RDWR | O_BINARY);
     if (fd < 0) {
-	fd = open (d->filename, O_RDWR | O_CREAT | O_BINARY, 0600);
+	fd = open (d->filename, O_RDWR | O_CREAT | O_EXCL | O_BINARY, 0600);
 	if (fd < 0) {
 	    ret = errno;
 	    krb5_set_error_string(context, "open(%s): %s", d->filename,
@@ -572,8 +572,11 @@ fkt_remove_entry(krb5_context context,
     krb5_kt_cursor cursor;
     off_t pos_start, pos_end;
     int found = 0;
+    krb5_error_code ret;
     
-    fkt_start_seq_get_int(context, id, O_RDWR | O_BINARY, &cursor);
+    ret = fkt_start_seq_get_int(context, id, O_RDWR | O_BINARY, &cursor);
+    if(ret != 0) 
+	goto out; /* return other error here? */
     while(fkt_next_entry_int(context, id, &e, &cursor, 
 			     &pos_start, &pos_end) == 0) {
 	if(krb5_kt_compare(context, &e, entry->principal, 
@@ -592,6 +595,7 @@ fkt_remove_entry(krb5_context context,
 	}
     }
     krb5_kt_end_seq_get(context, id, &cursor);
+  out:
     if (!found) {
 	krb5_clear_error_string (context);
 	return KRB5_KT_NOTFOUND;
diff --git a/crypto/heimdal/lib/krb5/keytab_keyfile.c b/crypto/heimdal/lib/krb5/keytab_keyfile.c
index e4c4eb6..7bfc59c 100644
--- a/crypto/heimdal/lib/krb5/keytab_keyfile.c
+++ b/crypto/heimdal/lib/krb5/keytab_keyfile.c
@@ -33,7 +33,7 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id: keytab_keyfile.c,v 1.14 2002/09/09 14:22:26 nectar Exp $");
+RCSID("$Id: keytab_keyfile.c,v 1.14.2.1 2002/10/21 16:07:26 joda Exp $");
 
 /* afs keyfile operations --------------------------------------- */
 
@@ -82,8 +82,7 @@ get_cell_and_realm (krb5_context context,
 	krb5_set_error_string (context, "no cell in %s", AFS_SERVERTHISCELL);
 	return EINVAL;
     }
-    if (buf[strlen(buf) - 1] == '\n')
-	buf[strlen(buf) - 1] = '\0';
+    buf[strcspn(buf, "\n")] = '\0';
     fclose(f);
 
     d->cell = strdup (buf);
@@ -100,8 +99,7 @@ get_cell_and_realm (krb5_context context,
 				   AFS_SERVERMAGICKRBCONF);
 	    return EINVAL;
 	}
-	if (buf[strlen(buf)-1] == '\n')
-	    buf[strlen(buf)-1] = '\0';
+	buf[strcspn(buf, "\n")] = '\0';
 	fclose(f);
     }
     /* uppercase */
diff --git a/crypto/heimdal/lib/krb5/krb5_appdefault.3 b/crypto/heimdal/lib/krb5/krb5_appdefault.3
index f82ec7a..750bb75 100644
--- a/crypto/heimdal/lib/krb5/krb5_appdefault.3
+++ b/crypto/heimdal/lib/krb5/krb5_appdefault.3
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2000 Kungliga Tekniska Högskolan
-.\" $Id: krb5_appdefault.3,v 1.8 2002/09/13 14:49:31 joda Exp $
+.\" $Id: krb5_appdefault.3,v 1.7 2002/08/28 15:30:46 joda Exp $
 .Dd July 25, 2000
 .Dt KRB5_APPDEFAULT 3
 .Os HEIMDAL
@@ -19,7 +19,7 @@ Kerberos 5 Library (libkrb5, -lkrb5)
 .Ft void
 .Fn krb5_appdefault_time "krb5_context context" "const char *appname" "krb5_realm realm" "const char *option" "time_t def_val" "time_t *ret_val"
 .Sh DESCRIPTION
-These functions get application defaults from the
+These functions get application application defaults from the
 .Dv appdefaults
 section of the
 .Xr krb5.conf 5
diff --git a/crypto/heimdal/lib/krb5/kuserok.c b/crypto/heimdal/lib/krb5/kuserok.c
index 17770c1..95123699 100644
--- a/crypto/heimdal/lib/krb5/kuserok.c
+++ b/crypto/heimdal/lib/krb5/kuserok.c
@@ -33,7 +33,7 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id: kuserok.c,v 1.6 2002/09/16 17:32:11 nectar Exp $");
+RCSID("$Id: kuserok.c,v 1.5.12.1 2002/10/21 14:37:55 joda Exp $");
 
 /*
  * Return TRUE iff `principal' is allowed to login as `luser'.
diff --git a/crypto/heimdal/lib/krb5/principal.c b/crypto/heimdal/lib/krb5/principal.c
index c5289ce..400ce38 100644
--- a/crypto/heimdal/lib/krb5/principal.c
+++ b/crypto/heimdal/lib/krb5/principal.c
@@ -41,7 +41,7 @@
 #include <fnmatch.h>
 #include "resolve.h"
 
-RCSID("$Id: principal.c,v 1.81 2002/08/26 13:31:40 assar Exp $");
+RCSID("$Id: principal.c,v 1.81.2.1 2002/10/21 16:08:25 joda Exp $");
 
 #define princ_num_comp(P) ((P)->name.name_string.len)
 #define princ_type(P) ((P)->name.name_type)
@@ -140,6 +140,12 @@ krb5_parse_name(krb5_context context,
 		c = '\b';
 	    else if(c == '0')
 		c = '\0';
+	    else if(c == '\0') {
+		krb5_set_error_string (context,
+				       "trailing \\ in principal name");
+		ret = KRB5_PARSE_MALFORMED;
+		goto exit;
+	    }
 	}else if(c == '/' || c == '@'){
 	    if(got_realm){
 		krb5_set_error_string (context,
diff --git a/crypto/heimdal/lib/krb5/prompter_posix.c b/crypto/heimdal/lib/krb5/prompter_posix.c
index 4aea3a4..c6cc715 100644
--- a/crypto/heimdal/lib/krb5/prompter_posix.c
+++ b/crypto/heimdal/lib/krb5/prompter_posix.c
@@ -33,7 +33,7 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id: prompter_posix.c,v 1.7 2002/09/16 17:32:11 nectar Exp $");
+RCSID("$Id: prompter_posix.c,v 1.6.6.1 2002/10/21 14:47:42 joda Exp $");
 
 int
 krb5_prompter_posix (krb5_context context,
diff --git a/crypto/heimdal/lib/krb5/store_emem.c b/crypto/heimdal/lib/krb5/store_emem.c
index 337a81c..47ca1c8 100644
--- a/crypto/heimdal/lib/krb5/store_emem.c
+++ b/crypto/heimdal/lib/krb5/store_emem.c
@@ -34,7 +34,7 @@
 #include "krb5_locl.h"
 #include "store-int.h"
 
-RCSID("$Id: store_emem.c,v 1.12 2002/04/18 14:00:34 joda Exp $");
+RCSID("$Id: store_emem.c,v 1.12.4.1 2002/10/21 16:08:55 joda Exp $");
 
 typedef struct emem_storage{
     unsigned char *base;
@@ -61,8 +61,10 @@ emem_store(krb5_storage *sp, const void *data, size_t size)
     if(size > s->base + s->size - s->ptr){
 	void *base;
 	size_t sz, off;
-	sz = 2 * (size + (s->ptr - s->base)); /* XXX */
 	off = s->ptr - s->base;
+	sz = off + size;
+	if (sz < 4096)
+	    sz *= 2;
 	base = realloc(s->base, sz);
 	if(base == NULL)
 	    return 0;
diff --git a/crypto/heimdal/lib/roken/ChangeLog b/crypto/heimdal/lib/roken/ChangeLog
index 6097a89..93cce29 100644
--- a/crypto/heimdal/lib/roken/ChangeLog
+++ b/crypto/heimdal/lib/roken/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-21  Johan Danielsson  <joda@pdc.kth.se>
+
+	* resolve.c: pull up 1.37; check length of txt records
+
 2002-09-10  Johan Danielsson  <joda@pdc.kth.se>
 
 	* roken.awk: include config.h before stdio.h (breaks with
diff --git a/crypto/heimdal/lib/roken/Makefile.am b/crypto/heimdal/lib/roken/Makefile.am
index a1dc45d..7b3aa0a6 100644
--- a/crypto/heimdal/lib/roken/Makefile.am
+++ b/crypto/heimdal/lib/roken/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.122 2002/09/09 19:17:01 joda Exp $
+# $Id: Makefile.am,v 1.122.4.1 2002/10/21 15:03:04 joda Exp $
 
 include $(top_srcdir)/Makefile.am.common
 
@@ -7,7 +7,7 @@ ACLOCAL_AMFLAGS = -I ../../cf
 CLEANFILES = roken.h make-roken.c $(XHEADERS)
 
 lib_LTLIBRARIES = libroken.la
-libroken_la_LDFLAGS = -version-info 16:0:0
+libroken_la_LDFLAGS = -version-info 16:1:0
 
 noinst_PROGRAMS = make-roken snprintf-test
 
diff --git a/crypto/heimdal/lib/roken/Makefile.in b/crypto/heimdal/lib/roken/Makefile.in
index 730821f..fe8bb61 100644
--- a/crypto/heimdal/lib/roken/Makefile.in
+++ b/crypto/heimdal/lib/roken/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.am,v 1.122 2002/09/09 19:17:01 joda Exp $
+# $Id: Makefile.am,v 1.122.4.1 2002/10/21 15:03:04 joda Exp $
 
 # $Id: Makefile.am.common,v 1.5 2002/05/19 18:35:37 joda Exp $
 
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -207,7 +206,7 @@ ACLOCAL_AMFLAGS = -I ../../cf
 CLEANFILES = roken.h make-roken.c $(XHEADERS)
 
 lib_LTLIBRARIES = libroken.la
-libroken_la_LDFLAGS = -version-info 16:0:0
+libroken_la_LDFLAGS = -version-info 16:1:0
 
 noinst_PROGRAMS = make-roken snprintf-test
 
@@ -525,21 +524,9 @@ uninstall-libLTLIBRARIES:
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test -z "$dir" && dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test -z "$dir" && dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
 libroken.la: $(libroken_la_OBJECTS) $(libroken_la_DEPENDENCIES) 
 	$(LINK) -rpath $(libdir) $(libroken_la_LDFLAGS) $(libroken_la_OBJECTS) $(libroken_la_LIBADD) $(LIBS)
 libtest_la-strftime.lo: strftime.c
@@ -549,18 +536,10 @@ libtest.la: $(libtest_la_OBJECTS) $(libtest_la_DEPENDENCIES)
 	$(LINK)  $(libtest_la_LDFLAGS) $(libtest_la_OBJECTS) $(libtest_la_LIBADD) $(LIBS)
 
 clean-checkPROGRAMS:
-	@list='$(check_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS)
 
 clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
 base64-test$(EXEEXT): $(base64_test_OBJECTS) $(base64_test_DEPENDENCIES) 
 	@rm -f base64-test$(EXEEXT)
 	$(LINK) $(base64_test_LDFLAGS) $(base64_test_OBJECTS) $(base64_test_LDADD) $(LIBS)
@@ -680,10 +659,6 @@ install-man3: $(man3_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    3*) ;; \
-	    *) ext='3' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -840,7 +815,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -892,7 +867,7 @@ clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/lib/roken/resolve.c b/crypto/heimdal/lib/roken/resolve.c
index ac380d7..ddecb98 100644
--- a/crypto/heimdal/lib/roken/resolve.c
+++ b/crypto/heimdal/lib/roken/resolve.c
@@ -45,7 +45,7 @@
 
 #include <assert.h>
 
-RCSID("$Id: resolve.c,v 1.36 2002/09/09 21:39:19 joda Exp $");
+RCSID("$Id: resolve.c,v 1.36.4.1 2002/10/21 14:48:15 joda Exp $");
 
 #undef HAVE_RES_NSEARCH
 #if (defined(HAVE_RES_SEARCH) || defined(HAVE_RES_NSEARCH)) && defined(HAVE_DN_EXPAND)
@@ -111,6 +111,221 @@ dns_free_data(struct dns_reply *r)
     free (r);
 }
 
+static int
+parse_record(const unsigned char *data, const unsigned char *end_data, 
+	     const unsigned char **pp, struct resource_record **rr)
+{
+    int type, class, ttl, size;
+    int status;
+    char host[MAXDNAME];
+    const unsigned char *p = *pp;
+    status = dn_expand(data, end_data, p, host, sizeof(host));
+    if(status < 0) 
+	return -1;
+    if (p + status + 10 > end_data)
+	return -1;
+    p += status;
+    type = (p[0] << 8) | p[1];
+    p += 2;
+    class = (p[0] << 8) | p[1];
+    p += 2;
+    ttl = (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3];
+    p += 4;
+    size = (p[0] << 8) | p[1];
+    p += 2;
+
+    if (p + size > end_data)
+	return -1;
+
+    *rr = calloc(1, sizeof(**rr));
+    if(*rr == NULL) 
+	return -1;
+    (*rr)->domain = strdup(host);
+    if((*rr)->domain == NULL) {
+	free(*rr);
+	return -1;
+    }
+    (*rr)->type = type;
+    (*rr)->class = class;
+    (*rr)->ttl = ttl;
+    (*rr)->size = size;
+    switch(type){
+    case T_NS:
+    case T_CNAME:
+    case T_PTR:
+	status = dn_expand(data, end_data, p, host, sizeof(host));
+	if(status < 0) {
+	    free(*rr);
+	    return -1;
+	}
+	(*rr)->u.txt = strdup(host);
+	if((*rr)->u.txt == NULL) {
+	    free(*rr);
+	    return -1;
+	}
+	break;
+    case T_MX:
+    case T_AFSDB:{
+	status = dn_expand(data, end_data, p + 2, host, sizeof(host));
+	if(status < 0){
+	    free(*rr);
+	    return -1;
+	}
+	if (status + 2 > size) {
+	    free(*rr);
+	    return -1;
+	}
+
+	(*rr)->u.mx = (struct mx_record*)malloc(sizeof(struct mx_record) + 
+						strlen(host));
+	if((*rr)->u.mx == NULL) {
+	    free(*rr);
+	    return -1;
+	}
+	(*rr)->u.mx->preference = (p[0] << 8) | p[1];
+	strcpy((*rr)->u.mx->domain, host);
+	break;
+    }
+    case T_SRV:{
+	status = dn_expand(data, end_data, p + 6, host, sizeof(host));
+	if(status < 0){
+	    free(*rr);
+	    return -1;
+	}
+	if (status + 6 > size) {
+	    free(*rr);
+	    return -1;
+	}
+
+	(*rr)->u.srv = 
+	    (struct srv_record*)malloc(sizeof(struct srv_record) + 
+				       strlen(host));
+	if((*rr)->u.srv == NULL) {
+	    free(*rr);
+	    return -1;
+	}
+	(*rr)->u.srv->priority = (p[0] << 8) | p[1];
+	(*rr)->u.srv->weight = (p[2] << 8) | p[3];
+	(*rr)->u.srv->port = (p[4] << 8) | p[5];
+	strcpy((*rr)->u.srv->target, host);
+	break;
+    }
+    case T_TXT:{
+	if(size == 0 || size < *p + 1) {
+	    free(*rr);
+	    return -1;
+	}
+	(*rr)->u.txt = (char*)malloc(*p + 1);
+	if((*rr)->u.txt == NULL) {
+	    free(*rr);
+	    return -1;
+	}
+	strncpy((*rr)->u.txt, (char*)p + 1, *p);
+	(*rr)->u.txt[*p] = '\0';
+	break;
+    }
+    case T_KEY : {
+	size_t key_len;
+
+	if (size < 4) {
+	    free(*rr);
+	    return -1;
+	}
+
+	key_len = size - 4;
+	(*rr)->u.key = malloc (sizeof(*(*rr)->u.key) + key_len - 1);
+	if ((*rr)->u.key == NULL) {
+	    free(*rr);
+	    return -1;
+	}
+
+	(*rr)->u.key->flags     = (p[0] << 8) | p[1];
+	(*rr)->u.key->protocol  = p[2];
+	(*rr)->u.key->algorithm = p[3];
+	(*rr)->u.key->key_len   = key_len;
+	memcpy ((*rr)->u.key->key_data, p + 4, key_len);
+	break;
+    }
+    case T_SIG : {
+	size_t sig_len;
+
+	if(size <= 18) {
+	    free(*rr);
+	    return -1;
+	}
+	status = dn_expand (data, end_data, p + 18, host, sizeof(host));
+	if (status < 0) {
+	    free(*rr);
+	    return -1;
+	}
+	if (status + 18 > size) {
+	    free(*rr);
+	    return -1;
+	}
+
+	/* the signer name is placed after the sig_data, to make it
+           easy to free this struture; the size calculation below
+           includes the zero-termination if the structure itself.
+	   don't you just love C?
+	*/
+	sig_len = size - 18 - status;
+	(*rr)->u.sig = malloc(sizeof(*(*rr)->u.sig)
+			      + strlen(host) + sig_len);
+	if ((*rr)->u.sig == NULL) {
+	    free(*rr);
+	    return -1;
+	}
+	(*rr)->u.sig->type           = (p[0] << 8) | p[1];
+	(*rr)->u.sig->algorithm      = p[2];
+	(*rr)->u.sig->labels         = p[3];
+	(*rr)->u.sig->orig_ttl       = (p[4] << 24) | (p[5] << 16)
+	    | (p[6] << 8) | p[7];
+	(*rr)->u.sig->sig_expiration = (p[8] << 24) | (p[9] << 16)
+	    | (p[10] << 8) | p[11];
+	(*rr)->u.sig->sig_inception  = (p[12] << 24) | (p[13] << 16)
+	    | (p[14] << 8) | p[15];
+	(*rr)->u.sig->key_tag        = (p[16] << 8) | p[17];
+	(*rr)->u.sig->sig_len        = sig_len;
+	memcpy ((*rr)->u.sig->sig_data, p + 18 + status, sig_len);
+	(*rr)->u.sig->signer         = &(*rr)->u.sig->sig_data[sig_len];
+	strcpy((*rr)->u.sig->signer, host);
+	break;
+    }
+
+    case T_CERT : {
+	size_t cert_len;
+
+	if (size < 5) {
+	    free(*rr);
+	    return -1;
+	}
+
+	cert_len = size - 5;
+	(*rr)->u.cert = malloc (sizeof(*(*rr)->u.cert) + cert_len - 1);
+	if ((*rr)->u.cert == NULL) {
+	    free(*rr);
+	    return -1;
+	}
+
+	(*rr)->u.cert->type      = (p[0] << 8) | p[1];
+	(*rr)->u.cert->tag       = (p[2] << 8) | p[3];
+	(*rr)->u.cert->algorithm = p[4];
+	(*rr)->u.cert->cert_len  = cert_len;
+	memcpy ((*rr)->u.cert->cert_data, p + 5, cert_len);
+	break;
+    }
+    default:
+	(*rr)->u.data = (unsigned char*)malloc(size);
+	if(size != 0 && (*rr)->u.data == NULL) {
+	    free(*rr);
+	    return -1;
+	}
+	memcpy((*rr)->u.data, p, size);
+    }
+    *pp = p + size;
+    return 0;
+}
+
 #ifndef TEST_RESOLVE
 static
 #endif
@@ -118,8 +333,9 @@ struct dns_reply*
 parse_reply(const unsigned char *data, size_t len)
 {
     const unsigned char *p;
-    char host[128];
     int status;
+    int i;
+    char host[MAXDNAME];
     const unsigned char *end_data = data + len;
     struct dns_reply *r;
     struct resource_record **rr;
@@ -137,6 +353,10 @@ parse_reply(const unsigned char *data, size_t len)
     memcpy(&r->h, p, 12); /* XXX this will probably be mostly garbage */
     p += 12;
 #endif
+    if(ntohs(r->h.qdcount) != 1) {
+	free(r);
+	return NULL;
+    }
     status = dn_expand(data, end_data, p, host, sizeof(host));
     if(status < 0){
 	dns_free_data(r);
@@ -156,209 +376,27 @@ parse_reply(const unsigned char *data, size_t len)
     p += 2;
     r->q.class = (p[0] << 8 | p[1]);
     p += 2;
+    
     rr = &r->head;
-    while(p < end_data){
-	int type, class, ttl, size;
-	status = dn_expand(data, end_data, p, host, sizeof(host));
-	if(status < 0){
+    for(i = 0; i < ntohs(r->h.ancount); i++) {
+	if(parse_record(data, end_data, &p, rr) != 0) {
 	    dns_free_data(r);
 	    return NULL;
 	}
-	if (p + status + 10 > end_data) {
-	    dns_free_data(r);
-	    return NULL;
-	}
-	p += status;
-	type = (p[0] << 8) | p[1];
-	p += 2;
-	class = (p[0] << 8) | p[1];
-	p += 2;
-	ttl = (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3];
-	p += 4;
-	size = (p[0] << 8) | p[1];
-	p += 2;
-
-	if (p + size > end_data) {
-	    dns_free_data(r);
-	    return NULL;
-	}
-
-	*rr = (struct resource_record*)calloc(1, 
-					      sizeof(struct resource_record));
-	if(*rr == NULL) {
+	rr = &(*rr)->next;
+    }
+    for(i = 0; i < ntohs(r->h.nscount); i++) {
+	if(parse_record(data, end_data, &p, rr) != 0) {
 	    dns_free_data(r);
 	    return NULL;
 	}
-	(*rr)->domain = strdup(host);
-	if((*rr)->domain == NULL) {
+	rr = &(*rr)->next;
+    }
+    for(i = 0; i < ntohs(r->h.arcount); i++) {
+	if(parse_record(data, end_data, &p, rr) != 0) {
 	    dns_free_data(r);
 	    return NULL;
 	}
-	(*rr)->type = type;
-	(*rr)->class = class;
-	(*rr)->ttl = ttl;
-	(*rr)->size = size;
-	switch(type){
-	case T_NS:
-	case T_CNAME:
-	case T_PTR:
-	    status = dn_expand(data, end_data, p, host, sizeof(host));
-	    if(status < 0){
-		dns_free_data(r);
-		return NULL;
-	    }
-	    (*rr)->u.txt = strdup(host);
-	    if((*rr)->u.txt == NULL) {
-		dns_free_data(r);
-		return NULL;
-	    }
-	    break;
-	case T_MX:
-	case T_AFSDB:{
-	    status = dn_expand(data, end_data, p + 2, host, sizeof(host));
-	    if(status < 0){
-		dns_free_data(r);
-		return NULL;
-	    }
-	    if (status + 2 > size) {
-		dns_free_data(r);
-		return NULL;
-	    }
-
-	    (*rr)->u.mx = (struct mx_record*)malloc(sizeof(struct mx_record) + 
-						    strlen(host));
-	    if((*rr)->u.mx == NULL) {
-		dns_free_data(r);
-		return NULL;
-	    }
-	    (*rr)->u.mx->preference = (p[0] << 8) | p[1];
-	    strcpy((*rr)->u.mx->domain, host);
-	    break;
-	}
-	case T_SRV:{
-	    status = dn_expand(data, end_data, p + 6, host, sizeof(host));
-	    if(status < 0){
-		dns_free_data(r);
-		return NULL;
-	    }
-	    if (status + 6 > size) {
-		dns_free_data(r);
-		return NULL;
-	    }
-
-	    (*rr)->u.srv = 
-		(struct srv_record*)malloc(sizeof(struct srv_record) + 
-					   strlen(host));
-	    if((*rr)->u.srv == NULL) {
-		dns_free_data(r);
-		return NULL;
-	    }
-	    (*rr)->u.srv->priority = (p[0] << 8) | p[1];
-	    (*rr)->u.srv->weight = (p[2] << 8) | p[3];
-	    (*rr)->u.srv->port = (p[4] << 8) | p[5];
-	    strcpy((*rr)->u.srv->target, host);
-	    break;
-	}
-	case T_TXT:{
-	    (*rr)->u.txt = (char*)malloc(size + 1);
-	    if((*rr)->u.txt == NULL) {
-		dns_free_data(r);
-		return NULL;
-	    }
-	    strncpy((*rr)->u.txt, (char*)p + 1, *p);
-	    (*rr)->u.txt[*p] = 0;
-	    break;
-	}
-	case T_KEY : {
-	    size_t key_len;
-
-	    if (size < 4) {
-		dns_free_data (r);
-		return NULL;
-	    }
-
-	    key_len = size - 4;
-	    (*rr)->u.key = malloc (sizeof(*(*rr)->u.key) + key_len - 1);
-	    if ((*rr)->u.key == NULL) {
-		dns_free_data (r);
-		return NULL;
-	    }
-
-	    (*rr)->u.key->flags     = (p[0] << 8) | p[1];
-	    (*rr)->u.key->protocol  = p[2];
-	    (*rr)->u.key->algorithm = p[3];
-	    (*rr)->u.key->key_len   = key_len;
-	    memcpy ((*rr)->u.key->key_data, p + 4, key_len);
-	    break;
-	}
-	case T_SIG : {
-	    size_t sig_len;
-
-	    status = dn_expand (data, end_data, p + 18, host, sizeof(host));
-	    if (status < 0) {
-		dns_free_data (r);
-		return NULL;
-	    }
-	    if (status + 18 > size) {
-		dns_free_data(r);
-		return NULL;
-	    }
-
-	    sig_len = len - 18 - status;
-	    (*rr)->u.sig = malloc(sizeof(*(*rr)->u.sig)
-				  + strlen(host) + sig_len);
-	    if ((*rr)->u.sig == NULL) {
-		dns_free_data (r);
-		return NULL;
-	    }
-	    (*rr)->u.sig->type           = (p[0] << 8) | p[1];
-	    (*rr)->u.sig->algorithm      = p[2];
-	    (*rr)->u.sig->labels         = p[3];
-	    (*rr)->u.sig->orig_ttl       = (p[4] << 24) | (p[5] << 16)
-		| (p[6] << 8) | p[7];
-	    (*rr)->u.sig->sig_expiration = (p[8] << 24) | (p[9] << 16)
-		| (p[10] << 8) | p[11];
-	    (*rr)->u.sig->sig_inception  = (p[12] << 24) | (p[13] << 16)
-		| (p[14] << 8) | p[15];
-	    (*rr)->u.sig->key_tag        = (p[16] << 8) | p[17];
-	    (*rr)->u.sig->sig_len        = sig_len;
-	    memcpy ((*rr)->u.sig->sig_data, p + 18 + status, sig_len);
-	    (*rr)->u.sig->signer         = &(*rr)->u.sig->sig_data[sig_len];
-	    strcpy((*rr)->u.sig->signer, host);
-	    break;
-	}
-
-	case T_CERT : {
-	    size_t cert_len;
-
-	    if (size < 5) {
-		dns_free_data(r);
-		return NULL;
-	    }
-
-	    cert_len = size - 5;
-	    (*rr)->u.cert = malloc (sizeof(*(*rr)->u.cert) + cert_len - 1);
-	    if ((*rr)->u.cert == NULL) {
-		dns_free_data (r);
-		return NULL;
-	    }
-
-	    (*rr)->u.cert->type      = (p[0] << 8) | p[1];
-	    (*rr)->u.cert->tag       = (p[2] << 8) | p[3];
-	    (*rr)->u.cert->algorithm = p[4];
-	    (*rr)->u.cert->cert_len  = cert_len;
-	    memcpy ((*rr)->u.cert->cert_data, p + 5, cert_len);
-	    break;
-	}
-	default:
-	    (*rr)->u.data = (unsigned char*)malloc(size);
-	    if(size != 0 && (*rr)->u.data == NULL) {
-		dns_free_data(r);
-		return NULL;
-	    }
-	    memcpy((*rr)->u.data, p, size);
-	}
-	p += size;
 	rr = &(*rr)->next;
     }
     *rr = NULL;
@@ -566,7 +604,7 @@ main(int argc, char **argv)
 	dns_srv_order(r);
 
     for(rr = r->head; rr;rr=rr->next){
-	printf("%s %s %d ", rr->domain, dns_type_to_string(rr->type), rr->ttl);
+	printf("%-30s %-5s %-6d ", rr->domain, dns_type_to_string(rr->type), rr->ttl);
 	switch(rr->type){
 	case T_NS:
 	case T_CNAME:
diff --git a/crypto/heimdal/lib/sl/Makefile.in b/crypto/heimdal/lib/sl/Makefile.in
index 6b6a944..df8b225 100644
--- a/crypto/heimdal/lib/sl/Makefile.in
+++ b/crypto/heimdal/lib/sl/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -241,13 +240,13 @@ CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(lib_LTLIBRARIES)
 
 libsl_la_DEPENDENCIES =
-@do_roken_rename_TRUE@am__objects_1 = strtok_r.lo snprintf.lo strdup.lo \
+@do_roken_rename_TRUE@am__objects_8 = strtok_r.lo snprintf.lo strdup.lo \
 @do_roken_rename_TRUE@	strupr.lo getprogname.lo
-am_libsl_la_OBJECTS = sl.lo $(am__objects_1)
+am_libsl_la_OBJECTS = sl.lo $(am__objects_8)
 libsl_la_OBJECTS = $(am_libsl_la_OBJECTS)
 libss_la_DEPENDENCIES =
-am__objects_2 = sl.lo $(am__objects_1)
-am_libss_la_OBJECTS = $(am__objects_2) ss.lo
+am__objects_16 = sl.lo $(am__objects_8)
+am_libss_la_OBJECTS = $(am__objects_16) ss.lo
 libss_la_OBJECTS = $(am_libss_la_OBJECTS)
 bin_PROGRAMS = mk_cmds$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
@@ -315,12 +314,6 @@ uninstall-libLTLIBRARIES:
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test -z "$dir" && dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
 libsl.la: $(libsl_la_OBJECTS) $(libsl_la_DEPENDENCIES) 
 	$(LINK) -rpath $(libdir) $(libsl_la_LDFLAGS) $(libsl_la_OBJECTS) $(libsl_la_LIBADD) $(LIBS)
 libss.la: $(libss_la_OBJECTS) $(libss_la_DEPENDENCIES) 
@@ -334,7 +327,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
@@ -343,22 +337,15 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
 	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done
 
 clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 parse.h: parse.c
-	@if test ! -f $@; then \
-	  rm -f parse.c; \
-	  $(MAKE) parse.c; \
-	else :; fi
 mk_cmds$(EXEEXT): $(mk_cmds_OBJECTS) $(mk_cmds_DEPENDENCIES) 
 	@rm -f mk_cmds$(EXEEXT)
 	$(LINK) $(mk_cmds_LDFLAGS) $(mk_cmds_OBJECTS) $(mk_cmds_LDADD) $(LIBS)
@@ -490,7 +477,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -543,12 +530,12 @@ clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "parse.hparse.clex.c" || rm -f parse.h parse.c lex.c
+	-test -z "parse.h" || rm -f parse.h
 clean: clean-am
 
 clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
diff --git a/crypto/heimdal/lib/vers/Makefile.in b/crypto/heimdal/lib/vers/Makefile.in
index e648e6d..294d056 100644
--- a/crypto/heimdal/lib/vers/Makefile.in
+++ b/crypto/heimdal/lib/vers/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -265,21 +264,11 @@ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test -z "$dir" && dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
 libvers.la: $(libvers_la_OBJECTS) $(libvers_la_DEPENDENCIES) 
 	$(LINK)  $(libvers_la_LDFLAGS) $(libvers_la_OBJECTS) $(libvers_la_LIBADD) $(LIBS)
 
 clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
 make-print-version$(EXEEXT): $(make_print_version_OBJECTS) $(make_print_version_DEPENDENCIES) 
 	@rm -f make-print-version$(EXEEXT)
 	$(LINK) $(make_print_version_LDFLAGS) $(make_print_version_OBJECTS) $(make_print_version_LDADD) $(LIBS)
@@ -350,7 +339,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -400,7 +389,7 @@ clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/missing b/crypto/heimdal/missing
index 6a37006..dd58370 100644
--- a/crypto/heimdal/missing
+++ b/crypto/heimdal/missing
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
+# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -293,23 +293,23 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     # Look for gnutar/gtar before invocation to avoid ugly error
     # messages.
     if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
+       gnutar ${1+"$@"} && exit 0
     fi
     if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
+       gtar ${1+"$@"} && exit 0
     fi
     firstarg="$1"
     if shift; then
 	case "$firstarg" in
 	*o*)
 	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
+	    tar "$firstarg" ${1+"$@"} && exit 0
 	    ;;
 	esac
 	case "$firstarg" in
 	*h*)
 	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
+	    tar "$firstarg" ${1+"$@"} && exit 0
 	    ;;
 	esac
     fi
diff --git a/crypto/heimdal/mkinstalldirs b/crypto/heimdal/mkinstalldirs
index 8ab885e..f9c37af 100755
--- a/crypto/heimdal/mkinstalldirs
+++ b/crypto/heimdal/mkinstalldirs
@@ -4,6 +4,8 @@
 # Created: 1993-05-16
 # Public domain
 
+# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $
+
 errstatus=0
 dirmode=""
 
diff --git a/crypto/heimdal/tools/Makefile.in b/crypto/heimdal/tools/Makefile.in
index 0f7496f..9710e0d 100644
--- a/crypto/heimdal/tools/Makefile.in
+++ b/crypto/heimdal/tools/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -237,23 +236,24 @@ $(srcdir)/Makefile.in:  Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdi
 	  $(AUTOMAKE) --foreign  tools/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f $$d$$p; then \
-	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \
-	    $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \
+	  f="`echo $$p|sed '$(transform)'`"; \
+	  if test -f $$p; then \
+	    echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/$$f"; \
+	    $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/$$f; \
+	  elif test -f $(srcdir)/$$p; then \
+	    echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/$$f"; \
+	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
 	done
 
 uninstall-binSCRIPTS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	  f="`echo $$p|sed '$(transform)'`"; \
 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
 	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done
@@ -283,10 +283,6 @@ install-man1: $(man1_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    1*) ;; \
-	    *) ext='1' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -319,7 +315,7 @@ top_distdir = ..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -370,7 +366,7 @@ clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/tools/krb5-config.cat1 b/crypto/heimdal/tools/krb5-config.cat1
index 89b0f93..461e8ca 100644
--- a/crypto/heimdal/tools/krb5-config.cat1
+++ b/crypto/heimdal/tools/krb5-config.cat1
@@ -1,12 +1,12 @@
-KRB5-CONFIG(1)          FreeBSD General Commands Manual         KRB5-CONFIG(1)
+KRB5-CONFIG(1)              NetBSD Reference Manual             KRB5-CONFIG(1)
 
 NNAAMMEE
-     kkrrbb55--ccoonnffiigg - give information on how to link code against Heimdal
-     libraries
+     kkrrbb55--ccoonnffiigg - give information on how to link code against Heimdal li-
+     braries
 
 SSYYNNOOPPSSIISS
      kkrrbb55--ccoonnffiigg [----pprreeffiixx[=_d_i_r]] [----eexxeecc--pprreeffiixx[=_d_i_r]] [----lliibbss] [----ccffllaaggss]
-                 [_l_i_b_r_a_r_i_e_s]
+     [_l_i_b_r_a_r_i_e_s]
 
 DDEESSCCRRIIPPTTIIOONN
      kkrrbb55--ccoonnffiigg tells the application programmer what special flags to use to
@@ -48,4 +48,4 @@ SSEEEE AALLSSOO
 HHIISSTTOORRYY
      kkrrbb55--ccoonnffiigg appeared in Heimdal 0.3d.
 
-HEIMDAL                        November 30, 2000                       HEIMDAL
+ HEIMDAL                       November 30, 2000                             1