New chroot patch, for 2.1.1p4

Ricardo Cerqueira rmcc at novis.pt
Sat Aug 26 10:53:53 EST 2000


Hi there, everybody;

As promised, here's the new version for my chroot patch.
It applies cleanly over OpenSSH 2.1.1p4, and I'm attaching 2 versions: 
		
	- openssh-2.1.1p4-chroot.patch-wc, is the chroot patch plus
	  a "--with-chroot" patch for the "configure" script.
	- openssh-2.1.1p4-chroot.patch, is the same without the
	  "--with-chroot" part.

Have fun, and please warn me if somethings wrong. Be aware this is not
plug-and-pray. Just like common FTP daemons, the new root needs to contain
at least a copy of a minimal working filesystem. (libs, bins, etc, confs)

RC

-- 
+-------------------
| Ricardo Cerqueira  
| PGP Key fingerprint  -  B7 05 13 CE 48 0A BF 1E  87 21 83 DB 28 DE 03 42 
| Novis  -  Engenharia ISP / Rede Técnica 
| Pç. Duque Saldanha, 1, 7º E / 1050-094 Lisboa / Portugal
| Tel: +351 21 0100000 - Fax: +351 21 0100001
-------------- next part --------------
diff -u --new-file openssh-2.1.1p4/acconfig.h openssh-2.1.1p4-chroot/acconfig.h
--- openssh-2.1.1p4/acconfig.h	Sat Jul 15 05:59:14 2000
+++ openssh-2.1.1p4-chroot/acconfig.h	Sat Aug 26 01:38:01 2000
@@ -158,6 +158,9 @@
 /* Define if you want to allow MD5 passwords */
 #undef HAVE_MD5_PASSWORDS
 
+/* Define if you want to use chrooting when a magic token is found */
+#undef CHROOT
+
 /* Define if you want to disable shadow passwords */
 #undef DISABLE_SHADOW
 
diff -u --new-file openssh-2.1.1p4/config.h.in openssh-2.1.1p4-chroot/config.h.in
--- openssh-2.1.1p4/config.h.in	Sun Jul 16 04:26:46 2000
+++ openssh-2.1.1p4-chroot/config.h.in	Sat Aug 26 01:36:49 2000
@@ -148,6 +148,9 @@
 /* Define if you want to allow MD5 passwords */
 #undef HAVE_MD5_PASSWORDS
 
+/* Define if you want to use chrooting when a magic token is found */
+#undef CHROOT
+
 /* Define if you want to disable shadow passwords */
 #undef DISABLE_SHADOW
 
diff -u --new-file openssh-2.1.1p4/configure openssh-2.1.1p4-chroot/configure
--- openssh-2.1.1p4/configure	Sat Aug 26 01:31:35 2000
+++ openssh-2.1.1p4-chroot/configure	Sat Aug 26 01:38:43 2000
@@ -42,6 +42,8 @@
 ac_help="$ac_help
   --with-md5-passwords    Enable use of MD5 passwords"
 ac_help="$ac_help
+  --with-chroot           Enable user chrooting through magic token"
+ac_help="$ac_help
   --without-shadow        Disable shadow password support"
 ac_help="$ac_help
   --with-ipaddr-display   Use ip address instead of hostname in \$DISPLAY"
@@ -588,7 +590,7 @@
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:592: checking for $ac_word" >&5
+echo "configure:594: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -618,7 +620,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:622: checking for $ac_word" >&5
+echo "configure:624: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -669,7 +671,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:673: checking for $ac_word" >&5
+echo "configure:675: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -701,7 +703,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:705: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:707: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -712,12 +714,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 716 "configure"
+#line 718 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -743,12 +745,12 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:747: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:749: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:752: checking whether we are using GNU C" >&5
+echo "configure:754: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -757,7 +759,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:761: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:763: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -776,7 +778,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:780: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:782: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -833,7 +835,7 @@
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:837: checking host system type" >&5
+echo "configure:839: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -856,7 +858,7 @@
 
 # Checks for programs.
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:860: checking how to run the C preprocessor" >&5
+echo "configure:862: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -871,13 +873,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 875 "configure"
+#line 877 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:881: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:883: \"$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
   :
@@ -888,13 +890,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 892 "configure"
+#line 894 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:900: \"$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
   :
@@ -905,13 +907,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 909 "configure"
+#line 911 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:915: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:917: \"$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
   :
@@ -938,7 +940,7 @@
 # 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:942: checking for $ac_word" >&5
+echo "configure:944: 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
@@ -977,7 +979,7 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./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:981: checking for a BSD compatible install" >&5
+echo "configure:983: 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
@@ -1032,7 +1034,7 @@
 # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1036: checking for $ac_word" >&5
+echo "configure:1038: 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
@@ -1061,7 +1063,7 @@
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1065: checking for $ac_word" >&5
+echo "configure:1067: 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
@@ -1097,7 +1099,7 @@
 # Extract the first word of "ent", so it can be a program name with args.
 set dummy ent; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1101: checking for $ac_word" >&5
+echo "configure:1103: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_ENT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1138,21 +1140,21 @@
 	
 # C Compiler features
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:1142: checking for inline" >&5
+echo "configure:1144: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 1149 "configure"
+#line 1151 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:1156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -1191,12 +1193,12 @@
 		blibpath="/usr/lib:/lib:/usr/local/lib"
 	fi
 	echo $ac_n "checking for authenticate""... $ac_c" 1>&6
-echo "configure:1195: checking for authenticate" >&5
+echo "configure:1197: checking for authenticate" >&5
 if eval "test \"`echo '$''{'ac_cv_func_authenticate'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1200 "configure"
+#line 1202 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char authenticate(); below.  */
@@ -1219,7 +1221,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_authenticate=yes"
 else
@@ -1264,7 +1266,7 @@
 EOF
 
 	echo $ac_n "checking for HPUX trusted system password database""... $ac_c" 1>&6
-echo "configure:1268: checking for HPUX trusted system password database" >&5
+echo "configure:1270: checking for HPUX trusted system password database" >&5
 	if test -f /tcb/files/auth/system/default; then
 		echo "$ac_t""yes" 1>&6
 		cat >> confdefs.h <<\EOF
@@ -1293,7 +1295,7 @@
 EOF
 
 	echo $ac_n "checking for HPUX trusted system password database""... $ac_c" 1>&6
-echo "configure:1297: checking for HPUX trusted system password database" >&5
+echo "configure:1299: checking for HPUX trusted system password database" >&5
 	if test -f /tcb/files/auth/system/default; then
 		echo "$ac_t""yes" 1>&6
 		cat >> confdefs.h <<\EOF
@@ -1374,7 +1376,7 @@
 	# hardwire lastlog location (can't detect it on some versions)
 	conf_lastlog_location="/var/adm/lastlog"
 	echo $ac_n "checking for obsolete utmp and wtmp in solaris2.x""... $ac_c" 1>&6
