diff -ur openssh-1.2.3/README openssh-1.2.3-drt/README
--- openssh-1.2.3/README	Tue Mar  7 12:40:57 2000
+++ openssh-1.2.3-drt/README	Wed Apr  5 22:54:44 2000
@@ -12,6 +12,11 @@
 This is the port of OpenBSD's excellent OpenSSH to Linux and other
 Unices.
 
+It has a patch by drt@ailis.de to make it cooperate nicely with
+daemontools. When configured --with-daemontools, sshd will not fork
+into background and will do it's logging to stdout. You might find
+more Information about this by having a look at http://drt.ailis.de/
+
 OpenSSH is based on the last free version of Tatu Ylonen's SSH with
 all patent-encumbered algorithms removed (to external libraries), all
 known security bugs fixed, new features reintroduced and many other
diff -ur openssh-1.2.3/acconfig.h openssh-1.2.3-drt/acconfig.h
--- openssh-1.2.3/acconfig.h	Mon Mar 13 05:41:24 2000
+++ openssh-1.2.3-drt/acconfig.h	Wed Apr  5 21:47:36 2000
@@ -150,6 +150,9 @@
 /* Use IPv4 for connection by default, IPv6 can still if explicity asked */
 #undef IPV4_DEFAULT
 
+/* Build for use with daemontools */
+#undef DAEMONTOOLS
+
 /* getaddrinfo is broken (if present) */
 #undef BROKEN_GETADDRINFO
 
diff -ur openssh-1.2.3/config.h.in openssh-1.2.3-drt/config.h.in
--- openssh-1.2.3/config.h.in	Thu Mar 23 23:28:45 2000
+++ openssh-1.2.3-drt/config.h.in	Wed Apr  5 21:47:51 2000
@@ -131,6 +131,9 @@
 /* Use IPv4 for connection by default, IPv6 can still if explicity asked */
 #undef IPV4_DEFAULT
 
+/* Build for use with daemontools */
+#undef DAEMONTOOLS
+
 /* getaddrinfo is broken (if present) */
 #undef BROKEN_GETADDRINFO
 
diff -ur openssh-1.2.3/configure openssh-1.2.3-drt/configure
--- openssh-1.2.3/configure	Thu Mar 23 23:28:48 2000
+++ openssh-1.2.3-drt/configure	Wed Apr  5 22:55:36 2000
@@ -48,6 +48,8 @@
 ac_help="$ac_help
   --with-ipv4-default     Use IPv4 by connections unless '-6' specified"
 ac_help="$ac_help
+  --with-daemontools      Build for use with daemontools"
+ac_help="$ac_help
   --with-4in6             Check for and convert IPv4 in IPv6 mapped addresses"
 ac_help="$ac_help
   --with-pid-dir=PATH     Specify location of ssh.pid file"
@@ -566,7 +568,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:570: checking for $ac_word" >&5
+echo "configure:572: 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
@@ -596,7 +598,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:600: checking for $ac_word" >&5
+echo "configure:602: 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
@@ -647,7 +649,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:651: checking for $ac_word" >&5
+echo "configure:653: 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
@@ -679,7 +681,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:683: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:685: 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.
@@ -690,12 +692,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 694 "configure"
+#line 696 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:701: \"$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
@@ -721,12 +723,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:725: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:727: 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:730: checking whether we are using GNU C" >&5
+echo "configure:732: 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
@@ -735,7 +737,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:739: \"$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:741: \"$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
@@ -754,7 +756,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:758: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:760: 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
@@ -811,7 +813,7 @@
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:815: checking host system type" >&5
+echo "configure:817: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -834,7 +836,7 @@
 
 # Checks for programs.
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:838: checking how to run the C preprocessor" >&5
+echo "configure:840: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -849,13 +851,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 853 "configure"
+#line 855 "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:859: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:861: \"$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
   :
@@ -866,13 +868,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 870 "configure"
+#line 872 "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:876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:878: \"$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
   :
@@ -883,13 +885,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 887 "configure"
+#line 889 "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:893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:895: \"$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
   :
