diff -ruN openssh-3.8.1p1+x509h/aclocal.m4 openssh-3.8.1p1+x509-5.1/aclocal.m4
--- openssh-3.8.1p1+x509h/aclocal.m4	2001-10-22 03:53:59.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/aclocal.m4	2004-11-19 09:06:00.000000000 +0200
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.5 2001/10/22 00:53:59 tim Exp $
+dnl $Id$
 dnl
 dnl OpenSSH-specific autoconf macros
 dnl
@@ -84,3 +84,192 @@
 #include <sys/socket.h>])
 ])
 
+
+# Options to build with LDAP
+#
+# Author: Roumen Petrov
+# Revision: 29 Oct 2004
+#
+
+AC_DEFUN(AC_WITH_LDAP,
+[
+dnl
+dnl Get the ldap paths
+dnl
+
+ac_ldap='none'
+AC_ARG_ENABLE(ldap,
+  [  --enable-ldap           Enable LDAP queries],
+  ac_ldap="$enableval"
+)
+
+if test "x$ac_ldap" = xyes; then
+  ac_ldap_prefix=""
+  AC_ARG_WITH(ldap-prefix,
+    [  --with-ldap-prefix=PATH      Prefix where LDAP is installed (optional)],
+    ac_ldap_prefix="$withval"
+  )
+
+  AC_ARG_WITH(ldap-bindir,
+    [  --with-ldap-bindir=PATH      Prefix where LDAP user executables are installed (optional)],
+    [LDAP_BINDIR="$withval"],
+    [
+      if test "x$ac_ldap_prefix" != "x"; then
+        LDAP_BINDIR="$ac_ldap_prefix/bin"
+      fi
+    ]
+  )
+  AC_SUBST(LDAP_BINDIR)
+
+  AC_ARG_WITH(ldap-libexecdir,
+    [  --with-ldap-libexecdir=PATH  Prefix where LDAP program executables are installed (optional)],
+    [LDAP_LIBEXECDIR="$withval"],
+    [
+      if test "x$ac_ldap_prefix" = "x"; then
+        LDAP_LIBEXECDIR="/usr/libexec"
+      else
+        LDAP_LIBEXECDIR="$ac_ldap_prefix/libexec"
+      fi
+    ]
+  )
+  AC_SUBST(LDAP_LIBEXECDIR)
+dnl### Check for slapd
+dnl  if test "x$cross_compiling" = "xyes" ; then
+dnl    AC_MSG_NOTICE([cannot check for LDAP daemon when cross compiling])
+dnl  else
+dnl    AC_CHECK_FILES(
+dnl      [
+dnl        $LDAP_LIBEXECDIR/slapd
+dnl      ]
+dnl    )
+dnl  fi
+
+  AC_ARG_WITH(ldap-sysconfdir,
+    [  --with-ldap-sysconfdir=PATH  Prefix where LDAP single-machine data are installed (optional)],
+    [LDAP_SYSCONFDIR="$withval"],
+    [LDAP_SYSCONFDIR="$ac_ldap_prefix/etc/openldap"]
+  )
+  AC_SUBST(LDAP_SYSCONFDIR)
+dnl### Check for schema files
+dnl  if test "x$cross_compiling" = "xyes" ; then
+dnl    AC_MSG_NOTICE([cannot check for schema files existence when cross compiling])
+dnl  else
+dnl    AC_CHECK_FILES(
+dnl      [
+dnl        $LDAP_SYSCONFDIR/schema/core.schema
+dnl        $LDAP_SYSCONFDIR/schema/cosine.schema
+dnl        $LDAP_SYSCONFDIR/schema/inetorgperson.schema-
+dnl      ]
+dnl    )
+dnl  fi
+
+
+  AC_ARG_WITH(ldap-libdir,
+    [  --with-ldap-libdir=PATH      Prefix where LDAP libaries are installed (optional)],
+    [LDAP_LDFLAGS="-L$withval"],
+    [
+      if test "x$ac_ldap_prefix" != "x"; then
+        LDAP_LDFLAGS="-L$ac_ldap_prefix/lib"
+      else
+        LDAP_LDFLAGS=""
+      fi
+    ]
+  )
+  AC_SUBST(LDAP_LDFLAGS)
+
+  AC_ARG_WITH(ldap-includedir,
+    [  --with-ldap-includedir=PATH  Prefix where LDAP header files are installed (optional)],
+    [LDAP_CPPFLAGS="-I$withval"],
+    [
+      if test "x$ac_ldap_prefix" != "x"; then
+        LDAP_CPPFLAGS="-I$ac_ldap_prefix/include"
+      else
+        LDAP_CPPFLAGS=""
+      fi
+    ]
+  )
+  AC_SUBST(LDAP_CPPFLAGS)
+
+
+  ac_save_CPPFLAGS="$CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $LDAP_CPPFLAGS"
+  AC_CHECK_HEADERS(
+    [lber.h ldap.h],
+    [],
+    [
+      AC_MSG_ERROR([cannot found LDAP headers])
+    ]
+  )
+  CPPFLAGS="$ac_save_CPPFLAGS"
+
+  ac_ldap_libs=""
+  AC_ARG_WITH(ldap-libs,
+    [  --with-ldap-libs=LIBS        Specify LDAP libraries to link with.
+                                 (defult is -lldap -llber -lssl -lcrypto)],
+    [ac_ldap_libs="$withval"]
+  )
+
+### Try to link with LDAP libs
+  ac_save_LDFLAGS="$LDFLAGS"
+  ac_save_LIBS="$LIBS"
+
+  LDFLAGS="$LDAP_LDFLAGS $LDFLAGS"
+  ac_LDAP_LINK=""
+  if test "x$ac_ldap_libs" != "x"; then
+    AC_MSG_CHECKING([to link with specified LDAP libs])
+
+    LDAP_LIBS="$ac_ldap_libs"
+    LIBS="$LDAP_LIBS $ac_save_LIBS"
+    AC_LINK_IFELSE(
+      [AC_LANG_CALL([], [ldap_init])],
+      [ac_LDAP_LINK="yes"]
+    )
+    if test "x$ac_LDAP_LINK" != "xyes"; then
+      AC_MSG_ERROR([cannot link with specified LDAP libs])
+    fi
+  else
+    AC_MSG_CHECKING([how to link LDAP libs])
+
+    LDAP_LIBS="-lldap"
+    for L in lber ssl crypto; do
+      LDAP_LIBS="$LDAP_LIBS -l$L"
+      LIBS="$LDAP_LIBS $ac_save_LIBS"
+      AC_LINK_IFELSE(
+        [AC_LANG_CALL([], [ldap_init])],
+        [ac_LDAP_LINK="yes"]
+      )
+      if test "x$ac_LDAP_LINK" = "xyes"; then
+        break
+      fi
+    done
+    if test "x$ac_LDAP_LINK" != "xyes"; then
+      AC_MSG_ERROR([cannot link with default LDAP libs])
+    fi
+  fi
+  AC_MSG_RESULT([done])
+  unset ac_LDAP_LINK
+  LIBS="$ac_save_LIBS"
+  LDFLAGS="$ac_save_LDFLAGS"
+  AC_SUBST([LDAP_LIBS])
+
+  unset ac_ldap_libs
+  unset ac_ldap_prefix
+else
+  AC_MSG_NOTICE([LDAP is disabled])
+fi
+
+if test "x$ac_ldap" = "xyes"; then
+	AC_DEFINE_UNQUOTED(
+		LDAP_ENABLED, 1,
+		[Define if you want to enable LDAP queries])
+	LDAP_ON=''
+	LDAP_OFF='#'
+else
+	LDAP_ON='#'
+	LDAP_OFF=''
+fi
+AC_SUBST(LDAP_ON)
+AC_SUBST(LDAP_OFF)
+
+unset ac_ldap
+])
diff -ruN openssh-3.8.1p1+x509h/auth2-hostbased.c openssh-3.8.1p1+x509-5.1/auth2-hostbased.c
--- openssh-3.8.1p1+x509h/auth2-hostbased.c	2004-01-21 02:02:50.000000000 +0200
+++ openssh-3.8.1p1+x509-5.1/auth2-hostbased.c	2004-11-19 09:06:01.000000000 +0200
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth2-hostbased.c,v 1.6 2004/01/19 21:25:15 markus Exp $");
+RCSID("$OpenBSD$");
 
 #include "ssh2.h"
 #include "xmalloc.h"
@@ -44,6 +44,8 @@
 extern u_char *session_id2;
 extern u_int session_id2_len;
 
+static int hostbased_algorithm_allowed(int pktype);
+
 static int
 userauth_hostbased(Authctxt *authctxt)
 {
@@ -81,6 +83,11 @@
 		    "public key algorithm: %s", pkalg);
 		goto done;
 	}
+	if (!hostbased_algorithm_allowed(pktype)) {
+		debug("userauth_hostbased: disallowed "
+		    "public key algorithm: %s", pkalg);
+		goto done;
+	}
 	key = key_from_blob(pkblob, blen);
 	if (key == NULL) {
 		error("userauth_hostbased: cannot decode key: %s", pkalg);
@@ -127,6 +134,28 @@
 	return authenticated;
 }
 
+/* return 1 if given hostbased algorithm is allowed */
+static int
+hostbased_algorithm_allowed(int pktype)
+{
+	char *s, *cp, *p;
+
+	if (options.hostbased_algorithms == NULL) return(1);
+
+	s = cp = xstrdup(options.hostbased_algorithms);
+	for (p = strsep(&cp, ",");
+	     p && *p != '\0';
+	     p = strsep(&cp, ",")
+	) {
+		if (pktype == key_type_from_name(p)) {
+			xfree(s);
+			return(1);
+		}
+	}
+	xfree(s);
+	return(0);
+}
+
 /* return 1 if given hostkey is allowed */
 int
 hostbased_key_allowed(struct passwd *pw, const char *cuser, char *chost,
diff -ruN openssh-3.8.1p1+x509h/auth2-pubkey.c openssh-3.8.1p1+x509-5.1/auth2-pubkey.c
--- openssh-3.8.1p1+x509h/auth2-pubkey.c	2004-04-21 09:06:01.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/auth2-pubkey.c	2004-11-19 09:06:01.000000000 +0200
@@ -49,6 +49,8 @@
 extern u_char *session_id2;
 extern u_int session_id2_len;
 
+static int pubkey_algorithm_allowed(int pktype);
+
 static int
 userauth_pubkey(Authctxt *authctxt)
 {
@@ -85,6 +87,11 @@
 		    pkalg);
 		goto done;
 	}
+	if (!pubkey_algorithm_allowed(pktype)) {
+		debug("userauth_pubkey: disallowed public key algorithm: %s",
+		    pkalg);
+		goto done;
+	}
 	key = key_from_blob(pkblob, blen);
 	if (key == NULL) {
 		error("userauth_pubkey: cannot decode key: %s", pkalg);
@@ -166,6 +173,28 @@
 	return authenticated;
 }
 
+/* return 1 if given publickey algorithm is allowed */
+static int
+pubkey_algorithm_allowed(int pktype)
+{
+	char *s, *cp, *p;
+
+	if (options.pubkey_algorithms == NULL) return(1);
+
+	s = cp = xstrdup(options.pubkey_algorithms);
+	for (p = strsep(&cp, ",");
+	     p && *p != '\0';
+	     p = strsep(&cp, ",")
+	) {
+		if (pktype == key_type_from_name(p)) {
+			xfree(s);
+			return(1);
+		}
+	}
+	xfree(s);
+	return(0);
+}
+
 /* return 1 if user allows given key */
 static int
 user_key_allowed2(struct passwd *pw, Key *key, char *file)
@@ -249,7 +278,7 @@
 			fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX);
 			verbose("Found matching %s key: %s",
 			    key_type(found), fp);
-			if ((key->type == KEY_X509_RSA) || 
+			if ((key->type == KEY_X509_RSA) ||
 			    (key->type == KEY_X509_DSA)) {
 				if (ssh_x509cert_check(key->x509) != 1) {
 					found_key = 0;
diff -ruN openssh-3.8.1p1+x509h/config.h.in openssh-3.8.1p1+x509-5.1/config.h.in
--- openssh-3.8.1p1+x509h/config.h.in	2004-04-21 09:06:01.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/config.h.in	2004-11-19 09:06:01.000000000 +0200
@@ -615,6 +615,12 @@
 /* Define if you have the <lastlog.h> header file. */
 #undef HAVE_LASTLOG_H
 
+/* Define if you have the <lber.h> header file. */
+#undef HAVE_LBER_H
+
+/* Define if you have the <ldap.h> header file. */
+#undef HAVE_LDAP_H
+
 /* Define if you have the `crypt' library (-lcrypt). */
 #undef HAVE_LIBCRYPT
 
@@ -1023,6 +1029,9 @@
 /* Define if you have the `__b64_pton' function. */
 #undef HAVE___B64_PTON
 
+/* Define if you want to enable LDAP queries */
+#undef LDAP_ENABLED
+
 /* The size of a `char', as computed by sizeof. */
 #undef SIZEOF_CHAR
 
diff -ruN openssh-3.8.1p1+x509h/configure openssh-3.8.1p1+x509-5.1/configure
--- openssh-3.8.1p1+x509h/configure	2004-04-21 09:06:02.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/configure	2004-11-19 09:06:02.000000000 +0200
@@ -672,6 +672,7 @@
   --disable-etc-default-login       Disable using PATH from /etc/default/login no
   --disable-x509store     Disable X.509 store
   --enable-ocsp           Enable OCSP validation
+  --enable-ldap           Enable LDAP queries
   --disable-lastlog       disable use of lastlog even if detected no
   --disable-utmp          disable use of utmp even if detected no
   --disable-utmpx         disable use of utmpx even if detected no
@@ -717,6 +718,14 @@
   --with-4in6             Check for and convert IPv4 in IPv6 mapped addresses
   --with-bsd-auth         Enable BSD auth support
   --with-sshca-dir=PATH   Specify location of ssh CA root
+  --with-ldap-prefix=PATH      Prefix where LDAP is installed (optional)
+  --with-ldap-bindir=PATH      Prefix where LDAP user executables are installed (optional)
+  --with-ldap-libexecdir=PATH  Prefix where LDAP program executables are installed (optional)
+  --with-ldap-sysconfdir=PATH  Prefix where LDAP single-machine data are installed (optional)
+  --with-ldap-libdir=PATH      Prefix where LDAP libaries are installed (optional)
+  --with-ldap-includedir=PATH  Prefix where LDAP header files are installed (optional)
+  --with-ldap-libs=LIBS        Specify LDAP libraries to link with.
+                                 (defult is -lldap -llber -lssl -lcrypto)
   --with-pid-dir=PATH     Specify location of ssh.pid file
   --with-lastlog=FILE|DIR specify lastlog location common locations
 
@@ -912,7 +921,7 @@
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:915: loading site script $ac_site_file" >&5
+    { echo "$as_me:924: loading site script $ac_site_file" >&5
 echo "$as_me: loading site script $ac_site_file" >&6;}
     cat "$ac_site_file" >&5
     . "$ac_site_file"
@@ -923,7 +932,7 @@
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:926: loading cache $cache_file" >&5
+    { echo "$as_me:935: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -931,7 +940,7 @@
     esac
   fi
 else
-  { echo "$as_me:934: creating cache $cache_file" >&5
+  { echo "$as_me:943: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -947,21 +956,21 @@
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:950: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:959: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:954: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:963: error: \`$ac_var' was not set in the previous run" >&5
 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-        { echo "$as_me:960: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:969: error: \`$ac_var' has changed since the previous run:" >&5
 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-        { echo "$as_me:962:   former value:  $ac_old_val" >&5
+        { echo "$as_me:971:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:964:   current value: $ac_new_val" >&5
+        { echo "$as_me:973:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -980,9 +989,9 @@
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:983: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:992: error: changes in the environment can compromise the build" >&5
 echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:985: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:994: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1002,10 +1011,10 @@
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:1005: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1014: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:1008: \$? = $ac_status" >&5
+  echo "$as_me:1017: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   ac_path_separator=';'
 else
@@ -1024,7 +1033,7 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:1027: checking for $ac_word" >&5
+echo "$as_me:1036: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1039,7 +1048,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}gcc"
-echo "$as_me:1042: found $ac_dir/$ac_word" >&5
+echo "$as_me:1051: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1047,10 +1056,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1050: result: $CC" >&5
+  echo "$as_me:1059: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1053: result: no" >&5
+  echo "$as_me:1062: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1059,7 +1068,7 @@
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:1062: checking for $ac_word" >&5
+echo "$as_me:1071: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1074,7 +1083,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:1077: found $ac_dir/$ac_word" >&5
+echo "$as_me:1086: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1082,10 +1091,10 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1085: result: $ac_ct_CC" >&5
+  echo "$as_me:1094: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1088: result: no" >&5
+  echo "$as_me:1097: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1098,7 +1107,7 @@
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:1101: checking for $ac_word" >&5
+echo "$as_me:1110: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1113,7 +1122,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}cc"
-echo "$as_me:1116: found $ac_dir/$ac_word" >&5
+echo "$as_me:1125: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1121,10 +1130,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1124: result: $CC" >&5
+  echo "$as_me:1133: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1127: result: no" >&5
+  echo "$as_me:1136: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1133,7 +1142,7 @@
   ac_ct_CC=$CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1136: checking for $ac_word" >&5
+echo "$as_me:1145: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1148,7 +1157,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:1151: found $ac_dir/$ac_word" >&5
+echo "$as_me:1160: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1156,10 +1165,10 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1159: result: $ac_ct_CC" >&5
+  echo "$as_me:1168: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1162: result: no" >&5
+  echo "$as_me:1171: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1172,7 +1181,7 @@
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1175: checking for $ac_word" >&5
+echo "$as_me:1184: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1192,7 +1201,7 @@
   continue
 fi
 ac_cv_prog_CC="cc"
-echo "$as_me:1195: found $ac_dir/$ac_word" >&5
+echo "$as_me:1204: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1214,10 +1223,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1217: result: $CC" >&5
+  echo "$as_me:1226: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1220: result: no" >&5
+  echo "$as_me:1229: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1228,7 +1237,7 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1231: checking for $ac_word" >&5
+echo "$as_me:1240: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1243,7 +1252,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1246: found $ac_dir/$ac_word" >&5
+echo "$as_me:1255: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1251,10 +1260,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1254: result: $CC" >&5
+  echo "$as_me:1263: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1257: result: no" >&5
+  echo "$as_me:1266: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1267,7 +1276,7 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1270: checking for $ac_word" >&5
+echo "$as_me:1279: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1282,7 +1291,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1285: found $ac_dir/$ac_word" >&5
+echo "$as_me:1294: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1290,10 +1299,10 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1293: result: $ac_ct_CC" >&5
+  echo "$as_me:1302: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1296: result: no" >&5
+  echo "$as_me:1305: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1305,32 +1314,32 @@
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1308: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1317: error: no acceptable cc found in \$PATH" >&5
 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:1313:" \
+echo "$as_me:1322:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1316: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1325: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1319: \$? = $ac_status" >&5
+  echo "$as_me:1328: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1321: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1330: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1324: \$? = $ac_status" >&5
+  echo "$as_me:1333: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1326: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1335: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1329: \$? = $ac_status" >&5
+  echo "$as_me:1338: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 1333 "configure"
+#line 1342 "configure"
 #include "confdefs.h"
 
 int
@@ -1346,13 +1355,13 @@
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:1349: checking for C compiler default output" >&5
+echo "$as_me:1358: checking for C compiler default output" >&5
 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:1352: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1361: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1355: \$? = $ac_status" >&5
+  echo "$as_me:1364: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Find the output, starting from the most likely.  This scheme is
 # not robust to junk in `.', hence go to wildcards (a.*) only as a last
@@ -1375,34 +1384,34 @@
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1378: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1387: error: C compiler cannot create executables" >&5
 echo "$as_me: error: C compiler cannot create executables" >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
-echo "$as_me:1384: result: $ac_file" >&5
+echo "$as_me:1393: result: $ac_file" >&5
 echo "${ECHO_T}$ac_file" >&6
 
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1389: checking whether the C compiler works" >&5
+echo "$as_me:1398: checking whether the C compiler works" >&5
 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
-  { (eval echo "$as_me:1395: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1404: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1398: \$? = $ac_status" >&5
+  echo "$as_me:1407: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1405: error: cannot run C compiled programs.
+	{ { echo "$as_me:1414: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&5
 echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&2;}
@@ -1410,24 +1419,24 @@
     fi
   fi
 fi
-echo "$as_me:1413: result: yes" >&5
+echo "$as_me:1422: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 rm -f a.out a.exe conftest$ac_cv_exeext
 ac_clean_files=$ac_clean_files_save
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1420: checking whether we are cross compiling" >&5
+echo "$as_me:1429: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1422: result: $cross_compiling" >&5
+echo "$as_me:1431: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1425: checking for executable suffix" >&5
+echo "$as_me:1434: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1427: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1436: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1430: \$? = $ac_status" >&5
+  echo "$as_me:1439: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -1443,25 +1452,25 @@
   esac
 done
 else
-  { { echo "$as_me:1446: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1455: error: cannot compute EXEEXT: cannot compile and link" >&5
 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-echo "$as_me:1452: result: $ac_cv_exeext" >&5
+echo "$as_me:1461: result: $ac_cv_exeext" >&5
 echo "${ECHO_T}$ac_cv_exeext" >&6
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-echo "$as_me:1458: checking for object suffix" >&5
+echo "$as_me:1467: checking for object suffix" >&5
 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1464 "configure"
+#line 1473 "configure"
 #include "confdefs.h"
 
 int
@@ -1473,10 +1482,10 @@
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1476: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1485: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1479: \$? = $ac_status" >&5
+  echo "$as_me:1488: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   case $ac_file in
@@ -1488,24 +1497,24 @@
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1491: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1500: error: cannot compute OBJEXT: cannot compile" >&5
 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-echo "$as_me:1498: result: $ac_cv_objext" >&5
+echo "$as_me:1507: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1502: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1511: checking whether we are using the GNU C compiler" >&5
 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1508 "configure"
+#line 1517 "configure"
 #include "confdefs.h"
 
 int
@@ -1520,16 +1529,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1523: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1532: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1526: \$? = $ac_status" >&5
+  echo "$as_me:1535: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1529: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1538: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1532: \$? = $ac_status" >&5
+  echo "$as_me:1541: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1541,19 +1550,19 @@
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1544: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1553: result: $ac_cv_c_compiler_gnu" >&5
 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS="-g"
-echo "$as_me:1550: checking whether $CC accepts -g" >&5
+echo "$as_me:1559: checking whether $CC accepts -g" >&5
 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1556 "configure"
+#line 1565 "configure"
 #include "confdefs.h"
 
 int
@@ -1565,16 +1574,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1568: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1577: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1571: \$? = $ac_status" >&5
+  echo "$as_me:1580: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1574: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1583: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1577: \$? = $ac_status" >&5
+  echo "$as_me:1586: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -1584,7 +1593,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:1587: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1596: result: $ac_cv_prog_cc_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -1611,16 +1620,16 @@
 #endif
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1614: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1623: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1617: \$? = $ac_status" >&5
+  echo "$as_me:1626: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1620: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1629: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1623: \$? = $ac_status" >&5
+  echo "$as_me:1632: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
    ''\
@@ -1632,7 +1641,7 @@
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line 1635 "configure"
+#line 1644 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -1645,16 +1654,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1648: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1657: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1651: \$? = $ac_status" >&5
+  echo "$as_me:1660: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1654: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1663: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1657: \$? = $ac_status" >&5
+  echo "$as_me:1666: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -1664,7 +1673,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 1667 "configure"
+#line 1676 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -1676,16 +1685,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1679: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1688: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1682: \$? = $ac_status" >&5
+  echo "$as_me:1691: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1685: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1694: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1688: \$? = $ac_status" >&5
+  echo "$as_me:1697: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -1729,7 +1738,7 @@
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1732: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1741: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1739,11 +1748,11 @@
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:1742: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1751: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:1746: checking build system type" >&5
+echo "$as_me:1755: checking build system type" >&5
 echo $ECHO_N "checking build system type... $ECHO_C" >&6
 if test "${ac_cv_build+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1752,23 +1761,23 @@
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:1755: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1764: error: cannot guess build type; you must specify one" >&5
 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:1759: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1768: error: $ac_config_sub $ac_cv_build_alias failed." >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:1764: result: $ac_cv_build" >&5
+echo "$as_me:1773: result: $ac_cv_build" >&5
 echo "${ECHO_T}$ac_cv_build" >&6
 build=$ac_cv_build
 build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
-echo "$as_me:1771: checking host system type" >&5
+echo "$as_me:1780: checking host system type" >&5
 echo $ECHO_N "checking host system type... $ECHO_C" >&6
 if test "${ac_cv_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1777,19 +1786,19 @@
 test -z "$ac_cv_host_alias" &&
   ac_cv_host_alias=$ac_cv_build_alias
 ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:1780: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1789: error: $ac_config_sub $ac_cv_host_alias failed" >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:1785: result: $ac_cv_host" >&5
+echo "$as_me:1794: result: $ac_cv_host" >&5
 echo "${ECHO_T}$ac_cv_host" >&6
 host=$ac_cv_host
 host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
-echo "$as_me:1792: checking whether byte ordering is bigendian" >&5
+echo "$as_me:1801: checking whether byte ordering is bigendian" >&5
 echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
 if test "${ac_cv_c_bigendian+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1797,7 +1806,7 @@
   ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat >conftest.$ac_ext <<_ACEOF
-#line 1800 "configure"
+#line 1809 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -1814,20 +1823,20 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1817: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1826: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1820: \$? = $ac_status" >&5
+  echo "$as_me:1829: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1823: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1832: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1826: \$? = $ac_status" >&5
+  echo "$as_me:1835: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat >conftest.$ac_ext <<_ACEOF
-#line 1830 "configure"
+#line 1839 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -1844,16 +1853,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1847: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1856: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1850: \$? = $ac_status" >&5
+  echo "$as_me:1859: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1853: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1862: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1856: \$? = $ac_status" >&5
+  echo "$as_me:1865: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_bigendian=yes
 else
@@ -1869,12 +1878,12 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 if test $ac_cv_c_bigendian = unknown; then
 if test "$cross_compiling" = yes; then
-  { { echo "$as_me:1872: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:1881: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1877 "configure"
+#line 1886 "configure"
 #include "confdefs.h"
 int
 main ()
@@ -1890,15 +1899,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:1893: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1902: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1896: \$? = $ac_status" >&5
+  echo "$as_me:1905: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:1898: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1907: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1901: \$? = $ac_status" >&5
+  echo "$as_me:1910: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_bigendian=no
 else
@@ -1911,7 +1920,7 @@
 fi
 fi
 fi
-echo "$as_me:1914: result: $ac_cv_c_bigendian" >&5
+echo "$as_me:1923: result: $ac_cv_c_bigendian" >&5
 echo "${ECHO_T}$ac_cv_c_bigendian" >&6
 if test $ac_cv_c_bigendian = yes; then
 
@@ -1926,7 +1935,7 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1929: checking for $ac_word" >&5
+echo "$as_me:1938: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1941,7 +1950,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:1944: found $ac_dir/$ac_word" >&5
+echo "$as_me:1953: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1949,10 +1958,10 @@
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:1952: result: $AWK" >&5
+  echo "$as_me:1961: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:1955: result: no" >&5
+  echo "$as_me:1964: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1964,7 +1973,7 @@
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:1967: checking how to run the C preprocessor" >&5
+echo "$as_me:1976: checking how to run the C preprocessor" >&5
 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -1985,18 +1994,18 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 1988 "configure"
+#line 1997 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:1993: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2002: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:1999: \$? = $ac_status" >&5
+  echo "$as_me:2008: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2019,17 +2028,17 @@
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2022 "configure"
+#line 2031 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2026: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2035: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2032: \$? = $ac_status" >&5
+  echo "$as_me:2041: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2066,7 +2075,7 @@
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2069: result: $CPP" >&5
+echo "$as_me:2078: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2076,18 +2085,18 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2079 "configure"
+#line 2088 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2084: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2093: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2090: \$? = $ac_status" >&5
+  echo "$as_me:2099: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2110,17 +2119,17 @@
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2113 "configure"
+#line 2122 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2117: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2126: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2123: \$? = $ac_status" >&5
+  echo "$as_me:2132: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2148,7 +2157,7 @@
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:2151: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2160: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2162,7 +2171,7 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:2165: checking for $ac_word" >&5
+echo "$as_me:2174: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2177,7 +2186,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:2180: found $ac_dir/$ac_word" >&5
+echo "$as_me:2189: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2185,10 +2194,10 @@
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:2188: result: $RANLIB" >&5
+  echo "$as_me:2197: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:2191: result: no" >&5
+  echo "$as_me:2200: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2197,7 +2206,7 @@
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:2200: checking for $ac_word" >&5
+echo "$as_me:2209: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2212,7 +2221,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:2215: found $ac_dir/$ac_word" >&5
+echo "$as_me:2224: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2221,10 +2230,10 @@
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:2224: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:2233: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:2227: result: no" >&5
+  echo "$as_me:2236: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2245,7 +2254,7 @@
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:2248: checking for a BSD compatible install" >&5
+echo "$as_me:2257: checking for a BSD compatible install" >&5
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
@@ -2294,7 +2303,7 @@
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:2297: result: $INSTALL" >&5
+echo "$as_me:2306: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2307,7 +2316,7 @@
 
 # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:2310: checking for $ac_word" >&5
+echo "$as_me:2319: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_AR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2324,7 +2333,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_AR="$ac_dir/$ac_word"
-   echo "$as_me:2327: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2336: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2335,10 +2344,10 @@
 AR=$ac_cv_path_AR
 
 if test -n "$AR"; then
-  echo "$as_me:2338: result: $AR" >&5
+  echo "$as_me:2347: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:2341: result: no" >&5
+  echo "$as_me:2350: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2346,7 +2355,7 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2349: checking for $ac_word" >&5
+echo "$as_me:2358: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PERL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2363,7 +2372,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PERL="$ac_dir/$ac_word"
-   echo "$as_me:2366: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2375: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2374,10 +2383,10 @@
 PERL=$ac_cv_path_PERL
 
 if test -n "$PERL"; then
-  echo "$as_me:2377: result: $PERL" >&5
+  echo "$as_me:2386: result: $PERL" >&5
 echo "${ECHO_T}$PERL" >&6
 else
-  echo "$as_me:2380: result: no" >&5
+  echo "$as_me:2389: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2386,7 +2395,7 @@
 
 # Extract the first word of "sed", so it can be a program name with args.
 set dummy sed; ac_word=$2
-echo "$as_me:2389: checking for $ac_word" >&5
+echo "$as_me:2398: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_SED+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2403,7 +2412,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_SED="$ac_dir/$ac_word"
-   echo "$as_me:2406: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2415: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2414,16 +2423,16 @@
 SED=$ac_cv_path_SED
 
 if test -n "$SED"; then
-  echo "$as_me:2417: result: $SED" >&5
+  echo "$as_me:2426: result: $SED" >&5
 echo "${ECHO_T}$SED" >&6
 else
-  echo "$as_me:2420: result: no" >&5
+  echo "$as_me:2429: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 # Extract the first word of "ent", so it can be a program name with args.
 set dummy ent; ac_word=$2
-echo "$as_me:2426: checking for $ac_word" >&5
+echo "$as_me:2435: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_ENT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2440,7 +2449,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ENT="$ac_dir/$ac_word"
-   echo "$as_me:2443: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2452: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2451,16 +2460,16 @@
 ENT=$ac_cv_path_ENT
 
 if test -n "$ENT"; then
-  echo "$as_me:2454: result: $ENT" >&5
+  echo "$as_me:2463: result: $ENT" >&5
 echo "${ECHO_T}$ENT" >&6
 else
-  echo "$as_me:2457: result: no" >&5
+  echo "$as_me:2466: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 # Extract the first word of "bash", so it can be a program name with args.
 set dummy bash; ac_word=$2
-echo "$as_me:2463: checking for $ac_word" >&5
+echo "$as_me:2472: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TEST_MINUS_S_SH+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2477,7 +2486,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TEST_MINUS_S_SH="$ac_dir/$ac_word"
-   echo "$as_me:2480: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2489: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2488,16 +2497,16 @@
 TEST_MINUS_S_SH=$ac_cv_path_TEST_MINUS_S_SH
 
 if test -n "$TEST_MINUS_S_SH"; then
-  echo "$as_me:2491: result: $TEST_MINUS_S_SH" >&5
+  echo "$as_me:2500: result: $TEST_MINUS_S_SH" >&5
 echo "${ECHO_T}$TEST_MINUS_S_SH" >&6
 else
-  echo "$as_me:2494: result: no" >&5
+  echo "$as_me:2503: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 # Extract the first word of "ksh", so it can be a program name with args.
 set dummy ksh; ac_word=$2
-echo "$as_me:2500: checking for $ac_word" >&5
+echo "$as_me:2509: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TEST_MINUS_S_SH+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2514,7 +2523,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TEST_MINUS_S_SH="$ac_dir/$ac_word"
-   echo "$as_me:2517: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2526: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2525,16 +2534,16 @@
 TEST_MINUS_S_SH=$ac_cv_path_TEST_MINUS_S_SH
 
 if test -n "$TEST_MINUS_S_SH"; then
-  echo "$as_me:2528: result: $TEST_MINUS_S_SH" >&5
+  echo "$as_me:2537: result: $TEST_MINUS_S_SH" >&5
 echo "${ECHO_T}$TEST_MINUS_S_SH" >&6
 else
-  echo "$as_me:2531: result: no" >&5
+  echo "$as_me:2540: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 # Extract the first word of "sh", so it can be a program name with args.
 set dummy sh; ac_word=$2
-echo "$as_me:2537: checking for $ac_word" >&5
+echo "$as_me:2546: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TEST_MINUS_S_SH+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2551,7 +2560,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TEST_MINUS_S_SH="$ac_dir/$ac_word"
-   echo "$as_me:2554: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2563: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2562,16 +2571,16 @@
 TEST_MINUS_S_SH=$ac_cv_path_TEST_MINUS_S_SH
 
 if test -n "$TEST_MINUS_S_SH"; then
-  echo "$as_me:2565: result: $TEST_MINUS_S_SH" >&5
+  echo "$as_me:2574: result: $TEST_MINUS_S_SH" >&5
 echo "${ECHO_T}$TEST_MINUS_S_SH" >&6
 else
-  echo "$as_me:2568: result: no" >&5
+  echo "$as_me:2577: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 # Extract the first word of "sh", so it can be a program name with args.
 set dummy sh; ac_word=$2
-echo "$as_me:2574: checking for $ac_word" >&5
+echo "$as_me:2583: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_SH+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2588,7 +2597,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_SH="$ac_dir/$ac_word"
-   echo "$as_me:2591: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2600: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2599,10 +2608,10 @@
 SH=$ac_cv_path_SH
 
 if test -n "$SH"; then
-  echo "$as_me:2602: result: $SH" >&5
+  echo "$as_me:2611: result: $SH" >&5
 echo "${ECHO_T}$SH" >&6
 else
-  echo "$as_me:2605: result: no" >&5
+  echo "$as_me:2614: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2614,7 +2623,7 @@
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:2617: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:2626: checking for special C compiler options needed for large files" >&5
 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_largefile_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2626,7 +2635,7 @@
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >conftest.$ac_ext <<_ACEOF
-#line 2629 "configure"
+#line 2638 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -2646,16 +2655,16 @@
 }
 _ACEOF
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2649: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2658: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2652: \$? = $ac_status" >&5
+  echo "$as_me:2661: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2655: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2664: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2658: \$? = $ac_status" >&5
+  echo "$as_me:2667: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -2665,16 +2674,16 @@
 rm -f conftest.$ac_objext
      	 CC="$CC -n32"
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2668: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2677: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2671: \$? = $ac_status" >&5
+  echo "$as_me:2680: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2674: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2683: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2677: \$? = $ac_status" >&5
+  echo "$as_me:2686: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -2688,13 +2697,13 @@
        rm -f conftest.$ac_ext
     fi
 fi
-echo "$as_me:2691: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:2700: result: $ac_cv_sys_largefile_CC" >&5
 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
   if test "$ac_cv_sys_largefile_CC" != no; then
     CC=$CC$ac_cv_sys_largefile_CC
   fi
 
-  echo "$as_me:2697: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:2706: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_file_offset_bits+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2702,7 +2711,7 @@
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 2705 "configure"
+#line 2714 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -2722,16 +2731,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2725: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2734: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2728: \$? = $ac_status" >&5
+  echo "$as_me:2737: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2731: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2740: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2734: \$? = $ac_status" >&5
+  echo "$as_me:2743: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -2740,7 +2749,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 2743 "configure"
+#line 2752 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -2761,16 +2770,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2764: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2773: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2767: \$? = $ac_status" >&5
+  echo "$as_me:2776: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2770: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2779: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2773: \$? = $ac_status" >&5
+  echo "$as_me:2782: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -2781,7 +2790,7 @@
   break
 done
 fi
-echo "$as_me:2784: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:2793: result: $ac_cv_sys_file_offset_bits" >&5
 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
 if test "$ac_cv_sys_file_offset_bits" != no; then
 
@@ -2791,7 +2800,7 @@
 
 fi
 rm -f conftest*
-  echo "$as_me:2794: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:2803: checking for _LARGE_FILES value needed for large files" >&5
 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_large_files+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2799,7 +2808,7 @@
   while :; do
   ac_cv_sys_large_files=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 2802 "configure"
+#line 2811 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -2819,16 +2828,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2822: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2831: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2825: \$? = $ac_status" >&5
+  echo "$as_me:2834: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2828: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2837: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2831: \$? = $ac_status" >&5
+  echo "$as_me:2840: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -2837,7 +2846,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 2840 "configure"
+#line 2849 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -2858,16 +2867,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2861: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2870: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2864: \$? = $ac_status" >&5
+  echo "$as_me:2873: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2867: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2876: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2870: \$? = $ac_status" >&5
+  echo "$as_me:2879: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -2878,7 +2887,7 @@
   break
 done
 fi
-echo "$as_me:2881: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:2890: result: $ac_cv_sys_large_files" >&5
 echo "${ECHO_T}$ac_cv_sys_large_files" >&6
 if test "$ac_cv_sys_large_files" != no; then
 
@@ -2891,7 +2900,7 @@
 fi
 
 if test -z "$AR" ; then
-	{ { echo "$as_me:2894: error: *** 'ar' missing, please install or fix your \$PATH ***" >&5
+	{ { echo "$as_me:2903: error: *** 'ar' missing, please install or fix your \$PATH ***" >&5
 echo "$as_me: error: *** 'ar' missing, please install or fix your \$PATH ***" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2906,7 +2915,7 @@
 	# Search for login
 	# Extract the first word of "login", so it can be a program name with args.
 set dummy login; ac_word=$2
-echo "$as_me:2909: checking for $ac_word" >&5
+echo "$as_me:2918: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_LOGIN_PROGRAM_FALLBACK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2923,7 +2932,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_LOGIN_PROGRAM_FALLBACK="$ac_dir/$ac_word"
-   echo "$as_me:2926: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2935: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2934,10 +2943,10 @@
 LOGIN_PROGRAM_FALLBACK=$ac_cv_path_LOGIN_PROGRAM_FALLBACK
 
 if test -n "$LOGIN_PROGRAM_FALLBACK"; then
-  echo "$as_me:2937: result: $LOGIN_PROGRAM_FALLBACK" >&5
+  echo "$as_me:2946: result: $LOGIN_PROGRAM_FALLBACK" >&5
 echo "${ECHO_T}$LOGIN_PROGRAM_FALLBACK" >&6
 else
-  echo "$as_me:2940: result: no" >&5
+  echo "$as_me:2949: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2951,7 +2960,7 @@
 
 # Extract the first word of "passwd", so it can be a program name with args.
 set dummy passwd; ac_word=$2
-echo "$as_me:2954: checking for $ac_word" >&5
+echo "$as_me:2963: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PATH_PASSWD_PROG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2968,7 +2977,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PATH_PASSWD_PROG="$ac_dir/$ac_word"
-   echo "$as_me:2971: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2980: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2979,10 +2988,10 @@
 PATH_PASSWD_PROG=$ac_cv_path_PATH_PASSWD_PROG
 
 if test -n "$PATH_PASSWD_PROG"; then
-  echo "$as_me:2982: result: $PATH_PASSWD_PROG" >&5
+  echo "$as_me:2991: result: $PATH_PASSWD_PROG" >&5
 echo "${ECHO_T}$PATH_PASSWD_PROG" >&6
 else
-  echo "$as_me:2985: result: no" >&5
+  echo "$as_me:2994: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2997,7 +3006,7 @@
 	LD=$CC
 fi
 
-echo "$as_me:3000: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:3009: checking for $CC option to accept ANSI C" >&5
 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3005,7 +3014,7 @@
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
-#line 3008 "configure"
+#line 3017 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -3054,16 +3063,16 @@
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3057: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3066: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3060: \$? = $ac_status" >&5
+  echo "$as_me:3069: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3063: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3072: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3066: \$? = $ac_status" >&5
+  echo "$as_me:3075: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -3080,15 +3089,15 @@
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:3083: result: none needed" >&5
+    echo "$as_me:3092: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:3086: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:3095: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
 
-echo "$as_me:3091: checking for inline" >&5
+echo "$as_me:3100: checking for inline" >&5
 echo $ECHO_N "checking for inline... $ECHO_C" >&6
 if test "${ac_cv_c_inline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3096,7 +3105,7 @@
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >conftest.$ac_ext <<_ACEOF
-#line 3099 "configure"
+#line 3108 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -3105,16 +3114,16 @@
 
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3108: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3117: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3111: \$? = $ac_status" >&5
+  echo "$as_me:3120: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3114: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3123: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3117: \$? = $ac_status" >&5
+  echo "$as_me:3126: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -3125,7 +3134,7 @@
 done
 
 fi
-echo "$as_me:3128: result: $ac_cv_c_inline" >&5
+echo "$as_me:3137: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -3160,7 +3169,7 @@
 # Check for some target-specific stuff
 case "$host" in
 *-*-aix*)
-	echo "$as_me:3163: checking how to specify blibpath for linker ($LD)" >&5
+	echo "$as_me:3172: checking how to specify blibpath for linker ($LD)" >&5
 echo $ECHO_N "checking how to specify blibpath for linker ($LD)... $ECHO_C" >&6
 	if (test -z "$blibpath"); then
 		blibpath="/usr/lib:/lib"
@@ -3170,7 +3179,7 @@
 		if (test -z "$blibflags"); then
 			LDFLAGS="$saved_LDFLAGS $tryflags$blibpath"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 3173 "configure"
+#line 3182 "configure"
 #include "confdefs.h"
 
 int
@@ -3182,16 +3191,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3185: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3194: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3188: \$? = $ac_status" >&5
+  echo "$as_me:3197: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3191: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3200: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3194: \$? = $ac_status" >&5
+  echo "$as_me:3203: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   blibflags=$tryflags
 else
@@ -3202,23 +3211,23 @@
 		fi
 	done
 	if (test -z "$blibflags"); then
-		echo "$as_me:3205: result: not found" >&5
+		echo "$as_me:3214: result: not found" >&5
 echo "${ECHO_T}not found" >&6
-		{ { echo "$as_me:3207: error: *** must be able to specify blibpath on AIX - check config.log" >&5
+		{ { echo "$as_me:3216: error: *** must be able to specify blibpath on AIX - check config.log" >&5
 echo "$as_me: error: *** must be able to specify blibpath on AIX - check config.log" >&2;}
    { (exit 1); exit 1; }; }
 	else
-		echo "$as_me:3211: result: $blibflags" >&5
+		echo "$as_me:3220: result: $blibflags" >&5
 echo "${ECHO_T}$blibflags" >&6
 	fi
 	LDFLAGS="$saved_LDFLAGS"
-		echo "$as_me:3215: checking for authenticate" >&5
+		echo "$as_me:3224: checking for authenticate" >&5
 echo $ECHO_N "checking for authenticate... $ECHO_C" >&6
 if test "${ac_cv_func_authenticate+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3221 "configure"
+#line 3230 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char authenticate (); below.  */
@@ -3249,16 +3258,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3252: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3261: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3255: \$? = $ac_status" >&5
+  echo "$as_me:3264: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3258: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3267: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3261: \$? = $ac_status" >&5
+  echo "$as_me:3270: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_authenticate=yes
 else
@@ -3268,7 +3277,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:3271: result: $ac_cv_func_authenticate" >&5
+echo "$as_me:3280: result: $ac_cv_func_authenticate" >&5
 echo "${ECHO_T}$ac_cv_func_authenticate" >&6
 if test $ac_cv_func_authenticate = yes; then
   cat >>confdefs.h <<\EOF
@@ -3276,7 +3285,7 @@
 EOF
 
 else
-  echo "$as_me:3279: checking for authenticate in -ls" >&5
+  echo "$as_me:3288: checking for authenticate in -ls" >&5
 echo $ECHO_N "checking for authenticate in -ls... $ECHO_C" >&6
 if test "${ac_cv_lib_s_authenticate+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3284,7 +3293,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ls  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3287 "configure"
+#line 3296 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3303,16 +3312,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3306: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3315: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3309: \$? = $ac_status" >&5
+  echo "$as_me:3318: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3312: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3321: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3315: \$? = $ac_status" >&5
+  echo "$as_me:3324: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_s_authenticate=yes
 else
@@ -3323,7 +3332,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3326: result: $ac_cv_lib_s_authenticate" >&5
+echo "$as_me:3335: result: $ac_cv_lib_s_authenticate" >&5
 echo "${ECHO_T}$ac_cv_lib_s_authenticate" >&6
 if test $ac_cv_lib_s_authenticate = yes; then
    cat >>confdefs.h <<\EOF
@@ -3336,13 +3345,13 @@
 
 fi
 
-		echo "$as_me:3339: checking whether loginfailed is declared" >&5
+		echo "$as_me:3348: checking whether loginfailed is declared" >&5
 echo $ECHO_N "checking whether loginfailed is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_loginfailed+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3345 "configure"
+#line 3354 "configure"
 #include "confdefs.h"
 #include <usersec.h>
 
@@ -3358,16 +3367,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3361: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3370: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3364: \$? = $ac_status" >&5
+  echo "$as_me:3373: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3367: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3376: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3370: \$? = $ac_status" >&5
+  echo "$as_me:3379: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_loginfailed=yes
 else
@@ -3377,13 +3386,13 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3380: result: $ac_cv_have_decl_loginfailed" >&5
+echo "$as_me:3389: result: $ac_cv_have_decl_loginfailed" >&5
 echo "${ECHO_T}$ac_cv_have_decl_loginfailed" >&6
 if test $ac_cv_have_decl_loginfailed = yes; then
-  echo "$as_me:3383: checking if loginfailed takes 4 arguments" >&5
+  echo "$as_me:3392: checking if loginfailed takes 4 arguments" >&5
 echo $ECHO_N "checking if loginfailed takes 4 arguments... $ECHO_C" >&6
 		  cat >conftest.$ac_ext <<_ACEOF
-#line 3386 "configure"
+#line 3395 "configure"
 #include "confdefs.h"
 #include <usersec.h>
 int
@@ -3395,18 +3404,18 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3398: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3407: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3401: \$? = $ac_status" >&5
+  echo "$as_me:3410: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3404: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3413: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3407: \$? = $ac_status" >&5
+  echo "$as_me:3416: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:3409: result: yes" >&5
+  echo "$as_me:3418: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 cat >>confdefs.h <<\EOF
 #define AIX_LOGINFAILED_4ARG 1
@@ -3415,7 +3424,7 @@
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:3418: result: no" >&5
+echo "$as_me:3427: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 fi
@@ -3425,13 +3434,13 @@
 for ac_func in setauthdb
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:3428: checking for $ac_func" >&5
+echo "$as_me:3437: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3434 "configure"
+#line 3443 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -3462,16 +3471,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3465: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3474: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3468: \$? = $ac_status" >&5
+  echo "$as_me:3477: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3471: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3480: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3474: \$? = $ac_status" >&5
+  echo "$as_me:3483: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -3481,7 +3490,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:3484: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:3493: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -3579,14 +3588,14 @@
 
 	;;
 *-*-darwin*)
-	echo "$as_me:3582: checking if we have working getaddrinfo" >&5
+	echo "$as_me:3591: checking if we have working getaddrinfo" >&5
 echo $ECHO_N "checking if we have working getaddrinfo... $ECHO_C" >&6
 	if test "$cross_compiling" = yes; then
-  echo "$as_me:3585: result: assume it is working" >&5
+  echo "$as_me:3594: result: assume it is working" >&5
 echo "${ECHO_T}assume it is working" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3589 "configure"
+#line 3598 "configure"
 #include "confdefs.h"
 #include <mach-o/dyld.h>
 main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
@@ -3596,23 +3605,23 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:3599: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3608: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3602: \$? = $ac_status" >&5
+  echo "$as_me:3611: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:3604: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3613: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3607: \$? = $ac_status" >&5
+  echo "$as_me:3616: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:3609: result: working" >&5
+  echo "$as_me:3618: result: working" >&5
 echo "${ECHO_T}working" >&6
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:3615: result: buggy" >&5
+echo "$as_me:3624: result: buggy" >&5
 echo "${ECHO_T}buggy" >&6
 	cat >>confdefs.h <<\EOF
 #define BROKEN_GETADDRINFO 1
@@ -3670,7 +3679,7 @@
 
 	LIBS="$LIBS -lsec -lsecpw"
 
-echo "$as_me:3673: checking for t_error in -lxnet" >&5
+echo "$as_me:3682: checking for t_error in -lxnet" >&5
 echo $ECHO_N "checking for t_error in -lxnet... $ECHO_C" >&6
 if test "${ac_cv_lib_xnet_t_error+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3678,7 +3687,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lxnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3681 "configure"
+#line 3690 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3697,16 +3706,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3700: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3709: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3703: \$? = $ac_status" >&5
+  echo "$as_me:3712: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3706: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3715: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3709: \$? = $ac_status" >&5
+  echo "$as_me:3718: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_xnet_t_error=yes
 else
@@ -3717,7 +3726,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3720: result: $ac_cv_lib_xnet_t_error" >&5
+echo "$as_me:3729: result: $ac_cv_lib_xnet_t_error" >&5
 echo "${ECHO_T}$ac_cv_lib_xnet_t_error" >&6
 if test $ac_cv_lib_xnet_t_error = yes; then
   cat >>confdefs.h <<EOF
@@ -3727,7 +3736,7 @@
   LIBS="-lxnet $LIBS"
 
 else
-  { { echo "$as_me:3730: error: *** -lxnet needed on HP-UX - check config.log ***" >&5
+  { { echo "$as_me:3739: error: *** -lxnet needed on HP-UX - check config.log ***" >&5
 echo "$as_me: error: *** -lxnet needed on HP-UX - check config.log ***" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -3762,7 +3771,7 @@
 
 	LIBS="$LIBS -lsec"
 
-echo "$as_me:3765: checking for t_error in -lxnet" >&5
+echo "$as_me:3774: checking for t_error in -lxnet" >&5
 echo $ECHO_N "checking for t_error in -lxnet... $ECHO_C" >&6
 if test "${ac_cv_lib_xnet_t_error+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3770,7 +3779,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lxnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3773 "configure"
+#line 3782 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3789,16 +3798,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3792: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3801: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3795: \$? = $ac_status" >&5
+  echo "$as_me:3804: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3798: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3807: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3801: \$? = $ac_status" >&5
+  echo "$as_me:3810: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_xnet_t_error=yes
 else
@@ -3809,7 +3818,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3812: result: $ac_cv_lib_xnet_t_error" >&5
+echo "$as_me:3821: result: $ac_cv_lib_xnet_t_error" >&5
 echo "${ECHO_T}$ac_cv_lib_xnet_t_error" >&6
 if test $ac_cv_lib_xnet_t_error = yes; then
   cat >>confdefs.h <<EOF
@@ -3819,7 +3828,7 @@
   LIBS="-lxnet $LIBS"
 
 else
-  { { echo "$as_me:3822: error: *** -lxnet needed on HP-UX - check config.log ***" >&5
+  { { echo "$as_me:3831: error: *** -lxnet needed on HP-UX - check config.log ***" >&5
 echo "$as_me: error: *** -lxnet needed on HP-UX - check config.log ***" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -3859,7 +3868,7 @@
 	check_for_hpux_broken_getaddrinfo=1
 	LIBS="$LIBS -lsec"
 
-echo "$as_me:3862: checking for t_error in -lxnet" >&5
+echo "$as_me:3871: checking for t_error in -lxnet" >&5
 echo $ECHO_N "checking for t_error in -lxnet... $ECHO_C" >&6
 if test "${ac_cv_lib_xnet_t_error+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3867,7 +3876,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lxnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3870 "configure"
+#line 3879 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3886,16 +3895,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3889: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3898: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3892: \$? = $ac_status" >&5
+  echo "$as_me:3901: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3895: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3904: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3898: \$? = $ac_status" >&5
+  echo "$as_me:3907: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_xnet_t_error=yes
 else
@@ -3906,7 +3915,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3909: result: $ac_cv_lib_xnet_t_error" >&5
+echo "$as_me:3918: result: $ac_cv_lib_xnet_t_error" >&5
 echo "${ECHO_T}$ac_cv_lib_xnet_t_error" >&6
 if test $ac_cv_lib_xnet_t_error = yes; then
   cat >>confdefs.h <<EOF
@@ -3916,7 +3925,7 @@
   LIBS="-lxnet $LIBS"
 
 else
-  { { echo "$as_me:3919: error: *** -lxnet needed on HP-UX - check config.log ***" >&5
+  { { echo "$as_me:3928: error: *** -lxnet needed on HP-UX - check config.log ***" >&5
 echo "$as_me: error: *** -lxnet needed on HP-UX - check config.log ***" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -3963,13 +3972,13 @@
 #define WITH_IRIX_AUDIT 1
 EOF
 
-	echo "$as_me:3966: checking for jlimit_startjob" >&5
+	echo "$as_me:3975: checking for jlimit_startjob" >&5
 echo $ECHO_N "checking for jlimit_startjob... $ECHO_C" >&6
 if test "${ac_cv_func_jlimit_startjob+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3972 "configure"
+#line 3981 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char jlimit_startjob (); below.  */
@@ -4000,16 +4009,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4003: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4012: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4006: \$? = $ac_status" >&5
+  echo "$as_me:4015: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4009: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4018: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4012: \$? = $ac_status" >&5
+  echo "$as_me:4021: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_jlimit_startjob=yes
 else
@@ -4019,7 +4028,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4022: result: $ac_cv_func_jlimit_startjob" >&5
+echo "$as_me:4031: result: $ac_cv_func_jlimit_startjob" >&5
 echo "${ECHO_T}$ac_cv_func_jlimit_startjob" >&6
 if test $ac_cv_func_jlimit_startjob = yes; then
   cat >>confdefs.h <<\EOF
@@ -4171,11 +4180,11 @@
 	external_path_file=/etc/default/login
 	# hardwire lastlog location (can't detect it on some versions)
 	conf_lastlog_location="/var/adm/lastlog"
-	echo "$as_me:4174: checking for obsolete utmp and wtmp in solaris2.x" >&5
+	echo "$as_me:4183: checking for obsolete utmp and wtmp in solaris2.x" >&5
 echo $ECHO_N "checking for obsolete utmp and wtmp in solaris2.x... $ECHO_C" >&6
 	sol2ver=`echo "$host"| sed -e 's/.*[0-9]\.//'`
 	if test "$sol2ver" -ge 8; then
-		echo "$as_me:4178: result: yes" >&5
+		echo "$as_me:4187: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 		cat >>confdefs.h <<\EOF
 #define DISABLE_UTMP 1
@@ -4186,7 +4195,7 @@
 EOF
 
 	else
-		echo "$as_me:4189: result: no" >&5
+		echo "$as_me:4198: result: no" >&5
 echo "${ECHO_T}no" >&6
 	fi
 	;;
@@ -4196,13 +4205,13 @@
 for ac_func in getpwanam
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:4199: checking for $ac_func" >&5
+echo "$as_me:4208: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4205 "configure"
+#line 4214 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -4233,16 +4242,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4236: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4245: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4239: \$? = $ac_status" >&5
+  echo "$as_me:4248: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4251: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4245: \$? = $ac_status" >&5
+  echo "$as_me:4254: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -4252,7 +4261,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4255: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:4264: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -4300,7 +4309,7 @@
 *-sni-sysv*)
 	# /usr/ucblib MUST NOT be searched on ReliantUNIX
 
-echo "$as_me:4303: checking for dlsym in -ldl" >&5
+echo "$as_me:4312: checking for dlsym in -ldl" >&5
 echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
 if test "${ac_cv_lib_dl_dlsym+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4308,7 +4317,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4311 "configure"
+#line 4320 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4327,16 +4336,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4330: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4339: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4333: \$? = $ac_status" >&5
+  echo "$as_me:4342: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4336: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4345: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4339: \$? = $ac_status" >&5
+  echo "$as_me:4348: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dl_dlsym=yes
 else
@@ -4347,7 +4356,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4350: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:4359: result: $ac_cv_lib_dl_dlsym" >&5
 echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
 if test $ac_cv_lib_dl_dlsym = yes; then
   cat >>confdefs.h <<EOF
@@ -4470,13 +4479,13 @@
 for ac_func in getluid setluid
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:4473: checking for $ac_func" >&5
+echo "$as_me:4482: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4479 "configure"
+#line 4488 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -4507,16 +4516,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4510: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4519: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4513: \$? = $ac_status" >&5
+  echo "$as_me:4522: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4516: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4525: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4519: \$? = $ac_status" >&5
+  echo "$as_me:4528: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -4526,7 +4535,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4529: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:4538: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -4580,13 +4589,13 @@
 for ac_func in getluid setluid
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:4583: checking for $ac_func" >&5
+echo "$as_me:4592: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4589 "configure"
+#line 4598 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -4617,16 +4626,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4620: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4629: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4623: \$? = $ac_status" >&5
+  echo "$as_me:4632: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4626: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4635: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4629: \$? = $ac_status" >&5
+  echo "$as_me:4638: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -4636,7 +4645,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4639: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:4648: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -4736,7 +4745,7 @@
 	MANTYPE=cat
 	;;
 *-dec-osf*)
-	echo "$as_me:4739: checking for Digital Unix SIA" >&5
+	echo "$as_me:4748: checking for Digital Unix SIA" >&5
 echo $ECHO_N "checking for Digital Unix SIA... $ECHO_C" >&6
 	no_osfsia=""
 
@@ -4745,7 +4754,7 @@
   withval="$with_osfsia"
 
 			if test "x$withval" = "xno" ; then
-				echo "$as_me:4748: result: disabled" >&5
+				echo "$as_me:4757: result: disabled" >&5
 echo "${ECHO_T}disabled" >&6
 				no_osfsia=1
 			fi
@@ -4753,7 +4762,7 @@
 fi;
 	if test -z "$no_osfsia" ; then
 		if test -f /etc/sia/matrix.conf; then
-			echo "$as_me:4756: result: yes" >&5
+			echo "$as_me:4765: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			cat >>confdefs.h <<\EOF
 #define HAVE_OSF_SIA 1
@@ -4769,7 +4778,7 @@
 
 			LIBS="$LIBS -lsecurity -ldb -lm -laud"
 		else
-			echo "$as_me:4772: result: no" >&5
+			echo "$as_me:4781: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cat >>confdefs.h <<\EOF
 #define LOCKED_PASSWD_SUBSTR "Nologin"
@@ -4861,15 +4870,15 @@
 
 fi;
 
-echo "$as_me:4864: checking compiler and flags for sanity" >&5
+echo "$as_me:4873: checking compiler and flags for sanity" >&5
 echo $ECHO_N "checking compiler and flags for sanity... $ECHO_C" >&6
 if test "$cross_compiling" = yes; then
-  { { echo "$as_me:4867: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:4876: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4872 "configure"
+#line 4881 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -4877,26 +4886,26 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4880: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4889: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4883: \$? = $ac_status" >&5
+  echo "$as_me:4892: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4885: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4894: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4888: \$? = $ac_status" >&5
+  echo "$as_me:4897: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  	echo "$as_me:4890: result: yes" >&5
+  	echo "$as_me:4899: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-		echo "$as_me:4897: result: no" >&5
+		echo "$as_me:4906: result: no" >&5
 echo "${ECHO_T}no" >&6
-		{ { echo "$as_me:4899: error: *** compiler cannot create working executables, check config.log ***" >&5
+		{ { echo "$as_me:4908: error: *** compiler cannot create working executables, check config.log ***" >&5
 echo "$as_me: error: *** compiler cannot create working executables, check config.log ***" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -4918,23 +4927,23 @@
 	ttyent.h usersec.h util.h utime.h utmp.h utmpx.h vis.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4921: checking for $ac_header" >&5
+echo "$as_me:4930: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4927 "configure"
+#line 4936 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4931: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4940: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4937: \$? = $ac_status" >&5
+  echo "$as_me:4946: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4953,7 +4962,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4956: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4965: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -4964,13 +4973,13 @@
 done
 
 # Checks for libraries.
-echo "$as_me:4967: checking for yp_match" >&5
+echo "$as_me:4976: checking for yp_match" >&5
 echo $ECHO_N "checking for yp_match... $ECHO_C" >&6
 if test "${ac_cv_func_yp_match+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4973 "configure"
+#line 4982 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char yp_match (); below.  */
@@ -5001,16 +5010,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5004: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5013: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5007: \$? = $ac_status" >&5
+  echo "$as_me:5016: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5010: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5019: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5013: \$? = $ac_status" >&5
+  echo "$as_me:5022: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_yp_match=yes
 else
@@ -5020,13 +5029,13 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5023: result: $ac_cv_func_yp_match" >&5
+echo "$as_me:5032: result: $ac_cv_func_yp_match" >&5
 echo "${ECHO_T}$ac_cv_func_yp_match" >&6
 if test $ac_cv_func_yp_match = yes; then
   :
 else
 
-echo "$as_me:5029: checking for yp_match in -lnsl" >&5
+echo "$as_me:5038: checking for yp_match in -lnsl" >&5
 echo $ECHO_N "checking for yp_match in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_yp_match+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5034,7 +5043,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 5037 "configure"
+#line 5046 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5053,16 +5062,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5056: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5065: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5059: \$? = $ac_status" >&5
+  echo "$as_me:5068: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5062: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5071: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5065: \$? = $ac_status" >&5
+  echo "$as_me:5074: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_yp_match=yes
 else
@@ -5073,7 +5082,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:5076: result: $ac_cv_lib_nsl_yp_match" >&5
+echo "$as_me:5085: result: $ac_cv_lib_nsl_yp_match" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_yp_match" >&6
 if test $ac_cv_lib_nsl_yp_match = yes; then
   cat >>confdefs.h <<EOF
@@ -5086,13 +5095,13 @@
 
 fi
 
-echo "$as_me:5089: checking for setsockopt" >&5
+echo "$as_me:5098: checking for setsockopt" >&5
 echo $ECHO_N "checking for setsockopt... $ECHO_C" >&6
 if test "${ac_cv_func_setsockopt+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5095 "configure"
+#line 5104 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char setsockopt (); below.  */
@@ -5123,16 +5132,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5126: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5135: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5129: \$? = $ac_status" >&5
+  echo "$as_me:5138: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5132: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5141: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5135: \$? = $ac_status" >&5
+  echo "$as_me:5144: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_setsockopt=yes
 else
@@ -5142,13 +5151,13 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5145: result: $ac_cv_func_setsockopt" >&5
+echo "$as_me:5154: result: $ac_cv_func_setsockopt" >&5
 echo "${ECHO_T}$ac_cv_func_setsockopt" >&6
 if test $ac_cv_func_setsockopt = yes; then
   :
 else
 
-echo "$as_me:5151: checking for setsockopt in -lsocket" >&5
+echo "$as_me:5160: checking for setsockopt in -lsocket" >&5
 echo $ECHO_N "checking for setsockopt in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_setsockopt+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5156,7 +5165,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 5159 "configure"
+#line 5168 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5175,16 +5184,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5178: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5187: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5181: \$? = $ac_status" >&5
+  echo "$as_me:5190: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5184: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5193: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5187: \$? = $ac_status" >&5
+  echo "$as_me:5196: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_setsockopt=yes
 else
@@ -5195,7 +5204,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:5198: result: $ac_cv_lib_socket_setsockopt" >&5
+echo "$as_me:5207: result: $ac_cv_lib_socket_setsockopt" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_setsockopt" >&6
 if test $ac_cv_lib_socket_setsockopt = yes; then
   cat >>confdefs.h <<EOF
@@ -5210,7 +5219,7 @@
 
 if test "x$with_tcp_wrappers" != "xno" ; then
     if test "x$do_sco3_extra_lib_check" = "xyes" ; then
-	echo "$as_me:5213: checking for innetgr in -lrpc" >&5
+	echo "$as_me:5222: checking for innetgr in -lrpc" >&5
 echo $ECHO_N "checking for innetgr in -lrpc... $ECHO_C" >&6
 if test "${ac_cv_lib_rpc_innetgr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5218,7 +5227,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrpc -lyp -lrpc $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 5221 "configure"
+#line 5230 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5237,16 +5246,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5240: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5249: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5243: \$? = $ac_status" >&5
+  echo "$as_me:5252: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5246: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5255: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5249: \$? = $ac_status" >&5
+  echo "$as_me:5258: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_rpc_innetgr=yes
 else
@@ -5257,7 +5266,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:5260: result: $ac_cv_lib_rpc_innetgr" >&5
+echo "$as_me:5269: result: $ac_cv_lib_rpc_innetgr" >&5
 echo "${ECHO_T}$ac_cv_lib_rpc_innetgr" >&6
 if test $ac_cv_lib_rpc_innetgr = yes; then
   LIBS="-lrpc -lyp -lrpc $LIBS"
@@ -5269,13 +5278,13 @@
 for ac_func in dirname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5272: checking for $ac_func" >&5
+echo "$as_me:5281: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5278 "configure"
+#line 5287 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -5306,16 +5315,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5309: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5318: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5312: \$? = $ac_status" >&5
+  echo "$as_me:5321: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5315: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5324: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5318: \$? = $ac_status" >&5
+  echo "$as_me:5327: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -5325,7 +5334,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5328: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5337: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -5335,23 +5344,23 @@
 for ac_header in libgen.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5338: checking for $ac_header" >&5
+echo "$as_me:5347: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5344 "configure"
+#line 5353 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5348: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5357: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5354: \$? = $ac_status" >&5
+  echo "$as_me:5363: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5370,7 +5379,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5373: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5382: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -5382,7 +5391,7 @@
 
 else
 
-	echo "$as_me:5385: checking for dirname in -lgen" >&5
+	echo "$as_me:5394: checking for dirname in -lgen" >&5
 echo $ECHO_N "checking for dirname in -lgen... $ECHO_C" >&6
 if test "${ac_cv_lib_gen_dirname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5390,7 +5399,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 5393 "configure"
+#line 5402 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5409,16 +5418,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5412: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5421: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5415: \$? = $ac_status" >&5
+  echo "$as_me:5424: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5418: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5421: \$? = $ac_status" >&5
+  echo "$as_me:5430: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gen_dirname=yes
 else
@@ -5429,11 +5438,11 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:5432: result: $ac_cv_lib_gen_dirname" >&5
+echo "$as_me:5441: result: $ac_cv_lib_gen_dirname" >&5
 echo "${ECHO_T}$ac_cv_lib_gen_dirname" >&6
 if test $ac_cv_lib_gen_dirname = yes; then
 
-		echo "$as_me:5436: checking for broken dirname" >&5
+		echo "$as_me:5445: checking for broken dirname" >&5
 echo $ECHO_N "checking for broken dirname... $ECHO_C" >&6
 if test "${ac_cv_have_broken_dirname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5442,12 +5451,12 @@
 			save_LIBS="$LIBS"
 			LIBS="$LIBS -lgen"
 			if test "$cross_compiling" = yes; then
-  { { echo "$as_me:5445: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:5454: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5450 "configure"
+#line 5459 "configure"
 #include "confdefs.h"
 
 #include <libgen.h>
@@ -5467,15 +5476,15 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5470: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5479: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5473: \$? = $ac_status" >&5
+  echo "$as_me:5482: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5475: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5484: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5478: \$? = $ac_status" >&5
+  echo "$as_me:5487: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_have_broken_dirname="no"
 else
@@ -5490,7 +5499,7 @@
 			LIBS="$save_LIBS"
 
 fi
-echo "$as_me:5493: result: $ac_cv_have_broken_dirname" >&5
+echo "$as_me:5502: result: $ac_cv_have_broken_dirname" >&5
 echo "${ECHO_T}$ac_cv_have_broken_dirname" >&6
 		if test "x$ac_cv_have_broken_dirname" = "xno" ; then
 			LIBS="$LIBS -lgen"
@@ -5501,23 +5510,23 @@
 for ac_header in libgen.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5504: checking for $ac_header" >&5
+echo "$as_me:5513: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5510 "configure"
+#line 5519 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5514: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5523: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5520: \$? = $ac_status" >&5
+  echo "$as_me:5529: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5536,7 +5545,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5539: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5548: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -5553,13 +5562,13 @@
 fi
 done
 
-echo "$as_me:5556: checking for getspnam" >&5
+echo "$as_me:5565: checking for getspnam" >&5
 echo $ECHO_N "checking for getspnam... $ECHO_C" >&6
 if test "${ac_cv_func_getspnam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5562 "configure"
+#line 5571 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getspnam (); below.  */
@@ -5590,16 +5599,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5593: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5602: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5596: \$? = $ac_status" >&5
+  echo "$as_me:5605: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5599: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5608: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5602: \$? = $ac_status" >&5
+  echo "$as_me:5611: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getspnam=yes
 else
@@ -5609,12 +5618,12 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5612: result: $ac_cv_func_getspnam" >&5
+echo "$as_me:5621: result: $ac_cv_func_getspnam" >&5
 echo "${ECHO_T}$ac_cv_func_getspnam" >&6
 if test $ac_cv_func_getspnam = yes; then
   :
 else
-  echo "$as_me:5617: checking for getspnam in -lgen" >&5
+  echo "$as_me:5626: checking for getspnam in -lgen" >&5
 echo $ECHO_N "checking for getspnam in -lgen... $ECHO_C" >&6
 if test "${ac_cv_lib_gen_getspnam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5622,7 +5631,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 5625 "configure"
+#line 5634 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5641,16 +5650,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5644: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5653: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5647: \$? = $ac_status" >&5
+  echo "$as_me:5656: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5650: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5653: \$? = $ac_status" >&5
+  echo "$as_me:5662: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gen_getspnam=yes
 else
@@ -5661,7 +5670,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:5664: result: $ac_cv_lib_gen_getspnam" >&5
+echo "$as_me:5673: result: $ac_cv_lib_gen_getspnam" >&5
 echo "${ECHO_T}$ac_cv_lib_gen_getspnam" >&6
 if test $ac_cv_lib_gen_getspnam = yes; then
   LIBS="$LIBS -lgen"
@@ -5669,7 +5678,7 @@
 
 fi
 
-echo "$as_me:5672: checking for library containing basename" >&5
+echo "$as_me:5681: checking for library containing basename" >&5
 echo $ECHO_N "checking for library containing basename... $ECHO_C" >&6
 if test "${ac_cv_search_basename+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5677,7 +5686,7 @@
   ac_func_search_save_LIBS=$LIBS
 ac_cv_search_basename=no
 cat >conftest.$ac_ext <<_ACEOF
-#line 5680 "configure"
+#line 5689 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5696,16 +5705,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5699: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5708: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5702: \$? = $ac_status" >&5
+  echo "$as_me:5711: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5705: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5714: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5708: \$? = $ac_status" >&5
+  echo "$as_me:5717: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_basename="none required"
 else
@@ -5717,7 +5726,7 @@
   for ac_lib in gen; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
-#line 5720 "configure"
+#line 5729 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5736,16 +5745,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5739: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5748: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5742: \$? = $ac_status" >&5
+  echo "$as_me:5751: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5745: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5754: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5748: \$? = $ac_status" >&5
+  echo "$as_me:5757: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_basename="-l$ac_lib"
 break
@@ -5758,7 +5767,7 @@
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:5761: result: $ac_cv_search_basename" >&5
+echo "$as_me:5770: result: $ac_cv_search_basename" >&5
 echo "${ECHO_T}$ac_cv_search_basename" >&6
 if test "$ac_cv_search_basename" != no; then
   test "$ac_cv_search_basename" = "none required" || LIBS="$ac_cv_search_basename $LIBS"
@@ -5773,7 +5782,7 @@
   withval="$with_zlib"
 
 		if test "x$withval" = "xno" ; then
-			{ { echo "$as_me:5776: error: *** zlib is required ***" >&5
+			{ { echo "$as_me:5785: error: *** zlib is required ***" >&5
 echo "$as_me: error: *** zlib is required ***" >&2;}
    { (exit 1); exit 1; }; }
 		fi
@@ -5798,7 +5807,7 @@
 
 fi;
 
-echo "$as_me:5801: checking for deflate in -lz" >&5
+echo "$as_me:5810: checking for deflate in -lz" >&5
 echo $ECHO_N "checking for deflate in -lz... $ECHO_C" >&6
 if test "${ac_cv_lib_z_deflate+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5806,7 +5815,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lz  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 5809 "configure"
+#line 5818 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5825,16 +5834,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5828: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5837: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5831: \$? = $ac_status" >&5
+  echo "$as_me:5840: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5834: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5843: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5837: \$? = $ac_status" >&5
+  echo "$as_me:5846: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_z_deflate=yes
 else
@@ -5845,7 +5854,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:5848: result: $ac_cv_lib_z_deflate" >&5
+echo "$as_me:5857: result: $ac_cv_lib_z_deflate" >&5
 echo "${ECHO_T}$ac_cv_lib_z_deflate" >&6
 if test $ac_cv_lib_z_deflate = yes; then
   cat >>confdefs.h <<EOF
@@ -5867,7 +5876,7 @@
 		CPPFLAGS="-I/usr/local/include ${saved_CPPFLAGS}"
 		LIBS="$LIBS -lz"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 5870 "configure"
+#line 5879 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5886,16 +5895,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5889: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5898: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5892: \$? = $ac_status" >&5
+  echo "$as_me:5901: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5895: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5904: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5898: \$? = $ac_status" >&5
+  echo "$as_me:5907: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >>confdefs.h <<\EOF
 #define HAVE_LIBZ 1
@@ -5905,7 +5914,7 @@
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-				{ { echo "$as_me:5908: error: *** zlib missing - please install first or check config.log ***" >&5
+				{ { echo "$as_me:5917: error: *** zlib missing - please install first or check config.log ***" >&5
 echo "$as_me: error: *** zlib missing - please install first or check config.log ***" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -5914,23 +5923,23 @@
 
 fi
 
-echo "$as_me:5917: checking for zlib.h" >&5
+echo "$as_me:5926: checking for zlib.h" >&5
 echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
 if test "${ac_cv_header_zlib_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5923 "configure"
+#line 5932 "configure"
 #include "confdefs.h"
 #include <zlib.h>
 _ACEOF
-if { (eval echo "$as_me:5927: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5936: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5933: \$? = $ac_status" >&5
+  echo "$as_me:5942: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5949,12 +5958,12 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5952: result: $ac_cv_header_zlib_h" >&5
+echo "$as_me:5961: result: $ac_cv_header_zlib_h" >&5
 echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
 if test $ac_cv_header_zlib_h = yes; then
   :
 else
-  { { echo "$as_me:5957: error: *** zlib.h missing - please install first or check config.log ***" >&5
+  { { echo "$as_me:5966: error: *** zlib.h missing - please install first or check config.log ***" >&5
 echo "$as_me: error: *** zlib.h missing - please install first or check config.log ***" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -5968,15 +5977,15 @@
 
 fi;
 
-echo "$as_me:5971: checking for zlib 1.1.4 or greater" >&5
+echo "$as_me:5980: checking for zlib 1.1.4 or greater" >&5
 echo $ECHO_N "checking for zlib 1.1.4 or greater... $ECHO_C" >&6
 if test "$cross_compiling" = yes; then
-  { { echo "$as_me:5974: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:5983: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5979 "configure"
+#line 5988 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -5993,26 +6002,26 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5996: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6005: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5999: \$? = $ac_status" >&5
+  echo "$as_me:6008: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:6001: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6010: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6004: \$? = $ac_status" >&5
+  echo "$as_me:6013: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:6006: result: yes" >&5
+  echo "$as_me:6015: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:6012: result: no" >&5
+ echo "$as_me:6021: result: no" >&5
 echo "${ECHO_T}no" >&6
 	  if test -z "$zlib_check_nonfatal" ; then
-		{ { echo "$as_me:6015: error: *** zlib too old - check config.log ***
+		{ { echo "$as_me:6024: error: *** zlib too old - check config.log ***
 Your reported zlib version has known security problems.  It's possible your
 vendor has fixed these problems without changing the version number.  If you
 are sure this is the case, you can disable the check by running
@@ -6026,7 +6035,7 @@
 If you are in doubt, upgrade zlib to version 1.1.4 or greater." >&2;}
    { (exit 1); exit 1; }; }
 	  else
-		{ echo "$as_me:6029: WARNING: zlib version may have security problems" >&5
+		{ echo "$as_me:6038: WARNING: zlib version may have security problems" >&5
 echo "$as_me: WARNING: zlib version may have security problems" >&2;}
 	  fi
 
@@ -6034,13 +6043,13 @@
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:6037: checking for strcasecmp" >&5
+echo "$as_me:6046: checking for strcasecmp" >&5
 echo $ECHO_N "checking for strcasecmp... $ECHO_C" >&6
 if test "${ac_cv_func_strcasecmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6043 "configure"
+#line 6052 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char strcasecmp (); below.  */
@@ -6071,16 +6080,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6074: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6083: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6077: \$? = $ac_status" >&5
+  echo "$as_me:6086: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6080: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6089: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6083: \$? = $ac_status" >&5
+  echo "$as_me:6092: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_strcasecmp=yes
 else
@@ -6090,12 +6099,12 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6093: result: $ac_cv_func_strcasecmp" >&5
+echo "$as_me:6102: result: $ac_cv_func_strcasecmp" >&5
 echo "${ECHO_T}$ac_cv_func_strcasecmp" >&6
 if test $ac_cv_func_strcasecmp = yes; then
   :
 else
-   echo "$as_me:6098: checking for strcasecmp in -lresolv" >&5
+   echo "$as_me:6107: checking for strcasecmp in -lresolv" >&5
 echo $ECHO_N "checking for strcasecmp in -lresolv... $ECHO_C" >&6
 if test "${ac_cv_lib_resolv_strcasecmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6103,7 +6112,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6106 "configure"
+#line 6115 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6122,16 +6131,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6125: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6134: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6128: \$? = $ac_status" >&5
+  echo "$as_me:6137: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6131: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6140: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6134: \$? = $ac_status" >&5
+  echo "$as_me:6143: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_resolv_strcasecmp=yes
 else
@@ -6142,7 +6151,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6145: result: $ac_cv_lib_resolv_strcasecmp" >&5
+echo "$as_me:6154: result: $ac_cv_lib_resolv_strcasecmp" >&5
 echo "${ECHO_T}$ac_cv_lib_resolv_strcasecmp" >&6
 if test $ac_cv_lib_resolv_strcasecmp = yes; then
   LIBS="$LIBS -lresolv"
@@ -6150,13 +6159,13 @@
 
 fi
 
-echo "$as_me:6153: checking for utimes" >&5
+echo "$as_me:6162: checking for utimes" >&5
 echo $ECHO_N "checking for utimes... $ECHO_C" >&6
 if test "${ac_cv_func_utimes+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6159 "configure"
+#line 6168 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char utimes (); below.  */
@@ -6187,16 +6196,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6190: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6199: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6193: \$? = $ac_status" >&5
+  echo "$as_me:6202: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6196: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6205: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6199: \$? = $ac_status" >&5
+  echo "$as_me:6208: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_utimes=yes
 else
@@ -6206,12 +6215,12 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6209: result: $ac_cv_func_utimes" >&5
+echo "$as_me:6218: result: $ac_cv_func_utimes" >&5
 echo "${ECHO_T}$ac_cv_func_utimes" >&6
 if test $ac_cv_func_utimes = yes; then
   :
 else
-   echo "$as_me:6214: checking for utimes in -lc89" >&5
+   echo "$as_me:6223: checking for utimes in -lc89" >&5
 echo $ECHO_N "checking for utimes in -lc89... $ECHO_C" >&6
 if test "${ac_cv_lib_c89_utimes+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6219,7 +6228,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc89  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6222 "configure"
+#line 6231 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6238,16 +6247,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6241: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6250: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6244: \$? = $ac_status" >&5
+  echo "$as_me:6253: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6247: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6256: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6250: \$? = $ac_status" >&5
+  echo "$as_me:6259: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_c89_utimes=yes
 else
@@ -6258,7 +6267,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6261: result: $ac_cv_lib_c89_utimes" >&5
+echo "$as_me:6270: result: $ac_cv_lib_c89_utimes" >&5
 echo "${ECHO_T}$ac_cv_lib_c89_utimes" >&6
 if test $ac_cv_lib_c89_utimes = yes; then
   cat >>confdefs.h <<\EOF
@@ -6273,23 +6282,23 @@
 for ac_header in libutil.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6276: checking for $ac_header" >&5
+echo "$as_me:6285: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6282 "configure"
+#line 6291 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6286: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:6295: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:6292: \$? = $ac_status" >&5
+  echo "$as_me:6301: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6308,7 +6317,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:6311: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:6320: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -6318,7 +6327,7 @@
 fi
 done
 
-echo "$as_me:6321: checking for library containing login" >&5
+echo "$as_me:6330: checking for library containing login" >&5
 echo $ECHO_N "checking for library containing login... $ECHO_C" >&6
 if test "${ac_cv_search_login+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6326,7 +6335,7 @@
   ac_func_search_save_LIBS=$LIBS
 ac_cv_search_login=no
 cat >conftest.$ac_ext <<_ACEOF
-#line 6329 "configure"
+#line 6338 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6345,16 +6354,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6348: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6357: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6351: \$? = $ac_status" >&5
+  echo "$as_me:6360: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6354: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6363: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6357: \$? = $ac_status" >&5
+  echo "$as_me:6366: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_login="none required"
 else
@@ -6366,7 +6375,7 @@
   for ac_lib in util bsd; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
-#line 6369 "configure"
+#line 6378 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6385,16 +6394,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6388: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6397: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6391: \$? = $ac_status" >&5
+  echo "$as_me:6400: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6394: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6403: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6397: \$? = $ac_status" >&5
+  echo "$as_me:6406: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_login="-l$ac_lib"
 break
@@ -6407,7 +6416,7 @@
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:6410: result: $ac_cv_search_login" >&5
+echo "$as_me:6419: result: $ac_cv_search_login" >&5
 echo "${ECHO_T}$ac_cv_search_login" >&6
 if test "$ac_cv_search_login" != no; then
   test "$ac_cv_search_login" = "none required" || LIBS="$ac_cv_search_login $LIBS"
@@ -6420,13 +6429,13 @@
 for ac_func in logout updwtmp logwtmp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:6423: checking for $ac_func" >&5
+echo "$as_me:6432: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6429 "configure"
+#line 6438 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -6457,16 +6466,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6460: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6469: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6463: \$? = $ac_status" >&5
+  echo "$as_me:6472: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6466: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6475: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6469: \$? = $ac_status" >&5
+  echo "$as_me:6478: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -6476,7 +6485,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6479: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6488: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -6489,13 +6498,13 @@
 for ac_func in strftime
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:6492: checking for $ac_func" >&5
+echo "$as_me:6501: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6498 "configure"
+#line 6507 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -6526,16 +6535,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6529: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6538: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6532: \$? = $ac_status" >&5
+  echo "$as_me:6541: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6535: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6544: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6538: \$? = $ac_status" >&5
+  echo "$as_me:6547: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -6545,7 +6554,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6548: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6557: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -6554,7 +6563,7 @@
 
 else
   # strftime is in -lintl on SCO UNIX.
-echo "$as_me:6557: checking for strftime in -lintl" >&5
+echo "$as_me:6566: checking for strftime in -lintl" >&5
 echo $ECHO_N "checking for strftime in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_strftime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6562,7 +6571,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6565 "configure"
+#line 6574 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6581,16 +6590,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6584: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6593: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6587: \$? = $ac_status" >&5
+  echo "$as_me:6596: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6590: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6599: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6593: \$? = $ac_status" >&5
+  echo "$as_me:6602: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_intl_strftime=yes
 else
@@ -6601,7 +6610,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6604: result: $ac_cv_lib_intl_strftime" >&5
+echo "$as_me:6613: result: $ac_cv_lib_intl_strftime" >&5
 echo "${ECHO_T}$ac_cv_lib_intl_strftime" >&6
 if test $ac_cv_lib_intl_strftime = yes; then
   cat >>confdefs.h <<\EOF
@@ -6615,10 +6624,10 @@
 done
 
 # Check for ALTDIRFUNC glob() extension
-echo "$as_me:6618: checking for GLOB_ALTDIRFUNC support" >&5
+echo "$as_me:6627: checking for GLOB_ALTDIRFUNC support" >&5
 echo $ECHO_N "checking for GLOB_ALTDIRFUNC support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 6621 "configure"
+#line 6630 "configure"
 #include "confdefs.h"
 
 		#include <glob.h>
@@ -6634,22 +6643,22 @@
 #define GLOB_HAS_ALTDIRFUNC 1
 EOF
 
-		echo "$as_me:6637: result: yes" >&5
+		echo "$as_me:6646: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 else
 
-		echo "$as_me:6642: result: no" >&5
+		echo "$as_me:6651: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 fi
 rm -f conftest*
 
 # Check for g.gl_matchc glob() extension
-echo "$as_me:6649: checking for gl_matchc field in glob_t" >&5
+echo "$as_me:6658: checking for gl_matchc field in glob_t" >&5
 echo $ECHO_N "checking for gl_matchc field in glob_t... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 6652 "configure"
+#line 6661 "configure"
 #include "confdefs.h"
 
 		#include <glob.h>
@@ -6663,26 +6672,26 @@
 #define GLOB_HAS_GL_MATCHC 1
 EOF
 
-		echo "$as_me:6666: result: yes" >&5
+		echo "$as_me:6675: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 else
 
-		echo "$as_me:6671: result: no" >&5
+		echo "$as_me:6680: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 fi
 rm -f conftest*
 
-echo "$as_me:6677: checking whether struct dirent allocates space for d_name" >&5
+echo "$as_me:6686: checking whether struct dirent allocates space for d_name" >&5
 echo $ECHO_N "checking whether struct dirent allocates space for d_name... $ECHO_C" >&6
 if test "$cross_compiling" = yes; then
-  { { echo "$as_me:6680: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:6689: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6685 "configure"
+#line 6694 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6691,24 +6700,24 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6694: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6703: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6697: \$? = $ac_status" >&5
+  echo "$as_me:6706: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:6699: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6708: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6702: \$? = $ac_status" >&5
+  echo "$as_me:6711: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:6704: result: yes" >&5
+  echo "$as_me:6713: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-		echo "$as_me:6711: result: no" >&5
+		echo "$as_me:6720: result: no" >&5
 echo "${ECHO_T}no" >&6
 		cat >>confdefs.h <<\EOF
 #define BROKEN_ONE_BYTE_DIRENT_D_NAME 1
@@ -6739,15 +6748,15 @@
 			LIBS="-lskey $LIBS"
 			SKEY_MSG="yes"
 
-			echo "$as_me:6742: checking for s/key support" >&5
+			echo "$as_me:6751: checking for s/key support" >&5
 echo $ECHO_N "checking for s/key support... $ECHO_C" >&6
 			if test "$cross_compiling" = yes; then
-  { { echo "$as_me:6745: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:6754: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6750 "configure"
+#line 6759 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -6756,36 +6765,36 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6759: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6768: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6762: \$? = $ac_status" >&5
+  echo "$as_me:6771: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:6764: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6773: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6767: \$? = $ac_status" >&5
+  echo "$as_me:6776: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:6769: result: yes" >&5
+  echo "$as_me:6778: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-					echo "$as_me:6776: result: no" >&5
+					echo "$as_me:6785: result: no" >&5
 echo "${ECHO_T}no" >&6
-					{ { echo "$as_me:6778: error: ** Incomplete or missing s/key libraries." >&5
+					{ { echo "$as_me:6787: error: ** Incomplete or missing s/key libraries." >&5
 echo "$as_me: error: ** Incomplete or missing s/key libraries." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-                 	echo "$as_me:6785: checking if skeychallenge takes 4 arguments" >&5
+                 	echo "$as_me:6794: checking if skeychallenge takes 4 arguments" >&5
 echo $ECHO_N "checking if skeychallenge takes 4 arguments... $ECHO_C" >&6
 			cat >conftest.$ac_ext <<_ACEOF
-#line 6788 "configure"
+#line 6797 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 				 #include <skey.h>
@@ -6798,18 +6807,18 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6801: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6810: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6804: \$? = $ac_status" >&5
+  echo "$as_me:6813: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6807: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6816: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6810: \$? = $ac_status" >&5
+  echo "$as_me:6819: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:6812: result: yes" >&5
+  echo "$as_me:6821: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 				 cat >>confdefs.h <<\EOF
 #define SKEYCHALLENGE_4ARG 1
@@ -6818,7 +6827,7 @@
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:6821: result: no" >&5
+echo "$as_me:6830: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 fi
@@ -6860,10 +6869,10 @@
 			fi
 			LIBWRAP="-lwrap"
 			LIBS="$LIBWRAP $LIBS"
-			echo "$as_me:6863: checking for libwrap" >&5
+			echo "$as_me:6872: checking for libwrap" >&5
 echo $ECHO_N "checking for libwrap... $ECHO_C" >&6
 			cat >conftest.$ac_ext <<_ACEOF
-#line 6866 "configure"
+#line 6875 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6881,19 +6890,19 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6884: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6893: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6887: \$? = $ac_status" >&5
+  echo "$as_me:6896: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6890: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6899: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6893: \$? = $ac_status" >&5
+  echo "$as_me:6902: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-					echo "$as_me:6896: result: yes" >&5
+					echo "$as_me:6905: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 					cat >>confdefs.h <<\EOF
 #define LIBWRAP 1
@@ -6905,7 +6914,7 @@
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-					{ { echo "$as_me:6908: error: *** libwrap missing" >&5
+					{ { echo "$as_me:6917: error: *** libwrap missing" >&5
 echo "$as_me: error: *** libwrap missing" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -6932,13 +6941,13 @@
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:6935: checking for $ac_func" >&5
+echo "$as_me:6944: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6941 "configure"
+#line 6950 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -6969,16 +6978,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6972: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6981: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6975: \$? = $ac_status" >&5
+  echo "$as_me:6984: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6978: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6987: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6981: \$? = $ac_status" >&5
+  echo "$as_me:6990: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -6988,7 +6997,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6991: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:7000: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -7003,13 +7012,13 @@
 for ac_func in gai_strerror
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:7006: checking for $ac_func" >&5
+echo "$as_me:7015: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7012 "configure"
+#line 7021 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -7040,16 +7049,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7043: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7052: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7046: \$? = $ac_status" >&5
+  echo "$as_me:7055: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7049: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7058: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7052: \$? = $ac_status" >&5
+  echo "$as_me:7061: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -7059,7 +7068,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7062: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:7071: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -7071,7 +7080,7 @@
 EOF
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 7074 "configure"
+#line 7083 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -7091,16 +7100,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7094: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7103: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7097: \$? = $ac_status" >&5
+  echo "$as_me:7106: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7100: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7109: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7103: \$? = $ac_status" >&5
+  echo "$as_me:7112: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >>confdefs.h <<\EOF
@@ -7115,7 +7124,7 @@
 fi
 done
 
-echo "$as_me:7118: checking for library containing nanosleep" >&5
+echo "$as_me:7127: checking for library containing nanosleep" >&5
 echo $ECHO_N "checking for library containing nanosleep... $ECHO_C" >&6
 if test "${ac_cv_search_nanosleep+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7123,7 +7132,7 @@
   ac_func_search_save_LIBS=$LIBS
 ac_cv_search_nanosleep=no
 cat >conftest.$ac_ext <<_ACEOF
-#line 7126 "configure"
+#line 7135 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7142,16 +7151,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7145: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7154: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7148: \$? = $ac_status" >&5
+  echo "$as_me:7157: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7151: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7160: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7154: \$? = $ac_status" >&5
+  echo "$as_me:7163: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_nanosleep="none required"
 else
@@ -7163,7 +7172,7 @@
   for ac_lib in rt posix4; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
-#line 7166 "configure"
+#line 7175 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7182,16 +7191,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7185: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7194: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7188: \$? = $ac_status" >&5
+  echo "$as_me:7197: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7191: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7200: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7194: \$? = $ac_status" >&5
+  echo "$as_me:7203: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_nanosleep="-l$ac_lib"
 break
@@ -7204,7 +7213,7 @@
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:7207: result: $ac_cv_search_nanosleep" >&5
+echo "$as_me:7216: result: $ac_cv_search_nanosleep" >&5
 echo "${ECHO_T}$ac_cv_search_nanosleep" >&6
 if test "$ac_cv_search_nanosleep" != no; then
   test "$ac_cv_search_nanosleep" = "none required" || LIBS="$ac_cv_search_nanosleep $LIBS"
@@ -7214,13 +7223,13 @@
 
 fi
 
-echo "$as_me:7217: checking for ANSI C header files" >&5
+echo "$as_me:7226: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7223 "configure"
+#line 7232 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -7228,13 +7237,13 @@
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:7231: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7240: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7237: \$? = $ac_status" >&5
+  echo "$as_me:7246: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7256,7 +7265,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 7259 "configure"
+#line 7268 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -7274,7 +7283,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 7277 "configure"
+#line 7286 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -7295,7 +7304,7 @@
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7298 "configure"
+#line 7307 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -7321,15 +7330,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:7324: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7333: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7327: \$? = $ac_status" >&5
+  echo "$as_me:7336: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:7329: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7338: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7332: \$? = $ac_status" >&5
+  echo "$as_me:7341: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -7342,7 +7351,7 @@
 fi
 fi
 fi
-echo "$as_me:7345: result: $ac_cv_header_stdc" >&5
+echo "$as_me:7354: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -7358,28 +7367,28 @@
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:7361: checking for $ac_header" >&5
+echo "$as_me:7370: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7367 "configure"
+#line 7376 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7373: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7382: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7376: \$? = $ac_status" >&5
+  echo "$as_me:7385: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7379: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7388: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7382: \$? = $ac_status" >&5
+  echo "$as_me:7391: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -7389,7 +7398,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:7392: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:7401: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -7399,13 +7408,13 @@
 fi
 done
 
-echo "$as_me:7402: checking whether strsep is declared" >&5
+echo "$as_me:7411: checking whether strsep is declared" >&5
 echo $ECHO_N "checking whether strsep is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_strsep+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7408 "configure"
+#line 7417 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -7420,16 +7429,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7423: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7432: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7426: \$? = $ac_status" >&5
+  echo "$as_me:7435: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7429: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7438: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7432: \$? = $ac_status" >&5
+  echo "$as_me:7441: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_strsep=yes
 else
@@ -7439,20 +7448,20 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:7442: result: $ac_cv_have_decl_strsep" >&5
+echo "$as_me:7451: result: $ac_cv_have_decl_strsep" >&5
 echo "${ECHO_T}$ac_cv_have_decl_strsep" >&6
 if test $ac_cv_have_decl_strsep = yes; then
 
 for ac_func in strsep
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:7449: checking for $ac_func" >&5
+echo "$as_me:7458: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7455 "configure"
+#line 7464 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -7483,16 +7492,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7486: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7495: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7489: \$? = $ac_status" >&5
+  echo "$as_me:7498: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7492: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7501: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7495: \$? = $ac_status" >&5
+  echo "$as_me:7504: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -7502,7 +7511,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7505: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:7514: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -7514,13 +7523,13 @@
 
 fi
 
-echo "$as_me:7517: checking whether getrusage is declared" >&5
+echo "$as_me:7526: checking whether getrusage is declared" >&5
 echo $ECHO_N "checking whether getrusage is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_getrusage+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7523 "configure"
+#line 7532 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -7535,16 +7544,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7538: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7547: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7541: \$? = $ac_status" >&5
+  echo "$as_me:7550: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7544: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7553: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7547: \$? = $ac_status" >&5
+  echo "$as_me:7556: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_getrusage=yes
 else
@@ -7554,20 +7563,20 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:7557: result: $ac_cv_have_decl_getrusage" >&5
+echo "$as_me:7566: result: $ac_cv_have_decl_getrusage" >&5
 echo "${ECHO_T}$ac_cv_have_decl_getrusage" >&6
 if test $ac_cv_have_decl_getrusage = yes; then
 
 for ac_func in getrusage
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:7564: checking for $ac_func" >&5
+echo "$as_me:7573: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7570 "configure"
+#line 7579 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -7598,16 +7607,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7601: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7610: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7604: \$? = $ac_status" >&5
+  echo "$as_me:7613: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7607: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7616: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7610: \$? = $ac_status" >&5
+  echo "$as_me:7619: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -7617,7 +7626,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7620: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:7629: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -7629,13 +7638,13 @@
 
 fi
 
-echo "$as_me:7632: checking whether tcsendbreak is declared" >&5
+echo "$as_me:7641: checking whether tcsendbreak is declared" >&5
 echo $ECHO_N "checking whether tcsendbreak is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_tcsendbreak+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7638 "configure"
+#line 7647 "configure"
 #include "confdefs.h"
 #include <termios.h>
 
@@ -7651,16 +7660,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7654: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7663: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7657: \$? = $ac_status" >&5
+  echo "$as_me:7666: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7660: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7669: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7663: \$? = $ac_status" >&5
+  echo "$as_me:7672: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_tcsendbreak=yes
 else
@@ -7670,7 +7679,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:7673: result: $ac_cv_have_decl_tcsendbreak" >&5
+echo "$as_me:7682: result: $ac_cv_have_decl_tcsendbreak" >&5
 echo "${ECHO_T}$ac_cv_have_decl_tcsendbreak" >&6
 if test $ac_cv_have_decl_tcsendbreak = yes; then
   cat >>confdefs.h <<\EOF
@@ -7682,13 +7691,13 @@
 for ac_func in tcsendbreak
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:7685: checking for $ac_func" >&5
+echo "$as_me:7694: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7691 "configure"
+#line 7700 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -7719,16 +7728,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7722: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7731: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7725: \$? = $ac_status" >&5
+  echo "$as_me:7734: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7728: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7737: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7731: \$? = $ac_status" >&5
+  echo "$as_me:7740: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -7738,7 +7747,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7741: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:7750: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -7753,13 +7762,13 @@
 for ac_func in setresuid
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:7756: checking for $ac_func" >&5
+echo "$as_me:7765: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7762 "configure"
+#line 7771 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -7790,16 +7799,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7793: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7802: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7796: \$? = $ac_status" >&5
+  echo "$as_me:7805: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7799: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7808: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7802: \$? = $ac_status" >&5
+  echo "$as_me:7811: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -7809,22 +7818,22 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7812: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:7821: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
-		echo "$as_me:7819: checking if setresuid seems to work" >&5
+		echo "$as_me:7828: checking if setresuid seems to work" >&5
 echo $ECHO_N "checking if setresuid seems to work... $ECHO_C" >&6
 	if test "$cross_compiling" = yes; then
-  { { echo "$as_me:7822: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:7831: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7827 "configure"
+#line 7836 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -7833,17 +7842,17 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:7836: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7845: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7839: \$? = $ac_status" >&5
+  echo "$as_me:7848: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:7841: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7850: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7844: \$? = $ac_status" >&5
+  echo "$as_me:7853: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:7846: result: yes" >&5
+  echo "$as_me:7855: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: program exited with status $ac_status" >&5
@@ -7853,7 +7862,7 @@
 #define BROKEN_SETRESUID 1
 EOF
 
-		 echo "$as_me:7856: result: not implemented" >&5
+		 echo "$as_me:7865: result: not implemented" >&5
 echo "${ECHO_T}not implemented" >&6
 
 fi
@@ -7866,13 +7875,13 @@
 for ac_func in setresgid
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:7869: checking for $ac_func" >&5
+echo "$as_me:7878: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7875 "configure"
+#line 7884 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -7903,16 +7912,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7906: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7915: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7909: \$? = $ac_status" >&5
+  echo "$as_me:7918: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7912: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7921: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7915: \$? = $ac_status" >&5
+  echo "$as_me:7924: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -7922,22 +7931,22 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7925: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:7934: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
-		echo "$as_me:7932: checking if setresgid seems to work" >&5
+		echo "$as_me:7941: checking if setresgid seems to work" >&5
 echo $ECHO_N "checking if setresgid seems to work... $ECHO_C" >&6
 	if test "$cross_compiling" = yes; then
-  { { echo "$as_me:7935: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:7944: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7940 "configure"
+#line 7949 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -7946,17 +7955,17 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:7949: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7958: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7952: \$? = $ac_status" >&5
+  echo "$as_me:7961: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:7954: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7963: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7957: \$? = $ac_status" >&5
+  echo "$as_me:7966: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:7959: result: yes" >&5
+  echo "$as_me:7968: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: program exited with status $ac_status" >&5
@@ -7966,7 +7975,7 @@
 #define BROKEN_SETRESGID 1
 EOF
 
-		 echo "$as_me:7969: result: not implemented" >&5
+		 echo "$as_me:7978: result: not implemented" >&5
 echo "${ECHO_T}not implemented" >&6
 
 fi
@@ -7979,13 +7988,13 @@
 for ac_func in gettimeofday time
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:7982: checking for $ac_func" >&5
+echo "$as_me:7991: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7988 "configure"
+#line 7997 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8016,16 +8025,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8019: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8028: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8022: \$? = $ac_status" >&5
+  echo "$as_me:8031: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8025: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8034: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8028: \$? = $ac_status" >&5
+  echo "$as_me:8037: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8035,7 +8044,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8038: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8047: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -8048,13 +8057,13 @@
 for ac_func in endutent getutent getutid getutline pututline setutent
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8051: checking for $ac_func" >&5
+echo "$as_me:8060: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8057 "configure"
+#line 8066 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8085,16 +8094,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8088: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8097: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8091: \$? = $ac_status" >&5
+  echo "$as_me:8100: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8094: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8103: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8097: \$? = $ac_status" >&5
+  echo "$as_me:8106: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8104,7 +8113,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8107: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8116: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -8117,13 +8126,13 @@
 for ac_func in utmpname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8120: checking for $ac_func" >&5
+echo "$as_me:8129: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8126 "configure"
+#line 8135 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8154,16 +8163,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8157: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8166: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8160: \$? = $ac_status" >&5
+  echo "$as_me:8169: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8163: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8172: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8166: \$? = $ac_status" >&5
+  echo "$as_me:8175: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8173,7 +8182,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8176: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8185: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -8186,13 +8195,13 @@
 for ac_func in endutxent getutxent getutxid getutxline pututxline
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8189: checking for $ac_func" >&5
+echo "$as_me:8198: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8195 "configure"
+#line 8204 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8223,16 +8232,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8226: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8235: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8229: \$? = $ac_status" >&5
+  echo "$as_me:8238: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8232: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8241: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8235: \$? = $ac_status" >&5
+  echo "$as_me:8244: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8242,7 +8251,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8245: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8254: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -8255,13 +8264,13 @@
 for ac_func in setutxent utmpxname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8258: checking for $ac_func" >&5
+echo "$as_me:8267: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8264 "configure"
+#line 8273 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8292,16 +8301,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8295: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8304: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8298: \$? = $ac_status" >&5
+  echo "$as_me:8307: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8301: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8310: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8304: \$? = $ac_status" >&5
+  echo "$as_me:8313: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8311,7 +8320,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8314: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8323: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -8321,13 +8330,13 @@
 fi
 done
 
-echo "$as_me:8324: checking for daemon" >&5
+echo "$as_me:8333: checking for daemon" >&5
 echo $ECHO_N "checking for daemon... $ECHO_C" >&6
 if test "${ac_cv_func_daemon+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8330 "configure"
+#line 8339 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char daemon (); below.  */
@@ -8358,16 +8367,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8361: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8370: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8364: \$? = $ac_status" >&5
+  echo "$as_me:8373: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8367: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8376: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8370: \$? = $ac_status" >&5
+  echo "$as_me:8379: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_daemon=yes
 else
@@ -8377,7 +8386,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8380: result: $ac_cv_func_daemon" >&5
+echo "$as_me:8389: result: $ac_cv_func_daemon" >&5
 echo "${ECHO_T}$ac_cv_func_daemon" >&6
 if test $ac_cv_func_daemon = yes; then
   cat >>confdefs.h <<\EOF
@@ -8385,7 +8394,7 @@
 EOF
 
 else
-  echo "$as_me:8388: checking for daemon in -lbsd" >&5
+  echo "$as_me:8397: checking for daemon in -lbsd" >&5
 echo $ECHO_N "checking for daemon in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_daemon+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8393,7 +8402,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8396 "configure"
+#line 8405 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8412,16 +8421,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8415: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8424: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8418: \$? = $ac_status" >&5
+  echo "$as_me:8427: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8421: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8430: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8424: \$? = $ac_status" >&5
+  echo "$as_me:8433: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_daemon=yes
 else
@@ -8432,7 +8441,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8435: result: $ac_cv_lib_bsd_daemon" >&5
+echo "$as_me:8444: result: $ac_cv_lib_bsd_daemon" >&5
 echo "${ECHO_T}$ac_cv_lib_bsd_daemon" >&6
 if test $ac_cv_lib_bsd_daemon = yes; then
   LIBS="$LIBS -lbsd"; cat >>confdefs.h <<\EOF
@@ -8443,13 +8452,13 @@
 
 fi
 
-echo "$as_me:8446: checking for getpagesize" >&5
+echo "$as_me:8455: checking for getpagesize" >&5
 echo $ECHO_N "checking for getpagesize... $ECHO_C" >&6
 if test "${ac_cv_func_getpagesize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8452 "configure"
+#line 8461 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getpagesize (); below.  */
@@ -8480,16 +8489,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8483: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8492: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8486: \$? = $ac_status" >&5
+  echo "$as_me:8495: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8489: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8498: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8492: \$? = $ac_status" >&5
+  echo "$as_me:8501: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getpagesize=yes
 else
@@ -8499,7 +8508,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8502: result: $ac_cv_func_getpagesize" >&5
+echo "$as_me:8511: result: $ac_cv_func_getpagesize" >&5
 echo "${ECHO_T}$ac_cv_func_getpagesize" >&6
 if test $ac_cv_func_getpagesize = yes; then
   cat >>confdefs.h <<\EOF
@@ -8507,7 +8516,7 @@
 EOF
 
 else
-  echo "$as_me:8510: checking for getpagesize in -lucb" >&5
+  echo "$as_me:8519: checking for getpagesize in -lucb" >&5
 echo $ECHO_N "checking for getpagesize in -lucb... $ECHO_C" >&6
 if test "${ac_cv_lib_ucb_getpagesize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8515,7 +8524,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lucb  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8518 "configure"
+#line 8527 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8534,16 +8543,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8537: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8546: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8540: \$? = $ac_status" >&5
+  echo "$as_me:8549: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8543: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8552: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8546: \$? = $ac_status" >&5
+  echo "$as_me:8555: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ucb_getpagesize=yes
 else
@@ -8554,7 +8563,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8557: result: $ac_cv_lib_ucb_getpagesize" >&5
+echo "$as_me:8566: result: $ac_cv_lib_ucb_getpagesize" >&5
 echo "${ECHO_T}$ac_cv_lib_ucb_getpagesize" >&6
 if test $ac_cv_lib_ucb_getpagesize = yes; then
   LIBS="$LIBS -lucb"; cat >>confdefs.h <<\EOF
@@ -8567,15 +8576,15 @@
 
 # Check for broken snprintf
 if test "x$ac_cv_func_snprintf" = "xyes" ; then
-	echo "$as_me:8570: checking whether snprintf correctly terminates long strings" >&5
+	echo "$as_me:8579: checking whether snprintf correctly terminates long strings" >&5
 echo $ECHO_N "checking whether snprintf correctly terminates long strings... $ECHO_C" >&6
 	if test "$cross_compiling" = yes; then
-  { { echo "$as_me:8573: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:8582: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8578 "configure"
+#line 8587 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -8583,30 +8592,30 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8586: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8595: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8589: \$? = $ac_status" >&5
+  echo "$as_me:8598: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8591: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8600: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8594: \$? = $ac_status" >&5
+  echo "$as_me:8603: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:8596: result: yes" >&5
+  echo "$as_me:8605: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-			echo "$as_me:8603: result: no" >&5
+			echo "$as_me:8612: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cat >>confdefs.h <<\EOF
 #define BROKEN_SNPRINTF 1
 EOF
 
-			{ echo "$as_me:8609: WARNING: ****** Your snprintf() function is broken, complain to your vendor" >&5
+			{ echo "$as_me:8618: WARNING: ****** Your snprintf() function is broken, complain to your vendor" >&5
 echo "$as_me: WARNING: ****** Your snprintf() function is broken, complain to your vendor" >&2;}
 
 fi
@@ -8615,11 +8624,11 @@
 fi
 
 if test "x$ac_cv_func_mkdtemp" = "xyes" ; then
-echo "$as_me:8618: checking for (overly) strict mkstemp" >&5
+echo "$as_me:8627: checking for (overly) strict mkstemp" >&5
 echo $ECHO_N "checking for (overly) strict mkstemp... $ECHO_C" >&6
 if test "$cross_compiling" = yes; then
 
-		echo "$as_me:8622: result: yes" >&5
+		echo "$as_me:8631: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 		cat >>confdefs.h <<\EOF
 #define HAVE_STRICT_MKSTEMP 1
@@ -8627,7 +8636,7 @@
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8630 "configure"
+#line 8639 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -8639,18 +8648,18 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8642: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8651: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8645: \$? = $ac_status" >&5
+  echo "$as_me:8654: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8647: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8656: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8650: \$? = $ac_status" >&5
+  echo "$as_me:8659: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-		echo "$as_me:8653: result: no" >&5
+		echo "$as_me:8662: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 else
@@ -8658,7 +8667,7 @@
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-		echo "$as_me:8661: result: yes" >&5
+		echo "$as_me:8670: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 		cat >>confdefs.h <<\EOF
 #define HAVE_STRICT_MKSTEMP 1
@@ -8670,15 +8679,15 @@
 fi
 
 if test ! -z "$check_for_openpty_ctty_bug"; then
-	echo "$as_me:8673: checking if openpty correctly handles controlling tty" >&5
+	echo "$as_me:8682: checking if openpty correctly handles controlling tty" >&5
 echo $ECHO_N "checking if openpty correctly handles controlling tty... $ECHO_C" >&6
 	if test "$cross_compiling" = yes; then
-  { { echo "$as_me:8676: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:8685: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8681 "configure"
+#line 8690 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -8715,18 +8724,18 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8718: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8727: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8721: \$? = $ac_status" >&5
+  echo "$as_me:8730: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8723: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8732: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8726: \$? = $ac_status" >&5
+  echo "$as_me:8735: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-			echo "$as_me:8729: result: yes" >&5
+			echo "$as_me:8738: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 else
@@ -8734,7 +8743,7 @@
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-			echo "$as_me:8737: result: no" >&5
+			echo "$as_me:8746: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cat >>confdefs.h <<\EOF
 #define SSHD_ACQUIRES_CTTY 1
@@ -8746,15 +8755,15 @@
 fi
 
 if test "x$ac_cv_func_getaddrinfo" = "xyes" -a "x$check_for_hpux_broken_getaddrinfo" = "x1"; then
-	echo "$as_me:8749: checking if getaddrinfo seems to work" >&5
+	echo "$as_me:8758: checking if getaddrinfo seems to work" >&5
 echo $ECHO_N "checking if getaddrinfo seems to work... $ECHO_C" >&6
 	if test "$cross_compiling" = yes; then
-  { { echo "$as_me:8752: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:8761: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8757 "configure"
+#line 8766 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -8813,18 +8822,18 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8816: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8825: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8819: \$? = $ac_status" >&5
+  echo "$as_me:8828: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8821: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8830: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8824: \$? = $ac_status" >&5
+  echo "$as_me:8833: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-			echo "$as_me:8827: result: yes" >&5
+			echo "$as_me:8836: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 else
@@ -8832,7 +8841,7 @@
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-			echo "$as_me:8835: result: no" >&5
+			echo "$as_me:8844: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cat >>confdefs.h <<\EOF
 #define BROKEN_GETADDRINFO 1
@@ -8843,14 +8852,14 @@
 fi
 fi
 
-echo "$as_me:8846: checking whether getpgrp takes no argument" >&5
+echo "$as_me:8855: checking whether getpgrp takes no argument" >&5
 echo $ECHO_N "checking whether getpgrp takes no argument... $ECHO_C" >&6
 if test "${ac_cv_func_getpgrp_void+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # Use it with a single arg.
 cat >conftest.$ac_ext <<_ACEOF
-#line 8853 "configure"
+#line 8862 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8862,16 +8871,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8865: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8874: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8868: \$? = $ac_status" >&5
+  echo "$as_me:8877: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8871: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8880: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8874: \$? = $ac_status" >&5
+  echo "$as_me:8883: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_func_getpgrp_1=yes
 else
@@ -8882,7 +8891,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 # Use it with no arg.
 cat >conftest.$ac_ext <<_ACEOF
-#line 8885 "configure"
+#line 8894 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8894,16 +8903,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8897: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8906: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8900: \$? = $ac_status" >&5
+  echo "$as_me:8909: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8903: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8912: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8906: \$? = $ac_status" >&5
+  echo "$as_me:8915: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_func_getpgrp_0=yes
 else
@@ -8917,12 +8926,12 @@
   yes:no) ac_cv_func_getpgrp_void=yes;;
   no:yes) ac_cv_func_getpgrp_void=false;;
   *) if test "$cross_compiling" = yes; then
-  { { echo "$as_me:8920: error: cannot check getpgrp if cross compiling" >&5
+  { { echo "$as_me:8929: error: cannot check getpgrp if cross compiling" >&5
 echo "$as_me: error: cannot check getpgrp if cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8925 "configure"
+#line 8934 "configure"
 #include "confdefs.h"
 $ac_includes_default
 
@@ -8976,15 +8985,15 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8979: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8988: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8982: \$? = $ac_status" >&5
+  echo "$as_me:8991: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8984: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8993: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8987: \$? = $ac_status" >&5
+  echo "$as_me:8996: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getpgrp_void=yes
 else
@@ -8998,7 +9007,7 @@
 esac # $ac_func_getpgrp_0:$ac_func_getpgrp_1
 
 fi
-echo "$as_me:9001: result: $ac_cv_func_getpgrp_void" >&5
+echo "$as_me:9010: result: $ac_cv_func_getpgrp_void" >&5
 echo "${ECHO_T}$ac_cv_func_getpgrp_void" >&6
 if test $ac_cv_func_getpgrp_void = yes; then
 
@@ -9018,12 +9027,12 @@
 		if test "x$withval" != "xno" ; then
 			if test "x$ac_cv_header_security_pam_appl_h" != "xyes" && \
 			   test "x$ac_cv_header_pam_pam_appl_h" != "xyes" ; then
-				{ { echo "$as_me:9021: error: PAM headers not found" >&5
+				{ { echo "$as_me:9030: error: PAM headers not found" >&5
 echo "$as_me: error: PAM headers not found" >&2;}
    { (exit 1); exit 1; }; }
 			fi
 
-echo "$as_me:9026: checking for dlopen in -ldl" >&5
+echo "$as_me:9035: checking for dlopen in -ldl" >&5
 echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9031,7 +9040,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9034 "configure"
+#line 9043 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9050,16 +9059,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9053: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9062: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9056: \$? = $ac_status" >&5
+  echo "$as_me:9065: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9059: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9068: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9062: \$? = $ac_status" >&5
+  echo "$as_me:9071: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dl_dlopen=yes
 else
@@ -9070,7 +9079,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9073: result: $ac_cv_lib_dl_dlopen" >&5
+echo "$as_me:9082: result: $ac_cv_lib_dl_dlopen" >&5
 echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
 if test $ac_cv_lib_dl_dlopen = yes; then
   cat >>confdefs.h <<EOF
@@ -9081,7 +9090,7 @@
 
 fi
 
-echo "$as_me:9084: checking for pam_set_item in -lpam" >&5
+echo "$as_me:9093: checking for pam_set_item in -lpam" >&5
 echo $ECHO_N "checking for pam_set_item in -lpam... $ECHO_C" >&6
 if test "${ac_cv_lib_pam_pam_set_item+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9089,7 +9098,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpam  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9092 "configure"
+#line 9101 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9108,16 +9117,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9111: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9120: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9114: \$? = $ac_status" >&5
+  echo "$as_me:9123: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9117: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9126: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9120: \$? = $ac_status" >&5
+  echo "$as_me:9129: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_pam_pam_set_item=yes
 else
@@ -9128,7 +9137,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9131: result: $ac_cv_lib_pam_pam_set_item" >&5
+echo "$as_me:9140: result: $ac_cv_lib_pam_pam_set_item" >&5
 echo "${ECHO_T}$ac_cv_lib_pam_pam_set_item" >&6
 if test $ac_cv_lib_pam_pam_set_item = yes; then
   cat >>confdefs.h <<EOF
@@ -9138,7 +9147,7 @@
   LIBS="-lpam $LIBS"
 
 else
-  { { echo "$as_me:9141: error: *** libpam missing" >&5
+  { { echo "$as_me:9150: error: *** libpam missing" >&5
 echo "$as_me: error: *** libpam missing" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -9146,13 +9155,13 @@
 for ac_func in pam_getenvlist
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:9149: checking for $ac_func" >&5
+echo "$as_me:9158: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9155 "configure"
+#line 9164 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9183,16 +9192,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9186: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9195: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9189: \$? = $ac_status" >&5
+  echo "$as_me:9198: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9192: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9201: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9195: \$? = $ac_status" >&5
+  echo "$as_me:9204: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -9202,7 +9211,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9205: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:9214: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -9215,13 +9224,13 @@
 for ac_func in pam_putenv
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:9218: checking for $ac_func" >&5
+echo "$as_me:9227: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9224 "configure"
+#line 9233 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9252,16 +9261,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9255: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9264: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9258: \$? = $ac_status" >&5
+  echo "$as_me:9267: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9261: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9270: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9264: \$? = $ac_status" >&5
+  echo "$as_me:9273: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -9271,7 +9280,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9274: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:9283: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -9300,10 +9309,10 @@
 # Check for older PAM
 if test "x$PAM_MSG" = "xyes" ; then
 	# Check PAM strerror arguments (old PAM)
-	echo "$as_me:9303: checking whether pam_strerror takes only one argument" >&5
+	echo "$as_me:9312: checking whether pam_strerror takes only one argument" >&5
 echo $ECHO_N "checking whether pam_strerror takes only one argument... $ECHO_C" >&6
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9306 "configure"
+#line 9315 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9322,18 +9331,18 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9325: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9334: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9328: \$? = $ac_status" >&5
+  echo "$as_me:9337: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9331: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9340: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9334: \$? = $ac_status" >&5
+  echo "$as_me:9343: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:9336: result: no" >&5
+  echo "$as_me:9345: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
   echo "$as_me: failed program was:" >&5
@@ -9343,7 +9352,7 @@
 #define HAVE_OLD_PAM 1
 EOF
 
-			echo "$as_me:9346: result: yes" >&5
+			echo "$as_me:9355: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			PAM_MSG="yes (old library)"
 
@@ -9383,7 +9392,7 @@
 fi;
 LIBS="-lcrypto $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9386 "configure"
+#line 9395 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9402,16 +9411,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9405: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9414: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9408: \$? = $ac_status" >&5
+  echo "$as_me:9417: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9411: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9420: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9414: \$? = $ac_status" >&5
+  echo "$as_me:9423: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >>confdefs.h <<\EOF
 #define HAVE_OPENSSL 1
@@ -9428,7 +9437,7 @@
 		fi
 		CPPFLAGS="-I/usr/local/ssl/include ${saved_CPPFLAGS}"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 9431 "configure"
+#line 9440 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9447,16 +9456,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9450: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9459: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9453: \$? = $ac_status" >&5
+  echo "$as_me:9462: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9456: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9465: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9459: \$? = $ac_status" >&5
+  echo "$as_me:9468: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >>confdefs.h <<\EOF
 #define HAVE_OPENSSL 1
@@ -9466,7 +9475,7 @@
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-				{ { echo "$as_me:9469: error: *** Can't find recent OpenSSL libcrypto (see config.log for details) ***" >&5
+				{ { echo "$as_me:9478: error: *** Can't find recent OpenSSL libcrypto (see config.log for details) ***" >&5
 echo "$as_me: error: *** Can't find recent OpenSSL libcrypto (see config.log for details) ***" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -9477,15 +9486,15 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 # Determine OpenSSL header version
-echo "$as_me:9480: checking OpenSSL header version" >&5
+echo "$as_me:9489: checking OpenSSL header version" >&5
 echo $ECHO_N "checking OpenSSL header version... $ECHO_C" >&6
 if test "$cross_compiling" = yes; then
-  { { echo "$as_me:9483: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:9492: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9488 "configure"
+#line 9497 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -9508,19 +9517,19 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:9511: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9520: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9514: \$? = $ac_status" >&5
+  echo "$as_me:9523: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:9516: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9525: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9519: \$? = $ac_status" >&5
+  echo "$as_me:9528: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 		ssl_header_ver=`cat conftest.sslincver`
-		echo "$as_me:9523: result: $ssl_header_ver" >&5
+		echo "$as_me:9532: result: $ssl_header_ver" >&5
 echo "${ECHO_T}$ssl_header_ver" >&6
 
 else
@@ -9528,9 +9537,9 @@
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-		echo "$as_me:9531: result: not found" >&5
+		echo "$as_me:9540: result: not found" >&5
 echo "${ECHO_T}not found" >&6
-		{ { echo "$as_me:9533: error: OpenSSL version header not found." >&5
+		{ { echo "$as_me:9542: error: OpenSSL version header not found." >&5
 echo "$as_me: error: OpenSSL version header not found." >&2;}
    { (exit 1); exit 1; }; }
 
@@ -9539,15 +9548,15 @@
 fi
 
 # Determine OpenSSL library version
-echo "$as_me:9542: checking OpenSSL library version" >&5
+echo "$as_me:9551: checking OpenSSL library version" >&5
 echo $ECHO_N "checking OpenSSL library version... $ECHO_C" >&6
 if test "$cross_compiling" = yes; then
-  { { echo "$as_me:9545: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:9554: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9550 "configure"
+#line 9559 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -9571,19 +9580,19 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:9574: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9583: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9577: \$? = $ac_status" >&5
+  echo "$as_me:9586: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:9579: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9588: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9582: \$? = $ac_status" >&5
+  echo "$as_me:9591: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 		ssl_library_ver=`cat conftest.ssllibver`
-		echo "$as_me:9586: result: $ssl_library_ver" >&5
+		echo "$as_me:9595: result: $ssl_library_ver" >&5
 echo "${ECHO_T}$ssl_library_ver" >&6
 
 else
@@ -9591,9 +9600,9 @@
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-		echo "$as_me:9594: result: not found" >&5
+		echo "$as_me:9603: result: not found" >&5
 echo "${ECHO_T}not found" >&6
-		{ { echo "$as_me:9596: error: OpenSSL library not found." >&5
+		{ { echo "$as_me:9605: error: OpenSSL library not found." >&5
 echo "$as_me: error: OpenSSL library not found." >&2;}
    { (exit 1); exit 1; }; }
 
@@ -9602,15 +9611,15 @@
 fi
 
 # Sanity check OpenSSL headers
-echo "$as_me:9605: checking whether OpenSSL's headers match the library" >&5
+echo "$as_me:9614: checking whether OpenSSL's headers match the library" >&5
 echo $ECHO_N "checking whether OpenSSL's headers match the library... $ECHO_C" >&6
 if test "$cross_compiling" = yes; then
-  { { echo "$as_me:9608: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:9617: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9613 "configure"
+#line 9622 "configure"
 #include "confdefs.h"
 
 #include <string.h>
@@ -9619,18 +9628,18 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:9622: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9631: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9625: \$? = $ac_status" >&5
+  echo "$as_me:9634: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:9627: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9636: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9630: \$? = $ac_status" >&5
+  echo "$as_me:9639: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-		echo "$as_me:9633: result: yes" >&5
+		echo "$as_me:9642: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 else
@@ -9638,9 +9647,9 @@
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-		echo "$as_me:9641: result: no" >&5
+		echo "$as_me:9650: result: no" >&5
 echo "${ECHO_T}no" >&6
-		{ { echo "$as_me:9643: error: Your OpenSSL headers do not match your library.
+		{ { echo "$as_me:9652: error: Your OpenSSL headers do not match your library.
 Check config.log for details.
 Also see contrib/findssl.sh for help identifying header/library mismatches." >&5
 echo "$as_me: error: Your OpenSSL headers do not match your library.
@@ -9656,7 +9665,7 @@
 # because the system crypt() is more featureful.
 if test "x$check_for_libcrypt_before" = "x1"; then
 
-echo "$as_me:9659: checking for crypt in -lcrypt" >&5
+echo "$as_me:9668: checking for crypt in -lcrypt" >&5
 echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6
 if test "${ac_cv_lib_crypt_crypt+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9664,7 +9673,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypt  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9667 "configure"
+#line 9676 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9683,16 +9692,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9686: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9695: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9689: \$? = $ac_status" >&5
+  echo "$as_me:9698: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9692: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9701: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9695: \$? = $ac_status" >&5
+  echo "$as_me:9704: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_crypt_crypt=yes
 else
@@ -9703,7 +9712,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9706: result: $ac_cv_lib_crypt_crypt" >&5
+echo "$as_me:9715: result: $ac_cv_lib_crypt_crypt" >&5
 echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
 if test $ac_cv_lib_crypt_crypt = yes; then
   cat >>confdefs.h <<EOF
@@ -9719,7 +9728,7 @@
 # Some Linux systems (Slackware) need crypt() from libcrypt, *not* the
 # version in OpenSSL.
 if test "x$check_for_libcrypt_later" = "x1"; then
-	echo "$as_me:9722: checking for crypt in -lcrypt" >&5
+	echo "$as_me:9731: checking for crypt in -lcrypt" >&5
 echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6
 if test "${ac_cv_lib_crypt_crypt+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9727,7 +9736,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypt  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9730 "configure"
+#line 9739 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9746,16 +9755,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9749: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9758: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9752: \$? = $ac_status" >&5
+  echo "$as_me:9761: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9755: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9764: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9758: \$? = $ac_status" >&5
+  echo "$as_me:9767: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_crypt_crypt=yes
 else
@@ -9766,7 +9775,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9769: result: $ac_cv_lib_crypt_crypt" >&5
+echo "$as_me:9778: result: $ac_cv_lib_crypt_crypt" >&5
 echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
 if test $ac_cv_lib_crypt_crypt = yes; then
   LIBS="$LIBS -lcrypt"
@@ -9777,15 +9786,15 @@
 ### Configure cryptographic random number support
 
 # Check wheter OpenSSL seeds itself
-echo "$as_me:9780: checking whether OpenSSL's PRNG is internally seeded" >&5
+echo "$as_me:9789: checking whether OpenSSL's PRNG is internally seeded" >&5
 echo $ECHO_N "checking whether OpenSSL's PRNG is internally seeded... $ECHO_C" >&6
 if test "$cross_compiling" = yes; then
-  { { echo "$as_me:9783: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:9792: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9788 "configure"
+#line 9797 "configure"
 #include "confdefs.h"
 
 #include <string.h>
@@ -9794,19 +9803,19 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:9797: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9806: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9800: \$? = $ac_status" >&5
+  echo "$as_me:9809: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:9802: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9811: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9805: \$? = $ac_status" >&5
+  echo "$as_me:9814: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 		OPENSSL_SEEDS_ITSELF=yes
-		echo "$as_me:9809: result: yes" >&5
+		echo "$as_me:9818: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 else
@@ -9814,7 +9823,7 @@
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-		echo "$as_me:9817: result: no" >&5
+		echo "$as_me:9826: result: no" >&5
 echo "${ECHO_T}no" >&6
 		# Default to use of the rand helper if OpenSSL doesn't
 		# seed itself
@@ -9834,7 +9843,7 @@
 			# Force use of OpenSSL's internal RNG, even if
 			# the previous test showed it to be unseeded.
 			if test -z "$OPENSSL_SEEDS_ITSELF" ; then
-				{ echo "$as_me:9837: WARNING: *** Forcing use of OpenSSL's non-self-seeding PRNG" >&5
+				{ echo "$as_me:9846: WARNING: *** Forcing use of OpenSSL's non-self-seeding PRNG" >&5
 echo "$as_me: WARNING: *** Forcing use of OpenSSL's non-self-seeding PRNG" >&2;}
 				OPENSSL_SEEDS_ITSELF=yes
 				USE_RAND_HELPER=""
@@ -9875,7 +9884,7 @@
 		[0-9]*)
 			;;
 		*)
-			{ { echo "$as_me:9878: error: You must specify a numeric port number for --with-prngd-port" >&5
+			{ { echo "$as_me:9887: error: You must specify a numeric port number for --with-prngd-port" >&5
 echo "$as_me: error: You must specify a numeric port number for --with-prngd-port" >&2;}
    { (exit 1); exit 1; }; }
 			;;
@@ -9906,7 +9915,7 @@
 		/*)
 			;;
 		*)
-			{ { echo "$as_me:9909: error: You must specify an absolute path to the entropy socket" >&5
+			{ { echo "$as_me:9918: error: You must specify an absolute path to the entropy socket" >&5
 echo "$as_me: error: You must specify an absolute path to the entropy socket" >&2;}
    { (exit 1); exit 1; }; }
 			;;
@@ -9914,12 +9923,12 @@
 
 		if test ! -z "$withval" ; then
 			if test ! -z "$PRNGD_PORT" ; then
-				{ { echo "$as_me:9917: error: You may not specify both a PRNGD/EGD port and socket" >&5
+				{ { echo "$as_me:9926: error: You may not specify both a PRNGD/EGD port and socket" >&5
 echo "$as_me: error: You may not specify both a PRNGD/EGD port and socket" >&2;}
    { (exit 1); exit 1; }; }
 			fi
 			if test ! -r "$withval" ; then
-				{ echo "$as_me:9922: WARNING: Entropy socket is not readable" >&5
+				{ echo "$as_me:9931: WARNING: Entropy socket is not readable" >&5
 echo "$as_me: WARNING: Entropy socket is not readable" >&2;}
 			fi
 			PRNGD_SOCKET="$withval"
@@ -9933,7 +9942,7 @@
 
 		# Check for existing socket only if we don't have a random device already
 		if test "$USE_RAND_HELPER" = yes ; then
-			echo "$as_me:9936: checking for PRNGD/EGD socket" >&5
+			echo "$as_me:9945: checking for PRNGD/EGD socket" >&5
 echo $ECHO_N "checking for PRNGD/EGD socket... $ECHO_C" >&6
 			# Insert other locations here
 			for sock in /var/run/egd-pool /dev/egd-pool /etc/entropy; do
@@ -9947,10 +9956,10 @@
 				fi
 			done
 			if test ! -z "$PRNGD_SOCKET" ; then
-				echo "$as_me:9950: result: $PRNGD_SOCKET" >&5
+				echo "$as_me:9959: result: $PRNGD_SOCKET" >&5
 echo "${ECHO_T}$PRNGD_SOCKET" >&6
 			else
-				echo "$as_me:9953: result: not found" >&5
+				echo "$as_me:9962: result: not found" >&5
 echo "${ECHO_T}not found" >&6
 			fi
 		fi
@@ -10006,7 +10015,7 @@
 
 	# Extract the first word of "ls", so it can be a program name with args.
 set dummy ls; ac_word=$2
-echo "$as_me:10009: checking for $ac_word" >&5
+echo "$as_me:10018: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PROG_LS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10023,7 +10032,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PROG_LS="$ac_dir/$ac_word"
-   echo "$as_me:10026: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10035: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -10034,10 +10043,10 @@
 PROG_LS=$ac_cv_path_PROG_LS
 
 if test -n "$PROG_LS"; then
-  echo "$as_me:10037: result: $PROG_LS" >&5
+  echo "$as_me:10046: result: $PROG_LS" >&5
 echo "${ECHO_T}$PROG_LS" >&6
 else
-  echo "$as_me:10040: result: no" >&5
+  echo "$as_me:10049: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10047,7 +10056,7 @@
 
 	# Extract the first word of "netstat", so it can be a program name with args.
 set dummy netstat; ac_word=$2
-echo "$as_me:10050: checking for $ac_word" >&5
+echo "$as_me:10059: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PROG_NETSTAT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10064,7 +10073,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PROG_NETSTAT="$ac_dir/$ac_word"
-   echo "$as_me:10067: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10076: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -10075,10 +10084,10 @@
 PROG_NETSTAT=$ac_cv_path_PROG_NETSTAT
 
 if test -n "$PROG_NETSTAT"; then
-  echo "$as_me:10078: result: $PROG_NETSTAT" >&5
+  echo "$as_me:10087: result: $PROG_NETSTAT" >&5
 echo "${ECHO_T}$PROG_NETSTAT" >&6
 else
-  echo "$as_me:10081: result: no" >&5
+  echo "$as_me:10090: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10088,7 +10097,7 @@
 
 	# Extract the first word of "arp", so it can be a program name with args.
 set dummy arp; ac_word=$2
-echo "$as_me:10091: checking for $ac_word" >&5
+echo "$as_me:10100: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PROG_ARP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10105,7 +10114,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PROG_ARP="$ac_dir/$ac_word"
-   echo "$as_me:10108: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10117: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -10116,10 +10125,10 @@
 PROG_ARP=$ac_cv_path_PROG_ARP
 
 if test -n "$PROG_ARP"; then
-  echo "$as_me:10119: result: $PROG_ARP" >&5
+  echo "$as_me:10128: result: $PROG_ARP" >&5
 echo "${ECHO_T}$PROG_ARP" >&6
 else
-  echo "$as_me:10122: result: no" >&5
+  echo "$as_me:10131: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10129,7 +10138,7 @@
 
 	# Extract the first word of "ifconfig", so it can be a program name with args.
 set dummy ifconfig; ac_word=$2
-echo "$as_me:10132: checking for $ac_word" >&5
+echo "$as_me:10141: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PROG_IFCONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10146,7 +10155,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PROG_IFCONFIG="$ac_dir/$ac_word"
-   echo "$as_me:10149: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10158: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -10157,10 +10166,10 @@
 PROG_IFCONFIG=$ac_cv_path_PROG_IFCONFIG
 
 if test -n "$PROG_IFCONFIG"; then
-  echo "$as_me:10160: result: $PROG_IFCONFIG" >&5
+  echo "$as_me:10169: result: $PROG_IFCONFIG" >&5
 echo "${ECHO_T}$PROG_IFCONFIG" >&6
 else
-  echo "$as_me:10163: result: no" >&5
+  echo "$as_me:10172: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10170,7 +10179,7 @@
 
 	# Extract the first word of "jstat", so it can be a program name with args.
 set dummy jstat; ac_word=$2
-echo "$as_me:10173: checking for $ac_word" >&5
+echo "$as_me:10182: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PROG_JSTAT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10187,7 +10196,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PROG_JSTAT="$ac_dir/$ac_word"
-   echo "$as_me:10190: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10199: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -10198,10 +10207,10 @@
 PROG_JSTAT=$ac_cv_path_PROG_JSTAT
 
 if test -n "$PROG_JSTAT"; then
-  echo "$as_me:10201: result: $PROG_JSTAT" >&5
+  echo "$as_me:10210: result: $PROG_JSTAT" >&5
 echo "${ECHO_T}$PROG_JSTAT" >&6
 else
-  echo "$as_me:10204: result: no" >&5
+  echo "$as_me:10213: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10211,7 +10220,7 @@
 
 	# Extract the first word of "ps", so it can be a program name with args.
 set dummy ps; ac_word=$2
-echo "$as_me:10214: checking for $ac_word" >&5
+echo "$as_me:10223: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PROG_PS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10228,7 +10237,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PROG_PS="$ac_dir/$ac_word"
-   echo "$as_me:10231: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10240: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -10239,10 +10248,10 @@
 PROG_PS=$ac_cv_path_PROG_PS
 
 if test -n "$PROG_PS"; then
-  echo "$as_me:10242: result: $PROG_PS" >&5
+  echo "$as_me:10251: result: $PROG_PS" >&5
 echo "${ECHO_T}$PROG_PS" >&6
 else
-  echo "$as_me:10245: result: no" >&5
+  echo "$as_me:10254: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10252,7 +10261,7 @@
 
 	# Extract the first word of "sar", so it can be a program name with args.
 set dummy sar; ac_word=$2
-echo "$as_me:10255: checking for $ac_word" >&5
+echo "$as_me:10264: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PROG_SAR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10269,7 +10278,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PROG_SAR="$ac_dir/$ac_word"
-   echo "$as_me:10272: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10281: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -10280,10 +10289,10 @@
 PROG_SAR=$ac_cv_path_PROG_SAR
 
 if test -n "$PROG_SAR"; then
-  echo "$as_me:10283: result: $PROG_SAR" >&5
+  echo "$as_me:10292: result: $PROG_SAR" >&5
 echo "${ECHO_T}$PROG_SAR" >&6
 else
-  echo "$as_me:10286: result: no" >&5
+  echo "$as_me:10295: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10293,7 +10302,7 @@
 
 	# Extract the first word of "w", so it can be a program name with args.
 set dummy w; ac_word=$2
-echo "$as_me:10296: checking for $ac_word" >&5
+echo "$as_me:10305: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PROG_W+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10310,7 +10319,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PROG_W="$ac_dir/$ac_word"
-   echo "$as_me:10313: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10322: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -10321,10 +10330,10 @@
 PROG_W=$ac_cv_path_PROG_W
 
 if test -n "$PROG_W"; then
-  echo "$as_me:10324: result: $PROG_W" >&5
+  echo "$as_me:10333: result: $PROG_W" >&5
 echo "${ECHO_T}$PROG_W" >&6
 else
-  echo "$as_me:10327: result: no" >&5
+  echo "$as_me:10336: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10334,7 +10343,7 @@
 
 	# Extract the first word of "who", so it can be a program name with args.
 set dummy who; ac_word=$2
-echo "$as_me:10337: checking for $ac_word" >&5
+echo "$as_me:10346: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PROG_WHO+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10351,7 +10360,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PROG_WHO="$ac_dir/$ac_word"
-   echo "$as_me:10354: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10363: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -10362,10 +10371,10 @@
 PROG_WHO=$ac_cv_path_PROG_WHO
 
 if test -n "$PROG_WHO"; then
-  echo "$as_me:10365: result: $PROG_WHO" >&5
+  echo "$as_me:10374: result: $PROG_WHO" >&5
 echo "${ECHO_T}$PROG_WHO" >&6
 else
-  echo "$as_me:10368: result: no" >&5
+  echo "$as_me:10377: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10375,7 +10384,7 @@
 
 	# Extract the first word of "last", so it can be a program name with args.
 set dummy last; ac_word=$2
-echo "$as_me:10378: checking for $ac_word" >&5
+echo "$as_me:10387: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PROG_LAST+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10392,7 +10401,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PROG_LAST="$ac_dir/$ac_word"
-   echo "$as_me:10395: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10404: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -10403,10 +10412,10 @@
 PROG_LAST=$ac_cv_path_PROG_LAST
 
 if test -n "$PROG_LAST"; then
-  echo "$as_me:10406: result: $PROG_LAST" >&5
+  echo "$as_me:10415: result: $PROG_LAST" >&5
 echo "${ECHO_T}$PROG_LAST" >&6
 else
-  echo "$as_me:10409: result: no" >&5
+  echo "$as_me:10418: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10416,7 +10425,7 @@
 
 	# Extract the first word of "lastlog", so it can be a program name with args.
 set dummy lastlog; ac_word=$2
-echo "$as_me:10419: checking for $ac_word" >&5
+echo "$as_me:10428: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PROG_LASTLOG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10433,7 +10442,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PROG_LASTLOG="$ac_dir/$ac_word"
-   echo "$as_me:10436: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10445: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -10444,10 +10453,10 @@
 PROG_LASTLOG=$ac_cv_path_PROG_LASTLOG
 
 if test -n "$PROG_LASTLOG"; then
-  echo "$as_me:10447: result: $PROG_LASTLOG" >&5
+  echo "$as_me:10456: result: $PROG_LASTLOG" >&5
 echo "${ECHO_T}$PROG_LASTLOG" >&6
 else
-  echo "$as_me:10450: result: no" >&5
+  echo "$as_me:10459: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10457,7 +10466,7 @@
 
 	# Extract the first word of "df", so it can be a program name with args.
 set dummy df; ac_word=$2
-echo "$as_me:10460: checking for $ac_word" >&5
+echo "$as_me:10469: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PROG_DF+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10474,7 +10483,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PROG_DF="$ac_dir/$ac_word"
-   echo "$as_me:10477: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10486: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -10485,10 +10494,10 @@
 PROG_DF=$ac_cv_path_PROG_DF
 
 if test -n "$PROG_DF"; then
-  echo "$as_me:10488: result: $PROG_DF" >&5
+  echo "$as_me:10497: result: $PROG_DF" >&5
 echo "${ECHO_T}$PROG_DF" >&6
 else
-  echo "$as_me:10491: result: no" >&5
+  echo "$as_me:10500: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10498,7 +10507,7 @@
 
 	# Extract the first word of "vmstat", so it can be a program name with args.
 set dummy vmstat; ac_word=$2
-echo "$as_me:10501: checking for $ac_word" >&5
+echo "$as_me:10510: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PROG_VMSTAT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10515,7 +10524,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PROG_VMSTAT="$ac_dir/$ac_word"
-   echo "$as_me:10518: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10527: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -10526,10 +10535,10 @@
 PROG_VMSTAT=$ac_cv_path_PROG_VMSTAT
 
 if test -n "$PROG_VMSTAT"; then
-  echo "$as_me:10529: result: $PROG_VMSTAT" >&5
+  echo "$as_me:10538: result: $PROG_VMSTAT" >&5
 echo "${ECHO_T}$PROG_VMSTAT" >&6
 else
-  echo "$as_me:10532: result: no" >&5
+  echo "$as_me:10541: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10539,7 +10548,7 @@
 
 	# Extract the first word of "uptime", so it can be a program name with args.
 set dummy uptime; ac_word=$2
-echo "$as_me:10542: checking for $ac_word" >&5
+echo "$as_me:10551: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PROG_UPTIME+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10556,7 +10565,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PROG_UPTIME="$ac_dir/$ac_word"
-   echo "$as_me:10559: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10568: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -10567,10 +10576,10 @@
 PROG_UPTIME=$ac_cv_path_PROG_UPTIME
 
 if test -n "$PROG_UPTIME"; then
-  echo "$as_me:10570: result: $PROG_UPTIME" >&5
+  echo "$as_me:10579: result: $PROG_UPTIME" >&5
 echo "${ECHO_T}$PROG_UPTIME" >&6
 else
-  echo "$as_me:10573: result: no" >&5
+  echo "$as_me:10582: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10580,7 +10589,7 @@
 
 	# Extract the first word of "ipcs", so it can be a program name with args.
 set dummy ipcs; ac_word=$2
-echo "$as_me:10583: checking for $ac_word" >&5
+echo "$as_me:10592: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PROG_IPCS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10597,7 +10606,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PROG_IPCS="$ac_dir/$ac_word"
-   echo "$as_me:10600: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10609: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -10608,10 +10617,10 @@
 PROG_IPCS=$ac_cv_path_PROG_IPCS
 
 if test -n "$PROG_IPCS"; then
-  echo "$as_me:10611: result: $PROG_IPCS" >&5
+  echo "$as_me:10620: result: $PROG_IPCS" >&5
 echo "${ECHO_T}$PROG_IPCS" >&6
 else
-  echo "$as_me:10614: result: no" >&5
+  echo "$as_me:10623: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10621,7 +10630,7 @@
 
 	# Extract the first word of "tail", so it can be a program name with args.
 set dummy tail; ac_word=$2
-echo "$as_me:10624: checking for $ac_word" >&5
+echo "$as_me:10633: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PROG_TAIL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10638,7 +10647,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PROG_TAIL="$ac_dir/$ac_word"
-   echo "$as_me:10641: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10650: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -10649,10 +10658,10 @@
 PROG_TAIL=$ac_cv_path_PROG_TAIL
 
 if test -n "$PROG_TAIL"; then
-  echo "$as_me:10652: result: $PROG_TAIL" >&5
+  echo "$as_me:10661: result: $PROG_TAIL" >&5
 echo "${ECHO_T}$PROG_TAIL" >&6
 else
-  echo "$as_me:10655: result: no" >&5
+  echo "$as_me:10664: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10683,13 +10692,13 @@
 fi
 
 # Checks for data types
-echo "$as_me:10686: checking for char" >&5
+echo "$as_me:10695: checking for char" >&5
 echo $ECHO_N "checking for char... $ECHO_C" >&6
 if test "${ac_cv_type_char+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10692 "configure"
+#line 10701 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10704,16 +10713,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10707: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10716: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10710: \$? = $ac_status" >&5
+  echo "$as_me:10719: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10713: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10722: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10716: \$? = $ac_status" >&5
+  echo "$as_me:10725: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_char=yes
 else
@@ -10723,10 +10732,10 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:10726: result: $ac_cv_type_char" >&5
+echo "$as_me:10735: result: $ac_cv_type_char" >&5
 echo "${ECHO_T}$ac_cv_type_char" >&6
 
-echo "$as_me:10729: checking size of char" >&5
+echo "$as_me:10738: checking size of char" >&5
 echo $ECHO_N "checking size of char... $ECHO_C" >&6
 if test "${ac_cv_sizeof_char+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10735,7 +10744,7 @@
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 10738 "configure"
+#line 10747 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10747,21 +10756,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10750: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10759: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10753: \$? = $ac_status" >&5
+  echo "$as_me:10762: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10756: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10765: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10759: \$? = $ac_status" >&5
+  echo "$as_me:10768: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 10764 "configure"
+#line 10773 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10773,16 +10782,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10776: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10785: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10779: \$? = $ac_status" >&5
+  echo "$as_me:10788: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10782: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10791: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10785: \$? = $ac_status" >&5
+  echo "$as_me:10794: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -10798,7 +10807,7 @@
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 10801 "configure"
+#line 10810 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10810,16 +10819,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10813: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10822: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10816: \$? = $ac_status" >&5
+  echo "$as_me:10825: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10819: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10828: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10822: \$? = $ac_status" >&5
+  echo "$as_me:10831: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -10835,7 +10844,7 @@
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 10838 "configure"
+#line 10847 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10847,16 +10856,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10850: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10859: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10853: \$? = $ac_status" >&5
+  echo "$as_me:10862: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10856: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10865: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10859: \$? = $ac_status" >&5
+  echo "$as_me:10868: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -10869,12 +10878,12 @@
 ac_cv_sizeof_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:10872: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:10881: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10877 "configure"
+#line 10886 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10890,15 +10899,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10893: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10902: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10896: \$? = $ac_status" >&5
+  echo "$as_me:10905: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:10898: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10907: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10901: \$? = $ac_status" >&5
+  echo "$as_me:10910: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_char=`cat conftest.val`
 else
@@ -10914,19 +10923,19 @@
   ac_cv_sizeof_char=0
 fi
 fi
-echo "$as_me:10917: result: $ac_cv_sizeof_char" >&5
+echo "$as_me:10926: result: $ac_cv_sizeof_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_CHAR $ac_cv_sizeof_char
 EOF
 
-echo "$as_me:10923: checking for short int" >&5
+echo "$as_me:10932: checking for short int" >&5
 echo $ECHO_N "checking for short int... $ECHO_C" >&6
 if test "${ac_cv_type_short_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10929 "configure"
+#line 10938 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10941,16 +10950,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10944: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10953: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10947: \$? = $ac_status" >&5
+  echo "$as_me:10956: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10950: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10959: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10953: \$? = $ac_status" >&5
+  echo "$as_me:10962: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_short_int=yes
 else
@@ -10960,10 +10969,10 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:10963: result: $ac_cv_type_short_int" >&5
+echo "$as_me:10972: result: $ac_cv_type_short_int" >&5
 echo "${ECHO_T}$ac_cv_type_short_int" >&6
 
-echo "$as_me:10966: checking size of short int" >&5
+echo "$as_me:10975: checking size of short int" >&5
 echo $ECHO_N "checking size of short int... $ECHO_C" >&6
 if test "${ac_cv_sizeof_short_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10972,7 +10981,7 @@
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 10975 "configure"
+#line 10984 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10984,21 +10993,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10987: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10996: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10990: \$? = $ac_status" >&5
+  echo "$as_me:10999: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10993: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11002: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10996: \$? = $ac_status" >&5
+  echo "$as_me:11005: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 11001 "configure"
+#line 11010 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11010,16 +11019,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11013: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11022: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11016: \$? = $ac_status" >&5
+  echo "$as_me:11025: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11019: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11028: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11022: \$? = $ac_status" >&5
+  echo "$as_me:11031: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -11035,7 +11044,7 @@
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 11038 "configure"
+#line 11047 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11047,16 +11056,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11050: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11059: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11053: \$? = $ac_status" >&5
+  echo "$as_me:11062: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11056: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11065: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11059: \$? = $ac_status" >&5
+  echo "$as_me:11068: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -11072,7 +11081,7 @@
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 11075 "configure"
+#line 11084 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11084,16 +11093,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11087: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11096: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11090: \$? = $ac_status" >&5
+  echo "$as_me:11099: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11093: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11102: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11096: \$? = $ac_status" >&5
+  echo "$as_me:11105: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -11106,12 +11115,12 @@
 ac_cv_sizeof_short_int=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:11109: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:11118: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11114 "configure"
+#line 11123 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11127,15 +11136,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11130: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11139: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11133: \$? = $ac_status" >&5
+  echo "$as_me:11142: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11135: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11144: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11138: \$? = $ac_status" >&5
+  echo "$as_me:11147: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_short_int=`cat conftest.val`
 else
@@ -11151,19 +11160,19 @@
   ac_cv_sizeof_short_int=0
 fi
 fi
-echo "$as_me:11154: result: $ac_cv_sizeof_short_int" >&5
+echo "$as_me:11163: result: $ac_cv_sizeof_short_int" >&5
 echo "${ECHO_T}$ac_cv_sizeof_short_int" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SHORT_INT $ac_cv_sizeof_short_int
 EOF
 
-echo "$as_me:11160: checking for int" >&5
+echo "$as_me:11169: checking for int" >&5
 echo $ECHO_N "checking for int... $ECHO_C" >&6
 if test "${ac_cv_type_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11166 "configure"
+#line 11175 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11178,16 +11187,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11181: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11190: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11184: \$? = $ac_status" >&5
+  echo "$as_me:11193: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11187: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11196: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11190: \$? = $ac_status" >&5
+  echo "$as_me:11199: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_int=yes
 else
@@ -11197,10 +11206,10 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11200: result: $ac_cv_type_int" >&5
+echo "$as_me:11209: result: $ac_cv_type_int" >&5
 echo "${ECHO_T}$ac_cv_type_int" >&6
 
-echo "$as_me:11203: checking size of int" >&5
+echo "$as_me:11212: checking size of int" >&5
 echo $ECHO_N "checking size of int... $ECHO_C" >&6
 if test "${ac_cv_sizeof_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11209,7 +11218,7 @@
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 11212 "configure"
+#line 11221 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11221,21 +11230,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11224: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11233: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11227: \$? = $ac_status" >&5
+  echo "$as_me:11236: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11230: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11239: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11233: \$? = $ac_status" >&5
+  echo "$as_me:11242: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 11238 "configure"
+#line 11247 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11247,16 +11256,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11250: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11259: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11253: \$? = $ac_status" >&5
+  echo "$as_me:11262: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11256: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11265: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11259: \$? = $ac_status" >&5
+  echo "$as_me:11268: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -11272,7 +11281,7 @@
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 11275 "configure"
+#line 11284 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11284,16 +11293,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11287: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11296: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11290: \$? = $ac_status" >&5
+  echo "$as_me:11299: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11293: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11302: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11296: \$? = $ac_status" >&5
+  echo "$as_me:11305: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -11309,7 +11318,7 @@
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 11312 "configure"
+#line 11321 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11321,16 +11330,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11324: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11333: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11327: \$? = $ac_status" >&5
+  echo "$as_me:11336: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11330: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11339: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11333: \$? = $ac_status" >&5
+  echo "$as_me:11342: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -11343,12 +11352,12 @@
 ac_cv_sizeof_int=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:11346: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:11355: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11351 "configure"
+#line 11360 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11364,15 +11373,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11367: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11376: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11370: \$? = $ac_status" >&5
+  echo "$as_me:11379: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11372: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11381: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11375: \$? = $ac_status" >&5
+  echo "$as_me:11384: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_int=`cat conftest.val`
 else
@@ -11388,19 +11397,19 @@
   ac_cv_sizeof_int=0
 fi
 fi
-echo "$as_me:11391: result: $ac_cv_sizeof_int" >&5
+echo "$as_me:11400: result: $ac_cv_sizeof_int" >&5
 echo "${ECHO_T}$ac_cv_sizeof_int" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_INT $ac_cv_sizeof_int
 EOF
 
-echo "$as_me:11397: checking for long int" >&5
+echo "$as_me:11406: checking for long int" >&5
 echo $ECHO_N "checking for long int... $ECHO_C" >&6
 if test "${ac_cv_type_long_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11403 "configure"
+#line 11412 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11415,16 +11424,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11418: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11427: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11421: \$? = $ac_status" >&5
+  echo "$as_me:11430: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11424: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11433: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11427: \$? = $ac_status" >&5
+  echo "$as_me:11436: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_long_int=yes
 else
@@ -11434,10 +11443,10 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11437: result: $ac_cv_type_long_int" >&5
+echo "$as_me:11446: result: $ac_cv_type_long_int" >&5
 echo "${ECHO_T}$ac_cv_type_long_int" >&6
 
-echo "$as_me:11440: checking size of long int" >&5
+echo "$as_me:11449: checking size of long int" >&5
 echo $ECHO_N "checking size of long int... $ECHO_C" >&6
 if test "${ac_cv_sizeof_long_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11446,7 +11455,7 @@
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 11449 "configure"
+#line 11458 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11458,21 +11467,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11461: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11470: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11464: \$? = $ac_status" >&5
+  echo "$as_me:11473: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11467: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11476: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11470: \$? = $ac_status" >&5
+  echo "$as_me:11479: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 11475 "configure"
+#line 11484 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11484,16 +11493,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11487: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11496: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11490: \$? = $ac_status" >&5
+  echo "$as_me:11499: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11493: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11502: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11496: \$? = $ac_status" >&5
+  echo "$as_me:11505: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -11509,7 +11518,7 @@
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 11512 "configure"
+#line 11521 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11521,16 +11530,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11524: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11533: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11527: \$? = $ac_status" >&5
+  echo "$as_me:11536: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11530: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11539: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11533: \$? = $ac_status" >&5
+  echo "$as_me:11542: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -11546,7 +11555,7 @@
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 11549 "configure"
+#line 11558 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11558,16 +11567,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11561: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11570: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11564: \$? = $ac_status" >&5
+  echo "$as_me:11573: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11567: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11576: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11570: \$? = $ac_status" >&5
+  echo "$as_me:11579: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -11580,12 +11589,12 @@
 ac_cv_sizeof_long_int=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:11583: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:11592: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11588 "configure"
+#line 11597 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11601,15 +11610,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11604: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11613: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11607: \$? = $ac_status" >&5
+  echo "$as_me:11616: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11609: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11618: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11612: \$? = $ac_status" >&5
+  echo "$as_me:11621: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_long_int=`cat conftest.val`
 else
@@ -11625,19 +11634,19 @@
   ac_cv_sizeof_long_int=0
 fi
 fi
-echo "$as_me:11628: result: $ac_cv_sizeof_long_int" >&5
+echo "$as_me:11637: result: $ac_cv_sizeof_long_int" >&5
 echo "${ECHO_T}$ac_cv_sizeof_long_int" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_LONG_INT $ac_cv_sizeof_long_int
 EOF
 
-echo "$as_me:11634: checking for long long int" >&5
+echo "$as_me:11643: checking for long long int" >&5
 echo $ECHO_N "checking for long long int... $ECHO_C" >&6
 if test "${ac_cv_type_long_long_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11640 "configure"
+#line 11649 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11652,16 +11661,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11655: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11664: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11658: \$? = $ac_status" >&5
+  echo "$as_me:11667: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11661: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11670: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11664: \$? = $ac_status" >&5
+  echo "$as_me:11673: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_long_long_int=yes
 else
@@ -11671,10 +11680,10 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11674: result: $ac_cv_type_long_long_int" >&5
+echo "$as_me:11683: result: $ac_cv_type_long_long_int" >&5
 echo "${ECHO_T}$ac_cv_type_long_long_int" >&6
 
-echo "$as_me:11677: checking size of long long int" >&5
+echo "$as_me:11686: checking size of long long int" >&5
 echo $ECHO_N "checking size of long long int... $ECHO_C" >&6
 if test "${ac_cv_sizeof_long_long_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11683,7 +11692,7 @@
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 11686 "configure"
+#line 11695 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11695,21 +11704,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11698: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11707: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11701: \$? = $ac_status" >&5
+  echo "$as_me:11710: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11704: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11713: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11707: \$? = $ac_status" >&5
+  echo "$as_me:11716: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 11712 "configure"
+#line 11721 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11721,16 +11730,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11724: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11733: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11727: \$? = $ac_status" >&5
+  echo "$as_me:11736: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11730: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11739: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11733: \$? = $ac_status" >&5
+  echo "$as_me:11742: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -11746,7 +11755,7 @@
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 11749 "configure"
+#line 11758 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11758,16 +11767,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11761: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11770: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11764: \$? = $ac_status" >&5
+  echo "$as_me:11773: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11767: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11776: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11770: \$? = $ac_status" >&5
+  echo "$as_me:11779: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -11783,7 +11792,7 @@
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 11786 "configure"
+#line 11795 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11795,16 +11804,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11798: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11807: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11801: \$? = $ac_status" >&5
+  echo "$as_me:11810: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11804: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11813: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11807: \$? = $ac_status" >&5
+  echo "$as_me:11816: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -11817,12 +11826,12 @@
 ac_cv_sizeof_long_long_int=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:11820: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:11829: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11825 "configure"
+#line 11834 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11838,15 +11847,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11841: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11850: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11844: \$? = $ac_status" >&5
+  echo "$as_me:11853: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11846: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11855: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11849: \$? = $ac_status" >&5
+  echo "$as_me:11858: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_long_long_int=`cat conftest.val`
 else
@@ -11862,7 +11871,7 @@
   ac_cv_sizeof_long_long_int=0
 fi
 fi
-echo "$as_me:11865: result: $ac_cv_sizeof_long_long_int" >&5
+echo "$as_me:11874: result: $ac_cv_sizeof_long_long_int" >&5
 echo "${ECHO_T}$ac_cv_sizeof_long_long_int" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_LONG_LONG_INT $ac_cv_sizeof_long_long_int
@@ -11874,14 +11883,14 @@
 fi
 
 # More checks for data types
-echo "$as_me:11877: checking for u_int type" >&5
+echo "$as_me:11886: checking for u_int type" >&5
 echo $ECHO_N "checking for u_int type... $ECHO_C" >&6
 if test "${ac_cv_have_u_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11884 "configure"
+#line 11893 "configure"
 #include "confdefs.h"
  #include <sys/types.h>
 int
@@ -11893,16 +11902,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11896: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11905: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11899: \$? = $ac_status" >&5
+  echo "$as_me:11908: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11902: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11911: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11905: \$? = $ac_status" >&5
+  echo "$as_me:11914: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_have_u_int="yes"
 else
@@ -11914,7 +11923,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:11917: result: $ac_cv_have_u_int" >&5
+echo "$as_me:11926: result: $ac_cv_have_u_int" >&5
 echo "${ECHO_T}$ac_cv_have_u_int" >&6
 if test "x$ac_cv_have_u_int" = "xyes" ; then
 	cat >>confdefs.h <<\EOF
@@ -11924,14 +11933,14 @@
 	have_u_int=1
 fi
 
-echo "$as_me:11927: checking for intXX_t types" >&5
+echo "$as_me:11936: checking for intXX_t types" >&5
 echo $ECHO_N "checking for intXX_t types... $ECHO_C" >&6
 if test "${ac_cv_have_intxx_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11934 "configure"
+#line 11943 "configure"
 #include "confdefs.h"
  #include <sys/types.h>
 int
@@ -11943,16 +11952,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11946: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11955: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11949: \$? = $ac_status" >&5
+  echo "$as_me:11958: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11952: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11961: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11955: \$? = $ac_status" >&5
+  echo "$as_me:11964: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_have_intxx_t="yes"
 else
@@ -11964,7 +11973,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:11967: result: $ac_cv_have_intxx_t" >&5
+echo "$as_me:11976: result: $ac_cv_have_intxx_t" >&5
 echo "${ECHO_T}$ac_cv_have_intxx_t" >&6
 if test "x$ac_cv_have_intxx_t" = "xyes" ; then
 	cat >>confdefs.h <<\EOF
@@ -11977,10 +11986,10 @@
 if (test -z "$have_intxx_t" && \
 	   test "x$ac_cv_header_stdint_h" = "xyes")
 then
-    echo "$as_me:11980: checking for intXX_t types in stdint.h" >&5
+    echo "$as_me:11989: checking for intXX_t types in stdint.h" >&5
 echo $ECHO_N "checking for intXX_t types in stdint.h... $ECHO_C" >&6
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11983 "configure"
+#line 11992 "configure"
 #include "confdefs.h"
  #include <stdint.h>
 int
@@ -11992,43 +12001,43 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11995: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12004: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11998: \$? = $ac_status" >&5
+  echo "$as_me:12007: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12001: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12010: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12004: \$? = $ac_status" >&5
+  echo "$as_me:12013: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 			cat >>confdefs.h <<\EOF
 #define HAVE_INTXX_T 1
 EOF
 
-			echo "$as_me:12011: result: yes" >&5
+			echo "$as_me:12020: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:12017: result: no" >&5
+ echo "$as_me:12026: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:12024: checking for int64_t type" >&5
+echo "$as_me:12033: checking for int64_t type" >&5
 echo $ECHO_N "checking for int64_t type... $ECHO_C" >&6
 if test "${ac_cv_have_int64_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12031 "configure"
+#line 12040 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12049,16 +12058,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12052: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12061: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12055: \$? = $ac_status" >&5
+  echo "$as_me:12064: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12058: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12067: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12061: \$? = $ac_status" >&5
+  echo "$as_me:12070: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_have_int64_t="yes"
 else
@@ -12070,7 +12079,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:12073: result: $ac_cv_have_int64_t" >&5
+echo "$as_me:12082: result: $ac_cv_have_int64_t" >&5
 echo "${ECHO_T}$ac_cv_have_int64_t" >&6
 if test "x$ac_cv_have_int64_t" = "xyes" ; then
 	cat >>confdefs.h <<\EOF
@@ -12079,14 +12088,14 @@
 
 fi
 
-echo "$as_me:12082: checking for u_intXX_t types" >&5
+echo "$as_me:12091: checking for u_intXX_t types" >&5
 echo $ECHO_N "checking for u_intXX_t types... $ECHO_C" >&6
 if test "${ac_cv_have_u_intxx_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12089 "configure"
+#line 12098 "configure"
 #include "confdefs.h"
  #include <sys/types.h>
 int
@@ -12098,16 +12107,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12101: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12110: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12104: \$? = $ac_status" >&5
+  echo "$as_me:12113: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12107: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12116: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12110: \$? = $ac_status" >&5
+  echo "$as_me:12119: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_have_u_intxx_t="yes"
 else
@@ -12119,7 +12128,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:12122: result: $ac_cv_have_u_intxx_t" >&5
+echo "$as_me:12131: result: $ac_cv_have_u_intxx_t" >&5
 echo "${ECHO_T}$ac_cv_have_u_intxx_t" >&6
 if test "x$ac_cv_have_u_intxx_t" = "xyes" ; then
 	cat >>confdefs.h <<\EOF
@@ -12130,10 +12139,10 @@
 fi
 
 if test -z "$have_u_intxx_t" ; then
-    echo "$as_me:12133: checking for u_intXX_t types in sys/socket.h" >&5
+    echo "$as_me:12142: checking for u_intXX_t types in sys/socket.h" >&5
 echo $ECHO_N "checking for u_intXX_t types in sys/socket.h... $ECHO_C" >&6
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12136 "configure"
+#line 12145 "configure"
 #include "confdefs.h"
  #include <sys/socket.h>
 int
@@ -12145,43 +12154,43 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12148: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12157: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12151: \$? = $ac_status" >&5
+  echo "$as_me:12160: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12154: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12163: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12157: \$? = $ac_status" >&5
+  echo "$as_me:12166: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 			cat >>confdefs.h <<\EOF
 #define HAVE_U_INTXX_T 1
 EOF
 
-			echo "$as_me:12164: result: yes" >&5
+			echo "$as_me:12173: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:12170: result: no" >&5
+ echo "$as_me:12179: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:12177: checking for u_int64_t types" >&5
+echo "$as_me:12186: checking for u_int64_t types" >&5
 echo $ECHO_N "checking for u_int64_t types... $ECHO_C" >&6
 if test "${ac_cv_have_u_int64_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12184 "configure"
+#line 12193 "configure"
 #include "confdefs.h"
  #include <sys/types.h>
 int
@@ -12193,16 +12202,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12196: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12205: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12199: \$? = $ac_status" >&5
+  echo "$as_me:12208: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12202: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12211: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12205: \$? = $ac_status" >&5
+  echo "$as_me:12214: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_have_u_int64_t="yes"
 else
@@ -12214,7 +12223,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:12217: result: $ac_cv_have_u_int64_t" >&5
+echo "$as_me:12226: result: $ac_cv_have_u_int64_t" >&5
 echo "${ECHO_T}$ac_cv_have_u_int64_t" >&6
 if test "x$ac_cv_have_u_int64_t" = "xyes" ; then
 	cat >>confdefs.h <<\EOF
@@ -12225,10 +12234,10 @@
 fi
 
 if test -z "$have_u_int64_t" ; then
-    echo "$as_me:12228: checking for u_int64_t type in sys/bitypes.h" >&5
+    echo "$as_me:12237: checking for u_int64_t type in sys/bitypes.h" >&5
 echo $ECHO_N "checking for u_int64_t type in sys/bitypes.h... $ECHO_C" >&6
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12231 "configure"
+#line 12240 "configure"
 #include "confdefs.h"
  #include <sys/bitypes.h>
 int
@@ -12240,29 +12249,29 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12243: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12252: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12246: \$? = $ac_status" >&5
+  echo "$as_me:12255: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12249: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12258: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12252: \$? = $ac_status" >&5
+  echo "$as_me:12261: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 			cat >>confdefs.h <<\EOF
 #define HAVE_U_INT64_T 1
 EOF
 
-			echo "$as_me:12259: result: yes" >&5
+			echo "$as_me:12268: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:12265: result: no" >&5
+ echo "$as_me:12274: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 fi
@@ -12270,14 +12279,14 @@
 fi
 
 if test -z "$have_u_intxx_t" ; then
-	echo "$as_me:12273: checking for uintXX_t types" >&5
+	echo "$as_me:12282: checking for uintXX_t types" >&5
 echo $ECHO_N "checking for uintXX_t types... $ECHO_C" >&6
 if test "${ac_cv_have_uintxx_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 12280 "configure"
+#line 12289 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12291,16 +12300,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12294: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12303: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12297: \$? = $ac_status" >&5
+  echo "$as_me:12306: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12300: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12309: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12303: \$? = $ac_status" >&5
+  echo "$as_me:12312: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_have_uintxx_t="yes"
 else
@@ -12312,7 +12321,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:12315: result: $ac_cv_have_uintxx_t" >&5
+echo "$as_me:12324: result: $ac_cv_have_uintxx_t" >&5
 echo "${ECHO_T}$ac_cv_have_uintxx_t" >&6
 	if test "x$ac_cv_have_uintxx_t" = "xyes" ; then
 		cat >>confdefs.h <<\EOF
@@ -12323,10 +12332,10 @@
 fi
 
 if test -z "$have_uintxx_t" ; then
-    echo "$as_me:12326: checking for uintXX_t types in stdint.h" >&5
+    echo "$as_me:12335: checking for uintXX_t types in stdint.h" >&5
 echo $ECHO_N "checking for uintXX_t types in stdint.h... $ECHO_C" >&6
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12329 "configure"
+#line 12338 "configure"
 #include "confdefs.h"
  #include <stdint.h>
 int
@@ -12338,29 +12347,29 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12341: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12350: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12344: \$? = $ac_status" >&5
+  echo "$as_me:12353: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12347: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12356: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12350: \$? = $ac_status" >&5
+  echo "$as_me:12359: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 			cat >>confdefs.h <<\EOF
 #define HAVE_UINTXX_T 1
 EOF
 
-			echo "$as_me:12357: result: yes" >&5
+			echo "$as_me:12366: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:12363: result: no" >&5
+ echo "$as_me:12372: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 fi
@@ -12370,10 +12379,10 @@
 if (test -z "$have_u_intxx_t" || test -z "$have_intxx_t" && \
 	   test "x$ac_cv_header_sys_bitypes_h" = "xyes")
 then
-	echo "$as_me:12373: checking for intXX_t and u_intXX_t types in sys/bitypes.h" >&5
+	echo "$as_me:12382: checking for intXX_t and u_intXX_t types in sys/bitypes.h" >&5
 echo $ECHO_N "checking for intXX_t and u_intXX_t types in sys/bitypes.h... $ECHO_C" >&6
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12376 "configure"
+#line 12385 "configure"
 #include "confdefs.h"
 
 #include <sys/bitypes.h>
@@ -12391,16 +12400,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12394: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12403: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12397: \$? = $ac_status" >&5
+  echo "$as_me:12406: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12400: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12409: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12403: \$? = $ac_status" >&5
+  echo "$as_me:12412: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 			cat >>confdefs.h <<\EOF
@@ -12411,27 +12420,27 @@
 #define HAVE_INTXX_T 1
 EOF
 
-			echo "$as_me:12414: result: yes" >&5
+			echo "$as_me:12423: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:12420: result: no" >&5
+echo "$as_me:12429: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:12427: checking for u_char" >&5
+echo "$as_me:12436: checking for u_char" >&5
 echo $ECHO_N "checking for u_char... $ECHO_C" >&6
 if test "${ac_cv_have_u_char+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12434 "configure"
+#line 12443 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12445,16 +12454,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12448: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12457: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12451: \$? = $ac_status" >&5
+  echo "$as_me:12460: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12454: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12463: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12457: \$? = $ac_status" >&5
+  echo "$as_me:12466: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_have_u_char="yes"
 else
@@ -12466,7 +12475,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:12469: result: $ac_cv_have_u_char" >&5
+echo "$as_me:12478: result: $ac_cv_have_u_char" >&5
 echo "${ECHO_T}$ac_cv_have_u_char" >&6
 if test "x$ac_cv_have_u_char" = "xyes" ; then
 	cat >>confdefs.h <<\EOF
@@ -12475,13 +12484,13 @@
 
 fi
 
-   echo "$as_me:12478: checking for socklen_t" >&5
+   echo "$as_me:12487: checking for socklen_t" >&5
 echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
 if test "${ac_cv_type_socklen_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12484 "configure"
+#line 12493 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -12498,16 +12507,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12501: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12510: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12504: \$? = $ac_status" >&5
+  echo "$as_me:12513: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12507: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12516: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12510: \$? = $ac_status" >&5
+  echo "$as_me:12519: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_socklen_t=yes
 else
@@ -12517,13 +12526,13 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12520: result: $ac_cv_type_socklen_t" >&5
+echo "$as_me:12529: result: $ac_cv_type_socklen_t" >&5
 echo "${ECHO_T}$ac_cv_type_socklen_t" >&6
 if test $ac_cv_type_socklen_t = yes; then
   :
 else
 
-      echo "$as_me:12526: checking for socklen_t equivalent" >&5
+      echo "$as_me:12535: checking for socklen_t equivalent" >&5
 echo $ECHO_N "checking for socklen_t equivalent... $ECHO_C" >&6
       if test "${curl_cv_socklen_t_equiv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12535,7 +12544,7 @@
 	 for arg2 in "struct sockaddr" void; do
 	    for t in int size_t unsigned long "unsigned long"; do
 	       cat >conftest.$ac_ext <<_ACEOF
-#line 12538 "configure"
+#line 12547 "configure"
 #include "confdefs.h"
 
 		  #include <sys/types.h>
@@ -12555,16 +12564,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12558: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12567: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12561: \$? = $ac_status" >&5
+  echo "$as_me:12570: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12564: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12573: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12567: \$? = $ac_status" >&5
+  echo "$as_me:12576: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 		  curl_cv_socklen_t_equiv="$t"
@@ -12579,14 +12588,14 @@
 	 done
 
 	 if test "x$curl_cv_socklen_t_equiv" = x; then
-	    { { echo "$as_me:12582: error: Cannot find a type to use in place of socklen_t" >&5
+	    { { echo "$as_me:12591: error: Cannot find a type to use in place of socklen_t" >&5
 echo "$as_me: error: Cannot find a type to use in place of socklen_t" >&2;}
    { (exit 1); exit 1; }; }
 	 fi
 
 fi
 
-      echo "$as_me:12589: result: $curl_cv_socklen_t_equiv" >&5
+      echo "$as_me:12598: result: $curl_cv_socklen_t_equiv" >&5
 echo "${ECHO_T}$curl_cv_socklen_t_equiv" >&6
 
 cat >>confdefs.h <<EOF
@@ -12595,13 +12604,13 @@
 
 fi
 
-echo "$as_me:12598: checking for sig_atomic_t" >&5
+echo "$as_me:12607: checking for sig_atomic_t" >&5
 echo $ECHO_N "checking for sig_atomic_t... $ECHO_C" >&6
 if test "${ac_cv_type_sig_atomic_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12604 "configure"
+#line 12613 "configure"
 #include "confdefs.h"
 #include <signal.h>
 
@@ -12617,16 +12626,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12620: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12629: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12623: \$? = $ac_status" >&5
+  echo "$as_me:12632: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12626: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12635: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12629: \$? = $ac_status" >&5
+  echo "$as_me:12638: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_sig_atomic_t=yes
 else
@@ -12636,7 +12645,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12639: result: $ac_cv_type_sig_atomic_t" >&5
+echo "$as_me:12648: result: $ac_cv_type_sig_atomic_t" >&5
 echo "${ECHO_T}$ac_cv_type_sig_atomic_t" >&6
 if test $ac_cv_type_sig_atomic_t = yes; then
 
@@ -12646,14 +12655,14 @@
 
 fi
 
-echo "$as_me:12649: checking for size_t" >&5
+echo "$as_me:12658: checking for size_t" >&5
 echo $ECHO_N "checking for size_t... $ECHO_C" >&6
 if test "${ac_cv_have_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12656 "configure"
+#line 12665 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12667,16 +12676,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12670: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12679: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12673: \$? = $ac_status" >&5
+  echo "$as_me:12682: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12676: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12685: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12679: \$? = $ac_status" >&5
+  echo "$as_me:12688: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_have_size_t="yes"
 else
@@ -12688,7 +12697,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:12691: result: $ac_cv_have_size_t" >&5
+echo "$as_me:12700: result: $ac_cv_have_size_t" >&5
 echo "${ECHO_T}$ac_cv_have_size_t" >&6
 if test "x$ac_cv_have_size_t" = "xyes" ; then
 	cat >>confdefs.h <<\EOF
@@ -12697,14 +12706,14 @@
 
 fi
 
-echo "$as_me:12700: checking for ssize_t" >&5
+echo "$as_me:12709: checking for ssize_t" >&5
 echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
 if test "${ac_cv_have_ssize_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12707 "configure"
+#line 12716 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12718,16 +12727,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12721: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12730: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12724: \$? = $ac_status" >&5
+  echo "$as_me:12733: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12727: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12736: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12730: \$? = $ac_status" >&5
+  echo "$as_me:12739: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_have_ssize_t="yes"
 else
@@ -12739,7 +12748,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:12742: result: $ac_cv_have_ssize_t" >&5
+echo "$as_me:12751: result: $ac_cv_have_ssize_t" >&5
 echo "${ECHO_T}$ac_cv_have_ssize_t" >&6
 if test "x$ac_cv_have_ssize_t" = "xyes" ; then
 	cat >>confdefs.h <<\EOF
@@ -12748,14 +12757,14 @@
 
 fi
 
-echo "$as_me:12751: checking for clock_t" >&5
+echo "$as_me:12760: checking for clock_t" >&5
 echo $ECHO_N "checking for clock_t... $ECHO_C" >&6
 if test "${ac_cv_have_clock_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12758 "configure"
+#line 12767 "configure"
 #include "confdefs.h"
 
 #include <time.h>
@@ -12769,16 +12778,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12772: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12781: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12775: \$? = $ac_status" >&5
+  echo "$as_me:12784: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12778: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12787: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12781: \$? = $ac_status" >&5
+  echo "$as_me:12790: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_have_clock_t="yes"
 else
@@ -12790,7 +12799,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:12793: result: $ac_cv_have_clock_t" >&5
+echo "$as_me:12802: result: $ac_cv_have_clock_t" >&5
 echo "${ECHO_T}$ac_cv_have_clock_t" >&6
 if test "x$ac_cv_have_clock_t" = "xyes" ; then
 	cat >>confdefs.h <<\EOF
@@ -12799,14 +12808,14 @@
 
 fi
 
-echo "$as_me:12802: checking for sa_family_t" >&5
+echo "$as_me:12811: checking for sa_family_t" >&5
 echo $ECHO_N "checking for sa_family_t... $ECHO_C" >&6
 if test "${ac_cv_have_sa_family_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12809 "configure"
+#line 12818 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12821,23 +12830,23 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12824: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12833: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12827: \$? = $ac_status" >&5
+  echo "$as_me:12836: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12830: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12839: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12833: \$? = $ac_status" >&5
+  echo "$as_me:12842: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_have_sa_family_t="yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
  cat >conftest.$ac_ext <<_ACEOF
-#line 12840 "configure"
+#line 12849 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12853,16 +12862,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12856: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12865: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12859: \$? = $ac_status" >&5
+  echo "$as_me:12868: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12862: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12871: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12865: \$? = $ac_status" >&5
+  echo "$as_me:12874: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_have_sa_family_t="yes"
 else
@@ -12877,7 +12886,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:12880: result: $ac_cv_have_sa_family_t" >&5
+echo "$as_me:12889: result: $ac_cv_have_sa_family_t" >&5
 echo "${ECHO_T}$ac_cv_have_sa_family_t" >&6
 if test "x$ac_cv_have_sa_family_t" = "xyes" ; then
 	cat >>confdefs.h <<\EOF
@@ -12886,14 +12895,14 @@
 
 fi
 
-echo "$as_me:12889: checking for pid_t" >&5
+echo "$as_me:12898: checking for pid_t" >&5
 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
 if test "${ac_cv_have_pid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12896 "configure"
+#line 12905 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12907,16 +12916,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12910: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12919: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12913: \$? = $ac_status" >&5
+  echo "$as_me:12922: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12916: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12925: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12919: \$? = $ac_status" >&5
+  echo "$as_me:12928: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_have_pid_t="yes"
 else
@@ -12928,7 +12937,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:12931: result: $ac_cv_have_pid_t" >&5
+echo "$as_me:12940: result: $ac_cv_have_pid_t" >&5
 echo "${ECHO_T}$ac_cv_have_pid_t" >&6
 if test "x$ac_cv_have_pid_t" = "xyes" ; then
 	cat >>confdefs.h <<\EOF
@@ -12937,14 +12946,14 @@
 
 fi
 
-echo "$as_me:12940: checking for mode_t" >&5
+echo "$as_me:12949: checking for mode_t" >&5
 echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
 if test "${ac_cv_have_mode_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12947 "configure"
+#line 12956 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12958,16 +12967,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12961: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12970: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12964: \$? = $ac_status" >&5
+  echo "$as_me:12973: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12967: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12976: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12970: \$? = $ac_status" >&5
+  echo "$as_me:12979: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_have_mode_t="yes"
 else
@@ -12979,7 +12988,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:12982: result: $ac_cv_have_mode_t" >&5
+echo "$as_me:12991: result: $ac_cv_have_mode_t" >&5
 echo "${ECHO_T}$ac_cv_have_mode_t" >&6
 if test "x$ac_cv_have_mode_t" = "xyes" ; then
 	cat >>confdefs.h <<\EOF
@@ -12988,14 +12997,14 @@
 
 fi
 
-echo "$as_me:12991: checking for struct sockaddr_storage" >&5
+echo "$as_me:13000: checking for struct sockaddr_storage" >&5
 echo $ECHO_N "checking for struct sockaddr_storage... $ECHO_C" >&6
 if test "${ac_cv_have_struct_sockaddr_storage+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12998 "configure"
+#line 13007 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13010,16 +13019,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13013: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13022: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13016: \$? = $ac_status" >&5
+  echo "$as_me:13025: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13019: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13028: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13022: \$? = $ac_status" >&5
+  echo "$as_me:13031: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_have_struct_sockaddr_storage="yes"
 else
@@ -13031,7 +13040,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:13034: result: $ac_cv_have_struct_sockaddr_storage" >&5
+echo "$as_me:13043: result: $ac_cv_have_struct_sockaddr_storage" >&5
 echo "${ECHO_T}$ac_cv_have_struct_sockaddr_storage" >&6
 if test "x$ac_cv_have_struct_sockaddr_storage" = "xyes" ; then
 	cat >>confdefs.h <<\EOF
@@ -13040,14 +13049,14 @@
 
 fi
 
-echo "$as_me:13043: checking for struct sockaddr_in6" >&5
+echo "$as_me:13052: checking for struct sockaddr_in6" >&5
 echo $ECHO_N "checking for struct sockaddr_in6... $ECHO_C" >&6
 if test "${ac_cv_have_struct_sockaddr_in6+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 13050 "configure"
+#line 13059 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13062,16 +13071,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13065: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13074: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13068: \$? = $ac_status" >&5
+  echo "$as_me:13077: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13071: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13080: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13074: \$? = $ac_status" >&5
+  echo "$as_me:13083: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_have_struct_sockaddr_in6="yes"
 else
@@ -13083,7 +13092,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:13086: result: $ac_cv_have_struct_sockaddr_in6" >&5
+echo "$as_me:13095: result: $ac_cv_have_struct_sockaddr_in6" >&5
 echo "${ECHO_T}$ac_cv_have_struct_sockaddr_in6" >&6
 if test "x$ac_cv_have_struct_sockaddr_in6" = "xyes" ; then
 	cat >>confdefs.h <<\EOF
@@ -13092,14 +13101,14 @@
 
 fi
 
-echo "$as_me:13095: checking for struct in6_addr" >&5
+echo "$as_me:13104: checking for struct in6_addr" >&5
 echo $ECHO_N "checking for struct in6_addr... $ECHO_C" >&6
 if test "${ac_cv_have_struct_in6_addr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 13102 "configure"
+#line 13111 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13114,16 +13123,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13117: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13126: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13120: \$? = $ac_status" >&5
+  echo "$as_me:13129: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13123: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13132: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13126: \$? = $ac_status" >&5
+  echo "$as_me:13135: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_have_struct_in6_addr="yes"
 else
@@ -13135,7 +13144,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:13138: result: $ac_cv_have_struct_in6_addr" >&5
+echo "$as_me:13147: result: $ac_cv_have_struct_in6_addr" >&5
 echo "${ECHO_T}$ac_cv_have_struct_in6_addr" >&6
 if test "x$ac_cv_have_struct_in6_addr" = "xyes" ; then
 	cat >>confdefs.h <<\EOF
@@ -13144,14 +13153,14 @@
 
 fi
 
-echo "$as_me:13147: checking for struct addrinfo" >&5
+echo "$as_me:13156: checking for struct addrinfo" >&5
 echo $ECHO_N "checking for struct addrinfo... $ECHO_C" >&6
 if test "${ac_cv_have_struct_addrinfo+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 13154 "configure"
+#line 13163 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13167,16 +13176,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13170: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13179: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13173: \$? = $ac_status" >&5
+  echo "$as_me:13182: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13176: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13185: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13179: \$? = $ac_status" >&5
+  echo "$as_me:13188: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_have_struct_addrinfo="yes"
 else
@@ -13188,7 +13197,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:13191: result: $ac_cv_have_struct_addrinfo" >&5
+echo "$as_me:13200: result: $ac_cv_have_struct_addrinfo" >&5
 echo "${ECHO_T}$ac_cv_have_struct_addrinfo" >&6
 if test "x$ac_cv_have_struct_addrinfo" = "xyes" ; then
 	cat >>confdefs.h <<\EOF
@@ -13197,14 +13206,14 @@
 
 fi
 
-echo "$as_me:13200: checking for struct timeval" >&5
+echo "$as_me:13209: checking for struct timeval" >&5
 echo $ECHO_N "checking for struct timeval... $ECHO_C" >&6
 if test "${ac_cv_have_struct_timeval+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 13207 "configure"
+#line 13216 "configure"
 #include "confdefs.h"
  #include <sys/time.h>
 int
@@ -13216,16 +13225,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13219: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13228: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13222: \$? = $ac_status" >&5
+  echo "$as_me:13231: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13225: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13234: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13228: \$? = $ac_status" >&5
+  echo "$as_me:13237: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_have_struct_timeval="yes"
 else
@@ -13237,7 +13246,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:13240: result: $ac_cv_have_struct_timeval" >&5
+echo "$as_me:13249: result: $ac_cv_have_struct_timeval" >&5
 echo "${ECHO_T}$ac_cv_have_struct_timeval" >&6
 if test "x$ac_cv_have_struct_timeval" = "xyes" ; then
 	cat >>confdefs.h <<\EOF
@@ -13247,13 +13256,13 @@
 	have_struct_timeval=1
 fi
 
-echo "$as_me:13250: checking for struct timespec" >&5
+echo "$as_me:13259: checking for struct timespec" >&5
 echo $ECHO_N "checking for struct timespec... $ECHO_C" >&6
 if test "${ac_cv_type_struct_timespec+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13256 "configure"
+#line 13265 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -13268,16 +13277,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13271: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13280: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13274: \$? = $ac_status" >&5
+  echo "$as_me:13283: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13277: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13286: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13280: \$? = $ac_status" >&5
+  echo "$as_me:13289: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_struct_timespec=yes
 else
@@ -13287,7 +13296,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:13290: result: $ac_cv_type_struct_timespec" >&5
+echo "$as_me:13299: result: $ac_cv_type_struct_timespec" >&5
 echo "${ECHO_T}$ac_cv_type_struct_timespec" >&6
 if test $ac_cv_type_struct_timespec = yes; then
 
@@ -13307,12 +13316,12 @@
 	exit 1;
 else
 	if test "$cross_compiling" = yes; then
-  { { echo "$as_me:13310: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:13319: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13315 "configure"
+#line 13324 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13340,15 +13349,15 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:13343: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13352: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13346: \$? = $ac_status" >&5
+  echo "$as_me:13355: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:13348: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13357: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13351: \$? = $ac_status" >&5
+  echo "$as_me:13360: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    true
 else
@@ -13367,14 +13376,14 @@
 # look for field 'ut_host' in header 'utmp.h'
 		ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"ut_host
-	echo "$as_me:13370: checking for ut_host field in utmp.h" >&5
+	echo "$as_me:13379: checking for ut_host field in utmp.h" >&5
 echo $ECHO_N "checking for ut_host field in utmp.h... $ECHO_C" >&6
 	if eval "test \"\${$ossh_varname+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13377 "configure"
+#line 13386 "configure"
 #include "confdefs.h"
 #include <utmp.h>
 
@@ -13391,7 +13400,7 @@
 
 	ossh_result=`eval 'echo $'"$ossh_varname"`
 	if test -n "`echo $ossh_varname`"; then
-		echo "$as_me:13394: result: $ossh_result" >&5
+		echo "$as_me:13403: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
 		if test "x$ossh_result" = "xyes"; then
 			cat >>confdefs.h <<\EOF
@@ -13400,21 +13409,21 @@
 
 		fi
 	else
-		echo "$as_me:13403: result: no" >&5
+		echo "$as_me:13412: result: no" >&5
 echo "${ECHO_T}no" >&6
 	fi
 
 # look for field 'ut_host' in header 'utmpx.h'
 		ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"ut_host
-	echo "$as_me:13410: checking for ut_host field in utmpx.h" >&5
+	echo "$as_me:13419: checking for ut_host field in utmpx.h" >&5
 echo $ECHO_N "checking for ut_host field in utmpx.h... $ECHO_C" >&6
 	if eval "test \"\${$ossh_varname+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13417 "configure"
+#line 13426 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
 
@@ -13431,7 +13440,7 @@
 
 	ossh_result=`eval 'echo $'"$ossh_varname"`
 	if test -n "`echo $ossh_varname`"; then
-		echo "$as_me:13434: result: $ossh_result" >&5
+		echo "$as_me:13443: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
 		if test "x$ossh_result" = "xyes"; then
 			cat >>confdefs.h <<\EOF
@@ -13440,21 +13449,21 @@
 
 		fi
 	else
-		echo "$as_me:13443: result: no" >&5
+		echo "$as_me:13452: result: no" >&5
 echo "${ECHO_T}no" >&6
 	fi
 
 # look for field 'syslen' in header 'utmpx.h'
 		ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"syslen
-	echo "$as_me:13450: checking for syslen field in utmpx.h" >&5
+	echo "$as_me:13459: checking for syslen field in utmpx.h" >&5
 echo $ECHO_N "checking for syslen field in utmpx.h... $ECHO_C" >&6
 	if eval "test \"\${$ossh_varname+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13457 "configure"
+#line 13466 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
 
@@ -13471,7 +13480,7 @@
 
 	ossh_result=`eval 'echo $'"$ossh_varname"`
 	if test -n "`echo $ossh_varname`"; then
-		echo "$as_me:13474: result: $ossh_result" >&5
+		echo "$as_me:13483: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
 		if test "x$ossh_result" = "xyes"; then
 			cat >>confdefs.h <<\EOF
@@ -13480,21 +13489,21 @@
 
 		fi
 	else
-		echo "$as_me:13483: result: no" >&5
+		echo "$as_me:13492: result: no" >&5
 echo "${ECHO_T}no" >&6
 	fi
 
 # look for field 'ut_pid' in header 'utmp.h'
 		ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"ut_pid
-	echo "$as_me:13490: checking for ut_pid field in utmp.h" >&5
+	echo "$as_me:13499: checking for ut_pid field in utmp.h" >&5
 echo $ECHO_N "checking for ut_pid field in utmp.h... $ECHO_C" >&6
 	if eval "test \"\${$ossh_varname+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13497 "configure"
+#line 13506 "configure"
 #include "confdefs.h"
 #include <utmp.h>
 
@@ -13511,7 +13520,7 @@
 
 	ossh_result=`eval 'echo $'"$ossh_varname"`
 	if test -n "`echo $ossh_varname`"; then
-		echo "$as_me:13514: result: $ossh_result" >&5
+		echo "$as_me:13523: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
 		if test "x$ossh_result" = "xyes"; then
 			cat >>confdefs.h <<\EOF
@@ -13520,21 +13529,21 @@
 
 		fi
 	else
-		echo "$as_me:13523: result: no" >&5
+		echo "$as_me:13532: result: no" >&5
 echo "${ECHO_T}no" >&6
 	fi
 
 # look for field 'ut_type' in header 'utmp.h'
 		ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"ut_type
-	echo "$as_me:13530: checking for ut_type field in utmp.h" >&5
+	echo "$as_me:13539: checking for ut_type field in utmp.h" >&5
 echo $ECHO_N "checking for ut_type field in utmp.h... $ECHO_C" >&6
 	if eval "test \"\${$ossh_varname+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13537 "configure"
+#line 13546 "configure"
 #include "confdefs.h"
 #include <utmp.h>
 
@@ -13551,7 +13560,7 @@
 
 	ossh_result=`eval 'echo $'"$ossh_varname"`
 	if test -n "`echo $ossh_varname`"; then
-		echo "$as_me:13554: result: $ossh_result" >&5
+		echo "$as_me:13563: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
 		if test "x$ossh_result" = "xyes"; then
 			cat >>confdefs.h <<\EOF
@@ -13560,21 +13569,21 @@
 
 		fi
 	else
-		echo "$as_me:13563: result: no" >&5
+		echo "$as_me:13572: result: no" >&5
 echo "${ECHO_T}no" >&6
 	fi
 
 # look for field 'ut_type' in header 'utmpx.h'
 		ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"ut_type
-	echo "$as_me:13570: checking for ut_type field in utmpx.h" >&5
+	echo "$as_me:13579: checking for ut_type field in utmpx.h" >&5
 echo $ECHO_N "checking for ut_type field in utmpx.h... $ECHO_C" >&6
 	if eval "test \"\${$ossh_varname+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13577 "configure"
+#line 13586 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
 
@@ -13591,7 +13600,7 @@
 
 	ossh_result=`eval 'echo $'"$ossh_varname"`
 	if test -n "`echo $ossh_varname`"; then
-		echo "$as_me:13594: result: $ossh_result" >&5
+		echo "$as_me:13603: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
 		if test "x$ossh_result" = "xyes"; then
 			cat >>confdefs.h <<\EOF
@@ -13600,21 +13609,21 @@
 
 		fi
 	else
-		echo "$as_me:13603: result: no" >&5
+		echo "$as_me:13612: result: no" >&5
 echo "${ECHO_T}no" >&6
 	fi
 
 # look for field 'ut_tv' in header 'utmp.h'
 		ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"ut_tv
-	echo "$as_me:13610: checking for ut_tv field in utmp.h" >&5
+	echo "$as_me:13619: checking for ut_tv field in utmp.h" >&5
 echo $ECHO_N "checking for ut_tv field in utmp.h... $ECHO_C" >&6
 	if eval "test \"\${$ossh_varname+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13617 "configure"
+#line 13626 "configure"
 #include "confdefs.h"
 #include <utmp.h>
 
@@ -13631,7 +13640,7 @@
 
 	ossh_result=`eval 'echo $'"$ossh_varname"`
 	if test -n "`echo $ossh_varname`"; then
-		echo "$as_me:13634: result: $ossh_result" >&5
+		echo "$as_me:13643: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
 		if test "x$ossh_result" = "xyes"; then
 			cat >>confdefs.h <<\EOF
@@ -13640,21 +13649,21 @@
 
 		fi
 	else
-		echo "$as_me:13643: result: no" >&5
+		echo "$as_me:13652: result: no" >&5
 echo "${ECHO_T}no" >&6
 	fi
 
 # look for field 'ut_id' in header 'utmp.h'
 		ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"ut_id
-	echo "$as_me:13650: checking for ut_id field in utmp.h" >&5
+	echo "$as_me:13659: checking for ut_id field in utmp.h" >&5
 echo $ECHO_N "checking for ut_id field in utmp.h... $ECHO_C" >&6
 	if eval "test \"\${$ossh_varname+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13657 "configure"
+#line 13666 "configure"
 #include "confdefs.h"
 #include <utmp.h>
 
@@ -13671,7 +13680,7 @@
 
 	ossh_result=`eval 'echo $'"$ossh_varname"`
 	if test -n "`echo $ossh_varname`"; then
-		echo "$as_me:13674: result: $ossh_result" >&5
+		echo "$as_me:13683: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
 		if test "x$ossh_result" = "xyes"; then
 			cat >>confdefs.h <<\EOF
@@ -13680,21 +13689,21 @@
 
 		fi
 	else
-		echo "$as_me:13683: result: no" >&5
+		echo "$as_me:13692: result: no" >&5
 echo "${ECHO_T}no" >&6
 	fi
 
 # look for field 'ut_id' in header 'utmpx.h'
 		ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"ut_id
-	echo "$as_me:13690: checking for ut_id field in utmpx.h" >&5
+	echo "$as_me:13699: checking for ut_id field in utmpx.h" >&5
 echo $ECHO_N "checking for ut_id field in utmpx.h... $ECHO_C" >&6
 	if eval "test \"\${$ossh_varname+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13697 "configure"
+#line 13706 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
 
@@ -13711,7 +13720,7 @@
 
 	ossh_result=`eval 'echo $'"$ossh_varname"`
 	if test -n "`echo $ossh_varname`"; then
-		echo "$as_me:13714: result: $ossh_result" >&5
+		echo "$as_me:13723: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
 		if test "x$ossh_result" = "xyes"; then
 			cat >>confdefs.h <<\EOF
@@ -13720,21 +13729,21 @@
 
 		fi
 	else
-		echo "$as_me:13723: result: no" >&5
+		echo "$as_me:13732: result: no" >&5
 echo "${ECHO_T}no" >&6
 	fi
 
 # look for field 'ut_addr' in header 'utmp.h'
 		ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr
-	echo "$as_me:13730: checking for ut_addr field in utmp.h" >&5
+	echo "$as_me:13739: checking for ut_addr field in utmp.h" >&5
 echo $ECHO_N "checking for ut_addr field in utmp.h... $ECHO_C" >&6
 	if eval "test \"\${$ossh_varname+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13737 "configure"
+#line 13746 "configure"
 #include "confdefs.h"
 #include <utmp.h>
 
@@ -13751,7 +13760,7 @@
 
 	ossh_result=`eval 'echo $'"$ossh_varname"`
 	if test -n "`echo $ossh_varname`"; then
-		echo "$as_me:13754: result: $ossh_result" >&5
+		echo "$as_me:13763: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
 		if test "x$ossh_result" = "xyes"; then
 			cat >>confdefs.h <<\EOF
@@ -13760,21 +13769,21 @@
 
 		fi
 	else
-		echo "$as_me:13763: result: no" >&5
+		echo "$as_me:13772: result: no" >&5
 echo "${ECHO_T}no" >&6
 	fi
 
 # look for field 'ut_addr' in header 'utmpx.h'
 		ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr
-	echo "$as_me:13770: checking for ut_addr field in utmpx.h" >&5
+	echo "$as_me:13779: checking for ut_addr field in utmpx.h" >&5
 echo $ECHO_N "checking for ut_addr field in utmpx.h... $ECHO_C" >&6
 	if eval "test \"\${$ossh_varname+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13777 "configure"
+#line 13786 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
 
@@ -13791,7 +13800,7 @@
 
 	ossh_result=`eval 'echo $'"$ossh_varname"`
 	if test -n "`echo $ossh_varname`"; then
-		echo "$as_me:13794: result: $ossh_result" >&5
+		echo "$as_me:13803: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
 		if test "x$ossh_result" = "xyes"; then
 			cat >>confdefs.h <<\EOF
@@ -13800,21 +13809,21 @@
 
 		fi
 	else
-		echo "$as_me:13803: result: no" >&5
+		echo "$as_me:13812: result: no" >&5
 echo "${ECHO_T}no" >&6
 	fi
 
 # look for field 'ut_addr_v6' in header 'utmp.h'
 		ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr_v6
-	echo "$as_me:13810: checking for ut_addr_v6 field in utmp.h" >&5
+	echo "$as_me:13819: checking for ut_addr_v6 field in utmp.h" >&5
 echo $ECHO_N "checking for ut_addr_v6 field in utmp.h... $ECHO_C" >&6
 	if eval "test \"\${$ossh_varname+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13817 "configure"
+#line 13826 "configure"
 #include "confdefs.h"
 #include <utmp.h>
 
@@ -13831,7 +13840,7 @@
 
 	ossh_result=`eval 'echo $'"$ossh_varname"`
 	if test -n "`echo $ossh_varname`"; then
-		echo "$as_me:13834: result: $ossh_result" >&5
+		echo "$as_me:13843: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
 		if test "x$ossh_result" = "xyes"; then
 			cat >>confdefs.h <<\EOF
@@ -13840,21 +13849,21 @@
 
 		fi
 	else
-		echo "$as_me:13843: result: no" >&5
+		echo "$as_me:13852: result: no" >&5
 echo "${ECHO_T}no" >&6
 	fi
 
 # look for field 'ut_addr_v6' in header 'utmpx.h'
 		ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr_v6
-	echo "$as_me:13850: checking for ut_addr_v6 field in utmpx.h" >&5
+	echo "$as_me:13859: checking for ut_addr_v6 field in utmpx.h" >&5
 echo $ECHO_N "checking for ut_addr_v6 field in utmpx.h... $ECHO_C" >&6
 	if eval "test \"\${$ossh_varname+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13857 "configure"
+#line 13866 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
 
@@ -13871,7 +13880,7 @@
 
 	ossh_result=`eval 'echo $'"$ossh_varname"`
 	if test -n "`echo $ossh_varname`"; then
-		echo "$as_me:13874: result: $ossh_result" >&5
+		echo "$as_me:13883: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
 		if test "x$ossh_result" = "xyes"; then
 			cat >>confdefs.h <<\EOF
@@ -13880,21 +13889,21 @@
 
 		fi
 	else
-		echo "$as_me:13883: result: no" >&5
+		echo "$as_me:13892: result: no" >&5
 echo "${ECHO_T}no" >&6
 	fi
 
 # look for field 'ut_exit' in header 'utmp.h'
 		ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"ut_exit
-	echo "$as_me:13890: checking for ut_exit field in utmp.h" >&5
+	echo "$as_me:13899: checking for ut_exit field in utmp.h" >&5
 echo $ECHO_N "checking for ut_exit field in utmp.h... $ECHO_C" >&6
 	if eval "test \"\${$ossh_varname+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13897 "configure"
+#line 13906 "configure"
 #include "confdefs.h"
 #include <utmp.h>
 
@@ -13911,7 +13920,7 @@
 
 	ossh_result=`eval 'echo $'"$ossh_varname"`
 	if test -n "`echo $ossh_varname`"; then
-		echo "$as_me:13914: result: $ossh_result" >&5
+		echo "$as_me:13923: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
 		if test "x$ossh_result" = "xyes"; then
 			cat >>confdefs.h <<\EOF
@@ -13920,21 +13929,21 @@
 
 		fi
 	else
-		echo "$as_me:13923: result: no" >&5
+		echo "$as_me:13932: result: no" >&5
 echo "${ECHO_T}no" >&6
 	fi
 
 # look for field 'ut_time' in header 'utmp.h'
 		ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"ut_time
-	echo "$as_me:13930: checking for ut_time field in utmp.h" >&5
+	echo "$as_me:13939: checking for ut_time field in utmp.h" >&5
 echo $ECHO_N "checking for ut_time field in utmp.h... $ECHO_C" >&6
 	if eval "test \"\${$ossh_varname+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13937 "configure"
+#line 13946 "configure"
 #include "confdefs.h"
 #include <utmp.h>
 
@@ -13951,7 +13960,7 @@
 
 	ossh_result=`eval 'echo $'"$ossh_varname"`
 	if test -n "`echo $ossh_varname`"; then
-		echo "$as_me:13954: result: $ossh_result" >&5
+		echo "$as_me:13963: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
 		if test "x$ossh_result" = "xyes"; then
 			cat >>confdefs.h <<\EOF
@@ -13960,21 +13969,21 @@
 
 		fi
 	else
-		echo "$as_me:13963: result: no" >&5
+		echo "$as_me:13972: result: no" >&5
 echo "${ECHO_T}no" >&6
 	fi
 
 # look for field 'ut_time' in header 'utmpx.h'
 		ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"ut_time
-	echo "$as_me:13970: checking for ut_time field in utmpx.h" >&5
+	echo "$as_me:13979: checking for ut_time field in utmpx.h" >&5
 echo $ECHO_N "checking for ut_time field in utmpx.h... $ECHO_C" >&6
 	if eval "test \"\${$ossh_varname+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13977 "configure"
+#line 13986 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
 
@@ -13991,7 +14000,7 @@
 
 	ossh_result=`eval 'echo $'"$ossh_varname"`
 	if test -n "`echo $ossh_varname`"; then
-		echo "$as_me:13994: result: $ossh_result" >&5
+		echo "$as_me:14003: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
 		if test "x$ossh_result" = "xyes"; then
 			cat >>confdefs.h <<\EOF
@@ -14000,21 +14009,21 @@
 
 		fi
 	else
-		echo "$as_me:14003: result: no" >&5
+		echo "$as_me:14012: result: no" >&5
 echo "${ECHO_T}no" >&6
 	fi
 
 # look for field 'ut_tv' in header 'utmpx.h'
 		ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'`
 		ossh_varname="ossh_cv_$ossh_safe""_has_"ut_tv
-	echo "$as_me:14010: checking for ut_tv field in utmpx.h" >&5
+	echo "$as_me:14019: checking for ut_tv field in utmpx.h" >&5
 echo $ECHO_N "checking for ut_tv field in utmpx.h... $ECHO_C" >&6
 	if eval "test \"\${$ossh_varname+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 14017 "configure"
+#line 14026 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
 
@@ -14031,7 +14040,7 @@
 
 	ossh_result=`eval 'echo $'"$ossh_varname"`
 	if test -n "`echo $ossh_varname`"; then
-		echo "$as_me:14034: result: $ossh_result" >&5
+		echo "$as_me:14043: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
 		if test "x$ossh_result" = "xyes"; then
 			cat >>confdefs.h <<\EOF
@@ -14040,17 +14049,17 @@
 
 		fi
 	else
-		echo "$as_me:14043: result: no" >&5
+		echo "$as_me:14052: result: no" >&5
 echo "${ECHO_T}no" >&6
 	fi
 
-echo "$as_me:14047: checking for struct stat.st_blksize" >&5
+echo "$as_me:14056: checking for struct stat.st_blksize" >&5
 echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6
 if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14053 "configure"
+#line 14062 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -14064,16 +14073,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14067: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14076: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14070: \$? = $ac_status" >&5
+  echo "$as_me:14079: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14073: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14082: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14076: \$? = $ac_status" >&5
+  echo "$as_me:14085: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_stat_st_blksize=yes
 else
@@ -14083,7 +14092,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:14086: result: $ac_cv_member_struct_stat_st_blksize" >&5
+echo "$as_me:14095: result: $ac_cv_member_struct_stat_st_blksize" >&5
 echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6
 if test $ac_cv_member_struct_stat_st_blksize = yes; then
 
@@ -14093,14 +14102,14 @@
 
 fi
 
-echo "$as_me:14096: checking for ss_family field in struct sockaddr_storage" >&5
+echo "$as_me:14105: checking for ss_family field in struct sockaddr_storage" >&5
 echo $ECHO_N "checking for ss_family field in struct sockaddr_storage... $ECHO_C" >&6
 if test "${ac_cv_have_ss_family_in_struct_ss+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 14103 "configure"
+#line 14112 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -14115,16 +14124,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14118: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14127: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14121: \$? = $ac_status" >&5
+  echo "$as_me:14130: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14124: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14133: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14127: \$? = $ac_status" >&5
+  echo "$as_me:14136: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_have_ss_family_in_struct_ss="yes"
 else
@@ -14135,7 +14144,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:14138: result: $ac_cv_have_ss_family_in_struct_ss" >&5
+echo "$as_me:14147: result: $ac_cv_have_ss_family_in_struct_ss" >&5
 echo "${ECHO_T}$ac_cv_have_ss_family_in_struct_ss" >&6
 if test "x$ac_cv_have_ss_family_in_struct_ss" = "xyes" ; then
 	cat >>confdefs.h <<\EOF
@@ -14144,14 +14153,14 @@
 
 fi
 
-echo "$as_me:14147: checking for __ss_family field in struct sockaddr_storage" >&5
+echo "$as_me:14156: checking for __ss_family field in struct sockaddr_storage" >&5
 echo $ECHO_N "checking for __ss_family field in struct sockaddr_storage... $ECHO_C" >&6
 if test "${ac_cv_have___ss_family_in_struct_ss+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 14154 "configure"
+#line 14163 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -14166,16 +14175,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14169: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14178: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14172: \$? = $ac_status" >&5
+  echo "$as_me:14181: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14175: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14184: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14178: \$? = $ac_status" >&5
+  echo "$as_me:14187: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_have___ss_family_in_struct_ss="yes"
 else
@@ -14187,7 +14196,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:14190: result: $ac_cv_have___ss_family_in_struct_ss" >&5
+echo "$as_me:14199: result: $ac_cv_have___ss_family_in_struct_ss" >&5
 echo "${ECHO_T}$ac_cv_have___ss_family_in_struct_ss" >&6
 if test "x$ac_cv_have___ss_family_in_struct_ss" = "xyes" ; then
 	cat >>confdefs.h <<\EOF
@@ -14196,14 +14205,14 @@
 
 fi
 
-echo "$as_me:14199: checking for pw_class field in struct passwd" >&5
+echo "$as_me:14208: checking for pw_class field in struct passwd" >&5
 echo $ECHO_N "checking for pw_class field in struct passwd... $ECHO_C" >&6
 if test "${ac_cv_have_pw_class_in_struct_passwd+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 14206 "configure"
+#line 14215 "configure"
 #include "confdefs.h"
 
 #include <pwd.h>
@@ -14217,16 +14226,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14220: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14229: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14223: \$? = $ac_status" >&5
+  echo "$as_me:14232: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14226: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14235: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14229: \$? = $ac_status" >&5
+  echo "$as_me:14238: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_have_pw_class_in_struct_passwd="yes"
 else
@@ -14238,7 +14247,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:14241: result: $ac_cv_have_pw_class_in_struct_passwd" >&5
+echo "$as_me:14250: result: $ac_cv_have_pw_class_in_struct_passwd" >&5
 echo "${ECHO_T}$ac_cv_have_pw_class_in_struct_passwd" >&6
 if test "x$ac_cv_have_pw_class_in_struct_passwd" = "xyes" ; then
 	cat >>confdefs.h <<\EOF
@@ -14247,14 +14256,14 @@
 
 fi
 
-echo "$as_me:14250: checking for pw_expire field in struct passwd" >&5
+echo "$as_me:14259: checking for pw_expire field in struct passwd" >&5
 echo $ECHO_N "checking for pw_expire field in struct passwd... $ECHO_C" >&6
 if test "${ac_cv_have_pw_expire_in_struct_passwd+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 14257 "configure"
+#line 14266 "configure"
 #include "confdefs.h"
 
 #include <pwd.h>
@@ -14268,16 +14277,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14271: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14280: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14274: \$? = $ac_status" >&5
+  echo "$as_me:14283: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14277: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14286: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14280: \$? = $ac_status" >&5
+  echo "$as_me:14289: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_have_pw_expire_in_struct_passwd="yes"
 else
@@ -14289,7 +14298,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:14292: result: $ac_cv_have_pw_expire_in_struct_passwd" >&5
+echo "$as_me:14301: result: $ac_cv_have_pw_expire_in_struct_passwd" >&5
 echo "${ECHO_T}$ac_cv_have_pw_expire_in_struct_passwd" >&6
 if test "x$ac_cv_have_pw_expire_in_struct_passwd" = "xyes" ; then
 	cat >>confdefs.h <<\EOF
@@ -14298,14 +14307,14 @@
 
 fi
 
-echo "$as_me:14301: checking for pw_change field in struct passwd" >&5
+echo "$as_me:14310: checking for pw_change field in struct passwd" >&5
 echo $ECHO_N "checking for pw_change field in struct passwd... $ECHO_C" >&6
 if test "${ac_cv_have_pw_change_in_struct_passwd+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 14308 "configure"
+#line 14317 "configure"
 #include "confdefs.h"
 
 #include <pwd.h>
@@ -14319,16 +14328,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14322: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14331: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14325: \$? = $ac_status" >&5
+  echo "$as_me:14334: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14328: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14337: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14331: \$? = $ac_status" >&5
+  echo "$as_me:14340: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_have_pw_change_in_struct_passwd="yes"
 else
@@ -14340,7 +14349,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:14343: result: $ac_cv_have_pw_change_in_struct_passwd" >&5
+echo "$as_me:14352: result: $ac_cv_have_pw_change_in_struct_passwd" >&5
 echo "${ECHO_T}$ac_cv_have_pw_change_in_struct_passwd" >&6
 if test "x$ac_cv_have_pw_change_in_struct_passwd" = "xyes" ; then
 	cat >>confdefs.h <<\EOF
@@ -14349,19 +14358,19 @@
 
 fi
 
-echo "$as_me:14352: checking for msg_accrights field in struct msghdr" >&5
+echo "$as_me:14361: checking for msg_accrights field in struct msghdr" >&5
 echo $ECHO_N "checking for msg_accrights field in struct msghdr... $ECHO_C" >&6
 if test "${ac_cv_have_accrights_in_msghdr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	if test "$cross_compiling" = yes; then
-  { { echo "$as_me:14359: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:14368: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14364 "configure"
+#line 14373 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -14378,15 +14387,15 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:14381: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14390: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14384: \$? = $ac_status" >&5
+  echo "$as_me:14393: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:14386: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14395: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14389: \$? = $ac_status" >&5
+  echo "$as_me:14398: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_have_accrights_in_msghdr="yes"
 else
@@ -14400,7 +14409,7 @@
 fi
 
 fi
-echo "$as_me:14403: result: $ac_cv_have_accrights_in_msghdr" >&5
+echo "$as_me:14412: result: $ac_cv_have_accrights_in_msghdr" >&5
 echo "${ECHO_T}$ac_cv_have_accrights_in_msghdr" >&6
 if test "x$ac_cv_have_accrights_in_msghdr" = "xyes" ; then
 	cat >>confdefs.h <<\EOF
@@ -14409,19 +14418,19 @@
 
 fi
 
-echo "$as_me:14412: checking for msg_control field in struct msghdr" >&5
+echo "$as_me:14421: checking for msg_control field in struct msghdr" >&5
 echo $ECHO_N "checking for msg_control field in struct msghdr... $ECHO_C" >&6
 if test "${ac_cv_have_control_in_msghdr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	if test "$cross_compiling" = yes; then
-  { { echo "$as_me:14419: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:14428: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14424 "configure"
+#line 14433 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -14438,15 +14447,15 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:14441: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14450: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14444: \$? = $ac_status" >&5
+  echo "$as_me:14453: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:14446: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14455: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14449: \$? = $ac_status" >&5
+  echo "$as_me:14458: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_have_control_in_msghdr="yes"
 else
@@ -14460,7 +14469,7 @@
 fi
 
 fi
-echo "$as_me:14463: result: $ac_cv_have_control_in_msghdr" >&5
+echo "$as_me:14472: result: $ac_cv_have_control_in_msghdr" >&5
 echo "${ECHO_T}$ac_cv_have_control_in_msghdr" >&6
 if test "x$ac_cv_have_control_in_msghdr" = "xyes" ; then
 	cat >>confdefs.h <<\EOF
@@ -14469,14 +14478,14 @@
 
 fi
 
-echo "$as_me:14472: checking if libc defines __progname" >&5
+echo "$as_me:14481: checking if libc defines __progname" >&5
 echo $ECHO_N "checking if libc defines __progname... $ECHO_C" >&6
 if test "${ac_cv_libc_defines___progname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 14479 "configure"
+#line 14488 "configure"
 #include "confdefs.h"
 
 int
@@ -14488,16 +14497,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14491: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14500: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14494: \$? = $ac_status" >&5
+  echo "$as_me:14503: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14497: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14506: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14500: \$? = $ac_status" >&5
+  echo "$as_me:14509: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_libc_defines___progname="yes"
 else
@@ -14509,7 +14518,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:14512: result: $ac_cv_libc_defines___progname" >&5
+echo "$as_me:14521: result: $ac_cv_libc_defines___progname" >&5
 echo "${ECHO_T}$ac_cv_libc_defines___progname" >&6
 if test "x$ac_cv_libc_defines___progname" = "xyes" ; then
 	cat >>confdefs.h <<\EOF
@@ -14518,14 +14527,14 @@
 
 fi
 
-echo "$as_me:14521: checking whether $CC implements __FUNCTION__" >&5
+echo "$as_me:14530: checking whether $CC implements __FUNCTION__" >&5
 echo $ECHO_N "checking whether $CC implements __FUNCTION__... $ECHO_C" >&6
 if test "${ac_cv_cc_implements___FUNCTION__+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 14528 "configure"
+#line 14537 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14539,16 +14548,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14542: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14551: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14545: \$? = $ac_status" >&5
+  echo "$as_me:14554: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14548: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14557: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14551: \$? = $ac_status" >&5
+  echo "$as_me:14560: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_cc_implements___FUNCTION__="yes"
 else
@@ -14560,7 +14569,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:14563: result: $ac_cv_cc_implements___FUNCTION__" >&5
+echo "$as_me:14572: result: $ac_cv_cc_implements___FUNCTION__" >&5
 echo "${ECHO_T}$ac_cv_cc_implements___FUNCTION__" >&6
 if test "x$ac_cv_cc_implements___FUNCTION__" = "xyes" ; then
 	cat >>confdefs.h <<\EOF
@@ -14569,14 +14578,14 @@
 
 fi
 
-echo "$as_me:14572: checking whether $CC implements __func__" >&5
+echo "$as_me:14581: checking whether $CC implements __func__" >&5
 echo $ECHO_N "checking whether $CC implements __func__... $ECHO_C" >&6
 if test "${ac_cv_cc_implements___func__+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 14579 "configure"
+#line 14588 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14590,16 +14599,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14593: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14602: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14596: \$? = $ac_status" >&5
+  echo "$as_me:14605: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14599: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14608: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14602: \$? = $ac_status" >&5
+  echo "$as_me:14611: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_cc_implements___func__="yes"
 else
@@ -14611,7 +14620,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:14614: result: $ac_cv_cc_implements___func__" >&5
+echo "$as_me:14623: result: $ac_cv_cc_implements___func__" >&5
 echo "${ECHO_T}$ac_cv_cc_implements___func__" >&6
 if test "x$ac_cv_cc_implements___func__" = "xyes" ; then
 	cat >>confdefs.h <<\EOF
@@ -14620,14 +14629,14 @@
 
 fi
 
-echo "$as_me:14623: checking whether getopt has optreset support" >&5
+echo "$as_me:14632: checking whether getopt has optreset support" >&5
 echo $ECHO_N "checking whether getopt has optreset support... $ECHO_C" >&6
 if test "${ac_cv_have_getopt_optreset+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 14630 "configure"
+#line 14639 "configure"
 #include "confdefs.h"
 
 #include <getopt.h>
@@ -14641,16 +14650,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14644: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14653: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14647: \$? = $ac_status" >&5
+  echo "$as_me:14656: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14650: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14653: \$? = $ac_status" >&5
+  echo "$as_me:14662: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_have_getopt_optreset="yes"
 else
@@ -14662,7 +14671,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:14665: result: $ac_cv_have_getopt_optreset" >&5
+echo "$as_me:14674: result: $ac_cv_have_getopt_optreset" >&5
 echo "${ECHO_T}$ac_cv_have_getopt_optreset" >&6
 if test "x$ac_cv_have_getopt_optreset" = "xyes" ; then
 	cat >>confdefs.h <<\EOF
@@ -14671,14 +14680,14 @@
 
 fi
 
-echo "$as_me:14674: checking if libc defines sys_errlist" >&5
+echo "$as_me:14683: checking if libc defines sys_errlist" >&5
 echo $ECHO_N "checking if libc defines sys_errlist... $ECHO_C" >&6
 if test "${ac_cv_libc_defines_sys_errlist+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 14681 "configure"
+#line 14690 "configure"
 #include "confdefs.h"
 
 int
@@ -14690,16 +14699,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14693: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14702: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14696: \$? = $ac_status" >&5
+  echo "$as_me:14705: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14699: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14708: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14702: \$? = $ac_status" >&5
+  echo "$as_me:14711: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_libc_defines_sys_errlist="yes"
 else
@@ -14711,7 +14720,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:14714: result: $ac_cv_libc_defines_sys_errlist" >&5
+echo "$as_me:14723: result: $ac_cv_libc_defines_sys_errlist" >&5
 echo "${ECHO_T}$ac_cv_libc_defines_sys_errlist" >&6
 if test "x$ac_cv_libc_defines_sys_errlist" = "xyes" ; then
 	cat >>confdefs.h <<\EOF
@@ -14720,14 +14729,14 @@
 
 fi
 
-echo "$as_me:14723: checking if libc defines sys_nerr" >&5
+echo "$as_me:14732: checking if libc defines sys_nerr" >&5
 echo $ECHO_N "checking if libc defines sys_nerr... $ECHO_C" >&6
 if test "${ac_cv_libc_defines_sys_nerr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 14730 "configure"
+#line 14739 "configure"
 #include "confdefs.h"
 
 int
@@ -14739,16 +14748,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14742: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14751: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14745: \$? = $ac_status" >&5
+  echo "$as_me:14754: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14748: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14757: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14751: \$? = $ac_status" >&5
+  echo "$as_me:14760: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    ac_cv_libc_defines_sys_nerr="yes"
 else
@@ -14760,7 +14769,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:14763: result: $ac_cv_libc_defines_sys_nerr" >&5
+echo "$as_me:14772: result: $ac_cv_libc_defines_sys_nerr" >&5
 echo "${ECHO_T}$ac_cv_libc_defines_sys_nerr" >&6
 if test "x$ac_cv_libc_defines_sys_nerr" = "xyes" ; then
 	cat >>confdefs.h <<\EOF
@@ -14791,23 +14800,23 @@
 for ac_header in sectok.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:14794: checking for $ac_header" >&5
+echo "$as_me:14803: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14800 "configure"
+#line 14809 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:14804: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14813: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:14810: \$? = $ac_status" >&5
+  echo "$as_me:14819: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -14826,7 +14835,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:14829: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:14838: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -14837,12 +14846,12 @@
 done
 
 			if test "$ac_cv_header_sectok_h" != yes; then
-				{ { echo "$as_me:14840: error: Can't find sectok.h" >&5
+				{ { echo "$as_me:14849: error: Can't find sectok.h" >&5
 echo "$as_me: error: Can't find sectok.h" >&2;}
    { (exit 1); exit 1; }; }
 			fi
 
-echo "$as_me:14845: checking for sectok_open in -lsectok" >&5
+echo "$as_me:14854: checking for sectok_open in -lsectok" >&5
 echo $ECHO_N "checking for sectok_open in -lsectok... $ECHO_C" >&6
 if test "${ac_cv_lib_sectok_sectok_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14850,7 +14859,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsectok  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14853 "configure"
+#line 14862 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14869,16 +14878,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14872: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14881: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14875: \$? = $ac_status" >&5
+  echo "$as_me:14884: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14878: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14887: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14881: \$? = $ac_status" >&5
+  echo "$as_me:14890: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_sectok_sectok_open=yes
 else
@@ -14889,7 +14898,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14892: result: $ac_cv_lib_sectok_sectok_open" >&5
+echo "$as_me:14901: result: $ac_cv_lib_sectok_sectok_open" >&5
 echo "${ECHO_T}$ac_cv_lib_sectok_sectok_open" >&6
 if test $ac_cv_lib_sectok_sectok_open = yes; then
   cat >>confdefs.h <<EOF
@@ -14901,7 +14910,7 @@
 fi
 
 			if test "$ac_cv_lib_sectok_sectok_open" != yes; then
-				{ { echo "$as_me:14904: error: Can't find libsectok" >&5
+				{ { echo "$as_me:14913: error: Can't find libsectok" >&5
 echo "$as_me: error: Can't find libsectok" >&2;}
    { (exit 1); exit 1; }; }
 			fi
@@ -14931,7 +14940,7 @@
   OPENSC_CONFIG=$opensc_config_prefix/bin/opensc-config
   # Extract the first word of "opensc-config", so it can be a program name with args.
 set dummy opensc-config; ac_word=$2
-echo "$as_me:14934: checking for $ac_word" >&5
+echo "$as_me:14943: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_OPENSC_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14948,7 +14957,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_OPENSC_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:14951: found $ac_dir/$ac_word" >&5
+   echo "$as_me:14960: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -14960,10 +14969,10 @@
 OPENSC_CONFIG=$ac_cv_path_OPENSC_CONFIG
 
 if test -n "$OPENSC_CONFIG"; then
-  echo "$as_me:14963: result: $OPENSC_CONFIG" >&5
+  echo "$as_me:14972: result: $OPENSC_CONFIG" >&5
 echo "${ECHO_T}$OPENSC_CONFIG" >&6
 else
-  echo "$as_me:14966: result: no" >&5
+  echo "$as_me:14975: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -14985,7 +14994,7 @@
 fi
 
 # Check libraries needed by DNS fingerprint support
-echo "$as_me:14988: checking for library containing getrrsetbyname" >&5
+echo "$as_me:14997: checking for library containing getrrsetbyname" >&5
 echo $ECHO_N "checking for library containing getrrsetbyname... $ECHO_C" >&6
 if test "${ac_cv_search_getrrsetbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14993,7 +15002,7 @@
   ac_func_search_save_LIBS=$LIBS
 ac_cv_search_getrrsetbyname=no
 cat >conftest.$ac_ext <<_ACEOF
-#line 14996 "configure"
+#line 15005 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15012,16 +15021,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15015: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15024: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15018: \$? = $ac_status" >&5
+  echo "$as_me:15027: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15021: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15030: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15024: \$? = $ac_status" >&5
+  echo "$as_me:15033: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_getrrsetbyname="none required"
 else
@@ -15033,7 +15042,7 @@
   for ac_lib in resolv; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
-#line 15036 "configure"
+#line 15045 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15052,16 +15061,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15055: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15064: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15058: \$? = $ac_status" >&5
+  echo "$as_me:15067: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15061: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15070: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15064: \$? = $ac_status" >&5
+  echo "$as_me:15073: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_getrrsetbyname="-l$ac_lib"
 break
@@ -15074,7 +15083,7 @@
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:15077: result: $ac_cv_search_getrrsetbyname" >&5
+echo "$as_me:15086: result: $ac_cv_search_getrrsetbyname" >&5
 echo "${ECHO_T}$ac_cv_search_getrrsetbyname" >&6
 if test "$ac_cv_search_getrrsetbyname" != no; then
   test "$ac_cv_search_getrrsetbyname" = "none required" || LIBS="$ac_cv_search_getrrsetbyname $LIBS"
@@ -15085,7 +15094,7 @@
 else
 
 		# Needed by our getrrsetbyname()
-		echo "$as_me:15088: checking for library containing res_query" >&5
+		echo "$as_me:15097: checking for library containing res_query" >&5
 echo $ECHO_N "checking for library containing res_query... $ECHO_C" >&6
 if test "${ac_cv_search_res_query+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15093,7 +15102,7 @@
   ac_func_search_save_LIBS=$LIBS
 ac_cv_search_res_query=no
 cat >conftest.$ac_ext <<_ACEOF
-#line 15096 "configure"
+#line 15105 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15112,16 +15121,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15115: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15124: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15118: \$? = $ac_status" >&5
+  echo "$as_me:15127: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15121: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15130: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15124: \$? = $ac_status" >&5
+  echo "$as_me:15133: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_res_query="none required"
 else
@@ -15133,7 +15142,7 @@
   for ac_lib in resolv; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
-#line 15136 "configure"
+#line 15145 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15152,16 +15161,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15155: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15164: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15158: \$? = $ac_status" >&5
+  echo "$as_me:15167: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15161: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15170: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15164: \$? = $ac_status" >&5
+  echo "$as_me:15173: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_res_query="-l$ac_lib"
 break
@@ -15174,14 +15183,14 @@
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:15177: result: $ac_cv_search_res_query" >&5
+echo "$as_me:15186: result: $ac_cv_search_res_query" >&5
 echo "${ECHO_T}$ac_cv_search_res_query" >&6
 if test "$ac_cv_search_res_query" != no; then
   test "$ac_cv_search_res_query" = "none required" || LIBS="$ac_cv_search_res_query $LIBS"
 
 fi
 
-		echo "$as_me:15184: checking for library containing dn_expand" >&5
+		echo "$as_me:15193: checking for library containing dn_expand" >&5
 echo $ECHO_N "checking for library containing dn_expand... $ECHO_C" >&6
 if test "${ac_cv_search_dn_expand+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15189,7 +15198,7 @@
   ac_func_search_save_LIBS=$LIBS
 ac_cv_search_dn_expand=no
 cat >conftest.$ac_ext <<_ACEOF
-#line 15192 "configure"
+#line 15201 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15208,16 +15217,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15211: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15220: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15214: \$? = $ac_status" >&5
+  echo "$as_me:15223: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15217: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15226: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15220: \$? = $ac_status" >&5
+  echo "$as_me:15229: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_dn_expand="none required"
 else
@@ -15229,7 +15238,7 @@
   for ac_lib in resolv; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
-#line 15232 "configure"
+#line 15241 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15248,16 +15257,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15251: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15260: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15254: \$? = $ac_status" >&5
+  echo "$as_me:15263: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15257: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15266: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15260: \$? = $ac_status" >&5
+  echo "$as_me:15269: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_dn_expand="-l$ac_lib"
 break
@@ -15270,7 +15279,7 @@
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:15273: result: $ac_cv_search_dn_expand" >&5
+echo "$as_me:15282: result: $ac_cv_search_dn_expand" >&5
 echo "${ECHO_T}$ac_cv_search_dn_expand" >&6
 if test "$ac_cv_search_dn_expand" != no; then
   test "$ac_cv_search_dn_expand" = "none required" || LIBS="$ac_cv_search_dn_expand $LIBS"
@@ -15280,13 +15289,13 @@
 for ac_func in _getshort _getlong
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15283: checking for $ac_func" >&5
+echo "$as_me:15292: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15289 "configure"
+#line 15298 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -15317,16 +15326,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15320: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15329: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15323: \$? = $ac_status" >&5
+  echo "$as_me:15332: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15326: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15335: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15329: \$? = $ac_status" >&5
+  echo "$as_me:15338: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15336,7 +15345,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:15339: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:15348: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -15346,13 +15355,13 @@
 fi
 done
 
-		echo "$as_me:15349: checking for HEADER.ad" >&5
+		echo "$as_me:15358: checking for HEADER.ad" >&5
 echo $ECHO_N "checking for HEADER.ad... $ECHO_C" >&6
 if test "${ac_cv_member_HEADER_ad+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15355 "configure"
+#line 15364 "configure"
 #include "confdefs.h"
 #include <arpa/nameser.h>
 
@@ -15367,16 +15376,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15370: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15379: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15373: \$? = $ac_status" >&5
+  echo "$as_me:15382: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15376: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15385: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15379: \$? = $ac_status" >&5
+  echo "$as_me:15388: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_HEADER_ad=yes
 else
@@ -15386,7 +15395,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:15389: result: $ac_cv_member_HEADER_ad" >&5
+echo "$as_me:15398: result: $ac_cv_member_HEADER_ad" >&5
 echo "${ECHO_T}$ac_cv_member_HEADER_ad" >&6
 if test $ac_cv_member_HEADER_ad = yes; then
   cat >>confdefs.h <<\EOF
@@ -15416,17 +15425,17 @@
 
 		KRB5_MSG="yes"
 
-		echo "$as_me:15419: checking for krb5-config" >&5
+		echo "$as_me:15428: checking for krb5-config" >&5
 echo $ECHO_N "checking for krb5-config... $ECHO_C" >&6
 		if test -x  $KRB5ROOT/bin/krb5-config ; then
 			KRB5CONF=$KRB5ROOT/bin/krb5-config
-			echo "$as_me:15423: result: $KRB5CONF" >&5
+			echo "$as_me:15432: result: $KRB5CONF" >&5
 echo "${ECHO_T}$KRB5CONF" >&6
 
-			echo "$as_me:15426: checking for gssapi support" >&5
+			echo "$as_me:15435: checking for gssapi support" >&5
 echo $ECHO_N "checking for gssapi support... $ECHO_C" >&6
 			if $KRB5CONF | grep gssapi >/dev/null ; then
-				echo "$as_me:15429: result: yes" >&5
+				echo "$as_me:15438: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 				cat >>confdefs.h <<\EOF
 #define GSSAPI 1
@@ -15434,17 +15443,17 @@
 
 				k5confopts=gssapi
 			else
-				echo "$as_me:15437: result: no" >&5
+				echo "$as_me:15446: result: no" >&5
 echo "${ECHO_T}no" >&6
 				k5confopts=""
 			fi
 			K5CFLAGS="`$KRB5CONF --cflags $k5confopts`"
 			K5LIBS="`$KRB5CONF --libs $k5confopts`"
 			CPPFLAGS="$CPPFLAGS $K5CFLAGS"
-			echo "$as_me:15444: checking whether we are using Heimdal" >&5
+			echo "$as_me:15453: checking whether we are using Heimdal" >&5
 echo $ECHO_N "checking whether we are using Heimdal... $ECHO_C" >&6
 			cat >conftest.$ac_ext <<_ACEOF
-#line 15447 "configure"
+#line 15456 "configure"
 #include "confdefs.h"
  #include <krb5.h>
 int
@@ -15456,18 +15465,18 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15459: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15468: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15462: \$? = $ac_status" >&5
+  echo "$as_me:15471: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15465: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15474: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15468: \$? = $ac_status" >&5
+  echo "$as_me:15477: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-   echo "$as_me:15470: result: yes" >&5
+   echo "$as_me:15479: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 					 cat >>confdefs.h <<\EOF
 #define HEIMDAL 1
@@ -15476,20 +15485,20 @@
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:15479: result: no" >&5
+echo "$as_me:15488: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 		else
-			echo "$as_me:15485: result: no" >&5
+			echo "$as_me:15494: result: no" >&5
 echo "${ECHO_T}no" >&6
 			CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include"
 			LDFLAGS="$LDFLAGS -L${KRB5ROOT}/lib"
-			echo "$as_me:15489: checking whether we are using Heimdal" >&5
+			echo "$as_me:15498: checking whether we are using Heimdal" >&5
 echo $ECHO_N "checking whether we are using Heimdal... $ECHO_C" >&6
 			cat >conftest.$ac_ext <<_ACEOF
-#line 15492 "configure"
+#line 15501 "configure"
 #include "confdefs.h"
  #include <krb5.h>
 int
@@ -15501,18 +15510,18 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15504: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15513: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15507: \$? = $ac_status" >&5
+  echo "$as_me:15516: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15510: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15519: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15513: \$? = $ac_status" >&5
+  echo "$as_me:15522: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-   echo "$as_me:15515: result: yes" >&5
+   echo "$as_me:15524: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 					 cat >>confdefs.h <<\EOF
 #define HEIMDAL 1
@@ -15523,13 +15532,13 @@
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:15526: result: no" >&5
+ echo "$as_me:15535: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 K5LIBS="-lkrb5 -lk5crypto -lcom_err"
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-			echo "$as_me:15532: checking for library containing dn_expand" >&5
+			echo "$as_me:15541: checking for library containing dn_expand" >&5
 echo $ECHO_N "checking for library containing dn_expand... $ECHO_C" >&6
 if test "${ac_cv_search_dn_expand+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15537,7 +15546,7 @@
   ac_func_search_save_LIBS=$LIBS
 ac_cv_search_dn_expand=no
 cat >conftest.$ac_ext <<_ACEOF
-#line 15540 "configure"
+#line 15549 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15556,16 +15565,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15559: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15568: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15562: \$? = $ac_status" >&5
+  echo "$as_me:15571: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15565: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15574: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15568: \$? = $ac_status" >&5
+  echo "$as_me:15577: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_dn_expand="none required"
 else
@@ -15577,7 +15586,7 @@
   for ac_lib in resolv; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
-#line 15580 "configure"
+#line 15589 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15596,16 +15605,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15599: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15608: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15602: \$? = $ac_status" >&5
+  echo "$as_me:15611: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15605: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15614: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15608: \$? = $ac_status" >&5
+  echo "$as_me:15617: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_dn_expand="-l$ac_lib"
 break
@@ -15618,14 +15627,14 @@
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:15621: result: $ac_cv_search_dn_expand" >&5
+echo "$as_me:15630: result: $ac_cv_search_dn_expand" >&5
 echo "${ECHO_T}$ac_cv_search_dn_expand" >&6
 if test "$ac_cv_search_dn_expand" != no; then
   test "$ac_cv_search_dn_expand" = "none required" || LIBS="$ac_cv_search_dn_expand $LIBS"
 
 fi
 
-			echo "$as_me:15628: checking for gss_init_sec_context in -lgssapi" >&5
+			echo "$as_me:15637: checking for gss_init_sec_context in -lgssapi" >&5
 echo $ECHO_N "checking for gss_init_sec_context in -lgssapi... $ECHO_C" >&6
 if test "${ac_cv_lib_gssapi_gss_init_sec_context+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15633,7 +15642,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgssapi $K5LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15636 "configure"
+#line 15645 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15652,16 +15661,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15655: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15664: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15658: \$? = $ac_status" >&5
+  echo "$as_me:15667: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15661: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15670: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15664: \$? = $ac_status" >&5
+  echo "$as_me:15673: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gssapi_gss_init_sec_context=yes
 else
@@ -15672,7 +15681,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15675: result: $ac_cv_lib_gssapi_gss_init_sec_context" >&5
+echo "$as_me:15684: result: $ac_cv_lib_gssapi_gss_init_sec_context" >&5
 echo "${ECHO_T}$ac_cv_lib_gssapi_gss_init_sec_context" >&6
 if test $ac_cv_lib_gssapi_gss_init_sec_context = yes; then
    cat >>confdefs.h <<\EOF
@@ -15681,7 +15690,7 @@
 
 				  K5LIBS="-lgssapi $K5LIBS"
 else
-   echo "$as_me:15684: checking for gss_init_sec_context in -lgssapi_krb5" >&5
+   echo "$as_me:15693: checking for gss_init_sec_context in -lgssapi_krb5" >&5
 echo $ECHO_N "checking for gss_init_sec_context in -lgssapi_krb5... $ECHO_C" >&6
 if test "${ac_cv_lib_gssapi_krb5_gss_init_sec_context+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15689,7 +15698,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgssapi_krb5 $K5LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15692 "configure"
+#line 15701 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15708,16 +15717,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15711: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15720: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15714: \$? = $ac_status" >&5
+  echo "$as_me:15723: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15717: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15726: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15720: \$? = $ac_status" >&5
+  echo "$as_me:15729: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gssapi_krb5_gss_init_sec_context=yes
 else
@@ -15728,7 +15737,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15731: result: $ac_cv_lib_gssapi_krb5_gss_init_sec_context" >&5
+echo "$as_me:15740: result: $ac_cv_lib_gssapi_krb5_gss_init_sec_context" >&5
 echo "${ECHO_T}$ac_cv_lib_gssapi_krb5_gss_init_sec_context" >&6
 if test $ac_cv_lib_gssapi_krb5_gss_init_sec_context = yes; then
    cat >>confdefs.h <<\EOF
@@ -15737,29 +15746,29 @@
 
 					  K5LIBS="-lgssapi_krb5 $K5LIBS"
 else
-  { echo "$as_me:15740: WARNING: Cannot find any suitable gss-api library - build may fail" >&5
+  { echo "$as_me:15749: WARNING: Cannot find any suitable gss-api library - build may fail" >&5
 echo "$as_me: WARNING: Cannot find any suitable gss-api library - build may fail" >&2;}
 fi
 
 fi
 
-			echo "$as_me:15746: checking for gssapi.h" >&5
+			echo "$as_me:15755: checking for gssapi.h" >&5
 echo $ECHO_N "checking for gssapi.h... $ECHO_C" >&6
 if test "${ac_cv_header_gssapi_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15752 "configure"
+#line 15761 "configure"
 #include "confdefs.h"
 #include <gssapi.h>
 _ACEOF
-if { (eval echo "$as_me:15756: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15765: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15762: \$? = $ac_status" >&5
+  echo "$as_me:15771: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15778,7 +15787,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:15781: result: $ac_cv_header_gssapi_h" >&5
+echo "$as_me:15790: result: $ac_cv_header_gssapi_h" >&5
 echo "${ECHO_T}$ac_cv_header_gssapi_h" >&6
 if test $ac_cv_header_gssapi_h = yes; then
   :
@@ -15789,23 +15798,23 @@
 for ac_header in gssapi.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:15792: checking for $ac_header" >&5
+echo "$as_me:15801: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15798 "configure"
+#line 15807 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:15802: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15811: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15808: \$? = $ac_status" >&5
+  echo "$as_me:15817: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15824,7 +15833,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:15827: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:15836: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -15832,7 +15841,7 @@
 EOF
 
 else
-  { echo "$as_me:15835: WARNING: Cannot find any suitable gss-api header - build may fail" >&5
+  { echo "$as_me:15844: WARNING: Cannot find any suitable gss-api header - build may fail" >&5
 echo "$as_me: WARNING: Cannot find any suitable gss-api header - build may fail" >&2;}
 
 fi
@@ -15842,23 +15851,23 @@
 
 			oldCPP="$CPPFLAGS"
 			CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include/gssapi"
-			echo "$as_me:15845: checking for gssapi_krb5.h" >&5
+			echo "$as_me:15854: checking for gssapi_krb5.h" >&5
 echo $ECHO_N "checking for gssapi_krb5.h... $ECHO_C" >&6
 if test "${ac_cv_header_gssapi_krb5_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15851 "configure"
+#line 15860 "configure"
 #include "confdefs.h"
 #include <gssapi_krb5.h>
 _ACEOF
-if { (eval echo "$as_me:15855: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15864: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15861: \$? = $ac_status" >&5
+  echo "$as_me:15870: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15877,7 +15886,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:15880: result: $ac_cv_header_gssapi_krb5_h" >&5
+echo "$as_me:15889: result: $ac_cv_header_gssapi_krb5_h" >&5
 echo "${ECHO_T}$ac_cv_header_gssapi_krb5_h" >&6
 if test $ac_cv_header_gssapi_krb5_h = yes; then
   :
@@ -15897,23 +15906,23 @@
 for ac_header in gssapi.h gssapi/gssapi.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:15900: checking for $ac_header" >&5
+echo "$as_me:15909: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15906 "configure"
+#line 15915 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:15910: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15919: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15916: \$? = $ac_status" >&5
+  echo "$as_me:15925: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15932,7 +15941,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:15935: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:15944: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -15945,23 +15954,23 @@
 for ac_header in gssapi_krb5.h gssapi/gssapi_krb5.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:15948: checking for $ac_header" >&5
+echo "$as_me:15957: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15954 "configure"
+#line 15963 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:15958: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15967: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15964: \$? = $ac_status" >&5
+  echo "$as_me:15973: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15980,7 +15989,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:15983: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:15992: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -15993,23 +16002,23 @@
 for ac_header in gssapi_generic.h gssapi/gssapi_generic.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:15996: checking for $ac_header" >&5
+echo "$as_me:16005: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16002 "configure"
+#line 16011 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:16006: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:16015: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:16012: \$? = $ac_status" >&5
+  echo "$as_me:16021: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16028,7 +16037,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:16031: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:16040: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -16039,7 +16048,7 @@
 done
 
 	LIBS="$LIBS $K5LIBS"
-	echo "$as_me:16042: checking for library containing k_hasafs" >&5
+	echo "$as_me:16051: checking for library containing k_hasafs" >&5
 echo $ECHO_N "checking for library containing k_hasafs... $ECHO_C" >&6
 if test "${ac_cv_search_k_hasafs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16047,7 +16056,7 @@
   ac_func_search_save_LIBS=$LIBS
 ac_cv_search_k_hasafs=no
 cat >conftest.$ac_ext <<_ACEOF
-#line 16050 "configure"
+#line 16059 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16066,16 +16075,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16069: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16078: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16072: \$? = $ac_status" >&5
+  echo "$as_me:16081: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16075: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16084: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16078: \$? = $ac_status" >&5
+  echo "$as_me:16087: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_k_hasafs="none required"
 else
@@ -16087,7 +16096,7 @@
   for ac_lib in kafs; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
-#line 16090 "configure"
+#line 16099 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16106,16 +16115,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16109: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16118: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16112: \$? = $ac_status" >&5
+  echo "$as_me:16121: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16115: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16124: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16118: \$? = $ac_status" >&5
+  echo "$as_me:16127: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_k_hasafs="-l$ac_lib"
 break
@@ -16128,7 +16137,7 @@
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:16131: result: $ac_cv_search_k_hasafs" >&5
+echo "$as_me:16140: result: $ac_cv_search_k_hasafs" >&5
 echo "${ECHO_T}$ac_cv_search_k_hasafs" >&6
 if test "$ac_cv_search_k_hasafs" != no; then
   test "$ac_cv_search_k_hasafs" = "none required" || LIBS="$ac_cv_search_k_hasafs $LIBS"
@@ -16138,7 +16147,7 @@
 
 fi
 
-	echo "$as_me:16141: checking for library containing krb5_init_ets" >&5
+	echo "$as_me:16150: checking for library containing krb5_init_ets" >&5
 echo $ECHO_N "checking for library containing krb5_init_ets... $ECHO_C" >&6
 if test "${ac_cv_search_krb5_init_ets+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16146,7 +16155,7 @@
   ac_func_search_save_LIBS=$LIBS
 ac_cv_search_krb5_init_ets=no
 cat >conftest.$ac_ext <<_ACEOF
-#line 16149 "configure"
+#line 16158 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16165,16 +16174,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16168: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16177: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16171: \$? = $ac_status" >&5
+  echo "$as_me:16180: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16174: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16183: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16177: \$? = $ac_status" >&5
+  echo "$as_me:16186: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_krb5_init_ets="none required"
 else
@@ -16186,7 +16195,7 @@
   for ac_lib in $K5LIBS; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
-#line 16189 "configure"
+#line 16198 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16205,16 +16214,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16208: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16217: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16211: \$? = $ac_status" >&5
+  echo "$as_me:16220: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16214: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16223: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16217: \$? = $ac_status" >&5
+  echo "$as_me:16226: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_krb5_init_ets="-l$ac_lib"
 break
@@ -16227,7 +16236,7 @@
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:16230: result: $ac_cv_search_krb5_init_ets" >&5
+echo "$as_me:16239: result: $ac_cv_search_krb5_init_ets" >&5
 echo "${ECHO_T}$ac_cv_search_krb5_init_ets" >&6
 if test "$ac_cv_search_krb5_init_ets" != no; then
   test "$ac_cv_search_krb5_init_ets" = "none required" || LIBS="$ac_cv_search_krb5_init_ets $LIBS"
@@ -16270,7 +16279,7 @@
 		TestPath="${TestPath}${PATH_SEPARATOR}/usr/openwin/bin"
 		# Extract the first word of "xauth", so it can be a program name with args.
 set dummy xauth; ac_word=$2
-echo "$as_me:16273: checking for $ac_word" >&5
+echo "$as_me:16282: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_xauth_path+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16287,7 +16296,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_xauth_path="$ac_dir/$ac_word"
-   echo "$as_me:16290: found $ac_dir/$ac_word" >&5
+   echo "$as_me:16299: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -16298,10 +16307,10 @@
 xauth_path=$ac_cv_path_xauth_path
 
 if test -n "$xauth_path"; then
-  echo "$as_me:16301: result: $xauth_path" >&5
+  echo "$as_me:16310: result: $xauth_path" >&5
 echo "${ECHO_T}$xauth_path" >&6
 else
-  echo "$as_me:16304: result: no" >&5
+  echo "$as_me:16313: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -16345,13 +16354,13 @@
 
 if test -z "$no_dev_ptmx" ; then
 	if test "x$disable_ptmx_check" != "xyes" ; then
-		echo "$as_me:16348: checking for \"/dev/ptmx\"" >&5
+		echo "$as_me:16357: checking for \"/dev/ptmx\"" >&5
 echo $ECHO_N "checking for \"/dev/ptmx\"... $ECHO_C" >&6
 if test "${ac_cv_file___dev_ptmx_+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:16354: error: cannot check for file existence when cross compiling" >&5
+  { { echo "$as_me:16363: error: cannot check for file existence when cross compiling" >&5
 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r ""/dev/ptmx""; then
@@ -16360,7 +16369,7 @@
   ac_cv_file___dev_ptmx_=no
 fi
 fi
-echo "$as_me:16363: result: $ac_cv_file___dev_ptmx_" >&5
+echo "$as_me:16372: result: $ac_cv_file___dev_ptmx_" >&5
 echo "${ECHO_T}$ac_cv_file___dev_ptmx_" >&6
 if test $ac_cv_file___dev_ptmx_ = yes; then
 
@@ -16374,13 +16383,13 @@
 
 	fi
 fi
-echo "$as_me:16377: checking for \"/dev/ptc\"" >&5
+echo "$as_me:16386: checking for \"/dev/ptc\"" >&5
 echo $ECHO_N "checking for \"/dev/ptc\"... $ECHO_C" >&6
 if test "${ac_cv_file___dev_ptc_+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:16383: error: cannot check for file existence when cross compiling" >&5
+  { { echo "$as_me:16392: error: cannot check for file existence when cross compiling" >&5
 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r ""/dev/ptc""; then
@@ -16389,7 +16398,7 @@
   ac_cv_file___dev_ptc_=no
 fi
 fi
-echo "$as_me:16392: result: $ac_cv_file___dev_ptc_" >&5
+echo "$as_me:16401: result: $ac_cv_file___dev_ptc_" >&5
 echo "${ECHO_T}$ac_cv_file___dev_ptc_" >&6
 if test $ac_cv_file___dev_ptc_ = yes; then
 
@@ -16412,7 +16421,7 @@
 			MANTYPE=$withval
 			;;
 		*)
-			{ { echo "$as_me:16415: error: invalid man type: $withval" >&5
+			{ { echo "$as_me:16424: error: invalid man type: $withval" >&5
 echo "$as_me: error: invalid man type: $withval" >&2;}
    { (exit 1); exit 1; }; }
 			;;
@@ -16425,7 +16434,7 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:16428: checking for $ac_word" >&5
+echo "$as_me:16437: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_NROFF+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16442,7 +16451,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_NROFF="$ac_dir/$ac_word"
-   echo "$as_me:16445: found $ac_dir/$ac_word" >&5
+   echo "$as_me:16454: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -16453,10 +16462,10 @@
 NROFF=$ac_cv_path_NROFF
 
 if test -n "$NROFF"; then
-  echo "$as_me:16456: result: $NROFF" >&5
+  echo "$as_me:16465: result: $NROFF" >&5
 echo "${ECHO_T}$NROFF" >&6
 else
-  echo "$as_me:16459: result: no" >&5
+  echo "$as_me:16468: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -16513,10 +16522,10 @@
 fi;
 
 if test -z "$disable_shadow" ; then
-	echo "$as_me:16516: checking if the systems has expire shadow information" >&5
+	echo "$as_me:16525: checking if the systems has expire shadow information" >&5
 echo $ECHO_N "checking if the systems has expire shadow information... $ECHO_C" >&6
 	cat >conftest.$ac_ext <<_ACEOF
-#line 16519 "configure"
+#line 16528 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16532,16 +16541,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16535: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16544: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16538: \$? = $ac_status" >&5
+  echo "$as_me:16547: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16541: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16550: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16544: \$? = $ac_status" >&5
+  echo "$as_me:16553: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    sp_expire_available=yes
 else
@@ -16552,14 +16561,14 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "x$sp_expire_available" = "xyes" ; then
-		echo "$as_me:16555: result: yes" >&5
+		echo "$as_me:16564: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 		cat >>confdefs.h <<\EOF
 #define HAS_SHADOW_EXPIRE 1
 EOF
 
 	else
-		echo "$as_me:16562: result: no" >&5
+		echo "$as_me:16571: result: no" >&5
 echo "${ECHO_T}no" >&6
 	fi
 fi
@@ -16596,13 +16605,13 @@
 
 else
 
-echo "$as_me:16599: checking for \"/etc/default/login\"" >&5
+echo "$as_me:16608: checking for \"/etc/default/login\"" >&5
 echo $ECHO_N "checking for \"/etc/default/login\"... $ECHO_C" >&6
 if test "${ac_cv_file___etc_default_login_+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:16605: error: cannot check for file existence when cross compiling" >&5
+  { { echo "$as_me:16614: error: cannot check for file existence when cross compiling" >&5
 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r ""/etc/default/login""; then
@@ -16611,7 +16620,7 @@
   ac_cv_file___etc_default_login_=no
 fi
 fi
-echo "$as_me:16614: result: $ac_cv_file___etc_default_login_" >&5
+echo "$as_me:16623: result: $ac_cv_file___etc_default_login_" >&5
 echo "${ECHO_T}$ac_cv_file___etc_default_login_" >&6
 if test $ac_cv_file___etc_default_login_ = yes; then
    external_path_file=/etc/default/login
@@ -16639,7 +16648,7 @@
   withval="$with_default_path"
 
 		if test "x$external_path_file" = "x/etc/login.conf" ; then
-			{ echo "$as_me:16642: WARNING:
+			{ echo "$as_me:16651: WARNING:
 --with-default-path=PATH has no effect on this system.
 Edit /etc/login.conf instead." >&5
 echo "$as_me: WARNING:
@@ -16647,7 +16656,7 @@
 Edit /etc/login.conf instead." >&2;}
 		elif test "x$withval" != "xno" ; then
 			if test ! -z "$external_path_file" ; then
-				{ echo "$as_me:16650: WARNING:
+				{ echo "$as_me:16659: WARNING:
 --with-default-path=PATH will only be used if PATH is not defined in
 $external_path_file ." >&5
 echo "$as_me: WARNING:
@@ -16660,11 +16669,11 @@
 
 else
    if test "x$external_path_file" = "x/etc/login.conf" ; then
-		{ echo "$as_me:16663: WARNING: Make sure the path to scp is in /etc/login.conf" >&5
+		{ echo "$as_me:16672: WARNING: Make sure the path to scp is in /etc/login.conf" >&5
 echo "$as_me: WARNING: Make sure the path to scp is in /etc/login.conf" >&2;}
 	else
 		if test ! -z "$external_path_file" ; then
-			{ echo "$as_me:16667: WARNING:
+			{ echo "$as_me:16676: WARNING:
 If PATH is defined in $external_path_file, ensure the path to scp is included,
 otherwise scp will not work." >&5
 echo "$as_me: WARNING:
@@ -16676,7 +16685,7 @@
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16679 "configure"
+#line 16688 "configure"
 #include "confdefs.h"
 
 /* find out what STDPATH is */
@@ -16713,15 +16722,15 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:16716: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16725: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16719: \$? = $ac_status" >&5
+  echo "$as_me:16728: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:16721: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16730: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16724: \$? = $ac_status" >&5
+  echo "$as_me:16733: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
    user_path=`cat conftest.stdpath`
 else
@@ -16745,7 +16754,7 @@
 			echo $user_path | grep "^$t_bindir"  > /dev/null 2>&1
 			if test $? -ne 0  ; then
 				user_path=$user_path:$t_bindir
-				echo "$as_me:16748: result: Adding $t_bindir to USER_PATH so scp will work" >&5
+				echo "$as_me:16757: result: Adding $t_bindir to USER_PATH so scp will work" >&5
 echo "${ECHO_T}Adding $t_bindir to USER_PATH so scp will work" >&6
 			fi
 		fi
@@ -16775,7 +16784,7 @@
 
 fi;
 
-echo "$as_me:16778: checking if we need to convert IPv4 in IPv6-mapped addresses" >&5
+echo "$as_me:16787: checking if we need to convert IPv4 in IPv6-mapped addresses" >&5
 echo $ECHO_N "checking if we need to convert IPv4 in IPv6-mapped addresses... $ECHO_C" >&6
 IPV4_IN6_HACK_MSG="no"
 
@@ -16784,7 +16793,7 @@
   withval="$with_4in6"
 
 		if test "x$withval" != "xno" ; then
-			echo "$as_me:16787: result: yes" >&5
+			echo "$as_me:16796: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			cat >>confdefs.h <<\EOF
 #define IPV4_IN_IPV6 1
@@ -16792,14 +16801,14 @@
 
 			IPV4_IN6_HACK_MSG="yes"
 		else
-			echo "$as_me:16795: result: no" >&5
+			echo "$as_me:16804: result: no" >&5
 echo "${ECHO_T}no" >&6
 		fi
 
 else
 
 		if test "x$inet6_default_4in6" = "xyes"; then
-			echo "$as_me:16802: result: yes (default)" >&5
+			echo "$as_me:16811: result: yes (default)" >&5
 echo "${ECHO_T}yes (default)" >&6
 			cat >>confdefs.h <<\EOF
 #define IPV4_IN_IPV6 1
@@ -16807,7 +16816,7 @@
 
 			IPV4_IN6_HACK_MSG="yes"
 		else
-			echo "$as_me:16810: result: no (default)" >&5
+			echo "$as_me:16819: result: no (default)" >&5
 echo "${ECHO_T}no (default)" >&6
 		fi
 
@@ -16879,7 +16888,7 @@
 		if test "x$ssh_x509store" = "xyes"; then
 			ssh_ocsp="yes"
 		else
-			{ { echo "$as_me:16882: error: cannot enable OCSP when x509store is disabled" >&5
+			{ { echo "$as_me:16891: error: cannot enable OCSP when x509store is disabled" >&5
 echo "$as_me: error: cannot enable OCSP when x509store is disabled" >&2;}
    { (exit 1); exit 1; }; }
 		fi
@@ -16891,13 +16900,13 @@
 for ac_func in OCSP_sendreq_bio
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:16894: checking for $ac_func" >&5
+echo "$as_me:16903: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16900 "configure"
+#line 16909 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -16928,16 +16937,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16931: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16940: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16934: \$? = $ac_status" >&5
+  echo "$as_me:16943: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16937: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16946: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16940: \$? = $ac_status" >&5
+  echo "$as_me:16949: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -16947,30 +16956,30 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:16950: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:16959: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
-		echo "$as_me:16957: checking for openssl/ocsp.h" >&5
+		echo "$as_me:16966: checking for openssl/ocsp.h" >&5
 echo $ECHO_N "checking for openssl/ocsp.h... $ECHO_C" >&6
 if test "${ac_cv_header_openssl_ocsp_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16963 "configure"
+#line 16972 "configure"
 #include "confdefs.h"
 #include <openssl/ocsp.h>
 _ACEOF
-if { (eval echo "$as_me:16967: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:16976: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:16973: \$? = $ac_status" >&5
+  echo "$as_me:16982: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16989,14 +16998,14 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:16992: result: $ac_cv_header_openssl_ocsp_h" >&5
+echo "$as_me:17001: result: $ac_cv_header_openssl_ocsp_h" >&5
 echo "${ECHO_T}$ac_cv_header_openssl_ocsp_h" >&6
 if test $ac_cv_header_openssl_ocsp_h = yes; then
   :
 else
 
 			ssh_ocsp="no"
-			{ { echo "$as_me:16999: error: OCSP header not found" >&5
+			{ { echo "$as_me:17008: error: OCSP header not found" >&5
 echo "$as_me: error: OCSP header not found" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -17005,7 +17014,7 @@
 else
 
 		ssh_ocsp="no"
-		{ echo "$as_me:17008: WARNING: Cannot find OCSP functions - OCSP is disabled" >&5
+		{ echo "$as_me:17017: WARNING: Cannot find OCSP functions - OCSP is disabled" >&5
 echo "$as_me: WARNING: Cannot find OCSP functions - OCSP is disabled" >&2;}
 
 fi
@@ -17025,18 +17034,318 @@
 	OCSP_OFF=''
 fi
 
+# enable LDAP queries
+LDAP_MSG="no"
+if test "x$ssh_x509store" = "xyes"; then
+
+ac_ldap='none'
+# Check whether --enable-ldap or --disable-ldap was given.
+if test "${enable_ldap+set}" = set; then
+  enableval="$enable_ldap"
+  ac_ldap="$enableval"
+
+fi;
+
+if test "x$ac_ldap" = xyes; then
+  ac_ldap_prefix=""
+
+# Check whether --with-ldap-prefix or --without-ldap-prefix was given.
+if test "${with_ldap_prefix+set}" = set; then
+  withval="$with_ldap_prefix"
+  ac_ldap_prefix="$withval"
+
+fi;
+
+# Check whether --with-ldap-bindir or --without-ldap-bindir was given.
+if test "${with_ldap_bindir+set}" = set; then
+  withval="$with_ldap_bindir"
+  LDAP_BINDIR="$withval"
+else
+
+      if test "x$ac_ldap_prefix" != "x"; then
+        LDAP_BINDIR="$ac_ldap_prefix/bin"
+      fi
+
+fi;
+
+# Check whether --with-ldap-libexecdir or --without-ldap-libexecdir was given.
+if test "${with_ldap_libexecdir+set}" = set; then
+  withval="$with_ldap_libexecdir"
+  LDAP_LIBEXECDIR="$withval"
+else
+
+      if test "x$ac_ldap_prefix" = "x"; then
+        LDAP_LIBEXECDIR="/usr/libexec"
+      else
+        LDAP_LIBEXECDIR="$ac_ldap_prefix/libexec"
+      fi
+
+fi;
+
+# Check whether --with-ldap-sysconfdir or --without-ldap-sysconfdir was given.
+if test "${with_ldap_sysconfdir+set}" = set; then
+  withval="$with_ldap_sysconfdir"
+  LDAP_SYSCONFDIR="$withval"
+else
+  LDAP_SYSCONFDIR="$ac_ldap_prefix/etc/openldap"
+
+fi;
+
+# Check whether --with-ldap-libdir or --without-ldap-libdir was given.
+if test "${with_ldap_libdir+set}" = set; then
+  withval="$with_ldap_libdir"
+  LDAP_LDFLAGS="-L$withval"
+else
+
+      if test "x$ac_ldap_prefix" != "x"; then
+        LDAP_LDFLAGS="-L$ac_ldap_prefix/lib"
+      else
+        LDAP_LDFLAGS=""
+      fi
+
+fi;
+
+# Check whether --with-ldap-includedir or --without-ldap-includedir was given.
+if test "${with_ldap_includedir+set}" = set; then
+  withval="$with_ldap_includedir"
+  LDAP_CPPFLAGS="-I$withval"
+else
+
+      if test "x$ac_ldap_prefix" != "x"; then
+        LDAP_CPPFLAGS="-I$ac_ldap_prefix/include"
+      else
+        LDAP_CPPFLAGS=""
+      fi
+
+fi;
+
+  ac_save_CPPFLAGS="$CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $LDAP_CPPFLAGS"
+
+for ac_header in lber.h ldap.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:17128: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 17134 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:17138: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  egrep -v '^ *\+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:17144: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  eval "$as_ac_Header=no"
+fi
+rm -f conftest.err conftest.$ac_ext
+fi
+echo "$as_me:17163: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+EOF
+
+else
+
+      { { echo "$as_me:17172: error: cannot found LDAP headers" >&5
+echo "$as_me: error: cannot found LDAP headers" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+done
+
+  CPPFLAGS="$ac_save_CPPFLAGS"
+
+  ac_ldap_libs=""
+
+# Check whether --with-ldap-libs or --without-ldap-libs was given.
+if test "${with_ldap_libs+set}" = set; then
+  withval="$with_ldap_libs"
+  ac_ldap_libs="$withval"
+
+fi;
+
+### Try to link with LDAP libs
+  ac_save_LDFLAGS="$LDFLAGS"
+  ac_save_LIBS="$LIBS"
+
+  LDFLAGS="$LDAP_LDFLAGS $LDFLAGS"
+  ac_LDAP_LINK=""
+  if test "x$ac_ldap_libs" != "x"; then
+    echo "$as_me:17197: checking to link with specified LDAP libs" >&5
+echo $ECHO_N "checking to link with specified LDAP libs... $ECHO_C" >&6
+
+    LDAP_LIBS="$ac_ldap_libs"
+    LIBS="$LDAP_LIBS $ac_save_LIBS"
+    cat >conftest.$ac_ext <<_ACEOF
+#line 17203 "configure"
+#include "confdefs.h"
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char ldap_init ();
+int
+main ()
+{
+ldap_init ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:17222: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:17225: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:17228: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:17231: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_LDAP_LINK="yes"
+
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+    if test "x$ac_LDAP_LINK" != "xyes"; then
+      { { echo "$as_me:17241: error: cannot link with specified LDAP libs" >&5
+echo "$as_me: error: cannot link with specified LDAP libs" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+  else
+    echo "$as_me:17246: checking how to link LDAP libs" >&5
+echo $ECHO_N "checking how to link LDAP libs... $ECHO_C" >&6
+
+    LDAP_LIBS="-lldap"
+    for L in lber ssl crypto; do
+      LDAP_LIBS="$LDAP_LIBS -l$L"
+      LIBS="$LDAP_LIBS $ac_save_LIBS"
+      cat >conftest.$ac_ext <<_ACEOF
+#line 17254 "configure"
+#include "confdefs.h"
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char ldap_init ();
+int
+main ()
+{
+ldap_init ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:17273: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:17276: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:17279: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:17282: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_LDAP_LINK="yes"
+
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+      if test "x$ac_LDAP_LINK" = "xyes"; then
+        break
+      fi
+    done
+    if test "x$ac_LDAP_LINK" != "xyes"; then
+      { { echo "$as_me:17296: error: cannot link with default LDAP libs" >&5
+echo "$as_me: error: cannot link with default LDAP libs" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+  fi
+  echo "$as_me:17301: result: done" >&5
+echo "${ECHO_T}done" >&6
+  unset ac_LDAP_LINK
+  LIBS="$ac_save_LIBS"
+  LDFLAGS="$ac_save_LDFLAGS"
+
+  unset ac_ldap_libs
+  unset ac_ldap_prefix
+else
+  { echo "$as_me:17310: LDAP is disabled" >&5
+echo "$as_me: LDAP is disabled" >&6;}
+fi
+
+if test "x$ac_ldap" = "xyes"; then
+
+cat >>confdefs.h <<EOF
+#define LDAP_ENABLED 1
+EOF
+
+	LDAP_ON=''
+	LDAP_OFF='#'
+else
+	LDAP_ON='#'
+	LDAP_OFF=''
+fi
+
+unset ac_ldap
+
+	if test "x$LDAP_ON" = "x"; then
+		LDAP_MSG="yes"
+	fi
+else
+	{ echo "$as_me:17333: x509store is disabled - skiping LDAP" >&5
+echo "$as_me: x509store is disabled - skiping LDAP" >&6;}
+fi
+
 ssh_x509dn_email="yes"
 if test "x$ssh_x509store" = "xyes"; then
 	# Check for Email in X.509 'Distinguished Name'
-	echo "$as_me:17031: checking for Email in X.509 'Distinguished Name'" >&5
+	echo "$as_me:17340: checking for Email in X.509 'Distinguished Name'" >&5
 echo $ECHO_N "checking for Email in X.509 'Distinguished Name'... $ECHO_C" >&6
 	if test "$cross_compiling" = yes; then
-  { { echo "$as_me:17034: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:17343: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17039 "configure"
+#line 17348 "configure"
 #include "confdefs.h"
 
 #include <openssl/evp.h>
@@ -17052,18 +17361,18 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:17055: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17364: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17058: \$? = $ac_status" >&5
+  echo "$as_me:17367: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:17060: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17369: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17063: \$? = $ac_status" >&5
+  echo "$as_me:17372: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-		echo "$as_me:17066: result: yes" >&5
+		echo "$as_me:17375: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 else
@@ -17071,7 +17380,7 @@
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-		echo "$as_me:17074: result: no" >&5
+		echo "$as_me:17383: result: no" >&5
 echo "${ECHO_T}no" >&6
 		ssh_x509dn_email="no"
 
@@ -17104,7 +17413,7 @@
 		if test "x$withval" != "xno" ; then
 			piddir=$withval
 			if test ! -d $piddir ; then
-			{ echo "$as_me:17107: WARNING: ** no $piddir directory on this system **" >&5
+			{ echo "$as_me:17416: WARNING: ** no $piddir directory on this system **" >&5
 echo "$as_me: WARNING: ** no $piddir directory on this system **" >&2;}
 			fi
 		fi
@@ -17227,10 +17536,10 @@
 
 fi;
 
-echo "$as_me:17230: checking if your system defines LASTLOG_FILE" >&5
+echo "$as_me:17539: checking if your system defines LASTLOG_FILE" >&5
 echo $ECHO_N "checking if your system defines LASTLOG_FILE... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 17233 "configure"
+#line 17542 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -17254,29 +17563,29 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17257: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17566: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17260: \$? = $ac_status" >&5
+  echo "$as_me:17569: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17263: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17572: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17266: \$? = $ac_status" >&5
+  echo "$as_me:17575: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-   echo "$as_me:17268: result: yes" >&5
+   echo "$as_me:17577: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-		echo "$as_me:17274: result: no" >&5
+		echo "$as_me:17583: result: no" >&5
 echo "${ECHO_T}no" >&6
-		echo "$as_me:17276: checking if your system defines _PATH_LASTLOG" >&5
+		echo "$as_me:17585: checking if your system defines _PATH_LASTLOG" >&5
 echo $ECHO_N "checking if your system defines _PATH_LASTLOG... $ECHO_C" >&6
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17279 "configure"
+#line 17588 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -17297,24 +17606,24 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17300: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17609: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17303: \$? = $ac_status" >&5
+  echo "$as_me:17612: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17306: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17615: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17309: \$? = $ac_status" >&5
+  echo "$as_me:17618: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-   echo "$as_me:17311: result: yes" >&5
+   echo "$as_me:17620: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-			echo "$as_me:17317: result: no" >&5
+			echo "$as_me:17626: result: no" >&5
 echo "${ECHO_T}no" >&6
 			system_lastlog_path=no
 
@@ -17332,7 +17641,7 @@
 				fi
 		done
 		if test -z "$conf_lastlog_location"; then
-			{ echo "$as_me:17335: WARNING: ** Cannot find lastlog **" >&5
+			{ echo "$as_me:17644: WARNING: ** Cannot find lastlog **" >&5
 echo "$as_me: WARNING: ** Cannot find lastlog **" >&2;}
 					fi
 	fi
@@ -17345,10 +17654,10 @@
 
 fi
 
-echo "$as_me:17348: checking if your system defines UTMP_FILE" >&5
+echo "$as_me:17657: checking if your system defines UTMP_FILE" >&5
 echo $ECHO_N "checking if your system defines UTMP_FILE... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 17351 "configure"
+#line 17660 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -17366,23 +17675,23 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17369: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17678: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17372: \$? = $ac_status" >&5
+  echo "$as_me:17681: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17375: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17684: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17378: \$? = $ac_status" >&5
+  echo "$as_me:17687: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-   echo "$as_me:17380: result: yes" >&5
+   echo "$as_me:17689: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:17385: result: no" >&5
+ echo "$as_me:17694: result: no" >&5
 echo "${ECHO_T}no" >&6
 	  system_utmp_path=no
 
@@ -17410,10 +17719,10 @@
 
 fi
 
-echo "$as_me:17413: checking if your system defines WTMP_FILE" >&5
+echo "$as_me:17722: checking if your system defines WTMP_FILE" >&5
 echo $ECHO_N "checking if your system defines WTMP_FILE... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 17416 "configure"
+#line 17725 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -17431,23 +17740,23 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17434: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17743: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17437: \$? = $ac_status" >&5
+  echo "$as_me:17746: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17440: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17749: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17443: \$? = $ac_status" >&5
+  echo "$as_me:17752: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-   echo "$as_me:17445: result: yes" >&5
+   echo "$as_me:17754: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:17450: result: no" >&5
+ echo "$as_me:17759: result: no" >&5
 echo "${ECHO_T}no" >&6
 	  system_wtmp_path=no
 
@@ -17475,10 +17784,10 @@
 
 fi
 
-echo "$as_me:17478: checking if your system defines UTMPX_FILE" >&5
+echo "$as_me:17787: checking if your system defines UTMPX_FILE" >&5
 echo $ECHO_N "checking if your system defines UTMPX_FILE... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 17481 "configure"
+#line 17790 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -17499,23 +17808,23 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17502: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17811: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17505: \$? = $ac_status" >&5
+  echo "$as_me:17814: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17508: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17817: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17511: \$? = $ac_status" >&5
+  echo "$as_me:17820: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-   echo "$as_me:17513: result: yes" >&5
+   echo "$as_me:17822: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:17518: result: no" >&5
+ echo "$as_me:17827: result: no" >&5
 echo "${ECHO_T}no" >&6
 	  system_utmpx_path=no
 
@@ -17535,10 +17844,10 @@
 
 fi
 
-echo "$as_me:17538: checking if your system defines WTMPX_FILE" >&5
+echo "$as_me:17847: checking if your system defines WTMPX_FILE" >&5
 echo $ECHO_N "checking if your system defines WTMPX_FILE... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 17541 "configure"
+#line 17850 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -17559,23 +17868,23 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17562: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17871: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17565: \$? = $ac_status" >&5
+  echo "$as_me:17874: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17568: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17877: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17571: \$? = $ac_status" >&5
+  echo "$as_me:17880: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-   echo "$as_me:17573: result: yes" >&5
+   echo "$as_me:17882: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:17578: result: no" >&5
+ echo "$as_me:17887: result: no" >&5
 echo "${ECHO_T}no" >&6
 	  system_wtmpx_path=no
 
@@ -17597,7 +17906,7 @@
 
 if test ! -z "$blibpath" ; then
 	LDFLAGS="$LDFLAGS $blibflags$blibpath"
-	{ echo "$as_me:17600: WARNING: Please check and edit blibpath in LDFLAGS in Makefile" >&5
+	{ echo "$as_me:17909: WARNING: Please check and edit blibpath in LDFLAGS in Makefile" >&5
 echo "$as_me: WARNING: Please check and edit blibpath in LDFLAGS in Makefile" >&2;}
 fi
 
@@ -17608,7 +17917,7 @@
 	LIBS=`echo $LIBS | sed 's/-ldl //'`
 fi
 
-ac_config_files="$ac_config_files Makefile openbsd-compat/Makefile scard/Makefile ssh_prng_cmds tests/CA/Makefile"
+ac_config_files="$ac_config_files Makefile openbsd-compat/Makefile scard/Makefile ssh_prng_cmds tests/CA/Makefile tests/CA/env"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -17689,7 +17998,7 @@
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:17692: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:18001: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -17862,7 +18171,7 @@
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:17865: error: ambiguous option: $1
+    { { echo "$as_me:18174: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -17881,7 +18190,7 @@
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:17884: error: unrecognized option: $1
+  -*) { { echo "$as_me:18193: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -17921,8 +18230,9 @@
   "scard/Makefile" ) CONFIG_FILES="$CONFIG_FILES scard/Makefile" ;;
   "ssh_prng_cmds" ) CONFIG_FILES="$CONFIG_FILES ssh_prng_cmds" ;;
   "tests/CA/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/CA/Makefile" ;;
+  "tests/CA/env" ) CONFIG_FILES="$CONFIG_FILES tests/CA/env" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-  *) { { echo "$as_me:17925: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:18235: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -18067,6 +18377,14 @@
 s,@sshcadir@,$sshcadir,;t t
 s,@OCSP_ON@,$OCSP_ON,;t t
 s,@OCSP_OFF@,$OCSP_OFF,;t t
+s,@LDAP_BINDIR@,$LDAP_BINDIR,;t t
+s,@LDAP_LIBEXECDIR@,$LDAP_LIBEXECDIR,;t t
+s,@LDAP_SYSCONFDIR@,$LDAP_SYSCONFDIR,;t t
+s,@LDAP_LDFLAGS@,$LDAP_LDFLAGS,;t t
+s,@LDAP_CPPFLAGS@,$LDAP_CPPFLAGS,;t t
+s,@LDAP_LIBS@,$LDAP_LIBS,;t t
+s,@LDAP_ON@,$LDAP_ON,;t t
+s,@LDAP_OFF@,$LDAP_OFF,;t t
 s,@piddir@,$piddir,;t t
 CEOF
 
@@ -18182,7 +18500,7 @@
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:18185: creating $ac_file" >&5
+    { echo "$as_me:18503: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -18200,7 +18518,7 @@
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:18203: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:18521: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -18213,7 +18531,7 @@
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:18216: error: cannot find input file: $f" >&5
+           { { echo "$as_me:18534: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -18274,7 +18592,7 @@
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:18277: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:18595: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -18285,7 +18603,7 @@
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:18288: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:18606: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -18298,7 +18616,7 @@
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:18301: error: cannot find input file: $f" >&5
+           { { echo "$as_me:18619: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -18415,7 +18733,7 @@
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-      { echo "$as_me:18418: $ac_file is unchanged" >&5
+      { echo "$as_me:18736: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -18528,6 +18846,7 @@
 echo "              MD5 password support: $MD5_MSG"
 echo "               X.509 store support: $ssh_x509store"
 echo "                      OCSP support: $ssh_ocsp"
+echo "                      LDAP queries: $LDAP_MSG"
 echo "       IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG"
 echo "           Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
 echo "                  BSD Auth support: $BSD_AUTH_MSG"
@@ -18547,6 +18866,20 @@
 
 echo ""
 
+if test "x$LDAP_MSG" = "xyes" ; then
+echo "Extra LDAP flags:"
+echo "    LDAP compiler flags: ${LDAP_CFLAGS}"
+echo "LDAP preprocessor flags: ${LDAP_CPPFLAGS}"
+echo "      LDAP linker flags: ${LDAP_LDFLAGS}"
+echo "         LDAP libraries: ${LDAP_LIBS}"
+echo ""
+echo "LDAP paths(used only in tests):"
+echo "     LDAP sysconfig dir: ${LDAP_SYSCONFDIR}"
+echo "       LDAP libexec dir: ${LDAP_LIBEXECDIR}"
+echo "           LDAP bin dir: ${LDAP_BINDIR}"
+echo ""
+fi
+
 if test "x$PAM_MSG" = "xyes" ; then
 	echo "PAM is enabled. You may need to install a PAM control file "
 	echo "for sshd, otherwise password authentication may fail. "
diff -ruN openssh-3.8.1p1+x509h/configure.ac openssh-3.8.1p1+x509-5.1/configure.ac
--- openssh-3.8.1p1+x509h/configure.ac	2004-04-21 09:06:00.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/configure.ac	2004-11-19 09:06:00.000000000 +0200
@@ -2657,6 +2657,18 @@
 AC_SUBST(OCSP_OFF)
 
 
+# enable LDAP queries
+LDAP_MSG="no"
+if test "x$ssh_x509store" = "xyes"; then
+	AC_WITH_LDAP
+	if test "x$LDAP_ON" = "x"; then
+		LDAP_MSG="yes"
+	fi
+else
+	AC_MSG_NOTICE([x509store is disabled - skiping LDAP])
+fi
+
+
 ssh_x509dn_email="yes"
 if test "x$ssh_x509store" = "xyes"; then
 	# Check for Email in X.509 'Distinguished Name'
@@ -2981,7 +2993,7 @@
 fi
 
 AC_EXEEXT
-AC_CONFIG_FILES([Makefile openbsd-compat/Makefile scard/Makefile ssh_prng_cmds tests/CA/Makefile])
+AC_CONFIG_FILES([Makefile openbsd-compat/Makefile scard/Makefile ssh_prng_cmds tests/CA/Makefile tests/CA/env])
 AC_OUTPUT
 
 # Print summary of options
@@ -3030,6 +3042,7 @@
 echo "              MD5 password support: $MD5_MSG"
 echo "               X.509 store support: $ssh_x509store"
 echo "                      OCSP support: $ssh_ocsp"
+echo "                      LDAP queries: $LDAP_MSG"
 echo "       IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG"
 echo "           Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
 echo "                  BSD Auth support: $BSD_AUTH_MSG"
@@ -3049,6 +3062,20 @@
 
 echo ""
 
+if test "x$LDAP_MSG" = "xyes" ; then
+echo "Extra LDAP flags:"
+echo "    LDAP compiler flags: ${LDAP_CFLAGS}"
+echo "LDAP preprocessor flags: ${LDAP_CPPFLAGS}"
+echo "      LDAP linker flags: ${LDAP_LDFLAGS}"
+echo "         LDAP libraries: ${LDAP_LIBS}"
+echo ""
+echo "LDAP paths(used only in tests):"
+echo "     LDAP sysconfig dir: ${LDAP_SYSCONFDIR}"
+echo "       LDAP libexec dir: ${LDAP_LIBEXECDIR}"
+echo "           LDAP bin dir: ${LDAP_BINDIR}"
+echo ""
+fi
+
 if test "x$PAM_MSG" = "xyes" ; then
 	echo "PAM is enabled. You may need to install a PAM control file "
 	echo "for sshd, otherwise password authentication may fail. "
diff -ruN openssh-3.8.1p1+x509h/key.c openssh-3.8.1p1+x509-5.1/key.c
--- openssh-3.8.1p1+x509h/key.c	2004-04-21 09:06:01.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/key.c	2004-11-19 09:06:01.000000000 +0200
@@ -123,7 +123,7 @@
 		if ((k->rsa->dmp1 = BN_new()) == NULL)
 			fatal("key_new_private: BN_new failed");
 		if (k->type == KEY_X509_RSA) {
-			debug3("key_new_private: X509(rsa) MORE ...?");                        
+			debug3("key_new_private: X509(rsa) MORE ...?");
 			/*
 			if ((k->x509 = X509_new()) == NULL)
 				fatal("key_new: X509_new failed");
@@ -135,7 +135,7 @@
 		if ((k->dsa->priv_key = BN_new()) == NULL)
 			fatal("key_new_private: BN_new failed");
 		if (k->type == KEY_X509_DSA) {
-			debug3("key_new_private: X509(dsa) MORE ...?");                        
+			debug3("key_new_private: X509(dsa) MORE ...?");
 			/*
 			if ((k->x509 = X509_new()) == NULL)
 				fatal("key_new: X509_new failed");
diff -ruN openssh-3.8.1p1+x509h/m4/ldap.m4 openssh-3.8.1p1+x509-5.1/m4/ldap.m4
--- openssh-3.8.1p1+x509h/m4/ldap.m4	1970-01-01 02:00:00.000000000 +0200
+++ openssh-3.8.1p1+x509-5.1/m4/ldap.m4	2004-11-18 23:09:35.000000000 +0200
@@ -0,0 +1,200 @@
+# Options to build with LDAP
+#
+# Author: Roumen Petrov
+# Revision: 7 Nov 2004
+#
+dnl The variables provided are :
+dnl - paths:
+dnl     LDAP_BINDIR
+dnl     LDAP_LIBEXECDIR
+dnl     LDAP_SYSCONFDIR
+dnl - build flags:
+dnl     LDAP_LDFLAGS
+dnl     LDAP_LIBS
+dnl     LDAP_CPPFLAGS
+dnl - conditional:
+dnl     LDAP_ON   (e.g. '' or '#')
+dnl     LDAP_OFF  (e.g. '#' or '' - oposite of LDAP_ON)
+
+AC_DEFUN(AC_WITH_LDAP,
+[
+dnl
+dnl Get the ldap paths
+dnl
+
+ac_ldap='none'
+AC_ARG_ENABLE(ldap,
+  [  --enable-ldap           Enable LDAP queries],
+  ac_ldap="$enableval"
+)
+
+if test "x$ac_ldap" = xyes; then
+  ac_ldap_prefix=""
+  AC_ARG_WITH(ldap-prefix,
+    [  --with-ldap-prefix=PATH      Prefix where LDAP is installed (optional)],
+    ac_ldap_prefix="$withval"
+  )
+
+  AC_ARG_WITH(ldap-bindir,
+    [  --with-ldap-bindir=PATH      Prefix where LDAP user executables are installed (optional)],
+    [LDAP_BINDIR="$withval"],
+    [
+      if test "x$ac_ldap_prefix" != "x"; then
+        LDAP_BINDIR="$ac_ldap_prefix/bin"
+      fi
+    ]
+  )
+  AC_SUBST(LDAP_BINDIR)
+
+  AC_ARG_WITH(ldap-libexecdir,
+    [  --with-ldap-libexecdir=PATH  Prefix where LDAP program executables are installed (optional)],
+    [LDAP_LIBEXECDIR="$withval"],
+    [
+      if test "x$ac_ldap_prefix" = "x"; then
+        LDAP_LIBEXECDIR="/usr/libexec"
+      else
+        LDAP_LIBEXECDIR="$ac_ldap_prefix/libexec"
+      fi
+    ]
+  )
+  AC_SUBST(LDAP_LIBEXECDIR)
+dnl### Check for slapd
+dnl  if test "x$cross_compiling" = "xyes" ; then
+dnl    AC_MSG_NOTICE([cannot check for LDAP daemon when cross compiling])
+dnl  else
+dnl    AC_CHECK_FILES(
+dnl      [
+dnl        $LDAP_LIBEXECDIR/slapd
+dnl      ]
+dnl    )
+dnl  fi
+
+  AC_ARG_WITH(ldap-sysconfdir,
+    [  --with-ldap-sysconfdir=PATH  Prefix where LDAP single-machine data are installed (optional)],
+    [LDAP_SYSCONFDIR="$withval"],
+    [LDAP_SYSCONFDIR="$ac_ldap_prefix/etc/openldap"]
+  )
+  AC_SUBST(LDAP_SYSCONFDIR)
+dnl### Check for schema files
+dnl  if test "x$cross_compiling" = "xyes" ; then
+dnl    AC_MSG_NOTICE([cannot check for schema files existence when cross compiling])
+dnl  else
+dnl    AC_CHECK_FILES(
+dnl      [
+dnl        $LDAP_SYSCONFDIR/schema/core.schema
+dnl        $LDAP_SYSCONFDIR/schema/cosine.schema
+dnl        $LDAP_SYSCONFDIR/schema/inetorgperson.schema-
+dnl      ]
+dnl    )
+dnl  fi
+
+
+  AC_ARG_WITH(ldap-libdir,
+    [  --with-ldap-libdir=PATH      Prefix where LDAP libaries are installed (optional)],
+    [LDAP_LDFLAGS="-L$withval"],
+    [
+      if test "x$ac_ldap_prefix" != "x"; then
+        LDAP_LDFLAGS="-L$ac_ldap_prefix/lib"
+      else
+        LDAP_LDFLAGS=""
+      fi
+    ]
+  )
+  AC_SUBST(LDAP_LDFLAGS)
+
+  AC_ARG_WITH(ldap-includedir,
+    [  --with-ldap-includedir=PATH  Prefix where LDAP header files are installed (optional)],
+    [LDAP_CPPFLAGS="-I$withval"],
+    [
+      if test "x$ac_ldap_prefix" != "x"; then
+        LDAP_CPPFLAGS="-I$ac_ldap_prefix/include"
+      else
+        LDAP_CPPFLAGS=""
+      fi
+    ]
+  )
+  AC_SUBST(LDAP_CPPFLAGS)
+
+
+  ac_save_CPPFLAGS="$CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $LDAP_CPPFLAGS"
+  AC_CHECK_HEADERS(
+    [lber.h ldap.h],
+    [],
+    [
+      AC_MSG_ERROR([cannot found LDAP headers])
+    ]
+  )
+  CPPFLAGS="$ac_save_CPPFLAGS"
+
+  ac_ldap_libs=""
+  AC_ARG_WITH(ldap-libs,
+    [  --with-ldap-libs=LIBS        Specify LDAP libraries to link with.
+                                 (default is -lldap -llber -lssl -lcrypto)],
+    [ac_ldap_libs="$withval"]
+  )
+
+### Try to link with LDAP libs
+  ac_save_LDFLAGS="$LDFLAGS"
+  ac_save_LIBS="$LIBS"
+
+  LDFLAGS="$LDAP_LDFLAGS $LDFLAGS"
+  ac_LDAP_LINK=""
+  if test "x$ac_ldap_libs" != "x"; then
+    AC_MSG_CHECKING([to link with specified LDAP libs])
+
+    LDAP_LIBS="$ac_ldap_libs"
+    LIBS="$LDAP_LIBS $ac_save_LIBS"
+    AC_LINK_IFELSE(
+      [AC_LANG_CALL([], [ldap_init])],
+      [ac_LDAP_LINK="yes"]
+    )
+    if test "x$ac_LDAP_LINK" != "xyes"; then
+      AC_MSG_ERROR([cannot link with specified LDAP libs])
+    fi
+  else
+    AC_MSG_CHECKING([how to link LDAP libs])
+
+    LDAP_LIBS="-lldap"
+    for L in lber ssl crypto; do
+      LDAP_LIBS="$LDAP_LIBS -l$L"
+      LIBS="$LDAP_LIBS $ac_save_LIBS"
+      AC_LINK_IFELSE(
+        [AC_LANG_CALL([], [ldap_init])],
+        [ac_LDAP_LINK="yes"]
+      )
+      if test "x$ac_LDAP_LINK" = "xyes"; then
+        break
+      fi
+    done
+    if test "x$ac_LDAP_LINK" != "xyes"; then
+      AC_MSG_ERROR([cannot link with default LDAP libs])
+    fi
+  fi
+  AC_MSG_RESULT([done])
+  unset ac_LDAP_LINK
+  LIBS="$ac_save_LIBS"
+  LDFLAGS="$ac_save_LDFLAGS"
+  AC_SUBST([LDAP_LIBS])
+
+  unset ac_ldap_libs
+  unset ac_ldap_prefix
+else
+  AC_MSG_NOTICE([LDAP is disabled])
+fi
+
+if test "x$ac_ldap" = "xyes"; then
+	AC_DEFINE_UNQUOTED(
+		LDAP_ENABLED, 1,
+		[Define if you want to enable LDAP queries])
+	LDAP_ON=''
+	LDAP_OFF='#'
+else
+	LDAP_ON='#'
+	LDAP_OFF=''
+fi
+AC_SUBST(LDAP_ON)
+AC_SUBST(LDAP_OFF)
+
+unset ac_ldap
+])
diff -ruN openssh-3.8.1p1+x509h/Makefile.in openssh-3.8.1p1+x509-5.1/Makefile.in
--- openssh-3.8.1p1+x509h/Makefile.in	2004-04-21 09:06:01.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/Makefile.in	2004-11-19 09:06:01.000000000 +0200
@@ -43,10 +43,11 @@
 CC=@CC@
 LD=@LD@
 CFLAGS=@CFLAGS@
-CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
+CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@
 LIBS=@LIBS@
 LIBPAM=@LIBPAM@
 LIBWRAP=@LIBWRAP@
+LIBLDAP=@LDAP_LDFLAGS@ @LDAP_LIBS@
 AR=@AR@
 AWK=@AWK@
 RANLIB=@RANLIB@
@@ -61,7 +62,13 @@
 INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@
 INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@
 
-X509_OBJS=ssh-x509.o x509store.o ssh-ocsp.o
+@LDAP_ON@LDAP_OBJS=x509_by_ldap.o
+@LDAP_OFF@LDAP_OBJS=
+
+@OCSP_ON@OCSP_OBJS=ssh-ocsp.o
+@OCSP_OFF@OCSP_OBJS=
+
+X509STORE_OBJS=x509store.o $(LDAP_OBJS) $(OCSP_OBJS)
 
 TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-agent$(EXEEXT) scp$(EXEEXT) ssh-rand-helper${EXEEXT} sftp-server$(EXEEXT) sftp$(EXEEXT)
 
@@ -72,12 +79,12 @@
 	log.o match.o moduli.o mpaux.o nchan.o packet.o \
 	readpass.o rsa.o tildexpand.o ttymodes.o xmalloc.o \
 	atomicio.o key.o dispatch.o kex.o mac.o uuencode.o misc.o \
-	rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o kexgex.o \
+	rijndael.o ssh-dss.o ssh-rsa.o ssh-x509.o dh.o kexdh.o kexgex.o \
 	kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \
-	entropy.o scard-opensc.o gss-genr.o $(X509_OBJS)
+	entropy.o scard-opensc.o gss-genr.o
 
 SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
-	sshconnect.o sshconnect1.o sshconnect2.o
+	sshconnect.o sshconnect1.o sshconnect2.o $(X509STORE_OBJS)
 
 SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
 	sshpty.o sshlogin.o servconf.o serverloop.o uidswap.o \
@@ -89,7 +96,7 @@
 	kexdhs.o kexgexs.o \
 	auth-krb5.o \
 	auth2-gss.o gss-serv.o gss-serv-krb5.o \
-	loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o
+	loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o $(X509STORE_OBJS)
 
 MANPAGES	= scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-rand-helper.8.out ssh-keysign.8.out sshd_config.5.out ssh_config.5.out
 MANPAGES_IN	= scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8 sshd_config.5 ssh_config.5
@@ -140,10 +147,10 @@
 	$(RANLIB) $@
 
 ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS)
-	$(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
+	$(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBLDAP) $(LIBS)
 
 sshd$(EXEEXT): libssh.a	$(LIBCOMPAT) $(SSHDOBJS)
-	$(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBWRAP) $(LIBPAM) $(LIBS)
+	$(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBWRAP) $(LIBPAM) $(LIBLDAP) $(LIBS)
 
 scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o
 	$(LD) -o $@ scp.o progressmeter.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
@@ -157,8 +164,8 @@
 ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keygen.o
 	$(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
 
-ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysign.o
-	$(LD) -o $@ ssh-keysign.o readconf.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
+ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysign.o readconf.o $(X509STORE_OBJS)
+	$(LD) -o $@ ssh-keysign.o readconf.o $(X509STORE_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBLDAP) $(LIBS)
 
 ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o
 	$(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS)
diff -ruN openssh-3.8.1p1+x509h/misc.h openssh-3.8.1p1+x509-5.1/misc.h
--- openssh-3.8.1p1+x509h/misc.h	2003-08-25 04:16:21.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/misc.h	2004-11-19 09:06:00.000000000 +0200
@@ -1,4 +1,4 @@
-/*	$OpenBSD: misc.h,v 1.12 2002/03/19 10:49:35 markus Exp $	*/
+/*	$OpenBSD$	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -31,3 +31,6 @@
 	int     nalloc;
 };
 void	 addargs(arglist *, char *, ...) __attribute__((format(printf, 2, 3)));
+
+/* RUMEN: to be compatible with OpenSSH 3.9 (tildexpand.h is removed) */
+#include "tildexpand.h"
diff -ruN openssh-3.8.1p1+x509h/pathnames.h openssh-3.8.1p1+x509-5.1/pathnames.h
--- openssh-3.8.1p1+x509h/pathnames.h	2004-04-21 09:06:00.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/pathnames.h	2004-11-19 09:06:00.000000000 +0200
@@ -207,7 +207,7 @@
 #define _PATH_USERCA_REVOCATION_FILE	"~/" _PATH_SSH_USER_DIR "/ca-bundle.crl"
 #define _PATH_USERCA_REVOCATION_PATH	"~/" _PATH_SSH_USER_DIR "/crl"
 
-/* x509 global store */
+/* x509 system store */
 #define _PATH_CA_CERTIFICATE_FILE	SSHCADIR "/ca-bundle.crt"
 #define _PATH_CA_CERTIFICATE_PATH	SSHCADIR "/crt"
 #define _PATH_CA_REVOCATION_FILE	SSHCADIR "/ca-bundle.crl"
diff -ruN openssh-3.8.1p1+x509h/readconf.c openssh-3.8.1p1+x509-5.1/readconf.c
--- openssh-3.8.1p1+x509h/readconf.c	2004-04-21 09:06:01.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/readconf.c	2004-11-19 09:06:01.000000000 +0200
@@ -132,10 +132,13 @@
 	oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
 	oX509rsaSigType,
 	oAllowedServerCertPurpose,
+	oMandatoryCRL,
 	oCACertificateFile, oCACertificatePath,
 	oCARevocationFile, oCARevocationPath,
+	oCAldapVersion, oCAldapURL,
 	oUserCACertificateFile, oUserCACertificatePath,
 	oUserCARevocationFile, oUserCARevocationPath,
+	oUserCAldapVersion, oUserCAldapURL,
 	oVAType, oVACertificateFile,
 	oVAOCSPResponderURL,
 	oDeprecated, oUnsupported
@@ -227,14 +230,19 @@
 	{ "serveralivecountmax", oServerAliveCountMax },
 	{ "x509rsasigtype", oX509rsaSigType },
 	{ "allowedcertpurpose", oAllowedServerCertPurpose },
+	{ "mandatorycrl", oMandatoryCRL },
 	{ "cacertificatefile", oCACertificateFile },
 	{ "cacertificatepath", oCACertificatePath },
 	{ "carevocationfile", oCARevocationFile },
 	{ "carevocationpath", oCARevocationPath },
+	{ "caldapversion", oCAldapVersion },
+	{ "caldapurl", oCAldapURL },
 	{ "usercacertificatefile", oUserCACertificateFile },
 	{ "usercacertificatepath", oUserCACertificatePath },
 	{ "usercarevocationfile", oUserCARevocationFile },
 	{ "usercarevocationpath", oUserCARevocationPath },
+	{ "usercaldapversion", oCAldapVersion },
+	{ "usercaldapurl", oCAldapURL },
 	{ "vatype", oVAType },
 	{ "vacertificatefile", oVACertificateFile },
 	{ "vaocspresponderurl", oVAOCSPResponderURL },
@@ -831,40 +839,73 @@
 		break;
 
 #ifndef SSH_X509STORE_DISABLED
+	case oMandatoryCRL:
+		intptr = &options->mandatory_crl;
+		goto parse_flag;
+
 	case oCACertificateFile:
+		/*X509StoreOptions prefered type is 'const char*' */
+		charptr = (char**)&options->ca.certificate_file;
+		goto parse_string;
+
 	case oCACertificatePath:
+		/*X509StoreOptions prefered type is 'const char*' */
+		charptr = (char**)&options->ca.certificate_path;
+		goto parse_string;
+
 	case oCARevocationFile:
+		/*X509StoreOptions prefered type is 'const char*' */
+		charptr = (char**)&options->ca.revocation_file;
+		goto parse_string;
+
 	case oCARevocationPath:
+		/*X509StoreOptions prefered type is 'const char*' */
+		charptr = (char**)&options->ca.revocation_path;
+		goto parse_string;
+
 	case oUserCACertificateFile:
+		/*X509StoreOptions prefered type is 'const char*' */
+		charptr = (char**)&options->userca.certificate_file;
+		goto parse_string;
+
 	case oUserCACertificatePath:
+		/*X509StoreOptions prefered type is 'const char*' */
+		charptr = (char**)&options->userca.certificate_path;
+		goto parse_string;
+
 	case oUserCARevocationFile:
+		/*X509StoreOptions prefered type is 'const char*' */
+		charptr = (char**)&options->userca.revocation_file;
+		goto parse_string;
+
 	case oUserCARevocationPath:
-		arg = strdelim(&s);
-		if (!arg || *arg == '\0')
-			fatal("%s line %d: Missing argument.", filename, linenum);
-		switch (opcode) {
-		case oCACertificateFile:
-			options->ca.certificate_file = xstrdup(arg);	break;
-		case oCACertificatePath:
-			options->ca.certificate_path = xstrdup(arg);	break;
-		case oCARevocationFile:
-			options->ca.revocation_file  = xstrdup(arg);	break;
-		case oCARevocationPath:
-			options->ca.revocation_path  = xstrdup(arg);	break;
-		case oUserCACertificateFile:
-			options->userca.certificate_file = xstrdup(arg);	break;
-		case oUserCACertificatePath:
-			options->userca.certificate_path = xstrdup(arg);	break;
-		case oUserCARevocationFile:
-			options->userca.revocation_file  = xstrdup(arg);	break;
-		case oUserCARevocationPath:
-			options->userca.revocation_path  = xstrdup(arg);	break;
-		default:
-			break;
-		}
-		break;
+		/*X509StoreOptions prefered type is 'const char*' */
+		charptr = (char**)&options->userca.revocation_path;
+		goto parse_string;
 #endif /*ndef SSH_X509STORE_DISABLED*/
 
+#ifdef LDAP_ENABLED
+	case oCAldapVersion:
+		/*X509StoreOptions prefered type is 'const char*' */
+		charptr = (char**)&options->ca.ldap_ver;
+		goto parse_string;
+
+	case oCAldapURL:
+		/*X509StoreOptions prefered type is 'const char*' */
+		charptr = (char**)&options->ca.ldap_url;
+		goto parse_string;
+
+	case oUserCAldapVersion:
+		/*X509StoreOptions prefered type is 'const char*' */
+		charptr = (char**)&options->userca.ldap_ver;
+		goto parse_string;
+
+	case oUserCAldapURL:
+		/*X509StoreOptions prefered type is 'const char*' */
+		charptr = (char**)&options->userca.ldap_url;
+		goto parse_string;
+#endif /*def LDAP_ENABLED*/
+
 #ifdef SSH_OCSP_ENABLED
 	case oVAType:
 		arg = strdelim(&s);
@@ -876,19 +917,14 @@
 		break;
 
 	case oVACertificateFile:
+		/* VAOptions prefered type is 'const char*' */
+		charptr = (char**)&options->va.certificate_file;
+		goto parse_string;
+
 	case oVAOCSPResponderURL:
-		arg = strdelim(&s);
-		if (!arg || *arg == '\0')
-			fatal("%s line %d: Missing argument.", filename, linenum);
-		switch (opcode) {
-		default:
-			break;
-		case oVACertificateFile:
-			options->va.certificate_file = xstrdup(arg);	break;
-		case oVAOCSPResponderURL:
-			options->va.responder_url    = xstrdup(arg);	break;
-		}
- 		break;
+		/* VAOptions prefered type is 'const char*' */
+		charptr = (char**)&options->va.responder_url;
+		goto parse_string;
 #endif /*def SSH_OCSP_ENABLED*/
 
 	case oDeprecated:
@@ -897,6 +933,7 @@
 		return 0;
 
 #ifdef SSH_X509STORE_DISABLED
+	case oMandatoryCRL:
 	case oCACertificateFile:
 	case oCACertificatePath:
 	case oCARevocationFile:
@@ -906,6 +943,12 @@
 	case oUserCARevocationFile:
 	case oUserCARevocationPath:
 #endif /*def SSH_X509STORE_DISABLED*/
+#ifndef LDAP_ENABLED
+	case oCAldapVersion:
+	case oCAldapURL:
+	case oUserCAldapVersion:
+	case oUserCAldapURL:
+#endif /*ndef LDAP_ENABLED*/
 #ifndef SSH_OCSP_ENABLED
 	case oVAType:
 	case oVACertificateFile:
@@ -1039,14 +1082,9 @@
 	options->x509rsasigtype = -1;
 	options->allowedcertpurpose = -1;
 #ifndef SSH_X509STORE_DISABLED
-	options->ca.certificate_file = NULL;
-	options->ca.certificate_path = NULL;
-	options->ca.revocation_file = NULL;
-	options->ca.revocation_path = NULL;
-	options->userca.certificate_file = NULL;
-	options->userca.certificate_path = NULL;
-	options->userca.revocation_file = NULL;
-	options->userca.revocation_path = NULL;
+	options->mandatory_crl = -1;
+	ssh_x509store_initialize(&options->ca);
+	ssh_x509store_initialize(&options->userca);
 #endif /*ndef SSH_X509STORE_DISABLED*/
 #ifdef SSH_OCSP_ENABLED
 	options->va.type = -1;
@@ -1060,6 +1098,8 @@
 ssh_x509store_init (Options *options) {
 	int         x509_store_loaded = 0;
 
+	ssh_x509store_mandatory_crl(options->mandatory_crl);
+
 	if(ssh_x509store_addlocations(&options->userca)) {
 		x509_store_loaded = 1;
 	}
@@ -1071,21 +1111,6 @@
 }
 #endif /*ndef SSH_X509STORE_DISABLED*/
 
-#ifndef SSH_X509STORE_DISABLED
-static void
-tilde_expand_filename2(const char **_fn, const char* _default) {
-	extern uid_t original_real_uid;
-
-	if (*_fn == NULL) {
-		*_fn = tilde_expand_filename(_default, original_real_uid);
-	} else {
-		const char *p = *_fn;
-		*_fn = tilde_expand_filename(p, original_real_uid);
-		xfree((void*)p);
-	}
-}
-#endif /*ndef SSH_X509STORE_DISABLED*/
-
 /*
  * Called after processing other sources of option data, this fills those
  * options for which no value has been specified with their default values.
@@ -1217,19 +1242,15 @@
 		options->allowedcertpurpose = ssh_get_default_x509purpose(0);
 	ssh_set_x509purpose(0, options->allowedcertpurpose);
 #ifndef SSH_X509STORE_DISABLED
-	if (options->ca.certificate_file == NULL)
-		options->ca.certificate_file = _PATH_CA_CERTIFICATE_FILE;
-	if (options->ca.certificate_path == NULL)
-		options->ca.certificate_path = _PATH_CA_CERTIFICATE_PATH;
-	if (options->ca.revocation_file == NULL)
-		options->ca.revocation_file = _PATH_CA_REVOCATION_FILE;
-	if (options->ca.revocation_path == NULL)
-		options->ca.revocation_path = _PATH_CA_REVOCATION_PATH;
-
-	tilde_expand_filename2(&options->userca.certificate_file, _PATH_USERCA_CERTIFICATE_FILE);
-	tilde_expand_filename2(&options->userca.certificate_path, _PATH_USERCA_CERTIFICATE_PATH);
-	tilde_expand_filename2(&options->userca.revocation_file , _PATH_USERCA_REVOCATION_FILE );
-	tilde_expand_filename2(&options->userca.revocation_path , _PATH_USERCA_REVOCATION_PATH );
+	if (options->mandatory_crl == -1)
+		options->mandatory_crl = 0;
+
+	ssh_x509store_system_defaults(&options->ca);
+
+	{
+		extern uid_t original_real_uid;
+		ssh_x509store_user_defaults(&options->userca, original_real_uid);
+	}
 
 	ssh_x509store_init(options);
 #endif /*ndef SSH_X509STORE_DISABLED*/
diff -ruN openssh-3.8.1p1+x509h/readconf.h openssh-3.8.1p1+x509-5.1/readconf.h
--- openssh-3.8.1p1+x509h/readconf.h	2004-04-21 09:06:00.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/readconf.h	2004-11-19 09:06:00.000000000 +0200
@@ -133,7 +133,8 @@
 	/* allowed server certificate purpose */
 	int     allowedcertpurpose;
 #ifndef SSH_X509STORE_DISABLED
-	/* sshd PKI(X509) global store */
+	int     mandatory_crl;
+	/* sshd PKI(X509) system store */
 	X509StoreOptions ca;
 	/* sshd PKI(X509) user store */
 	X509StoreOptions userca;
diff -ruN openssh-3.8.1p1+x509h/README.x509v3 openssh-3.8.1p1+x509-5.1/README.x509v3
--- openssh-3.8.1p1+x509h/README.x509v3	2004-03-20 12:56:57.000000000 +0200
+++ openssh-3.8.1p1+x509-5.1/README.x509v3	2004-11-18 22:33:59.000000000 +0200
@@ -1,6 +1,6 @@
                                                           Roumen Petrov
                                                         Sofia, Bulgaria
-                                                        Sat Mar 20 2004
+                                                        Wed Nov 17 2004
 
 How to use X.509 certificates with OpenSSH?
 
@@ -18,7 +18,7 @@
 .....
 -----END CERTIFICATE-----
 Note that to use X.509 certificates in OpenSSH files must contain
-private key followed by certificate.
+private key followed by certificate that match private key!
 
 
 1.) server configuration:
@@ -56,6 +56,12 @@
 integer starting from zero. Hash is result from command like this:
 $ openssl crl -in crl_file_name -noout -hash
 
+1.1.2.5.) CAldapVersion
+  LDAP protocol version. Default depend from LDAP library.
+
+1.1.2.6.) CAldapURL
+  Hostport and dn of LDAP URL. No default value.
+
 1.1.3.) HostKey files...
   Host key for protocol version 2 can contain private key plus X.509
 certificate in PEM format.
@@ -68,7 +74,7 @@
 ... X509COMPAT: RSA succeed for sha1 digest ...
 This options is intended to collect information about default
 signature digest type in other SecSH implementations.
-When you see this PLEASE send a EMAIL with "X509COMPAT" lines
+When you see this PLEASE send me a EMAIL with "X509COMPAT" lines
 from log files.
 
 1.1.5.) VAType none
@@ -146,7 +152,9 @@
 - [User]CACertificatePath;
 - [User]CACertificateFile;
 - [User]CARevocationFile;
-- [User]CARevocationPath.
+- [User]CARevocationPath;
+- [User]CAldapVersion;
+- [User]CAldapURL.
 
 Note: When we use own CA we must import CA certificate[s] to
 "X509 store". More info on:
@@ -176,7 +184,7 @@
 
 3.1.) In openssh build dir run "make check" or "make test".
   Both commands are equivalent and run regression tests.
-  If you lake to test only X.509 certificates you can run
+  If you want to test only X.509 certificates you can run
 $ make check-certs
 
   If certificate test scripts fail might you should setup test
@@ -245,8 +253,8 @@
   Read sshd_config.5 manual page for valid values.
   - SSHD_PORT
     (environment or config)
-    specifies the port number that server listens on and client connect
-    to on localhost. The default is 20022.
+    Specifies the port number that server listens on and client connect
+    to on SSHD_LISTENADDRESS. The default is 20022.
   - SSHD_LISTENADDRESS
     (only in config)
     Same as sshd option "ListenAddress" but without(!) port number.
@@ -271,7 +279,7 @@
   Variables related to OCSP tests.
   - SSH_VA_BASEPORT
     (environment or config)
-    test script run one or more OCSP responders at same once. First
+    Test script run one or more OCSP responders at same once. First
     responder listen on specified port, second on port plus one and
     etc. The default is 20080.
   - SSH_OPENSLL_OCSP_TMOUT=60
@@ -281,6 +289,20 @@
     This is work around for missing SO_REUSEADDR socket option in
     OpenSSL OCSP responder.
 
+3.1.2.5.) LDAP:
+  In use only when OpenSSH is build with LDAP support!
+  - SSH_LDAP_DB
+    (config)
+    Specifies LDAP database type. The default is ldbm.
+  - SSH_LDAP_DC
+    (config)
+    Specifies domain name component in LDAP distinguished name.
+    The default is "dc=example,dc=com".
+  - LDAPD_PORT
+    (environment or config)
+    LDAP daemon run by test script run listens on SSHD_LISTENADDRESS
+    and this port. The default is 20389.
+
 3.1.3.) Sample commands to run tests:
 $ OPENSSL=/usr/local/ssl/bin/openssl make check-certs
 $ SSHD_PORT=1122 SSH_X509TESTS="agent blob_auth" make check-certs
@@ -316,6 +338,10 @@
 config:
   Configuration file.
 
+env.in:
+  Template file.
+  Currently contain variables related to LDAP directories.
+
 shell.rc:
   Shell settings.
 
@@ -335,10 +361,14 @@
   File with .pub extention contain openssh public key (BLOB format).
   File with .crt extention contain openssl "text output" for identity
   files. Files with .p12 extention are for "Microsoft Windows keystore".
-Note: .p12 = .pfx for Windows.
+  Note: .p12 = .pfx for Windows.
+
 4-cre_crls.sh:
   Revoke part of client certificates.
 
+5-cre_ldap.sh
+  Create LDAP ldif files and slapd config.
+
 verify.sh:
   To check certificates against "Test CA". Note: check only
   testid_*.crt and testhostkey_*.crt files in current directory.
@@ -353,7 +383,10 @@
 test-dn_auth_file.sh.inc,
 test-dn_auth_path.sh.inc,
 test-agent.sh.inc,
-test-crl.sh.inc:
+test-crl.sh.inc,
+test-alg.sh.inc,
+test-ocsp.sh.inc,
+test-by_ldap.sh.inc:
   Test shell scripts. See DESCRIPTION in each file.
 
 Note that hostbased authentication we cannot test without to install.
@@ -443,5 +476,22 @@
   and start/restart the server. Don't forget to inform users
   that hostkey is changed!
 
+Q.) How to import CA certificates and/or CRLs in LDAP?
+A.) You should create a ldif file with LDAP entries that contains
+  binary atributes "cACertificate" and/or "certificateRevocationList"
+  and to specify path to file with certificate or CRL in DER format.
+  Entry should contain objectClass "pkiCA". See definition in core
+  LDAP schema. After this to use command ldapadd or ldapmodify to
+  add/modify LDAP data. See command manual pages.
+
+  As example when you build OpenSSH with ldap queries after
+  regression test see content of file
+    $(top_builddir)/tests/CA/ldap/ca.ldif .
+  This file is created by the script
+    $(srcdir)/tests/CA/5-cre_ldap.sh
+  and entries are added to LDAP with command:
+# ldapadd -x -w secret -D cn=... -H ldap://... \
+    -f .../ca.ldif .
+  See ldapadd manual page for options meaning.
 
 Enjoy ;-)
diff -ruN openssh-3.8.1p1+x509h/servconf.c openssh-3.8.1p1+x509-5.1/servconf.c
--- openssh-3.8.1p1+x509h/servconf.c	2004-04-21 09:06:01.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/servconf.c	2004-11-19 09:06:01.000000000 +0200
@@ -124,13 +124,14 @@
 	options->client_alive_count_max = -1;
 	options->authorized_keys_file = NULL;
 	options->authorized_keys_file2 = NULL;
+
+	options->hostbased_algorithms = NULL;
+	options->pubkey_algorithms = NULL;
 	options->x509rsasigtype = -1;
 	options->allowedcertpurpose = -1;
 #ifndef SSH_X509STORE_DISABLED
-	options->ca.certificate_file = NULL;
-	options->ca.certificate_path = NULL;
-	options->ca.revocation_file = NULL;
-	options->ca.revocation_path = NULL;
+	options->mandatory_crl = -1;
+	ssh_x509store_initialize(&options->ca);
 #endif /*ndef SSH_X509STORE_DISABLED*/
 #ifdef SSH_OCSP_ENABLED
 	options->va.type = -1;
@@ -264,6 +265,8 @@
 	if (options->authorized_keys_file == NULL)
 		options->authorized_keys_file = _PATH_SSH_USER_PERMITTED_KEYS;
 
+	/* options->hostbased_algorithms */
+	/* options->pubkey_algorithms */
 	if (options->x509rsasigtype == -1)
 		options->x509rsasigtype = SSH_X509RSA_MD5;
 	options->x509rsasigtype = ssh_x509rsasig(options->x509rsasigtype);
@@ -271,14 +274,10 @@
 		options->allowedcertpurpose = ssh_get_default_x509purpose(1);
 	ssh_set_x509purpose(1, options->allowedcertpurpose);
 #ifndef SSH_X509STORE_DISABLED
-	if (options->ca.certificate_file == NULL)
-		options->ca.certificate_file = _PATH_CA_CERTIFICATE_FILE;
-	if (options->ca.certificate_path == NULL)
-		options->ca.certificate_path = _PATH_CA_CERTIFICATE_PATH;
-	if (options->ca.revocation_file == NULL)
-		options->ca.revocation_file = _PATH_CA_REVOCATION_FILE;
-	if (options->ca.revocation_path == NULL)
-		options->ca.revocation_path = _PATH_CA_REVOCATION_PATH;
+	if (options->mandatory_crl == -1)
+		options->mandatory_crl = 0;
+	ssh_x509store_mandatory_crl(options->mandatory_crl);
+	ssh_x509store_system_defaults(&options->ca);
 	ssh_x509store_addlocations(&options->ca);
 #endif /*ndef SSH_X509STORE_DISABLED*/
 #ifdef SSH_OCSP_ENABLED
@@ -328,8 +327,12 @@
 	sUsePrivilegeSeparation,
 	sX509rsaSigType,
 	sAllowedClientCertPurpose,
+	sMandatoryCRL,
 	sCACertificateFile, sCACertificatePath,
 	sCARevocationFile, sCARevocationPath,
+	sCAldapVersion, sCAldapURL,
+	sHostbasedAlgorithms,
+	sPubkeyAlgorithms,
 	sVAType, sVACertificateFile,
 	sVAOCSPResponderURL,
 	sDeprecated, sUnsupported
@@ -432,10 +435,15 @@
 	{ "useprivilegeseparation", sUsePrivilegeSeparation},
 	{ "x509rsasigtype", sX509rsaSigType },
 	{ "allowedcertpurpose", sAllowedClientCertPurpose },
+	{ "mandatorycrl", sMandatoryCRL } ,
 	{ "cacertificatefile", sCACertificateFile },
 	{ "cacertificatepath", sCACertificatePath },
 	{ "carevocationfile", sCARevocationFile },
 	{ "carevocationpath", sCARevocationPath },
+	{ "caldapversion", sCAldapVersion },
+	{ "caldapurl", sCAldapURL },
+	{ "hostbasedalgorithms", sHostbasedAlgorithms },
+	{ "pubkeyalgorithms", sPubkeyAlgorithms },
 	{ "vatype", sVAType },
 	{ "vacertificatefile", sVACertificateFile },
 	{ "vaocspresponderurl", sVAOCSPResponderURL },
@@ -965,6 +973,28 @@
 		intptr = &options->client_alive_count_max;
 		goto parse_int;
 
+	case sHostbasedAlgorithms:
+		arg = strdelim(&cp);
+		if (!arg || *arg == '\0')
+			fatal("%s line %d: Missing argument.", filename, linenum);
+		if (!key_names_valid2(arg))
+			fatal("%.200s line %d: Bad protocol 2 hostbased algorithms '%s'.",
+			    filename, linenum, arg ? arg : "<NONE>");
+		if (options->hostbased_algorithms == NULL)
+			options->hostbased_algorithms = xstrdup(arg);
+		break;
+
+	case sPubkeyAlgorithms:
+		arg = strdelim(&cp);
+		if (!arg || *arg == '\0')
+			fatal("%s line %d: Missing argument.", filename, linenum);
+		if (!key_names_valid2(arg))
+			fatal("%.200s line %d: Bad protocol 2 public key algorithms '%s'.",
+			    filename, linenum, arg ? arg : "<NONE>");
+		if (options->pubkey_algorithms == NULL)
+			options->pubkey_algorithms = xstrdup(arg);
+		break;
+
 	case sX509rsaSigType:
 		arg = strdelim(&cp);
 		if (!arg || *arg == '\0')
@@ -1001,6 +1031,10 @@
 		break;
 
 #ifndef SSH_X509STORE_DISABLED
+	case sMandatoryCRL:
+		intptr = &options->mandatory_crl;
+		goto parse_flag;
+
 	case sCACertificateFile:
 	case sCACertificatePath:
 	case sCARevocationFile:
@@ -1023,6 +1057,22 @@
 		break;
 #endif /*ndef SSH_X509STORE_DISABLED*/
 
+#ifdef LDAP_ENABLED
+	case sCAldapVersion:
+		arg = strdelim(&cp);
+		if (!arg || *arg == '\0')
+			fatal("%s line %d: Missing argument.", filename, linenum);
+		options->ca.ldap_ver = xstrdup(arg);
+		break;
+
+	case sCAldapURL:
+		arg = strdelim(&cp);
+		if (!arg || *arg == '\0')
+			fatal("%s line %d: Missing argument.", filename, linenum);
+		options->ca.ldap_url = xstrdup(arg);
+		break;
+#endif /*def LDAP_ENABLED*/
+
 #ifdef SSH_OCSP_ENABLED
 	case sVAType:
 		arg = strdelim(&cp);
@@ -1057,11 +1107,16 @@
 		break;
 
 #ifdef SSH_X509STORE_DISABLED
+	case sMandatoryCRL:
 	case sCACertificateFile:
 	case sCACertificatePath:
 	case sCARevocationFile:
 	case sCARevocationPath:
 #endif /*def SSH_X509STORE_DISABLED*/
+#ifndef LDAP_ENABLED
+	case sCAldapVersion:
+	case sCAldapURL:
+#endif /*ndef LDAP_ENABLED*/
 #ifndef SSH_OCSP_ENABLED
 	case sVAType:
 	case sVACertificateFile:
diff -ruN openssh-3.8.1p1+x509h/servconf.h openssh-3.8.1p1+x509-5.1/servconf.h
--- openssh-3.8.1p1+x509h/servconf.h	2004-04-21 09:06:00.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/servconf.h	2004-11-19 09:06:00.000000000 +0200
@@ -151,12 +151,15 @@
 	char   *authorized_keys_file2;
 	int	use_pam;		/* Enable auth via PAM */
 
+	char*   hostbased_algorithms;	/* Supported hostbased algorithms. */
+	char*   pubkey_algorithms;	/* Supported pubkey algorithms. */
 	/* rumen-XXX: X509 RSA signature type: md5=0, sha1=1 */
 	int     x509rsasigtype;
 	/* allowed client certificate purpose */
 	int     allowedcertpurpose;
 #ifndef SSH_X509STORE_DISABLED
-	/* sshd PKI(X509) global store */
+	int     mandatory_crl;
+	/* sshd PKI(X509) system store */
 	X509StoreOptions ca;
 #endif /*ndef SSH_X509STORE_DISABLED*/
 #ifdef SSH_OCSP_ENABLED
diff -ruN openssh-3.8.1p1+x509h/sftp.c openssh-3.8.1p1+x509-5.1/sftp.c
--- openssh-3.8.1p1+x509h/sftp.c	2004-03-08 14:12:19.000000000 +0200
+++ openssh-3.8.1p1+x509-5.1/sftp.c	2004-11-19 09:06:01.000000000 +0200
@@ -369,7 +369,7 @@
 				i++;
 				if (cp[i] != '\'' && cp[i] != '\"' &&
 				    cp[i] != '\\') {
-					error("Bad escaped character '\%c'",
+					error("Bad escaped character '\\%c'",
 					    cp[i]);
 					goto fail;
 				}
diff -ruN openssh-3.8.1p1+x509h/ssh.0 openssh-3.8.1p1+x509-5.1/ssh.0
--- openssh-3.8.1p1+x509h/ssh.0	2004-04-21 09:06:00.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/ssh.0	2004-11-19 09:06:00.000000000 +0200
@@ -305,10 +305,11 @@
              DSA authentication is read.  The default is $HOME/.ssh/identity
              for protocol version 1, and $HOME/.ssh/id_rsa and
              $HOME/.ssh/id_dsa for protocol version 2.  For protocol version 2
-             is possible identity to contain in addition a X.509 certificate.
-             Identity files may also be specified on a per-host basis in the
-             configuration file.  It is possible to have multiple -i options
-             (and multiple identities specified in configuration files).
+             is possible identity to contain in addition X.509 certificate
+             that match private key.  Identity files may also be specified on
+             a per-host basis in the configuration file.  It is possible to
+             have multiple -i options (and multiple identities specified in
+             configuration files).
 
      -k      Disables forwarding (delegation) of GSSAPI credentials to the
              server.
@@ -479,18 +480,19 @@
      $HOME/.ssh/identity, $HOME/.ssh/id_dsa, $HOME/.ssh/id_rsa
              Contains the authentication identity of the user.  They are for
              protocol 1 RSA, protocol 2 DSA, and protocol 2 RSA, respectively.
-             It is possible protocol version 2 identity to contain identity
-             plus X.509 certificate.  These files contain sensitive data and
-             should be readable by the user but not accessible by others
-             (read/write/execute).  Note that ssh ignores a private key file
-             if it is accessible by others.  It is possible to specify a
-             passphrase when generating the key; the passphrase will be used
-             to encrypt the sensitive part of this file using 3DES.
+             It is possible protocol version 2 identity to contain private key
+             followed by X.509 certificate that match it.  These files contain
+             sensitive data and should be readable by the user but not acces-
+             sible by others (read/write/execute).  Note that ssh ignores a
+             private key file if it is accessible by others.  It is possible
+             to specify a passphrase when generating the key; the passphrase
+             will be used to encrypt the sensitive part of this file using
+             3DES.
 
      $HOME/.ssh/identity.pub, $HOME/.ssh/id_dsa.pub, $HOME/.ssh/id_rsa.pub
              Contains the public key for authentication (public part of the
              identity file in human-readable form).  Note that protocol ver-
-             sion 2 while a identity contain private key and X.509 certificate
+             sion 2 if a identity contain private key and X.509 certificate
              this file must contain that certificate.  The contents of the
              $HOME/.ssh/identity.pub file should be added to the file
              $HOME/.ssh/authorized_keys on all machines where the user wishes
@@ -546,18 +548,18 @@
              /etc/ssh/ssh_host_rsa_key
              These three files contain the private parts of the host keys and
              are used for RhostsRSAAuthentication and HostbasedAuthentication.
-             It is possible files to contain private part plus X.509 certifi-
-             cate for protocol version 2 keys.  If the protocol version 1
-             RhostsRSAAuthentication method is used, ssh must be setuid root,
-             since the host key is readable only by root.  For protocol ver-
-             sion 2, ssh uses ssh-keysign(8) to access the host keys for
-             HostbasedAuthentication.  This eliminates the requirement that
-             ssh be setuid root when that authentication method is used.  By
-             default ssh is not setuid root.  When a certificate is used as
-             host key for hostbased authentication that certificate must have
-             client purpose too or server configuration must permit connection
-             without client purpose. For allowed client certificate purposes
-             see ssh_config(5).
+             It is possible files to contain private part followed by X.509
+             certificate that match it for protocol version 2 keys.  If the
+             protocol version 1 RhostsRSAAuthentication method is used, ssh
+             must be setuid root, since the host key is readable only by root.
+             For protocol version 2, ssh uses ssh-keysign(8) to access the
+             host keys for HostbasedAuthentication.  This eliminates the
+             requirement that ssh be setuid root when that authentication
+             method is used.  By default ssh is not setuid root.  When a cer-
+             tificate is used as host key for hostbased authentication that
+             certificate must have client purpose too or server configuration
+             must permit connection without client purpose. For allowed client
+             certificate purposes see ssh_config(5).
 
      /etc/ssh/ca/ca-bundle.crt and /etc/ssh/ca/ca-bundle.crl
              Part of systemwide ``X.509 store''.  The first file contain mul-
diff -ruN openssh-3.8.1p1+x509h/ssh.1 openssh-3.8.1p1+x509-5.1/ssh.1
--- openssh-3.8.1p1+x509h/ssh.1	2004-04-21 09:06:00.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/ssh.1	2004-11-19 09:06:00.000000000 +0200
@@ -539,7 +539,7 @@
 .Pa $HOME/.ssh/id_dsa
 for protocol version 2.
 For protocol version 2 is possible identity to contain in addition
-a X.509 certificate.
+X.509 certificate that match private key.
 Identity files may also be specified on
 a per-host basis in the configuration file.
 It is possible to have multiple
@@ -803,8 +803,8 @@
 .It Pa $HOME/.ssh/identity, $HOME/.ssh/id_dsa, $HOME/.ssh/id_rsa
 Contains the authentication identity of the user.
 They are for protocol 1 RSA, protocol 2 DSA, and protocol 2 RSA, respectively.
-It is possible protocol version 2 identity to contain identity plus
-X.509 certificate.
+It is possible protocol version 2 identity to contain
+private key followed by X.509 certificate that match it.
 These files
 contain sensitive data and should be readable by the user but not
 accessible by others (read/write/execute).
@@ -817,7 +817,7 @@
 .It Pa $HOME/.ssh/identity.pub, $HOME/.ssh/id_dsa.pub, $HOME/.ssh/id_rsa.pub
 Contains the public key for authentication (public part of the
 identity file in human-readable form).
-Note that protocol version 2 while a identity contain private key and
+Note that protocol version 2 if a identity contain private key and
 X.509 certificate this file must contain that certificate.
 The contents of the
 .Pa $HOME/.ssh/identity.pub
@@ -870,8 +870,8 @@
 This file contains
 public keys, one per line, in the following format (fields separated
 by spaces): system name, public key and optional comment field.
-When a X.509 certificate is used as host key instead of public key line
-contain certificate (old style) or certificate
+When a X.509 certificate is used as host key instead of public key
+line contain certificate (old style) or certificate
 .Dq "Distinguished Name" .
 When different names are used
 for the same machine, all such names should be listed, separated by
@@ -897,8 +897,9 @@
 .Cm RhostsRSAAuthentication
 and
 .Cm HostbasedAuthentication .
-It is possible files to contain private part plus X.509 certificate for
-protocol version 2 keys.
+It is possible files to contain private part
+followed by X.509 certificate that match it
+for protocol version 2 keys.
 If the protocol version 1
 .Cm RhostsRSAAuthentication
 method is used,
diff -ruN openssh-3.8.1p1+x509h/ssh-add.0 openssh-3.8.1p1+x509-5.1/ssh-add.0
--- openssh-3.8.1p1+x509h/ssh-add.0	2004-04-21 09:06:00.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/ssh-add.0	2004-11-19 09:06:00.000000000 +0200
@@ -77,13 +77,13 @@
 
      $HOME/.ssh/id_dsa
              Contains the protocol version 2 DSA authentication identity of
-             the user.  It is possible to contain identity plus X.509 certifi-
-             cate.
+             the user.  It is possible to contain private key followed by
+             X.509 certificate that match it.
 
      $HOME/.ssh/id_rsa
              Contains the protocol version 2 RSA authentication identity of
-             the user.  It is possible to contain identity plus X.509 certifi-
-             cate.
+             the user.  It is possible to contain private key followed by
+             X.509 certificate that match it.
 
      Identity files should not be readable by anyone but the user.  Note that
      ssh-add ignores identity files if they are accessible by others.
diff -ruN openssh-3.8.1p1+x509h/ssh-add.1 openssh-3.8.1p1+x509-5.1/ssh-add.1
--- openssh-3.8.1p1+x509h/ssh-add.1	2004-04-21 09:06:00.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/ssh-add.1	2004-11-19 09:06:00.000000000 +0200
@@ -149,10 +149,12 @@
 Contains the protocol version 1 RSA authentication identity of the user.
 .It Pa $HOME/.ssh/id_dsa
 Contains the protocol version 2 DSA authentication identity of the user.
-It is possible to contain identity plus X.509 certificate.
+It is possible to contain private key
+followed by X.509 certificate that match it.
 .It Pa $HOME/.ssh/id_rsa
 Contains the protocol version 2 RSA authentication identity of the user.
-It is possible to contain identity plus X.509 certificate.
+It is possible to contain private key
+followed by X.509 certificate that match it.
 .El
 .Pp
 Identity files should not be readable by anyone but the user.
diff -ruN openssh-3.8.1p1+x509h/ssh-agent.0 openssh-3.8.1p1+x509-5.1/ssh-agent.0
--- openssh-3.8.1p1+x509h/ssh-agent.0	2004-04-21 09:06:00.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/ssh-agent.0	2004-11-19 09:06:00.000000000 +0200
@@ -50,7 +50,7 @@
      identity has a passphrase, ssh-add(1) asks for the passphrase (using a
      small X11 application if running under X11, or from the terminal if run-
      ning without X).  It then sends the identity to the agent.  Identity can
-     contain in addition a X.509 certificate.  Several identities can be
+     by X.509 certificate that match private key.  Several identities can be
      stored in the agent; the agent can automatically use any of these identi-
      ties.  ssh-add -l displays the identities currently held by the agent.
 
@@ -90,13 +90,13 @@
 
      $HOME/.ssh/id_dsa
              Contains the protocol version 2 DSA authentication identity of
-             the user.  It is possible to contain identity plus x509 certifi-
-             cate.
+             the user.  It is possible to contain private key followed by
+             X.509 certificate that match it.
 
      $HOME/.ssh/id_rsa
              Contains the protocol version 2 RSA authentication identity of
-             the user.  It is possible to contain identity plus x509 certifi-
-             cate.
+             the user.  It is possible to contain private key followed by
+             X.509 certificate that match it.
 
      /tmp/ssh-XXXXXXXXXX/agent.<ppid>
              Unix-domain sockets used to contain the connection to the authen-
diff -ruN openssh-3.8.1p1+x509h/ssh-agent.1 openssh-3.8.1p1+x509-5.1/ssh-agent.1
--- openssh-3.8.1p1+x509h/ssh-agent.1	2004-04-21 09:06:00.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/ssh-agent.1	2004-11-19 09:06:00.000000000 +0200
@@ -122,7 +122,7 @@
 asks for the passphrase (using a small X11 application if running
 under X11, or from the terminal if running without X).
 It then sends the identity to the agent.
-Identity can contain in addition a X.509 certificate.
+Identity can by X.509 certificate that match private key.
 Several identities can be stored in the
 agent; the agent can automatically use any of these identities.
 .Ic ssh-add -l
@@ -174,10 +174,12 @@
 Contains the protocol version 1 RSA authentication identity of the user.
 .It Pa $HOME/.ssh/id_dsa
 Contains the protocol version 2 DSA authentication identity of the user.
-It is possible to contain identity plus x509 certificate.
+It is possible to contain private key
+followed by X.509 certificate that match it.
 .It Pa $HOME/.ssh/id_rsa
 Contains the protocol version 2 RSA authentication identity of the user.
-It is possible to contain identity plus x509 certificate.
+It is possible to contain private key
+followed by X.509 certificate that match it.
 .It Pa /tmp/ssh-XXXXXXXXXX/agent.<ppid>
 Unix-domain sockets used to contain the connection to the
 authentication agent.
diff -ruN openssh-3.8.1p1+x509h/ssh.c openssh-3.8.1p1+x509-5.1/ssh.c
--- openssh-3.8.1p1+x509h/ssh.c	2004-03-22 00:36:01.000000000 +0200
+++ openssh-3.8.1p1+x509-5.1/ssh.c	2004-11-19 09:06:01.000000000 +0200
@@ -18,6 +18,9 @@
  * Modified to work with SSL by Niels Provos <provos@citi.umich.edu>
  * in Canada (German citizen).
  *
+ * X509 certificates support:
+ * Copyright (c) 2002-2003 Roumen Petrov.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -40,10 +43,14 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.209 2004/03/11 10:21:17 markus Exp $");
+RCSID("$OpenBSD$");
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
+#ifdef LDAP_ENABLED
+/* OpenSSL extension defined in x509_by_ldap.c */
+extern void ERR_load_X509byLDAP_strings(void);
+#endif
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -79,6 +86,9 @@
 char *__progname;
 #endif
 
+/* ssh-x509.c needs this */
+extern int (*pssh_x509cert_check)(X509 *cert);
+
 /* Flag indicating whether debug mode is on.  This can be set on the command line. */
 int debug_flag = 0;
 
@@ -177,6 +187,7 @@
 
 	__progname = ssh_get_progname(av[0]);
 	init_rng();
+	pssh_x509cert_check = ssh_x509cert_check;
 
 	/*
 	 * Save the original real uid.  It will be needed later (uid-swapping
@@ -470,6 +481,9 @@
 
 	SSLeay_add_all_algorithms();
 	ERR_load_crypto_strings();
+#ifdef LDAP_ENABLED
+	ERR_load_X509byLDAP_strings();
+#endif
 
 	/* Initialize the command to execute on remote host. */
 	buffer_init(&command);
diff -ruN openssh-3.8.1p1+x509h/ssh_config openssh-3.8.1p1+x509-5.1/ssh_config
--- openssh-3.8.1p1+x509h/ssh_config	2004-04-21 09:06:00.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/ssh_config	2004-11-19 09:06:00.000000000 +0200
@@ -37,6 +37,7 @@
 #   EscapeChar ~
 #   X509rsaSigType=md5
 #   AllowedCertPurpose sslserver
+#   MandatoryCRL no
 #   CACertificateFile /etc/ssh/ca/ca-bundle.crt
 #   CACertificatePath /etc/ssh/ca/crt
 #   CARevocationFile /etc/ssh/ca/ca-bundle.crl
diff -ruN openssh-3.8.1p1+x509h/ssh_config.0 openssh-3.8.1p1+x509-5.1/ssh_config.0
--- openssh-3.8.1p1+x509h/ssh_config.0	2004-04-21 09:06:00.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/ssh_config.0	2004-11-19 09:06:00.000000000 +0200
@@ -71,27 +71,38 @@
              work if UsePrivilegedPort is set to ``yes''.
 
      CACertificateFile
-             This file contain multiple certificates of certificate signers in
-             PEM format concatenated together. The default is
-             /etc/ssh/ca/ca-bundle.crt.
+             ``X509 store'' option: This file contain multiple certificates of
+             certificate signers in PEM format concatenated together. The
+             default is /etc/ssh/ca/ca-bundle.crt.
 
      CACertificatePath
-             ``Hash dir'' with certificates of certificate signers. Each cer-
-             tificate should be stored in separate file with name [HASH].[NUM-
-             BER], where [HASH] is certificate hash value and [NUMBER] is an
-             integer starting from zero.  The default is /etc/ssh/ca/crt.
+             ``X509 store'' option: ``Hash dir'' with certificates of certifi-
+             cate signers. Each certificate should be stored in separate file
+             with name [HASH].[NUMBER], where [HASH] is certificate hash value
+             and [NUMBER] is an integer starting from zero.  The default is
+             /etc/ssh/ca/crt.
+
+     CAldapVersion
+             ``X509 store'' option: Specifies LDAP protocol version.  The
+             default depend from LDAP library.
+
+     CAldapURL
+             ``X509 store'' option: Specifies hostport and dn of LDAP URLs
+             (Uniform Resource Locators) as detailed in RFC 2255. The rest of
+             URL is build internally.  Because of OpenSSH options parser limi-
+             tation use `%3D' instead of `=' !
 
      CARevocationFile
-             This file contain multiple ``Certificate Revocation List'' (CRL)
-             of certificate signers in PEM format concatenated together.  The
-             default is /etc/ssh/ca/ca-bundle.crl.
+             ``X509 store'' option: This file contain multiple ``Certificate
+             Revocation List'' (CRL) of certificate signers in PEM format con-
+             catenated together.  The default is /etc/ssh/ca/ca-bundle.crl.
 
      CARevocationPath
-             ``Hash dir'' with ``Certificate Revocation List'' (CRL) of cer-
-             tificate signers. Each CRL should be stored in separate file with
-             name [HASH].r[NUMBER], where [HASH] is CRL hash value and [NUM-
-             BER] is an integer starting from zero. The default is
-             /etc/ssh/ca/crl.
+             ``X509 store'' option: ``Hash dir'' with ``Certificate Revocation
+             List'' (CRL) of certificate signers. Each CRL should be stored in
+             separate file with name [HASH].r[NUMBER], where [HASH] is CRL
+             hash value and [NUMBER] is an integer starting from zero. The
+             default is /etc/ssh/ca/crl.
 
      ChallengeResponseAuthentication
              Specifies whether to use challenge response authentication.  The
@@ -265,12 +276,12 @@
              identity is read.  The default is $HOME/.ssh/identity for proto-
              col version 1, and $HOME/.ssh/id_rsa and $HOME/.ssh/id_dsa for
              protocol version 2.  For version 2 is possible identity file to
-             contain key plus X.509 certificate.  Additionally, any identities
-             represented by the authentication agent will be used for authen-
-             tication.  The file name may use the tilde syntax to refer to a
-             user's home directory.  It is possible to have multiple identity
-             files specified in configuration files; all these identities will
-             be tried in sequence.
+             contain key followed by X.509 certificate that match the key.
+             Additionally, any identities represented by the authentication
+             agent will be used for authentication.  The file name may use the
+             tilde syntax to refer to a user's home directory.  It is possible
+             to have multiple identity files specified in configuration files;
+             all these identities will be tried in sequence.
 
      IdentitiesOnly
              Specifies that ssh should only use the authentication identity
@@ -302,6 +313,11 @@
              be comma-separated.  The default is
              ``hmac-md5,hmac-sha1,hmac-ripemd160,hmac-sha1-96,hmac-md5-96''.
 
+     MandatoryCRL
+             ``X509 store'' option: Specifies whether CRL must present in
+             store for all certificates in ``certificate chain'' with atribute
+             ``X509v3 CRL Distribution Points''.  The default is ``no''.
+
      NoHostAuthenticationForLocalhost
              This option can be used if the home directory is shared across
              machines.  In this case localhost will refer to a different
@@ -453,16 +469,26 @@
              mand line.
 
      UserCACertificateFile
-             User CACertificateFile , the default is ~/.ssh/ca-bundle.crt.
+             ``X509 store'' option: User CACertificateFile , the default is
+             ~/.ssh/ca-bundle.crt.
 
      UserCACertificatePath
-             User CACertificatePath , the default is ~/.ssh/crt.
+             ``X509 store'' option: User CACertificatePath , the default is
+             ~/.ssh/crt.
+
+     UserCAldapVersion
+             ``X509 store'' option: User CAldapVersion.
+
+     UserCAldapURL
+             ``X509 store'' option: User CAldapURL.
 
      UserCARevocationFile
-             User CARevocationFile , the default is ~/.ssh/ca-bundle.crl.
+             ``X509 store'' option: User CARevocationFile , the default is
+             ~/.ssh/ca-bundle.crl.
 
      UserCARevocationPath
-             User CARevocationPath , the default is ~/.ssh/crl.
+             ``X509 store'' option: User CARevocationPath , the default is
+             ~/.ssh/crl.
 
      UserKnownHostsFile
              Specifies a file to use for the user host key database instead of
diff -ruN openssh-3.8.1p1+x509h/ssh_config.5 openssh-3.8.1p1+x509-5.1/ssh_config.5
--- openssh-3.8.1p1+x509h/ssh_config.5	2004-04-21 09:06:00.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/ssh_config.5	2004-11-19 09:06:00.000000000 +0200
@@ -175,28 +175,47 @@
 .Cm UsePrivilegedPort
 is set to
 .Dq yes .
-.Pp
 .It Cm CACertificateFile
+.Dq X509 store
+option:
 This file contain multiple certificates of certificate signers in
 PEM format concatenated together. The default is
 .Pa /etc/ssh/ca/ca-bundle.crt .
-.Pp
 .It Cm CACertificatePath
+.Dq X509 store
+option:
 .Dq "Hash dir"
 with certificates of certificate signers. Each certificate should be
 stored in separate file with name [HASH].[NUMBER], where [HASH] is
 certificate hash value and [NUMBER] is an integer starting from zero.
 The default is
 .Pa /etc/ssh/ca/crt .
-.Pp
+.It Cm CAldapVersion
+.Dq X509 store
+option:
+Specifies LDAP protocol version.
+The default depend from LDAP library.
+.It Cm CAldapURL
+.Dq X509 store
+option:
+Specifies hostport and dn of LDAP URLs (Uniform Resource Locators)
+as detailed in RFC 2255. The rest of URL is build internally.
+Because of OpenSSH options parser limitation use 
+.Sq %3D
+instead of
+.Sq = 
+!
 .It Cm CARevocationFile
+.Dq X509 store
+option:
 This file contain multiple
 .Dq "Certificate Revocation List"
 (CRL) of certificate signers in PEM format concatenated together.
 The default is
 .Pa /etc/ssh/ca/ca-bundle.crl .
-.Pp
 .It Cm CARevocationPath
+.Dq X509 store
+option:
 .Dq "Hash dir"
 with
 .Dq "Certificate Revocation List"
@@ -461,7 +480,8 @@
 and
 .Pa $HOME/.ssh/id_dsa
 for protocol version 2.
-For version 2 is possible identity file to contain key plus X.509 certificate.
+For version 2 is possible identity file to contain key
+followed by X.509 certificate that match the key.
 Additionally, any identities represented by the authentication agent
 will be used for authentication.
 The file name may use the tilde
@@ -513,6 +533,15 @@
 Multiple algorithms must be comma-separated.
 The default is
 .Dq hmac-md5,hmac-sha1,hmac-ripemd160,hmac-sha1-96,hmac-md5-96 .
+.It Cm MandatoryCRL
+.Dq X509 store
+option:
+Specifies whether CRL must present in store for all certificates in
+.Dq certificate chain
+with atribute
+.Dq X509v3 CRL Distribution Points .
+The default is
+.Dq no .
 .It Cm NoHostAuthenticationForLocalhost
 This option can be used if the home directory is shared across machines.
 In this case localhost will refer to a different machine on each of
@@ -750,26 +779,40 @@
 This can be useful when a different user name is used on different machines.
 This saves the trouble of
 having to remember to give the user name on the command line.
-.Pp
 .It Cm UserCACertificateFile
+.Dq X509 store
+option:
 User
 .Cm CACertificateFile
 , the default is
 .Pa ~/.ssh/ca-bundle.crt .
-.Pp
 .It Cm UserCACertificatePath
+.Dq X509 store
+option:
 User
 .Cm CACertificatePath
 , the default is
 .Pa ~/.ssh/crt .
-.Pp
+.It Cm UserCAldapVersion
+.Dq X509 store
+option:
+User
+.Cm CAldapVersion .
+.It Cm UserCAldapURL
+.Dq X509 store
+option:
+User
+.Cm CAldapURL .
 .It Cm UserCARevocationFile
+.Dq X509 store
+option:
 User
 .Cm CARevocationFile
 , the default is
 .Pa ~/.ssh/ca-bundle.crl .
-.Pp
 .It Cm UserCARevocationPath
+.Dq X509 store
+option:
 User
 .Cm CARevocationPath
 , the default is
diff -ruN openssh-3.8.1p1+x509h/sshconnect.c openssh-3.8.1p1+x509-5.1/sshconnect.c
--- openssh-3.8.1p1+x509h/sshconnect.c	2004-04-21 09:06:01.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/sshconnect.c	2004-11-19 09:06:01.000000000 +0200
@@ -760,7 +760,7 @@
 				subject = x509key_subject(host_key);
 				snprintf(extramsg, sizeof(extramsg),
 				    "Distinguished name is %.*s.\n",
-				    X509KEY_SUBJECT_MAXLEN, subject);
+				    (int) X509_NAME_MAXLEN, subject);
 			} else {
 				subject = NULL;
 				*extramsg = '\0';
@@ -1092,7 +1092,7 @@
 	if ((host_key->type == KEY_X509_RSA) || (host_key->type == KEY_X509_DSA)) {
 		char *subject = x509key_subject(host_key);
 		error("Distinguished name sent by remote host is\n%.*s.",
-		    X509KEY_SUBJECT_MAXLEN, subject);
+		    (int) X509_NAME_MAXLEN, subject);
 		xfree(subject);
 	}
 	error("Please contact your system administrator.");
diff -ruN openssh-3.8.1p1+x509h/sshd.0 openssh-3.8.1p1+x509-5.1/sshd.0
--- openssh-3.8.1p1+x509h/sshd.0	2004-04-21 09:06:00.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/sshd.0	2004-11-19 09:06:00.000000000 +0200
@@ -60,10 +60,11 @@
 
    SSH protocol version 2
      Version 2 works similarly: Each host has a host-specific key (RSA or DSA)
-     used to identify the host.  It is possible host key to contain key plus
-     X.509 certificate.  However, when the daemon starts, it does not generate
-     a server key.  Forward security is provided through a Diffie-Hellman key
-     agreement.  This key agreement results in a shared session key.
+     used to identify the host.  It is possible host key to contain private
+     key followed by X.509 certificate that match it.  However, when the dae-
+     mon starts, it does not generate a server key.  Forward security is pro-
+     vided through a Diffie-Hellman key agreement.  This key agreement results
+     in a shared session key.
 
      The rest of the session is encrypted using a symmetric cipher, currently
      128-bit AES, Blowfish, 3DES, CAST128, Arcfour, 192-bit AES, or 256-bit
@@ -142,8 +143,8 @@
              /etc/ssh/ssh_host_rsa_key and /etc/ssh/ssh_host_dsa_key for pro-
              tocol version 2.  It is possible to have multiple host key files
              for the different protocol versions and host key algorithms.  It
-             is possible host key for protocol version 2 to contain key plus
-             X.509 certificate.
+             is possible host key for protocol version 2 to contain private
+             key followed by X.509 certificate that match it.
 
      -i      Specifies that sshd is being run from inetd(8).  sshd is normally
              not run from inetd because it needs to generate the server key
@@ -396,21 +397,22 @@
      /etc/ssh/ssh_host_key, /etc/ssh/ssh_host_dsa_key,
              /etc/ssh/ssh_host_rsa_key
              These three files contain the private parts of the host keys.  It
-             is possible to contain private part plus X.509 certificate for
-             protocol version 2 keys.  These files should only be owned by
-             root, readable only by root, and not accessible to others.  Note
-             that sshd does not start if this file is group/world-accessible.
+             is possible to contain private part followed by X.509 certificate
+             that match it for protocol version 2 keys.  These files should
+             only be owned by root, readable only by root, and not accessible
+             to others.  Note that sshd does not start if this file is
+             group/world-accessible.
 
      /etc/ssh/ssh_host_key.pub, /etc/ssh/ssh_host_dsa_key.pub,
              /etc/ssh/ssh_host_rsa_key.pub
              These three files contain the public parts of the host keys.
              These files should be world-readable but writable only by root.
              Their contents should match the respective private parts.  Note
-             that when corresponding host key contain a certificate in addi-
-             tion these file must contains that certificate.  These files are
-             not really used for anything; they are provided for the conve-
-             nience of the user so their contents can be copied to known hosts
-             files.  These files are created using ssh-keygen(1).
+             that when corresponding host key contain X.509 certificate these
+             files must contains that certificate.  These files are not really
+             used for anything; they are provided for the convenience of the
+             user so their contents can be copied to known hosts files.  These
+             files are created using ssh-keygen(1).
 
      /etc/moduli
              Contains Diffie-Hellman groups used for the "Diffie-Hellman Group
diff -ruN openssh-3.8.1p1+x509h/sshd.8 openssh-3.8.1p1+x509-5.1/sshd.8
--- openssh-3.8.1p1+x509h/sshd.8	2004-04-21 09:06:00.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/sshd.8	2004-11-19 09:06:00.000000000 +0200
@@ -153,7 +153,8 @@
 .Ss SSH protocol version 2
 Version 2 works similarly:
 Each host has a host-specific key (RSA or DSA) used to identify the host.
-It is possible host key to contain key plus X.509 certificate.
+It is possible host key to contain private key
+followed by X.509 certificate that match it.
 However, when the daemon starts, it does not generate a server key.
 Forward security is provided through a Diffie-Hellman key agreement.
 This key agreement results in a shared session key.
@@ -261,8 +262,8 @@
 for protocol version 2.
 It is possible to have multiple host key files for
 the different protocol versions and host key algorithms.
-It is possible host key for protocol version 2 to contain key plus X.509
-certificate.
+It is possible host key for protocol version 2 to contain private key
+followed by X.509 certificate that match it.
 .It Fl i
 Specifies that
 .Nm
@@ -641,8 +642,9 @@
 .Xr sshd_config 5 .
 .It Pa /etc/ssh/ssh_host_key, /etc/ssh/ssh_host_dsa_key, /etc/ssh/ssh_host_rsa_key
 These three files contain the private parts of the host keys.
-It is possible to contain private part plus X.509 certificate for
-protocol version 2 keys.
+It is possible to contain private part
+followed by X.509 certificate that match it
+for protocol version 2 keys.
 These files should only be owned by root, readable only by root, and not
 accessible to others.
 Note that
@@ -653,8 +655,8 @@
 These files should be world-readable but writable only by
 root.
 Their contents should match the respective private parts.
-Note that when corresponding host key contain a certificate
-in addition these file must contains that certificate.
+Note that when corresponding host key contain X.509 certificate
+these files must contains that certificate.
 These files are not
 really used for anything; they are provided for the convenience of
 the user so their contents can be copied to known hosts files.
diff -ruN openssh-3.8.1p1+x509h/sshd.c openssh-3.8.1p1+x509-5.1/sshd.c
--- openssh-3.8.1p1+x509h/sshd.c	2004-04-21 09:06:01.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/sshd.c	2004-11-19 09:06:01.000000000 +0200
@@ -105,6 +105,9 @@
 char *__progname;
 #endif
 
+/* ssh-x509.c needs this */
+extern int (*pssh_x509cert_check)(X509 *cert);
+
 /* Server configuration options. */
 ServerOptions options;
 
@@ -821,6 +824,7 @@
 #endif
 	__progname = ssh_get_progname(av[0]);
 	init_rng();
+	pssh_x509cert_check = ssh_x509cert_check;
 
 	/* Save argv. Duplicate so setproctitle emulation doesn't clobber it */
 	saved_argc = ac;
diff -ruN openssh-3.8.1p1+x509h/sshd_config openssh-3.8.1p1+x509-5.1/sshd_config
--- openssh-3.8.1p1+x509h/sshd_config	2004-04-21 09:06:00.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/sshd_config	2004-11-19 09:06:00.000000000 +0200
@@ -32,6 +32,10 @@
 #  - "skip" or ""(empty): don`t check purpose.
 #AllowedCertPurpose sslclient
 
+# Specifies whether CRL must present in store for all certificates in
+# certificate chain with atribute "cRLDistributionPoints"
+#MandatoryCRL no
+
 # A file with multiple certificates of certificate signers
 # in PEM format concatenated together.
 #CACertificateFile /etc/ssh/ca/ca-bundle.crt
@@ -50,6 +54,15 @@
 # or have symbolic links to them of this form.
 #CARevocationPath /etc/ssh/ca/crl
 
+# LDAP protocol version.
+# Example:
+# CAldapVersion 2
+
+# Note because of OpenSSH options parser limitation
+# use %3D instead of = !
+# Example:
+# CAldapURL ldap://localhost:389/dc%3Dexample,dc%3Dcom
+
 # SSH can use "Online Certificate Status Protocol"(OCSP)
 # to validate certificate. Set VAType to
 #  - none    : do not use OCSP to validate certificates;
diff -ruN openssh-3.8.1p1+x509h/sshd_config.0 openssh-3.8.1p1+x509-5.1/sshd_config.0
--- openssh-3.8.1p1+x509h/sshd_config.0	2004-04-21 09:06:00.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/sshd_config.0	2004-11-19 09:06:00.000000000 +0200
@@ -22,7 +22,6 @@
              o   `sslclient' , `SSL client' , `SSL_client' or `client' ;
              o   `any' , `Any Purpose' , `Any_Purpose' or `AnyPurpose' ;
              o   `skip' or `' (empty): do not check purpose.
-
              The default is ``sslclient''.
 
      AllowGroups
@@ -67,27 +66,38 @@
              protocol version 2.  By default, no banner is displayed.
 
      CACertificateFile
-             This file contain multiple certificates of certificate signers in
-             PEM format concatenated together. The default is
-             /etc/ssh/ca/ca-bundle.crt.
+             ``X509 store'' option: This file contain multiple certificates of
+             certificate signers in PEM format concatenated together. The
+             default is /etc/ssh/ca/ca-bundle.crt.
 
      CACertificatePath
-             ``Hash dir'' with certificates of certificate signers. Each cer-
-             tificate should be stored in separate file with name [HASH].[NUM-
-             BER], where [HASH] is certificate hash value and [NUMBER] is an
-             integer starting from zero.  The default is /etc/ssh/ca/crt.
+             ``X509 store'' option: ``Hash dir'' with certificates of certifi-
+             cate signers. Each certificate should be stored in separate file
+             with name [HASH].[NUMBER], where [HASH] is certificate hash value
+             and [NUMBER] is an integer starting from zero.  The default is
+             /etc/ssh/ca/crt.
+
+     CAldapVersion
+             ``X509 store'' option: Specifies LDAP protocol version.  The
+             default is not specified and depend from LDAP library.
+
+     CAldapURL
+             ``X509 store'' option: Specifies hostport and dn(distinguished
+             name) of LDAP URLs (Uniform Resource Locators) as detailed in RFC
+             2255.  The rest of URL is build internally.  Because of OpenSSH
+             options parser limitation use `%3D' instead of `=' !
 
      CARevocationFile
-             This file contain multiple ``Certificate Revocation List'' (CRL)
-             of certificate signers in PEM format concatenated together.  The
-             default is /etc/ssh/ca/ca-bundle.crl.
+             ``X509 store'' option: This file contain multiple ``Certificate
+             Revocation List'' (CRL) of certificate signers in PEM format con-
+             catenated together.  The default is /etc/ssh/ca/ca-bundle.crl.
 
      CARevocationPath
-             ``Hash dir'' with ``Certificate Revocation List'' (CRL) of cer-
-             tificate signers. Each CRL should be stored in separate file with
-             name [HASH].r[NUMBER], where [HASH] is CRL hash value and [NUM-
-             BER] is an integer starting from zero. The default is
-             /etc/ssh/ca/crl.
+             ``X509 store'' option: ``Hash dir'' with ``Certificate Revocation
+             List'' (CRL) of certificate signers. Each CRL should be stored in
+             separate file with name [HASH].r[NUMBER], where [HASH] is CRL
+             hash value and [NUMBER] is an integer starting from zero. The
+             default is /etc/ssh/ca/crl.
 
      ChallengeResponseAuthentication
              Specifies whether challenge response authentication is allowed.
@@ -167,6 +177,11 @@
              cache on logout.  The default is ``yes''.  Note that this option
              applies to protocol version 2 only.
 
+     HostbasedAlgorithms
+             Specifies the protocol version 2 algorithms used in ``hostbased''
+             authentication that the server accept.  The default is all sup-
+             ported by server.
+
      HostbasedAuthentication
              Specifies whether rhosts or /etc/hosts.equiv authentication
              together with successful public key client host authentication is
@@ -182,7 +197,8 @@
              is group/world-accessible.  It is possible to have multiple host
              key files.  ``rsa1'' keys are used for version 1 and ``dsa'' or
              ``rsa'' are used for version 2 of the SSH protocol.  It is possi-
-             ble host key to contain key plus X.509 certificate for version 2.
+             ble host key to contain private key followed by X.509 certificate
+             that match it for version 2.
 
      IgnoreRhosts
              Specifies that .rhosts and .shosts files will not be used in
@@ -258,6 +274,11 @@
              rated.  The default is
              ``hmac-md5,hmac-sha1,hmac-ripemd160,hmac-sha1-96,hmac-md5-96''.
 
+     MandatoryCRL
+             ``X509 store'' option: Specifies whether CRL must present in
+             store for all certificates in ``certificate chain'' with atribute
+             ``X509v3 CRL Distribution Points''.  The default is ``no''.
+
      MaxStartups
              Specifies the maximum number of concurrent unauthenticated con-
              nections to the sshd daemon.  Additional connections will be
@@ -331,6 +352,11 @@
              selects among multiple protocol versions offered by the server.
              Specifying ``2,1'' is identical to ``1,2''.
 
+     PubkeyAlgorithms
+             Specifies the protocol version 2 algorithms used in ``publickey''
+             authentication that the server accept.  The default is all sup-
+             ported by server.
+
      PubkeyAuthentication
              Specifies whether public key authentication is allowed.  The
              default is ``yes''.  Note that this option applies to protocol
diff -ruN openssh-3.8.1p1+x509h/sshd_config.5 openssh-3.8.1p1+x509-5.1/sshd_config.5
--- openssh-3.8.1p1+x509h/sshd_config.5	2004-04-21 09:06:00.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/sshd_config.5	2004-11-19 09:06:00.000000000 +0200
@@ -92,10 +92,8 @@
 ..
 (empty): do not check purpose.
 .El
-.Pp
 The default is
 .Dq sslclient .
-.Pp
 .It Cm AllowGroups
 This keyword can be followed by a list of group name patterns, separated
 by spaces.
@@ -155,28 +153,47 @@
 authentication is allowed.
 This option is only available for protocol version 2.
 By default, no banner is displayed.
-.Pp
 .It Cm CACertificateFile
+.Dq X509 store
+option:
 This file contain multiple certificates of certificate signers in
 PEM format concatenated together. The default is
 .Pa /etc/ssh/ca/ca-bundle.crt .
-.Pp
 .It Cm CACertificatePath
+.Dq X509 store
+option:
 .Dq "Hash dir"
 with certificates of certificate signers. Each certificate should be
 stored in separate file with name [HASH].[NUMBER], where [HASH] is
 certificate hash value and [NUMBER] is an integer starting from zero.
 The default is
 .Pa /etc/ssh/ca/crt .
-.Pp
+.It Cm CAldapVersion
+.Dq X509 store
+option:
+Specifies LDAP protocol version.
+The default is not specified and depend from LDAP library.
+.It Cm CAldapURL
+.Dq X509 store
+option:
+Specifies hostport and dn(distinguished name) of LDAP URLs (Uniform Resource Locators) as detailed in RFC 2255.
+The rest of URL is build internally.
+Because of OpenSSH options parser limitation use 
+.Sq %3D
+instead of
+.Sq = 
+!
 .It Cm CARevocationFile
+.Dq X509 store
+option:
 This file contain multiple
 .Dq "Certificate Revocation List"
 (CRL) of certificate signers in PEM format concatenated together.
 The default is
 .Pa /etc/ssh/ca/ca-bundle.crl .
-.Pp
 .It Cm CARevocationPath
+.Dq X509 store
+option:
 .Dq "Hash dir"
 with
 .Dq "Certificate Revocation List"
@@ -300,6 +317,11 @@
 The default is
 .Dq yes .
 Note that this option applies to protocol version 2 only.
+.It Cm HostbasedAlgorithms
+Specifies the protocol version 2 algorithms used in 
+.Dq hostbased
+authentication that the server accept.
+The default is all supported by server.
 .It Cm HostbasedAuthentication
 Specifies whether rhosts or /etc/hosts.equiv authentication together
 with successful public key client host authentication is allowed
@@ -329,7 +351,8 @@
 or
 .Dq rsa
 are used for version 2 of the SSH protocol.
-It is possible host key to contain key plus X.509 certificate
+It is possible host key to contain private key
+followed by X.509 certificate that match it
 for version 2.
 .It Cm IgnoreRhosts
 Specifies that
@@ -452,6 +475,15 @@
 Multiple algorithms must be comma-separated.
 The default is
 .Dq hmac-md5,hmac-sha1,hmac-ripemd160,hmac-sha1-96,hmac-md5-96 .
+.It Cm MandatoryCRL
+.Dq X509 store
+option:
+Specifies whether CRL must present in store for all certificates in
+.Dq certificate chain
+with atribute
+.Dq X509v3 CRL Distribution Points .
+The default is
+.Dq no .
 .It Cm MaxStartups
 Specifies the maximum number of concurrent unauthenticated connections to the
 .Nm sshd
@@ -580,6 +612,11 @@
 .Dq 2,1
 is identical to
 .Dq 1,2 .
+.It Cm PubkeyAlgorithms
+Specifies the protocol version 2 algorithms used in 
+.Dq publickey
+authentication that the server accept.
+The default is all supported by server.
 .It Cm PubkeyAuthentication
 Specifies whether public key authentication is allowed.
 The default is
diff -ruN openssh-3.8.1p1+x509h/ssh-keygen.0 openssh-3.8.1p1+x509-5.1/ssh-keygen.0
--- openssh-3.8.1p1+x509h/ssh-keygen.0	2004-04-21 09:06:00.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/ssh-keygen.0	2004-11-19 09:06:00.000000000 +0200
@@ -212,13 +212,14 @@
 
      $HOME/.ssh/id_dsa
              Contains the protocol version 2 DSA authentication identity of
-             the user.  It is possible to contain identity plus X.509 certifi-
-             cate.  This file should not be readable by anyone but the user.
-             It is possible to specify a passphrase when generating the key;
-             that passphrase will be used to encrypt the private part of this
-             file using 3DES.  This file is not automatically accessed by
-             ssh-keygen but it is offered as the default file for the private
-             key.  ssh(1) will read this file when a login attempt is made.
+             the user.  It is possible to contain private key followed by
+             X.509 certificate that match it.  This file should not be read-
+             able by anyone but the user.  It is possible to specify a
+             passphrase when generating the key; that passphrase will be used
+             to encrypt the private part of this file using 3DES.  This file
+             is not automatically accessed by ssh-keygen but it is offered as
+             the default file for the private key.  ssh(1) will read this file
+             when a login attempt is made.
 
      $HOME/.ssh/id_dsa.pub
              Contains the protocol version 2 DSA public key for authentica-
@@ -226,22 +227,24 @@
              $HOME/.ssh/authorized_keys on all machines where the user wishes
              to log in using public key authentication.  There is no need to
              keep the contents of this file secret.  When file
-             $HOME/.ssh/id_dsa contain DSA identity plus X.509 certificate
-             this file must contain that certificate! Use ssh-keygen with
-             option -y to regenerate its content.  Note in case with X.509
-             certificate you can append content to $HOME/.ssh/authorized_keys
-             or to add certificate ``Distinguished Name'' / ``Subject'' in
-             corresponding format to ``authorized keys'' file. See sshd(8).
+             $HOME/.ssh/id_dsa contain DSA private key followed by X.509 cer-
+             tificate this file must contain that certificate!  Use ssh-keygen
+             with option -y to regenerate its content.  Note in case with
+             X.509 certificate you can append content to
+             $HOME/.ssh/authorized_keys or to add certificate ``Distinguished
+             Name'' / ``Subject'' in corresponding format to ``authorized
+             keys'' file. See sshd(8).
 
      $HOME/.ssh/id_rsa
              Contains the protocol version 2 RSA authentication identity of
-             the user.  It is possible to contain identity plus X.509 certifi-
-             cate.  This file should not be readable by anyone but the user.
-             It is possible to specify a passphrase when generating the key;
-             that passphrase will be used to encrypt the private part of this
-             file using 3DES.  This file is not automatically accessed by
-             ssh-keygen but it is offered as the default file for the private
-             key.  ssh(1) will read this file when a login attempt is made.
+             the user.  It is possible to contain private key followed by
+             X.509 certificate that match it.  This file should not be read-
+             able by anyone but the user.  It is possible to specify a
+             passphrase when generating the key; that passphrase will be used
+             to encrypt the private part of this file using 3DES.  This file
+             is not automatically accessed by ssh-keygen but it is offered as
+             the default file for the private key.  ssh(1) will read this file
+             when a login attempt is made.
 
      $HOME/.ssh/id_rsa.pub
              Contains the protocol version 2 RSA public key for authentica-
@@ -249,12 +252,13 @@
              $HOME/.ssh/authorized_keys on all machines where the user wishes
              to log in using public key authentication.  There is no need to
              keep the contents of this file secret.  When file
-             $HOME/.ssh/id_rsa contain RSA identity plus X.509 certificate
-             this file must contain that certificate! Use ssh-keygen with
-             option -y to regenerate its content.  Note in case with X.509
-             certificate you can append content to $HOME/.ssh/authorized_keys
-             or to add certificate ``Distinguished Name'' / ``Subject'' in
-             corresponding format to ``authorized keys'' file. See sshd(8).
+             $HOME/.ssh/id_rsa contain RSA private key followed by X.509 cer-
+             tificate this file must contain that certificate!  Use ssh-keygen
+             with option -y to regenerate its content.  Note in case with
+             X.509 certificate you can append content to
+             $HOME/.ssh/authorized_keys or to add certificate ``Distinguished
+             Name'' / ``Subject'' in corresponding format to ``authorized
+             keys'' file. See sshd(8).
 
      /etc/moduli
              Contains Diffie-Hellman groups used for DH-GEX.  The file format
diff -ruN openssh-3.8.1p1+x509h/ssh-keygen.1 openssh-3.8.1p1+x509-5.1/ssh-keygen.1
--- openssh-3.8.1p1+x509h/ssh-keygen.1	2004-04-21 09:06:00.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/ssh-keygen.1	2004-11-19 09:06:00.000000000 +0200
@@ -357,7 +357,8 @@
 There is no need to keep the contents of this file secret.
 .It Pa $HOME/.ssh/id_dsa
 Contains the protocol version 2 DSA authentication identity of the user.
-It is possible to contain identity plus X.509 certificate.
+It is possible to contain private key
+followed by X.509 certificate that match it.
 This file should not be readable by anyone but the user.
 It is possible to
 specify a passphrase when generating the key; that passphrase will be
@@ -376,8 +377,9 @@
 There is no need to keep the contents of this file secret.
 When file
 .Pa $HOME/.ssh/id_dsa
-contain DSA identity plus X.509 certificate this file must contain
-that certificate! Use
+contain DSA private key followed by X.509 certificate
+this file must contain that certificate!
+Use
 .Nm
 with option -y to regenerate its content.
 Note in case with X.509 certificate you can append content to
@@ -392,7 +394,8 @@
 .Xr sshd 8 .
 .It Pa $HOME/.ssh/id_rsa
 Contains the protocol version 2 RSA authentication identity of the user.
-It is possible to contain identity plus X.509 certificate.
+It is possible to contain private key
+followed by X.509 certificate that match it.
 This file should not be readable by anyone but the user.
 It is possible to
 specify a passphrase when generating the key; that passphrase will be
@@ -411,8 +414,9 @@
 There is no need to keep the contents of this file secret.
 When file
 .Pa $HOME/.ssh/id_rsa
-contain RSA identity plus X.509 certificate this file must contain
-that certificate! Use
+contain RSA private key followed by X.509 certificate
+this file must contain that certificate!
+Use
 .Nm
 with option -y to regenerate its content.
 Note in case with X.509 certificate you can append content to
diff -ruN openssh-3.8.1p1+x509h/ssh-keysign.0 openssh-3.8.1p1+x509-5.1/ssh-keysign.0
--- openssh-3.8.1p1+x509h/ssh-keysign.0	2004-04-21 09:06:00.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/ssh-keysign.0	2004-11-19 09:06:00.000000000 +0200
@@ -29,7 +29,8 @@
              readable only by root, and not accessible to others.  Since they
              are readable only by root, ssh-keysign must be set-uid root if
              hostbased authentication is used.  It is possible host key to
-             contain private parts plus X.509 certificate.
+             contain private parts followed by X.509 certificate that match
+             it.
 
 SEE ALSO
      ssh(1), ssh-keygen(1), ssh_config(5), sshd(8)
diff -ruN openssh-3.8.1p1+x509h/ssh-keysign.8 openssh-3.8.1p1+x509-5.1/ssh-keysign.8
--- openssh-3.8.1p1+x509h/ssh-keysign.8	2004-04-21 09:06:00.000000000 +0300
+++ openssh-3.8.1p1+x509-5.1/ssh-keysign.8	2004-11-19 09:06:00.000000000 +0200
@@ -68,7 +68,8 @@
 Since they are readable only by root,
 .Nm
 must be set-uid root if hostbased authentication is used.
-It is possible host key to contain private parts plus X.509 certificate.
+It is possible host key to contain private parts
+followed by X.509 certificate that match it.
 .El
 .Sh SEE ALSO
 .Xr ssh 1 ,
diff -ruN openssh-3.8.1p1+x509h/ssh-ocsp.c openssh-3.8.1p1+x509-5.1/ssh-ocsp.c
--- openssh-3.8.1p1+x509h/ssh-ocsp.c	2004-03-21 11:37:25.000000000 +0200
+++ openssh-3.8.1p1+x509-5.1/ssh-ocsp.c	2004-11-07 23:24:04.000000000 +0200
@@ -23,9 +23,12 @@
  */
 
 #include "x509store.h"
+#ifndef SSH_OCSP_ENABLED
+#  include "error: OCSP is disabled"
+#endif
 
-#ifdef SSH_OCSP_ENABLED
 #if 0
+#  /* not yet implemented */
 #  define SSH_WITH_SSLOCSP
 #endif
 
@@ -69,7 +72,6 @@
 	n = sizeof(sshva_type_map) / sizeof(sshva_type_map[0]);
 	for (k = 0; k < n; k++) {
 		va_type_map *p = sshva_type_map + k;
-logit("RUMEN: p->code=%s", p->code);
 		if (strcasecmp(type, p->code) == 0) return(p->id);
 	}
 
@@ -145,6 +147,21 @@
 }
 
 
+static void
+openssl_error(const char *ssh_method, const char *openssl_method) {
+	char buf[512];
+
+	ERR_error_string_n(ERR_get_error(), buf, sizeof(buf));
+	/* clear rest of errors in OpenSSL "error buffer" */
+	ERR_clear_error();
+
+	error("%.128s: %.128s fail with errormsg='%.*s'"
+		, ssh_method
+		, openssl_method
+		, (int) sizeof(buf), buf);
+}
+
+
 static char*
 ssh_ASN1_GENERALIZEDTIME_2_string(ASN1_GENERALIZEDTIME *asn1_time) {
 	BIO    *bio;
@@ -197,14 +214,11 @@
 	}
 
 	if (BIO_read_filename(fbio, certs_file) <= 0) {
-		char ebuf[512];
-		error("ssh_load_x509certs:"
-			" File description is '%.512s'."
-			" BIO_read_filename(..., '%.512s')"
-			" fail with errormsg='%.512s'"
+		openssl_error("ssh_load_x509certs", "BIO_read_filename");
+		logit("ssh_load_x509certs:"
+			" description/filename='%.512s'/'%.512s'"
 			, certs_descrip
-			, certs_file
-			, openssl_errormsg(ebuf, sizeof(ebuf)));
+			, certs_file);
 		goto exit;
 	}
 
@@ -249,7 +263,7 @@
 ) {
 	X509        *issuer = NULL;
 	OCSP_CERTID *id = NULL;
-	char         subj[512];
+	char         subj[X509_NAME_MAXLEN];
 
 	if (cert == NULL) {
 		error("ssh_ocspreq_addcert: cert is NULL");
@@ -468,10 +482,7 @@
 #ifndef OPENSSL_NO_SOCK
 	bio_conn = BIO_new_connect(conn->host);
 	if (bio_conn == NULL) {
-		char ebuf[512];
-		error("ssh_ocsp_get_response:"
-			" BIO_new_connect fail with errormsg='%.512s'"
-			, openssl_errormsg(ebuf, sizeof(ebuf)));
+		openssl_error("ssh_ocsp_get_response", "BIO_new_connect");
 		goto exit;
 	}
 #else
@@ -502,19 +513,13 @@
 #endif /*def SSH_WITH_SSLOCSP*/
 
 	if (BIO_do_connect(bio_conn) <= 0) {
-		char ebuf[512];
-		error("ssh_ocsp_get_response:"
-			" BIO_do_connect fail with errormsg='%.512s'"
-			, openssl_errormsg(ebuf, sizeof(ebuf)));
+		openssl_error("ssh_ocsp_get_response", "BIO_do_connect");
 		goto exit;
 	}
 
 	resp = OCSP_sendreq_bio(bio_conn, conn->path, req);
 	if (resp == NULL) {
-		char ebuf[512];
-		error("ssh_ocsp_get_response:"
-			" OCSP_sendreq_bio fail with errormsg='%.512s'"
-			, openssl_errormsg(ebuf, sizeof(ebuf)));
+		openssl_error("ssh_ocsp_get_response", "OCSP_sendreq_bio");
 	}
 
 exit:
@@ -553,10 +558,7 @@
 
 	br = OCSP_response_get1_basic(resp);
 	if (br == NULL) {
-		char ebuf[512];
-		error("ssh_ocsp_get_basicresp: "
-			" OCSP_response_get1_basic fail with errormsg='%.512s'"
-			, openssl_errormsg(ebuf, sizeof(ebuf)));
+		openssl_error("ssh_ocsp_get_basicresp", "OCSP_response_get1_basic");
 		return(NULL);
 	}
 
@@ -565,10 +567,7 @@
 		if (flag == -1) {
 			logit("ssh_ocsp_get_basicresp: WARNING - no nonce in response");
 		} else {
-			char ebuf[512];
-			error("ssh_ocsp_get_basicresp: "
-				" OCSP_check_nonce fail with errormsg='%.512s'"
-				, openssl_errormsg(ebuf, sizeof(ebuf)));
+			openssl_error("ssh_ocsp_get_basicresp", "OCSP_check_nonce");
 			goto error;
 		}
 	}
@@ -578,10 +577,12 @@
 int k;
 logit("ssh_ocsp_get_basicresp: VA certs num=%d", sk_X509_num(vacrts));
 for (k = 0; k < sk_X509_num(vacrts); k++) {
-	char buf[512];
+	char buf[X509_NAME_MAXLEN];
 	X509 *x = sk_X509_value(vacrts, k);
 	X509_NAME_oneline(X509_get_subject_name(x), buf, sizeof(buf));
-	logit("ssh_ocsp_get_basicresp: VA[%d] subject='%.512s'", k, buf);
+	logit("ssh_ocsp_get_basicresp: VA[%d] subject='%.*s'"
+		, k
+		, (int) sizeof(buf), buf);
 }
 }
 #endif /*def SSHOCSPTEST*/
@@ -621,12 +622,8 @@
 		flag = OCSP_basic_verify(br, NULL, x509store, basic_verify_flags);
 	}
 	if (flag <= 0) {
-		char ebuf[512];
-		error("ssh_ocsp_get_basicresp:"
-			" flag=%d"
-			" OCSP_basic_verify fail with errormsg='%.512s'"
-			, flag
-			, openssl_errormsg(ebuf, sizeof(ebuf)));
+		openssl_error("ssh_ocsp_get_basicresp", "OCSP_basic_verify");
+		logit("ssh_ocsp_get_basicresp: flag=%d", flag);
 		goto error;
 	}
 
@@ -641,9 +638,9 @@
 
 
 /*
- * Method return:
+ * Method return value:
  *  1 - all cert.-s are good
- * -1 - error or one cert. with status unknow
+ * -1 - error or at least one cert. with status unknow
  *  0 - otherwise, i.e. at least one cert. is revoked and rest are good
  */
 static int
@@ -695,9 +692,9 @@
 
 		if (get_log_level() >= SYSLOG_LEVEL_DEBUG3) {
 			char *subject = sk_value(subjs, k);
-			debug3("ssh_ocsp_check_validity:"
-				" cert[%d]='%.512s'"
-				, k, subject);
+			debug3("ssh_ocsp_check_validity: cert[%d]='%.*s'"
+				, k
+				, (int) X509_NAME_MAXLEN, subject);
 		}
 
 		if (!OCSP_resp_find_status(
@@ -757,7 +754,7 @@
 
 
 static int
-ssh_ocsp_validate(
+ssh_ocsp_validate2(
 	X509 *cert,
 	X509_STORE *x509store,
 	const ssh_ocsp_conn *ocsp
@@ -776,7 +773,7 @@
 	    (va.certificate_file != NULL)) {
 		vacrts = ssh_load_x509certs(va.certificate_file, "'OCSP Responder' trusted certificates");
 		if (vacrts == NULL) goto exit;
-		debug("ssh_ocsp_validate: VA certs num=%d", sk_X509_num(vacrts));
+		debug("ssh_ocsp_validate2: VA certs num=%d", sk_X509_num(vacrts));
 	}
 
 	if (!ssh_ocspreq_addcert(cert, x509store, req, ids, subjs)) {
@@ -793,7 +790,7 @@
 	{ /*check OCSP response status*/
 		int flag = OCSP_response_status(resp);
 		if (flag != OCSP_RESPONSE_STATUS_SUCCESSFUL) {
-			error("ssh_ocsp_validate:"
+			error("ssh_ocsp_validate2:"
 				" responder error=%d(%.256s)"
 				, flag
 				, OCSP_response_status_str((long/*???*/)flag));
@@ -929,7 +926,7 @@
 			debug("ssh_aiaocsp_validate: cannot create ocsp connection");
 			continue;
 		}
-		ret = ssh_ocsp_validate(cert, x509store, conn);
+		ret = ssh_ocsp_validate2(cert, x509store, conn);
 		ssh_ocsp_conn_free(&conn);
 
 		if (ret >= 0) break;
@@ -940,7 +937,7 @@
 
 
 static int
-ssh_x509_validate4cert(X509 *cert, X509_STORE *x509store) {
+ssh_ocsp_validate4cert(X509 *cert, X509_STORE *x509store) {
 	int found = 0;
 	int ret = -1;
 	int loc = -1;
@@ -955,7 +952,7 @@
 
 		xe = X509_get_ext(cert, loc);
 		if (xe == NULL) {
-			debug("ssh_x509_validate4cert: cannot get x509 extension");
+			debug("ssh_ocsp_validate4cert: cannot get x509 extension");
 			continue;
 		}
 
@@ -972,49 +969,44 @@
 	}
 
 	if (found) {
-		debug3("ssh_x509_validate4cert: validation result=%d", ret);
+		debug3("ssh_ocsp_validate4cert: validation result=%d", ret);
 	} else {
-		debug3("ssh_x509_validate4cert: no OCSP 'Service Locator' URL");
+		debug3("ssh_ocsp_validate4cert: no OCSP 'Service Locator' URL");
 	}
 	return(found ? ret : 1);
 }
-#endif /*def SSH_OCSP_ENABLED*/
 
 
 int
-ssh_x509_validate(X509 *cert, X509_STORE *x509store) {
-#ifndef SSH_OCSP_ENABLED
-	return(1);
-#else
+ssh_ocsp_validate(X509 *cert, X509_STORE *x509store) {
 	int ret = -1;
 	ssh_ocsp_conn	*conn = NULL;
 
 	if (get_log_level() >= SYSLOG_LEVEL_DEBUG3) {
-		char buf[512];
+		char buf[X509_NAME_MAXLEN];
 		X509_NAME_oneline( X509_get_subject_name(cert), buf, sizeof(buf));
-		debug3("ssh_x509_validate: for '%.512s'", buf);
+		debug3("ssh_ocsp_validate: for '%.*s'", (int) sizeof(buf), buf);
 	}
 
 	switch (va.type) {
 	default:
 		/*when something is missing*/
-		fatal("ssh_x509_validate: invalid validator type %d", va.type);
+		fatal("ssh_ocsp_validate: invalid validator type %d", va.type);
 		break; /*;-)*/
 	case SSHVA_NONE:
 		ret = 1;
 		break;
 	case SSHVA_OCSP_CERT:
-		ret = ssh_x509_validate4cert(cert, x509store);
+		ret = ssh_ocsp_validate4cert(cert, x509store);
 		break;
 	case SSHVA_OCSP_SPEC:
 		conn = ssh_ocsp_conn_new(va.responder_url);
 		if (conn != NULL) {
-			ret = ssh_ocsp_validate(cert, x509store, conn);
+			ret = ssh_ocsp_validate2(cert, x509store, conn);
 			ssh_ocsp_conn_free(&conn);
 		}
 		break;
 	}
 
 	return(ret);
-#endif /*def SSH_OCSP_ENABLED*/
 }
diff -ruN openssh-3.8.1p1+x509h/ssh-x509.c openssh-3.8.1p1+x509-5.1/ssh-x509.c
--- openssh-3.8.1p1+x509h/ssh-x509.c	2004-02-22 18:34:20.000000000 +0200
+++ openssh-3.8.1p1+x509-5.1/ssh-x509.c	2004-11-07 11:50:38.000000000 +0200
@@ -21,6 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 #include "ssh-x509.h"
 #include "log.h"
 #include <openssl/err.h>
@@ -31,6 +32,10 @@
 #include "x509store.h"
 #include "compat.h"
 
+int (*pssh_x509cert_check)(X509 *_cert) = NULL;
+int ssh_X509_NAME_cmp(X509_NAME *_a, X509_NAME *_b);
+
+
 static char*
 openssl_errormsg(char *buf, size_t len) {
 	ERR_error_string_n(ERR_get_error(), buf, len);
@@ -291,7 +296,7 @@
 	BIO_write(mbio, blob, blen);
 	BIO_flush(mbio);
 
-	debug3("x509key_from_blob:We have %d bytes available in BIO", BIO_pending(mbio));
+	debug3("x509key_from_blob: We have %d bytes available in BIO", BIO_pending(mbio));
 
 	{ /* read X509 certificate from BIO data */
 		X509* x509 = NULL;
@@ -357,8 +362,8 @@
 
 	if (!x509key_check("x509key_subject", key)) return(buf);
 
-	buf = xmalloc(X509KEY_SUBJECT_MAXLEN); /*fatal on error*/
-	X509_NAME_oneline(X509_get_subject_name(key->x509), buf, X509KEY_SUBJECT_MAXLEN);
+	buf = xmalloc(X509_NAME_MAXLEN); /*fatal on error*/
+	X509_NAME_oneline(X509_get_subject_name(key->x509), buf, X509_NAME_MAXLEN);
 	return(buf);
 }
 
@@ -398,7 +403,7 @@
 int
 x509key_write_subject(const Key *key, FILE *f) {
 	BIO  *out;
-	char  buf[X509KEY_SUBJECT_MAXLEN];
+	char  buf[X509_NAME_MAXLEN];
 
 	if (!x509key_check("x509key_write_subject", key)) return(0);
 
@@ -448,7 +453,7 @@
 x509key_save_cert(FILE *fp, X509 *x509) {
 	int  ret = 0;
 	BIO *out;
-	char buf[X509KEY_SUBJECT_MAXLEN];
+	char buf[X509_NAME_MAXLEN];
 
 	out = BIO_new_fp(fp, BIO_NOCLOSE);
 	if (out == NULL) return(0);
@@ -597,11 +602,26 @@
  *   OpenSSL functions X509_NAME_cmp check nids order in X509_NAME.
  *   i.e. X509_NAME{"/C=XX/O=YY"} is not equal to X509_NAME{"/O=YY/C=XX"}
  */
-static int
+int
 ssh_X509_NAME_cmp(X509_NAME *_a, X509_NAME *_b) {
 	int k, n;
 	X509_NAME *b;
 
+#if 1
+	/*XXX: to call fatal when _a or _b is NULL or to use next*/
+	if (_a == NULL) {
+		return((_b == NULL) ? 0 : 1);
+	} else {
+		if (_b == NULL) return(-1);
+	}
+#else
+	if (_a == NULL) {
+		fatal("ssh_X509_NAME_cmp: first name is NULL");
+	}
+	if (_b == NULL) {
+		fatal("ssh_X509_NAME_cmp: second name is NULL");
+	}
+#endif
 
 	k = sk_X509_NAME_ENTRY_num(_a->entries);
 	n = sk_X509_NAME_ENTRY_num(_b->entries);
@@ -624,8 +644,8 @@
 		nid = OBJ_obj2nid(neA->object);
 		loc = X509_NAME_get_index_by_NID(b, nid, -1);
 		if (loc < 0) {
-			char buf1[X509KEY_SUBJECT_MAXLEN];
-			char buf2[X509KEY_SUBJECT_MAXLEN];
+			char buf1[X509_NAME_MAXLEN];
+			char buf2[X509_NAME_MAXLEN];
 
 			X509_NAME_oneline(_a, buf1, sizeof(buf1));
 			X509_NAME_oneline(_b, buf2, sizeof(buf2));
@@ -947,7 +967,12 @@
 		sigblob = NULL;
 	}
 	if (ret > 0) {
-		ret = ssh_x509cert_check(key->x509);
+		if (pssh_x509cert_check != NULL) {
+			ret = pssh_x509cert_check(key->x509);
+		} else {
+			error("ssh_x509_verify: pssh_x509cert_check is NULL");
+			ret = -1;
+		}
 	}
 	ret = ret > 0 ? 1 : (ret < 0 ? -1 : 0);
 	debug3("ssh_x509_verify: return %d", ret);
diff -ruN openssh-3.8.1p1+x509h/ssh-x509.h openssh-3.8.1p1+x509-5.1/ssh-x509.h
--- openssh-3.8.1p1+x509h/ssh-x509.h	2004-02-22 18:24:36.000000000 +0200
+++ openssh-3.8.1p1+x509-5.1/ssh-x509.h	2004-11-07 11:52:52.000000000 +0200
@@ -24,7 +24,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-
 #include "includes.h"
 #include "key.h"
 #include "buffer.h"
@@ -41,7 +40,6 @@
 Key*	x509key_from_blob(const u_char *blob, int blen);
 int	x509key_to_blob(const Key *key, Buffer *b);
 
-#define X509KEY_SUBJECT_MAXLEN	512
 char*	x509key_subject(const Key *key);
 
 /*
@@ -59,7 +57,6 @@
 
 int	x509key_save_pem(FILE *fp, const Key *key, const EVP_CIPHER *cipher, u_char *passphrase, int len);
 
-
 #ifndef SSH_X509STORE_DISABLED
 int	ssh_x509_equal(const Key *a, const Key *b);
 #endif /*ndef SSH_X509STORE_DISABLED*/
diff -ruN openssh-3.8.1p1+x509h/tests/CA/1-cre_cadb.sh openssh-3.8.1p1+x509-5.1/tests/CA/1-cre_cadb.sh
--- openssh-3.8.1p1+x509h/tests/CA/1-cre_cadb.sh	2004-03-20 12:50:15.000000000 +0200
+++ openssh-3.8.1p1+x509-5.1/tests/CA/1-cre_cadb.sh	2004-10-30 00:17:59.000000000 +0300
@@ -159,12 +159,15 @@
 # Key usage: this is typical for a CA certificate. However since it will
 # prevent it being used as an test self-signed certificate it is best
 # left out by default.
-# Since we generate OpenSSH test CA we comment next line.
-#keyUsage = cRLSign, keyCertSign
+# Since we verify CRL signatures cRLSign must present
+keyUsage = keyCertSign, cRLSign
 
 # PKIX recommendations harmless if included in all certificates.
 subjectKeyIdentifier            = hash
 authorityKeyIdentifier          = keyid:always,issuer:always
+
+# To test CRL presence this extension should exist
+crlDistributionPoints = URI:attribute_only_exist
 EOF
 
 
diff -ruN openssh-3.8.1p1+x509h/tests/CA/5-cre_ldap.sh openssh-3.8.1p1+x509-5.1/tests/CA/5-cre_ldap.sh
--- openssh-3.8.1p1+x509h/tests/CA/5-cre_ldap.sh	1970-01-01 02:00:00.000000000 +0200
+++ openssh-3.8.1p1+x509-5.1/tests/CA/5-cre_ldap.sh	2004-11-08 20:36:45.000000000 +0200
@@ -0,0 +1,169 @@
+#!/bin/sh
+# Copyright (c) 2004 Roumen Petrov, Sofia, Bulgaria
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# DESCRIPTION: Create LDAP files.
+#
+
+CWD=`pwd`
+SCRIPTDIR=`echo $0 | sed 's/5-cre_ldap.sh$//'`
+. "${SCRIPTDIR}shell.rc"
+. "${SCRIPTDIR}functions"
+. "${SCRIPTDIR}config"
+. ./env
+
+
+if test ! -d ldap/data; then
+  mkdir -p ldap/data || exit $?
+fi
+
+
+# ===
+cre_base_ldif() {
+(
+  cat <<EOF
+dn: ${SSH_LDAP_DC}
+objectClass: dcObject
+objectClass: organization
+dc: example
+o: Example Corporation
+description: The Example Corporation
+
+dn: cn=Manager,${SSH_LDAP_DC}
+objectClass: inetOrgPerson
+cn: Manager
+sn: Manager
+title: the world's most famous manager
+mail: manager@example.com
+uid: manager
+
+
+#The organization 'OpenSSH Test Team':
+dn: O=${SSH_DN_O},${SSH_LDAP_DC}
+objectclass: organization
+o: ${SSH_DN_O}
+st: ${SSH_DN_ST}
+
+
+#The 'OpenSSH Test Team' "CA" organizational units:
+dn: OU=${SSH_DN_OU},O=${SSH_DN_O},${SSH_LDAP_DC}
+objectclass: organizationalUnit
+ou: ${SSH_DN_OU}
+l: ${SSH_DN_L}
+st: ${SSH_DN_ST}
+EOF
+
+
+  for type in ${SSH_SIGN_TYPES}; do
+    N="${CAKEY_PREFIX}-${type}.crt.pem"
+
+    cat <<EOF
+
+dn: OU=${SSH_DN_OU} $type keys,OU=${SSH_DN_OU},O=${SSH_DN_O},${SSH_LDAP_DC}
+objectclass: organizationalUnit
+ou: $SSH_DN_OU $type keys
+l: ${SSH_DN_L}
+st: ${SSH_DN_ST}
+EOF
+  done
+) > ldap/base.ldif
+}
+
+
+# ===
+cre_ca_ldif() {
+(
+  for type in ${SSH_SIGN_TYPES}; do
+    N="${CAKEY_PREFIX}-${type}.crt"
+    if test ! -f "ldap/${N}.der"; then
+      ${OPENSSL} x509 \
+        -in "${SSH_CACERTDIR}/${N}".pem \
+        -out "ldap/${N}.der" -outform DER \
+        || exit $?
+    fi
+
+    N="${CAKEY_PREFIX}-${type}.crl"
+    if test ! -f "ldap/${N}.der"; then
+      ${OPENSSL} crl \
+        -in "${SSH_CACRLDIR}/${N}".pem \
+        -out "ldap/${N}.der" -outform DER \
+        || exit $?
+    fi
+  done
+) || return $?
+
+(
+  for type in ${SSH_SIGN_TYPES}; do
+    cat <<EOF
+dn: CN=OpenSSH Test ${type} CA key,OU=${SSH_DN_OU} $type keys,OU=${SSH_DN_OU},O=${SSH_DN_O},${SSH_LDAP_DC}
+objectClass: inetOrgPerson
+objectClass: pkiCA
+cACertificate;binary:< file://${CWD}/ldap/catest-${type}.crt.der
+certificateRevocationList;binary:< file://${CWD}/ldap/catest-${type}.crl.der
+cn: OpenSSH Test ${type} CA key
+sn: OpenSSH Test ${type} CA key
+ou: OpenSSH Testers ${type} keys
+ou: ${SSH_DN_OU}
+o: ${SSH_DN_O}
+l: ${SSH_DN_L}
+st: ${SSH_DN_ST}
+
+EOF
+  done
+) > ldap/ca.ldif
+}
+
+
+# ===
+cre_slapdconf () {
+(
+  cat <<EOF
+#required schemas
+include		$LDAP_SYSCONFDIR/schema/core.schema
+include		$LDAP_SYSCONFDIR/schema/cosine.schema
+include		$LDAP_SYSCONFDIR/schema/inetorgperson.schema
+
+#features
+allow bind_v2
+#disallow bind_simple ;-)
+
+#dbms
+database	$SSH_LDAP_DB
+suffix		"$SSH_LDAP_DC"
+rootdn		"cn=Manager,$SSH_LDAP_DC"
+rootpw		secret
+
+directory	$CWD/ldap/data
+
+index	objectClass	eq
+EOF
+) > ldap/slapd.conf.tmpl
+
+}
+
+
+# ===
+
+cre_base_ldif &&
+cre_ca_ldif &&
+cre_slapdconf &&
+: ; retval=$?
+
+show_status $retval "${extd}Creating${norm} ${warn}LDAP${norm} ${attn}files${norm}"
diff -ruN openssh-3.8.1p1+x509h/tests/CA/config openssh-3.8.1p1+x509-5.1/tests/CA/config
--- openssh-3.8.1p1+x509h/tests/CA/config	2004-03-20 12:02:17.000000000 +0200
+++ openssh-3.8.1p1+x509-5.1/tests/CA/config	2004-11-11 00:14:50.000000000 +0200
@@ -65,7 +65,9 @@
  dn_auth_path
  agent
  crl
+ alg
  ocsp
+ by_ldap
 "
 fi
 
@@ -162,3 +164,13 @@
 # OpenSSL OCSP responder don't use SO_REUSEADDR :-(, so ocsp tests
 # must wait socket to close.
 SSH_OPENSLL_OCSP_TMOUT=60
+
+# === LDAP:
+#SSH_LDAP_DB=bdb
+SSH_LDAP_DB=ldbm
+SSH_LDAP_DC="dc=example,dc=com"
+
+if test -z "${LDAPD_PORT}"; then
+  LDAPD_PORT=20389
+fi
+LDAPD_URL="ldap://${SSHD_LISTENADDRESS}:${LDAPD_PORT}"
diff -ruN openssh-3.8.1p1+x509h/tests/CA/env.in openssh-3.8.1p1+x509-5.1/tests/CA/env.in
--- openssh-3.8.1p1+x509h/tests/CA/env.in	1970-01-01 02:00:00.000000000 +0200
+++ openssh-3.8.1p1+x509-5.1/tests/CA/env.in	2004-10-29 22:52:46.000000000 +0300
@@ -0,0 +1,4 @@
+# LDAP environment:
+@LDAP_ON@LDAP_SYSCONFDIR="@LDAP_SYSCONFDIR@"
+@LDAP_ON@LDAP_LIBEXECDIR="@LDAP_LIBEXECDIR@"
+@LDAP_ON@LDAP_BINDIR="@LDAP_BINDIR@"
diff -ruN openssh-3.8.1p1+x509h/tests/CA/functions openssh-3.8.1p1+x509-5.1/tests/CA/functions
--- openssh-3.8.1p1+x509h/tests/CA/functions	2004-02-17 21:23:33.000000000 +0200
+++ openssh-3.8.1p1+x509-5.1/tests/CA/functions	2004-10-02 00:22:16.000000000 +0300
@@ -238,7 +238,7 @@
 
   retval=0
 
-#bash bug or ?: when commands are on only one line retval is always zero :-/ !!!
+#SHELL bug or ?: when we assign command result to "local xxx=..." retval is always zero :-/ !!!
 #unix sh don't like local :-)
 #  local subject=`"${OPENSSL}" x509 -noout -subject -in "${identity_file}" $*`; retval=$?
   subject=`"${OPENSSL}" x509 -noout -subject -in "${identity_file}" $* 2>/dev/null`; retval=$?
diff -ruN openssh-3.8.1p1+x509h/tests/CA/Makefile.in openssh-3.8.1p1+x509-5.1/tests/CA/Makefile.in
--- openssh-3.8.1p1+x509h/tests/CA/Makefile.in	2004-03-09 21:37:04.000000000 +0200
+++ openssh-3.8.1p1+x509-5.1/tests/CA/Makefile.in	2004-11-07 10:49:37.000000000 +0200
@@ -6,7 +6,7 @@
 all:
 
 
-clean:
+clean: ldap_clean
 	rm -f testhostkey_*
 	rm -f testid_*
 	rm -f testocsp_*
@@ -17,11 +17,12 @@
 	rm -f sshd_x509.log
 
 distclean: clean
+	rm -f env
 	rm -f Makefile
 
 # ===
 
-check-certs: ca_files hostkeys identities ocsp_certs crl_files
+check-certs: ca_files hostkeys identities ocsp_certs crl_files ldap_files
 	@echo
 	$(SHELL) $(srcdir)/openssh_tests.sh
 
@@ -117,3 +118,16 @@
 ca-test/catest-bundle.crl: testid_rsa-rsa_md5 testid_dsa-rsa_md5
 	@echo
 	$(SHELL) $(srcdir)/4-cre_crls.sh
+
+# ===
+@LDAP_OFF@ldap_files:
+@LDAP_ON@ldap_files: ldap/slapd.conf.tmpl
+
+@LDAP_ON@ldap/slapd.conf.tmpl:
+@LDAP_ON@	@echo
+@LDAP_ON@	$(SHELL) $(srcdir)/5-cre_ldap.sh
+
+@LDAP_OFF@ldap_clean:
+@LDAP_ON@ldap_clean:
+@LDAP_ON@	rm -f ldap_setup.log
+@LDAP_ON@	rm -fr ldap
diff -ruN openssh-3.8.1p1+x509h/tests/CA/openssh_tests.sh openssh-3.8.1p1+x509-5.1/tests/CA/openssh_tests.sh
--- openssh-3.8.1p1+x509h/tests/CA/openssh_tests.sh	2004-03-20 11:42:40.000000000 +0200
+++ openssh-3.8.1p1+x509-5.1/tests/CA/openssh_tests.sh	2004-11-11 00:15:10.000000000 +0200
@@ -28,6 +28,7 @@
 . "${SCRIPTDIR}shell.rc"
 . "${SCRIPTDIR}functions"
 . "${SCRIPTDIR}config"
+. "./env"
 
 test "x$TEST_SSH_SSH"       = "x" && { echo "${warn}Please define ${attn}TEST_SSH_SSH${norm}"      ; exit 1; }
 test "x$TEST_SSH_SSHD"      = "x" && { echo "${warn}Please define ${attn}TEST_SSH_SSHD${norm}"     ; exit 1; }
@@ -79,6 +80,7 @@
 
 cat > "$SSHD_CFG" <<EOF
 CACertificateFile /file/not/found
+CAldapURL ${LDAPD_URL}
 VAType none
 EOF
 
@@ -88,6 +90,11 @@
 else
   SSH_X509STORE_DISABLED="no"
 fi
+if grep 'Unsupported.*CAldapURL' "${SSHD_LOG}" > /dev/null; then
+  SSH_LDAP_ENABLED="no"
+else
+  SSH_LDAP_ENABLED="yes"
+fi
 if grep 'Unsupported.*VAType' "${SSHD_LOG}" > /dev/null; then
   SSH_OCSP_ENABLED="no"
 else
@@ -102,6 +109,10 @@
     -e 's|dn_auth_path||g' \
     -e 's|crl||g'`
 fi
+echo SSH_LDAP_ENABLED=${SSH_LDAP_ENABLED}
+if test "x${SSH_LDAP_ENABLED}" = "xno"; then
+  SSH_X509TESTS=`echo "${SSH_X509TESTS}" | sed -e 's|by_ldap||g'`
+fi
 echo SSH_OCSP_ENABLED=${SSH_OCSP_ENABLED}
 if test "x${SSH_OCSP_ENABLED}" = "xno"; then
   SSH_X509TESTS=`echo "${SSH_X509TESTS}" | sed -e 's|ocsp||g'`
@@ -246,7 +257,7 @@
   msg="OpenSSH Certificate TeSt-${1}"
 
   sshopts=""
-  #sshopts="${sshopts} -v -v -v
+  #sshopts="${sshopts} -v -v -v"
   test -n "$2" && sshopts="${sshopts} -i $2"
   #assignment to variable "identity_file" crash ksh :-(
   #identity_file="value_without_significance"
@@ -302,20 +313,18 @@
 
 # ===
 do_all () {
-  printf '%s' "" > "${AUTHORIZEDKEYSFILE}"
+  create_empty_file "${AUTHORIZEDKEYSFILE}" &&
   chmod 644 "${AUTHORIZEDKEYSFILE}" || return $?
 
-  printf '%s' "" > "${SSHD_LOG}"
-  if test ! -f "${TEST_SSHD_HOSTKEY}"; then
-    "$TEST_SSH_SSHKEYGEN" -t rsa -f "${TEST_SSHD_HOSTKEY}" -N ""
-  fi
+  create_empty_file "${SSHD_LOG}" || return $?
+
   if test ! -f "${TEST_SSHD_HOSTKEY}.pub"; then
     echo "${warn}Public host file ${attn}${TEST_SSHD_HOSTKEY}.pub${warn} not found !${norm}"
     return 3
   fi
   ( printf '%s' "${SSHD_LISTENADDRESS} "
     cat "${TEST_SSHD_HOSTKEY}.pub"
-  ) > "${USERKNOWNHOSTSFILE}"
+  ) > "${USERKNOWNHOSTSFILE}" &&
   chmod 644 "${USERKNOWNHOSTSFILE}" || return $?
 
   # call the test scripts
diff -ruN openssh-3.8.1p1+x509h/tests/CA/test-alg.sh.inc openssh-3.8.1p1+x509-5.1/tests/CA/test-alg.sh.inc
--- openssh-3.8.1p1+x509h/tests/CA/test-alg.sh.inc	1970-01-01 02:00:00.000000000 +0200
+++ openssh-3.8.1p1+x509-5.1/tests/CA/test-alg.sh.inc	2004-10-17 16:17:12.000000000 +0300
@@ -0,0 +1,139 @@
+#
+# Copyright (c) 2004 Roumen Petrov, Sofia, Bulgaria
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# DESCRIPTION: Test OpenSSH client authentication:
+#  - "IdentityFile" contain private key and optional x509 certificate;
+#  - "AuthorizedKeysFile" contain certificate BLOB.
+#  - server accept different publickey algorithms.
+# Note that "Host-Based Authentication" we cannot test without to install.
+#
+
+
+# ===
+#env. vars:
+#  alg
+testAlg () {
+  printSeparator
+  echo "  - only ${attn}${alg}${norm} algorithm"
+
+  creTestSSHDcfgFile
+  if test "x${SSH_X509STORE_DISABLED}" != "xyes"; then
+    cat >> "$SSHD_CFG" <<EOF
+CACertificateFile ${SSH_CAROOT}/${CACERTFILE}
+CACertificatePath /path/not/found
+CARevocationFile  /crlfile/not/found
+CARevocationPath  /crlpath/not/found
+EOF
+    fi
+  cat >> "$SSHD_CFG" <<EOF
+PubkeyAlgorithms $alg
+EOF
+
+  runSSHdaemon || return $?
+  (
+    for SSH_CLIENTKEY in ${TEST_SSH_CLIENTKEYS}; do
+      case $SSH_CLIENTKEY in
+        *rsa) keytype="rsa";;
+        *dsa) keytype="dsa";;
+        *)    echo "${warn}unknown client key type${norm}"
+              exit 1;;
+      esac
+      case $alg in
+        x509v3-sign-*) withcert="yes";;
+        *)             withcert="";;
+      esac
+
+      if test -z "$withcert"; then
+        must_fail=""
+        if test "X$alg" = "Xssh-rsa"; then
+          test "$keytype" = "rsa" || must_fail="yes"
+        else
+          test "$keytype" = "dsa" || must_fail="yes"
+        fi
+      else
+        must_fail="yes"
+      fi
+
+      identity_file="${SSH_CLIENTKEY}"
+      "$TEST_SSH_SSHKEYGEN" -f "${identity_file}" -y 2>/dev/null > "${AUTHORIZEDKEYSFILE}" || exit $?
+
+      if test -n "$must_fail"; then
+        typemsg="${identity_file} ${warn}!${norm}"
+      else
+        typemsg="${identity_file}"
+      fi
+      runTest "${typemsg}" \
+        "${identity_file}" "" "$must_fail" || exit $?
+
+      for type in ${SSH_SIGN_TYPES}; do
+        if test -n "$withcert"; then
+          must_fail=""
+          if test "X$alg" = "Xx509v3-sign-rsa"; then
+            test "$keytype" = "rsa" || must_fail="yes"
+          else
+            test "$keytype" = "dsa" || must_fail="yes"
+          fi
+        else
+          must_fail="yes"
+        fi
+
+        identity_file="${SSH_CLIENTKEY}-${type}"
+        "$TEST_SSH_SSHKEYGEN" -f "${identity_file}" -y 2>/dev/null > "${AUTHORIZEDKEYSFILE}" || exit $?
+
+        if test -n "$must_fail"; then
+          typemsg="${identity_file} ${warn}!${norm}"
+        else
+          typemsg="${identity_file}"
+        fi
+        runTest "${typemsg}" \
+          "${identity_file}" "" "$must_fail" || exit $?
+      done
+    done
+  ); retval=$?
+  killSSHdaemon
+
+  return $retval
+}
+
+
+# ===
+
+do_test () {
+  retval=0
+  if test "x${SSH_X509STORE_DISABLED}" = "xyes"; then
+    echo "* ${extd}with different publickey ${attn}algorithms${norm}:"
+  else
+    echo "* ${extd}against ${attn}CACertificateFile${norm} and different publickey ${attn}algorithms${norm}:"
+  fi
+
+  for alg in \
+    "ssh-rsa" \
+    "ssh-dss" \
+    "x509v3-sign-rsa" \
+    "x509v3-sign-dss" \
+  ; do
+    testAlg; retval=$?
+    if test $retval -ne 0; then
+      break
+    fi
+  done
+  return $retval
+}
diff -ruN openssh-3.8.1p1+x509h/tests/CA/test-by_ldap.sh.inc openssh-3.8.1p1+x509-5.1/tests/CA/test-by_ldap.sh.inc
--- openssh-3.8.1p1+x509h/tests/CA/test-by_ldap.sh.inc	1970-01-01 02:00:00.000000000 +0200
+++ openssh-3.8.1p1+x509-5.1/tests/CA/test-by_ldap.sh.inc	2004-11-07 22:52:06.000000000 +0200
@@ -0,0 +1,215 @@
+#
+# Copyright (c) 2004 Roumen Petrov, Sofia, Bulgaria
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# DESCRIPTION: Test OpenSSH client authentication:
+#  - "IdentityFile" contain private key and x509 certificate;
+#  - "AuthorizedKeysFile" contain certificate Subject;
+#  - authorization against:
+#    - LDAP, without CRL file and hash-dir
+#
+
+
+LDAP_SETUP_LOG="${CWD}/ldap_setup.log"
+LDAPD_PID="${CWD}/slapd.pid"
+LDAPD_ARGS="${CWD}/slapd.args"
+LDAPD_CFG="${CWD}/slapd.conf"
+
+if test -z "${LDAP_BINDIR}"; then
+  LDAPADD=ldapadd
+else
+  LDAPADD="${LDAP_BINDIR}/ldapadd"
+fi
+
+
+# ===
+#args:
+#  $1 - info. message for valid cert.
+#  $2 - request valid cert. to fail flag
+#  $3 - info. message for revoked cert.
+#  $4 - request revoked cert. to fail flag
+test_all_keys () {
+  for type in ${SSH_SIGN_TYPES}; do
+    for SSH_CLIENTKEY in ${TEST_SSH_CLIENTKEYS}; do
+      identity_file="${SSH_CLIENTKEY}-${type}"
+      creX509AuthorizedKeysFile "${identity_file}" &&
+      runTest "${identity_file}" \
+        "${identity_file}" "$1" "$2" || return $?
+
+      identity_file="${SSH_CLIENTKEY}-${type}-revoked"
+      creX509AuthorizedKeysFile "${identity_file}" &&
+      runTest "${identity_file}" \
+        "${identity_file}" "$3" "$4" || return $?
+    done
+  done
+  return 0
+}
+
+
+# ===
+creTestLDAPDcfgFile() {
+(
+  cat <<EOF
+include		$CWD/ldap/slapd.conf.tmpl
+
+pidfile		$LDAPD_PID
+argsfile	$LDAPD_ARGS
+EOF
+) > ${LDAPD_CFG}
+
+}
+
+
+# ===
+runLDAPdaemon() {
+  if test -f "${LDAPD_PID}"; then
+    echo "${warn}slapd pid file exist!${norm}" >&2
+  fi
+
+  printf '  %s' "starting ${extd}LDAP${norm} server on ${attn}${LDAPD_URL}${norm}"
+  #for errors check syslog files(LOCAL4 facility)
+  $SUDO "${LDAP_LIBEXECDIR}/slapd" \
+    -f "${LDAPD_CFG}" \
+    -h "${LDAPD_URL}" \
+  > /dev/null 2>&1
+
+  sleep 2
+  K=0
+  while test $K -le 5; do
+    if test -f "${LDAPD_PID}"; then
+      break
+    fi
+    sleep 1
+    K=`expr $K + 1`
+  done
+
+  test -r "${LDAPD_PID}"; show_status $?
+  if test ! -r "${LDAPD_PID}"; then
+    printf "${warn}cannot start slapd:${norm} " >&2
+    error_file_not_readable "${LDAPD_PID}"
+    return 33
+  fi
+  return 0
+}
+
+
+killLDAPdaemon() {
+(
+  $SUDO kill `cat "${LDAPD_PID}" 2>/dev/null` > /dev/null 2>&1
+  K=0
+  while test $K -le 9; do
+    if test ! -f "${LDAPD_PID}"; then
+      break
+    fi
+    sleep 1
+    K=`expr $K + 1`
+  done
+  if test -f "${LDAPD_PID}"; then
+    $SUDO kill -9 `cat "${LDAPD_PID}" 2>/dev/null` > /dev/null 2>&1
+    sleep 1
+    $SUDO rm -f "${LDAPD_PID}" > /dev/null 2>&1
+    $SUDO rm -f "${LDAPD_ARGS}" > /dev/null 2>&1
+  fi
+  rm -f "${LDAPD_CFG}"
+  exit 0
+)
+}
+
+
+initLDAPdb() {
+  create_empty_file "${LDAP_SETUP_LOG}" || return $?
+
+  "${LDAPADD}" \
+    -x -w secret -D "cn=Manager,${SSH_LDAP_DC}" \
+    -H "${LDAPD_URL}" \
+    -f "${CWD}/ldap/base.ldif" \
+  >> "${LDAP_SETUP_LOG}" 2>&1 || return $?
+
+  "${LDAPADD}" \
+    -x -w secret -D "cn=Manager,${SSH_LDAP_DC}" \
+    -H "${LDAPD_URL}" \
+    -f "${CWD}/ldap/ca.ldif" \
+  >> "${LDAP_SETUP_LOG}" 2>&1 || return $?
+
+  return 0
+}
+
+
+# ===
+# $1 - LDAP version
+testLDAP() {
+  printSeparator
+  echo "Begin test with LDAP ${extd}version${norm} ${attn}$1${norm}"
+
+  creTestLDAPDcfgFile
+  creTestSSHDcfgFile
+
+#openssh config parser limitation
+SSH_CONF_LDAP_DC=`echo ${SSH_LDAP_DC} | sed -e 's|=|%3D|g'`
+  cat >> "$SSHD_CFG" <<EOF
+CACertificateFile /file/not/found
+CACertificatePath /path/not/found
+CARevocationFile  /crlfile/not/found
+CARevocationPath  /crlpath/not/found
+CAldapVersion $1
+CAldapURL ${LDAPD_URL}/${SSH_CONF_LDAP_DC}
+#TODO:MandatoryCRL yes
+EOF
+
+  runSSHdaemon || return $?
+  (
+    rm -f "${CWD}/ldap/data"/*
+    runLDAPdaemon
+    (
+      initLDAPdb || exit $?
+
+      test_all_keys "" "" "${warn}!${norm}" "Yes"
+    ); retval=$?
+    killLDAPdaemon
+    exit ${retval}
+  ); retval=$?
+  killSSHdaemon
+
+  return ${retval}
+}
+
+
+# ===
+LDAPtestBREAK() {
+  echo
+  killLDAPdaemon
+  testBREAK
+}
+
+trap LDAPtestBREAK INT QUIT ABRT KILL TERM || exit 1
+
+
+# ===
+
+do_test () {
+  if test "x${SSH_LDAP_ENABLED}" = "xno"; then
+    echo "* ${extd}LDAP${norm} is ${attn}disabled${norm}"
+    return 1
+  fi
+  echo "* ${extd}against ${attn}CALdapUrl${norm}:"
+
+  testLDAP 2 &&
+  testLDAP 3
+}
diff -ruN openssh-3.8.1p1+x509h/tests/CA/test-crl.sh.inc openssh-3.8.1p1+x509-5.1/tests/CA/test-crl.sh.inc
--- openssh-3.8.1p1+x509h/tests/CA/test-crl.sh.inc	2004-03-09 08:51:19.000000000 +0200
+++ openssh-3.8.1p1+x509-5.1/tests/CA/test-crl.sh.inc	2004-10-29 12:01:09.000000000 +0300
@@ -32,20 +32,22 @@
 
 # ===
 #args:
-#  $1 - info. message for revoked cert.
-#  $2 - request revoked cert. to fail flag
+#  $1 - info. message for valid cert.
+#  $2 - request valid cert. to fail flag
+#  $3 - info. message for revoked cert.
+#  $4 - request revoked cert. to fail flag
 test_all_keys () {
   for type in ${SSH_SIGN_TYPES}; do
     for SSH_CLIENTKEY in ${TEST_SSH_CLIENTKEYS}; do
       identity_file="${SSH_CLIENTKEY}-${type}"
       creX509AuthorizedKeysFile "${identity_file}" &&
       runTest "${identity_file}" \
-        "${identity_file}" "" "" || return $?
+        "${identity_file}" "$1" "$2" || return $?
 
       identity_file="${SSH_CLIENTKEY}-${type}-revoked"
       creX509AuthorizedKeysFile "${identity_file}" &&
       runTest "${identity_file}" \
-        "${identity_file}" "$1" "$2" || return $?
+        "${identity_file}" "$3" "$4" || return $?
     done
   done
   return 0
@@ -55,7 +57,7 @@
 # ===
 test_nocrl () {
   printSeparator
-  echo "Begin test ${extd}without${norm} CA CRL ${attn}file${norm} and ${attn}hash-dir${norm} ..."
+  echo "Begin test ${extd}without${norm} CRL ${attn}file${norm} and ${attn}hash-dir${norm} ..."
 
   creTestSSHDcfgFile
   cat >> "$SSHD_CFG" <<EOF
@@ -66,7 +68,7 @@
 EOF
 
   runSSHdaemon || return $?
-    test_all_keys "" ""; retval=$?
+    test_all_keys "" "" "" ""; retval=$?
   killSSHdaemon
 
   return ${retval}
@@ -76,7 +78,7 @@
 # ===
 test_crlfile () {
   printSeparator
-  echo "Begin test ${extd}with CA CRL file(${attn}CARevocationFile${norm}) ..."
+  echo "Begin test with CRL ${extd}file(${attn}CARevocationFile${norm}) ..."
 
   creTestSSHDcfgFile
   cat >> "$SSHD_CFG" <<EOF
@@ -87,7 +89,7 @@
 EOF
 
   runSSHdaemon || return $?
-    test_all_keys "${warn}!${norm}" "Yes"; retval=$?
+    test_all_keys "" "" "${warn}!${norm}" "Yes"; retval=$?
   killSSHdaemon
 
   return ${retval}
@@ -97,7 +99,7 @@
 # ===
 test_crldir () {
   printSeparator
-  echo "Begin test ${extd}with CA CRL hash-dir(${attn}CARevocationPath${norm}) ..."
+  echo "Begin test with CRL ${extd}hash-dir(${attn}CARevocationPath${norm}) ..."
 
   creTestSSHDcfgFile
   cat >> "$SSHD_CFG" <<EOF
@@ -108,7 +110,7 @@
 EOF
 
   runSSHdaemon || return $?
-    test_all_keys "${warn}!${norm}" "Yes"; retval=$?
+    test_all_keys "" "" "${warn}!${norm}" "Yes"; retval=$?
   killSSHdaemon
 
   return ${retval}
@@ -165,13 +167,13 @@
 }
 
 
-#===
+# ===
 test_onlyonecrl () {
   retval=0
   CRL_TEST_DIR="${SSH_CAROOT}/crl-test"
 
   printSeparator
-  echo "Check ${extd}revoked${norm} with only ${attn}one CRL${norm} file in ${attn}CARevocationPath${norm} ..."
+  echo "Check ${extd}revoked${norm} with only ${attn}one CRL${norm} in ${attn}CARevocationPath${norm} ..."
 
   mkdir -p "${CRL_TEST_DIR}" || return $?
 
@@ -202,7 +204,51 @@
 }
 
 
-#===
+# ===
+test_crlpresence_yes () {
+  printSeparator
+  echo "Begin test with mandatory ${extd}CRL presence ${attn}with${norm} CRL ..."
+
+  creTestSSHDcfgFile
+  cat >> "$SSHD_CFG" <<EOF
+CACertificateFile ${SSH_CAROOT}/${CACERTFILE}
+CACertificatePath /path/not/found
+CARevocationFile  ${SSH_CAROOT}/${CACRLFILE}
+CARevocationPath  /crlpath/not/found
+MandatoryCRL yes
+EOF
+
+  runSSHdaemon || return $?
+    test_all_keys "" "" "${warn}!${norm}" "Yes"; retval=$?
+  killSSHdaemon
+
+  return ${retval}
+}
+
+
+# ===
+test_crlpresence_no () {
+  printSeparator
+  echo "Begin test with mandatory ${extd}CRL presence ${attn}without${norm} CRL ..."
+
+  creTestSSHDcfgFile
+  cat >> "$SSHD_CFG" <<EOF
+CACertificateFile ${SSH_CAROOT}/${CACERTFILE}
+CACertificatePath /path/not/found
+CARevocationFile  /crlfile/not/found
+CARevocationPath  /crlpath/not/found
+MandatoryCRL yes
+EOF
+
+  runSSHdaemon || return $?
+    test_all_keys "${warn}!${norm}" "Yes" "${warn}!${norm}" "Yes"; retval=$?
+  killSSHdaemon
+
+  return ${retval}
+}
+
+
+# ===
 
 do_test () {
   if test "x${SSH_X509STORE_DISABLED}" = "xyes"; then
@@ -214,5 +260,7 @@
   test_nocrl &&
   test_crlfile &&
   test_crldir &&
-  test_onlyonecrl
+  test_onlyonecrl &&
+  test_crlpresence_yes &&
+  test_crlpresence_no
 }
diff -ruN openssh-3.8.1p1+x509h/tests/CA/test-ocsp.sh.inc openssh-3.8.1p1+x509-5.1/tests/CA/test-ocsp.sh.inc
--- openssh-3.8.1p1+x509h/tests/CA/test-ocsp.sh.inc	2004-03-20 12:01:13.000000000 +0200
+++ openssh-3.8.1p1+x509-5.1/tests/CA/test-ocsp.sh.inc	2004-10-16 23:22:25.000000000 +0300
@@ -241,7 +241,7 @@
 }
 
 
-#===
+# ===
 
 do_test () {
   if test "x${SSH_OCSP_ENABLED}" = "xno"; then
diff -ruN openssh-3.8.1p1+x509h/x509_by_ldap.c openssh-3.8.1p1+x509-5.1/x509_by_ldap.c
--- openssh-3.8.1p1+x509h/x509_by_ldap.c	1970-01-01 02:00:00.000000000 +0200
+++ openssh-3.8.1p1+x509-5.1/x509_by_ldap.c	2004-11-07 11:58:08.000000000 +0200
@@ -0,0 +1,723 @@
+/*
+ * Copyright (c) 2004 Roumen Petrov.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "x509_by_ldap.h"
+/* Prefered X509_NAME_cmp method from ssh-x509.c */
+extern int     ssh_X509_NAME_cmp(X509_NAME *a, X509_NAME *b);
+#include <ldap.h>
+
+
+/* ================================================================== */
+/* ERRORS */
+#ifndef OPENSSL_NO_ERR
+static ERR_STRING_DATA X509byLDAP_str_functs[] = {
+	{ ERR_PACK(0, X509byLDAP_F_LOOKUPCRTL, 0)	, "LOOKUPCRTL" },
+	{ ERR_PACK(0, X509byLDAP_F_LDAPHOST_NEW, 0)	, "LDAPHOST_NEW" },
+	{ ERR_PACK(0, X509byLDAP_F_SET_PROTOCOL, 0)	, "SET_PROTOCOL" },
+	{ ERR_PACK(0, X509byLDAP_F_RESULT2STORE, 0)	, "RESULT2STORE" },
+	{ ERR_PACK(0, X509byLDAP_F_GET_BY_SUBJECT, 0)	, "GET_BY_SUBJECT" },
+	{ 0, NULL }
+};
+
+
+static ERR_STRING_DATA X509byLDAP_str_reasons[] = {
+	{ X509byLDAP_R_INVALID_CRTLCMD			, "invalid control command" },
+	{ X509byLDAP_R_NOT_LDAP_URL			, "not ldap url" },
+	{ X509byLDAP_R_INVALID_URL			, "invalid ldap url" },
+	{ X509byLDAP_R_INITIALIZATION_ERROR		, "ldap initialization error" },
+	{ X509byLDAP_R_UNABLE_TO_GET_PROTOCOL_VERSION	, "unable to get ldap protocol version" },
+	{ X509byLDAP_R_UNABLE_TO_SET_PROTOCOL_VERSION	, "unable to set ldap protocol version" },
+	{ X509byLDAP_R_UNABLE_TO_COUNT_ENTRIES		, "unable to count ldap entries" },
+	{ X509byLDAP_R_WRONG_LOOKUP_TYPE		, "wrong lookup type" },
+	{ X509byLDAP_R_UNABLE_TO_GET_FILTER		, "unable to get ldap filter" },
+	{ X509byLDAP_R_UNABLE_TO_BIND			, "unable to bind to ldap server" },
+	{ X509byLDAP_R_SEARCH_FAIL			, "search failure" },
+	{ 0, NULL }
+};
+#endif /*ndef OPENSSL_NO_ERR*/
+
+
+void
+ERR_load_X509byLDAP_strings(void) {
+	static int init = 1;
+
+	if (init) {
+		init = 0;
+#ifndef OPENSSL_NO_ERR
+		ERR_load_strings(ERR_LIB_X509byLDAP, X509byLDAP_str_functs);
+		ERR_load_strings(ERR_LIB_X509byLDAP, X509byLDAP_str_reasons);
+#endif
+	}
+}
+
+
+static char*
+ldap_errormsg(char *buf, size_t len, int err) {
+	snprintf(buf, len, "ldaperror=0x%x(%.256s)", err, ldap_err2string(err));
+	return(buf);
+}
+
+
+static void
+openssl_add_ldap_error(int err) {
+	char	buf[512];
+	ERR_add_error_data(1, ldap_errormsg(buf, sizeof(buf), err));
+}
+
+
+
+/* ================================================================== */
+/* LOOKUP by LDAP */
+
+static const char ATTR_CACERT[] = "cACertificate";
+static const char ATTR_CACRL[] = "certificateRevocationList";
+
+typedef struct ldaphost_s ldaphost;
+struct ldaphost_s {
+	char        *url;
+	char        *binddn;
+	char        *bindpw;
+	LDAPURLDesc *ldapurl;
+	LDAP        *ld;
+	ldaphost    *next;
+};
+
+
+static ldaphost* ldaphost_new(const char *url);
+static void ldaphost_free(ldaphost *p);
+
+
+static int  ldaplookup_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl, char **ret);
+static int  ldaplookup_new(X509_LOOKUP *ctx);
+static void ldaplookup_free(X509_LOOKUP *ctx);
+static int  ldaplookup_init(X509_LOOKUP *ctx);
+static int  ldaplookup_shutdown(X509_LOOKUP *ctx);
+static int  ldaplookup_by_subject(X509_LOOKUP *ctx, int type, X509_NAME *name, X509_OBJECT *ret);
+
+static int  ldaplookup_add_search(X509_LOOKUP *ctx, const char *url);
+static int  ldaplookup_set_protocol(X509_LOOKUP *ctx, const char *ver);
+
+
+X509_LOOKUP_METHOD x509_ldap_lookup = {
+	"Load certs and crls from LDAP server",
+	ldaplookup_new,		/* new */
+	ldaplookup_free,	/* free */
+	ldaplookup_init,	/* init */
+	ldaplookup_shutdown,	/* shutdown */
+	ldaplookup_ctrl,	/* ctrl */
+	ldaplookup_by_subject,	/* get_by_subject */
+	NULL,			/* get_by_issuer_serial */
+	NULL,			/* get_by_fingerprint */
+	NULL,			/* get_by_alias */
+};
+
+
+X509_LOOKUP_METHOD*
+X509_LOOKUP_ldap(void) {
+	return(&x509_ldap_lookup);
+}
+
+
+static int
+ldaplookup_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc, long argl, char **retp) {
+	int ret = 0;
+
+#ifdef TRACE_BY_LDAP
+fprintf(stderr, "TRACE_BY_LDAP ldaplookup_ctrl: cmd=%d, argc=%s\n", cmd, argc);
+#endif
+	switch (cmd) {
+	case X509_L_LDAP_HOST:
+		ret = ldaplookup_add_search(ctx, argc);
+		break;
+	case X509_L_LDAP_VERSION:
+		ret = ldaplookup_set_protocol(ctx, argc);
+		break;
+	default:
+		X509byLDAPerr(X509byLDAP_F_LOOKUPCRTL, X509byLDAP_R_INVALID_CRTLCMD);
+		break;
+	}
+	return(ret);
+}
+
+
+static int
+ldaplookup_new(X509_LOOKUP *ctx) {
+#ifdef TRACE_BY_LDAP
+fprintf(stderr, "TRACE_BY_LDAP ldaplookup_new:\n");
+#endif
+	if (ctx == NULL)
+		return(0);
+
+	ctx->method_data = NULL;
+	return(1);
+}
+
+
+static void
+ldaplookup_free(X509_LOOKUP *ctx) {
+	ldaphost *p;
+#ifdef TRACE_BY_LDAP
+fprintf(stderr, "TRACE_BY_LDAP ldaplookup_free:\n");
+#endif
+
+	if (ctx == NULL)
+		return;
+
+	p = (ldaphost*) ctx->method_data;
+	while (p != NULL) {
+		ldaphost *q = p;
+		p = p->next;
+		ldaphost_free(q);
+	}
+}
+
+
+static int
+ldaplookup_init(X509_LOOKUP *ctx) {
+#ifdef TRACE_BY_LDAP
+fprintf(stderr, "TRACE_BY_LDAP ldaplookup_init:\n");
+#endif
+	return(1);
+}
+
+
+static int
+ldaplookup_shutdown(X509_LOOKUP *ctx) {
+#ifdef TRACE_BY_LDAP
+fprintf(stderr, "TRACE_BY_LDAP ldaplookup_shutdown:\n");
+#endif
+	return(1);
+}
+
+
+static ldaphost*
+ldaphost_new(const char *url) {
+	ldaphost *p;
+	int          ret;
+
+	p = OPENSSL_malloc(sizeof(ldaphost));
+	if (p == NULL) return(NULL);
+
+	memset(p, 0, sizeof(ldaphost));
+
+	p->url = OPENSSL_malloc(strlen(url) + 1);
+	if (p->url == NULL) goto error;
+	strcpy(p->url, url);
+
+	/*ldap://hostport/dn[?attrs[?scope[?filter[?exts]]]] */
+	ret = ldap_is_ldap_url(url);
+	if (ret < 0) {
+		X509byLDAPerr(X509byLDAP_F_LDAPHOST_NEW, X509byLDAP_R_NOT_LDAP_URL);
+		goto error;
+	}
+
+	ret = ldap_url_parse(url, &p->ldapurl);
+	if (ret != 0) {
+		X509byLDAPerr(X509byLDAP_F_LDAPHOST_NEW, X509byLDAP_R_INVALID_URL);
+		openssl_add_ldap_error(ret);
+		goto error;
+	}
+#ifdef TRACE_BY_LDAP
+fprintf(stderr, "TRACE_BY_LDAP ldaphost_new: ldap_url_desc2str=%s\n", ldap_url_desc2str(p->ldapurl));
+fprintf(stderr, "TRACE_BY_LDAP ldaphost_new: ldapurl->%s://%s:%d\n", p->ldapurl->lud_scheme, p->ldapurl->lud_host, p->ldapurl->lud_port);
+#endif
+
+	/* open ldap connection */
+	p->ld = ldap_init(p->ldapurl->lud_host, p->ldapurl->lud_port);
+	if(p->ld == NULL) {
+		X509byLDAPerr(X509byLDAP_F_LDAPHOST_NEW, X509byLDAP_R_INITIALIZATION_ERROR);
+		goto error;
+	}
+
+	{
+		int version = -1;
+
+		ret = ldap_get_option(p->ld, LDAP_OPT_PROTOCOL_VERSION, &version);
+		if (ret != LDAP_OPT_SUCCESS) {
+			X509byLDAPerr(X509byLDAP_F_LDAPHOST_NEW, X509byLDAP_R_UNABLE_TO_GET_PROTOCOL_VERSION );
+			goto error;
+		}
+#ifdef TRACE_BY_LDAP
+fprintf(stderr, "TRACE_BY_LDAP ldaphost_new: using ldap v%d protocol\n", version);
+#endif
+	}
+
+	return(p);
+error:
+	ldaphost_free(p);
+	return(NULL);
+}
+
+
+static void
+ldaphost_free(ldaphost *p) {
+#ifdef TRACE_BY_LDAP
+fprintf(stderr, "TRACE_BY_LDAP ldaphost_free:\n");
+#endif
+	if (p == NULL) return;
+	if (p->url    != NULL) OPENSSL_free(p->url);
+	if (p->binddn != NULL) OPENSSL_free(p->binddn);
+	if (p->bindpw != NULL) OPENSSL_free(p->bindpw);
+	if (p->ldapurl != NULL) {
+		ldap_free_urldesc(p->ldapurl);
+		p->ldapurl = NULL;
+	}
+	if (p->ld != NULL) {
+		/* how to free ld ???*/
+		p->ld = NULL;
+	}
+	OPENSSL_free(p);
+}
+
+
+static int/*bool*/
+ldaplookup_add_search(X509_LOOKUP *ctx, const char *url) {
+	ldaphost *p, *q;
+
+	if (ctx == NULL) return(0);
+	if (url == NULL) return(0);
+
+	q = ldaphost_new(url);
+	if (q == NULL) return(0);
+
+	p = (ldaphost*) ctx->method_data;
+	if (p == NULL) {
+		ctx->method_data = (void*) q;
+		return(1);
+	}
+
+	for(; p->next != NULL; p = p->next) {
+		/*find list end*/
+	}
+	p->next = q;
+
+	return(1);
+}
+
+
+static int/*bool*/
+ldaplookup_set_protocol(X509_LOOKUP *ctx, const char *ver) {
+	ldaphost *p;
+	char *q = NULL;
+	int n;
+
+#ifdef TRACE_BY_LDAP
+fprintf(stderr, "TRACE_BY_LDAP ldaplookup_set_protocol(..., %s)\n", ver);
+#endif
+	if (ctx == NULL) return(0);
+	if (ver == NULL) return(0);
+
+	p = (ldaphost*) ctx->method_data;
+	if (p == NULL) return(0);
+
+	n = (int) strtol(ver, &q, 10);
+	if (*q != '\0') return(0);
+	if ((n < LDAP_VERSION_MIN) || (n > LDAP_VERSION_MAX)) return(0);
+
+	for(; p->next != NULL; p = p->next) {
+		/*find list end*/
+	}
+#ifdef TRACE_BY_LDAP
+fprintf(stderr, "TRACE_BY_LDAP ldaplookup_set_protocol(...): ver=%d\n", n);
+#endif
+	{
+		int ret;
+		const int version = n;
+
+		ret = ldap_set_option(p->ld, LDAP_OPT_PROTOCOL_VERSION, &version);
+		if (ret != LDAP_OPT_SUCCESS) {
+			X509byLDAPerr(X509byLDAP_F_SET_PROTOCOL, X509byLDAP_R_UNABLE_TO_SET_PROTOCOL_VERSION);
+			openssl_add_ldap_error(ret);
+			return(0);
+		}
+	}
+
+	return(1);
+}
+
+
+static char*
+ldaplookup_filter(X509_NAME *name, const char *attribute) {
+	char *p = NULL;
+	int k;
+	BIO *mbio;
+
+	mbio = BIO_new(BIO_s_mem());
+	if (mbio == NULL) return(NULL);
+
+	BIO_puts(mbio, "(&");
+
+	k = sk_X509_NAME_ENTRY_num(name->entries);
+	for (--k; k >= 0; k--) {
+		X509_NAME_ENTRY *ne;
+		ASN1_STRING     *nv;
+		int nid;
+
+		ne = sk_X509_NAME_ENTRY_value(name->entries, k);
+		nid = OBJ_obj2nid(ne->object);
+
+		if (
+			(nid != NID_organizationName) &&
+			(nid != NID_organizationalUnitName) &&
+			(nid != NID_commonName)
+		) continue;
+
+		BIO_puts(mbio, "(");
+		BIO_puts(mbio, OBJ_nid2sn(nid));
+		BIO_puts(mbio, "=");
+		nv = ne->value;
+		/*
+		TODO:
+		we must escape '(' and ')' symbols and might to check for other symbols (>=128?)
+		BIO_puts(mbio, M_ASN1_STRING_data(nv));
+		*/
+		{	/* escape '(' and ')' */
+			p = (char*)M_ASN1_STRING_data(nv);
+			for (; *p; p++) {
+				if ((*p == '(') || (*p == ')'))
+					BIO_write(mbio, "\\", 1);
+				BIO_write(mbio, p, 1);
+			}
+		}
+		BIO_puts(mbio, ")");
+	}
+
+	BIO_puts(mbio, "(");
+	BIO_puts(mbio, attribute);
+	BIO_puts(mbio, "=*)");
+
+	BIO_puts(mbio, ")");
+	BIO_flush(mbio);
+
+	k = BIO_pending(mbio);
+	p = OPENSSL_malloc(k + 1);
+	if (p == NULL) goto done;
+
+	k = BIO_read(mbio, p, k);
+	p[k] = '\0';
+
+done:
+	BIO_free_all(mbio);
+	return(p);
+}
+
+
+static int/*bool*/
+ldaplookup_check_attr(
+	int type,
+	const char *attr
+) {
+	if (type == X509_LU_X509)
+		return(strncmp(attr, ATTR_CACERT, sizeof(ATTR_CACERT)) != 0);
+
+	if (type == X509_LU_CRL)
+		return(strncmp(attr, ATTR_CACRL, sizeof(ATTR_CACRL)) != 0);
+
+	return(0);
+}
+
+
+/*
+ * We will put into store X509 object from passed data in buffer only
+ * when object name match passed. To compare both names we use our
+ * method "ssh_X509_NAME_cmp"(it is more general).
+ */
+static int/*bool*/
+ldaplookup_data2store(
+	int         type,
+	X509_NAME*  name,
+	void*       buf,
+	int         len,
+	X509_STORE* store
+) {
+	int ok = 0;
+	BIO *mbio;
+
+	if (name == NULL) return(0);
+	if (buf == NULL) return(0);
+	if (len <= 0) return(0);
+	if (store == NULL) return(0);
+
+	mbio = BIO_new_mem_buf(buf, len);
+	if (mbio == NULL) return(0);
+
+	switch (type) {
+	case X509_LU_X509: {
+		X509 *x509 = d2i_X509_bio(mbio, NULL);
+		if(x509 == NULL) goto exit;
+
+		/*This is correct since lookup method is by subject*/
+		if (ssh_X509_NAME_cmp(name, X509_get_subject_name(x509)) != 0) goto exit;
+
+		ok = X509_STORE_add_cert(store, x509);
+		} break;
+	case X509_LU_CRL: {
+		X509_CRL *crl = d2i_X509_CRL_bio(mbio, NULL);
+		if(crl == NULL) goto exit;
+
+		if (ssh_X509_NAME_cmp(name, X509_CRL_get_issuer(crl)) != 0) goto exit;
+
+		ok = X509_STORE_add_crl(store, crl);
+		} break;
+	}
+
+exit:
+	if (mbio != NULL) BIO_free_all(mbio);
+#ifdef TRACE_BY_LDAP
+fprintf(stderr, "TRACE_BY_LDAP ldaplookup_data2store: ok=%d\n", ok);
+#endif
+	return(ok);
+}
+
+
+static int
+ldaplookup_result2store(
+	int          type,
+	X509_NAME*   name,
+	LDAP*        ld,
+	LDAPMessage* res,
+	X509_STORE*  store
+) {
+	int count = 0;
+	int result;
+	LDAPMessage *entry;
+
+	result = ldap_count_entries(ld, res);
+	if (result < 0) {
+		result = ldap_result2error(ld, res, 0);
+		X509byLDAPerr(X509byLDAP_F_RESULT2STORE, X509byLDAP_R_UNABLE_TO_COUNT_ENTRIES);
+		openssl_add_ldap_error(result);
+		goto done;
+	}
+#ifdef TRACE_BY_LDAP
+fprintf(stderr, "TRACE_BY_LDAP ldaplookup_result2store: ldap_count_entries=%d\n", result);
+#endif
+
+	for(entry = ldap_first_entry(ld, res);
+	    entry != NULL;
+	    entry = ldap_next_entry(ld, entry)
+	) {
+		char *attr;
+		BerElement *ber;
+#ifdef TRACE_BY_LDAP
+{
+char *dn = ldap_get_dn(ld, entry);
+fprintf(stderr, "TRACE_BY_LDAP ldaplookup_result2store(): ldap_get_dn=%s\n", dn);
+ldap_memfree(dn);
+}
+#endif
+		for(attr = ldap_first_attribute(ld, entry, &ber);
+		    attr != NULL;
+		    attr = ldap_next_attribute(ld, entry, ber)
+		) {
+			struct berval **vals;
+			struct berval **p;
+
+#ifdef TRACE_BY_LDAP
+fprintf(stderr, "TRACE_BY_LDAP ldaplookup_result2store: attr=%s\n", attr);
+#endif
+			if (!ldaplookup_check_attr(type, attr))	continue;
+
+			vals = ldap_get_values_len(ld, entry, attr);
+			if (vals == NULL) continue;
+
+			for(p = vals; *p; p++) {
+				struct berval *q = *p;
+				if (ldaplookup_data2store(type, name, q->bv_val, q->bv_len, store)) {
+					count++;
+				}
+			}
+			ldap_value_free_len(vals);
+		}
+		ber_free(ber, 0);
+	}
+done:
+#ifdef TRACE_BY_LDAP
+fprintf(stderr, "TRACE_BY_LDAP ldaplookup_result2store: count=%d\n", count);
+#endif
+	return(count);
+}
+
+
+static int
+ldaplookup_by_subject(
+	X509_LOOKUP *ctx,
+	int          type,
+	X509_NAME   *name,
+	X509_OBJECT *ret
+) {
+	int count = 0;
+	ldaphost *lh;
+	const char *attrs[2];
+	char *filter = NULL;
+
+
+	if (ctx == NULL) return(0);
+	if (name == NULL) return(0);
+
+	lh = (ldaphost*) ctx->method_data;
+	if (lh == NULL) return(0);
+
+	switch(type) {
+	case X509_LU_X509: {
+		attrs[0] = ATTR_CACERT;
+		} break;
+	case X509_LU_CRL: {
+		attrs[0] = ATTR_CACRL;
+		} break;
+	default: {
+		X509byLDAPerr(X509byLDAP_F_GET_BY_SUBJECT, X509byLDAP_R_WRONG_LOOKUP_TYPE);
+		goto done;
+		}
+	}
+	attrs[1] = NULL;
+
+	filter = ldaplookup_filter(name, attrs[0]);
+	if (filter == NULL) {
+		X509byLDAPerr(X509byLDAP_F_GET_BY_SUBJECT, X509byLDAP_R_UNABLE_TO_GET_FILTER);
+		goto done;
+	}
+#ifdef TRACE_BY_LDAP
+fprintf(stderr, "TRACE_BY_LDAP ldaplookup_by_subject: filter=%s\n", filter);
+#endif
+
+	for (; lh != NULL; lh = lh->next) {
+		LDAPMessage *res = NULL;
+		int result;
+
+#ifdef TRACE_BY_LDAP
+{
+int version = -1;
+
+ldap_get_option(lh->ld, LDAP_OPT_PROTOCOL_VERSION, &version);
+fprintf(stderr, "TRACE_BY_LDAP ldaplookup_by_subject:"
+" bind to \"%s://%s:%d\""
+" using ldap v%d protocol\n"
+, lh->ldapurl->lud_scheme, lh->ldapurl->lud_host, lh->ldapurl->lud_port
+, version
+);
+}
+#endif
+
+		/* anonymous bind - data must be retrieved by anybody */
+		result = ldap_simple_bind_s(lh->ld, NULL/*binddn*/, NULL/*bindpw*/);
+		if (result != LDAP_SUCCESS) {
+			X509byLDAPerr(X509byLDAP_F_GET_BY_SUBJECT, X509byLDAP_R_UNABLE_TO_BIND);
+			{
+				char	buf[1024];
+				snprintf(buf, sizeof(buf),
+					" url=\"%s://%s:%d\""
+					" ldaperror=0x%x(%.256s)"
+					, lh->ldapurl->lud_scheme, lh->ldapurl->lud_host, lh->ldapurl->lud_port
+					, result, ldap_err2string(result)
+				);
+				ERR_add_error_data(1, buf);
+			}
+			continue;
+		}
+
+		result = ldap_search_s(lh->ld, lh->ldapurl->lud_dn, LDAP_SCOPE_SUBTREE, filter, (char**)attrs, 0, &res);
+#ifdef TRACE_BY_LDAP
+fprintf(stderr, "TRACE_BY_LDAP ldaplookup_by_subject:"
+" ldap_search_s return 0x%x(%s)\n"
+, result, ldap_err2string(result));
+#endif
+
+		if (result != LDAP_SUCCESS) {
+			X509byLDAPerr(X509byLDAP_F_GET_BY_SUBJECT, X509byLDAP_R_SEARCH_FAIL);
+			ldap_msgfree(res);
+			continue;
+		}
+
+		result = ldaplookup_result2store(type, name, lh->ld, res, ctx->store_ctx);
+		if (result > 0) count += result;
+
+		ldap_msgfree(res);
+
+		/*do not call ldap_unbind_s*/
+	}
+
+#ifdef TRACE_BY_LDAP
+fprintf(stderr, "TRACE_BY_LDAP ldaplookup_by_subject: count=%d\n", count);
+#endif
+	if (count > 0) {
+		/*
+		 * we have added at least one to the cache so now pull one out again
+		 */
+		union {
+			struct {
+				X509_CINF st_x509_cinf;
+				X509 st_x509;
+			} x509;
+			struct {
+				X509_CRL_INFO st_crl_info;
+				X509_CRL st_crl;
+			} crl;
+		} data;
+
+		X509_OBJECT stmp, *tmp;
+		int k;
+
+		memset(&data, 0, sizeof(data));
+		stmp.type = type;
+		switch(type) {
+		case X509_LU_X509: {
+			data.x509.st_x509_cinf.subject = name;
+			data.x509.st_x509.cert_info = &data.x509.st_x509_cinf;
+			stmp.data.x509 = &data.x509.st_x509;
+			} break;
+		case X509_LU_CRL: {
+			data.crl.st_crl_info.issuer = name;
+			data.crl.st_crl.crl = &data.crl.st_crl_info;
+			stmp.data.crl = &data.crl.st_crl;
+			} break;
+		default:
+			count = 0;
+			goto done;
+		}
+
+		CRYPTO_r_lock(CRYPTO_LOCK_X509_STORE);
+		k = sk_X509_OBJECT_find(ctx->store_ctx->objs, &stmp);
+		if (k >= 0)
+			tmp = sk_X509_OBJECT_value(ctx->store_ctx->objs, k);
+		else
+			tmp = NULL;
+		CRYPTO_r_unlock(CRYPTO_LOCK_X509_STORE);
+#ifdef TRACE_BY_LDAP
+fprintf(stderr, "TRACE_BY_LDAP ldaplookup_by_subject: k=%d, tmp=%p\n", k, tmp);
+#endif
+
+		if (tmp == NULL) {
+			count = 0;
+			goto done;
+		}
+
+		ret->type = tmp->type;
+		memcpy(&ret->data, &tmp->data, sizeof(ret->data));
+	}
+
+done:
+	if (filter != NULL) OPENSSL_free(filter);
+	return(count > 0);
+}
diff -ruN openssh-3.8.1p1+x509h/x509_by_ldap.h openssh-3.8.1p1+x509-5.1/x509_by_ldap.h
--- openssh-3.8.1p1+x509h/x509_by_ldap.h	1970-01-01 02:00:00.000000000 +0200
+++ openssh-3.8.1p1+x509-5.1/x509_by_ldap.h	2004-11-19 09:06:00.000000000 +0200
@@ -0,0 +1,98 @@
+#ifndef X509_BY_LDAP_H
+#define X509_BY_LDAP_H
+/*
+ * Copyright (c) 2004 Roumen Petrov.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* openssh specific includes */
+#include "includes.h"
+#ifndef LDAP_ENABLED
+#  include "error: LDAP is disabled"
+#endif
+
+/* required includes */
+#include <openssl/x509_vfy.h>
+#include <openssl/err.h>
+
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+
+X509_LOOKUP_METHOD* X509_LOOKUP_ldap(void);
+
+#define X509_L_LDAP_HOST	1
+#define X509_L_LDAP_VERSION	2
+
+#define X509_LOOKUP_add_ldap(x,value) \
+		X509_LOOKUP_ctrl((x),X509_L_LDAP_HOST,(value),(long)(0),NULL)
+#define X509_LOOKUP_set_protocol(x,value) \
+		X509_LOOKUP_ctrl((x),X509_L_LDAP_VERSION,(value),(long)(0),NULL)
+
+
+/* Error codes for the X509byLDAP functions. */
+#ifdef NO_ERR /* openssl < 0.7.x */
+#  define OPENSSL_NO_ERR /* openssl >= 0.7.x */
+#endif
+
+#ifndef OPENSSL_NO_ERR
+
+void ERR_load_X509byLDAP_strings(void);
+
+/* library */
+#define ERR_LIB_X509byLDAP	ERR_LIB_USER
+
+#define X509byLDAPerr(f,r) ERR_PUT_error(ERR_LIB_X509byLDAP,(f),(r),__FILE__,__LINE__)
+
+/* BEGIN ERROR CODES */
+
+/* Function codes. */
+#define X509byLDAP_F_LOOKUPCRTL			100
+#define X509byLDAP_F_LDAPHOST_NEW		101
+#define X509byLDAP_F_SET_PROTOCOL		102
+#define X509byLDAP_F_RESULT2STORE		103
+#define X509byLDAP_F_GET_BY_SUBJECT		104
+
+/* Reason codes. */
+#define X509byLDAP_R_INVALID_CRTLCMD			100
+#define X509byLDAP_R_NOT_LDAP_URL			101
+#define X509byLDAP_R_INVALID_URL			102
+#define X509byLDAP_R_INITIALIZATION_ERROR		103
+#define X509byLDAP_R_UNABLE_TO_GET_PROTOCOL_VERSION	104
+#define X509byLDAP_R_UNABLE_TO_SET_PROTOCOL_VERSION	105
+#define X509byLDAP_R_UNABLE_TO_COUNT_ENTRIES		106
+#define X509byLDAP_R_WRONG_LOOKUP_TYPE			107
+#define X509byLDAP_R_UNABLE_TO_GET_FILTER		108
+#define X509byLDAP_R_UNABLE_TO_BIND			109
+#define X509byLDAP_R_SEARCH_FAIL			110
+
+#endif /*ndef OPENSSL_NO_ERR*/
+
+
+#ifdef	__cplusplus
+}
+#endif
+
+
+#endif /*ndef X509_BY_LDAP_H*/
diff -ruN openssh-3.8.1p1+x509h/x509store.c openssh-3.8.1p1+x509-5.1/x509store.c
--- openssh-3.8.1p1+x509h/x509store.c	2004-03-21 12:09:33.000000000 +0200
+++ openssh-3.8.1p1+x509-5.1/x509store.c	2004-11-15 23:36:10.000000000 +0200
@@ -21,13 +21,20 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 #include "x509store.h"
 #include "openssl/x509v3.h"
 #include "log.h"
 
 #ifndef SSH_X509STORE_DISABLED
 #include "xmalloc.h"
+#include "pathnames.h"
+#include "misc.h"
 #include "openssl/err.h"
+#include "openssl/x509_vfy.h"
+#ifdef LDAP_ENABLED
+#  include "x509_by_ldap.h"
+#endif
 #endif /*ndef SSH_X509STORE_DISABLED*/
 
 /* allowed client/server certificate purpose */
@@ -43,11 +50,14 @@
 
 #ifndef SSH_X509STORE_DISABLED
 static X509_STORE	*x509store = NULL;
-#define SSH_CHECK_REVOKED
+#if 1
+#  define SSH_CHECK_REVOKED
+#endif
 
 
 #ifdef SSH_CHECK_REVOKED
 static X509_STORE	*x509revoked = NULL;
+static int/*bool*/	x509_mandatory_crl = 0;
 static int ssh_x509revoked_cb(int ok, X509_STORE_CTX *ctx);
 
 
@@ -96,10 +106,10 @@
 static int
 ssh_x509store_cb(int ok, X509_STORE_CTX *ctx) {
 	if (!ok) {
-		char buf[512];
+		char buf[X509_NAME_MAXLEN];
 		X509_NAME_oneline(X509_get_subject_name(ctx->current_cert), buf, sizeof(buf));
-		error("ssh_x509store_cb: subject='%.512s', error %d at %d depth lookup:%.200s",
-			buf,
+		error("ssh_x509store_cb: subject='%.*s', error %d at %d depth lookup:%.200s",
+			(int) sizeof(buf), buf,
 			ctx->error,
 			ctx->error_depth,
 			X509_verify_cert_error_string(ctx->error));
@@ -220,6 +230,59 @@
 
 
 #ifndef SSH_X509STORE_DISABLED
+void
+ssh_x509store_initialize(X509StoreOptions *options) {
+	options->certificate_file = NULL;
+	options->certificate_path = NULL;
+	options->revocation_file = NULL;
+	options->revocation_path = NULL;
+#ifdef LDAP_ENABLED
+	options->ldap_ver = NULL;
+	options->ldap_url = NULL;
+#endif
+}
+
+
+void
+ssh_x509store_system_defaults(X509StoreOptions *options) {
+	if (options->certificate_file == NULL)
+		options->certificate_file = _PATH_CA_CERTIFICATE_FILE;
+	if (options->certificate_path == NULL)
+		options->certificate_path = _PATH_CA_CERTIFICATE_PATH;
+	if (options->revocation_file == NULL)
+		options->revocation_file = _PATH_CA_REVOCATION_FILE;
+	if (options->revocation_path == NULL)
+		options->revocation_path = _PATH_CA_REVOCATION_PATH;
+#ifdef LDAP_ENABLED
+	/*nothing to do ;-)*/
+#endif
+}
+
+
+static void
+tilde_expand_filename2(const char **_fn, const char* _default, uid_t uid) {
+	if (*_fn == NULL) {
+		*_fn = tilde_expand_filename(_default, uid);
+	} else {
+		const char *p = *_fn;
+		*_fn = tilde_expand_filename(p, uid);
+		xfree((void*)p);
+	}
+}
+
+
+void
+ssh_x509store_user_defaults(X509StoreOptions *options, uid_t uid) {
+	tilde_expand_filename2(&options->certificate_file, _PATH_USERCA_CERTIFICATE_FILE, uid);
+	tilde_expand_filename2(&options->certificate_path, _PATH_USERCA_CERTIFICATE_PATH, uid);
+	tilde_expand_filename2(&options->revocation_file , _PATH_USERCA_REVOCATION_FILE , uid);
+	tilde_expand_filename2(&options->revocation_path , _PATH_USERCA_REVOCATION_PATH , uid);
+#ifdef LDAP_ENABLED
+	/*nothing to do ;-)*/
+#endif
+}
+
+
 static void
 ssh_x509store_initcontext(void) {
 	if (x509store == NULL) {
@@ -233,16 +296,16 @@
 	if (x509revoked == NULL) {
 		x509revoked = X509_STORE_new();
 		if (x509revoked == NULL) {
-			fatal("cannot create x509revoced context");
+			fatal("cannot create x509revoked context");
 		}
 	}
 #endif
 }
 
 
-int
+int/*bool*/
 ssh_x509store_addlocations(const X509StoreOptions *_locations) {
-	int flag = 0, flag2 = 0;
+	int flag;
 
 	if (_locations == NULL) {
 		error("ssh_x509store_addlocations: _locations is NULL");
@@ -261,6 +324,8 @@
 	}
 #endif
 	ssh_x509store_initcontext();
+
+	flag = 0;
 	/*
 	 * Note:
 	 * After X509_LOOKUP_{add_dir|load_file} calls we must call
@@ -270,7 +335,7 @@
 	if (_locations->certificate_path != NULL) {
 		X509_LOOKUP *lookup = X509_STORE_add_lookup(x509store, X509_LOOKUP_hash_dir());
 		if (lookup == NULL) {
-			fatal("ssh_x509store_addlocations:cannot add hash dir lookup !");
+			fatal("ssh_x509store_addlocations: cannot add hash dir lookup !");
 			return(0); /* ;-) */
 		}
 		if (X509_LOOKUP_add_dir(lookup, _locations->certificate_path, X509_FILETYPE_PEM)) {
@@ -282,7 +347,7 @@
 	if (_locations->certificate_file != NULL) {
 		X509_LOOKUP *lookup = X509_STORE_add_lookup(x509store, X509_LOOKUP_file());
 		if (lookup == NULL) {
-			fatal("ssh_x509store_addlocations:cannot add file lookup !");
+			fatal("ssh_x509store_addlocations: cannot add file lookup !");
 			return(0); /* ;-) */
 		}
 		if (X509_LOOKUP_load_file(lookup, _locations->certificate_file, X509_FILETYPE_PEM)) {
@@ -291,35 +356,100 @@
 		}
 		ERR_clear_error();
 	}
+	/*at least one lookup should succeed*/
+	if (flag == 0) return(0);
+
+	flag = 0;
 #ifdef SSH_CHECK_REVOKED
 	if (_locations->revocation_path != NULL) {
 		X509_LOOKUP *lookup = X509_STORE_add_lookup(x509revoked, X509_LOOKUP_hash_dir());
 		if (lookup == NULL) {
-			fatal("ssh_x509store_addlocations:cannot add hash dir revocation lookup !");
+			fatal("ssh_x509store_addlocations: cannot add hash dir revocation lookup !");
 			return(0); /* ;-) */
 		}
 		if (X509_LOOKUP_add_dir(lookup, _locations->revocation_path, X509_FILETYPE_PEM)) {
 			debug2("hash dir '%.400s' added to x509 revocation store", _locations->revocation_path);
-			flag2 = 1;
+			flag = 1;
 		}
 		ERR_clear_error();
 	}
 	if (_locations->revocation_file != NULL) {
 		X509_LOOKUP *lookup = X509_STORE_add_lookup(x509revoked, X509_LOOKUP_file());
 		if (lookup == NULL) {
-			fatal("ssh_x509store_addlocations:cannot add file revocation lookup !");
+			fatal("ssh_x509store_addlocations: cannot add file revocation lookup !");
 			return(0); /* ;-) */
 		}
 		if (X509_LOOKUP_load_file(lookup, _locations->revocation_file, X509_FILETYPE_PEM)) {
 			debug2("file '%.400s' added to x509 revocation store", _locations->revocation_file);
-			flag2 = 1;
+			flag = 1;
 		}
 		ERR_clear_error();
 	}
+#else /*ndef SSH_CHECK_REVOKED*/
+	if (_locations->revocation_path != NULL) {
+		logit("useless option: revocation_path");
+	}
+	if (_locations->revocation_file != NULL) {
+		logit("useless option: revocation_file");
+	}
+	flag = 1;
+#endif /*ndef SSH_CHECK_REVOKED*/
+	/*at least one revocation lookup should succeed*/
+	if (flag == 0) return(0);
+
+#ifdef LDAP_ENABLED
+	if (_locations->ldap_url != NULL) {
+		X509_LOOKUP *lookup;
+
+		lookup = X509_STORE_add_lookup(x509store, X509_LOOKUP_ldap());
+		if (lookup == NULL) {
+			fatal("ssh_x509store_addlocations: cannot add ldap lookup !");
+			return(0); /* ;-) */
+		}
+		if (X509_LOOKUP_add_ldap(lookup, _locations->ldap_url)) {
+			debug2("ldap url '%.400s' added to x509 store", _locations->ldap_url);
+		}
+		if (_locations->ldap_ver != NULL) {
+			if (!X509_LOOKUP_set_protocol(lookup, _locations->ldap_ver)) {
+				fatal("ssh_x509store_addlocations: cannot set ldap version !");
+				return(0); /* ;-) */
+			}
+		}
+		/*ERR_clear_error();*/
+
+#ifdef SSH_CHECK_REVOKED
+		lookup = X509_STORE_add_lookup(x509revoked, X509_LOOKUP_ldap());
+		if (lookup == NULL) {
+			fatal("ssh_x509store_addlocations: cannot add ldap lookup(revoked) !");
+			return(0); /* ;-) */
+		}
+		if (X509_LOOKUP_add_ldap(lookup, _locations->ldap_url)) {
+			debug2("ldap url '%.400s' added to x509 store(revoked)", _locations->ldap_url);
+		}
+		if (_locations->ldap_ver != NULL) {
+			if (!X509_LOOKUP_set_protocol(lookup, _locations->ldap_ver)) {
+				fatal("ssh_x509store_addlocations: cannot set ldap version(revoked) !");
+				return(0); /* ;-) */
+			}
+		}
+		/*ERR_clear_error();*/
+#endif /*def SSH_CHECK_REVOKED*/
+	}
+#endif /*def LDAP_ENABLED*/
+
+	return(1);
+}
+
+
+int/*bool*/
+ssh_x509store_mandatory_crl(int _mandatory_crl) {
+#ifdef SSH_CHECK_REVOKED
+	x509_mandatory_crl = (_mandatory_crl != 0);
+	return(x509_mandatory_crl);
 #else
-	flag2 = 1;
+	logit("useless option: mandatory_crl");
+	return(_mandatory_crl != 0);
 #endif
-	return(flag && flag2);
 }
 
 
@@ -408,9 +538,9 @@
 	}
 
 	if (get_log_level() >= SYSLOG_LEVEL_DEBUG3) {
-		char buf[512];
+		char buf[X509_NAME_MAXLEN];
 		X509_NAME_oneline( X509_get_subject_name(_cert), buf, sizeof(buf));
-		debug3("ssh_x509cert_check: for '%.512s'", buf);
+		debug3("ssh_x509cert_check: for '%.*s'", (int) sizeof(buf), buf);
 	}
 
 	csc = X509_STORE_CTX_new();
@@ -418,7 +548,7 @@
 		int ecode = ERR_get_error();
 		char ebuf[256];
 		ERR_error_string_n(ecode, ebuf, sizeof(ebuf));
-		error("ssh_x509cert_check:X509_STORE_CTX_new failed with '%.256s'", ebuf);
+		error("ssh_x509cert_check: X509_STORE_CTX_new failed with '%.256s'", ebuf);
 
 		/* clear rest of errors in OpenSSL "error buffer" */
 		ERR_clear_error();
@@ -427,6 +557,7 @@
 
 	ret = ssh_verify_cert(csc, _cert);
 	X509_STORE_CTX_free(csc);
+#ifdef SSH_OCSP_ENABLED
 	if (ret > 0) {
 /*
  * OpenSSH implementation first verify and validate certificate by
@@ -469,11 +600,12 @@
  * Therefore instead to send OCSP request in ssh_x509revoked_cb()
  * we do this here.
  */
-		ret = ssh_x509_validate(_cert, x509store);
+		ret = ssh_ocsp_validate(_cert, x509store);
 	}
+#endif /*def SSH_OCSP_ENABLED*/
 
 #else /*def SSH_X509STORE_DISABLED*/
-	if (sshpurpose.index >=0) {
+	if (sshpurpose.index >= 0) {
 		xptmp = X509_PURPOSE_get0(sshpurpose.index);
 		if (xptmp == NULL) {
 			fatal("ssh_x509cert_check: cannot get purpose from index");
@@ -493,25 +625,23 @@
 
 #ifndef SSH_X509STORE_DISABLED
 #ifdef SSH_CHECK_REVOKED
-static int
-ssh_check_crl(X509_STORE_CTX *_ctx, X509_CRL *_crl) {
-	X509   *cert = NULL;
+static int/*bool*/
+ssh_check_crl(X509_STORE_CTX *_ctx, X509* _issuer, X509_CRL *_crl) {
 	time_t *pcheck_time;
 	int     k;
 
+	if (_issuer == NULL) {
+		error("ssh_check_crl: issuer is NULL");
+		return(0);
+	}
 	if (_crl == NULL) {
+		debug("ssh_check_crl: crl is NULL");
 		return(1);
 	}
 
-	cert = X509_STORE_CTX_get_current_cert(_ctx);
-	if (cert == NULL) {
-		error("ssh_check_crl: missing current certificate in x509store context");
-		return(0);
-	}
-
 	if (get_log_level() >= SYSLOG_LEVEL_DEBUG3) {
 		BIO *bio;
-		char buf[512];
+		char buf[X509_NAME_MAXLEN];
 		char *p;
 
 		bio = BIO_new(BIO_s_mem());
@@ -520,7 +650,7 @@
 			return(0); /* ;-) */
 		}
 
-		X509_NAME_oneline( X509_CRL_get_issuer(_crl), buf, sizeof(buf));
+		X509_NAME_oneline(X509_CRL_get_issuer(_crl), buf, sizeof(buf));
 
 		BIO_printf(bio, ", Last Update: ");
 		ASN1_UTCTIME_print(bio, X509_CRL_get_lastUpdate(_crl));
@@ -539,16 +669,38 @@
 		BIO_free(bio);
 	}
 
+/* RFC 3280:
+ * The cRLSign bit is asserted when the subject public key is used
+ * for verifying a signature on certificate revocation list (e.g., a
+ * CRL, delta CRL, or an ARL).  This bit MUST be asserted in
+ * certificates that are used to verify signatures on CRLs.
+ */
+	if (/*???(_issuer->ex_flags & EXFLAG_KUSAGE) &&*/
+	    !(_issuer->ex_kusage & KU_CRL_SIGN)
+	) {
+		char buf[X509_NAME_MAXLEN];
+
+		X509_NAME_oneline(X509_get_subject_name(_issuer), buf, sizeof(buf));
+		error("ssh_check_crl: to verify crl signature key usage 'cRLSign'"
+			" must present in issuer certificate '%.*s'"
+			, (int) sizeof(buf), buf);
+	#ifdef X509_V_ERR_KEYUSAGE_NO_CRL_SIGN
+		/*first defined in OpenSSL 0.9.7d*/
+		X509_STORE_CTX_set_error(_ctx, X509_V_ERR_KEYUSAGE_NO_CRL_SIGN);
+	#endif
+		return(0);
+	}
+
 	{
-		EVP_PKEY *pkey = X509_get_pubkey(cert);
+		EVP_PKEY *pkey = X509_get_pubkey(_issuer);
 		if (pkey == NULL) {
-			error("ssh_check_crl:unable to decode public key");
+			error("ssh_check_crl: unable to decode issuer public key");
 			X509_STORE_CTX_set_error(_ctx, X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY);
 			return(0);
 		}
 
 		if (X509_CRL_verify(_crl, pkey) <= 0) {
-			error("ssh_check_crl:CRL has invalid signature");
+			error("ssh_check_crl: CRL has invalid signature");
 			X509_STORE_CTX_set_error(_ctx, X509_V_ERR_CRL_SIGNATURE_FAILURE);
 			return(0);
 		}
@@ -564,23 +716,23 @@
 	k = X509_cmp_time(X509_CRL_get_lastUpdate(_crl), pcheck_time);
 	if (k == 0) {
 		X509_STORE_CTX_set_error(_ctx, X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD);
-		error("ssh_check_crl:CRL has invalid lastUpdate field");
+		error("ssh_check_crl: CRL has invalid lastUpdate field");
 		return(0);
 	}
 	if (k > 0) {
 		X509_STORE_CTX_set_error(_ctx, X509_V_ERR_CRL_NOT_YET_VALID);
-		error("ssh_check_crl:CRL is not yet valid");
+		error("ssh_check_crl: CRL is not yet valid");
 		return(0);
 	}
 
 	k = X509_cmp_time(X509_CRL_get_nextUpdate(_crl), pcheck_time);
 	if (k == 0) {
-		error("ssh_check_crl:CRL has invalid nextUpdate field");
+		error("ssh_check_crl: CRL has invalid nextUpdate field");
 		X509_STORE_CTX_set_error(_ctx, X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD);
 		return(0);
 	}
 	if (k < 0) {
-		error("ssh_check_crl:CRL is expired");
+		error("ssh_check_crl: CRL is expired");
 		X509_STORE_CTX_set_error(_ctx, X509_V_ERR_CRL_HAS_EXPIRED);
 		return(0);
 	}
@@ -589,16 +741,16 @@
 }
 
 
-static int
-ssh_check_crl_cert(X509_STORE_CTX *_ctx, X509_CRL *_crl, X509 *_cert) {
+static int/*bool*/
+ssh_is_cert_revoked(X509_STORE_CTX *_ctx, X509_CRL *_crl, X509 *_cert) {
 	X509_REVOKED revoked;
 	int   k;
-	char *p, buf1[512], buf2[512];
+	char *p, buf1[X509_NAME_MAXLEN], buf2[X509_NAME_MAXLEN];
 
 	if (_crl == NULL) return(1);
 	revoked.serialNumber = X509_get_serialNumber(_cert);
 	k = sk_X509_REVOKED_find(_crl->crl->revoked, &revoked);
-	if (k < 0) return(1);
+	if (k < 0) return(0);
 
 	X509_STORE_CTX_set_error(_ctx, X509_V_ERR_CERT_REVOKED);
 	/* yes, revoked. print log and ...*/
@@ -606,11 +758,13 @@
 	X509_NAME_oneline(X509_get_subject_name(_cert), buf1, sizeof(buf1));
 	X509_NAME_oneline(X509_CRL_get_issuer  (_crl ), buf2, sizeof(buf2));
 
-	error("certificate '%.512s' with serial '%.40s' revoked from issuer '%.512s'",
-	     buf1, p, buf2);
+	error("certificate '%.*s' with serial '%.40s' revoked from issuer '%.*s'"
+		, (int) sizeof(buf1), buf1
+		, p
+		, (int) sizeof(buf2), buf2);
 	xfree(p);
 
-	return(0);
+	return(1);
 }
 
 
@@ -630,16 +784,20 @@
 	}
 
 	if (get_log_level() >= SYSLOG_LEVEL_DEBUG3) {
-		char buf[512];
+		char buf[X509_NAME_MAXLEN];
 
 		X509_NAME_oneline(X509_get_issuer_name(cert), buf, sizeof(buf));
-		debug3("ssh_x509revoked_cb:issuer =%.512s", buf);
+		debug3("ssh_x509revoked_cb: issuer =%.*s", (int) sizeof(buf), buf);
 
 		X509_NAME_oneline(X509_get_subject_name(cert), buf, sizeof(buf));
-		debug3("ssh_x509revoked_cb:subject=%.512s", buf);
+		debug3("ssh_x509revoked_cb: subject=%.*s", (int) sizeof(buf), buf);
 	}
 
 	memset(&xobj, 0, sizeof(xobj));
+/* TODO:
+ * NID_crl_distribution_points may contain one or more
+ * CRLissuer != cert issuer
+ */
 	if (ssh_x509store_lookup(
 	      x509revoked, X509_LU_CRL,
 	      X509_get_subject_name(cert),
@@ -665,7 +823,17 @@
  * we already know that all issuers of "current certificate" aren't
  * revoked.
  */
-		ok = ssh_check_crl(ctx, xobj.data.crl);
+		ok = ssh_check_crl(ctx, cert, xobj.data.crl);
+	} else {
+		if (x509_mandatory_crl) {
+			int loc;
+			loc = X509_get_ext_by_NID(cert, NID_crl_distribution_points, -1);
+			ok = (loc < 0);
+			if (!ok) {
+				error("ssh_x509revoked_cb: unable to get issued CRL");
+				X509_STORE_CTX_set_error(ctx, X509_V_ERR_UNABLE_TO_GET_CRL);
+			}
+		}
 	}
 	X509_OBJECT_free_contents(&xobj);
 	if (!ok) return(0);
@@ -675,7 +843,7 @@
 	      x509revoked, X509_LU_CRL,
 	      X509_get_issuer_name(cert),
 	      &xobj) > 0) {
-		ok = ssh_check_crl_cert(ctx, xobj.data.crl, cert);
+		ok = !ssh_is_cert_revoked(ctx, xobj.data.crl, cert);
 	}
 	X509_OBJECT_free_contents(&xobj);
 	/* clear rest of errors in OpenSSL "error buffer" */
diff -ruN openssh-3.8.1p1+x509h/x509store.h openssh-3.8.1p1+x509-5.1/x509store.h
--- openssh-3.8.1p1+x509h/x509store.h	2004-03-21 11:09:12.000000000 +0200
+++ openssh-3.8.1p1+x509-5.1/x509store.h	2004-11-07 22:44:28.000000000 +0200
@@ -24,11 +24,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-
 #include "includes.h"
 #include <openssl/x509.h>
 
 
+#define X509_NAME_MAXLEN	512
+
+
 int ssh_x509cert_check(X509 *_cert);
 
 int ssh_get_default_x509purpose(int _is_server);
@@ -47,16 +49,26 @@
 	const char   *certificate_path;
 	const char   *revocation_file;
 	const char   *revocation_path;
+#ifdef LDAP_ENABLED
+	const char   *ldap_ver;
+	const char   *ldap_url;
+#endif
 }       X509StoreOptions;
 
-int ssh_x509store_addlocations(const X509StoreOptions *_locations);
+void ssh_x509store_initialize(X509StoreOptions *options);
+void ssh_x509store_system_defaults(X509StoreOptions *options);
+void ssh_x509store_user_defaults(X509StoreOptions *options, uid_t uid);
 
-int ssh_x509_validate(X509 *cert, X509_STORE *x509store);
+int/*bool*/ ssh_x509store_addlocations(const X509StoreOptions *_locations);
+int/*bool*/ ssh_x509store_mandatory_crl(int _mandatory_crl);
 
 #endif /*ndef SSH_X509STORE_DISABLED*/
 
 
 #ifdef SSH_X509STORE_DISABLED
+#ifdef LDAP_ENABLED
+#  include "cannot enable LDAP when x509store is disabled"
+#endif /*def LDAP_ENABLED*/
 #ifdef SSH_OCSP_ENABLED
 #  include "cannot enable OCSP when x509store is disabled"
 #endif /*def SSH_OCSP_ENABLED*/
@@ -87,6 +99,8 @@
 
 void ssh_set_validator(const VAOptions *_va); /*fatal on error*/
 
+int ssh_ocsp_validate(X509 *cert, X509_STORE *x509store);
+
 #endif /*def SSH_OCSP_ENABLED*/