-echo "configure:1378: checking for obsolete utmp and wtmp in solaris2.x" >&5
+echo "configure:1380: checking for obsolete utmp and wtmp in solaris2.x" >&5
 	sol2ver=`echo "$host"| sed -e 's/.*[0-9]\.//'`
 	if test "$sol2ver" -ge 8; then
 		echo "$ac_t""yes" 1>&6
@@ -1395,12 +1397,12 @@
 	for ac_func in getpwanam
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1399: checking for $ac_func" >&5
+echo "configure:1401: 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 1404 "configure"
+#line 1406 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1423,7 +1425,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1429: \"$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
@@ -1478,7 +1480,7 @@
 # This is untested
 	if test ! -z "USE_SIA" ; then
 		echo $ac_n "checking for Digital Unix Security Integration Architecture""... $ac_c" 1>&6
-echo "configure:1482: checking for Digital Unix Security Integration Architecture" >&5
+echo "configure:1484: checking for Digital Unix Security Integration Architecture" >&5
 		if test -f /etc/sia/matrix.conf; then
 			echo "$ac_t""yes" 1>&6
 			cat >> confdefs.h <<\EOF
@@ -1535,7 +1537,7 @@
 
 # Checks for libraries.
 echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
-echo "configure:1539: checking for deflate in -lz" >&5
+echo "configure:1541: checking for deflate in -lz" >&5
 ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1543,7 +1545,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lz  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1547 "configure"
+#line 1549 "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
@@ -1554,7 +1556,7 @@
 deflate()
 ; return 0; }
 EOF
