address PR9630. compilation chokes on IPv4-only kernel.

this basically is due to synchronization issue between WIDE ssh IPv6 patch
and netbsd repository.

2 files changed, 273 insertions, 269 deletions

diff --git a/security/ssh/patches/patch-ab b/security/ssh/patches/patch-ab
index 8dde82b5880..d3b0973e346 100644
--- a/security/ssh/patches/patch-ab
+++ b/security/ssh/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.10 1999/12/28 03:54:21 kim Exp $
+$NetBSD: patch-ab,v 1.11 2000/03/18 04:35:23 itojun Exp $
 
---- configure.in.orig	Wed May 12 07:20:02 1999
-+++ configure.in	Mon Dec 27 22:39:58 1999
+--- configure.in.orig	Wed May 12 20:20:02 1999
++++ configure.in	Sat Mar 18 13:21:59 2000
 @@ -30,8 +30,132 @@
  fi
  
@@ -190,7 +190,7 @@ $NetBSD: patch-ab,v 1.10 1999/12/28 03:54:21 kim Exp $
  AC_CHECK_LIB(c, crypt, [true], AC_CHECK_LIB(crypt, crypt))
  AC_CHECK_LIB(sec, getspnam)
  AC_CHECK_LIB(seq, get_process_stats)
-@@ -436,6 +571,105 @@
+@@ -436,6 +571,107 @@
  
  AC_REPLACE_FUNCS(strerror memmove remove random putenv crypt socketpair snprintf)
  
@@ -263,7 +263,9 @@ $NetBSD: patch-ab,v 1.10 1999/12/28 03:54:21 kim Exp $
 +    }
 +  }
 +
-+  if (inet6 != 2 || inet4 != 2)
++  if (inet4 != 0 && inet4 != 2)
++    goto bad;
++  if (inet6 != 0 && inet6 != 2)
 +    goto bad;
 +
 +  if (aitop)
@@ -296,7 +298,7 @@ $NetBSD: patch-ab,v 1.10 1999/12/28 03:54:21 kim Exp $
  AC_PROG_LN_S
  AC_PROG_INSTALL
  AC_CHECK_PROG(AR, ar, ar, echo)
-@@ -903,8 +1137,8 @@
+@@ -903,8 +1139,8 @@
      fi
      AC_MSG_RESULT(Assuming TIS headers and libraries are in $withval.)
      AC_DEFINE(HAVE_TIS)
@@ -307,7 +309,7 @@ $NetBSD: patch-ab,v 1.10 1999/12/28 03:54:21 kim Exp $
      AC_MSG_WARN(Remember to read README.TIS. The connection between sshd and TIS authentication
  server is clear text!)
      ;;
-@@ -912,55 +1146,117 @@
+@@ -912,55 +1148,117 @@
    AC_MSG_RESULT(no)
  )
  
@@ -450,7 +452,7 @@ $NetBSD: patch-ab,v 1.10 1999/12/28 03:54:21 kim Exp $
  
  AC_MSG_CHECKING(whether to use libwrap)
  AC_ARG_WITH(libwrap,
-@@ -970,11 +1266,19 @@
+@@ -970,11 +1268,19 @@
      AC_MSG_RESULT(no)
      ;;
    yes)
@@ -475,7 +477,7 @@ $NetBSD: patch-ab,v 1.10 1999/12/28 03:54:21 kim Exp $
      ;;
    *)
      AC_MSG_RESULT(yes)
-@@ -1227,14 +1531,14 @@
+@@ -1227,14 +1533,14 @@
  [ case "$enableval" in
    no)
         AC_MSG_RESULT(no)
@@ -493,7 +495,7 @@ $NetBSD: patch-ab,v 1.10 1999/12/28 03:54:21 kim Exp $
  )
  
  AC_MSG_CHECKING(whether to enable TCP_NODELAY)
-@@ -1252,6 +1556,38 @@
+@@ -1252,6 +1558,38 @@
    AC_DEFINE(ENABLE_TCP_NODELAY)
  )
  
@@ -532,7 +534,7 @@ $NetBSD: patch-ab,v 1.10 1999/12/28 03:54:21 kim Exp $
  AC_MSG_CHECKING(whether to enable SO_LINGER)
  AC_ARG_ENABLE(so-linger,
  [  --enable-so-linger      Enable setting SO_LINGER socket option],
-@@ -1311,6 +1647,8 @@
+@@ -1311,6 +1649,8 @@
    AC_DEFINE(SCP_ALL_STATISTICS_ENABLED)
  )
  
@@ -541,7 +543,7 @@ $NetBSD: patch-ab,v 1.10 1999/12/28 03:54:21 kim Exp $
  # We include this here only to make it visible in --help; this is only used
  # in the gmp subdirectory.
  AC_ARG_ENABLE(asm,
-@@ -1336,4 +1674,4 @@
+@@ -1336,4 +1676,4 @@
  AC_SUBST(SSHDCONFOBJS)
  AC_SUBST(SSHINSTALLMODE)
  
diff --git a/security/ssh/patches/patch-aj b/security/ssh/patches/patch-aj
index 24971711e4e..59c6550889a 100644
--- a/security/ssh/patches/patch-aj
+++ b/security/ssh/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
+$NetBSD: patch-aj,v 1.11 2000/03/18 04:35:23 itojun Exp $
 
---- configure.orig	Wed May 12 07:20:06 1999
-+++ configure	Mon Dec 27 22:40:04 1999
+--- configure.orig	Wed May 12 20:20:06 1999
++++ configure	Sat Mar 18 13:22:06 2000
 @@ -1,7 +1,7 @@
  #! /bin/sh
  
@@ -2741,7 +2741,7 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -4509,19 +4895,133 @@
+@@ -4509,19 +4895,135 @@
   
  else
    echo "$ac_t""no" 1>&6
@@ -2829,7 +2829,9 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
 +    }
 +  }
 +
-+  if (inet6 != 2 || inet4 != 2)
++  if (inet4 != 0 && inet4 != 2)
++    goto bad;
++  if (inet6 != 0 && inet6 != 2)
 +    goto bad;
 +
 +  if (aitop)
@@ -2843,7 +2845,7 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
 +}
 +
 +EOF