@@ -916,7 +918,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:920: checking for $ac_word" >&5
+echo "configure:922: 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
@@ -955,7 +957,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:959: checking for a BSD compatible install" >&5
+echo "configure:961: 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
@@ -1010,7 +1012,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:1014: checking for $ac_word" >&5
+echo "configure:1016: 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
@@ -1039,7 +1041,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:1043: checking for $ac_word" >&5
+echo "configure:1045: 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
@@ -1080,21 +1082,21 @@
 	
 # C Compiler features
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:1084: checking for inline" >&5
+echo "configure:1086: 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 1091 "configure"
+#line 1093 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:1098: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1100: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -1153,7 +1155,7 @@
 EOF
 
 	echo $ac_n "checking for HPUX trusted system password database""... $ac_c" 1>&6
-echo "configure:1157: checking for HPUX trusted system password database" >&5
+echo "configure:1159: 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
@@ -1222,7 +1224,7 @@
 
 # Checks for libraries.
 echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
-echo "configure:1226: checking for deflate in -lz" >&5
+echo "configure:1228: 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
@@ -1230,7 +1232,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lz  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1234 "configure"
+#line 1236 "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
@@ -1241,7 +1243,7 @@
 deflate()
 ; return 0; }
 EOF
-if { (eval echo configure:1245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1247: \"$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
@@ -1270,7 +1272,7 @@
 fi
 
 echo $ac_n "checking for login in -lutil""... $ac_c" 1>&6
-echo "configure:1274: checking for login in -lutil" >&5
+echo "configure:1276: 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
@@ -1278,7 +1280,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lutil  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1282 "configure"
+#line 1284 "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
@@ -1289,7 +1291,7 @@
 login()
 ; return 0; }
 EOF
-if { (eval echo configure:1293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1295: \"$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
@@ -1315,7 +1317,7 @@
 
 if test -z "$no_libsocket" ; then
 	echo $ac_n "checking for yp_match in -lnsl""... $ac_c" 1>&6
-echo "configure:1319: checking for yp_match in -lnsl" >&5
+echo "configure:1321: 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
@@ -1323,7 +1325,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1327 "configure"
+#line 1329 "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
@@ -1334,7 +1336,7 @@
 yp_match()
 ; return 0; }
 EOF
-if { (eval echo configure:1338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1340: \"$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
@@ -1364,7 +1366,7 @@
 fi
 if test -z "$no_libnsl" ; then
 	echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
-echo "configure:1368: checking for main in -lsocket" >&5
+echo "configure:1370: 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
@@ -1372,14 +1374,14 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1376 "configure"
+#line 1378 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:1383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1385: \"$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
@@ -1413,17 +1415,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1417: checking for $ac_hdr" >&5
+echo "configure:1419: 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 1422 "configure"
+#line 1424 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1427: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1429: \"$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*
@@ -1454,12 +1456,12 @@
 for ac_func in arc4random bindresvport_af freeaddrinfo gai_strerror getaddrinfo getnameinfo innetgr md5_crypt mkdtemp openpty rresvport_af setenv seteuid setlogin setproctitle setreuid snprintf strlcat strlcpy updwtmpx vsnprintf _getpty
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1458: checking for $ac_func" >&5
+echo "configure:1460: 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 1463 "configure"
+#line 1465 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1482,7 +1484,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1488: \"$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
@@ -1508,12 +1510,12 @@
 
 
 echo $ac_n "checking for login""... $ac_c" 1>&6
-echo "configure:1512: checking for login" >&5
+echo "configure:1514: 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 1517 "configure"
+#line 1519 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char login(); below.  */
@@ -1536,7 +1538,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1542: \"$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
@@ -1557,7 +1559,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for login in -lbsd""... $ac_c" 1>&6
-echo "configure:1561: checking for login in -lbsd" >&5
+echo "configure:1563: 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
@@ -1565,7 +1567,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lbsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1569 "configure"
+#line 1571 "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
@@ -1576,7 +1578,7 @@
 login()
 ; return 0; }
 EOF
-if { (eval echo configure:1580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1582: \"$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
@@ -1604,12 +1606,12 @@
 
 
 echo $ac_n "checking for daemon""... $ac_c" 1>&6
-echo "configure:1608: checking for daemon" >&5
+echo "configure:1610: 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 1613 "configure"
+#line 1615 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char daemon(); below.  */
@@ -1632,7 +1634,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1638: \"$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
@@ -1653,7 +1655,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for daemon in -lbsd""... $ac_c" 1>&6
-echo "configure:1657: checking for daemon in -lbsd" >&5
+echo "configure:1659: 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
@@ -1661,7 +1663,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lbsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1665 "configure"
+#line 1667 "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
@@ -1672,7 +1674,7 @@
 daemon()
 ; return 0; }
 EOF
-if { (eval echo configure:1676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1678: \"$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
@@ -1700,12 +1702,12 @@
 
 
 echo $ac_n "checking for getpagesize""... $ac_c" 1>&6
-echo "configure:1704: checking for getpagesize" >&5
+echo "configure:1706: 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 1709 "configure"
+#line 1711 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getpagesize(); below.  */
@@ -1728,7 +1730,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1734: \"$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
@@ -1749,7 +1751,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for getpagesize in -lucb""... $ac_c" 1>&6
-echo "configure:1753: checking for getpagesize in -lucb" >&5
+echo "configure:1755: 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
@@ -1757,7 +1759,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lucb  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1761 "configure"
+#line 1763 "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
@@ -1768,7 +1770,7 @@
 getpagesize()
 ; return 0; }
 EOF
-if { (eval echo configure:1772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1774: \"$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
@@ -1812,7 +1814,7 @@
 
 if test -z "$no_pam" -a "x$ac_cv_header_security_pam_appl_h" = "xyes" ; then
 	echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:1816: checking for dlopen in -ldl" >&5
+echo "configure:1818: 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
@@ -1820,7 +1822,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1824 "configure"
+#line 1826 "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
@@ -1831,7 +1833,7 @@
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:1835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1837: \"$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
@@ -1862,9 +1864,9 @@
 
 	# Check PAM strerror arguments (old PAM)
 	echo $ac_n "checking whether pam_strerror takes only one argument""... $ac_c" 1>&6
-echo "configure:1866: checking whether pam_strerror takes only one argument" >&5
+echo "configure:1868: checking whether pam_strerror takes only one argument" >&5
 	cat > conftest.$ac_ext <<EOF
-#line 1868 "configure"
+#line 1870 "configure"
 #include "confdefs.h"
 
 			#include <stdlib.h>
@@ -1874,7 +1876,7 @@
 (void)pam_strerror((pam_handle_t *)NULL, -1);
 ; return 0; }
 EOF
-if { (eval echo configure:1878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1880: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""no" 1>&6
 else
@@ -1913,7 +1915,7 @@
 	tryssldir="$tryssldir $prefix"
 fi
 echo $ac_n "checking for OpenSSL/SSLeay directory""... $ac_c" 1>&6
-echo "configure:1917: checking for OpenSSL/SSLeay directory" >&5
+echo "configure:1919: checking for OpenSSL/SSLeay directory" >&5
 for ssldir in "" $tryssldir /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl ; do
 	if test ! -z "$ssldir" ; then
 		LDFLAGS="$saved_LDFLAGS -L$ssldir/lib -L$ssldir"
@@ -1937,7 +1939,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 1941 "configure"
+#line 1943 "configure"
 #include "confdefs.h"
 
 				#include <openssl/rsa.h>
@@ -1949,7 +1951,7 @@
 				return(key==NULL);}
 			
 EOF
-if { (eval echo configure:1953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
 				cat >> confdefs.h <<\EOF
@@ -1973,7 +1975,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 1977 "configure"
+#line 1979 "configure"
 #include "confdefs.h"
 
 				#include <ssl/rsa.h>
@@ -1985,7 +1987,7 @@
 				return(key==NULL);}
 			
 EOF
-if { (eval echo configure:1989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
 				cat >> confdefs.h <<\EOF
@@ -2036,7 +2038,7 @@
 
 # Checks for data types
 echo $ac_n "checking size of char""... $ac_c" 1>&6
-echo "configure:2040: checking size of char" >&5
+echo "configure:2042: 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
@@ -2044,7 +2046,7 @@
   ac_cv_sizeof_char=1
 else
   cat > conftest.$ac_ext <<EOF
-#line 2048 "configure"
+#line 2050 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -2055,7 +2057,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:2059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2061: \"$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
@@ -2075,7 +2077,7 @@
 
 
 echo $ac_n "checking size of short int""... $ac_c" 1>&6
-echo "configure:2079: checking size of short int" >&5
+echo "configure:2081: 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
@@ -2083,7 +2085,7 @@
   ac_cv_sizeof_short_int=2
 else
   cat > conftest.$ac_ext <<EOF
-#line 2087 "configure"
+#line 2089 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -2094,7 +2096,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:2098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2100: \"$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
@@ -2114,7 +2116,7 @@
 
 
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:2118: checking size of int" >&5
+echo "configure:2120: 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
@@ -2122,7 +2124,7 @@
   ac_cv_sizeof_int=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 2126 "configure"
+#line 2128 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -2133,7 +2135,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:2137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2139: \"$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
@@ -2153,7 +2155,7 @@
 
 
 echo $ac_n "checking size of long int""... $ac_c" 1>&6
-echo "configure:2157: checking size of long int" >&5
+echo "configure:2159: 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
@@ -2161,7 +2163,7 @@
   ac_cv_sizeof_long_int=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 2165 "configure"
+#line 2167 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -2172,7 +2174,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:2176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2178: \"$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
@@ -2192,7 +2194,7 @@
 
 
 echo $ac_n "checking size of long long int""... $ac_c" 1>&6
-echo "configure:2196: checking size of long long int" >&5
+echo "configure:2198: 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
@@ -2200,7 +2202,7 @@
   ac_cv_sizeof_long_long_int=8
 else
   cat > conftest.$ac_ext <<EOF
-#line 2204 "configure"
+#line 2206 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -2211,7 +2213,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:2215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2217: \"$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
@@ -2233,16 +2235,16 @@
 
 # More checks for data types
 echo $ac_n "checking for intXX_t types""... $ac_c" 1>&6
-echo "configure:2237: checking for intXX_t types" >&5
+echo "configure:2239: checking for intXX_t types" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2239 "configure"
+#line 2241 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int main() {
 int8_t a; int16_t b; int32_t c; int64_t d; a = b = c = d = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:2246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2248: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 		cat >> confdefs.h <<\EOF
@@ -2262,16 +2264,16 @@
 rm -f conftest* 
 
 echo $ac_n "checking for u_intXX_t types""... $ac_c" 1>&6
-echo "configure:2266: checking for u_intXX_t types" >&5
+echo "configure:2268: checking for u_intXX_t types" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2268 "configure"
+#line 2270 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int main() {
 u_int8_t a; u_int16_t b; u_int32_t c; u_int64_t d; a = b = c = d = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:2275: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2277: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 		cat >> confdefs.h <<\EOF
@@ -2294,9 +2296,9 @@
            "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:2298: checking for intXX_t and u_intXX_t types in sys/bitypes.h" >&5
+echo "configure:2300: checking for intXX_t and u_intXX_t types in sys/bitypes.h" >&5
 	cat > conftest.$ac_ext <<EOF
-#line 2300 "configure"
+#line 2302 "configure"
 #include "confdefs.h"
 #include <sys/bitypes.h>
 int main() {
@@ -2307,7 +2309,7 @@
 		
 ; return 0; }
 EOF
-if { (eval echo configure:2311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2313: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 			cat >> confdefs.h <<\EOF
@@ -2332,16 +2334,16 @@
 
 if test -z "$have_u_intxx_t" ; then
 	echo $ac_n "checking for uintXX_t types""... $ac_c" 1>&6
-echo "configure:2336: checking for uintXX_t types" >&5
+echo "configure:2338: checking for uintXX_t types" >&5
 	cat > conftest.$ac_ext <<EOF
-#line 2338 "configure"
+#line 2340 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int main() {
 uint8_t a; uint16_t b; uint32_t c; uint64_t d; a = b = c = d = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:2345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2347: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 			cat >> confdefs.h <<\EOF
@@ -2361,9 +2363,9 @@
 fi
 
 echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
-echo "configure:2365: checking for socklen_t" >&5
+echo "configure:2367: checking for socklen_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2367 "configure"
+#line 2369 "configure"
 #include "confdefs.h"
 
 		#include <sys/types.h>
@@ -2373,7 +2375,7 @@
 socklen_t foo; foo = 1235;
 ; return 0; }
 EOF
-if { (eval echo configure:2377: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2379: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 		cat >> confdefs.h <<\EOF
@@ -2392,16 +2394,16 @@
 rm -f conftest*
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2396: checking for size_t" >&5
+echo "configure:2398: checking for size_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2398 "configure"
+#line 2400 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int main() {
 size_t foo; foo = 1235;
 ; return 0; }
 EOF
-if { (eval echo configure:2405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2407: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 		cat >> confdefs.h <<\EOF
@@ -2420,9 +2422,9 @@
 rm -f conftest*
 
 echo $ac_n "checking for struct sockaddr_storage""... $ac_c" 1>&6
-echo "configure:2424: checking for struct sockaddr_storage" >&5
+echo "configure:2426: checking for struct sockaddr_storage" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2426 "configure"
+#line 2428 "configure"
 #include "confdefs.h"
 
 		#include <sys/types.h>
@@ -2432,7 +2434,7 @@
 struct sockaddr_storage s;
 ; return 0; }
 EOF
-if { (eval echo configure:2436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2438: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 		cat >> confdefs.h <<\EOF
@@ -2451,16 +2453,16 @@
 rm -f conftest*
 
 echo $ac_n "checking for struct sockaddr_in6""... $ac_c" 1>&6
-echo "configure:2455: checking for struct sockaddr_in6" >&5
+echo "configure:2457: checking for struct sockaddr_in6" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2457 "configure"
+#line 2459 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 int main() {
 struct sockaddr_in6 s; s.sin6_family = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:2464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2466: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 		cat >> confdefs.h <<\EOF
@@ -2479,16 +2481,16 @@
 rm -f conftest*
 
 echo $ac_n "checking for struct in6_addr""... $ac_c" 1>&6
-echo "configure:2483: checking for struct in6_addr" >&5
+echo "configure:2485: checking for struct in6_addr" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2485 "configure"
+#line 2487 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 int main() {
 struct in6_addr s; s.s6_addr[0] = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:2492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2494: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 		cat >> confdefs.h <<\EOF
@@ -2507,9 +2509,9 @@
 rm -f conftest*
 
 echo $ac_n "checking for struct addrinfo""... $ac_c" 1>&6
-echo "configure:2511: checking for struct addrinfo" >&5
+echo "configure:2513: checking for struct addrinfo" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2513 "configure"
+#line 2515 "configure"
 #include "confdefs.h"
 
 		#include <sys/types.h>
@@ -2520,7 +2522,7 @@
 struct addrinfo s; s.ai_flags = AI_PASSIVE;
 ; return 0; }
 EOF
-if { (eval echo configure:2524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2526: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 		cat >> confdefs.h <<\EOF
@@ -2540,9 +2542,9 @@
 
 # Checks for structure members
 echo $ac_n "checking whether utmp.h has ut_host field""... $ac_c" 1>&6
-echo "configure:2544: checking whether utmp.h has ut_host field" >&5
+echo "configure:2546: checking whether utmp.h has ut_host field" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2546 "configure"
+#line 2548 "configure"
 #include "confdefs.h"
 #include <utmp.h>
 EOF
@@ -2561,9 +2563,9 @@
 rm -f conftest*
 
 echo $ac_n "checking whether utmpx.h has ut_host field""... $ac_c" 1>&6
-echo "configure:2565: checking whether utmpx.h has ut_host field" >&5
+echo "configure:2567: checking whether utmpx.h has ut_host field" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2567 "configure"
+#line 2569 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
 EOF
@@ -2582,9 +2584,9 @@
 rm -f conftest*
 
 echo $ac_n "checking whether utmpx.h has syslen field""... $ac_c" 1>&6
-echo "configure:2586: checking whether utmpx.h has syslen field" >&5
+echo "configure:2588: checking whether utmpx.h has syslen field" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2588 "configure"
+#line 2590 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
 EOF
@@ -2603,9 +2605,9 @@
 rm -f conftest*
 
 echo $ac_n "checking whether utmp.h has ut_pid field""... $ac_c" 1>&6
-echo "configure:2607: checking whether utmp.h has ut_pid field" >&5
+echo "configure:2609: checking whether utmp.h has ut_pid field" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2609 "configure"
+#line 2611 "configure"
 #include "confdefs.h"
 #include <utmp.h>
 EOF
@@ -2624,9 +2626,9 @@
 rm -f conftest*
 
 echo $ac_n "checking whether utmp.h has ut_type field""... $ac_c" 1>&6
-echo "configure:2628: checking whether utmp.h has ut_type field" >&5
+echo "configure:2630: checking whether utmp.h has ut_type field" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2630 "configure"
+#line 2632 "configure"
 #include "confdefs.h"
 #include <utmp.h>
 EOF
@@ -2645,9 +2647,9 @@
 rm -f conftest*
 
 echo $ac_n "checking whether utmp.h has ut_tv field""... $ac_c" 1>&6
-echo "configure:2649: checking whether utmp.h has ut_tv field" >&5
+echo "configure:2651: checking whether utmp.h has ut_tv field" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2651 "configure"
+#line 2653 "configure"
 #include "confdefs.h"
 #include <utmp.h>
 EOF
@@ -2666,9 +2668,9 @@
 rm -f conftest*
 
 echo $ac_n "checking whether utmp.h has ut_id field""... $ac_c" 1>&6
-echo "configure:2670: checking whether utmp.h has ut_id field" >&5
+echo "configure:2672: checking whether utmp.h has ut_id field" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2672 "configure"
+#line 2674 "configure"
 #include "confdefs.h"
 #include <utmp.h>
 EOF
@@ -2687,9 +2689,9 @@
 rm -f conftest*
 
 echo $ac_n "checking whether utmp.h has ut_addr field""... $ac_c" 1>&6
-echo "configure:2691: checking whether utmp.h has ut_addr field" >&5
+echo "configure:2693: checking whether utmp.h has ut_addr field" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2693 "configure"
+#line 2695 "configure"
 #include "confdefs.h"
 #include <utmp.h>
 EOF
@@ -2708,9 +2710,9 @@
 rm -f conftest*
 
 echo $ac_n "checking whether utmpx.h has ut_addr field""... $ac_c" 1>&6
-echo "configure:2712: checking whether utmpx.h has ut_addr field" >&5
+echo "configure:2714: checking whether utmpx.h has ut_addr field" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2714 "configure"
+#line 2716 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
 EOF
@@ -2729,9 +2731,9 @@
 rm -f conftest*
 
 echo $ac_n "checking whether utmp.h has ut_addr_v6 field""... $ac_c" 1>&6
-echo "configure:2733: checking whether utmp.h has ut_addr_v6 field" >&5
+echo "configure:2735: checking whether utmp.h has ut_addr_v6 field" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2735 "configure"
+#line 2737 "configure"
 #include "confdefs.h"
 #include <utmp.h>
 EOF
@@ -2750,9 +2752,9 @@
 rm -f conftest*
 
 echo $ac_n "checking whether utmpx.h has ut_addr_v6 field""... $ac_c" 1>&6
-echo "configure:2754: checking whether utmpx.h has ut_addr_v6 field" >&5
+echo "configure:2756: checking whether utmpx.h has ut_addr_v6 field" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2756 "configure"
+#line 2758 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
 EOF
@@ -2772,9 +2774,9 @@
 
 
 echo $ac_n "checking whether struct sockaddr_storage has ss_family field""... $ac_c" 1>&6
-echo "configure:2776: checking whether struct sockaddr_storage has ss_family field" >&5
+echo "configure:2778: checking whether struct sockaddr_storage has ss_family field" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2778 "configure"
+#line 2780 "configure"
 #include "confdefs.h"
 
 		#include <sys/types.h>
@@ -2784,7 +2786,7 @@
 struct sockaddr_storage s; s.ss_family = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:2788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2790: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 		cat >> confdefs.h <<\EOF
@@ -2802,9 +2804,9 @@
 fi
 rm -f conftest*
 echo $ac_n "checking whether struct sockaddr_storage has __ss_family field""... $ac_c" 1>&6
-echo "configure:2806: checking whether struct sockaddr_storage has __ss_family field" >&5
+echo "configure:2808: checking whether struct sockaddr_storage has __ss_family field" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2808 "configure"
+#line 2810 "configure"
 #include "confdefs.h"
 
 		#include <sys/types.h>
@@ -2814,7 +2816,7 @@
 struct sockaddr_storage s; s.__ss_family = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:2818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2820: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 		cat >> confdefs.h <<\EOF
@@ -2833,16 +2835,16 @@
 rm -f conftest*
 
 echo $ac_n "checking whether libc defines __progname""... $ac_c" 1>&6
-echo "configure:2837: checking whether libc defines __progname" >&5
+echo "configure:2839: checking whether libc defines __progname" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2839 "configure"
+#line 2841 "configure"
 #include "confdefs.h"
 
 int main() {
 extern char *__progname; printf("%s", __progname);
 ; return 0; }
 EOF
-if { (eval echo configure:2846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   
 		cat >> confdefs.h <<\EOF
@@ -2879,7 +2881,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:2883: checking for $ac_word" >&5
+echo "configure:2885: 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
@@ -2932,7 +2934,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:2936: checking for $ac_word" >&5
+echo "configure:2938: 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
@@ -3014,7 +3016,7 @@
 else
   
 		echo $ac_n "checking location of lastlog file""... $ac_c" 1>&6
-echo "configure:3018: checking location of lastlog file" >&5
+echo "configure:3020: checking location of lastlog file" >&5
 		for lastlog in /var/log/lastlog /var/adm/lastlog /usr/adm/lastlog  /etc/security/lastlog ; do
 			if test -f $lastlog ; then
 				gotlastlog="file"
@@ -3060,7 +3062,7 @@
 	
 ac_safe=`echo ""/dev/ptmx"" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for "/dev/ptmx"""... $ac_c" 1>&6
-echo "configure:3064: checking for "/dev/ptmx"" >&5
+echo "configure:3066: 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
@@ -3093,7 +3095,7 @@
 
 ac_safe=`echo ""/dev/ptc"" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for "/dev/ptc"""... $ac_c" 1>&6
-echo "configure:3097: checking for "/dev/ptc"" >&5
+echo "configure:3099: 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
@@ -3142,7 +3144,7 @@
 		
 ac_safe=`echo ""/dev/urandom"" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for "/dev/urandom"""... $ac_c" 1>&6
-echo "configure:3146: checking for "/dev/urandom"" >&5
+echo "configure:3148: 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
@@ -3252,17 +3254,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3256: checking for $ac_hdr" >&5
+echo "configure:3258: 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 3261 "configure"
+#line 3263 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3266: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3268: \"$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*
@@ -3289,7 +3291,7 @@
 done
 
 			echo $ac_n "checking for main in -lkrb""... $ac_c" 1>&6
-echo "configure:3293: checking for main in -lkrb" >&5
+echo "configure:3295: 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
@@ -3297,14 +3299,14 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lkrb  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3301 "configure"
+#line 3303 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:3308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3310: \"$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
@@ -3340,7 +3342,7 @@
 
 			KLIBS="-lkrb -ldes"
 			echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6
-echo "configure:3344: checking for dn_expand in -lresolv" >&5
+echo "configure:3346: 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
@@ -3348,7 +3350,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3352 "configure"
+#line 3354 "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
@@ -3359,7 +3361,7 @@
 dn_expand()
 ; return 0; }
 EOF
-if { (eval echo configure:3363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3365: \"$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
@@ -3454,9 +3456,9 @@
 			saved_LIBS="$LIBS"
 			LIBS="$LIBS -lwrap"
 			echo $ac_n "checking for libwrap""... $ac_c" 1>&6
-echo "configure:3458: checking for libwrap" >&5
+echo "configure:3460: checking for libwrap" >&5
 			cat > conftest.$ac_ext <<EOF
-#line 3460 "configure"
+#line 3462 "configure"
 #include "confdefs.h"
 
 					#include <tcpd.h>
@@ -3466,7 +3468,7 @@
 hosts_access(0);
 ; return 0; }
 EOF
-if { (eval echo configure:3470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   
 					echo "$ac_t""yes" 1>&6
@@ -3589,8 +3591,25 @@
 fi
 
 
+# Whether to build for DAEMONTOOLS
+#AC_MSG_CHECKING([to build for daemontools])
+# Check whether --with-daemontools or --without-daemontools was given.
+if test "${with_daemontools+set}" = set; then
+  withval="$with_daemontools"
+  
+		if test "x$withval" != "xno" ; then
+			cat >> confdefs.h <<\EOF
+#define DAEMONTOOLS 1
+EOF
+
+		fi
+	
+
+fi
+
+
 echo $ac_n "checking to convert IPv4 in IPv6-mapped addresses""... $ac_c" 1>&6
-echo "configure:3594: checking to convert IPv4 in IPv6-mapped addresses" >&5
+echo "configure:3613: checking to convert IPv4 in IPv6-mapped addresses" >&5
 # Check whether --with-4in6 or --without-4in6 was given.
 if test "${with_4in6+set}" = set; then
   withval="$with_4in6"
diff -ur openssh-1.2.3/configure.in openssh-1.2.3-drt/configure.in
--- openssh-1.2.3/configure.in	Fri Mar 17 13:26:46 2000
+++ openssh-1.2.3-drt/configure.in	Wed Apr  5 22:51:34 2000
@@ -806,6 +806,17 @@
 	]
 )
 
+# Whether to build for DAEMONTOOLS
+#AC_MSG_CHECKING([to build for daemontools])
+AC_ARG_WITH(daemontools,
+	[  --with-daemontools      Build for use with daemontools],
+	[
+		if test "x$withval" != "xno" ; then
+			AC_DEFINE(DAEMONTOOLS)
+		fi
+	]
+)
+
 AC_MSG_CHECKING([to convert IPv4 in IPv6-mapped addresses])
 AC_ARG_WITH(4in6,
 	[  --with-4in6             Check for and convert IPv4 in IPv6 mapped addresses],
diff -ur openssh-1.2.3/log-server.c openssh-1.2.3-drt/log-server.c
--- openssh-1.2.3/log-server.c	Thu Mar  9 11:27:50 2000
+++ openssh-1.2.3-drt/log-server.c	Thu Apr  6 01:22:06 2000
@@ -137,9 +137,13 @@
 	} else {
 		vsnprintf(msgbuf, sizeof(msgbuf), fmt, args);
 	}
+#ifndef DAEMONTOOLS 
 	if (log_on_stderr)
+#endif
 		fprintf(stderr, "%s\n", msgbuf);
+#ifndef DAEMONTOOLS 
 	openlog(__progname, LOG_PID, log_facility);
 	syslog(pri, "%.500s", msgbuf);
 	closelog();
+#endif
 }
diff -ur openssh-1.2.3/sshd.c openssh-1.2.3-drt/sshd.c
--- openssh-1.2.3/sshd.c	Fri Mar 17 13:40:18 2000
+++ openssh-1.2.3-drt/sshd.c	Thu Apr  6 01:09:42 2000
@@ -475,6 +475,7 @@
 	/* If not in debugging mode, and not started from inetd,
 	   disconnect from the controlling terminal, and fork.  The
 	   original process exits. */
+#ifndef DAEMONTOOLS
 	if (!debug_flag && !inetd_flag) {
 #ifdef TIOCNOTTY
 		int fd;
@@ -491,6 +492,7 @@
 		}
 #endif /* TIOCNOTTY */
 	}
+#endif /* DAEMONTOOLS */
 	/* Reinitialize the log (because of the fork above). */
 	log_init(av0, options.log_level, options.log_facility, log_stderr);
 
@@ -802,8 +804,8 @@
 		strlcpy(buf, client_version_string, sizeof(buf));
 	} else {
 		/* Send our protocol version identification. */
-		snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s\n",
-			 PROTOCOL_MAJOR, PROTOCOL_MINOR, SSH_VERSION);
+		snprintf(buf, sizeof buf, "SSH-%d.%d-OpenSSH\n",
+			 PROTOCOL_MAJOR, PROTOCOL_MINOR);
 		if (atomicio(write, sock_out, buf, strlen(buf)) != strlen(buf)) {
 			log("Could not write ident string to %s.", remote_ip);
 			fatal_cleanup();