-if { (eval echo configure:1558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1560: \"$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
@@ -1583,7 +1585,7 @@
 fi
 
 echo $ac_n "checking for login in -lutil""... $ac_c" 1>&6
-echo "configure:1587: checking for login in -lutil" >&5
+echo "configure:1589: checking for login in -lutil" >&5
 ac_lib_var=`echo util'_'login | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1591,7 +1593,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lutil  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1595 "configure"
+#line 1597 "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
@@ -1602,7 +1604,7 @@
 login()
 ; return 0; }
 EOF
-if { (eval echo configure:1606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1608: \"$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
@@ -1628,7 +1630,7 @@
 
 if test -z "$no_libsocket" ; then
 	echo $ac_n "checking for yp_match in -lnsl""... $ac_c" 1>&6
-echo "configure:1632: checking for yp_match in -lnsl" >&5
+echo "configure:1634: checking for yp_match in -lnsl" >&5
 ac_lib_var=`echo nsl'_'yp_match | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1636,7 +1638,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1640 "configure"
+#line 1642 "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
@@ -1647,7 +1649,7 @@
 yp_match()
 ; return 0; }
 EOF
-if { (eval echo configure:1651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1653: \"$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
@@ -1677,7 +1679,7 @@
 fi
 if test -z "$no_libnsl" ; then
 	echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
-echo "configure:1681: checking for main in -lsocket" >&5
+echo "configure:1683: checking for main in -lsocket" >&5
 ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1685,14 +1687,14 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1689 "configure"
+#line 1691 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:1696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1698: \"$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
@@ -1726,17 +1728,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1730: checking for $ac_hdr" >&5
+echo "configure:1732: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1735 "configure"
+#line 1737 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1740: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1742: \"$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*
@@ -1767,12 +1769,12 @@
 for ac_func in arc4random atexit b64_ntop bcopy bindresvport_af clock freeaddrinfo gai_strerror getaddrinfo getnameinfo getrusage inet_aton innetgr md5_crypt memmove mkdtemp on_exit openpty rresvport_af setenv seteuid setlogin setproctitle setreuid sigaction sigvec snprintf strerror strlcat strlcpy strsep vsnprintf vhangup _getpty __b64_ntop
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1771: checking for $ac_func" >&5
+echo "configure:1773: 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 1776 "configure"
+#line 1778 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1795,7 +1797,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1801: \"$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
@@ -1822,12 +1824,12 @@
 for ac_func in gettimeofday time
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1826: checking for $ac_func" >&5
+echo "configure:1828: 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 1831 "configure"
+#line 1833 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1850,7 +1852,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1856: \"$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
@@ -1877,12 +1879,12 @@
 for ac_func in login logout updwtmp logwtmp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1881: checking for $ac_func" >&5
+echo "configure:1883: 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 1886 "configure"
+#line 1888 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1905,7 +1907,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1911: \"$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
@@ -1932,12 +1934,12 @@
 for ac_func in entutent getutent getutid getutline pututline setutent
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1936: checking for $ac_func" >&5
+echo "configure:1938: 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 1941 "configure"
+#line 1943 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1960,7 +1962,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1966: \"$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
@@ -1987,12 +1989,12 @@
 for ac_func in utmpname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1991: checking for $ac_func" >&5
+echo "configure:1993: 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 1996 "configure"
+#line 1998 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2015,7 +2017,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2021: \"$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
@@ -2042,12 +2044,12 @@
 for ac_func in entutxent getutxent getutxid getutxline pututxline 
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2046: checking for $ac_func" >&5
+echo "configure:2048: 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 2051 "configure"
+#line 2053 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2070,7 +2072,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2076: \"$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
@@ -2097,12 +2099,12 @@
 for ac_func in setutxent utmpxname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2101: checking for $ac_func" >&5
+echo "configure:2103: 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 2106 "configure"
+#line 2108 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2125,7 +2127,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2131: \"$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
@@ -2151,12 +2153,12 @@
 
 
 echo $ac_n "checking for getuserattr""... $ac_c" 1>&6
-echo "configure:2155: checking for getuserattr" >&5
+echo "configure:2157: checking for getuserattr" >&5
 if eval "test \"`echo '$''{'ac_cv_func_getuserattr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2160 "configure"
+#line 2162 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getuserattr(); below.  */
@@ -2179,7 +2181,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_getuserattr=yes"
 else
@@ -2200,7 +2202,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for getuserattr in -ls""... $ac_c" 1>&6
-echo "configure:2204: checking for getuserattr in -ls" >&5
+echo "configure:2206: checking for getuserattr in -ls" >&5
 ac_lib_var=`echo s'_'getuserattr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2208,7 +2210,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ls  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2212 "configure"
+#line 2214 "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
@@ -2219,7 +2221,7 @@
 getuserattr()
 ; return 0; }
 EOF
-if { (eval echo configure:2223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2225: \"$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
@@ -2247,12 +2249,12 @@
 
 
 echo $ac_n "checking for login""... $ac_c" 1>&6
-echo "configure:2251: checking for login" >&5
+echo "configure:2253: checking for login" >&5
 if eval "test \"`echo '$''{'ac_cv_func_login'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2256 "configure"
+#line 2258 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char login(); below.  */
@@ -2275,7 +2277,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_login=yes"
 else
@@ -2296,7 +2298,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for login in -lbsd""... $ac_c" 1>&6
-echo "configure:2300: checking for login in -lbsd" >&5
+echo "configure:2302: checking for login in -lbsd" >&5
 ac_lib_var=`echo bsd'_'login | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2304,7 +2306,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lbsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2308 "configure"
+#line 2310 "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
@@ -2315,7 +2317,7 @@
 login()
 ; return 0; }
 EOF
-if { (eval echo configure:2319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2321: \"$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
@@ -2343,12 +2345,12 @@
 
 
 echo $ac_n "checking for daemon""... $ac_c" 1>&6
-echo "configure:2347: checking for daemon" >&5
+echo "configure:2349: checking for daemon" >&5
 if eval "test \"`echo '$''{'ac_cv_func_daemon'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2352 "configure"
+#line 2354 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char daemon(); below.  */
@@ -2371,7 +2373,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_daemon=yes"
 else
@@ -2392,7 +2394,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for daemon in -lbsd""... $ac_c" 1>&6
-echo "configure:2396: checking for daemon in -lbsd" >&5
+echo "configure:2398: checking for daemon in -lbsd" >&5
 ac_lib_var=`echo bsd'_'daemon | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2400,7 +2402,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lbsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2404 "configure"
+#line 2406 "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
@@ -2411,7 +2413,7 @@
 daemon()
 ; return 0; }
 EOF
-if { (eval echo configure:2415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2417: \"$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
@@ -2439,12 +2441,12 @@
 
 
 echo $ac_n "checking for getpagesize""... $ac_c" 1>&6
-echo "configure:2443: checking for getpagesize" >&5
+echo "configure:2445: checking for getpagesize" >&5
 if eval "test \"`echo '$''{'ac_cv_func_getpagesize'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2448 "configure"
+#line 2450 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getpagesize(); below.  */
@@ -2467,7 +2469,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_getpagesize=yes"
 else
@@ -2488,7 +2490,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for getpagesize in -lucb""... $ac_c" 1>&6
-echo "configure:2492: checking for getpagesize in -lucb" >&5
+echo "configure:2494: checking for getpagesize in -lucb" >&5
 ac_lib_var=`echo ucb'_'getpagesize | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2496,7 +2498,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lucb  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2500 "configure"
+#line 2502 "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
@@ -2507,7 +2509,7 @@
 getpagesize()
 ; return 0; }
 EOF
-if { (eval echo configure:2511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2513: \"$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
@@ -2537,19 +2539,19 @@
 # Check for broken snprintf
 if test "x$ac_cv_func_snprintf" = "xyes" ; then
 	echo $ac_n "checking whether snprintf correctly terminates long strings""... $ac_c" 1>&6
-echo "configure:2541: checking whether snprintf correctly terminates long strings" >&5
+echo "configure:2543: checking whether snprintf correctly terminates long strings" >&5
 	if test "$cross_compiling" = yes; then
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 2546 "configure"
+#line 2548 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
 int main(void){char b[5];snprintf(b,5,"123456789");return(b[4]!='\0');}
 		
 EOF
-if { (eval echo configure:2553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   echo "$ac_t""yes" 1>&6
 else
@@ -2590,7 +2592,7 @@
 
 if (test -z "$no_pam" && test "x$ac_cv_header_security_pam_appl_h" = "xyes") ; then
 	echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:2594: checking for dlopen in -ldl" >&5
+echo "configure:2596: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2598,7 +2600,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2602 "configure"
+#line 2604 "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
@@ -2609,7 +2611,7 @@
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:2613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2615: \"$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
@@ -2641,12 +2643,12 @@
 	for ac_func in pam_getenvlist
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2645: checking for $ac_func" >&5
+echo "configure:2647: 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 2650 "configure"
+#line 2652 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2669,7 +2671,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2675: \"$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
@@ -2700,9 +2702,9 @@
 
 	# Check PAM strerror arguments (old PAM)
 	echo $ac_n "checking whether pam_strerror takes only one argument""... $ac_c" 1>&6
-echo "configure:2704: checking whether pam_strerror takes only one argument" >&5
+echo "configure:2706: checking whether pam_strerror takes only one argument" >&5
 	cat > conftest.$ac_ext <<EOF
-#line 2706 "configure"
+#line 2708 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -2712,7 +2714,7 @@
 (void)pam_strerror((pam_handle_t *)NULL, -1);
 ; return 0; }
 EOF
-if { (eval echo configure:2716: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2718: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""no" 1>&6
 else
@@ -2752,7 +2754,7 @@
 	tryssldir="$tryssldir $prefix"
 fi
 echo $ac_n "checking for OpenSSL directory""... $ac_c" 1>&6
-echo "configure:2756: checking for OpenSSL directory" >&5
+echo "configure:2758: checking for OpenSSL directory" >&5
 if eval "test \"`echo '$''{'ac_cv_openssldir'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2777,7 +2779,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 2781 "configure"
+#line 2783 "configure"
 #include "confdefs.h"
 
 #include <string.h>
@@ -2791,7 +2793,7 @@
 }
 			
 EOF
-if { (eval echo configure:2795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
 				found_crypto=1
@@ -2846,7 +2848,7 @@
 # Now test RSA support
 saved_LIBS="$LIBS"
 echo $ac_n "checking for RSA support""... $ac_c" 1>&6
-echo "configure:2850: checking for RSA support" >&5
+echo "configure:2852: checking for RSA support" >&5
 for WANTS_RSAREF in "" 1 ; do
 	if test -z "$WANTS_RSAREF" ; then
 		LIBS="$saved_LIBS"
@@ -2857,7 +2859,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 2861 "configure"
+#line 2863 "configure"
 #include "confdefs.h"
 
 #include <string.h>
@@ -2876,7 +2878,7 @@
 }
 	
 EOF
-if { (eval echo configure:2880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
 		rsa_works=1
@@ -2912,7 +2914,7 @@
 
 # Checks for data types
 echo $ac_n "checking size of char""... $ac_c" 1>&6
-echo "configure:2916: checking size of char" >&5
+echo "configure:2918: checking size of char" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2920,7 +2922,7 @@
   ac_cv_sizeof_char=1
 else
   cat > conftest.$ac_ext <<EOF
-#line 2924 "configure"
+#line 2926 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -2931,7 +2933,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:2935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_char=`cat conftestval`
 else
@@ -2951,7 +2953,7 @@
 
 
 echo $ac_n "checking size of short int""... $ac_c" 1>&6
-echo "configure:2955: checking size of short int" >&5
+echo "configure:2957: checking size of short int" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_short_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2959,7 +2961,7 @@
   ac_cv_sizeof_short_int=2
 else
   cat > conftest.$ac_ext <<EOF
-#line 2963 "configure"
+#line 2965 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -2970,7 +2972,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:2974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_short_int=`cat conftestval`
 else
@@ -2990,7 +2992,7 @@
 
 
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:2994: checking size of int" >&5
+echo "configure:2996: checking size of int" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2998,7 +3000,7 @@
   ac_cv_sizeof_int=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 3002 "configure"
+#line 3004 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -3009,7 +3011,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:3013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -3029,7 +3031,7 @@
 
 
 echo $ac_n "checking size of long int""... $ac_c" 1>&6
-echo "configure:3033: checking size of long int" >&5
+echo "configure:3035: checking size of long int" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3037,7 +3039,7 @@
   ac_cv_sizeof_long_int=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 3041 "configure"
+#line 3043 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -3048,7 +3050,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:3052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long_int=`cat conftestval`
 else
@@ -3068,7 +3070,7 @@
 
 
 echo $ac_n "checking size of long long int""... $ac_c" 1>&6
-echo "configure:3072: checking size of long long int" >&5
+echo "configure:3074: checking size of long long int" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3076,7 +3078,7 @@
   ac_cv_sizeof_long_long_int=8
 else
   cat > conftest.$ac_ext <<EOF
-#line 3080 "configure"
+#line 3082 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -3087,7 +3089,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:3091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long_long_int=`cat conftestval`
 else
@@ -3109,20 +3111,20 @@
 
 # More checks for data types
 echo $ac_n "checking for intXX_t types""... $ac_c" 1>&6
-echo "configure:3113: checking for intXX_t types" >&5
+echo "configure:3115: checking for intXX_t types" >&5
 if eval "test \"`echo '$''{'ac_cv_have_intxx_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 3119 "configure"
+#line 3121 "configure"
 #include "confdefs.h"
  #include <sys/types.h> 
 int main() {
  int8_t a; int16_t b; int32_t c; a = b = c = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:3126: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3128: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ac_cv_have_intxx_t="yes" 
 else
@@ -3146,20 +3148,20 @@
 fi
 	
 echo $ac_n "checking for u_intXX_t types""... $ac_c" 1>&6
-echo "configure:3150: checking for u_intXX_t types" >&5
+echo "configure:3152: checking for u_intXX_t types" >&5
 if eval "test \"`echo '$''{'ac_cv_have_u_intxx_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 3156 "configure"
+#line 3158 "configure"
 #include "confdefs.h"
  #include <sys/types.h> 
 int main() {
  u_int8_t a; u_int16_t b; u_int32_t c; a = b = c = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:3163: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3165: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ac_cv_have_u_intxx_t="yes" 
 else
@@ -3187,9 +3189,9 @@
            test "x$ac_cv_header_sys_bitypes_h" = "xyes")
 then
 	echo $ac_n "checking for intXX_t and u_intXX_t types in sys/bitypes.h""... $ac_c" 1>&6
-echo "configure:3191: checking for intXX_t and u_intXX_t types in sys/bitypes.h" >&5
+echo "configure:3193: checking for intXX_t and u_intXX_t types in sys/bitypes.h" >&5
 	cat > conftest.$ac_ext <<EOF
-#line 3193 "configure"
+#line 3195 "configure"
 #include "confdefs.h"
 
 #include <sys/bitypes.h>
@@ -3202,7 +3204,7 @@
 		
 ; return 0; }
 EOF
-if { (eval echo configure:3206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 			cat >> confdefs.h <<\EOF
@@ -3227,13 +3229,13 @@
 
 if test -z "$have_u_intxx_t" ; then
 	echo $ac_n "checking for uintXX_t types""... $ac_c" 1>&6
-echo "configure:3231: checking for uintXX_t types" >&5
+echo "configure:3233: checking for uintXX_t types" >&5
 if eval "test \"`echo '$''{'ac_cv_have_uintxx_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 3237 "configure"
+#line 3239 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -3242,7 +3244,7 @@
  uint8_t a; uint16_t b; uint32_t c; a = b = c = 1; 
 ; return 0; }
 EOF
-if { (eval echo configure:3246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3248: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ac_cv_have_uintxx_t="yes" 
 else
@@ -3266,13 +3268,13 @@
 fi
 
 echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
-echo "configure:3270: checking for socklen_t" >&5
+echo "configure:3272: checking for socklen_t" >&5
 if eval "test \"`echo '$''{'ac_cv_have_socklen_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 3276 "configure"
+#line 3278 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -3282,7 +3284,7 @@
 socklen_t foo; foo = 1235;
 ; return 0; }
 EOF
-if { (eval echo configure:3286: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3288: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ac_cv_have_socklen_t="yes" 
 else
@@ -3305,13 +3307,13 @@
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3309: checking for size_t" >&5
+echo "configure:3311: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_have_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 3315 "configure"
+#line 3317 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -3320,7 +3322,7 @@
  size_t foo; foo = 1235; 
 ; return 0; }
 EOF
-if { (eval echo configure:3324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ac_cv_have_size_t="yes" 
 else
@@ -3343,13 +3345,13 @@
 fi
 
 echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
-echo "configure:3347: checking for ssize_t" >&5
+echo "configure:3349: checking for ssize_t" >&5
 if eval "test \"`echo '$''{'ac_cv_have_ssize_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 3353 "configure"
+#line 3355 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -3358,7 +3360,7 @@
  ssize_t foo; foo = 1235; 
 ; return 0; }
 EOF
-if { (eval echo configure:3362: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3364: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ac_cv_have_ssize_t="yes" 
 else
@@ -3381,13 +3383,13 @@
 fi
 
 echo $ac_n "checking for sa_family_t""... $ac_c" 1>&6
-echo "configure:3385: checking for sa_family_t" >&5
+echo "configure:3387: checking for sa_family_t" >&5
 if eval "test \"`echo '$''{'ac_cv_have_sa_family_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 3391 "configure"
+#line 3393 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -3397,7 +3399,7 @@
  sa_family_t foo; foo = 1235; 
 ; return 0; }
 EOF
-if { (eval echo configure:3401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3403: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ac_cv_have_sa_family_t="yes" 
 else
@@ -3420,13 +3422,13 @@
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:3424: checking for pid_t" >&5
+echo "configure:3426: checking for pid_t" >&5
 if eval "test \"`echo '$''{'ac_cv_have_pid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 3430 "configure"
+#line 3432 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -3435,7 +3437,7 @@
  pid_t foo; foo = 1235; 
 ; return 0; }
 EOF
-if { (eval echo configure:3439: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3441: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ac_cv_have_pid_t="yes" 
 else
@@ -3458,13 +3460,13 @@
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:3462: checking for mode_t" >&5
+echo "configure:3464: checking for mode_t" >&5
 if eval "test \"`echo '$''{'ac_cv_have_mode_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 3468 "configure"
+#line 3470 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -3473,7 +3475,7 @@
  mode_t foo; foo = 1235; 
 ; return 0; }
 EOF
-if { (eval echo configure:3477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ac_cv_have_mode_t="yes" 
 else
@@ -3497,13 +3499,13 @@
 
 
 echo $ac_n "checking for struct sockaddr_storage""... $ac_c" 1>&6
-echo "configure:3501: checking for struct sockaddr_storage" >&5
+echo "configure:3503: checking for struct sockaddr_storage" >&5
 if eval "test \"`echo '$''{'ac_cv_have_struct_sockaddr_storage'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 3507 "configure"
+#line 3509 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -3513,7 +3515,7 @@
  struct sockaddr_storage s; 
 ; return 0; }
 EOF
-if { (eval echo configure:3517: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ac_cv_have_struct_sockaddr_storage="yes" 
 else
@@ -3536,13 +3538,13 @@
 fi
 
 echo $ac_n "checking for struct sockaddr_in6""... $ac_c" 1>&6
-echo "configure:3540: checking for struct sockaddr_in6" >&5
+echo "configure:3542: checking for struct sockaddr_in6" >&5
 if eval "test \"`echo '$''{'ac_cv_have_struct_sockaddr_in6'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 3546 "configure"
+#line 3548 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -3552,7 +3554,7 @@
  struct sockaddr_in6 s; s.sin6_family = 0; 
 ; return 0; }
 EOF
-if { (eval echo configure:3556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ac_cv_have_struct_sockaddr_in6="yes" 
 else
@@ -3575,13 +3577,13 @@
 fi
 
 echo $ac_n "checking for struct in6_addr""... $ac_c" 1>&6
-echo "configure:3579: checking for struct in6_addr" >&5
+echo "configure:3581: checking for struct in6_addr" >&5
 if eval "test \"`echo '$''{'ac_cv_have_struct_in6_addr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 3585 "configure"
+#line 3587 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -3591,7 +3593,7 @@
  struct in6_addr s; s.s6_addr[0] = 0; 
 ; return 0; }
 EOF
-if { (eval echo configure:3595: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3597: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ac_cv_have_struct_in6_addr="yes" 
 else
@@ -3614,13 +3616,13 @@
 fi
 
 echo $ac_n "checking for struct addrinfo""... $ac_c" 1>&6
-echo "configure:3618: checking for struct addrinfo" >&5
+echo "configure:3620: checking for struct addrinfo" >&5
 if eval "test \"`echo '$''{'ac_cv_have_struct_addrinfo'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 3624 "configure"
+#line 3626 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -3631,7 +3633,7 @@
  struct addrinfo s; s.ai_flags = AI_PASSIVE; 
 ; return 0; }
 EOF
-if { (eval echo configure:3635: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3637: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ac_cv_have_struct_addrinfo="yes" 
 else
@@ -3661,13 +3663,13 @@
 		ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"ut_host
 	echo $ac_n "checking for ut_host field in utmp.h""... $ac_c" 1>&6
-echo "configure:3665: checking for ut_host field in utmp.h" >&5
+echo "configure:3667: checking for ut_host field in utmp.h" >&5
 	if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 3671 "configure"
+#line 3673 "configure"
 #include "confdefs.h"
 #include <utmp.h>
 EOF
@@ -3701,13 +3703,13 @@
 		ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"ut_host
 	echo $ac_n "checking for ut_host field in utmpx.h""... $ac_c" 1>&6
-echo "configure:3705: checking for ut_host field in utmpx.h" >&5
+echo "configure:3707: checking for ut_host field in utmpx.h" >&5
 	if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 3711 "configure"
+#line 3713 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
 EOF
@@ -3741,13 +3743,13 @@
 		ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"syslen
 	echo $ac_n "checking for syslen field in utmpx.h""... $ac_c" 1>&6
-echo "configure:3745: checking for syslen field in utmpx.h" >&5
+echo "configure:3747: checking for syslen field in utmpx.h" >&5
 	if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 3751 "configure"
+#line 3753 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
 EOF
@@ -3781,13 +3783,13 @@
 		ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"ut_pid
 	echo $ac_n "checking for ut_pid field in utmp.h""... $ac_c" 1>&6
-echo "configure:3785: checking for ut_pid field in utmp.h" >&5
+echo "configure:3787: checking for ut_pid field in utmp.h" >&5
 	if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 3791 "configure"
+#line 3793 "configure"
 #include "confdefs.h"
 #include <utmp.h>
 EOF
@@ -3821,13 +3823,13 @@
 		ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"ut_type
 	echo $ac_n "checking for ut_type field in utmp.h""... $ac_c" 1>&6
-echo "configure:3825: checking for ut_type field in utmp.h" >&5
+echo "configure:3827: checking for ut_type field in utmp.h" >&5
 	if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 3831 "configure"
+#line 3833 "configure"
 #include "confdefs.h"
 #include <utmp.h>
 EOF
@@ -3861,13 +3863,13 @@
 		ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"ut_type
 	echo $ac_n "checking for ut_type field in utmpx.h""... $ac_c" 1>&6
-echo "configure:3865: checking for ut_type field in utmpx.h" >&5
+echo "configure:3867: checking for ut_type field in utmpx.h" >&5
 	if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 3871 "configure"
+#line 3873 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
 EOF
@@ -3901,13 +3903,13 @@
 		ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"ut_tv
 	echo $ac_n "checking for ut_tv field in utmp.h""... $ac_c" 1>&6
-echo "configure:3905: checking for ut_tv field in utmp.h" >&5
+echo "configure:3907: checking for ut_tv field in utmp.h" >&5
 	if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 3911 "configure"
+#line 3913 "configure"
 #include "confdefs.h"
 #include <utmp.h>
 EOF
@@ -3941,13 +3943,13 @@
 		ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"ut_id
 	echo $ac_n "checking for ut_id field in utmp.h""... $ac_c" 1>&6
-echo "configure:3945: checking for ut_id field in utmp.h" >&5
+echo "configure:3947: checking for ut_id field in utmp.h" >&5
 	if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 3951 "configure"
+#line 3953 "configure"
 #include "confdefs.h"
 #include <utmp.h>
 EOF
@@ -3981,13 +3983,13 @@
 		ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"ut_id
 	echo $ac_n "checking for ut_id field in utmpx.h""... $ac_c" 1>&6
-echo "configure:3985: checking for ut_id field in utmpx.h" >&5
+echo "configure:3987: checking for ut_id field in utmpx.h" >&5
 	if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 3991 "configure"
+#line 3993 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
 EOF
@@ -4021,13 +4023,13 @@
 		ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr
 	echo $ac_n "checking for ut_addr field in utmp.h""... $ac_c" 1>&6
-echo "configure:4025: checking for ut_addr field in utmp.h" >&5
+echo "configure:4027: checking for ut_addr field in utmp.h" >&5
 	if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 4031 "configure"
+#line 4033 "configure"
 #include "confdefs.h"
 #include <utmp.h>
 EOF
@@ -4061,13 +4063,13 @@
 		ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr
 	echo $ac_n "checking for ut_addr field in utmpx.h""... $ac_c" 1>&6
-echo "configure:4065: checking for ut_addr field in utmpx.h" >&5
+echo "configure:4067: checking for ut_addr field in utmpx.h" >&5
 	if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 4071 "configure"
+#line 4073 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
 EOF
@@ -4101,13 +4103,13 @@
 		ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr_v6
 	echo $ac_n "checking for ut_addr_v6 field in utmp.h""... $ac_c" 1>&6
-echo "configure:4105: checking for ut_addr_v6 field in utmp.h" >&5
+echo "configure:4107: checking for ut_addr_v6 field in utmp.h" >&5
 	if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 4111 "configure"
+#line 4113 "configure"
 #include "confdefs.h"
 #include <utmp.h>
 EOF
@@ -4141,13 +4143,13 @@
 		ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr_v6
 	echo $ac_n "checking for ut_addr_v6 field in utmpx.h""... $ac_c" 1>&6
-echo "configure:4145: checking for ut_addr_v6 field in utmpx.h" >&5
+echo "configure:4147: checking for ut_addr_v6 field in utmpx.h" >&5
 	if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 4151 "configure"
+#line 4153 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
 EOF
@@ -4181,13 +4183,13 @@
 		ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"ut_exit
 	echo $ac_n "checking for ut_exit field in utmp.h""... $ac_c" 1>&6
-echo "configure:4185: checking for ut_exit field in utmp.h" >&5
+echo "configure:4187: checking for ut_exit field in utmp.h" >&5
 	if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 4191 "configure"
+#line 4193 "configure"
 #include "confdefs.h"
 #include <utmp.h>
 EOF
@@ -4221,13 +4223,13 @@
 		ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"ut_time
 	echo $ac_n "checking for ut_time field in utmp.h""... $ac_c" 1>&6
-echo "configure:4225: checking for ut_time field in utmp.h" >&5
+echo "configure:4227: checking for ut_time field in utmp.h" >&5
 	if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 4231 "configure"
+#line 4233 "configure"
 #include "confdefs.h"
 #include <utmp.h>
 EOF
@@ -4261,13 +4263,13 @@
 		ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"ut_time
 	echo $ac_n "checking for ut_time field in utmpx.h""... $ac_c" 1>&6
-echo "configure:4265: checking for ut_time field in utmpx.h" >&5
+echo "configure:4267: checking for ut_time field in utmpx.h" >&5
 	if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 4271 "configure"
+#line 4273 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
 EOF
@@ -4301,13 +4303,13 @@
 		ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"ut_tv
 	echo $ac_n "checking for ut_tv field in utmpx.h""... $ac_c" 1>&6
-echo "configure:4305: checking for ut_tv field in utmpx.h" >&5
+echo "configure:4307: checking for ut_tv field in utmpx.h" >&5
 	if eval "test \"`echo '$''{'$ossh_varname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 		cat > conftest.$ac_ext <<EOF
-#line 4311 "configure"
+#line 4313 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
 EOF
@@ -4338,13 +4340,13 @@
 
 
 echo $ac_n "checking for ss_family field in struct sockaddr_storage""... $ac_c" 1>&6
-echo "configure:4342: checking for ss_family field in struct sockaddr_storage" >&5
+echo "configure:4344: checking for ss_family field in struct sockaddr_storage" >&5
 if eval "test \"`echo '$''{'ac_cv_have_ss_family_in_struct_ss'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 4348 "configure"
+#line 4350 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -4354,7 +4356,7 @@
  struct sockaddr_storage s; s.ss_family = 1; 
 ; return 0; }
 EOF
-if { (eval echo configure:4358: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ac_cv_have_ss_family_in_struct_ss="yes" 
 else
@@ -4376,13 +4378,13 @@
 fi
 
 echo $ac_n "checking for __ss_family field in struct sockaddr_storage""... $ac_c" 1>&6
-echo "configure:4380: checking for __ss_family field in struct sockaddr_storage" >&5
+echo "configure:4382: checking for __ss_family field in struct sockaddr_storage" >&5
 if eval "test \"`echo '$''{'ac_cv_have___ss_family_in_struct_ss'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 4386 "configure"
+#line 4388 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -4392,7 +4394,7 @@
  struct sockaddr_storage s; s.__ss_family = 1; 
 ; return 0; }
 EOF
-if { (eval echo configure:4396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4398: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    ac_cv_have___ss_family_in_struct_ss="yes" 
 else
@@ -4416,20 +4418,20 @@
 
 
 echo $ac_n "checking if libc defines __progname""... $ac_c" 1>&6
-echo "configure:4420: checking if libc defines __progname" >&5
+echo "configure:4422: checking if libc defines __progname" >&5
 if eval "test \"`echo '$''{'ac_cv_libc_defines___progname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 4426 "configure"
+#line 4428 "configure"
 #include "confdefs.h"
 
 int main() {
  extern char *__progname; printf("%s", __progname); 
 ; return 0; }
 EOF
-if { (eval echo configure:4433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    ac_cv_libc_defines___progname="yes" 
 else
@@ -4453,20 +4455,20 @@
 
 
 echo $ac_n "checking if libc defines sys_errlist""... $ac_c" 1>&6
-echo "configure:4457: checking if libc defines sys_errlist" >&5
+echo "configure:4459: checking if libc defines sys_errlist" >&5
 if eval "test \"`echo '$''{'ac_cv_libc_defines_sys_errlist'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 4463 "configure"
+#line 4465 "configure"
 #include "confdefs.h"
 
 int main() {
  extern const char *const sys_errlist[]; printf("%s", sys_errlist[0]);
 ; return 0; }
 EOF
-if { (eval echo configure:4470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    ac_cv_libc_defines_sys_errlist="yes" 
 else
@@ -4503,7 +4505,7 @@
 		# Extract the first word of "rsh", so it can be a program name with args.
 set dummy rsh; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4507: checking for $ac_word" >&5
+echo "configure:4509: 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
@@ -4553,7 +4555,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:4557: checking for $ac_word" >&5
+echo "configure:4559: 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
@@ -4619,7 +4621,7 @@
 	
 ac_safe=`echo ""/dev/ptmx"" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for "/dev/ptmx"""... $ac_c" 1>&6
-echo "configure:4623: checking for "/dev/ptmx"" >&5
+echo "configure:4625: checking for "/dev/ptmx"" >&5
 if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4652,7 +4654,7 @@
 
 ac_safe=`echo ""/dev/ptc"" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for "/dev/ptc"""... $ac_c" 1>&6
-echo "configure:4656: checking for "/dev/ptc"" >&5
+echo "configure:4658: checking for "/dev/ptc"" >&5
 if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4703,7 +4705,7 @@
 		
 ac_safe=`echo ""/dev/urandom"" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for "/dev/urandom"""... $ac_c" 1>&6
-echo "configure:4707: checking for "/dev/urandom"" >&5
+echo "configure:4709: checking for "/dev/urandom"" >&5
 if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4764,7 +4766,7 @@
 	# Extract the first word of "ls", so it can be a program name with args.
 set dummy ls; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4768: checking for $ac_word" >&5
+echo "configure:4770: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PROG_LS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4805,7 +4807,7 @@
 	# Extract the first word of "netstat", so it can be a program name with args.
 set dummy netstat; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4809: checking for $ac_word" >&5
+echo "configure:4811: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PROG_NETSTAT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4846,7 +4848,7 @@
 	# Extract the first word of "arp", so it can be a program name with args.
 set dummy arp; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4850: checking for $ac_word" >&5
+echo "configure:4852: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PROG_ARP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4887,7 +4889,7 @@
 	# Extract the first word of "ifconfig", so it can be a program name with args.
 set dummy ifconfig; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4891: checking for $ac_word" >&5
+echo "configure:4893: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PROG_IFCONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4928,7 +4930,7 @@
 	# Extract the first word of "ps", so it can be a program name with args.
 set dummy ps; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4932: checking for $ac_word" >&5
+echo "configure:4934: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PROG_PS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4969,7 +4971,7 @@
 	# Extract the first word of "w", so it can be a program name with args.
 set dummy w; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4973: checking for $ac_word" >&5
+echo "configure:4975: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PROG_W'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5010,7 +5012,7 @@
 	# Extract the first word of "who", so it can be a program name with args.
 set dummy who; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5014: checking for $ac_word" >&5
+echo "configure:5016: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PROG_WHO'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5051,7 +5053,7 @@
 	# Extract the first word of "last", so it can be a program name with args.
 set dummy last; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5055: checking for $ac_word" >&5
+echo "configure:5057: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PROG_LAST'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5092,7 +5094,7 @@
 	# Extract the first word of "lastlog", so it can be a program name with args.
 set dummy lastlog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5096: checking for $ac_word" >&5
+echo "configure:5098: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PROG_LASTLOG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5133,7 +5135,7 @@
 	# Extract the first word of "df", so it can be a program name with args.
 set dummy df; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5137: checking for $ac_word" >&5
+echo "configure:5139: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PROG_DF'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5174,7 +5176,7 @@
 	# Extract the first word of "vmstat", so it can be a program name with args.
 set dummy vmstat; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5178: checking for $ac_word" >&5
+echo "configure:5180: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PROG_VMSTAT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5215,7 +5217,7 @@
 	# Extract the first word of "uptime", so it can be a program name with args.
 set dummy uptime; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5219: checking for $ac_word" >&5
+echo "configure:5221: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PROG_UPTIME'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5256,7 +5258,7 @@
 	# Extract the first word of "ipcs", so it can be a program name with args.
 set dummy ipcs; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5260: checking for $ac_word" >&5
+echo "configure:5262: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PROG_IPCS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5297,7 +5299,7 @@
 	# Extract the first word of "tail", so it can be a program name with args.
 set dummy tail; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5301: checking for $ac_word" >&5
+echo "configure:5303: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PROG_TAIL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5338,7 +5340,7 @@
 	# Extract the first word of "ls", so it can be a program name with args.
 set dummy ls; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5342: checking for $ac_word" >&5
+echo "configure:5344: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PROG_LS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5432,17 +5434,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5436: checking for $ac_hdr" >&5
+echo "configure:5438: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5441 "configure"
+#line 5443 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5448: \"$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*
@@ -5469,7 +5471,7 @@
 done
 
 			echo $ac_n "checking for main in -lkrb""... $ac_c" 1>&6
-echo "configure:5473: checking for main in -lkrb" >&5
+echo "configure:5475: checking for main in -lkrb" >&5
 ac_lib_var=`echo krb'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5477,14 +5479,14 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lkrb  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5481 "configure"
+#line 5483 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5490: \"$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
@@ -5520,7 +5522,7 @@
 
 			KLIBS="-lkrb -ldes"
 			echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6
-echo "configure:5524: checking for dn_expand in -lresolv" >&5
+echo "configure:5526: 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
@@ -5528,7 +5530,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5532 "configure"
+#line 5534 "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
@@ -5539,7 +5541,7 @@
 dn_expand()
 ; return 0; }
 EOF
-if { (eval echo configure:5543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5545: \"$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
@@ -5640,9 +5642,9 @@
 			saved_LIBS="$LIBS"
 			LIBS="$LIBS -lwrap"
 			echo $ac_n "checking for libwrap""... $ac_c" 1>&6
-echo "configure:5644: checking for libwrap" >&5
+echo "configure:5646: checking for libwrap" >&5
 			cat > conftest.$ac_ext <<EOF
-#line 5646 "configure"
+#line 5648 "configure"
 #include "confdefs.h"
 
 #include <tcpd.h>
@@ -5652,7 +5654,7 @@
 hosts_access(0);
 ; return 0; }
 EOF
-if { (eval echo configure:5656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   
 					echo "$ac_t""yes" 1>&6
@@ -5696,6 +5698,24 @@
 fi
 
 
+# Check whether to enable chrooting
+CHROOT_MSG="no" 
+# Check whether --with-chroot or --without-chroot was given.
+if test "${with_chroot+set}" = set; then
+  withval="$with_chroot"
+  
+		if test "x$withval" != "xno" ; then
+			cat >> confdefs.h <<\EOF
+#define CHROOT 1
+EOF
+
+			CHROOT_MSG="yes" 
+		fi
+	
+
+fi
+
+
 # Whether to disable shadow password support
 # Check whether --with-shadow or --without-shadow was given.
 if test "${with_shadow+set}" = set; then
@@ -5715,9 +5735,9 @@
 
 if test -z "$disable_shadow" ; then
 	echo $ac_n "checking if the systems has expire shadow information""... $ac_c" 1>&6
-echo "configure:5719: checking if the systems has expire shadow information" >&5
+echo "configure:5739: checking if the systems has expire shadow information" >&5
 	cat > conftest.$ac_ext <<EOF
-#line 5721 "configure"
+#line 5741 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -5728,7 +5748,7 @@
  sp.sp_expire = sp.sp_lstchg = sp.sp_inact = 0; 
 ; return 0; }
 EOF
-if { (eval echo configure:5732: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5752: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    sp_expire_available=yes 
 else
@@ -5806,7 +5826,7 @@
 
 
 echo $ac_n "checking if we need to convert IPv4 in IPv6-mapped addresses""... $ac_c" 1>&6
-echo "configure:5810: checking if we need to convert IPv4 in IPv6-mapped addresses" >&5
+echo "configure:5830: checking if we need to convert IPv4 in IPv6-mapped addresses" >&5
 IPV4_IN6_HACK_MSG="no" 
 # Check whether --with-4in6 or --without-4in6 was given.
 if test "${with_4in6+set}" = set; then
@@ -5949,9 +5969,9 @@
 
 
 echo $ac_n "checking if your system defines LASTLOG_FILE""... $ac_c" 1>&6
-echo "configure:5953: checking if your system defines LASTLOG_FILE" >&5
+echo "configure:5973: checking if your system defines LASTLOG_FILE" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5955 "configure"
+#line 5975 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -5967,7 +5987,7 @@
  char *lastlog = LASTLOG_FILE; 
 ; return 0; }
 EOF
-if { (eval echo configure:5971: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5991: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    echo "$ac_t""yes" 1>&6 
 else
@@ -5977,9 +5997,9 @@
   
 		echo "$ac_t""no" 1>&6
 		echo $ac_n "checking if your system defines _PATH_LASTLOG""... $ac_c" 1>&6
-echo "configure:5981: checking if your system defines _PATH_LASTLOG" >&5
+echo "configure:6001: checking if your system defines _PATH_LASTLOG" >&5
 		cat > conftest.$ac_ext <<EOF
-#line 5983 "configure"
+#line 6003 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -5995,7 +6015,7 @@
  char *lastlog = _PATH_LASTLOG; 
 ; return 0; }
 EOF
-if { (eval echo configure:5999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6019: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    echo "$ac_t""yes" 1>&6 
 else
@@ -6034,9 +6054,9 @@
 fi	
 
 echo $ac_n "checking if your system defines UTMP_FILE""... $ac_c" 1>&6
-echo "configure:6038: checking if your system defines UTMP_FILE" >&5
+echo "configure:6058: checking if your system defines UTMP_FILE" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6040 "configure"
+#line 6060 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6049,7 +6069,7 @@
  char *utmp = UTMP_FILE; 
 ; return 0; }
 EOF
-if { (eval echo configure:6053: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    echo "$ac_t""yes" 1>&6 
 else
@@ -6084,9 +6104,9 @@
 fi	
 
 echo $ac_n "checking if your system defines WTMP_FILE""... $ac_c" 1>&6
-echo "configure:6088: checking if your system defines WTMP_FILE" >&5
+echo "configure:6108: checking if your system defines WTMP_FILE" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6090 "configure"
+#line 6110 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6099,7 +6119,7 @@
  char *wtmp = WTMP_FILE; 
 ; return 0; }
 EOF
-if { (eval echo configure:6103: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    echo "$ac_t""yes" 1>&6 
 else
@@ -6135,9 +6155,9 @@
 
 
 echo $ac_n "checking if your system defines UTMPX_FILE""... $ac_c" 1>&6
-echo "configure:6139: checking if your system defines UTMPX_FILE" >&5
+echo "configure:6159: checking if your system defines UTMPX_FILE" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6141 "configure"
+#line 6161 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6153,7 +6173,7 @@
  char *utmpx = UTMPX_FILE; 
 ; return 0; }
 EOF
-if { (eval echo configure:6157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6177: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    echo "$ac_t""yes" 1>&6 
 else
@@ -6180,9 +6200,9 @@
 fi	
 
 echo $ac_n "checking if your system defines WTMPX_FILE""... $ac_c" 1>&6
-echo "configure:6184: checking if your system defines WTMPX_FILE" >&5
+echo "configure:6204: checking if your system defines WTMPX_FILE" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6186 "configure"
+#line 6206 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6198,7 +6218,7 @@
  char *wtmpx = WTMPX_FILE; 
 ; return 0; }
 EOF
-if { (eval echo configure:6202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    echo "$ac_t""yes" 1>&6 
 else
@@ -6680,6 +6700,7 @@
 echo "                 S/KEY support: $SKEY_MSG"
 echo "          TCP Wrappers support: $TCPW_MSG"
 echo "          MD5 password support: $MD5_MSG"
+echo "    Magic token chroot support: $CHROOT_MSG"
 echo "   IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG"
 echo "      Use IPv4 by default hack: $IPV4_HACK_MSG"
 echo "       Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
diff -u --new-file openssh-2.1.1p4/configure.in openssh-2.1.1p4-chroot/configure.in
--- openssh-2.1.1p4/configure.in	Sat Jul 15 05:59:14 2000
+++ openssh-2.1.1p4-chroot/configure.in	Sat Aug 26 01:35:51 2000
@@ -991,6 +991,18 @@
 	]
 )
 
+# Check whether to enable chrooting
+CHROOT_MSG="no" 
+AC_ARG_WITH(chroot,
+	[  --with-chroot           Enable user chrooting through magic token],
+	[
+		if test "x$withval" != "xno" ; then
+			AC_DEFINE(CHROOT)
+			CHROOT_MSG="yes" 
+		fi
+	]
+)
+
 # Whether to disable shadow password support
 AC_ARG_WITH(shadow,
 	[  --without-shadow        Disable shadow password support],
@@ -1367,6 +1379,7 @@
 echo "                 S/KEY support: $SKEY_MSG"
 echo "          TCP Wrappers support: $TCPW_MSG"
 echo "          MD5 password support: $MD5_MSG"
+echo "    Magic token chroot support: $CHROOT_MSG"
 echo "   IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG"
 echo "      Use IPv4 by default hack: $IPV4_HACK_MSG"
 echo "       Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
Common subdirectories: openssh-2.1.1p4/contrib and openssh-2.1.1p4-chroot/contrib
diff -u --new-file openssh-2.1.1p4/session.c openssh-2.1.1p4-chroot/session.c
--- openssh-2.1.1p4/session.c	Wed Jul 12 00:45:27 2000
+++ openssh-2.1.1p4-chroot/session.c	Sat Aug 26 01:28:06 2000
@@ -897,6 +897,10 @@
 	extern char **environ;
 	struct stat st;
 	char *argv[10];
+#ifdef CHROOT
+	char *user_dir;
+	char *new_root;
+#endif /* CHROOT */ 
 #ifdef WITH_IRIX_PROJECT
 	prid_t projid;
 #endif /* WITH_IRIX_PROJECT */
@@ -922,6 +926,25 @@
 	if (setlogin(pw->pw_name) < 0)
 		error("setlogin failed: %s", strerror(errno));
 #endif
+#ifdef CHROOT
+	user_dir = xstrdup(pw->pw_dir);
+	new_root = user_dir + 1;                                                                                  
+
+	while((new_root = strchr(new_root, '.')) != NULL) {
+	     new_root--;
+	     if(strncmp(new_root, "/./", 3) == 0) {
+	          *new_root = '\0';
+	          new_root += 2;
+
+		  if(chroot(user_dir) != 0)
+	               fatal("Couldn't chroot to user directory %s", user_dir);
+
+   	          pw->pw_dir = new_root;
+		  break;
+	     }
+	     new_root += 2;
+	}
+#endif /* CHROOT */
 
 	/* Set uid, gid, and groups. */
 	/* Login(1) does this as well, and it needs uid 0 for the "-h"
-------------- next part --------------
diff -u --new-file openssh-2.1.1p4/session.c openssh-2.1.1p4-chroot/session.c
--- openssh-2.1.1p4/session.c	Wed Jul 12 00:45:27 2000
+++ openssh-2.1.1p4-chroot/session.c	Sat Aug 26 01:28:06 2000
@@ -897,6 +897,10 @@
 	extern char **environ;
 	struct stat st;
 	char *argv[10];
+#ifdef CHROOT
+	char *user_dir;
+	char *new_root;
+#endif /* CHROOT */ 
 #ifdef WITH_IRIX_PROJECT
 	prid_t projid;
 #endif /* WITH_IRIX_PROJECT */
@@ -922,6 +926,25 @@
 	if (setlogin(pw->pw_name) < 0)
 		error("setlogin failed: %s", strerror(errno));
 #endif
+#ifdef CHROOT
+	user_dir = xstrdup(pw->pw_dir);
+	new_root = user_dir + 1;                                                                                  
+
+	while((new_root = strchr(new_root, '.')) != NULL) {
+	     new_root--;
+	     if(strncmp(new_root, "/./", 3) == 0) {
+	          *new_root = '\0';
+	          new_root += 2;
+
+		  if(chroot(user_dir) != 0)
+	               fatal("Couldn't chroot to user directory %s", user_dir);
+
+   	          pw->pw_dir = new_root;
+		  break;
+	     }
+	     new_root += 2;
+	}
+#endif /* CHROOT */
 
 	/* Set uid, gid, and groups. */
 	/* Login(1) does this as well, and it needs uid 0 for the "-h"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 524 bytes
Desc: not available
Url : http://lists.mindrot.org/pipermail/openssh-unix-dev/attachments/20000826/294ae598/attachment.bin 


More information about the openssh-unix-dev mailing list