-+if { (eval echo configure:4996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 +then
 +  echo "$ac_t""good" 1>&6
 +buggygetaddrinfo=no
@@ -2868,26 +2870,26 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:4520: checking for $ac_func" >&5
-+echo "configure:5020: checking for $ac_func" >&5
++echo "configure:5022: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 4525 "configure"
-+#line 5025 "configure"
++#line 5027 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -4544,7 +5044,7 @@
+@@ -4544,7 +5046,7 @@
  
  ; return 0; }
  EOF
 -if { (eval echo configure:4548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:5048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -4565,14 +5065,16 @@
+@@ -4565,14 +5067,16 @@
   
  else
    echo "$ac_t""no" 1>&6
@@ -2902,11 +2904,11 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
  
  echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
 -echo "configure:4576: checking whether ln -s works" >&5
-+echo "configure:5078: checking whether ln -s works" >&5
++echo "configure:5080: checking whether ln -s works" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4599,28 +5101,30 @@
+@@ -4599,28 +5103,30 @@
  # SunOS /usr/etc/install
  # IRIX /sbin/install
  # AIX /bin/install
@@ -2916,7 +2918,7 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
  # ./install, which can be erroneously created by make from ./install.sh.
  echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
 -echo "configure:4607: checking for a BSD compatible install" >&5
-+echo "configure:5110: checking for a BSD compatible install" >&5
++echo "configure:5112: checking for a BSD compatible install" >&5
  if test -z "$INSTALL"; then
  if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -2941,7 +2943,7 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
  	    :
  	  else
  	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-@@ -4650,20 +5154,23 @@
+@@ -4650,20 +5156,23 @@
  # It thinks the first close brace ends the variable substitution.
  test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
  
@@ -2953,7 +2955,7 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
  set dummy ar; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:4659: checking for $ac_word" >&5
-+echo "configure:5165: checking for $ac_word" >&5
++echo "configure:5167: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
@@ -2968,12 +2970,12 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_prog_AR="ar"
-@@ -4685,15 +5192,16 @@
+@@ -4685,15 +5194,16 @@
    # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:4689: checking for $ac_word" >&5
-+echo "configure:5196: checking for $ac_word" >&5
++echo "configure:5198: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
@@ -2988,12 +2990,12 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_prog_RANLIB="ranlib"
-@@ -4719,15 +5227,16 @@
+@@ -4719,15 +5229,16 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:4723: checking for $ac_word" >&5
-+echo "configure:5231: checking for $ac_word" >&5
++echo "configure:5233: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_MAKEDEP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
@@ -3008,38 +3010,38 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_prog_MAKEDEP="$ac_prog"
-@@ -4754,7 +5263,7 @@
+@@ -4754,7 +5265,7 @@
  # Uses ac_ vars as temps to allow command line to override cache and checks.
  # --without-x overrides everything else, but does not touch the cache.
  echo $ac_n "checking for X""... $ac_c" 1>&6
 -echo "configure:4758: checking for X" >&5
-+echo "configure:5267: checking for X" >&5
++echo "configure:5269: checking for X" >&5
  
  # Check whether --with-x or --without-x was given.
  if test "${with_x+set}" = set; then
-@@ -4816,13 +5325,13 @@
+@@ -4816,13 +5327,13 @@
  
    # First, try using that file with no special directory specified.
  cat > conftest.$ac_ext <<EOF
 -#line 4820 "configure"
-+#line 5329 "configure"
++#line 5331 "configure"
  #include "confdefs.h"
  #include <$x_direct_test_include>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:4825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 -ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:5334: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5336: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
    # We can compile using X headers with no special include directory.
-@@ -4890,14 +5399,14 @@
+@@ -4890,14 +5401,14 @@
    ac_save_LIBS="$LIBS"
    LIBS="-l$x_direct_test_library $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 4894 "configure"
-+#line 5403 "configure"
++#line 5405 "configure"
  #include "confdefs.h"
  
  int main() {
@@ -3047,20 +3049,20 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
  ; return 0; }
  EOF
 -if { (eval echo configure:4901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:5410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    LIBS="$ac_save_LIBS"
  # We can link X programs with no special library path.
-@@ -5003,17 +5512,17 @@
+@@ -5003,17 +5514,17 @@
      case "`(uname -sr) 2>/dev/null`" in
      "SunOS 5"*)
        echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
 -echo "configure:5007: checking whether -R must be followed by a space" >&5
-+echo "configure:5516: checking whether -R must be followed by a space" >&5
++echo "configure:5518: checking whether -R must be followed by a space" >&5
        ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
        cat > conftest.$ac_ext <<EOF
 -#line 5010 "configure"
-+#line 5519 "configure"
++#line 5521 "configure"
  #include "confdefs.h"
  
  int main() {
@@ -3068,16 +3070,16 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
  ; return 0; }
  EOF
 -if { (eval echo configure:5017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:5526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_R_nospace=yes
  else
-@@ -5029,14 +5538,14 @@
+@@ -5029,14 +5540,14 @@
        else
  	LIBS="$ac_xsave_LIBS -R $x_libraries"
  	cat > conftest.$ac_ext <<EOF
 -#line 5033 "configure"
-+#line 5542 "configure"
++#line 5544 "configure"
  #include "confdefs.h"
  
  int main() {
@@ -3085,274 +3087,274 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
  ; return 0; }
  EOF
 -if { (eval echo configure:5040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:5549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_R_space=yes
  else
-@@ -5068,7 +5577,7 @@
+@@ -5068,7 +5579,7 @@
      # libraries were built with DECnet support.  And karl@cs.umb.edu says
      # the Alpha needs dnet_stub (dnet does not exist).
      echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
 -echo "configure:5072: checking for dnet_ntoa in -ldnet" >&5
-+echo "configure:5581: checking for dnet_ntoa in -ldnet" >&5
++echo "configure:5583: checking for dnet_ntoa in -ldnet" >&5
  ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5076,7 +5585,7 @@
+@@ -5076,7 +5587,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-ldnet  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 5080 "configure"
-+#line 5589 "configure"
++#line 5591 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -5087,7 +5596,7 @@
+@@ -5087,7 +5598,7 @@
  dnet_ntoa()
  ; return 0; }
  EOF
 -if { (eval echo configure:5091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:5600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -5109,7 +5618,7 @@
+@@ -5109,7 +5620,7 @@
  
      if test $ac_cv_lib_dnet_dnet_ntoa = no; then
        echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
 -echo "configure:5113: checking for dnet_ntoa in -ldnet_stub" >&5
-+echo "configure:5622: checking for dnet_ntoa in -ldnet_stub" >&5
++echo "configure:5624: checking for dnet_ntoa in -ldnet_stub" >&5
  ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5117,7 +5626,7 @@
+@@ -5117,7 +5628,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-ldnet_stub  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 5121 "configure"
-+#line 5630 "configure"
++#line 5632 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -5128,7 +5637,7 @@
+@@ -5128,7 +5639,7 @@
  dnet_ntoa()
  ; return 0; }
  EOF
 -if { (eval echo configure:5132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:5641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -5157,12 +5666,12 @@
+@@ -5157,12 +5668,12 @@
      # The nsl library prevents programs from opening the X display
      # on Irix 5.2, according to dickey@clark.net.
      echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
 -echo "configure:5161: checking for gethostbyname" >&5
-+echo "configure:5670: checking for gethostbyname" >&5
++echo "configure:5672: checking for gethostbyname" >&5
  if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 5166 "configure"
-+#line 5675 "configure"
++#line 5677 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char gethostbyname(); below.  */
-@@ -5185,7 +5694,7 @@
+@@ -5185,7 +5696,7 @@
  
  ; return 0; }
  EOF
 -if { (eval echo configure:5189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:5698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_gethostbyname=yes"
  else
-@@ -5206,7 +5715,7 @@
+@@ -5206,7 +5717,7 @@
  
      if test $ac_cv_func_gethostbyname = no; then
        echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
 -echo "configure:5210: checking for gethostbyname in -lnsl" >&5
-+echo "configure:5719: checking for gethostbyname in -lnsl" >&5
++echo "configure:5721: checking for gethostbyname in -lnsl" >&5
  ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5214,7 +5723,7 @@
+@@ -5214,7 +5725,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 5218 "configure"
-+#line 5727 "configure"
++#line 5729 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -5225,7 +5734,7 @@
+@@ -5225,7 +5736,7 @@
  gethostbyname()
  ; return 0; }
  EOF
 -if { (eval echo configure:5229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:5738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -5255,12 +5764,12 @@
+@@ -5255,12 +5766,12 @@
      # -lsocket must be given before -lnsl if both are needed.
      # We assume that if connect needs -lnsl, so does gethostbyname.
      echo $ac_n "checking for connect""... $ac_c" 1>&6
 -echo "configure:5259: checking for connect" >&5
-+echo "configure:5768: checking for connect" >&5
++echo "configure:5770: checking for connect" >&5
  if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 5264 "configure"
-+#line 5773 "configure"
++#line 5775 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char connect(); below.  */
-@@ -5283,7 +5792,7 @@
+@@ -5283,7 +5794,7 @@
  
  ; return 0; }
  EOF
 -if { (eval echo configure:5287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:5796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_connect=yes"
  else
-@@ -5304,7 +5813,7 @@
+@@ -5304,7 +5815,7 @@
  
      if test $ac_cv_func_connect = no; then
        echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
 -echo "configure:5308: checking for connect in -lsocket" >&5
-+echo "configure:5817: checking for connect in -lsocket" >&5
++echo "configure:5819: checking for connect in -lsocket" >&5
  ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5312,7 +5821,7 @@
+@@ -5312,7 +5823,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 5316 "configure"
-+#line 5825 "configure"
++#line 5827 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -5323,7 +5832,7 @@
+@@ -5323,7 +5834,7 @@
  connect()
  ; return 0; }
  EOF
 -if { (eval echo configure:5327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:5836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -5347,12 +5856,12 @@
+@@ -5347,12 +5858,12 @@
  
      # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
      echo $ac_n "checking for remove""... $ac_c" 1>&6
 -echo "configure:5351: checking for remove" >&5
-+echo "configure:5860: checking for remove" >&5
++echo "configure:5862: checking for remove" >&5
  if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 5356 "configure"
-+#line 5865 "configure"
++#line 5867 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char remove(); below.  */
-@@ -5375,7 +5884,7 @@
+@@ -5375,7 +5886,7 @@
  
  ; return 0; }
  EOF
 -if { (eval echo configure:5379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:5888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_remove=yes"
  else
-@@ -5396,7 +5905,7 @@
+@@ -5396,7 +5907,7 @@
  
      if test $ac_cv_func_remove = no; then
        echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
 -echo "configure:5400: checking for remove in -lposix" >&5
-+echo "configure:5909: checking for remove in -lposix" >&5
++echo "configure:5911: checking for remove in -lposix" >&5
  ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5404,7 +5913,7 @@
+@@ -5404,7 +5915,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lposix  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 5408 "configure"
-+#line 5917 "configure"
++#line 5919 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -5415,7 +5924,7 @@
+@@ -5415,7 +5926,7 @@
  remove()
  ; return 0; }
  EOF
 -if { (eval echo configure:5419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:5928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -5439,12 +5948,12 @@
+@@ -5439,12 +5950,12 @@
  
      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
      echo $ac_n "checking for shmat""... $ac_c" 1>&6
 -echo "configure:5443: checking for shmat" >&5
-+echo "configure:5952: checking for shmat" >&5
++echo "configure:5954: checking for shmat" >&5
  if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 5448 "configure"
-+#line 5957 "configure"
++#line 5959 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char shmat(); below.  */
-@@ -5467,7 +5976,7 @@
+@@ -5467,7 +5978,7 @@
  
  ; return 0; }
  EOF
 -if { (eval echo configure:5471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:5980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_shmat=yes"
  else
-@@ -5488,7 +5997,7 @@
+@@ -5488,7 +5999,7 @@
  
      if test $ac_cv_func_shmat = no; then
        echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
 -echo "configure:5492: checking for shmat in -lipc" >&5
-+echo "configure:6001: checking for shmat in -lipc" >&5
++echo "configure:6003: checking for shmat in -lipc" >&5
  ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5496,7 +6005,7 @@
+@@ -5496,7 +6007,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lipc  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 5500 "configure"
-+#line 6009 "configure"
++#line 6011 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -5507,7 +6016,7 @@
+@@ -5507,7 +6018,7 @@
  shmat()
  ; return 0; }
  EOF
 -if { (eval echo configure:5511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:6020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -5540,15 +6049,15 @@
+@@ -5540,15 +6051,15 @@
    # libraries we check for below, so use a different variable.
    #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
    echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
 -echo "configure:5544: checking for IceConnectionNumber in -lICE" >&5
-+echo "configure:6053: checking for IceConnectionNumber in -lICE" >&5
++echo "configure:6055: checking for IceConnectionNumber in -lICE" >&5
  ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -3362,29 +3364,29 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
 +LIBS="-lICE $X_EXTRA_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 5552 "configure"
-+#line 6061 "configure"
++#line 6063 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -5559,7 +6068,7 @@
+@@ -5559,7 +6070,7 @@
  IceConnectionNumber()
  ; return 0; }
  EOF
 -if { (eval echo configure:5563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:6072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -5587,7 +6096,7 @@
+@@ -5587,7 +6098,7 @@
  # Extract the first word of "passwd", so it can be a program name with args.
  set dummy passwd; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:5591: checking for $ac_word" >&5
-+echo "configure:6100: checking for $ac_word" >&5
++echo "configure:6102: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PASSWD_PATH'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -5595,9 +6104,13 @@
+@@ -5595,9 +6106,13 @@
    /*)
    ac_cv_path_PASSWD_PATH="$PASSWD_PATH" # Let the user override the test with a path.
    ;;
@@ -3400,16 +3402,16 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path_PASSWD_PATH="$ac_dir/$ac_word"
-@@ -5625,7 +6138,7 @@
+@@ -5625,7 +6140,7 @@
  # Extract the first word of "xauth", so it can be a program name with args.
  set dummy xauth; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:5629: checking for $ac_word" >&5
-+echo "configure:6142: checking for $ac_word" >&5
++echo "configure:6144: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_XAUTH_PATH'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -5633,9 +6146,13 @@
+@@ -5633,9 +6148,13 @@
    /*)
    ac_cv_path_XAUTH_PATH="$XAUTH_PATH" # Let the user override the test with a path.
    ;;
@@ -3425,25 +3427,25 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path_XAUTH_PATH="$ac_dir/$ac_word"
-@@ -5669,7 +6186,7 @@
+@@ -5669,7 +6188,7 @@
    X_PROGRAMS="ssh-askpass"
  fi
  echo $ac_n "checking for X11 unix domain socket directory""... $ac_c" 1>&6
 -echo "configure:5673: checking for X11 unix domain socket directory" >&5
-+echo "configure:6190: checking for X11 unix domain socket directory" >&5
++echo "configure:6192: checking for X11 unix domain socket directory" >&5
  
  if test '!' -d /tmp/.X11-unix; then
    if test -d /var/X/.X11-unix; then
-@@ -5698,7 +6215,7 @@
+@@ -5698,7 +6217,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:5702: checking for $ac_word" >&5
-+echo "configure:6219: checking for $ac_word" >&5
++echo "configure:6221: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -5706,9 +6223,13 @@
+@@ -5706,9 +6225,13 @@
    /*)
    ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
    ;;
@@ -3459,217 +3461,217 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path_PERL="$ac_dir/$ac_word"
-@@ -5739,12 +6260,12 @@
+@@ -5739,12 +6262,12 @@
  for ac_func in getpseudotty
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:5743: checking for $ac_func" >&5
-+echo "configure:6264: checking for $ac_func" >&5
++echo "configure:6266: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 5748 "configure"
-+#line 6269 "configure"
++#line 6271 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -5767,7 +6288,7 @@
+@@ -5767,7 +6290,7 @@
  
  ; return 0; }
  EOF
 -if { (eval echo configure:5771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:6292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -5792,7 +6313,7 @@
+@@ -5792,7 +6315,7 @@
  done
  
  echo $ac_n "checking for pseudo ttys""... $ac_c" 1>&6
 -echo "configure:5796: checking for pseudo ttys" >&5
-+echo "configure:6317: checking for pseudo ttys" >&5
++echo "configure:6319: checking for pseudo ttys" >&5
  if test -c /dev/getpty && test $ac_cv_func_getpseudotty = yes
  then
    cat >> confdefs.h <<\EOF
-@@ -5832,7 +6353,7 @@
+@@ -5832,7 +6355,7 @@
  fi
  
  echo $ac_n "checking for /etc/default/login""... $ac_c" 1>&6
 -echo "configure:5836: checking for /etc/default/login" >&5
-+echo "configure:6357: checking for /etc/default/login" >&5
++echo "configure:6359: checking for /etc/default/login" >&5
  if test -f /etc/default/login; then
    cat >> confdefs.h <<\EOF
  #define HAVE_ETC_DEFAULT_LOGIN 1
-@@ -5845,7 +6366,7 @@
+@@ -5845,7 +6368,7 @@
  
  if test -z "$no_shadows_password_checking"; then
    echo $ac_n "checking for shadow passwords""... $ac_c" 1>&6
 -echo "configure:5849: checking for shadow passwords" >&5
-+echo "configure:6370: checking for shadow passwords" >&5
++echo "configure:6372: checking for shadow passwords" >&5
    if test -f /etc/shadow; then
        # If we don't have shadow.h, this might be some nonstandard
        # kludging... So better check it out.
-@@ -5859,7 +6380,7 @@
+@@ -5859,7 +6382,7 @@
        # have getspent in a system library.  However, a libshadow.a library
        # contaning these is publicly available.
        echo $ac_n "checking for getspent in -lshadow""... $ac_c" 1>&6
 -echo "configure:5863: checking for getspent in -lshadow" >&5
-+echo "configure:6384: checking for getspent in -lshadow" >&5
++echo "configure:6386: checking for getspent in -lshadow" >&5
  ac_lib_var=`echo shadow'_'getspent | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5867,7 +6388,7 @@
+@@ -5867,7 +6390,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lshadow  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 5871 "configure"
-+#line 6392 "configure"
++#line 6394 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -5878,7 +6399,7 @@
+@@ -5878,7 +6401,7 @@
  getspent()
  ; return 0; }
  EOF
 -if { (eval echo configure:5882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:6403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -5906,9 +6427,9 @@
+@@ -5906,9 +6429,9 @@
  fi
  
        echo $ac_n "checking whether spwd have sp_expire field""... $ac_c" 1>&6
 -echo "configure:5910: checking whether spwd have sp_expire field" >&5
-+echo "configure:6431: checking whether spwd have sp_expire field" >&5
++echo "configure:6433: checking whether spwd have sp_expire field" >&5
        cat > conftest.$ac_ext <<EOF
 -#line 5912 "configure"
-+#line 6433 "configure"
++#line 6435 "configure"
  #include "confdefs.h"
  #include <shadow.h>
  EOF
-@@ -5927,9 +6448,9 @@
+@@ -5927,9 +6450,9 @@
  rm -f conftest*
  
        echo $ac_n "checking whether spwd have sp_inact field""... $ac_c" 1>&6
 -echo "configure:5931: checking whether spwd have sp_inact field" >&5
-+echo "configure:6452: checking whether spwd have sp_inact field" >&5
++echo "configure:6454: checking whether spwd have sp_inact field" >&5
        cat > conftest.$ac_ext <<EOF
 -#line 5933 "configure"
-+#line 6454 "configure"
++#line 6456 "configure"
  #include "confdefs.h"
  #include <shadow.h>
  EOF
-@@ -5968,7 +6489,7 @@
+@@ -5968,7 +6491,7 @@
  fi
  
  echo $ac_n "checking location of mail spool files""... $ac_c" 1>&6
 -echo "configure:5972: checking location of mail spool files" >&5
-+echo "configure:6493: checking location of mail spool files" >&5
++echo "configure:6495: checking location of mail spool files" >&5
  for dir in /var/spool/mail /var/mail /usr/spool/mail /usr/mail FILE
  do
    if test "$dir" = "FILE"; then
-@@ -6007,7 +6528,7 @@
+@@ -6007,7 +6530,7 @@
  done
  
  echo $ac_n "checking location of utmp""... $ac_c" 1>&6
 -echo "configure:6011: checking location of utmp" >&5
-+echo "configure:6532: checking location of utmp" >&5
++echo "configure:6534: checking location of utmp" >&5
  if test -f /var/run/utmp; then
    cat >> confdefs.h <<\EOF
  #define SSH_UTMP "/var/run/utmp"
-@@ -6043,7 +6564,7 @@
+@@ -6043,7 +6566,7 @@
  fi
  
  echo $ac_n "checking location of wtmp""... $ac_c" 1>&6
 -echo "configure:6047: checking location of wtmp" >&5
-+echo "configure:6568: checking location of wtmp" >&5
++echo "configure:6570: checking location of wtmp" >&5
  if test -f /var/log/wtmp; then
    cat >> confdefs.h <<\EOF
  #define SSH_WTMP "/var/log/wtmp"
-@@ -6077,7 +6598,7 @@
+@@ -6077,7 +6600,7 @@
  fi
  
  echo $ac_n "checking location of lastlog""... $ac_c" 1>&6
 -echo "configure:6081: checking location of lastlog" >&5
-+echo "configure:6602: checking location of lastlog" >&5
++echo "configure:6604: checking location of lastlog" >&5
  if test -f /var/log/lastlog || test -d /var/log/lastlog; then
    cat >> confdefs.h <<\EOF
  #define SSH_LASTLOG "/var/log/lastlog"
-@@ -6132,7 +6653,7 @@
+@@ -6132,7 +6655,7 @@
  fi
  
  echo $ac_n "checking whether $LASTLOG is a directory""... $ac_c" 1>&6
 -echo "configure:6136: checking whether $LASTLOG is a directory" >&5
-+echo "configure:6657: checking whether $LASTLOG is a directory" >&5
++echo "configure:6659: checking whether $LASTLOG is a directory" >&5
  if test -d $LASTLOG
  then
    echo "$ac_t""yes" 1>&6
-@@ -6145,7 +6666,7 @@
+@@ -6145,7 +6668,7 @@
  fi
  
  echo $ac_n "checking whether to include the IDEA encryption algorithm""... $ac_c" 1>&6
 -echo "configure:6149: checking whether to include the IDEA encryption algorithm" >&5
-+echo "configure:6670: checking whether to include the IDEA encryption algorithm" >&5
++echo "configure:6672: checking whether to include the IDEA encryption algorithm" >&5
  # Check whether --with-idea or --without-idea was given.
  if test "${with_idea+set}" = set; then
    withval="$with_idea"
-@@ -6179,7 +6700,7 @@
+@@ -6179,7 +6702,7 @@
  
  
  echo $ac_n "checking whether to include the Blowfish encryption algorithm""... $ac_c" 1>&6
 -echo "configure:6183: checking whether to include the Blowfish encryption algorithm" >&5
-+echo "configure:6704: checking whether to include the Blowfish encryption algorithm" >&5
++echo "configure:6706: checking whether to include the Blowfish encryption algorithm" >&5
  # Check whether --with-blowfish or --without-blowfish was given.
  if test "${with_blowfish+set}" = set; then
    withval="$with_blowfish"
-@@ -6206,7 +6727,7 @@
+@@ -6206,7 +6729,7 @@
  
  
  echo $ac_n "checking whether to include the DES encryption algorithm""... $ac_c" 1>&6
 -echo "configure:6210: checking whether to include the DES encryption algorithm" >&5
-+echo "configure:6731: checking whether to include the DES encryption algorithm" >&5
++echo "configure:6733: checking whether to include the DES encryption algorithm" >&5
  # Check whether --with-des or --without-des was given.
  if test "${with_des+set}" = set; then
    withval="$with_des"
-@@ -6229,7 +6750,7 @@
+@@ -6229,7 +6752,7 @@
  
  
  echo $ac_n "checking whether to include the ARCFOUR encryption algorithm""... $ac_c" 1>&6
 -echo "configure:6233: checking whether to include the ARCFOUR encryption algorithm" >&5
-+echo "configure:6754: checking whether to include the ARCFOUR encryption algorithm" >&5
++echo "configure:6756: checking whether to include the ARCFOUR encryption algorithm" >&5
  # Check whether --with-arcfour or --without-arcfour was given.
  if test "${with_arcfour+set}" = set; then
    withval="$with_arcfour"
-@@ -6252,7 +6773,7 @@
+@@ -6252,7 +6775,7 @@
  
  
  echo $ac_n "checking whether to include the none encryption algorithm""... $ac_c" 1>&6
 -echo "configure:6256: checking whether to include the none encryption algorithm" >&5
-+echo "configure:6777: checking whether to include the none encryption algorithm" >&5
++echo "configure:6779: checking whether to include the none encryption algorithm" >&5
  # Check whether --with-none or --without-none was given.
  if test "${with_none+set}" = set; then
    withval="$with_none"
-@@ -6275,7 +6796,7 @@
+@@ -6275,7 +6798,7 @@
  
  
  echo $ac_n "checking whether to use login""... $ac_c" 1>&6
 -echo "configure:6279: checking whether to use login" >&5
-+echo "configure:6800: checking whether to use login" >&5
++echo "configure:6802: checking whether to use login" >&5
  # Check whether --with-login or --without-login was given.
  if test "${with_login+set}" = set; then
    withval="$with_login"
-@@ -6290,7 +6811,7 @@
+@@ -6290,7 +6813,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:6294: checking for $ac_word" >&5
-+echo "configure:6815: checking for $ac_word" >&5
++echo "configure:6817: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PATH_LOGIN'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -6298,9 +6819,13 @@
+@@ -6298,9 +6821,13 @@
    /*)
    ac_cv_path_PATH_LOGIN="$PATH_LOGIN" # Let the user override the test with a path.
    ;;
@@ -3685,25 +3687,25 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path_PATH_LOGIN="$ac_dir/$ac_word"
-@@ -6349,7 +6874,7 @@
+@@ -6349,7 +6876,7 @@
  
  
  echo $ac_n "checking whether to use rsh""... $ac_c" 1>&6
 -echo "configure:6353: checking whether to use rsh" >&5
-+echo "configure:6878: checking whether to use rsh" >&5
++echo "configure:6880: checking whether to use rsh" >&5
  # Check whether --with-rsh or --without-rsh was given.
  if test "${with_rsh+set}" = set; then
    withval="$with_rsh"
-@@ -6364,7 +6889,7 @@
+@@ -6364,7 +6891,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:6368: checking for $ac_word" >&5
-+echo "configure:6893: checking for $ac_word" >&5
++echo "configure:6895: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_RSH_PATH'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -6372,9 +6897,13 @@
+@@ -6372,9 +6899,13 @@
    /*)
    ac_cv_path_RSH_PATH="$RSH_PATH" # Let the user override the test with a path.
    ;;
@@ -3719,16 +3721,16 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path_RSH_PATH="$ac_dir/$ac_word"
-@@ -6416,7 +6945,7 @@
+@@ -6416,7 +6947,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:6420: checking for $ac_word" >&5
-+echo "configure:6949: checking for $ac_word" >&5
++echo "configure:6951: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_RSH_PATH'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -6424,9 +6953,13 @@
+@@ -6424,9 +6955,13 @@
    /*)
    ac_cv_path_RSH_PATH="$RSH_PATH" # Let the user override the test with a path.
    ;;
@@ -3744,52 +3746,52 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path_RSH_PATH="$ac_dir/$ac_word"
-@@ -6465,7 +6998,7 @@
+@@ -6465,7 +7000,7 @@
  
  # Code to permit setting default path for users (alden@math.ohio-state.edu)
  echo $ac_n "checking default path""... $ac_c" 1>&6
 -echo "configure:6469: checking default path" >&5
-+echo "configure:7002: checking default path" >&5
++echo "configure:7004: checking default path" >&5
  # Check whether --with-path or --without-path was given.
  if test "${with_path+set}" = set; then
    withval="$with_path"
-@@ -6488,7 +7021,7 @@
+@@ -6488,7 +7023,7 @@
  
  
  echo $ac_n "checking etcdir""... $ac_c" 1>&6
 -echo "configure:6492: checking etcdir" >&5
-+echo "configure:7025: checking etcdir" >&5
++echo "configure:7027: checking etcdir" >&5
  # Check whether --with-etcdir or --without-etcdir was given.
  if test "${with_etcdir+set}" = set; then
    withval="$with_etcdir"
-@@ -6513,7 +7046,7 @@
+@@ -6513,7 +7048,7 @@
  
  
  echo $ac_n "checking whether to use nologin.allow file to override nologin""... $ac_c" 1>&6
 -echo "configure:6517: checking whether to use nologin.allow file to override nologin" >&5
-+echo "configure:7050: checking whether to use nologin.allow file to override nologin" >&5
++echo "configure:7052: checking whether to use nologin.allow file to override nologin" >&5
  # Check whether --with-nologin-allow or --without-nologin-allow was given.
  if test "${with_nologin_allow+set}" = set; then
    withval="$with_nologin_allow"
-@@ -6543,7 +7076,7 @@
+@@ -6543,7 +7078,7 @@
  
  
  echo $ac_n "checking whether to support SecurID""... $ac_c" 1>&6
 -echo "configure:6547: checking whether to support SecurID" >&5
-+echo "configure:7080: checking whether to support SecurID" >&5
++echo "configure:7082: checking whether to support SecurID" >&5
  # Check whether --with-securid or --without-securid was given.
  if test "${with_securid+set}" = set; then
    withval="$with_securid"
-@@ -6586,7 +7119,7 @@
+@@ -6586,7 +7121,7 @@
  
  
  echo $ac_n "checking whether to support TIS authentication server""... $ac_c" 1>&6
 -echo "configure:6590: checking whether to support TIS authentication server" >&5
-+echo "configure:7123: checking whether to support TIS authentication server" >&5
++echo "configure:7125: checking whether to support TIS authentication server" >&5
  # Check whether --with-tis or --without-tis was given.
  if test "${with_tis+set}" = set; then
    withval="$with_tis"
-@@ -6604,8 +7137,8 @@
+@@ -6604,8 +7139,8 @@
  #define HAVE_TIS 1
  EOF
  
@@ -3800,7 +3802,7 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
      echo "configure: warning: Remember to read README.TIS. The connection between sshd and TIS authentication
  server is clear text!" 1>&2
      ;;
-@@ -6616,40 +7149,138 @@
+@@ -6616,40 +7151,138 @@
  fi
  
  
@@ -3810,7 +3812,7 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
 -if test "${with_kerberos5+set}" = set; then
 -  withval="$with_kerberos5"
 +echo $ac_n "checking whether to use Kerberos v4""... $ac_c" 1>&6
-+echo "configure:7154: checking whether to use Kerberos v4" >&5
++echo "configure:7156: checking whether to use Kerberos v4" >&5
 +# Check whether --with-krb4 or --without-krb4 was given.
 +if test "${with_krb4+set}" = set; then
 +  withval="$with_krb4"
@@ -3843,7 +3845,7 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
 +  KERBEROS_LIBS="-L${KERBEROS_ROOT}/lib -lkrb -ldes"
 +  KERBEROS_OBJS="auth-kerberos.o"
 +  echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6
-+echo "configure:7183: checking for dn_expand in -lresolv" >&5
++echo "configure:7185: checking for dn_expand in -lresolv" >&5
 +ac_lib_var=`echo resolv'_'dn_expand | sed 'y%./+-%__p_%'`
 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
 +  echo $ac_n "(cached) $ac_c" 1>&6
@@ -3851,7 +3853,7 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
 +  ac_save_LIBS="$LIBS"
 +LIBS="-lresolv  $LIBS"
 +cat > conftest.$ac_ext <<EOF
-+#line 7191 "configure"
++#line 7193 "configure"
 +#include "confdefs.h"
 +/* Override any gcc2 internal prototype to avoid an error.  */
 +/* We use char because int might match the return type of a gcc2
@@ -3862,7 +3864,7 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
 +dn_expand()
 +; return 0; }
 +EOF
-+if { (eval echo configure:7202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 +  rm -rf conftest*
 +  eval "ac_cv_lib_$ac_lib_var=yes"
 +else
@@ -3883,20 +3885,20 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
 +fi
 +
 +    echo $ac_n "checking whether AFS lifetime conversion routines are present""... $ac_c" 1>&6
-+echo "configure:7223: checking whether AFS lifetime conversion routines are present" >&5
++echo "configure:7225: checking whether AFS lifetime conversion routines are present" >&5
 +  keeplibs="$LIBS"
 +  keepcflags="$CFLAGS"
 +  LIBS="-L${KERBEROS_ROOT}/lib -lkrb -ldes $LIBS"
 +  CFLAGS="-I${KERBEROS_ROOT}/include $CFLAGS"
 +  cat > conftest.$ac_ext <<EOF
-+#line 7229 "configure"
++#line 7231 "configure"
 +#include "confdefs.h"
 +#include <krb.h>
 +int main() {
 + krb_life_to_time(10, 10);
 +; return 0; }
 +EOF
-+if { (eval echo configure:7236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 +  rm -rf conftest*
 +  echo "$ac_t""yes" 1>&6
 +               cat >> confdefs.h <<\EOF
@@ -3916,7 +3918,7 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
 +esac
 +
 +echo $ac_n "checking whether to use Kerberos v5""... $ac_c" 1>&6
-+echo "configure:7256: checking whether to use Kerberos v5" >&5
++echo "configure:7258: checking whether to use Kerberos v5" >&5
 +# Check whether --with-krb5 or --without-krb5 was given.
 +if test "${with_krb5+set}" = set; then
 +  withval="$with_krb5"
@@ -3948,29 +3950,29 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
 +  KERBEROS_LIBS="-L${KERBEROS_ROOT}/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
    echo $ac_n "checking for dbm_open in -lndbm""... $ac_c" 1>&6
 -echo "configure:6653: checking for dbm_open in -lndbm" >&5
-+echo "configure:7284: checking for dbm_open in -lndbm" >&5
++echo "configure:7286: checking for dbm_open in -lndbm" >&5
  ac_lib_var=`echo ndbm'_'dbm_open | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -6657,7 +7288,7 @@
+@@ -6657,7 +7290,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lndbm  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 6661 "configure"
-+#line 7292 "configure"
++#line 7294 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -6668,7 +7299,7 @@
+@@ -6668,7 +7301,7 @@
  dbm_open()
  ; return 0; }
  EOF
 -if { (eval echo configure:6672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:7303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -6692,40 +7323,66 @@
+@@ -6692,40 +7325,66 @@
    ;;
  esac
  
@@ -3990,7 +3992,7 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
 -  *)
 -    if test "$with_kerberos5" = no ; then
 +echo $ac_n "checking whether to use AFS""... $ac_c" 1>&6
-+echo "configure:7328: checking whether to use AFS" >&5
++echo "configure:7330: checking whether to use AFS" >&5
 +# Check whether --with-afs or --without-afs was given.
 +if test "${with_afs+set}" = set; then
 +  withval="$with_afs"
@@ -4020,7 +4022,7 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
 +
 +
 +echo $ac_n "checking whether to use Hesiod""... $ac_c" 1>&6
-+echo "configure:7355: checking whether to use Hesiod" >&5
++echo "configure:7357: checking whether to use Hesiod" >&5
 +# Check whether --with-hesiod or --without-hesiod was given.
 +if test "${with_hesiod+set}" = set; then
 +  withval="$with_hesiod"
@@ -4053,11 +4055,11 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
  
  echo $ac_n "checking whether to use libwrap""... $ac_c" 1>&6
 -echo "configure:6729: checking whether to use libwrap" >&5
-+echo "configure:7386: checking whether to use libwrap" >&5
++echo "configure:7388: checking whether to use libwrap" >&5
  # Check whether --with-libwrap or --without-libwrap was given.
  if test "${with_libwrap+set}" = set; then
    withval="$with_libwrap"
-@@ -6734,56 +7391,41 @@
+@@ -6734,56 +7393,41 @@
      echo "$ac_t""no" 1>&6
      ;;
    yes)
@@ -4076,7 +4078,7 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
 +    OLDLIBS="$LIBS"
 +    LIBS="$WRAPLIBS $LIBS"
 +    cat > conftest.$ac_ext <<EOF
-+#line 7399 "configure"
++#line 7401 "configure"
  #include "confdefs.h"
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -/* We use char because int might match the return type of a gcc2
@@ -4095,7 +4097,7 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
 -else
 -  echo "configure: failed program was:" >&5
 -  cat conftest.$ac_ext >&5
-+if { (eval echo configure:7406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
 -  eval "ac_cv_lib_$ac_lib_var=no"
 -fi
@@ -4136,12 +4138,12 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
      ;;
    *)
      echo "$ac_t""yes" 1>&6
-@@ -6799,14 +7441,14 @@
+@@ -6799,14 +7443,14 @@
      OLDLIBS="$LIBS"
      LIBS="$WRAPLIBS $LIBS"
      cat > conftest.$ac_ext <<EOF
 -#line 6803 "configure"
-+#line 7445 "configure"
++#line 7447 "configure"
  #include "confdefs.h"
   int allow_severity; int deny_severity; 
  int main() {
@@ -4149,88 +4151,88 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
  ; return 0; }
  EOF
 -if { (eval echo configure:6810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:7452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    :
  else
    echo "configure: failed program was:" >&5
-@@ -6827,7 +7469,7 @@
+@@ -6827,7 +7471,7 @@
  
  
  echo $ac_n "checking whether to support SOCKS""... $ac_c" 1>&6
 -echo "configure:6831: checking whether to support SOCKS" >&5
-+echo "configure:7473: checking whether to support SOCKS" >&5
++echo "configure:7475: checking whether to support SOCKS" >&5
  # Check whether --with-socks or --without-socks was given.
  if test "${with_socks+set}" = set; then
    withval="$with_socks"
-@@ -6838,7 +7480,7 @@
+@@ -6838,7 +7482,7 @@
    yes)
      echo "$ac_t""yes" 1>&6
      echo $ac_n "checking for SOCKSconnect in -lsocks5""... $ac_c" 1>&6
 -echo "configure:6842: checking for SOCKSconnect in -lsocks5" >&5
-+echo "configure:7484: checking for SOCKSconnect in -lsocks5" >&5
++echo "configure:7486: checking for SOCKSconnect in -lsocks5" >&5
  ac_lib_var=`echo socks5'_'SOCKSconnect | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -6846,7 +7488,7 @@
+@@ -6846,7 +7490,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lsocks5  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 6850 "configure"
-+#line 7492 "configure"
++#line 7494 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -6857,7 +7499,7 @@
+@@ -6857,7 +7501,7 @@
  SOCKSconnect()
  ; return 0; }
  EOF
 -if { (eval echo configure:6861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:7503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -6879,7 +7521,7 @@
+@@ -6879,7 +7523,7 @@
    echo "$ac_t""no" 1>&6
  
  	echo $ac_n "checking for Rconnect in -lsocks""... $ac_c" 1>&6
 -echo "configure:6883: checking for Rconnect in -lsocks" >&5
-+echo "configure:7525: checking for Rconnect in -lsocks" >&5
++echo "configure:7527: checking for Rconnect in -lsocks" >&5
  ac_lib_var=`echo socks'_'Rconnect | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -6887,7 +7529,7 @@
+@@ -6887,7 +7531,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lsocks  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 6891 "configure"
-+#line 7533 "configure"
++#line 7535 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -6898,7 +7540,7 @@
+@@ -6898,7 +7542,7 @@
  Rconnect()
  ; return 0; }
  EOF
 -if { (eval echo configure:6902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:7544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -6934,7 +7576,7 @@
+@@ -6934,7 +7578,7 @@
  
  if test "x$socks" = "x"; then
  	echo $ac_n "checking whether to support SOCKS5""... $ac_c" 1>&6
 -echo "configure:6938: checking whether to support SOCKS5" >&5
-+echo "configure:7580: checking whether to support SOCKS5" >&5
++echo "configure:7582: checking whether to support SOCKS5" >&5
  	# Check whether --with-socks5 or --without-socks5 was given.
  if test "${with_socks5+set}" = set; then
    withval="$with_socks5"
-@@ -6968,14 +7610,14 @@
+@@ -6968,14 +7612,14 @@
  	    TMPLIBS="$LIBS"
  	    LIBS="$LIBS $KERBEROS_LIBS"
  	    cat > conftest.$ac_ext <<EOF
 -#line 6972 "configure"
-+#line 7614 "configure"
++#line 7616 "configure"
  #include "confdefs.h"
  
  int main() {
@@ -4238,25 +4240,25 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
  ; return 0; }
  EOF
 -if { (eval echo configure:6979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:7621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    :
  else
    echo "configure: failed program was:" >&5
-@@ -6996,7 +7638,7 @@
+@@ -6996,7 +7640,7 @@
  
  if test "x$socks" = "x"; then
  	echo $ac_n "checking whether to support SOCKS4""... $ac_c" 1>&6
 -echo "configure:7000: checking whether to support SOCKS4" >&5
-+echo "configure:7642: checking whether to support SOCKS4" >&5
++echo "configure:7644: checking whether to support SOCKS4" >&5
  	# Check whether --with-socks4 or --without-socks4 was given.
  if test "${with_socks4+set}" = set; then
    withval="$with_socks4"
-@@ -7016,14 +7658,14 @@
+@@ -7016,14 +7660,14 @@
  	    fi
  	    LIBS="$withval $LIBS"
  	    cat > conftest.$ac_ext <<EOF
 -#line 7020 "configure"
-+#line 7662 "configure"
++#line 7664 "configure"
  #include "confdefs.h"
  
  int main() {
@@ -4264,70 +4266,70 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
  ; return 0; }
  EOF
 -if { (eval echo configure:7027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:7669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    :
  else
    echo "configure: failed program was:" >&5
-@@ -7150,7 +7792,7 @@
+@@ -7150,7 +7794,7 @@
  fi
  
  echo $ac_n "checking whether to use rsaref""... $ac_c" 1>&6
 -echo "configure:7154: checking whether to use rsaref" >&5
-+echo "configure:7796: checking whether to use rsaref" >&5
++echo "configure:7798: checking whether to use rsaref" >&5
  # Check whether --with-rsaref or --without-rsaref was given.
  if test "${with_rsaref+set}" = set; then
    withval="$with_rsaref"
-@@ -7184,7 +7826,7 @@
+@@ -7184,7 +7828,7 @@
  
  # This allows group writeability in userfile_check_owner_permissions()
  echo $ac_n "checking whether to allow group writeability""... $ac_c" 1>&6
 -echo "configure:7188: checking whether to allow group writeability" >&5
-+echo "configure:7830: checking whether to allow group writeability" >&5
++echo "configure:7832: checking whether to allow group writeability" >&5
  # Check whether --enable-group-writeability or --disable-group-writeability was given.
  if test "${enable_group_writeability+set}" = set; then
    enableval="$enable_group_writeability"
-@@ -7200,7 +7842,7 @@
+@@ -7200,7 +7844,7 @@
  
  
  echo $ac_n "checking whether to disable forwardings in server""... $ac_c" 1>&6
 -echo "configure:7204: checking whether to disable forwardings in server" >&5
-+echo "configure:7846: checking whether to disable forwardings in server" >&5
++echo "configure:7848: checking whether to disable forwardings in server" >&5
  # Check whether --enable-server-port-forwardings or --disable-server-port-forwardings was given.
  if test "${enable_server_port_forwardings+set}" = set; then
    enableval="$enable_server_port_forwardings"
-@@ -7222,7 +7864,7 @@
+@@ -7222,7 +7866,7 @@
  
  
  echo $ac_n "checking whether to disable forwardings in client""... $ac_c" 1>&6
 -echo "configure:7226: checking whether to disable forwardings in client" >&5
-+echo "configure:7868: checking whether to disable forwardings in client" >&5
++echo "configure:7870: checking whether to disable forwardings in client" >&5
  # Check whether --enable-client-port-forwardings or --disable-client-port-forwardings was given.
  if test "${enable_client_port_forwardings+set}" = set; then
    enableval="$enable_client_port_forwardings"
-@@ -7244,7 +7886,7 @@
+@@ -7244,7 +7888,7 @@
  
  
  echo $ac_n "checking whether to disable X11 forwarding in server""... $ac_c" 1>&6
 -echo "configure:7248: checking whether to disable X11 forwarding in server" >&5
-+echo "configure:7890: checking whether to disable X11 forwarding in server" >&5
++echo "configure:7892: checking whether to disable X11 forwarding in server" >&5
  # Check whether --enable-server-x11-forwarding or --disable-server-x11-forwarding was given.
  if test "${enable_server_x11_forwarding+set}" = set; then
    enableval="$enable_server_x11_forwarding"
-@@ -7266,7 +7908,7 @@
+@@ -7266,7 +7910,7 @@
  
  
  echo $ac_n "checking whether to disable X11 forwarding in client""... $ac_c" 1>&6
 -echo "configure:7270: checking whether to disable X11 forwarding in client" >&5
-+echo "configure:7912: checking whether to disable X11 forwarding in client" >&5
++echo "configure:7914: checking whether to disable X11 forwarding in client" >&5
  # Check whether --enable-client-x11-forwarding or --disable-client-x11-forwarding was given.
  if test "${enable_client_x11_forwarding+set}" = set; then
    enableval="$enable_client_x11_forwarding"
-@@ -7288,28 +7930,28 @@
+@@ -7288,28 +7932,28 @@
  
  
  echo $ac_n "checking whether to install ssh as suid root""... $ac_c" 1>&6
 -echo "configure:7292: checking whether to install ssh as suid root" >&5
-+echo "configure:7934: checking whether to install ssh as suid root" >&5
++echo "configure:7936: checking whether to install ssh as suid root" >&5
  # Check whether --enable-suid-ssh or --disable-suid-ssh was given.
  if test "${enable_suid_ssh+set}" = set; then
    enableval="$enable_suid_ssh"
@@ -4352,16 +4354,16 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
  
  echo $ac_n "checking whether to enable TCP_NODELAY""... $ac_c" 1>&6
 -echo "configure:7313: checking whether to enable TCP_NODELAY" >&5
-+echo "configure:7955: checking whether to enable TCP_NODELAY" >&5
++echo "configure:7957: checking whether to enable TCP_NODELAY" >&5
  # Check whether --enable-tcp-nodelay or --disable-tcp-nodelay was given.
  if test "${enable_tcp_nodelay+set}" = set; then
    enableval="$enable_tcp_nodelay"
-@@ -7334,8 +7976,60 @@
+@@ -7334,8 +7978,60 @@
  fi
  
  
 +echo $ac_n "checking whether to enable another port try support""... $ac_c" 1>&6
-+echo "configure:7981: checking whether to enable another port try support" >&5
++echo "configure:7983: checking whether to enable another port try support" >&5
 +# Check whether --enable-another-port-try or --disable-another-port-try was given.
 +if test "${enable_another_port_try+set}" = set; then
 +  enableval="$enable_another_port_try"
@@ -4387,7 +4389,7 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
 +
 +
 +echo $ac_n "checking whether to enable logging auth info support""... $ac_c" 1>&6
-+echo "configure:8007: checking whether to enable logging auth info support" >&5
++echo "configure:8009: checking whether to enable logging auth info support" >&5
 +# Check whether --enable-log-auth or --disable-log-auth was given.
 +if test "${enable_log_auth+set}" = set; then
 +  enableval="$enable_log_auth"
@@ -4414,38 +4416,38 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
 +
  echo $ac_n "checking whether to enable SO_LINGER""... $ac_c" 1>&6
 -echo "configure:7339: checking whether to enable SO_LINGER" >&5
-+echo "configure:8033: checking whether to enable SO_LINGER" >&5
++echo "configure:8035: checking whether to enable SO_LINGER" >&5
  # Check whether --enable-so-linger or --disable-so-linger was given.
  if test "${enable_so_linger+set}" = set; then
    enableval="$enable_so_linger"
-@@ -7357,7 +8051,7 @@
+@@ -7357,7 +8053,7 @@
  
  
  echo $ac_n "checking whether to include scp statistics at all""... $ac_c" 1>&6
 -echo "configure:7361: checking whether to include scp statistics at all" >&5
-+echo "configure:8055: checking whether to include scp statistics at all" >&5
++echo "configure:8057: checking whether to include scp statistics at all" >&5
  # Check whether --with-scp-stats or --without-scp-stats was given.
  if test "${with_scp_stats+set}" = set; then
    withval="$with_scp_stats"
-@@ -7383,7 +8077,7 @@
+@@ -7383,7 +8079,7 @@
  
  
  echo $ac_n "checking whether to enable scp statistics""... $ac_c" 1>&6
 -echo "configure:7387: checking whether to enable scp statistics" >&5
-+echo "configure:8081: checking whether to enable scp statistics" >&5
++echo "configure:8083: checking whether to enable scp statistics" >&5
  # Check whether --enable-scp-stats or --disable-scp-stats was given.
  if test "${enable_scp_stats+set}" = set; then
    enableval="$enable_scp_stats"
-@@ -7409,7 +8103,7 @@
+@@ -7409,7 +8105,7 @@
  
  
  echo $ac_n "checking whether to enable scp statistics for all files""... $ac_c" 1>&6
 -echo "configure:7413: checking whether to enable scp statistics for all files" >&5
-+echo "configure:8107: checking whether to enable scp statistics for all files" >&5
++echo "configure:8109: checking whether to enable scp statistics for all files" >&5
  # Check whether --enable-all-scp-stats or --disable-all-scp-stats was given.
  if test "${enable_all_scp_stats+set}" = set; then
    enableval="$enable_all_scp_stats"
-@@ -7434,6 +8128,8 @@
+@@ -7434,6 +8130,8 @@
  fi
  
  
@@ -4454,16 +4456,16 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
  # We include this here only to make it visible in --help; this is only used
  # in the gmp subdirectory.
  # Check whether --enable-asm or --disable-asm was given.
-@@ -7445,7 +8141,7 @@
+@@ -7445,7 +8143,7 @@
  
  PIDDIR="/var/run"
  echo $ac_n "checking where to put sshd.pid""... $ac_c" 1>&6
 -echo "configure:7449: checking where to put sshd.pid" >&5
-+echo "configure:8145: checking where to put sshd.pid" >&5
++echo "configure:8147: checking where to put sshd.pid" >&5
  if test '!' -d $PIDDIR; then
    PIDDIR="$ETCDIR"
  fi
-@@ -7505,7 +8201,7 @@
+@@ -7505,7 +8203,7 @@
  # Ultrix sh set writes to stderr and can't be redirected directly,
  # and sets the high bit in the cache file unless we assign to the vars.
  (set) 2>&1 |
@@ -4472,7 +4474,7 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
    *ac_space=\ *)
      # `set' does not quote correctly, so add quotes (double-quote substitution
      # turns \\\\ into \\, and sed turns \\ into \).
-@@ -7572,7 +8268,7 @@
+@@ -7572,7 +8270,7 @@
      echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
      exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
    -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
@@ -4481,7 +4483,7 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
      exit 0 ;;
    -help | --help | --hel | --he | --h)
      echo "\$ac_cs_usage"; exit 0 ;;
-@@ -7583,7 +8279,7 @@
+@@ -7583,7 +8281,7 @@
  ac_given_srcdir=$srcdir
  ac_given_INSTALL="$INSTALL"
  
@@ -4490,7 +4492,7 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
  EOF
  cat >> $CONFIG_STATUS <<EOF
  
-@@ -7592,9 +8288,11 @@
+@@ -7592,9 +8290,11 @@
   s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
  $ac_vpsub
  $extrasub
@@ -4502,7 +4504,7 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
  s%@DEFS@%$DEFS%g
  s%@LDFLAGS@%$LDFLAGS%g
  s%@LIBS@%$LIBS%g
-@@ -7623,6 +8321,7 @@
+@@ -7623,6 +8323,7 @@
  s%@LIBOBJS@%$LIBOBJS%g
  s%@LN_S@%$LN_S%g
  s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
@@ -4510,7 +4512,7 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
  s%@INSTALL_DATA@%$INSTALL_DATA%g
  s%@AR@%$AR%g
  s%@RANLIB@%$RANLIB%g
-@@ -7641,6 +8340,9 @@
+@@ -7641,6 +8342,9 @@
  s%@KERBEROS_INCS@%$KERBEROS_INCS%g
  s%@KERBEROS_LIBS@%$KERBEROS_LIBS%g
  s%@KERBEROS_OBJS@%$KERBEROS_OBJS%g
@@ -4520,7 +4522,7 @@ $NetBSD: patch-aj,v 1.10 1999/12/28 03:54:21 kim Exp $
  s%@WRAPLIBS@%$WRAPLIBS%g
  s%@subdirs@%$subdirs%g
  s%@ETCDIR@%$ETCDIR%g
-@@ -7691,7 +8393,7 @@
+@@ -7691,7 +8395,7 @@
  
  cat >> $CONFIG_STATUS <<EOF