72 files changed, 2496 insertions, 4699 deletions
diff --git a/ChangeLog b/ChangeLog
index c2891ba41..e259be6a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,192 @@
+20040418
+ - (dtucker) [auth-pam.c] Log username and source host for failed PAM
+   authentication attempts.  With & ok djm@
+ - (djm) [openbsd-compat/bsd-cygwin_util.c] Recent versions of Cygwin allow
+   change of user context without a password, so relax auth method 
+   restrictions; from vinschen AT redhat.com; ok dtucker@
+ - Release 3.8.1p1
+20040416
+ - (dtucker) [regress/sftp-cmds.sh] Skip quoting test on Cygwin, since
+   FAT/NTFS does not permit quotes in filenames.  From vinschen at redhat.com
+ - (djm) [auth-krb5.c auth.h session.c] Explicitly refer to Kerberos ccache 
+   file using FILE: method, fixes problems on Mac OSX.
+   Patch from simon@sxw.org.uk; ok dtucker@
+ - (tim) [configure.ac] Set SETEUID_BREAKS_SETUID, BROKEN_SETREUID and
+   BROKEN_SETREGID for SCO OpenServer 3
+20040412
+ - (dtucker) [sshd_config.5] Add PermitRootLogin without-password warning
+   from bug #701 (text from jfh at cise.ufl.edu).
+ - (dtucker) [acconfig.h configure.ac defines.h] Bug #673: check for 4-arg
+   skeychallenge(), eg on NetBSD.  ok mouring@
+ - (dtucker) [auth-skey.c defines.h monitor.c] Make skeychallenge explicitly
+   4-arg, with compatibility for 3-arg versions.  From djm@, ok me.
+ - (djm) [configure.ac] Fix detection of libwrap on OpenBSD; ok dtucker@
+20040408
+ - (dtucker) [loginrec.c] Use UT_LINESIZE if available, prevents truncating
+   pty name on Linux 2.6.x systems.  Patch from jpe at eisenmenger.org.
+ - (bal) [monitor.c monitor_wrap.c] Second try.  Put the zlib.h headers
+   back and #undef TARGET_OS_MAC instead.  (Bug report pending with Apple)
+ - (dtucker) [defines.h loginrec.c] Define UT_LINESIZE if not defined and
+   simplify loginrec.c.  ok tim@
+ - (bal) [monitor.c monitor_wrap.c] Ok.. Last time.  Promise.  Tim suggested
+   limiting scope and dtucker@ agreed.
+20040407
+ - (dtucker) [session.c] Flush stdout after displaying loginmsg.  From
+   f_mohr at yahoo.de.
+ - (bal) [acconfig.h auth-krb5.c configure.ac gss-serv-krb5.c] Check to see
+   if Krb5 library exports krb5_init_etc() since some OSes (like MacOS/X)
+   are starting to restrict it as internal since it is not needed by
+   developers any more. (Patch based on Apple tree)
+ - (bal) [monitor.c monitor_wrap.c] monitor_wrap.c] moved zlib.h higher since 
+   krb5 on MacOS/X conflicts.  There may be a better solution, but this will 
+   work for now.
+20040406
+ - (dtucker) [acconfig.h configure.ac defines.h] Bug #820: don't use
+   updwtmpx() on IRIX since it seems to clobber utmp.  ok djm@
+ - (dtucker) [configure.ac] Bug #816, #748 (again): Attempt to detect
+   broken getaddrinfo and friends on HP-UX.  ok djm@
+20040330
+ - (dtucker) [configure.ac] Bug #811: Use "!" for LOCKED_PASSWD_PREFIX on
+   Linuxes, since that's what many use.  ok djm@
+ - (dtucker) [auth-pam.c] rename the_authctxt to sshpam_authctxt in auth-pam.c
+   to reduce potential confusion with the one in sshd.c.  ok djm@
+ - (djm) Bug #825: Fix ip_options_check() for mapped IPv4/IPv6 connection; 
+   with & ok dtucker@
+20040327
+ - (dtucker) [session.c] Bug #817: Clear loginmsg after fork to prevent
+   duplicate login messages for mutli-session logins.  ok djm@
+20040322
+ - (djm) [sshd.c] Drop supplemental groups if started as root
+ - (djm) OpenBSD CVS Sync
+   - markus@cvs.openbsd.org 2004/03/09 22:11:05
+     [ssh.c]
+     increase x11 cookie lifetime to 20 minutes; ok djm
+   - markus@cvs.openbsd.org 2004/03/10 09:45:06
+     [ssh.c]
+     trim usage to match ssh(1) and look more like unix. ok djm@
+   - markus@cvs.openbsd.org 2004/03/11 08:36:26
+     [sshd.c]
+     trim usage; ok deraadt
+   - markus@cvs.openbsd.org 2004/03/11 10:21:17
+     [ssh.c sshd.c]
+     ssh, sshd: sync version output, ok djm
+   - markus@cvs.openbsd.org 2004/03/20 10:40:59
+     [version.h]
+     3.8.1
+ - (djm) Crank RPM spec versions
+20040311
+ - (djm) [configure.ac] Add standard license to configure.ac; ok ben, dtucker
+20040310
+ - (dtucker) [openbsd-compat/fake-rfc2553.h] Bug #812: #undef getaddrinfo
+   before redefining it, silences warnings on Tru64.
+20040308
+ - (dtucker) [sshd.c] Back out rev 1.270 as it caused problems on some
+   platforms (eg SCO, HP-UX) with logging in the wrong TZ.  ok djm@
+ - (dtucker) [configure.ac sshd.c openbsd-compat/bsd-misc.h
+   openbsd-compat/setenv.c] Unset KRB5CCNAME on AIX to prevent it from being
+   inherited by the child.  ok djm@
+ - (dtucker) [auth-pam.c auth-pam.h auth1.c auth2.c monitor.c monitor_wrap.c
+   monitor_wrap.h] Bug #808: Ensure force_pwchange is correctly initialized
+   even if keyboard-interactive is not used by the client.  Prevents 
+   segfaults in some cases where the user's password is expired (note this 
+   is not considered a security exposure).  ok djm@
+ - (djm) OpenBSD CVS Sync
+   - markus@cvs.openbsd.org 2004/03/03 06:47:52
+     [sshd.c]
+     change proctiltle after accept(2); ok henning, deraadt, djm
+   - djm@cvs.openbsd.org 2004/03/03 09:30:42
+     [sftp-client.c]
+     Don't print duplicate messages when progressmeter is off
+     Spotted by job317 AT mailvault.com; ok markus@
+   - djm@cvs.openbsd.org 2004/03/03 09:31:20
+     [sftp.c]
+     Fix initialisation of progress meter; ok markus@
+   - markus@cvs.openbsd.org 2004/03/05 10:53:58
+     [readconf.c readconf.h scp.1 sftp.1 ssh.1 ssh_config.5 sshconnect2.c]
+     add IdentitiesOnly; ok djm@, pb@
+   - djm@cvs.openbsd.org 2004/03/08 09:38:05
+     [ssh-keyscan.c]
+     explicitly initialise remote_major and remote_minor.
+     from cjwatson AT debian.org; ok markus@
+   - dtucker@cvs.openbsd.org 2004/03/08 10:18:57
+     [sshd_config.5]
+     Document KerberosGetAFSToken;  ok markus@
+ - (tim) [regress/README.regress] Document ssh-rand-helper issue. ok bal
+20040307
+ - (tim) [regress/login-timeout.sh] fix building outside of source tree.
+20040304
+ - (dtucker) [auth-pam.c] Don't try to export PAM when compiled with
+   -DUSE_POSIX_THREADS.  From antoine.verheijen at ualbert ca.  ok djm@
+ - (dtucker) [auth-pam.c] Reset signal status when starting pam auth thread,
+   prevent hanging during PAM keyboard-interactive authentications.  ok djm@
+ - (dtucker) [auth-passwd.c auth-sia.c auth-sia.h defines.h
+   openbsd-compat/xcrypt.c] Bug #802: Fix build error on Tru64 when
+   configured --with-osfsia.  ok djm@
+20040303
+ - (djm) [configure.ac ssh-agent.c] Use prctl to prevent ptrace on ssh-agent
+   ok dtucker  
+20040229
+ - (tim) [configure.ac] Put back bits mistakenly removed from Rev 1.188
+20040229
+ - (dtucker) OpenBSD CVS Sync
+   - djm@cvs.openbsd.org 2004/02/25 00:22:45
+     [sshd.c]
+     typo in comment
+   - dtucker@cvs.openbsd.org 2004/02/27 22:42:47
+     [dh.c]
+     Prevent sshd from sending DH groups with a primitive generator of zero or
+     one, even if they are listed in /etc/moduli.  ok markus@
+   - dtucker@cvs.openbsd.org 2004/02/27 22:44:56
+     [dh.c]
+     Make /etc/moduli line buffer big enough for 8kbit primes, in case anyone
+     ever uses one.  ok markus@
+   - dtucker@cvs.openbsd.org 2004/02/27 22:49:27
+     [dh.c]
+     Reset bit counter at the right time, fixes debug output in the case where
+     the DH group is rejected.  ok markus@
+   - dtucker@cvs.openbsd.org 2004/02/17 08:23:20
+     [regress/Makefile regress/login-timeout.sh]
+     Add regression test for LoginGraceTime; ok markus@
+   - markus@cvs.openbsd.org 2004/02/24 16:56:30
+     [regress/test-exec.sh]
+     allow arguments in ${TEST_SSH_XXX}
+   - markus@cvs.openbsd.org 2004/02/24 17:06:52
+     [regress/ssh-com-client.sh regress/ssh-com-keygen.sh
+     regress/ssh-com-sftp.sh regress/ssh-com.sh]
+     test against recent ssh.com releases
+   - dtucker@cvs.openbsd.org 2004/02/28 12:16:57
+     [regress/dynamic-forward.sh]
+     Make dynamic-forward understand nc's new output.  ok markus@
+   - dtucker@cvs.openbsd.org 2004/02/28 13:44:45
+     [regress/try-ciphers.sh]
+     Test acss too; ok markus@
+ - (dtucker) [regress/try-ciphers.sh] Skip acss if not compiled in (eg if we
+   built with openssl < 0.9.7)
+20040226
+ - (bal) KNF our sshlogin.c even if the code looks nothing like upstream
+   code due to diversity issues.
+20040225
+ - (djm) Trim ChangeLog 
+ - (djm) Don't specify path to PAM modules in Redhat sshd.pam; from Fedora
 20040224
 - (dtucker) OpenBSD CVS Sync
   - markus@cvs.openbsd.org 2004/02/19 21:15:04
@@ -794,1139 +983,4 @@
   - (djm) Trim deprecated options from INSTALL. Mention UsePAM
   - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-20030919
+$Id: ChangeLog,v 1.3316.2.1 2004/04/18 12:51:12 djm Exp $
- - (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL;
-   djast AT cs.toronto.edu
- - (djm) Bug #661: Remove duplicate check for basename; from 
-   bugzilla-openssh AT thewrittenword.com
- - (djm) Bug #641: Allow RedHat RPM building without GTK-2; Patch from
-   jason AT devrandom.org
- - (djm) Bug #646: Fix location of x11-ssh-askpass; Jim
- - (dtucker) [openbsd-compat/port-aix.h] Bug #640: Don't include audit.h
-   unless required.  Reorder to reduce warnings.
- - (dtucker) [session.c] Bug #643: Fix size_t -> u_int and fix null deref
-   when /etc/default/login doesn't exist or isn't readable.  Fixes from
-   jparsons-lists at saffron.net and georg.oppenberg at deu mci com.
- - (dtucker) [acconfig.h] Updated basename test needs HAVE_BASENAME
-20030918
- - (djm) Bug #652: Fix empty password auth
-20030917
- - (djm) Sync with V_3_7 branch
- - (djm) OpenBSD Sync
-   - markus@cvs.openbsd.org 2003/09/16 21:02:40
-     [buffer.c channels.c version.h]
-     more malloc/fatal fixes; ok millert/deraadt; ghudson at MIT.EDU
- - (djm) Crank RPM spec file versions
- - (tim) [openbsd-compat/inet_ntoa.c] 20030917 "Sync with V_3_7 branch" undid
-   20030916 "Missed dead header in inet_ntoa.c"
- 
-20030916
- - (dtucker) [acconfig.h configure.ac defines.h session.c] Bug #252: Retrieve
-   PATH (or SUPATH) and UMASK from /etc/default/login on platforms that have it
-   (eg Solaris, Reliant Unix).  Patch from Robert.Dahlem at siemens.com.  
-   ok djm@
- - (bal) OpenBSD Sync
-   - deraadt@cvs.openbsd.org 2003/09/16 03:03:47
-     [buffer.c]
-     do not expand buffer before attempting to reallocate it; markus ok
- - (tim) [configure.ac] Fix portability issues.
- - (bal) Missed dead header in inet_ntoa.c
-20030914
- - (dtucker) [Makefile regress/Makefile] Fix portability issues preventing
-   the regression tests from running with Solaris' make.  Patch from Brian
-   Poole (raj at cerias.purdue.edu).
- - (dtucker) [regress/Makefile] AIX's make doesn't like " +=", so replace
-   with vanilla "=".
-20030913
- - (dtucker) [regress/agent-timeout.sh] Timeout of 5 sec is borderline for
-   slower hosts, increase to 10 sec.
- - (dtucker) [auth-passwd.c] On AIX, call setauthdb() before loginsuccess(),
-   required to correctly reset failed login count when using a password
-   registry other than "files" (eg LDAP, see bug #543).
- - (tim) [configure.ac] define WITH_ABBREV_NO_TTY for SCO.
-   Report by Roger Cornelius.
- - (dtucker) [auth-pam.c] Use SSHD_PAM_SERVICE for PAM service name, patch
-   from cjwatson at debian.org.
-20030912
- - (tim) [regress/agent-ptrace.sh] sh doesn't like "if ! shell_function; then".
- - (tim) [Makefile.in] only mkdir regress if it does not exist.
- - (tim) [regress/yes-head.sh] shell portability fix.
-20030911
- - (dtucker) [configure.ac] Bug #588, #615: Move other libgen tests to after
-   the dirname test, to allow a broken dirname to be detected correctly.
-   Based partially on patch supplied by alex.kiernan at thus.net.  ok djm@
- - (tim) [configure.ac] Move libgen tests to before libwrap to unbreak
-   UnixWare 2.03 using --with-tcp-wrappers.
- - (tim) [configure.ac] Prefer setuid/setgid on UnixWare and Open Server.
- - (tim) [regress/agent-ptrace.sh regress/dynamic-forward.sh
-   regress/sftp-cmds.sh regress/stderr-after-eof.sh regress/test-exec.sh]
-   no longer depends on which(1). patch by dtucker@
-20030910
- - (dtucker) [configure.ac] Bug #636: Add support for Cray's new X1 machine.
-   Patch from wendyp at cray.com.
- - (dtucker) [configure.ac] Part of bug #615: tcsendbreak might be a macro.
- - (dtucker) [regressh/yes-head.sh] Some platforms (eg Solaris) don't have
-   "yes".
-20030909
- - (tim) [regress/Makefile] Fixes for building outside of a read-only
-   source tree.
- - (tim) [regress/agent-timeout.sh] s/TIMEOUT/SSHAGENT_TIMEOUT/ Fixes conflict
-   with shell read-only variable.
- - (tim) [regress/sftp-badcmds.sh regress/sftp-cmds.sh] Fix errors like
-   UX:rm: ERROR: Cannot remove '.' or '..'
-20030908
- - (tim) [configure.ac openbsd-compat/getrrsetbyname.c] wrap _getshort and
-   _getlong in #ifndef
- - (tim) [configure.ac acconfig.h openbsd-compat/getrrsetbyname.c] test for
-   HEADER.ad in arpa/nameser.h
- - (tim) [ssh-keygen.c] s/PATH_MAX/MAXPATHLEN/ ok mouring@
-20030907
- - (dtucker) [agent-ptrace.sh dynamic-forward.sh (all regress/)]
-   Put "which" inside quotes.
- - (dtucker) [dynamic-forward.sh forwarding.sh sftp-batch.sh (all regress/)]
-   Add ${EXEEXT}: required to work on Cygwin.
- - (dtucker) [regress/sftp-batch.sh] Make temporary batch file name more
-   distinctive, so "rm ${BATCH}.*" doesn't match the script itself.
- - (dtucker) [regress/sftp-cmds.sh] Skip quoted file test on Cygwin.
- - (dtucker) [openbsd-compat/xcrypt.c] #elsif -> #elif
- - (dtucker) [acconfig.h] Typo.
- - (dtucker) [CREDITS Makefile.in configure.ac mdoc2man.awk mdoc2man.pl]
-   Replace mdoc2man.pl with mdoc2man.awk, provided by Peter Stuge.
-20030906
- - (dtucker) [acconfig.h configure.ac uidswap.c] Prefer setuid/setgid on AIX.
-20030905
- - (dtucker) [Makefile.in] Add distclean target for regress/, fix clean target.
-20030904
- - (dtucker) Portablize regression tests.  Parts contributed by Roumen
-   Petrov, David M. Williams and Corinna Vinschen.
-   - [Makefile.in] Add "make tests" target and "make clean" hooks.
-   - [regress/agent-getpeereid.sh] Skip test on platforms that don't support
-     getpeereid.
-   - [regress/agent-ptrace.sh] Skip tests if platform doesn't support it or
-     gdb cannot be found.
-   - [regress/reconfigure/sh] Make path to sshd fully qualified if required.
-   - [regress/rekey.sh] Remove dependence on /dev/zero (not all platforms have
-     it).  The sparse file will take less disk space too.
-   - [regress/sftp-cmds.sh] Ensure files used for test are readable.
-   - [regress/stderr-after-eof.sh] Search for a usable checksum program.
-   - [regress/sftp-badcmds.sh regress/sftp-cmds.sh regress/sftp.sh
-     regress/ssh-com-client.sh regress/ssh-com-sftp.sh regress/stderr-data.sh
-     regress/transfer.sh] Use ${EXEEXT} where appropriate.
-   - [regress/sftp.sh regress/ssh-com-sftp.sh] Remove dependency on /dev/stdin.
-   - [regress/agent-ptrace.sh regress/agent-timeout.sh]
-     "grep -q" -> "grep >/dev/null"
-   - [regress/agent.sh regress/proto-version.sh regress/ssh-com.sh
-     regress/test-exec.sh] Handle different ways of echoing without newlines.
-   - [regress/dynamic-forward.sh] Some "which" programs output on stderr.
-   - [regress/sftp-cmds.sh] Use portable "test" option.
-   - [regress/test-exec.sh] Use sudo, search for "whoami" equivalent, always
-     use Strictmodes no, wait longer for sshd startup.
-   - [regress/Makefile] Remove BSDisms.
-   - [regress/README.regress] Add a basic readme.
-   - [Makefile.in regress/agent-getpeereid.sh] config.h is now in $BUILDDIR
-     not $OBJ.
-   - [Makefile.in regress/agent-ptrace] Fix minor regress issues on Cygwin.
-20030903
- - (djm) OpenBSD CVS Sync
-   - markus@cvs.openbsd.org 2003/08/26 09:58:43
-     [auth-passwd.c auth.c auth.h auth1.c auth2-none.c auth2-passwd.c]
-     [auth2.c monitor.c]
-     fix passwd auth for 'username leaks via timing'; with djm@, original 
-     patches from solar
-   - markus@cvs.openbsd.org 2003/08/28 12:54:34
-     [auth.h]
-     remove kerberos support from ssh1, since it has been replaced with GSSAPI;
-     but keep kerberos passwd auth for ssh1 and 2; ok djm, hin, henning, ...
-   - markus@cvs.openbsd.org 2003/09/02 16:40:29
-     [version.h]
-     enter 3.7
-   - jmc@cvs.openbsd.org 2003/09/02 18:50:06
-     [sftp.1 ssh_config.5]
-     escape punctuation;
-     ok deraadt@
-20030902
- - (djm) OpenBSD CVS Sync
-   - deraadt@cvs.openbsd.org 2003/08/24 17:36:51
-     [auth2-gss.c]
-     64 bit cleanups; markus ok
-   - markus@cvs.openbsd.org 2003/08/28 12:54:34
-     [auth-krb5.c auth.h auth1.c monitor.c monitor.h monitor_wrap.c]
-     [monitor_wrap.h readconf.c servconf.c session.c ssh_config.5]
-     [sshconnect1.c sshd.c sshd_config sshd_config.5]
-     remove kerberos support from ssh1, since it has been replaced with GSSAPI;
-     but keep kerberos passwd auth for ssh1 and 2; ok djm, hin, henning, ...
-   - markus@cvs.openbsd.org 2003/08/29 10:03:15
-     [compat.c compat.h]
-     SSH_BUG_K5USER is unused; ok henning@
-   - markus@cvs.openbsd.org 2003/08/29 10:04:36
-     [channels.c nchan.c]
-     be less chatty; debug -> debug2, cleanup; ok henning@
-   - markus@cvs.openbsd.org 2003/08/31 10:26:04
-     [progressmeter.c]
-     pass file_size + 1 to snprintf: fixes printing of truncated
-     file names; fix based on patch/report from sturm@;
-   - markus@cvs.openbsd.org 2003/08/31 12:14:22
-     [progressmeter.c]
-     do write to buf[-1]
-   - markus@cvs.openbsd.org 2003/08/31 13:29:05
-     [session.c]
-     call ssh_gssapi_storecreds conditionally from do_exec(); 
-     with sxw@inf.ed.ac.uk
-   - markus@cvs.openbsd.org 2003/08/31 13:30:18
-     [gss-serv.c]
-     correct string termination in parse_ename(); sxw@inf.ed.ac.uk
-   - markus@cvs.openbsd.org 2003/08/31 13:31:57
-     [gss-serv.c]
-     whitspace KNF
-   - markus@cvs.openbsd.org 2003/09/01 09:50:04
-     [sshd_config.5]
-     gss kex is not supported; sxw@inf.ed.ac.uk
-   - markus@cvs.openbsd.org 2003/09/01 12:50:46
-     [readconf.c]
-     rm gssapidelegatecreds alias; never supported before
-   - markus@cvs.openbsd.org 2003/09/01 13:52:18
-     [ssh.h]
-     rm whitespace
-   - markus@cvs.openbsd.org 2003/09/01 18:15:50
-     [readconf.c readconf.h servconf.c servconf.h ssh.c]
-     remove unused kerberos code; ok henning@
-   - markus@cvs.openbsd.org 2003/09/01 20:44:54
-     [auth2-gss.c]
-     fix leak
- - (djm) Don't initialise pam_conv structures inline. Avoids HP/UX compiler
-   error. Part of Bug #423, patch from  michael_steffens AT hp.com
- - (djm) Bug #423: reorder setting of PAM_TTY and calling of PAM session 
-   management (now done in do_setusercontext). Largely from 
-   michael_steffens AT hp.com
- - (djm) Fix openbsd-compat/ again - remove references to strl(cpy|cat).h 
- 
-20030829
- - (bal) openbsd-compat/ clean up.  Considate headers, add in Id on our
-   files, and added missing license to header.
-20030826
- - (djm) Bug #629: Mark ssh_config option "pamauthenticationviakbdint"
-   as deprecated. Remove mention from README.privsep. Patch from 
-   aet AT cc.hut.fi
- - (dtucker) OpenBSD CVS Sync
-   - markus@cvs.openbsd.org 2003/08/22 10:56:09
-     [auth2.c auth2-gss.c auth.h compat.c compat.h gss-genr.c gss-serv-krb5.c
-     gss-serv.c monitor.c monitor.h monitor_wrap.c monitor_wrap.h readconf.c
-     readconf.h servconf.c servconf.h session.c session.h ssh-gss.h
-     ssh_config.5 sshconnect2.c sshd_config sshd_config.5]
-     support GSS API user authentication; patches from Simon Wilkinson,
-     stripped down and tested by Jakob and myself.
-   - markus@cvs.openbsd.org 2003/08/22 13:20:03
-     [sshconnect2.c]
-     remove support for "kerberos-2@ssh.com"
-   - markus@cvs.openbsd.org 2003/08/22 13:22:27
-     [auth2.c] (auth2-krb5.c removed)
-     nuke "kerberos-2@ssh.com"
-   - markus@cvs.openbsd.org 2003/08/22 20:55:06
-     [LICENCE]
-     add Simon Wilkinson
-   - deraadt@cvs.openbsd.org 2003/08/24 17:36:52
-     [monitor.c monitor_wrap.c sshconnect2.c]
-     64 bit cleanups; markus ok
-   - fgsch@cvs.openbsd.org 2003/08/25 08:13:09
-     [sftp-int.c]
-     fix div by zero when listing for filename lengths longer than width.
-     markus@ ok.
-   - djm@cvs.openbsd.org 2003/08/25 10:33:33
-     [sshconnect2.c]
-     fprintf->logit to silence login banner with "ssh -q"; ok markus@
- - (dtucker) [Makefile.in acconfig.h auth-krb5.c auth-pam.c auth-pam.h
-   configure.ac defines.h gss-serv-krb5.c session.c ssh-gss.h sshconnect1.c
-   sshconnect2.c] Add Portable GSSAPI support, patch by Simon Wilkinson.
- - (dtucker) [Makefile.in] Remove auth2-krb5.
- - (dtucker) [contrib/aix/inventory.sh] Add public domain notice.  ok mouring@
-   (the original author)
- - (dtucker) [auth.c] Do not check for locked accounts when PAM is enabled.
-20030825
- - (djm) Bug #621: Select OpenSC keys by usage attributes. Patch from 
-   larsch@trustcenter.de
- - (bal) openbsd-compat/ OpenBSD updates.  Mostly licensing, ansifications
-   and minor fixes. OK djm@
- - (bal) redo how we handle 'mysignal()'.  Move it to 
-   openbsd-compat/bsd-misc.c, s/mysignal/signal/ and #define signal to
-   be our 'mysignal' by default.  OK djm@
- - (dtucker) [acconfig.h auth.c configure.ac sshd.8] Bug #422 again: deny
-   any access to locked accounts.  ok djm@
- - (djm) Bug #564: Perform PAM account checks for all authentications when
-   UsePAM=yes; ok dtucker
- - (dtucker) [configure.ac] Bug #533, #551: define BROKEN_GETADDRINFO on
-   Tru64, solves getnameinfo and "bad addr or host" errors.  ok djm@
- - (dtucker) [README buildbff.sh inventory.sh] (all in contrib/aix)
-   Update package builder: correctly handle config variables, use lsuser
-   rather than /etc/passwd, fix typos, add Id's.
-20030822
- - (djm) s/get_progname/ssh_get_progname/g to avoid conflict with Heimdal 
-   -lbroken; ok dtucker 
- - (dtucker) [contrib/cygwin/ssh-user-config] Put keys in authorized_keys
-   rather that authorized_keys2.  Patch from vinschen@redhat.com.
-20030821
- - (dtucker) OpenBSD CVS Sync
-   - markus@cvs.openbsd.org 2003/08/14 16:08:58
-     [ssh-keygen.c]
-     exit after primetest, ok djm@
- - (dtucker) [defines.h] Put CMSG_DATA, CMSG_FIRSTHDR with other CMSG* macros,
-   change CMSG_DATA to use __CMSG_ALIGN (and thus work properly), reformat for
-   consistency.
- - (dtucker) [configure.ac] Move openpty/ctty test outside of case statement
-   and after normal openpty test.
-20030813
- - (dtucker) [session.c] Remove #ifdef TIOCSBRK kludge.
- - (dtucker) OpenBSD CVS Sync
-   - markus@cvs.openbsd.org 2003/08/13 08:33:02
-     [session.c]
-     use more portable tcsendbreak(3) and ignore break_length;
-     ok deraadt, millert
-   - markus@cvs.openbsd.org 2003/08/13 08:46:31
-     [auth1.c readconf.c readconf.h servconf.c servconf.h ssh.c ssh_config
-     ssh_config.5 sshconnect1.c sshd.8 sshd.c sshd_config sshd_config.5]
-     remove RhostsAuthentication; suggested by djm@ before; ok djm@, deraadt@,
-     fgsch@, miod@, henning@, jakob@ and others
-   - markus@cvs.openbsd.org 2003/08/13 09:07:10
-     [readconf.c ssh.c]
-     socks4->socks, since with support both 4 and 5; dtucker@zip.com.au
- - (dtucker) [configure.ac openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h]
-   Add a tcsendbreak function for platforms that don't have one, based on the
-   one from OpenBSD.
-20030811
- - (dtucker) OpenBSD CVS Sync
-   (thanks to Simon Wilkinson for help with this -dt)
-   - markus@cvs.openbsd.org 2003/07/16 15:02:06
-     [auth-krb5.c]
-     mcc -> fcc; from Love H�rnquist �strand <lha@it.su.se>
-     otherwise the kerberos credentinal is stored in a memory cache
-     in the privileged sshd. ok jabob@, hin@ (some time ago)
- - (dtucker) [openbsd-compat/xcrypt.c] Remove Cygwin #ifdef block (duplicate
-   in bsd-cygwin_util.h).
-20030808
- - (dtucker) [openbsd-compat/fake-rfc2553.h] Older Linuxes have AI_PASSIVE and
-   AI_CANONNAME in netdb.h but not AI_NUMERICHOST, so check each definition
-   separately before defining them.
- - (dtucker) [auth-pam.c] Don't set PAM_TTY if tty is null.  ok djm@
-20030807
- - (dtucker) [session.c] Have session_break_req not attempt to send a break
-   if TIOCSBRK and TIOCCBRK are not defined (eg Cygwin).
- - (dtucker) [canohost.c] Bug #336: Only check ip options if IP_OPTIONS is
-   defined (fixes compile error on really old Linuxes).
- - (dtucker) [defines.h] Bug #336: Add CMSG_DATA and CMSG_FIRSTHDR macros if
-   not already defined (eg Linux with some versions of libc5), based on those
-   from OpenBSD.
- - (dtucker) [openbsd-compat/bsd-cygwin_util.c openbsd-compat/bsd-cygwin_util.h]
-   Remove incorrect filenames from comments (file names are in Id tags).
- - (dtucker) [session.c openbsd-compat/bsd-cygwin_util.h] Move Cygwin
-   specific defines and includes to bsd-cygwin_util.h.  Fixes build error too.
-20030802
- - (dtucker) [monitor.h monitor_wrap.h] Remove excess ident tags.
- - (dtucker) OpenBSD CVS Sync
-   - markus@cvs.openbsd.org 2003/07/22 13:35:22
-     [auth1.c auth.h auth-passwd.c monitor.c monitor.h monitor_wrap.c
-     monitor_wrap.h readconf.c readconf.h servconf.c servconf.h session.c ssh.1
-     ssh.c ssh_config.5 sshconnect1.c sshd.c sshd_config.5 ssh.h]
-     remove (already disabled) KRB4/AFS support, re-enable -k in ssh(1);
-     test+ok henning@
- - (dtucker) [Makefile.in acconfig.h configure.ac] Remove KRB4/AFS support.
- - (dtucker) [auth-krb4.c radix.c radix.h] Remove KRB4/AFS specific files.
- - (dtucker) OpenBSD CVS Sync
-   - markus@cvs.openbsd.org 2003/07/23 07:42:43
-     [sshd_config]
-     remove AFS; itojun@
-   - djm@cvs.openbsd.org 2003/07/28 09:49:56
-     [ssh-keygen.1 ssh-keygen.c]
-     Support for generating Diffie-Hellman groups (/etc/moduli) from ssh-keygen.
-     Based on code from Phil Karn, William Allen Simpson and Niels Provos.
-     ok markus@, thanks jmc@
-   - markus@cvs.openbsd.org 2003/07/29 18:24:00
-     [LICENCE progressmeter.c]
-     replace 4 clause BSD licensed progressmeter code with a replacement
-     from Nils Nordman and myself; ok deraadt@
-     (copied from OpenBSD an re-applied portable changes)
-   - markus@cvs.openbsd.org 2003/07/29 18:26:46
-     [progressmeter.c]
-     fix length for "- stalled -" (included with previous import)
-   - markus@cvs.openbsd.org 2003/07/30 07:44:14
-     [progressmeter.c]
-     use only 4 digits in format_size (included with previous import)
-   - markus@cvs.openbsd.org 2003/07/30 07:53:27
-     [progressmeter.c]
-     whitespace (included with previous import)
-   - markus@cvs.openbsd.org 2003/07/31 09:21:02
-     [auth2-none.c]
-     check whether passwd auth is allowd, similar to proto 1; rob@pitman.co.za
-     ok henning
-   - avsm@cvs.openbsd.org 2003/07/31 15:50:16
-     [atomicio.c]
-     correct comment: atomicio takes vwrite, not write; deraadt@ ok
-   - markus@cvs.openbsd.org 2003/07/31 22:34:03
-     [progressmeter.c]
-     print rate similar old version; round instead truncate;
-     (included in previous progressmeter.c commit)
- - (dtucker) [openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h]
-   Add a tcgetpgrp function.
- - (dtucker) [Makefile.in moduli.c moduli.h] Add new files and to Makefile.
- - (dtucker) [openbsd-compat/bsd-misc.c] Fix cut-and-paste bug in tcgetpgrp.
-20030730
- - (djm) [auth-pam.c] Don't use crappy APIs like sprintf. Thanks bal
-20030726
- - (dtucker) [openbsd-compat/xcrypt.c] Fix typo: DISABLED_SHADOW ->
-   DISABLE_SHADOW.  Fixes HP-UX compile error.
-20030724
- - (bal) [auth-passwd.c openbsd-compat/Makefile.in openbsd-compat/xcrypt.c 
-    openbsd-compat/xcrypt.h] Split off encryption into xcrypt() interface,
-    and isolate shadow password functions.  Tested in Solaris, but should
-    not break other platforms too badly (except maybe HP =).  Also brings
-    auth-passwd.c into full sync with OpenBSD tree.
-20030723
- - (dtucker) [configure.ac] Back out change for bug #620.
-20030719
- - (dtucker) [configure.ac] Bug #620: Define BROKEN_GETADDRINFO for
-   Solaris/x86.  Patch from jrhett at isite.net.
- - (dtucker) OpenBSD CVS Sync
-   - markus@cvs.openbsd.org 2003/07/14 12:36:37
-     [sshd.c]
-     remove undocumented -V option. would be only useful if openssh is used
-     as ssh v1 server for ssh.com's ssh v2.
-   - markus@cvs.openbsd.org 2003/07/16 10:34:53
-     [ssh.c sshd.c]
-     don't exit on multiple -v or -d; ok deraadt@
-   - markus@cvs.openbsd.org 2003/07/16 10:36:28
-     [sshtty.c]
-     clear IUCLC in enter_raw_mode; from rob@pitman.co.za; ok deraadt@, fgs@
-   - deraadt@cvs.openbsd.org 2003/07/18 01:54:25
-     [scp.c]
-     userid is unsigned, but well, force it anyways; andrushock@korovino.net
-   - djm@cvs.openbsd.org 2003/07/19 00:45:53
-     [sftp-int.c]
-     fix sftp filename parsing for arguments with escaped quotes. bz #517;
-     ok markus
-   - djm@cvs.openbsd.org 2003/07/19 00:46:31
-     [regress/sftp-cmds.sh]
-     regress test for sftp arguments with escaped quotes; ok markus
-20030714
- - (dtucker) [acconfig.h configure.ac port-aix.c] Older AIXes don't declare
-   loginfailed at all, so assume 3-arg loginfailed if not declared.
- - (dtucker) [port-aix.h] Work around name collision on AIX for r_type by
-   undef'ing it.
- - (dtucker) Bug #543: [configure.ac port-aix.c port-aix.h]
-   Call setauthdb() before loginfailed(), which may load password registry-
-   specific functions.  Based on patch by cawlfiel at us.ibm.com.
- - (dtucker) [port-aix.h] Fix prototypes.
- - (dtucker) OpenBSD CVS Sync
-   - avsm@cvs.openbsd.org 2003/07/09 13:58:19
-     [key.c]
-     minor tweak: when generating the hex fingerprint, give strlcat the full
-     bound to the buffer, and add a comment below explaining why the
-     zero-termination is one less than the bound.  markus@ ok
-   - markus@cvs.openbsd.org 2003/07/10 14:42:28
-     [packet.c]
-     the 2^(blocksize*2) rekeying limit is too expensive for 3DES,
-     blowfish, etc, so enforce a 1GB limit for small blocksizes.
-   - markus@cvs.openbsd.org 2003/07/10 20:05:55
-     [sftp.c]
-     sync usage with manpage, add missing -R
-20030708
- - (dtucker) [acconfig.h auth-passwd.c configure.ac session.c port-aix.[ch]]
-   Include AIX headers for authentication functions and make calls match
-   prototypes.  Test for and handle 3-arg and 4-arg variants of loginfailed.
- - (dtucker) [session.c] Check return value of setpcred().
- - (dtucker) [auth-passwd.c auth.c session.c sshd.c port-aix.c port-aix.h]
-   Convert aixloginmsg into platform-independant Buffer loginmsg.
-20030707
- - (dtucker) [configure.ac] Bug #600: Check that getrusage is declared before
-   searching libraries for it.  Fixes build errors on NCR MP-RAS.
-20030706
- - (dtucker) [ssh-rand-helper.c loginrec.c]
-   Apply atomicio typing change to these too.
-20030703
- - (dtucker) OpenBSD CVS Sync
-   - djm@cvs.openbsd.org 2003/06/28 07:48:10
-     [sshd.c]
-     report pidfile creation errors, based on patch from Roumen Petrov;
-     ok markus@
-   - deraadt@cvs.openbsd.org 2003/06/28 16:23:06
-     [atomicio.c atomicio.h authfd.c clientloop.c monitor_wrap.c msg.c
-     progressmeter.c scp.c sftp-client.c ssh-keyscan.c ssh.h sshconnect.c
-     sshd.c]
-     deal with typing of write vs read in atomicio
-   - markus@cvs.openbsd.org 2003/06/29 12:44:38
-     [sshconnect.c]
-     memset 0, not \0; andrushock@korovino.net
-   - markus@cvs.openbsd.org 2003/07/02 12:56:34
-     [channels.c]
-     deny dynamic forwarding with -R for v1, too; ok djm@
-   - markus@cvs.openbsd.org 2003/07/02 14:51:16
-     [channels.c ssh.1 ssh_config.5]
-     (re)add socks5 suppport to -D; ok djm@
-     now ssh(1) can act both as a socks 4 and socks 5 server and
-     dynamically forward ports.
-   - markus@cvs.openbsd.org 2003/07/02 20:37:48
-     [ssh.c]
-     convert hostkeyalias to lowercase, otherwise uppercase aliases will
-     not match at all; ok henning@
-   - markus@cvs.openbsd.org 2003/07/03 08:21:46
-     [regress/dynamic-forward.sh]
-     add socks5; speedup; reformat; based on patch from dtucker@zip.com.au
-   - markus@cvs.openbsd.org 2003/07/03 08:24:13
-     [regress/Makefile]
-     enable tests for dynamic fwd via socks (-D), uses nc(1)
-   - djm@cvs.openbsd.org 2003/07/03 08:09:06
-     [readconf.c readconf.h ssh-keysign.c ssh.c]
-     fix AddressFamily option in config file, from brent@graveland.net;
-     ok markus@
-20030630
- - (djm) Search for support functions necessary to build our 
-   getrrsetbyname() replacement. Patch from Roumen Petrov 
-20030629
- - (dtucker) [includes.h] Bug #602: move #include of netdb.h to after in.h
-   (fixes compiler warnings on Solaris 2.5.1).
- - (dtucker) [configure.ac] Add sanity test after system-dependant compiler
-   flag modifications.
-   
-20030628
- - (djm) Bug #591: use PKCS#15 private key label as a comment in case 
-   of OpenSC. Report and patch from larsch@trustcenter.de
- - (djm) Bug #593: Sanity check OpenSC card reader number; patch from 
-   aj@dungeon.inka.de
- - (dtucker) OpenBSD CVS Sync
-   - markus@cvs.openbsd.org 2003/06/23 09:02:44
-     [ssh_config.5]
-     document EnableSSHKeysign; bugzilla #599; ok deraadt@, jmc@
-   - markus@cvs.openbsd.org 2003/06/24 08:23:46
-     [auth2-hostbased.c auth2-pubkey.c auth2.c channels.c key.c key.h
-      monitor.c packet.c packet.h serverloop.c sshconnect2.c sshd.c]
-     int -> u_int; ok djm@, deraadt@, mouring@
-   - miod@cvs.openbsd.org 2003/06/25 22:39:36
-     [sftp-server.c]
-     Typo police: attribute is better written with an 'r'.
-   - markus@cvs.openbsd.org 2003/06/26 20:08:33
-     [readconf.c]
-     do not dump core for 'ssh -o proxycommand host'; ok deraadt@
- - (dtucker) [regress/dynamic-forward.sh] Import new regression test.
- - (dtucker) [configure.ac] Bug #570: Have ./configure --enable-FEATURE 
-   actually enable the feature, for those normally disabled.  Patch by
-   openssh (at) roumenpetrov.info.
-20030624
- - (dtucker) Have configure refer the user to config.log and
-   contrib/findssl.sh for OpenSSL header/library mismatches.
-20030622
- - (dtucker) OpenBSD CVS Sync
-   - markus@cvs.openbsd.org 2003/06/21 09:14:05
-     [regress/reconfigure.sh]
-     missing $SUDO; from dtucker@zip.com.au
-   - markus@cvs.openbsd.org 2003/06/18 11:28:11
-     [ssh-rsa.c]
-     backout last change, since it violates pkcs#1
-     switch to share/misc/license.template
-   - djm@cvs.openbsd.org 2003/06/20 05:47:58
-     [sshd_config.5]
-     sync description of protocol 2 cipher proposal; ok markus
-   - djm@cvs.openbsd.org 2003/06/20 05:48:21
-     [sshd_config]
-     sync some implemented options; ok markus@
- - (dtucker) [regress/authorized_keys_root] Remove temp data file from CVS.
- - (dtucker) [openbsd-compat/setproctitle.c] Ensure SPT_TYPE is defined before
-   testing its value.
-20030618
- - (djm) OpenBSD CVS Sync
-   - markus@cvs.openbsd.org 2003/06/12 07:57:38
-     [monitor.c sshlogin.c sshpty.c]
-     typos; dtucker at zip.com.au
-   - djm@cvs.openbsd.org 2003/06/12 12:22:47
-     [LICENCE]
-     mention more copyright holders; ok markus@
-   - nino@cvs.openbsd.org 2003/06/12 15:34:09
-     [scp.c]
-     Typo. Ok markus@.
-   - markus@cvs.openbsd.org 2003/06/12 19:12:03
-     [scard.c scard.h ssh-agent.c ssh.c]
-     add sc_get_key_label; larsch at trustcenter.de; bugzilla#591
-   - markus@cvs.openbsd.org 2003/06/16 08:22:35
-     [ssh-rsa.c]
-     make sure the signature has at least the expected length (don't
-     insist on len == hlen + oidlen, since this breaks some smartcards)
-     bugzilla #592; ok djm@
-   - markus@cvs.openbsd.org 2003/06/16 10:22:45
-     [ssh-add.c]
-     print out key comment on each prompt; make ssh-askpass more useable; ok djm@
-   - markus@cvs.openbsd.org 2003/06/17 18:14:23
-     [cipher-ctr.c]
-     use license from /usr/share/misc/license.template for new code
- - (dtucker) [reconfigure.sh rekey.sh sftp-badcmds.sh]
-   Import new regression tests from OpenBSD
- - (dtucker) [regress/copy.1 regress/copy.2] Remove temp data files from CVS.
- - (dtucker) OpenBSD CVS Sync (regress/)
-   - markus@cvs.openbsd.org 2003/04/02 12:21:13
-     [Makefile]
-     enable rekey test
-   - djm@cvs.openbsd.org 2003/04/04 09:34:22
-     [Makefile sftp-cmds.sh]
-     More regression tests, including recent directory rename bug; ok markus@
-   - markus@cvs.openbsd.org 2003/05/14 22:08:27
-     [ssh-com-client.sh ssh-com-keygen.sh ssh-com-sftp.sh ssh-com.sh]
-     test against some new commerical versions
-   - mouring@cvs.openbsd.org 2003/05/15 04:07:12
-     [sftp-cmds.sh]
-     Advanced put/get testing for sftp.  OK @djm
-   - markus@cvs.openbsd.org 2003/06/12 15:40:01
-     [try-ciphers.sh]
-     add ctr
-   - markus@cvs.openbsd.org 2003/06/12 15:43:32
-     [Makefile]
-     test -HUP; dtucker at zip.com.au
-20030614
- - (djm) Update license on fake-rfc2553.[ch]; ok itojun@
-20030611
- - (djm) Mention portable copyright holders in LICENSE
- - (djm) Put licenses on substantial header files
- - (djm) Sync LICENSE against OpenBSD
- - (djm) OpenBSD CVS Sync
-   - jmc@cvs.openbsd.org 2003/06/10 09:12:11
-     [scp.1 sftp-server.8 ssh.1 ssh-add.1 ssh-agent.1 ssh_config.5]
-     [sshd.8 sshd_config.5 ssh-keygen.1 ssh-keyscan.1 ssh-keysign.8]
-     - section reorder
-     - COMPATIBILITY merge
-     - macro cleanup
-     - kill whitespace at EOL
-     - new sentence, new line
-     ssh pages ok markus@
-   - deraadt@cvs.openbsd.org 2003/06/10 22:20:52
-     [packet.c progressmeter.c]
-     mostly ansi cleanup; pval ok
-   - jakob@cvs.openbsd.org 2003/06/11 10:16:16
-     [sshconnect.c]
-     clean up check_host_key() and improve SSHFP feedback. ok markus@
-   - jakob@cvs.openbsd.org 2003/06/11 10:18:47
-     [dns.c]
-     sync with check_host_key() change
-   - djm@cvs.openbsd.org 2003/06/11 11:18:38
-     [authfd.c authfd.h ssh-add.c ssh-agent.c]
-     make agent constraints (lifetime, confirm) work with smartcard keys; 
-     ok markus@
-20030609
- - (djm) Sync README.smartcard with OpenBSD -current
- - (djm) Re-merge OpenSC info into README.smartcard
-20030606
- - (dtucker) [uidswap.c] Fix setreuid and add missing args to fatal(). ok djm@
-20030605
- - (djm) Support AI_NUMERICHOST in fake-getaddrinfo.c. Needed for recent
-   canohost.c changes.
- - (djm) Implement paranoid priv dropping checks, based on:
-   "SetUID demystified" - Hao Chen, David Wagner and Drew Dean
-   Proceedings of USENIX Security Symposium 2002
- - (djm) Don't use xmalloc() or pull in toplevel headers in fake-* code
- - (djm) Merge all the openbsd/fake-* into fake-rfc2553.[ch]
- - (djm) Bug #588 - Add scard-opensc.o back to Makefile.in
-   Patch from larsch@trustcenter.de
- - (djm) Bug #589 - scard-opensc: load only keys with a private keys
-   Patch from larsch@trustcenter.de
- - (dtucker) Add includes.h to fake-rfc2553.c so it will build.
- - (dtucker) Define EAI_NONAME in fake-rfc2553.h (used by fake-rfc2553.c).
-20030604
- - (djm) Bug #573 - Remove unneeded Krb headers and compat goop. Patch from
-   simon@sxw.org.uk (Also matches a change in OpenBSD a while ago)
- - (djm) Bug #577 - wrong flag in scard-opensc.c sc_private_decrypt. 
-   Patch from larsch@trustcenter.de; ok markus@
- - (djm) Bug #584: scard-opensc.c doesn't work without PIN. Patch from 
-   larsch@trustcenter.de; ok markus@
- - (djm) OpenBSD CVS Sync
-   - djm@cvs.openbsd.org 2003/06/04 08:25:18
-     [sshconnect.c]
-     disable challenge/response and keyboard-interactive auth methods 
-     upon hostkey mismatch. based on patch from fcusack AT fcusack.com. 
-     bz #580; ok markus@
-   - djm@cvs.openbsd.org 2003/06/04 10:23:48
-     [sshd.c]
-     remove duplicated group-dropping code; ok markus@
-   - djm@cvs.openbsd.org 2003/06/04 12:03:59
-     [serverloop.c]
-     remove bitrotten commet; ok markus@
-   - djm@cvs.openbsd.org 2003/06/04 12:18:49
-     [scp.c]
-     ansify; ok markus@
-   - djm@cvs.openbsd.org 2003/06/04 12:40:39
-     [scp.c]
-     kill ssh process upon receipt of signal, bz #241.
-     based on patch from esb AT hawaii.edu; ok markus@
-   - djm@cvs.openbsd.org 2003/06/04 12:41:22
-     [sftp.c]
-     kill ssh process on receipt of signal; ok markus@
- - (djm) Update to fix of bug #584: lock card before return. 
-   From larsch@trustcenter.de
- - (djm) Always use mysignal() for SIGALRM
-20030603
- - (djm) Replace setproctitle replacement with code derived from 
-   UCB sendmail
- - (djm) OpenBSD CVS Sync
-   - markus@cvs.openbsd.org 2003/06/02 09:17:34
-     [auth2-hostbased.c auth.c auth-options.c auth-rhosts.c auth-rh-rsa.c]
-     [canohost.c monitor.c servconf.c servconf.h session.c sshd_config]
-     [sshd_config.5]
-     deprecate VerifyReverseMapping since it's dangerous if combined
-     with IP based access control as noted by Mike Harding; replace with
-     a UseDNS option, UseDNS is on by default and includes the
-     VerifyReverseMapping check; with itojun@, provos@, jakob@ and deraadt@
-     ok deraadt@, djm@
-   - millert@cvs.openbsd.org 2003/06/03 02:56:16
-     [scp.c]
-     Remove the advertising clause in the UCB license which Berkeley
-     rescinded 22 July 1999.  Proofed by myself and Theo.
- - (djm) Fix portable-specific uses of verify_reverse_mapping too
- - (djm) Sync openbsd-compat with OpenBSD CVS. 
-    - No more 4-term BSD licenses in linked code
- - (dtucker) [port-aix.c bsd-cray.c] Fix uses of verify_reverse_mapping.
-20030602
- - (djm) Fix segv from bad reordering in auth-pam.c
- - (djm) Always use saved_argv in sshd.c as compat_init_setproctitle may 
-   clobber
- - (tim) openbsd-compat/xmmap.[ch] License clarifications. Add missing
-   CVS ID.
- - (djm) Remove "noip6" option from RedHat spec file. This may now be 
-   set at runtime using AddressFamily option.
- - (djm) Fix use of macro before #define in cipher-aes.c
- - (djm) Sync license on openbsd-compat/bindresvport.c with OpenBSD CVS
- - (djm) OpenBSD CVS Sync
-   - djm@cvs.openbsd.org 2003/05/26 12:54:40
-     [sshconnect.c]
-     fix format strings; ok markus@
-   - deraadt@cvs.openbsd.org 2003/05/29 16:58:45
-     [sshd.c uidswap.c]
-     seteuid and setegid; markus ok
-   - jakob@cvs.openbsd.org 2003/06/02 08:31:10
-     [ssh_config.5]
-     VerifyHostKeyDNS is v2 only. ok markus@
-20030530
- - (dtucker) Add missing semicolon in md5crypt.c, patch from openssh at
-   roumenpetrov.info
- - (dtucker) Define SSHD_ACQUIRES_CTTY for NCR MP-RAS and Reliant Unix.
-20030526
- - (djm) Avoid auth2-chall.c warning when compiling without 
-   PAM, BSD_AUTH and SKEY
-20030525
- (djm) OpenBSD CVS Sync
-   - djm@cvs.openbsd.org 2003/05/24 09:02:22
-     [log.c]
-     pass logged data through strnvis; ok markus
-   - djm@cvs.openbsd.org 2003/05/24 09:30:40
-     [authfile.c monitor.c sftp-common.c sshpty.c]
-     cast some types for printing; ok markus@
-20030524
- - (dtucker) Correct --osfsia in INSTALL.  Patch by skeleten at shillest.net
-20030523
- - (djm) Use VIS_SAFE on logged strings rather than default strnvis 
-   encoding (which encodes many more characters)
- - OpenBSD CVS Sync
-   - jmc@cvs.openbsd.org 2003/05/20 12:03:35
-     [sftp.1]
-     - new sentence, new line
-     - added .Xr's
-     - typos
-     ok djm@
-   - jmc@cvs.openbsd.org 2003/05/20 12:09:31
-     [ssh.1 ssh_config.5 sshd.8 sshd_config.5 ssh-keygen.1]
-     new sentence, new line
-   - djm@cvs.openbsd.org 2003/05/23 08:29:30
-     [sshconnect.c]
-     fix leak; ok markus@
-20030520
- - (djm) OpenBSD CVS Sync
-   - deraadt@cvs.openbsd.org 2003/05/18 23:22:01
-     [log.c]
-     use syslog_r() in a signal handler called place; markus ok
- - (djm) Configure logic to detect syslog_r and friends
-20030519
- - (djm) Sync auth-pam.h with what we actually implement
-20030518
- - (djm) Return of the dreaded PAM_TTY_KLUDGE, which went missing in 
-   recent merge
- - (djm) OpenBSD CVS Sync
-   - djm@cvs.openbsd.org 2003/05/16 03:27:12
-     [readconf.c ssh_config ssh_config.5 ssh-keysign.c]
-     add AddressFamily option to ssh_config (like -4, -6 on commandline).
-     Portable bug #534; ok markus@
-   - itojun@cvs.openbsd.org 2003/05/17 03:25:58
-     [auth-rhosts.c]
-     just in case, put numbers to sscanf %s arg.
-   - markus@cvs.openbsd.org 2003/05/17 04:27:52
-     [cipher.c cipher-ctr.c myproposal.h]
-     experimental support for aes-ctr modes from
-     http://www.ietf.org/internet-drafts/draft-ietf-secsh-newmodes-00.txt
-     ok djm@
- - (djm) Remove IPv4 by default hack now that we can specify AF in config
- - (djm) Tidy and trim TODO
- - (djm) Sync openbsd-compat/ with OpenBSD CVS head
- - (djm) Big KNF on openbsd-compat/
- - (djm) KNF on md5crypt.[ch]
- - (djm) KNF on auth-sia.[ch]
-20030517
- - (bal) strcat -> strlcat on openbsd-compat/realpath.c (rev 1.8 OpenBSD)
-20030516
- - (djm) OpenBSD CVS Sync
-   - djm@cvs.openbsd.org 2003/05/15 13:52:10
-     [ssh.c]
-     Make "ssh -V" print the OpenSSL version in a human readable form. Patch
-     from Craig Leres (mindrot at ee.lbl.gov); ok markus@
-   - jakob@cvs.openbsd.org 2003/05/15 14:02:47
-     [readconf.c servconf.c]
-     warn for unsupported config option. ok markus@
-   - markus@cvs.openbsd.org 2003/05/15 14:09:21
-     [auth2-krb5.c]
-     fix 64bit issue; report itojun@
-   - djm@cvs.openbsd.org 2003/05/15 14:55:25
-     [readconf.c readconf.h ssh_config ssh_config.5 sshconnect.c]
-     add a ConnectTimeout option to ssh, based on patch from
-     Jean-Charles Longuet (jclonguet at free.fr); portable #207 ok markus@
- - (djm) Add warning for UsePAM when built without PAM support
- - (djm) A few type mismatch fixes from Bug #565
- - (djm) Guard free_pam_environment against NULL argument. Works around
-   HP/UX PAM problems debugged by dtucker
-20030515
- - (djm) OpenBSD CVS Sync
-   - jmc@cvs.openbsd.org 2003/05/14 13:11:56
-     [ssh-agent.1]
-     setup -> set up;
-     from wiz@netbsd
-   - jakob@cvs.openbsd.org 2003/05/14 18:16:20
-     [key.c key.h readconf.c readconf.h ssh_config.5 sshconnect.c]
-     [dns.c dns.h README.dns ssh-keygen.1 ssh-keygen.c]
-     add experimental support for verifying hos keys using DNS as described
-     in draft-ietf-secsh-dns-xx.txt. more information in README.dns.
-     ok markus@ and henning@
-   - markus@cvs.openbsd.org 2003/05/14 22:24:42
-     [clientloop.c session.c ssh.1]
-     allow to send a BREAK to the remote system; ok various
-   - markus@cvs.openbsd.org 2003/05/15 00:28:28
-     [sshconnect2.c]
-     cleanup unregister of per-method packet handlers; ok djm@
-   - jakob@cvs.openbsd.org 2003/05/15 01:48:10
-     [readconf.c readconf.h servconf.c servconf.h]
-     always parse kerberos options. ok djm@ markus@
-   - jakob@cvs.openbsd.org 2003/05/15 02:27:15
-     [dns.c]
-     add missing freerrset
-   - markus@cvs.openbsd.org 2003/05/15 03:08:29
-     [cipher.c cipher-bf1.c cipher-aes.c cipher-3des1.c]
-     split out custom EVP ciphers
-   - djm@cvs.openbsd.org 2003/05/15 03:10:52
-     [ssh-keygen.c]
-     avoid warning; ok jakob@
-   - mouring@cvs.openbsd.org 2003/05/15 03:39:07
-     [sftp-int.c]
-     Make put/get (globed and nonglobed) code more consistant. OK djm@
-   - mouring@cvs.openbsd.org 2003/05/15 03:43:59
-     [sftp-int.c sftp.c]
-     Teach ls how to display multiple column display and allow users 
-     to return to single column format via 'ls -1'.  OK @djm
-   - jakob@cvs.openbsd.org 2003/05/15 04:08:44
-     [readconf.c servconf.c]
-     disable kerberos when not supported. ok markus@
-   - markus@cvs.openbsd.org 2003/05/15 04:08:41
-     [ssh.1]
-     ~B is ssh2 only
- - (djm) Always parse UsePAM
- - (djm) Configure glue for DNS support (code doesn't work in portable yet)
- - (djm) Import getrrsetbyname() function from OpenBSD libc (for DNS support)
- - (djm) Tidy Makefile clean targets
- - (djm) Adapt README.dns for portable
- - (djm) Avoid uuencode.c warnings
- - (djm) Enable UsePAM when built --with-pam
- - (djm) Only build getrrsetbyname replacement when using --with-dns
- - (djm) Bug #529: sshd doesn't work correctly after SIGHUP (copy argv 
-         correctly)
- - (djm) Bug #444: Wrong paths after reconfigure
- - (dtucker) HP-UX needs to include <sys/strtio.h> for TIOCSBRK
-20030514
- - (djm) Bug #117: Don't lie to PAM about username
- - (djm) RCSID sync w/ OpenBSD
- - (djm) OpenBSD CVS Sync
-   - djm@cvs.openbsd.org 2003/04/09 12:00:37
-     [readconf.c]
-     strip trailing whitespace from config lines before parsing. 
-     Fixes bz 528; ok markus@
-   - markus@cvs.openbsd.org 2003/04/12 10:13:57
-     [cipher.c]
-     hide cipher details; ok djm@
-   - markus@cvs.openbsd.org 2003/04/12 10:15:36
-     [misc.c]
-     debug->debug2
-   - naddy@cvs.openbsd.org 2003/04/12 11:40:15
-     [ssh.1]
-     document -V switch, fix wording; ok markus@
-   - markus@cvs.openbsd.org 2003/04/14 14:17:50
-     [channels.c sshconnect.c sshd.c ssh-keyscan.c]
-     avoid hardcoded SOCK_xx; with itojun@; should allow ssh over SCTP
-   - mouring@cvs.openbsd.org 2003/04/14 21:31:27
-     [sftp-int.c]
-     Missing globfree(&g) in process_put() spotted by Vince Brimhall
-     <VBrimhall@novell.com>.  ok@ Theo
-   - markus@cvs.openbsd.org 2003/04/16 14:35:27
-     [auth.h]
-     document struct Authctxt; with solar
-   - deraadt@cvs.openbsd.org 2003/04/26 04:29:49
-     [ssh-keyscan.c]
-     -t in usage(); rogier@quaak.org
-   - mouring@cvs.openbsd.org 2003/04/30 01:16:20
-     [sshd.8 sshd_config.5]
-     Escape ?, * and ! in .Ql for nroff compatibility.  OpenSSH Portable 
-     Bug #550 and * escaping suggested by jmc@.
-   - david@cvs.openbsd.org 2003/04/30 20:41:07
-     [sshd.8]
-     fix invalid .Pf macro usage introduced in previous commit
-     ok jmc@ mouring@
-   - markus@cvs.openbsd.org 2003/05/11 16:56:48
-     [authfile.c ssh-keygen.c]
-     change key_load_public to try to read a public from:
-     rsa1 private or rsa1 public and ssh2 keys.
-     this makes ssh-keygen -e fail for ssh1 keys more gracefully
-     for example; report from itojun (netbsd pr 20550).
-   - markus@cvs.openbsd.org 2003/05/11 20:30:25
-     [channels.c clientloop.c serverloop.c session.c ssh.c]
-     make channel_new() strdup the 'remote_name' (not the caller); ok theo
-   - markus@cvs.openbsd.org 2003/05/12 16:55:37
-     [sshconnect2.c]
-     for pubkey authentication try the user keys in the following order:
-        1. agent keys that are found in the config file
-        2. other agent keys
-        3. keys that are only listed in the config file
-     this helps when an agent has many keys, where the server might
-     close the connection before the correct key is used. report & ok pb@
-   - markus@cvs.openbsd.org 2003/05/12 18:35:18
-     [ssh-keyscan.1]
-     typo: DSA keys are of type ssh-dss; Brian Poole
-   - markus@cvs.openbsd.org 2003/05/14 00:52:59
-     [ssh2.h]
-     ranges for per auth method messages
-   - djm@cvs.openbsd.org 2003/05/14 01:00:44
-     [sftp.1]
-     emphasise the batchmode functionality and make reference to pubkey auth,
-     both of which are FAQs; ok markus@
-   - markus@cvs.openbsd.org 2003/05/14 02:15:47
-     [auth2.c monitor.c sshconnect2.c auth2-krb5.c]
-     implement kerberos over ssh2 ("kerberos-2@ssh.com"); tested with jakob@
-     server interops with commercial client; ok jakob@ djm@
-   - jmc@cvs.openbsd.org 2003/05/14 08:25:39
-     [sftp.1]
-     - better formatting in SYNOPSIS
-     - whitespace at EOL
-     ok djm@
-   - markus@cvs.openbsd.org 2003/05/14 08:57:49
-     [monitor.c]
-     http://bugzilla.mindrot.org/show_bug.cgi?id=560
-     Privsep child continues to run after monitor killed.
-     Pass monitor signals through to child; Darren Tucker
- - (djm) Make portable build with MIT krb5 (some issues remain)
- - (djm) Add new UsePAM configuration directive to allow runtime control
-   over usage of PAM. This allows non-root use of sshd when built with
-   --with-pam
- - (djm) Die screaming if start_pam() is called when UsePAM=no
- - (djm) Avoid KrbV leak for MIT Kerberos
- - (dtucker) Set ai_socktype and ai_protocol in fake-getaddrinfo.c. ok djm@
- - (djm) Bug #258: sscanf("[0-9]") -> sscanf("[0123456789]") for portability
-20030512
- - (djm) Redhat spec: Don't install profile.d scripts when not 
-   building with GNOME/GTK askpass (patch from bet@rahul.net)
-20030510
- - (dtucker) Bug #318: Create ssh_prng_cmds.out during "make" rather than
-   "make install".  Patch by roth@feep.net.
- - (dtucker) Bug #536: Test for and work around openpty/controlling tty
-   problem on Linux (fixes "could not set controlling tty" errors).
- - (djm) Merge FreeBSD PAM code: replaces PAM password auth kludge with 
-   proper challenge-response module
- - (djm) 2-clause license on loginrec.c, with permission from
-   andre@ae-35.com
-20030504
- - (dtucker) Bug #497: Move #include of bsd-cygwin_util.h to openbsd-compat.h.
-   Patch from vinschen@redhat.com.
-20030503
- - (dtucker) Add missing "void" to record_failed_login in bsd-cray.c.  Noted
-   by wendyp@cray.com.
-20030502
- - (dtucker) Bug #544: ignore invalid cmsg_type on Linux 2.0 kernels,
-   privsep should now work.
- - (dtucker) Move handling of bad password authentications into a platform
-   specific record_failed_login() function (affects AIX & Unicos). ok mouring@
-20030429
- - (djm) Add back radix.o (used by AFS support), after it went missing from
-   Makefile many moons ago
- - (djm) Apply "owl-always-auth" patch from Openwall/Solar Designer
- - (djm) Fix blibpath specification for AIX/gcc
- - (djm) Some systems have basename in -lgen. Fix from ayamura@ayamura.org
-20030428
- - (bal) [defines.h progressmeter.c scp.c] Some more culling of non 64bit 
-   hacked code.
-20030427
- - (bal) Bug #541: return; was dropped by mistake.  Reported by 
-   furrier@iglou.com
- - (bal) Since we don't support platforms lacking u_int_64.  We may
-   as well clean out some of those evil #ifdefs
- - (bal) auth1.c minor resync while looking at the code.
- - (bal) auth2.c same changed as above.
-20030409
- - (djm) Bug #539: Specify creation mode with O_CREAT for lastlog. Report 
-   from matth@eecs.berkeley.edu
- - (djm) Make the spec work with Redhat 9.0 (which renames sharutils)
- - (djm) OpenBSD CVS Sync
-   - markus@cvs.openbsd.org 2003/04/02 09:48:07
-     [clientloop.c monitor.c monitor_wrap.c packet.c packet.h readconf.c]
-     [readconf.h serverloop.c sshconnect2.c]
-     reapply rekeying chage, tested by henning@, ok djm@
-   - markus@cvs.openbsd.org 2003/04/02 14:36:26
-     [ssh-keysign.c]
-     potential segfault if KEY_UNSPEC; cjwatson@debian.org; bug #526
-   - itojun@cvs.openbsd.org 2003/04/03 07:25:27
-     [progressmeter.c]
-     $OpenBSD$
-   - itojun@cvs.openbsd.org 2003/04/03 10:17:35
-     [progressmeter.c]
-     remove $OpenBSD$, as other *.c does not have it.
-   - markus@cvs.openbsd.org 2003/04/07 08:29:57
-     [monitor_wrap.c]
-     typo: get correct counters; introduced during rekeying change.
-   - millert@cvs.openbsd.org 2003/04/07 21:58:05
-     [progressmeter.c]
-     The UCB copyright here is incorrect.  This code did not originate
-     at UCB, it was written by Luke Mewburn.  Updated the copyright at
-     the author's request.  markus@ OK
-   - itojun@cvs.openbsd.org 2003/04/08 20:21:29
-     [*.c *.h]
-     rename log() into logit() to avoid name conflict.  markus ok, from
-     netbsd
-     - (djm) XXX - Performed locally using:
-       "perl -p -i -e 's/(\s|^)log\(/$1logit\(/g' *.c *.h"
-   - hin@cvs.openbsd.org 2003/04/09 08:23:52
-     [servconf.c]
-     Don't include <krb.h> when compiling with Kerberos 5 support
-   - (djm) Fix up missing include for packet.c
-   - (djm) Fix missed log => logit occurance (reference by function pointer)
-20030402
- - (bal) if IP_TOS is not found or broken don't try to compile in
-   packet_set_tos() function call.  bug #527
-20030401
- - (djm) OpenBSD CVS Sync
-   - jmc@cvs.openbsd.org 2003/03/28 10:11:43
-     [scp.1 sftp.1 ssh.1 ssh-add.1 ssh-agent.1 ssh_config.5 sshd_config.5]
-     [ssh-keygen.1 ssh-keyscan.1 ssh-keysign.8]
-     - killed whitespace
-     - new sentence new line
-     - .Bk for arguments
-     ok markus@
-   - markus@cvs.openbsd.org 2003/04/01 10:10:23
-     [clientloop.c monitor.c monitor_wrap.c packet.c packet.h readconf.c]
-     [readconf.h serverloop.c sshconnect2.c]
-     rekeying bugfixes and automatic rekeying:
-     * both client and server rekey _automatically_
-           (a) after 2^31 packets, because after 2^32 packets
-               the sequence number for packets wraps
-           (b) after 2^(blocksize_in_bits/4) blocks
-       (see: draft-ietf-secsh-newmodes-00.txt)
-       (a) and (b) are _enabled_ by default, and only disabled for known
-       openssh versions, that don't support rekeying properly.
-     * client option 'RekeyLimit'
-     * do not reply to requests during rekeying
-   - markus@cvs.openbsd.org 2003/04/01 10:22:21
-     [clientloop.c monitor.c monitor_wrap.c packet.c packet.h readconf.c]
-     [readconf.h serverloop.c sshconnect2.c]
-     backout rekeying changes (for 3.6.1)
-   - markus@cvs.openbsd.org 2003/04/01 10:31:26
-     [compat.c compat.h kex.c]
-     bugfix causes stalled connections for ssh.com < 3.0; noticed by ho@; 
-     tested by ho@ and myself
-   - markus@cvs.openbsd.org 2003/04/01 10:56:46
-     [version.h]
-     3.6.1
- - (djm) Crank spec file versions
- - (djm) Release 3.6.1p1
-20030326
- - (djm) OpenBSD CVS Sync
-   - deraadt@cvs.openbsd.org 2003/03/26 04:02:51
-     [sftp-server.c]
-     one last fix to the tree: race fix broke stuff; pr 3169; 
-     srp@srparish.net, help from djm
-20030325
- - (djm) Fix getpeerid support for 64 bit BE systems. From 
-    Arnd Bergmann <arndb@de.ibm.com>
-20030324
- - (djm) OpenBSD CVS Sync
-   - markus@cvs.openbsd.org 2003/03/23 19:02:00
-     [monitor.c]
-     unbreak rekeying for privsep; ok millert@
- - Release 3.6p1
- - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
-   Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.3257 2004/02/24 06:13:28 djm Exp $
diff --git a/README b/README
index 7e918fe08..0620d0eee 100644
--- a/README
+++ b/README
@@ -1,5 +1,4 @@
-See:
+See http://www.openssh.com/txt/release-3.8.1 for the release notes.
-http://www.openssh.com/txt/release-3.8 for the release notes.
 - A Japanese translation of this document and of the OpenSSH FAQ is
 - available at http://www.unixuser.org/~haruyama/security/openssh/index.html
@@ -66,4 +65,4 @@ References -
 [6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9
 [7] http://www.openssh.com/faq.html
-$Id: README,v 1.53 2004/02/24 05:13:24 dtucker Exp $
+$Id: README,v 1.54 2004/04/18 10:32:56 djm Exp $
diff --git a/RFC.nroff b/RFC.nroff
deleted file mode 100644
index d6baed652..000000000
--- a/RFC.nroff
+++ /dev/null
@@ -1,1780 +0,0 @@
-.\" -*- nroff -*-
-.\"
-.\" $OpenBSD: RFC.nroff,v 1.2 2000/10/16 09:38:44 djm Exp $
-.\"
-.pl 10.0i
-.po 0
-.ll 7.2i
-.lt 7.2i
-.nr LL 7.2i
-.nr LT 7.2i
-.ds LF Ylonen
-.ds RF FORMFEED[Page %]
-.ds CF
-.ds LH Internet-Draft
-.ds RH 15 November 1995
-.ds CH SSH (Secure Shell) Remote Login Protocol
-.na
-.hy 0
-.in 0
-Network Working Group                                          T. Ylonen
-Internet-Draft                         Helsinki University of Technology
-draft-ylonen-ssh-protocol-00.txt                        15 November 1995
-Expires: 15 May 1996
-.in 3
-.ce
-The SSH (Secure Shell) Remote Login Protocol
-.ti 0
-Status of This Memo
-This document is an Internet-Draft.   Internet-Drafts  are  working
-documents of the Internet Engineering Task Force (IETF), its areas,
-and its working groups.  Note that other groups may also distribute
-working documents as Internet-Drafts.
-Internet-Drafts are draft documents valid  for  a  maximum  of  six
-months  and  may  be updated, replaced, or obsoleted by other docu-
-ments at any time.  It is inappropriate to use  Internet-Drafts  as
-reference  material  or  to  cite them other than as ``work in pro-
-gress.''
-To learn the current status of any Internet-Draft, please check the
-``1id-abstracts.txt'' listing contained in the Internet- Drafts Shadow
-Directories on ftp.is.co.za (Africa), nic.nordu.net (Europe),
-munnari.oz.au (Pacific Rim), ds.internic.net (US East Coast), or
-ftp.isi.edu (US West Coast).
-The distribution of  this  memo  is  unlimited.
-.ti 0
-Introduction
-SSH (Secure Shell) is a program to log into another computer over a
-network, to execute commands in a remote machine, and to move files
-from one machine to another.  It provides strong authentication and
-secure communications over insecure networks.  Its features include
-the following:
-.IP o
-Closes several security holes (e.g., IP, routing, and DNS spoofing).
-New authentication methods: .rhosts together with RSA [RSA] based host
-authentication, and pure RSA authentication.
-.IP o
-All communications are automatically and transparently encrypted.
-Encryption is also used to protect integrity.
-.IP o
-X11 connection forwarding provides secure X11 sessions.
-.IP o
-Arbitrary TCP/IP ports can be redirected over the encrypted channel
-in both directions.
-.IP o
-Client RSA-authenticates the server machine in the beginning of every
-connection to prevent trojan horses (by routing or DNS spoofing) and
-man-in-the-middle attacks, and the server RSA-authenticates the client
-machine before accepting .rhosts or /etc/hosts.equiv authentication
-(to prevent DNS, routing, or IP spoofing).
-.IP o
-An authentication agent, running in the user's local workstation or
-laptop, can be used to hold the user's RSA authentication keys.
-.RT
-The goal has been to make the software as easy to use as possible for
-ordinary users.  The protocol has been designed to be as secure as
-possible while making it possible to create implementations that
-are easy to use and install.  The sample implementation has a number
-of convenient features that are not described in this document as they
-are not relevant for the protocol.
-.ti 0
-Overview of the Protocol
-The software consists of a server program running on a server machine,
-and a client program running on a client machine (plus a few auxiliary
-programs).  The machines are connected by an insecure IP [RFC0791]
-network (that can be monitored, tampered with, and spoofed by hostile
-parties).
-A connection is always initiated by the client side.  The server
-listens on a specific port waiting for connections.  Many clients may
-connect to the same server machine.
-The client and the server are connected via a TCP/IP [RFC0793] socket
-that is used for bidirectional communication.  Other types of
-transport can be used but are currently not defined.
-When the client connects the server, the server accepts the connection
-and responds by sending back its version identification string.  The
-client parses the server's identification, and sends its own
-identification.  The purpose of the identification strings is to
-validate that the connection was to the correct port, declare the
-protocol version number used, and to declare the software version used
-on each side (for debugging purposes).  The identification strings are
-human-readable.  If either side fails to understand or support the
-other side's version, it closes the connection.
-After the protocol identification phase, both sides switch to a packet
-based binary protocol.  The server starts by sending its host key
-(every host has an RSA key used to authenticate the host), server key
-(an RSA key regenerated every hour), and other information to the
-client.  The client then generates a 256 bit session key, encrypts it
-using both RSA keys (see below for details), and sends the encrypted
-session key and selected cipher type to the server.  Both sides then
-turn on encryption using the selected algorithm and key.  The server
-sends an encrypted confirmation message to the client.
-The client then authenticates itself using any of a number of
-authentication methods.  The currently supported authentication
-methods are .rhosts or /etc/hosts.equiv authentication (disabled by
-default), the same with RSA-based host authentication, RSA
-authentication, and password authentication.
-After successful authentication, the client makes a number of requests
-to prepare for the session.  Typical requests include allocating a
-pseudo tty, starting X11 [X11] or TCP/IP port forwarding, starting
-authentication agent forwarding, and executing the shell or a command.
-When a shell or command is executed, the connection enters interactive
-session mode.  In this mode, data is passed in both directions,
-new forwarded connections may be opened, etc.  The interactive session
-normally terminates when the server sends the exit status of the
-program to the client.
-The protocol makes several reservations for future extensibility.
-First of all, the initial protocol identification messages include the
-protocol version number.  Second, the first packet by both sides
-includes a protocol flags field, which can be used to agree on
-extensions in a compatible manner.  Third, the authentication and
-session preparation phases work so that the client sends requests to
-the server, and the server responds with success or failure.  If the
-client sends a request that the server does not support, the server
-simply returns failure for it.  This permits compatible addition of
-new authentication methods and preparation operations.  The
-interactive session phase, on the other hand, works asynchronously and
-does not permit the use of any extensions (because there is no easy
-and reliable way to signal rejection to the other side and problems
-would be hard to debug).  Any compatible extensions to this phase must
-be agreed upon during any of the earlier phases.
-.ti 0
-The Binary Packet Protocol
-After the protocol identification strings, both sides only send
-specially formatted packets.  The packet layout is as follows:
-.IP o
-Packet length: 32 bit unsigned integer, coded as four 8-bit bytes, msb
-first.  Gives the length of the packet, not including the length field
-and padding.  The maximum length of a packet (not including the length
-field and padding) is 262144 bytes.
-.IP o
-Padding: 1-8 bytes of random data (or zeroes if not encrypting).  The
-amount of padding is (8 - (length % 8)) bytes (where % stands for the
-modulo operator).  The rationale for always having some random padding
-at the beginning of each packet is to make known plaintext attacks
-more difficult.
-.IP o
-Packet type: 8-bit unsigned byte.  The value 255 is reserved for
-future extension.
-.IP o
-Data: binary data bytes, depending on the packet type.  The number of
-data bytes is the "length" field minus 5.
-.IP o
-Check bytes: 32-bit crc, four 8-bit bytes, msb first.  The crc is the
-Cyclic Redundancy Check, with the polynomial 0xedb88320, of the
-Padding, Packet type, and Data fields.  The crc is computed before
-any encryption.
-.RT
-The packet, except for the length field, may be encrypted using any of
-a number of algorithms.  The length of the encrypted part (Padding +
-Type + Data + Check) is always a multiple of 8 bytes.  Typically the
-cipher is used in a chained mode, with all packets chained together as
-if it was a single data stream (the length field is never included in
-the encryption process).  Details of encryption are described below.
-When the session starts, encryption is turned off.  Encryption is
-enabled after the client has sent the session key.  The encryption
-algorithm to use is selected by the client.
-.ti 0
-Packet Compression
-If compression is supported (it is an optional feature, see
-SSH_CMSG_REQUEST_COMPRESSION below), the packet type and data fields
-of the packet are compressed using the gzip deflate algorithm [GZIP].
-If compression is in effect, the packet length field indicates the
-length of the compressed data, plus 4 for the crc.  The amount of
-padding is computed from the compressed data, so that the amount of
-data to be encrypted becomes a multiple of 8 bytes.
-When compressing, the packets (type + data portions) in each direction
-are compressed as if they formed a continuous data stream, with only the
-current compression block flushed between packets.  This corresponds
-to the GNU ZLIB library Z_PARTIAL_FLUSH option.  The compression
-dictionary is not flushed between packets.  The two directions are
-compressed independently of each other.
-.ti 0
-Packet Encryption
-The protocol supports several encryption methods.  During session
-initialization, the server sends a bitmask of all encryption methods
-that it supports, and the client selects one of these methods.  The
-client also generates a 256-bit random session key (32 8-bit bytes) and
-sends it to the server.
-The encryption methods supported by the current implementation, and
-their codes are:
-.TS
-center;
-l r l.
-SSH_CIPHER_NONE 0          No encryption
-SSH_CIPHER_IDEA 1          IDEA in CFB mode
-SSH_CIPHER_DES  2          DES in CBC mode
-SSH_CIPHER_3DES 3          Triple-DES in CBC mode
-SSH_CIPHER_TSS  4          An experimental stream cipher
-SSH_CIPHER_RC4  5          RC4
-.TE
-All implementations are required to support SSH_CIPHER_DES and
-SSH_CIPHER_3DES.  Supporting SSH_CIPHER_IDEA, SSH_CIPHER_RC4, and
-SSH_CIPHER_NONE is recommended.  Support for SSH_CIPHER_TSS is
-optional (and it is not described in this document).  Other ciphers
-may be added at a later time; support for them is optional.
-For encryption, the encrypted portion of the packet is considered a
-linear byte stream.  The length of the stream is always a multiple of
-8.  The encrypted portions of consecutive packets (in the same
-direction) are encrypted as if they were a continuous buffer (that is,
-any initialization vectors are passed from the previous packet to the
-next packet).  Data in each direction is encrypted independently.
-.IP SSH_CIPHER_DES
-The key is taken from the first 8 bytes of the session key.  The least
-significant bit of each byte is ignored.  This results in 56 bits of
-key data.  DES [DES] is used in CBC mode.  The iv (initialization vector) is
-initialized to all zeroes.
-.IP SSH_CIPHER_3DES
-The variant of triple-DES used here works as follows: there are three
-independent DES-CBC ciphers, with independent initialization vectors.
-The data (the whole encrypted data stream) is first encrypted with the
-first cipher, then decrypted with the second cipher, and finally
-encrypted with the third cipher.  All these operations are performed
-in CBC mode.
-The key for the first cipher is taken from the first 8 bytes of the
-session key; the key for the next cipher from the next 8 bytes, and
-the key for the third cipher from the following 8 bytes.  All three
-initialization vectors are initialized to zero.
-(Note: the variant of 3DES used here differs from some other
-descriptions.)
-.IP SSH_CIPHER_IDEA
-The key is taken from the first 16 bytes of the session key.  IDEA
-[IDEA] is used in CFB mode.  The initialization vector is initialized
-to all zeroes.
-.IP SSH_CIPHER_TSS
-All 32 bytes of the session key are used as the key.
-There is no reference available for the TSS algorithm; it is currently
-only documented in the sample implementation source code.  The
-security of this cipher is unknown (but it is quite fast).  The cipher
-is basically a stream cipher that uses MD5 as a random number
-generator and takes feedback from the data.
-.IP SSH_CIPHER_RC4
-The first 16 bytes of the session key are used as the key for the
-server to client direction.  The remaining 16 bytes are used as the
-key for the client to server direction.  This gives independent
-128-bit keys for each direction.
-This algorithm is the alleged RC4 cipher posted to the Usenet in 1995.
-It is widely believed to be equivalent with the original RSADSI RC4
-cipher.  This is a very fast algorithm.
-.RT
-.ti 0
-Data Type Encodings
-The Data field of each packet contains data encoded as described in
-this section.  There may be several data items; each item is coded as
-described here, and their representations are concatenated together
-(without any alignment or padding).
-Each data type is stored as follows:
-.IP "8-bit byte"
-The byte is stored directly as a single byte.
-.IP "32-bit unsigned integer"
-Stored in 4 bytes, msb first.
-.IP "Arbitrary length binary string"
-First 4 bytes are the length of the string, msb first (not including
-the length itself).  The following "length" bytes are the string
-value.  There are no terminating null characters.
-.IP "Multiple-precision integer"
-First 2 bytes are the number of bits in the integer, msb first (for
-example, the value 0x00012345 would have 17 bits).  The value zero has
-zero bits.  It is permissible that the number of bits be larger than the
-real number of bits.
-The number of bits is followed by (bits + 7) / 8 bytes of binary data,
-msb first, giving the value of the integer.
-.RT
-.ti 0
-TCP/IP Port Number and Other Options
-The server listens for connections on TCP/IP port 22.
-The client may connect the server from any port.  However, if the
-client wishes to use any form of .rhosts or /etc/hosts.equiv
-authentication, it must connect from a privileged port (less than
-1024).
-For the IP Type of Service field [RFC0791], it is recommended that
-interactive sessions (those having a user terminal or forwarding X11
-connections) use the IPTOS_LOWDELAY, and non-interactive connections
-use IPTOS_THROUGHPUT.
-It is recommended that keepalives are used, because otherwise programs
-on the server may never notice if the other end of the connection is
-rebooted.
-.ti 0
-Protocol Version Identification
-After the socket is opened, the server sends an identification string,
-which is of the form
-"SSH-<protocolmajor>.<protocolminor>-<version>\\n", where
-<protocolmajor> and <protocolminor> are integers and specify the
-protocol version number (not software distribution version).
-<version> is server side software version string (max 40 characters);
-it is not interpreted by the remote side but may be useful for
-debugging.
-The client parses the server's string, and sends a corresponding
-string with its own information in response.  If the server has lower
-version number, and the client contains special code to emulate it,
-the client responds with the lower number; otherwise it responds with
-its own number.  The server then compares the version number the
-client sent with its own, and determines whether they can work
-together.  The server either disconnects, or sends the first packet
-using the binary packet protocol and both sides start working
-according to the lower of the protocol versions.
-By convention, changes which keep the protocol compatible with
-previous versions keep the same major protocol version; changes that
-are not compatible increment the major version (which will hopefully
-never happen).  The version described in this document is 1.3.
-The client will
-.ti 0
-Key Exchange and Server Host Authentication
-The first message sent by the server using the packet protocol is
-SSH_SMSG_PUBLIC_KEY.  It declares the server's host key, server public
-key, supported ciphers, supported authentication methods, and flags
-for protocol extensions.  It also contains a 64-bit random number
-(cookie) that must be returned in the client's reply (to make IP
-spoofing more difficult).  No encryption is used for this message.
-Both sides compute a session id as follows.  The modulus of the server
-key is interpreted as a byte string (without explicit length field,
-with minimum length able to hold the whole value), most significant
-byte first.  This string is concatenated with the server host key
-interpreted the same way.  Additionally, the cookie is concatenated
-with this.  Both sides compute MD5 of the resulting string.  The
-resulting 16 bytes (128 bits) are stored by both parties and are
-called the session id.
-The client responds with a SSH_CMSG_SESSION_KEY message, which
-contains the selected cipher type, a copy of the 64-bit cookie sent by
-the server, client's protocol flags, and a session key encrypted
-with both the server's host key and server key.  No encryption is used
-for this message.
-The session key is 32 8-bit bytes (a total of 256 random bits
-generated by the client).  The client first xors the 16 bytes of the
-session id with the first 16 bytes of the session key.  The resulting
-string is then encrypted using the smaller key (one with smaller
-modulus), and the result is then encrypted using the other key.  The
-number of bits in the public modulus of the two keys must differ by at
-least 128 bits.
-At each encryption step, a multiple-precision integer is constructed
-from the data to be encrypted as follows (the integer is here
-interpreted as a sequence of bytes, msb first; the number of bytes is
-the number of bytes needed to represent the modulus).
-The most significant byte (which is only partial as the value must be
-less than the public modulus, which is never a power of two) is zero.
-The next byte contains the value 2 (which stands for public-key
-encrypted data in the PKCS standard [PKCS#1]).  Then, there are
-non-zero random bytes to fill any unused space, a zero byte, and the
-data to be encrypted in the least significant bytes, the last byte of
-the data in the least significant byte.
-This algorithm is used twice.  First, it is used to encrypt the 32
-random bytes generated by the client to be used as the session key
-(xored by the session id).  This value is converted to an integer as
-described above, and encrypted with RSA using the key with the smaller
-modulus.  The resulting integer is converted to a byte stream, msb
-first.  This byte stream is padded and encrypted identically using the
-key with the larger modulus.
-After the client has sent the session key, it starts to use the
-selected algorithm and key for decrypting any received packets, and
-for encrypting any sent packets.  Separate ciphers are used for
-different directions (that is, both directions have separate
-initialization vectors or other state for the ciphers).
-When the server has received the session key message, and has turned
-on encryption, it sends a SSH_SMSG_SUCCESS message to the client.
-The recommended size of the host key is 1024 bits, and 768 bits for
-the server key.  The minimum size is 512 bits for the smaller key.
-.ti 0
-Declaring the User Name
-The client then sends a SSH_CMSG_USER message to the server.  This
-message specifies the user name to log in as.
-The server validates that such a user exists, checks whether
-authentication is needed, and responds with either SSH_SMSG_SUCCESS or
-SSH_SMSG_FAILURE.  SSH_SMSG_SUCCESS indicates that no authentication
-is needed for this user (no password), and authentication phase has
-now been completed.  SSH_SMSG_FAILURE indicates that authentication is
-needed (or the user does not exist).
-If the user does not exist, it is recommended that this returns
-failure, but the server keeps reading messages from the client, and
-responds to any messages (except SSH_MSG_DISCONNECT, SSH_MSG_IGNORE,
-and SSH_MSG_DEBUG) with SSH_SMSG_FAILURE.  This way the client cannot
-be certain whether the user exists.
-.ti 0
-Authentication Phase
-Provided the server didn't immediately accept the login, an
-authentication exchange begins.  The client sends messages to the
-server requesting different types of authentication in arbitrary order as
-many times as desired (however, the server may close the connection
-after a timeout).  The server always responds with SSH_SMSG_SUCCESS if
-it has accepted the authentication, and with SSH_SMSG_FAILURE if it has
-denied authentication with the requested method or it does not
-recognize the message.  Some authentication methods cause an exchange
-of further messages before the final result is sent.  The
-authentication phase ends when the server responds with success.
-The recommended value for the authentication timeout (timeout before
-disconnecting if no successful authentication has been made) is 5
-minutes.
-The following authentication methods are currently supported:
-.TS
-center;
-l r l.
-SSH_AUTH_RHOSTS 1       .rhosts or /etc/hosts.equiv
-SSH_AUTH_RSA    2       pure RSA authentication
-SSH_AUTH_PASSWORD       3       password authentication
-SSH_AUTH_RHOSTS_RSA     4       .rhosts with RSA host authentication
-.TE
-.IP SSH_AUTH_RHOSTS
-This is the authentication method used by rlogin and rsh [RFC1282].
-The client sends SSH_CMSG_AUTH_RHOSTS with the client-side user name
-as an argument.
-The server checks whether to permit authentication.  On UNIX systems,
-this is usually done by checking /etc/hosts.equiv, and .rhosts in the
-user's home directory.  The connection must come from a privileged
-port.
-It is recommended that the server checks that there are no IP options
-(such as source routing) specified for the socket before accepting
-this type of authentication.  The client host name should be
-reverse-mapped and then forward mapped to ensure that it has the
-proper IP-address.
-This authentication method trusts the remote host (root on the remote
-host can pretend to be any other user on that host), the name
-services, and partially the network: anyone who can see packets coming
-out from the server machine can do IP-spoofing and pretend to be any
-machine; however, the protocol prevents blind IP-spoofing (which used
-to be possible with rlogin).
-Many sites probably want to disable this authentication method because
-of the fundamental insecurity of conventional .rhosts or
-/etc/hosts.equiv authentication when faced with spoofing.  It is
-recommended that this method not be supported by the server by
-default.
-.IP SSH_AUTH_RHOSTS_RSA
-In addition to conventional .rhosts and hosts.equiv authentication,
-this method additionally requires that the client host be
-authenticated using RSA.
-The client sends SSH_CMSG_AUTH_RHOSTS_RSA specifying the client-side
-user name, and the public host key of the client host.
-The server first checks if normal .rhosts or /etc/hosts.equiv
-authentication would be accepted, and if not, responds with
-SSH_SMSG_FAILURE.  Otherwise, it checks whether it knows the host key
-for the client machine (using the same name for the host that was used
-for checking the .rhosts and /etc/hosts.equiv files).  If it does not
-know the RSA key for the client, access is denied and SSH_SMSG_FAILURE
-is sent.
-If the server knows the host key of the client machine, it verifies
-that the given host key matches that known for the client.  If not,
-access is denied and SSH_SMSG_FAILURE is sent.
-The server then sends a SSH_SMSG_AUTH_RSA_CHALLENGE message containing
-an encrypted challenge for the client.  The challenge is 32 8-bit
-random bytes (256 bits).  When encrypted, the highest (partial) byte
-is left as zero, the next byte contains the value 2, the following are
-non-zero random bytes, followed by a zero byte, and the challenge put
-in the remaining bytes.  This is then encrypted using RSA with the
-client host's public key.  (The padding and encryption algorithm is
-the same as that used for the session key.)
-The client decrypts the challenge using its private host key,
-concatenates this with the session id, and computes an MD5 checksum
-of the resulting 48 bytes.  The MD5 output is returned as 16 bytes in
-a SSH_CMSG_AUTH_RSA_RESPONSE message.  (MD5 is used to deter chosen
-plaintext attacks against RSA; the session id binds it to a specific
-session).
-The server verifies that the MD5 of the decrypted challenge returned by
-the client matches that of the original value, and sends SSH_SMSG_SUCCESS if
-so.  Otherwise it sends SSH_SMSG_FAILURE and refuses the
-authentication attempt.
-This authentication method trusts the client side machine in that root
-on that machine can pretend to be any user on that machine.
-Additionally, it trusts the client host key.  The name and/or IP
-address of the client host is only used to select the public host key.
-The same host name is used when scanning .rhosts or /etc/hosts.equiv
-and when selecting the host key.  It would in principle be possible to
-eliminate the host name entirely and substitute it directly by the
-host key.  IP and/or DNS [RFC1034] spoofing can only be used
-to pretend to be a host for which the attacker has the private host
-key.
-.IP SSH_AUTH_RSA
-The idea behind RSA authentication is that the server recognizes the
-public key offered by the client, generates a random challenge, and
-encrypts the challenge with the public key.  The client must then
-prove that it has the corresponding private key by decrypting the
-challenge.
-The client sends SSH_CMSG_AUTH_RSA with public key modulus (n) as an
-argument.
-The server may respond immediately with SSH_SMSG_FAILURE if it does
-not permit authentication with this key.  Otherwise it generates a
-challenge, encrypts it using the user's public key (stored on the
-server and identified using the modulus), and sends
-SSH_SMSG_AUTH_RSA_CHALLENGE with the challenge (mp-int) as an
-argument.
-The challenge is 32 8-bit random bytes (256 bits).  When encrypted,
-the highest (partial) byte is left as zero, the next byte contains the
-value 2, the following are non-zero random bytes, followed by a zero
-byte, and the challenge put in the remaining bytes.  This is then
-encrypted with the public key.  (The padding and encryption algorithm
-is the same as that used for the session key.)
-The client decrypts the challenge using its private key, concatenates
-it with the session id, and computes an MD5 checksum of the resulting
-48 bytes.  The MD5 output is returned as 16 bytes in a
-SSH_CMSG_AUTH_RSA_RESPONSE message.  (Note that the MD5 is necessary
-to avoid chosen plaintext attacks against RSA; the session id binds it
-to a specific session.)
-The server verifies that the MD5 of the decrypted challenge returned
-by the client matches that of the original value, and sends
-SSH_SMSG_SUCCESS if so.  Otherwise it sends SSH_SMSG_FAILURE and
-refuses the authentication attempt.
-This authentication method does not trust the remote host, the
-network, name services, or anything else.  Authentication is based
-solely on the possession of the private identification keys.  Anyone
-in possession of the private keys can log in, but nobody else.
-The server may have additional requirements for a successful
-authentiation.  For example, to limit damage due to a compromised RSA
-key, a server might restrict access to a limited set of hosts.
-.IP SSH_AUTH_PASSWORD
-The client sends a SSH_CMSG_AUTH_PASSWORD message with the plain text
-password.  (Note that even though the password is plain text inside
-the message, it is normally encrypted by the packet mechanism.)
-The server verifies the password, and sends SSH_SMSG_SUCCESS if
-authentication was accepted and SSH_SMSG_FAILURE otherwise.
-Note that the password is read from the user by the client; the user
-never interacts with a login program.
-This authentication method does not trust the remote host, the
-network, name services or anything else.  Authentication is based
-solely on the possession of the password.  Anyone in possession of the
-password can log in, but nobody else.
-.RT
-.ti 0
-Preparatory Operations
-After successful authentication, the server waits for a request from
-the client, processes the request, and responds with SSH_SMSG_SUCCESS
-whenever a request has been successfully processed.  If it receives a
-message that it does not recognize or it fails to honor a request, it
-returns SSH_SMSG_FAILURE.  It is expected that new message types might
-be added to this phase in future.
-The following messages are currently defined for this phase.
-.IP SSH_CMSG_REQUEST_COMPRESSION
-Requests that compression be enabled for this session.  A
-gzip-compatible compression level (1-9) is passed as an argument.
-.IP SSH_CMSG_REQUEST_PTY
-Requests that a pseudo terminal device be allocated for this session.
-The user terminal type and terminal modes are supplied as arguments.
-.IP SSH_CMSG_X11_REQUEST_FORWARDING
-Requests forwarding of X11 connections from the remote machine to the
-local machine over the secure channel.  Causes an internet-domain
-socket to be allocated and the DISPLAY variable to be set on the server.
-X11 authentication data is automatically passed to the server, and the
-client may implement spoofing of authentication data for added
-security.  The authentication data is passed as arguments.
-.IP SSH_CMSG_PORT_FORWARD_REQUEST
-Requests forwarding of a TCP/IP port on the server host over the
-secure channel.  What happens is that whenever a connection is made to
-the port on the server, a connection will be made from the client end
-to the specified host/port.  Any user can forward unprivileged ports;
-only the root can forward privileged ports (as determined by
-authentication done earlier).
-.IP SSH_CMSG_AGENT_REQUEST_FORWARDING
-Requests forwarding of the connection to the authentication agent.
-.IP SSH_CMSG_EXEC_SHELL
-Starts a shell (command interpreter) for the user, and moves into
-interactive session mode.
-.IP SSH_CMSG_EXEC_CMD
-Executes the given command (actually "<shell> -c <command>" or
-equivalent) for the user, and moves into interactive session mode.
-.RT
-.ti 0
-Interactive Session and Exchange of Data
-During the interactive session, any data written by the shell or
-command running on the server machine is forwarded to stdin or
-stderr on the client machine, and any input available from stdin on
-the client machine is forwarded to the program on the server machine.
-All exchange is asynchronous; either side can send at any time, and
-there are no acknowledgements (TCP/IP already provides reliable
-transport, and the packet protocol protects against tampering or IP
-spoofing).
-When the client receives EOF from its standard input, it will send
-SSH_CMSG_EOF; however, this in no way terminates the exchange.  The
-exchange terminates and interactive mode is left when the server sends
-SSH_SMSG_EXITSTATUS to indicate that the client program has
-terminated.  Alternatively, either side may disconnect at any time by
-sending SSH_MSG_DISCONNECT or closing the connection.
-The server may send any of the following messages:
-.IP SSH_SMSG_STDOUT_DATA
-Data written to stdout by the program running on the server.  The data
-is passed as a string argument.  The client writes this data to
-stdout.
-.IP SSH_SMSG_STDERR_DATA
-Data written to stderr by the program running on the server.  The data
-is passed as a string argument.  The client writes this data to
-stderr.  (Note that if the program is running on a tty, it is not
-possible to separate stdout and stderr data, and all data will be sent
-as stdout data.)
-.IP SSH_SMSG_EXITSTATUS
-Indicates that the shell or command has exited.  Exit status is passed
-as an integer argument.  This message causes termination of the
-interactive session.
-.IP SSH_SMSG_AGENT_OPEN
-Indicates that someone on the server side is requesting a connection
-to the authentication agent.  The server-side channel number is passed
-as an argument.  The client must respond with either
-SSH_CHANNEL_OPEN_CONFIRMATION or SSH_CHANNEL_OPEN_FAILURE.
-.IP SSH_SMSG_X11_OPEN
-Indicates that a connection has been made to the X11 socket on the
-server side and should be forwarded to the real X server.  An integer
-argument indicates the channel number allocated for this connection on
-the server side.  The client should send back either
-SSH_MSG_CHANNEL_OPEN_CONFIRMATION or SSH_MSG_CHANNEL_OPEN_FAILURE with
-the same server side channel number.
-.IP SSH_MSG_PORT_OPEN
-Indicates that a connection has been made to a port on the server side
-for which forwarding has been requested.  Arguments are server side
-channel number, host name to connect to, and port to connect to.  The
-client should send back either
-SSH_MSG_CHANNEL_OPEN_CONFIRMATION or SSH_MSG_CHANNEL_OPEN_FAILURE with
-the same server side channel number.
-.IP SSH_MSG_CHANNEL_OPEN_CONFIRMATION
-This is sent by the server to indicate that it has opened a connection
-as requested in a previous message.  The first argument indicates the
-client side channel number, and the second argument is the channel number
-that the server has allocated for this connection.
-.IP SSH_MSG_CHANNEL_OPEN_FAILURE
-This is sent by the server to indicate that it failed to open a
-connection as requested in a previous message.  The client-side
-channel number is passed as an argument.  The client will close the
-descriptor associated with the channel and free the channel.
-.IP SSH_MSG_CHANNEL_DATA
-This packet contains data for a channel from the server.  The first
-argument is the client-side channel number, and the second argument (a
-string) is the data.
-.IP SSH_MSG_CHANNEL_CLOSE
-This is sent by the server to indicate that whoever was in the other
-end of the channel has closed it.  The argument is the client side channel
-number.  The client will let all buffered data in the channel to
-drain, and when ready, will close the socket, free the channel, and
-send the server a SSH_MSG_CHANNEL_CLOSE_CONFIRMATION message for the
-channel.
-.IP SSH_MSG_CHANNEL_CLOSE_CONFIRMATION
-This is send by the server to indicate that a channel previously
-closed by the client has now been closed on the server side as well.
-The argument indicates the client channel number.  The client frees
-the channel.
-.RT
-The client may send any of the following messages:
-.IP SSH_CMSG_STDIN_DATA
-This is data to be sent as input to the program running on the server.
-The data is passed as a string.
-.IP SSH_CMSG_EOF
-Indicates that the client has encountered EOF while reading standard
-input.  The server will allow any buffered input data to drain, and
-will then close the input to the program.
-.IP SSH_CMSG_WINDOW_SIZE
-Indicates that window size on the client has been changed.  The server
-updates the window size of the tty and causes SIGWINCH to be sent to
-the program.  The new window size is passed as four integer arguments:
-row, col, xpixel, ypixel.
-.IP SSH_MSG_PORT_OPEN
-Indicates that a connection has been made to a port on the client side
-for which forwarding has been requested.  Arguments are client side
-channel number, host name to connect to, and port to connect to.  The
-server should send back either SSH_MSG_CHANNEL_OPEN_CONFIRMATION or
-SSH_MSG_CHANNEL_OPEN_FAILURE with the same client side channel number.
-.IP SSH_MSG_CHANNEL_OPEN_CONFIRMATION
-This is sent by the client to indicate that it has opened a connection
-as requested in a previous message.  The first argument indicates the
-server side channel number, and the second argument is the channel
-number that the client has allocated for this connection.
-.IP SSH_MSG_CHANNEL_OPEN_FAILURE
-This is sent by the client to indicate that it failed to open a
-connection as requested in a previous message.  The server side
-channel number is passed as an argument.  The server will close the
-descriptor associated with the channel and free the channel.
-.IP SSH_MSG_CHANNEL_DATA
-This packet contains data for a channel from the client.  The first
-argument is the server side channel number, and the second argument (a
-string) is the data.
-.IP SSH_MSG_CHANNEL_CLOSE
-This is sent by the client to indicate that whoever was in the other
-end of the channel has closed it.  The argument is the server channel
-number.  The server will allow buffered data to drain, and when ready,
-will close the socket, free the channel, and send the client a
-SSH_MSG_CHANNEL_CLOSE_CONFIRMATION message for the channel.
-.IP SSH_MSG_CHANNEL_CLOSE_CONFIRMATION
-This is send by the client to indicate that a channel previously
-closed by the server has now been closed on the client side as well.
-The argument indicates the server channel number.  The server frees
-the channel.
-.RT
-Any unsupported messages during interactive mode cause the connection
-to be terminated with SSH_MSG_DISCONNECT and an error message.
-Compatible protocol upgrades should agree about any extensions during
-the preparation phase or earlier.
-.ti 0
-Termination of the Connection
-Normal termination of the connection is always initiated by the server
-by sending SSH_SMSG_EXITSTATUS after the program has exited.  The
-client responds to this message by sending SSH_CMSG_EXIT_CONFIRMATION
-and closes the socket; the server then closes the socket.  There are
-two purposes for the confirmation: some systems may lose previously
-sent data when the socket is closed, and closing the client side first
-causes any TCP/IP TIME_WAIT [RFC0793] waits to occur on the client side, not
-consuming server resources.
-If the program terminates due to a signal, the server will send
-SSH_MSG_DISCONNECT with an appropriate message.  If the connection is
-closed, all file descriptors to the program will be closed and the
-server will exit.  If the program runs on a tty, the kernel sends it
-the SIGHUP signal when the pty master side is closed.
-.ti 0
-Protocol Flags
-Both the server and the client pass 32 bits of protocol flags to the
-other side.  The flags are intended for compatible protocol extension;
-the server first announces which added capabilities it supports, and
-the client then sends the capabilities that it supports.
-The following flags are currently defined (the values are bit masks):
-.IP "1 SSH_PROTOFLAG_SCREEN_NUMBER"
-This flag can only be sent by the client.  It indicates that the X11
-forwarding requests it sends will include the screen number.
-.IP "2 SSH_PROTOFLAG_HOST_IN_FWD_OPEN"
-If both sides specify this flag, SSH_SMSG_X11_OPEN and
-SSH_MSG_PORT_OPEN messages will contain an additional field containing
-a description of the host at the other end of the connection.
-.RT
-.ti 0
-Detailed Description of Packet Types and Formats
-The supported packet types and the corresponding message numbers are
-given in the following table.  Messages with _MSG_ in their name may
-be sent by either side.  Messages with _CMSG_ are only sent by the
-client, and messages with _SMSG_ only by the server.
-A packet may contain additional data after the arguments specified
-below.  Any such data should be ignored by the receiver.  However, it
-is recommended that no such data be stored without good reason.  (This
-helps build compatible extensions.)
-.IP "0 SSH_MSG_NONE"
-This code is reserved.  This message type is never sent.
-.IP "1 SSH_MSG_DISCONNECT"
-.TS
-;
-l l.
-string  Cause of disconnection
-.TE
-This message may be sent by either party at any time.  It causes the
-immediate disconnection of the connection.  The message is intended to
-be displayed to a human, and describes the reason for disconnection.
-.IP "2 SSH_SMSG_PUBLIC_KEY"
-.TS
-;
-l l.
-8 bytes anti_spoofing_cookie
-32-bit int      server_key_bits
-mp-int  server_key_public_exponent
-mp-int  server_key_public_modulus
-32-bit int      host_key_bits
-mp-int  host_key_public_exponent
-mp-int  host_key_public_modulus
-32-bit int      protocol_flags
-32-bit int      supported_ciphers_mask
-32-bit int      supported_authentications_mask
-.TE
-Sent as the first message by the server.  This message gives the
-server's host key, server key, protocol flags (intended for compatible
-protocol extension), supported_ciphers_mask (which is the
-bitwise or of (1 << cipher_number), where << is the left shift
-operator, for all supported ciphers), and
-supported_authentications_mask (which is the bitwise or of (1 <<
-authentication_type) for all supported authentication types).  The
-anti_spoofing_cookie is 64 random bytes, and must be sent back
-verbatim by the client in its reply.  It is used to make IP-spoofing
-more difficult (encryption and host keys are the real defense against
-spoofing).
-.IP "3 SSH_CMSG_SESSION_KEY"
-.TS
-;
-l l.
-1 byte  cipher_type (must be one of the supported values)
-8 bytes anti_spoofing_cookie (must match data sent by the server)
-mp-int  double-encrypted session key
-32-bit int      protocol_flags
-.TE
-Sent by the client as the first message in the session.  Selects the
-cipher to use, and sends the encrypted session key to the server.  The
-anti_spoofing_cookie must be the same bytes that were sent by the
-server.  Protocol_flags is intended for negotiating compatible
-protocol extensions.
-.IP "4 SSH_CMSG_USER"
-.TS
-;
-l l.
-string  user login name on server
-.TE
-Sent by the client to begin authentication.  Specifies the user name
-on the server to log in as.  The server responds with SSH_SMSG_SUCCESS
-if no authentication is needed for this user, or SSH_SMSG_FAILURE if
-authentication is needed (or the user does not exist).  [Note to the
-implementator: the user name is of arbitrary size.  The implementation
-must be careful not to overflow internal buffers.]
-.IP "5 SSH_CMSG_AUTH_RHOSTS"
-.TS
-;
-l l.
-string  client-side user name
-.TE
-Requests authentication using /etc/hosts.equiv and .rhosts (or
-equivalent mechanisms).  This authentication method is normally
-disabled in the server because it is not secure (but this is the
-method used by rsh and rlogin).  The server responds with
-SSH_SMSG_SUCCESS if authentication was successful, and
-SSH_SMSG_FAILURE if access was not granted.  The server should check
-that the client side port number is less than 1024 (a privileged
-port), and immediately reject authentication if it is not.  Supporting
-this authentication method is optional.  This method should normally
-not be enabled in the server because it is not safe.  (However, not
-enabling this only helps if rlogind and rshd are disabled.)
-.IP "6 SSH_CMSG_AUTH_RSA"
-.TS
-;
-l l.
-mp-int  identity_public_modulus
-.TE
-Requests authentication using pure RSA authentication.  The server
-checks if the given key is permitted to log in, and if so, responds
-with SSH_SMSG_AUTH_RSA_CHALLENGE.  Otherwise, it responds with
-SSH_SMSG_FAILURE.  The client often tries several different keys in
-sequence until one supported by the server is found.  Authentication
-is accepted if the client gives the correct response to the challenge.
-The server is free to add other criteria for authentication, such as a
-requirement that the connection must come from a certain host.  Such
-additions are not visible at the protocol level.  Supporting this
-authentication method is optional but recommended.
-.IP "7 SSH_SMSG_AUTH_RSA_CHALLENGE"
-.TS
-;
-l l.
-mp-int  encrypted challenge
-.TE
-Presents an RSA authentication challenge to the client.  The challenge
-is a 256-bit random value encrypted as described elsewhere in this
-document.  The client must decrypt the challenge using the RSA private
-key, compute MD5 of the challenge plus session id, and send back the
-resulting 16 bytes using SSH_CMSG_AUTH_RSA_RESPONSE.
-.IP "8 SSH_CMSG_AUTH_RSA_RESPONSE"
-.TS
-;
-l l.
-16 bytes        MD5 of decrypted challenge
-.TE
-This message is sent by the client in response to an RSA challenge.
-The MD5 checksum is returned instead of the decrypted challenge to
-deter known-plaintext attacks against the RSA key.  The server
-responds to this message with either SSH_SMSG_SUCCESS or
-SSH_SMSG_FAILURE.
-.IP "9 SSH_CMSG_AUTH_PASSWORD"
-.TS
-;
-l l.
-string  plain text password
-.TE
-Requests password authentication using the given password.  Note that
-even though the password is plain text inside the packet, the whole
-packet is normally encrypted by the packet layer.  It would not be
-possible for the client to perform password encryption/hashing,
-because it cannot know which kind of encryption/hashing, if any, the
-server uses.  The server responds to this message with
-SSH_SMSG_SUCCESS or SSH_SMSG_FAILURE.
-.IP "10 SSH_CMSG_REQUEST_PTY"
-.TS
-;
-l l.
-string  TERM environment variable value (e.g. vt100)
-32-bit int      terminal height, rows (e.g., 24)
-32-bit int      terminal width, columns (e.g., 80)
-32-bit int      terminal width, pixels (0 if no graphics) (e.g., 480)
-32-bit int      terminal height, pixels (0 if no graphics) (e.g., 640)
-n bytes tty modes encoded in binary
-.TE
-Requests a pseudo-terminal to be allocated for this command.  This
-message can be used regardless of whether the session will later
-execute the shell or a command.  If a pty has been requested with this
-message, the shell or command will run on a pty.  Otherwise it will
-communicate with the server using pipes, sockets or some other similar
-mechanism.
-The terminal type gives the type of the user's terminal.  In the UNIX
-environment it is passed to the shell or command in the TERM
-environment variable.
-The width and height values give the initial size of the user's
-terminal or window.  All values can be zero if not supported by the
-operating system.  The server will pass these values to the kernel if
-supported.
-Terminal modes are encoded into a byte stream in a portable format.
-The exact format is described later in this document.
-The server responds to the request with either SSH_SMSG_SUCCESS or
-SSH_SMSG_FAILURE.  If the server does not have the concept of pseudo
-terminals, it should return success if it is possible to execute a
-shell or a command so that it looks to the client as if it was running
-on a pseudo terminal.
-.IP "11 SSH_CMSG_WINDOW_SIZE"
-.TS
-;
-l l.
-32-bit int      terminal height, rows
-32-bit int      terminal width, columns
-32-bit int      terminal width, pixels
-32-bit int      terminal height, pixels
-.TE
-This message can only be sent by the client during the interactive
-session.  This indicates that the size of the user's window has
-changed, and provides the new size.  The server will update the
-kernel's notion of the window size, and a SIGWINCH signal or
-equivalent will be sent to the shell or command (if supported by the
-operating system).
-.IP "12 SSH_CMSG_EXEC_SHELL"
-(no arguments)
-Starts a shell (command interpreter), and enters interactive session
-mode.
-.IP "13 SSH_CMSG_EXEC_CMD"
-.TS
-;
-l l.
-string  command to execute
-.TE
-Starts executing the given command, and enters interactive session
-mode.  On UNIX, the command is run as "<shell> -c <command>", where
-<shell> is the user's login shell.
-.IP "14 SSH_SMSG_SUCCESS"
-(no arguments)
-This message is sent by the server in response to the session key, a
-successful authentication request, and a successfully completed
-preparatory operation.
-.IP "15 SSH_SMSG_FAILURE"
-(no arguments)
-This message is sent by the server in response to a failed
-authentication operation to indicate that the user has not yet been
-successfully authenticated, and in response to a failed preparatory
-operation.  This is also sent in response to an authentication or
-preparatory operation request that is not recognized or supported.
-.IP "16 SSH_CMSG_STDIN_DATA"
-.TS
-;
-l l.
-string  data
-.TE
-Delivers data from the client to be supplied as input to the shell or
-program running on the server side.  This message can only be used in
-the interactive session mode.  No acknowledgement is sent for this
-message.
-.IP "17 SSH_SMSG_STDOUT_DATA"
-.TS
-;
-l l.
-string  data
-.TE
-Delivers data from the server that was read from the standard output of
-the shell or program running on the server side.  This message can
-only be used in the interactive session mode.  No acknowledgement is
-sent for this message.
-.IP "18 SSH_SMSG_STDERR_DATA"
-.TS
-;
-l l.
-string  data
-.TE
-Delivers data from the server that was read from the standard error of
-the shell or program running on the server side.  This message can
-only be used in the interactive session mode.  No acknowledgement is
-sent for this message.
-.IP "19 SSH_CMSG_EOF"
-(no arguments)
-This message is sent by the client to indicate that EOF has been
-reached on the input.  Upon receiving this message, and after all
-buffered input data has been sent to the shell or program, the server
-will close the input file descriptor to the program.  This message can
-only be used in the interactive session mode.  No acknowledgement is
-sent for this message.
-.IP "20 SSH_SMSG_EXITSTATUS"
-.TS
-;
-l l.
-32-bit int      exit status of the command
-.TE
-Returns the exit status of the shell or program after it has exited.
-The client should respond with SSH_CMSG_EXIT_CONFIRMATION when it has
-received this message.  This will be the last message sent by the
-server.  If the program being executed dies with a signal instead of
-exiting normally, the server should terminate the session with
-SSH_MSG_DISCONNECT (which can be used to pass a human-readable string
-indicating that the program died due to a signal) instead of using
-this message.
-.IP "21 SSH_MSG_CHANNEL_OPEN_CONFIRMATION"
-.TS
-;
-l l.
-32-bit int      remote_channel
-32-bit int      local_channel
-.TE
-This is sent in response to any channel open request if the channel
-has been successfully opened.  Remote_channel is the channel number
-received in the initial open request; local_channel is the channel
-number the side sending this message has allocated for the channel.
-Data can be transmitted on the channel after this message.
-.IP "22 SSH_MSG_CHANNEL_OPEN_FAILURE"
-.TS
-;
-l l.
-32-bit int      remote_channel
-.TE
-This message indicates that an earlier channel open request by the
-other side has failed or has been denied.  Remote_channel is the
-channel number given in the original request.
-.IP "23 SSH_MSG_CHANNEL_DATA"
-.TS
-;
-l l.
-32-bit int      remote_channel
-string  data
-.TE
-Data is transmitted in a channel in these messages.  A channel is
-bidirectional, and both sides can send these messages.  There is no
-acknowledgement for these messages.  It is possible that either side
-receives these messages after it has sent SSH_MSG_CHANNEL_CLOSE for
-the channel.  These messages cannot be received after the party has
-sent or received SSH_MSG_CHANNEL_CLOSE_CONFIRMATION.
-.IP "24 SSH_MSG_CHANNEL_CLOSE"
-.TS
-;
-l l.
-32-bit int      remote_channel
-.TE
-When a channel is closed at one end of the connection, that side sends
-this message.  Upon receiving this message, the channel should be
-closed.  When this message is received, if the channel is already
-closed (the receiving side has sent this message for the same channel
-earlier), the channel is freed and no further action is taken;
-otherwise the channel is freed and SSH_MSG_CHANNEL_CLOSE_CONFIRMATION
-is sent in response.  (It is possible that the channel is closed
-simultaneously at both ends.)
-.IP "25 SSH_MSG_CHANNEL_CLOSE_CONFIRMATION"
-.TS
-;
-l l.
-32-bit int      remote_channel
-.TE
-This message is sent in response to SSH_MSG_CHANNEL_CLOSE unless the
-channel was already closed.  When this message is sent or received,
-the channel is freed.
-.IP "26 (OBSOLETED; was unix-domain X11 forwarding)
-.IP "27 SSH_SMSG_X11_OPEN"
-.TS
-;
-l l.
-32-bit int      local_channel
-string  originator_string (see below)
-.TE
-This message can be sent by the server during the interactive session
-mode to indicate that a client has connected the fake X server.
-Local_channel is the channel number that the server has allocated for
-the connection.  The client should try to open a connection to the
-real X server, and respond with SSH_MSG_CHANNEL_OPEN_CONFIRMATION or
-SSH_MSG_CHANNEL_OPEN_FAILURE.
-The field originator_string is present if both sides
-specified SSH_PROTOFLAG_HOST_IN_FWD_OPEN in the protocol flags.  It
-contains a description of the host originating the connection.
-.IP "28 SSH_CMSG_PORT_FORWARD_REQUEST"
-.TS
-;
-l l.
-32-bit int      server_port
-string  host_to_connect
-32-bit int      port_to_connect
-.TE
-Sent by the client in the preparatory phase, this message requests
-that server_port on the server machine be forwarded over the secure
-channel to the client machine, and from there to the specified host
-and port.  The server should start listening on the port, and send
-SSH_MSG_PORT_OPEN whenever a connection is made to it.  Supporting
-this message is optional, and the server is free to reject any forward
-request.  For example, it is highly recommended that unless the user
-has been authenticated as root, forwarding any privileged port numbers
-(below 1024) is denied.
-.IP "29 SSH_MSG_PORT_OPEN"
-.TS
-;
-l l.
-32-bit int      local_channel
-string  host_name
-32-bit int      port
-string  originator_string (see below)
-.TE
-Sent by either party in interactive session mode, this message
-indicates that a connection has been opened to a forwarded TCP/IP
-port.  Local_channel is the channel number that the sending party has
-allocated for the connection.  Host_name is the host the connection
-should be be forwarded to, and the port is the port on that host to
-connect.  The receiving party should open the connection, and respond
-with SSH_MSG_CHANNEL_OPEN_CONFIRMATION or
-SSH_MSG_CHANNEL_OPEN_FAILURE.  It is recommended that the receiving
-side check the host_name and port for validity to avoid compromising
-local security by compromised remote side software.  Particularly, it
-is recommended that the client permit connections only to those ports
-for which it has requested forwarding with SSH_CMSG_PORT_FORWARD_REQUEST.
-The field originator_string is present if both sides
-specified SSH_PROTOFLAG_HOST_IN_FWD_OPEN in the protocol flags.  It
-contains a description of the host originating the connection.
-.IP "30 SSH_CMSG_AGENT_REQUEST_FORWARDING"
-(no arguments)
-Requests that the connection to the authentication agent be forwarded
-over the secure channel.  The method used by clients to contact the
-authentication agent within each machine is implementation and machine
-dependent.  If the server accepts this request, it should arrange that
-any clients run from this session will actually contact the server
-program when they try to contact the authentication agent.  The server
-should then send a SSH_SMSG_AGENT_OPEN to open a channel to the agent,
-and the client should forward the connection to the real
-authentication agent.  Supporting this message is optional.
-.IP "31 SSH_SMSG_AGENT_OPEN"
-.TS
-;
-l l.
-32-bit int      local_channel
-.TE
-Sent by the server in interactive session mode, this message requests
-opening a channel to the authentication agent.  The client should open
-a channel, and respond with either SSH_MSG_CHANNEL_OPEN_CONFIRMATION
-or SSH_MSG_CHANNEL_OPEN_FAILURE.
-.IP "32 SSH_MSG_IGNORE"
-.TS
-;
-l l.
-string  data
-.TE
-Either party may send this message at any time.  This message, and the
-argument string, is silently ignored.  This message might be used in
-some implementations to make traffic analysis more difficult.  This
-message is not currently sent by the implementation, but all
-implementations are required to recognize and ignore it.
-.IP "33 SSH_CMSG_EXIT_CONFIRMATION"
-(no arguments)
-Sent by the client in response to SSH_SMSG_EXITSTATUS.  This is the
-last message sent by the client.
-.IP "34 SSH_CMSG_X11_REQUEST_FORWARDING"
-.TS
-;
-l l.
-string  x11_authentication_protocol
-string  x11_authentication_data
-32-bit int      screen number (if SSH_PROTOFLAG_SCREEN_NUMBER)
-.TE
-Sent by the client during the preparatory phase, this message requests
-that the server create a fake X11 display and set the DISPLAY
-environment variable accordingly.  An internet-domain display is
-preferable.  The given authentication protocol and the associated data
-should be recorded by the server so that it is used as authentication
-on connections (e.g., in .Xauthority).  The authentication protocol
-must be one of the supported X11 authentication protocols, e.g.,
-"MIT-MAGIC-COOKIE-1".  Authentication data must be a lowercase hex
-string of even length.  Its interpretation is protocol dependent.
-The data is in a format that can be used with e.g. the xauth program.
-Supporting this message is optional.
-The client is permitted (and recommended) to generate fake
-authentication information and send fake information to the server.
-This way, a corrupt server will not have access to the user's terminal
-after the connection has terminated.  The correct authorization codes
-will also not be left hanging around in files on the server (many
-users keep the same X session for months, thus protecting the
-authorization data becomes important).
-X11 authentication spoofing works by initially sending fake (random)
-authentication data to the server, and interpreting the first packet
-sent by the X11 client after the connection has been opened.  The
-first packet contains the client's authentication.  If the packet
-contains the correct fake data, it is replaced by the client by the
-correct authentication data, and then sent to the X server.
-.IP "35 SSH_CMSG_AUTH_RHOSTS_RSA"
-.TS
-;
-l l.
-string  clint-side user name
-32-bit int      client_host_key_bits
-mp-int  client_host_key_public_exponent
-mp-int  client_host_key_public_modulus
-.TE
-Requests authentication using /etc/hosts.equiv and .rhosts (or
-equivalent) together with RSA host authentication.  The server should
-check that the client side port number is less than 1024 (a privileged
-port), and immediately reject authentication if it is not.  The server
-responds with SSH_SMSG_FAILURE or SSH_SMSG_AUTH_RSA_CHALLENGE.  The
-client must respond to the challenge with the proper
-SSH_CMSG_AUTH_RSA_RESPONSE.  The server then responds with success if
-access was granted, or failure if the client gave a wrong response.
-Supporting this authentication method is optional but recommended in
-most environments.
-.IP "36 SSH_MSG_DEBUG"
-.TS
-;
-l l.
-string  debugging message sent to the other side
-.TE
-This message may be sent by either party at any time.  It is used to
-send debugging messages that may be informative to the user in
-solving various problems.  For example, if authentication fails
-because of some configuration error (e.g., incorrect permissions for
-some file), it can be very helpful for the user to make the cause of
-failure available.  On the other hand, one should not make too much
-information available for security reasons.  It is recommended that
-the client provides an option to display the debugging information
-sent by the sender (the user probably does not want to see it by default).
-The server can log debugging data sent by the client (if any).  Either
-party is free to ignore any received debugging data.  Every
-implementation must be able to receive this message, but no
-implementation is required to send these.
-.IP "37 SSH_CMSG_REQUEST_COMPRESSION"
-.TS
-;
-l l.
-32-bit int      gzip compression level (1-9)
-.TE
-This message can be sent by the client in the preparatory operations
-phase.  The server responds with SSH_SMSG_FAILURE if it does not
-support compression or does not want to compress; it responds with
-SSH_SMSG_SUCCESS if it accepted the compression request.  In the
-latter case the response to this packet will still be uncompressed,
-but all further packets in either direction will be compressed by gzip.
-.RT
-.ti 0
-Encoding of Terminal Modes
-Terminal modes (as passed in SSH_CMSG_REQUEST_PTY) are encoded into a
-byte stream.  It is intended that the coding be portable across
-different environments.
-The tty mode description is a stream of bytes.  The stream consists of
-opcode-argument pairs.  It is terminated by opcode TTY_OP_END (0).
-Opcodes 1-127 have one-byte arguments.  Opcodes 128-159 have 32-bit
-integer arguments (stored msb first).  Opcodes 160-255 are not yet
-defined, and cause parsing to stop (they should only be used after any
-other data).
-The client puts in the stream any modes it knows about, and the server
-ignores any modes it does not know about.  This allows some degree of
-machine-independence, at least between systems that use a POSIX-like
-[POSIX] tty interface.  The protocol can support other systems as
-well, but the client may need to fill reasonable values for a number
-of parameters so the server pty gets set to a reasonable mode (the
-server leaves all unspecified mode bits in their default values, and
-only some combinations make sense).
-The following opcodes have been defined.  The naming of opcodes mostly
-follows the POSIX terminal mode flags.
-.IP "0 TTY_OP_END"
-Indicates end of options.
-.IP "1 VINTR"
-Interrupt character; 255 if none.  Similarly for the other characters.
-Not all of these characters are supported on all systems.
-.IP "2 VQUIT"
-The quit character (sends SIGQUIT signal on UNIX systems).
-.IP "3 VERASE"
-Erase the character to left of the cursor.
-.IP "4 VKILL"
-Kill the current input line.
-.IP "5 VEOF "
-End-of-file character (sends EOF from the terminal).
-.IP "6 VEOL "
-End-of-line character in addition to carriage return and/or linefeed.
-.IP "7 VEOL2"
-Additional end-of-line character.
-.IP "8 VSTART"
-Continues paused output (normally ^Q).
-.IP "9 VSTOP"
-Pauses output (^S).
-.IP "10 VSUSP"
-Suspends the current program.
-.IP "11 VDSUSP"
-Another suspend character.
-.IP "12 VREPRINT"
-Reprints the current input line.
-.IP "13 VWERASE"
-Erases a word left of cursor.
-.IP "14 VLNEXT"
-More special input characters; these are probably not supported on
-most systems.
-.IP "15 VFLUSH"
-.IP "16 VSWTCH"
-.IP "17 VSTATUS"
-.IP "18 VDISCARD"
-.IP "30 IGNPAR"
-The ignore parity flag.  The next byte should be 0 if this flag is not
-set, and 1 if it is set.
-.IP "31 PARMRK"
-More flags.  The exact definitions can be found in the POSIX standard.
-.IP "32 INPCK"
-.IP "33 ISTRIP"
-.IP "34 INLCR"
-.IP "35 IGNCR"
-.IP "36 ICRNL"
-.IP "37 IUCLC"
-.IP "38 IXON"
-.IP "39 IXANY"
-.IP "40 IXOFF"
-.IP "41 IMAXBEL"
-.IP "50 ISIG"
-.IP "51 ICANON"
-.IP "52 XCASE"
-.IP "53 ECHO"
-.IP "54 ECHOE"
-.IP "55 ECHOK"
-.IP "56 ECHONL"
-.IP "57 NOFLSH"
-.IP "58 TOSTOP"
-.IP "59 IEXTEN"
-.IP "60 ECHOCTL"
-.IP "61 ECHOKE"
-.IP "62 PENDIN"
-.IP "70 OPOST"
-.IP "71 OLCUC"
-.IP "72 ONLCR"
-.IP "73 OCRNL"
-.IP "74 ONOCR"
-.IP "75 ONLRET"
-.IP "90 CS7"
-.IP "91 CS8"
-.IP "92 PARENB"
-.IP "93 PARODD"
-.IP "192 TTY_OP_ISPEED"
-Specifies the input baud rate in bits per second.
-.IP "193 TTY_OP_OSPEED"
-Specifies the output baud rate in bits per second.
-.RT
-.ti 0
-The Authentication Agent Protocol
-The authentication agent is a program that can be used to hold RSA
-authentication keys for the user (in future, it might hold data for
-other authentication types as well).  An authorized program can send
-requests to the agent to generate a proper response to an RSA
-challenge.  How the connection is made to the agent (or its
-representative) inside a host and how access control is done inside a
-host is implementation-dependent; however, how it is forwarded and how
-one interacts with it is specified in this protocol.  The connection
-to the agent is normally automatically forwarded over the secure
-channel.
-A program that wishes to use the agent first opens a connection to its
-local representative (typically, the agent itself or an SSH server).
-It then writes a request to the connection, and waits for response.
-It is recommended that at least five minutes of timeout are provided
-waiting for the agent to respond to an authentication challenge (this
-gives sufficient time for the user to cut-and-paste the challenge to a
-separate machine, perform the computation there, and cut-and-paste the
-result back if so desired).
-Messages sent to and by the agent are in the following format:
-.TS
-;
-l l.
-4 bytes Length, msb first.  Does not include length itself.
-1 byte  Packet type.  The value 255 is reserved for future extensions.
-data    Any data, depending on packet type.  Encoding as in the ssh packet
-protocol.
-.TE
-The following message types are currently defined:
-.IP "1 SSH_AGENTC_REQUEST_RSA_IDENTITIES"
-(no arguments)
-Requests the agent to send a list of all RSA keys for which it can
-answer a challenge.
-.IP "2 SSH_AGENT_RSA_IDENTITIES_ANSWER"
-.TS
-;
-l l.
-32-bit int      howmany
-howmany times:
-32-bit int      bits
-mp-int  public exponent
-mp-int  public modulus
-string  comment
-.TE
-The agent sends this message in response to the to
-SSH_AGENTC_REQUEST_RSA_IDENTITIES.  The answer lists all RSA keys for
-which the agent can answer a challenge.  The comment field is intended
-to help identify each key; it may be printed by an application to
-indicate which key is being used.  If the agent is not holding any
-keys, howmany will be zero.
-.IP "3 SSH_AGENTC_RSA_CHALLENGE
-.TS
-;
-l l.
-32-bit int      bits
-mp-int  public exponent
-mp-int  public modulus
-mp-int  challenge
-16 bytes        session_id
-32-bit int      response_type
-.TE
-Requests RSA decryption of random challenge to authenticate the other
-side.  The challenge will be decrypted with the RSA private key
-corresponding to the given public key.
-The decrypted challenge must contain a zero in the highest (partial)
-byte, 2 in the next byte, followed by non-zero random bytes, a zero
-byte, and then the real challenge value in the lowermost bytes.  The
-real challenge must be 32 8-bit bytes (256 bits).
-Response_type indicates the format of the response to be returned.
-Currently the only supported value is 1, which means to compute MD5 of
-the real challenge plus session id, and return the resulting 16 bytes
-in a SSH_AGENT_RSA_RESPONSE message.
-.IP "4 SSH_AGENT_RSA_RESPONSE"
-.TS
-;
-l l.
-16 bytes        MD5 of decrypted challenge
-.TE
-Answers an RSA authentication challenge.  The response is 16 bytes:
-the MD5 checksum of the 32-byte challenge.
-.IP "5 SSH_AGENT_FAILURE"
-(no arguments)
-This message is sent whenever the agent fails to answer a request
-properly.  For example, if the agent cannot answer a challenge (e.g.,
-no longer has the proper key), it can respond with this.  The agent
-also responds with this message if it receives a message it does not
-recognize.
-.IP "6 SSH_AGENT_SUCCESS"
-(no arguments)
-This message is sent by the agent as a response to certain requests
-that do not otherwise cause a message be sent.  Currently, this is
-only sent in response to SSH_AGENTC_ADD_RSA_IDENTITY and
-SSH_AGENTC_REMOVE_RSA_IDENTITY.
-.IP "7 SSH_AGENTC_ADD_RSA_IDENTITY"
-.TS
-;
-l l.
-32-bit int      bits
-mp-int  public modulus
-mp-int  public exponent
-mp-int  private exponent
-mp-int  multiplicative inverse of p mod q
-mp-int  p
-mp-int  q
-string  comment
-.TE
-Registers an RSA key with the agent.  After this request, the agent can
-use this RSA key to answer requests.  The agent responds with
-SSH_AGENT_SUCCESS or SSH_AGENT_FAILURE.
-.IP "8 SSH_AGENT_REMOVE_RSA_IDENTITY"
-.TS
-;
-l l.
-32-bit int      bits
-mp-int  public exponent
-mp-int  public modulus
-.TE
-Removes an RSA key from the agent.  The agent will no longer accept
-challenges for this key and will not list it as a supported identity.
-The agent responds with SSH_AGENT_SUCCESS or SSH_AGENT_FAILURE.
-.RT
-If the agent receives a message that it does not understand, it
-responds with SSH_AGENT_FAILURE.  This permits compatible future
-extensions.
-It is possible that several clients have a connection open to the
-authentication agent simultaneously.  Each client will use a separate
-connection (thus, any SSH connection can have multiple agent
-connections active simultaneously).
-.ti 0
-References
-.IP "[DES] "
-FIPS PUB 46-1: Data Encryption Standard.  National Bureau of
-Standards, January 1988.  FIPS PUB 81: DES Modes of Operation.
-National Bureau of Standards, December 1980.  Bruce Schneier: Applied
-Cryptography.  John Wiley & Sons, 1994.  J. Seberry and J. Pieprzyk:
-Cryptography: An Introduction to Computer Security.  Prentice-Hall,
-1989.
-.IP "[GZIP] "
-The GNU GZIP program; available for anonymous ftp at prep.ai.mit.edu.
-Please let me know if you know a paper describing the algorithm.
-.IP "[IDEA] "
-Xuejia Lai: On the Design and Security of Block Ciphers, ETH Series in
-Information Processing, vol. 1, Hartung-Gorre Verlag, Konstanz,
-Switzerland, 1992.  Bruce Schneier: Applied Cryptography, John Wiley &
-Sons, 1994.  See also the following patents: PCT/CH91/00117, EP 0 482
-154 B1, US Pat. 5,214,703.
-.IP [PKCS#1]
-PKCS #1: RSA Encryption Standard.  Version 1.5, RSA Laboratories,
-November 1993.  Available for anonymous ftp at ftp.rsa.com.
-.IP [POSIX]
-Portable Operating System Interface (POSIX) - Part 1: Application
-Program Interface (API) [C language], ISO/IEC 9945-1, IEEE Std 1003.1,
-1990.
-.IP [RFC0791]
-J. Postel: Internet Protocol, RFC 791, USC/ISI, September 1981.
-.IP [RFC0793]
-J. Postel: Transmission Control Protocol, RFC 793, USC/ISI, September
-1981.
-.IP [RFC1034]
-P. Mockapetris: Domain Names - Concepts and Facilities, RFC 1034,
-USC/ISI, November 1987.
-.IP [RFC1282]
-B. Kantor: BSD Rlogin, RFC 1258, UCSD, December 1991.
-.IP "[RSA] "
-Bruce Schneier: Applied Cryptography.  John Wiley & Sons, 1994.  See
-also R. Rivest, A. Shamir, and L. M. Adleman: Cryptographic
-Communications System and Method.  US Patent 4,405,829, 1983.
-.IP "[X11] "
-R. Scheifler: X Window System Protocol, X Consortium Standard, Version
-11, Release 6.  Massachusetts Institute of Technology, Laboratory of
-Computer Science, 1994.
-.RT
-.ti 0
-Security Considerations
-This protocol deals with the very issue of user authentication and
-security.
-First of all, as an implementation issue, the server program will have
-to run as root (or equivalent) on the server machine.  This is because
-the server program will need be able to change to an arbitrary user
-id.  The server must also be able to create a privileged TCP/IP port.
-The client program will need to run as root if any variant of .rhosts
-authentication is to be used.  This is because the client program will
-need to create a privileged port.  The client host key is also usually
-stored in a file which is readable by root only.  The client needs the
-host key in .rhosts authentication only.  Root privileges can be
-dropped as soon as the privileged port has been created and the host
-key has been read.
-The SSH protocol offers major security advantages over existing telnet
-and rlogin protocols.
-.IP o
-IP spoofing is restricted to closing a connection (by encryption, host
-keys, and the special random cookie).  If encryption is not used, IP
-spoofing is possible for those who can hear packets going out from the
-server.
-.IP o
-DNS spoofing is made ineffective (by host keys).
-.IP o
-Routing spoofing is made ineffective (by host keys).
-.IP o
-All data is encrypted with strong algorithms to make eavesdropping as
-difficult as possible.  This includes encrypting any authentication
-information such as passwords.  The information for decrypting session
-keys is destroyed every hour.
-.IP o
-Strong authentication methods: .rhosts combined with RSA host
-authentication, and pure RSA authentication.
-.IP o
-X11 connections and arbitrary TCP/IP ports can be forwarded securely.
-.IP o
-Man-in-the-middle attacks are deterred by using the server host key to
-encrypt the session key.
-.IP o
-Trojan horses to catch a password by routing manipulation are deterred
-by checking that the host key of the server machine matches that
-stored on the client host.
-.RT
-The security of SSH against man-in-the-middle attacks and the security
-of the new form of .rhosts authentication, as well as server host
-validation, depends on the integrity of the host key and the files
-containing known host keys.
-The host key is normally stored in a root-readable file.  If the host
-key is compromised, it permits attackers to use IP, DNS and routing
-spoofing as with current rlogin and rsh.  It should never be any worse
-than the current situation.
-The files containing known host keys are not sensitive.  However, if an
-attacker gets to modify the known host key files, it has the same
-consequences as a compromised host key, because the attacker can then
-change the recorded host key.
-The security improvements obtained by this protocol for X11 are of
-particular significance.  Previously, there has been no way to protect
-data communicated between an X server and a client running on a remote
-machine.  By creating a fake display on the server, and forwarding all
-X11 requests over the secure channel, SSH can be used to run any X11
-applications securely without any cooperation with the vendors of the
-X server or the application.
-Finally, the security of this program relies on the strength of the
-underlying cryptographic algorithms.  The RSA algorithm is used for
-authentication key exchange.  It is widely believed to be secure.  Of
-the algorithms used to encrypt the session, DES has a rather small key
-these days, probably permitting governments and organized criminals to
-break it in very short time with specialized hardware.  3DES is
-probably safe (but slower).  IDEA is widely believed to be secure.
-People have varying degrees of confidence in the other algorithms.
-This program is not secure if used with no encryption at all.
-.ti 0
-Additional Information
-Additional information (especially on the implementation and mailing
-lists) is available via WWW at http://www.cs.hut.fi/ssh.
-Comments should be sent to Tatu Ylonen <ylo@cs.hut.fi> or the SSH
-Mailing List <ssh@clinet.fi>.
-.ti 0
-Author's Address
-.TS
-;
-l.
-Tatu Ylonen
-Helsinki University of Technology
-Otakaari 1
-FIN-02150 Espoo, Finland
-Phone: +358-0-451-3374
-Fax: +358-0-451-3293
-EMail: ylo@cs.hut.fi
-.TE
diff --git a/acconfig.h b/acconfig.h
index 62252d760..f14353519 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,4 +1,4 @@
-/* $Id: acconfig.h,v 1.173 2004/02/06 05:24:31 dtucker Exp $ */
+/* $Id: acconfig.h,v 1.177 2004/04/15 23:22:40 dtucker Exp $ */
 /*
 * Copyright (c) 1999-2003 Damien Miller.  All rights reserved.
@@ -131,6 +131,9 @@
 /* Define if your AIX loginfailed() function takes 4 arguments (AIX >= 5.2) */
 #undef AIX_LOGINFAILED_4ARG
+/* Define if your skeychallenge() function takes 4 arguments (eg NetBSD) */
+#undef SKEYCHALLENGE_4ARG
 /* Define if you have/want arrays (cluster-wide session managment, not C arrays) */
 #undef WITH_IRIX_ARRAY
@@ -202,6 +205,9 @@
 /* Define if you don't want to use lastlog in session.c */
 #undef NO_SSH_LASTLOG
+/* Define if have krb5_init_ets */
+#undef KRB5_INIT_ETS
 /* Define if you don't want to use utmp */
 #undef DISABLE_UTMP
@@ -347,6 +353,9 @@
 /* getaddrinfo is broken (if present) */
 #undef BROKEN_GETADDRINFO
+/* updwtmpx is broken (if present) */
+#undef BROKEN_UPDWTMPX
 /* Workaround more Linux IPv6 quirks */
 #undef DONT_TRY_OTHER_AF
diff --git a/auth-krb5.c b/auth-krb5.c
index 859492478..a728ebac1 100644
--- a/auth-krb5.c
+++ b/auth-krb5.c
@@ -54,7 +54,9 @@ krb5_init(void *context)
                problem = krb5_init_context(&authctxt->krb5_ctx);
                if (problem)
                        return (problem);
+#ifdef KRB5_INIT_ETS
                krb5_init_ets(authctxt->krb5_ctx);
+#endif
        }
        return (0);
 }
@@ -70,6 +72,7 @@ auth_krb5_password(Authctxt *authctxt, const char *password)
 #endif
        krb5_error_code problem;
        krb5_ccache ccache = NULL;
+        int len;
        if (!authctxt->valid)
                return (0);
@@ -175,6 +178,11 @@ auth_krb5_password(Authctxt *authctxt, const char *password)
        authctxt->krb5_ticket_file = (char *)krb5_cc_get_name(authctxt->krb5_ctx, authctxt->krb5_fwd_ccache);
+        len = strlen(authctxt->krb5_ticket_file) + 6;
+        authctxt->krb5_ccname = xmalloc(len);
+        snprintf(authctxt->krb5_ccname, len, "FILE:%s",
+            authctxt->krb5_ticket_file);
 out:
        restore_uid();
diff --git a/auth-pam.c b/auth-pam.c
index d3186372e..36dbb7e15 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -31,7 +31,7 @@
 /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */
 #include "includes.h"
-RCSID("$Id: auth-pam.c,v 1.95 2004/02/17 12:20:08 dtucker Exp $");
+RCSID("$Id: auth-pam.c,v 1.100 2004/04/18 01:00:26 dtucker Exp $");
 #ifdef USE_PAM
 #if defined(HAVE_SECURITY_PAM_APPL_H)
@@ -58,6 +58,7 @@ RCSID("$Id: auth-pam.c,v 1.95 2004/02/17 12:20:08 dtucker Exp $");
 extern ServerOptions options;
 extern Buffer loginmsg;
 extern int compat20;
+extern u_int utmp_len;
 #ifdef USE_POSIX_THREADS
 #include <pthread.h>
@@ -160,7 +161,7 @@ static int sshpam_session_open = 0;
 static int sshpam_cred_established = 0;
 static int sshpam_account_status = -1;
 static char **sshpam_env = NULL;
-static Authctxt *the_authctxt = NULL;
+static Authctxt *sshpam_authctxt = NULL;
 /* Some PAM implementations don't implement this */
 #ifndef HAVE_PAM_GETENVLIST
@@ -180,9 +181,9 @@ void
 pam_password_change_required(int reqd)
 {
        debug3("%s %d", __func__, reqd);
-        if (the_authctxt == NULL)
+        if (sshpam_authctxt == NULL)
                fatal("%s: PAM authctxt not initialized", __func__);
-        the_authctxt->force_pwchange = reqd;
+        sshpam_authctxt->force_pwchange = reqd;
        if (reqd) {
                no_port_forwarding_flag |= 2;
                no_agent_forwarding_flag |= 2;
@@ -204,6 +205,7 @@ import_environments(Buffer *b)
        debug3("PAM: %s entering", __func__);
+#ifndef USE_POSIX_THREADS
        /* Import variables set by do_pam_account */
        sshpam_account_status = buffer_get_int(b);
        pam_password_change_required(buffer_get_int(b));
@@ -231,6 +233,7 @@ import_environments(Buffer *b)
                }
 #endif
        }
+#endif
 }
 /*
@@ -339,7 +342,7 @@ sshpam_thread(void *ctxtp)
        sshpam_conv.conv = sshpam_thread_conv;
        sshpam_conv.appdata_ptr = ctxt;
-        if (the_authctxt == NULL)
+        if (sshpam_authctxt == NULL)
                fatal("%s: PAM authctxt not initialized", __func__);
        buffer_init(&buffer);
@@ -354,7 +357,7 @@ sshpam_thread(void *ctxtp)
        if (compat20) {
                if (!do_pam_account())
                        goto auth_fail;
-                if (the_authctxt->force_pwchange) {
+                if (sshpam_authctxt->force_pwchange) {
                        sshpam_err = pam_chauthtok(sshpam_handle,
                            PAM_CHANGE_EXPIRED_AUTHTOK);
                        if (sshpam_err != PAM_SUCCESS)
@@ -368,7 +371,7 @@ sshpam_thread(void *ctxtp)
 #ifndef USE_POSIX_THREADS
        /* Export variables set by do_pam_account */
        buffer_put_int(&buffer, sshpam_account_status);
-        buffer_put_int(&buffer, the_authctxt->force_pwchange);
+        buffer_put_int(&buffer, sshpam_authctxt->force_pwchange);
        /* Export any environment strings set in child */
        for(i = 0; environ[i] != NULL; i++)
@@ -451,7 +454,6 @@ sshpam_cleanup(void)
 static int
 sshpam_init(Authctxt *authctxt)
 {
-        extern u_int utmp_len;
        extern char *__progname;
        const char *pam_rhost, *pam_user, *user = authctxt->user;
@@ -467,7 +469,7 @@ sshpam_init(Authctxt *authctxt)
        debug("PAM: initializing for \"%s\"", user);
        sshpam_err =
            pam_start(SSHD_PAM_SERVICE, user, &null_conv, &sshpam_handle);
-        the_authctxt = authctxt;
+        sshpam_authctxt = authctxt;
        if (sshpam_err != PAM_SUCCESS) {
                pam_end(sshpam_handle, sshpam_err);
@@ -597,7 +599,10 @@ sshpam_query(void *ctx, char **name, char **info,
                                xfree(msg);
                                return (0);
                        }
-                        error("PAM: %s", msg);
+                        error("PAM: %s for %s%.100s from %.100s", msg,
+                            sshpam_authctxt->valid ? "" : "illegal user ",
+                            sshpam_authctxt->user,
+                            get_remote_name_or_ip(utmp_len, options.use_dns));
                        /* FALLTHROUGH */
                default:
                        *num = 0;
diff --git a/auth-pam.h b/auth-pam.h
index f3aad063b..1b3706e07 100644
--- a/auth-pam.h
+++ b/auth-pam.h
@@ -1,4 +1,4 @@
-/* $Id: auth-pam.h,v 1.24 2004/02/10 02:23:29 dtucker Exp $ */
+/* $Id: auth-pam.h,v 1.25 2004/03/08 12:04:07 dtucker Exp $ */
 /*
 * Copyright (c) 2000 Damien Miller.  All rights reserved.
diff --git a/auth-passwd.c b/auth-passwd.c
index b9679abd0..beaf0fa6c 100644
--- a/auth-passwd.c
+++ b/auth-passwd.c
@@ -73,13 +73,6 @@ auth_password(Authctxt *authctxt, const char *password)
        if (*password == '\0' && options.permit_empty_passwd == 0)
                return 0;
-#if defined(HAVE_OSF_SIA)
-        /*
-         * XXX: any reason this is before krb?  could be moved to
-         * sys_auth_passwd()?  -dt
-         */
-        return auth_sia_password(authctxt, password) && ok;
-#endif
 #ifdef KRB5
        if (options.kerberos_authentication == 1) {
                int ret = auth_krb5_password(authctxt, password);
diff --git a/auth-sia.c b/auth-sia.c
index cd2dcb840..63f55d07f 100644
--- a/auth-sia.c
+++ b/auth-sia.c
@@ -47,7 +47,7 @@ extern int saved_argc;
 extern char **saved_argv;
 int
-auth_sia_password(Authctxt *authctxt, char *pass)
+sys_auth_passwd(Authctxt *authctxt, char *pass)
 {
        int ret;
        SIAENTITY *ent = NULL;
diff --git a/auth-sia.h b/auth-sia.h
index 38164ff81..ca55e913e 100644
--- a/auth-sia.h
+++ b/auth-sia.h
@@ -26,7 +26,7 @@
 #ifdef HAVE_OSF_SIA
-int     auth_sia_password(Authctxt *, char *);
+int     sys_auth_passwd(Authctxt *, char *);
 void    session_setup_sia(struct passwd *, char *);
 #endif /* HAVE_OSF_SIA */
diff --git a/auth-skey.c b/auth-skey.c
index f9ea03fd1..ac1af69ed 100644
--- a/auth-skey.c
+++ b/auth-skey.c
@@ -47,7 +47,8 @@ skey_query(void *ctx, char **name, char **infotxt,
        int len;
        struct skey skey;
-        if (skeychallenge(&skey, authctxt->user, challenge) == -1)
+        if (_compat_skeychallenge(&skey, authctxt->user, challenge, 
+            sizeof(challenge)) == -1)
                return -1;
        *name  = xstrdup("");
diff --git a/auth.h b/auth.h
index de2222aaa..3a7d222ef 100644
--- a/auth.h
+++ b/auth.h
@@ -66,6 +66,7 @@ struct Authctxt {
        krb5_ccache      krb5_fwd_ccache;
        krb5_principal   krb5_user;
        char            *krb5_ticket_file;
+        char            *krb5_ccname;
 #endif
        void            *methoddata;
 };
diff --git a/canohost.c b/canohost.c
index f5145922e..a0067afc1 100644
--- a/canohost.c
+++ b/canohost.c
@@ -44,6 +44,9 @@ get_remote_hostname(int socket, int use_dns)
                cleanup_exit(255);
        }
+        if (from.ss_family == AF_INET)
+                check_ip_options(socket, ntop);
        ipv64_normalise_mapped(&from, &fromlen);
        if (from.ss_family == AF_INET6)
@@ -56,9 +59,6 @@ get_remote_hostname(int socket, int use_dns)
        if (!use_dns)
                return xstrdup(ntop);
-        if (from.ss_family == AF_INET)
-                check_ip_options(socket, ntop);
        debug3("Trying to reverse map address %.100s.", ntop);
        /* Map the IP address to a host name. */
        if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),
diff --git a/config.h.in b/config.h.in
index 32622dc5f..06471531e 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,5 +1,5 @@
 /* config.h.in.  Generated automatically from configure.ac by autoheader.  */
-/* $Id: acconfig.h,v 1.173 2004/02/06 05:24:31 dtucker Exp $ */
+/* $Id: acconfig.h,v 1.177 2004/04/15 23:22:40 dtucker Exp $ */
 /*
 * Copyright (c) 1999-2003 Damien Miller.  All rights reserved.
@@ -132,6 +132,9 @@
 /* Define if your AIX loginfailed() function takes 4 arguments (AIX >= 5.2) */
 #undef AIX_LOGINFAILED_4ARG
+/* Define if your skeychallenge() function takes 4 arguments (eg NetBSD) */
+#undef SKEYCHALLENGE_4ARG
 /* Define if you have/want arrays (cluster-wide session managment, not C arrays) */
 #undef WITH_IRIX_ARRAY
@@ -203,6 +206,9 @@
 /* Define if you don't want to use lastlog in session.c */
 #undef NO_SSH_LASTLOG
+/* Define if have krb5_init_ets */
+#undef KRB5_INIT_ETS
 /* Define if you don't want to use utmp */
 #undef DISABLE_UTMP
@@ -348,6 +354,9 @@
 /* getaddrinfo is broken (if present) */
 #undef BROKEN_GETADDRINFO
+/* updwtmpx is broken (if present) */
+#undef BROKEN_UPDWTMPX
 /* Workaround more Linux IPv6 quirks */
 #undef DONT_TRY_OTHER_AF
@@ -708,6 +717,9 @@
 /* Define if you have the <paths.h> header file. */
 #undef HAVE_PATHS_H
+/* Define if you have the `prctl' function. */
+#undef HAVE_PRCTL
 /* Define if you have the `pstat' function. */
 #undef HAVE_PSTAT
@@ -885,6 +897,9 @@
 /* Define if you have the <sys/mman.h> header file. */
 #undef HAVE_SYS_MMAN_H
+/* Define if you have the <sys/prctl.h> header file. */
+#undef HAVE_SYS_PRCTL_H
 /* Define if you have the <sys/pstat.h> header file. */
 #undef HAVE_SYS_PSTAT_H
@@ -945,6 +960,9 @@
 /* Define if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
+/* Define if you have the `unsetenv' function. */
+#undef HAVE_UNSETENV
 /* Define if you have the `updwtmp' function. */
 #undef HAVE_UPDWTMP
diff --git a/configure b/configure
index c39957b7c..70fd4feaa 100755
--- a/configure
+++ b/configure
@@ -3853,16 +3853,10 @@ EOF
 #define SPT_TYPE SPT_PSTAT
 EOF
-        case "$host" in
+        check_for_hpux_broken_getaddrinfo=1
-        *-*-hpux11.11*)
-                cat >>confdefs.h <<\EOF
-#define BROKEN_GETADDRINFO 1
-EOF
-;;
-        esac
        LIBS="$LIBS -lsec"
-echo "$as_me:3865: checking for t_error in -lxnet" >&5
+echo "$as_me:3859: 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
@@ -3870,7 +3864,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lxnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3873 "configure"
+#line 3867 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3889,16 +3883,16 @@ t_error ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3892: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3886: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:3895: \$? = $ac_status" >&5
+  echo "$as_me:3889: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3898: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3892: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:3901: \$? = $ac_status" >&5
+  echo "$as_me:3895: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_xnet_t_error=yes
 else
@@ -3909,7 +3903,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3912: result: $ac_cv_lib_xnet_t_error" >&5
+echo "$as_me:3906: 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
@@ -3919,7 +3913,7 @@ EOF
  LIBS="-lxnet $LIBS"
 else
-  { { echo "$as_me:3922: error: *** -lxnet needed on HP-UX - check config.log ***" >&5
+  { { echo "$as_me:3916: 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
@@ -3966,13 +3960,13 @@ EOF
 #define WITH_IRIX_AUDIT 1
 EOF
-        echo "$as_me:3969: checking for jlimit_startjob" >&5
+        echo "$as_me:3963: 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 3975 "configure"
+#line 3969 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char jlimit_startjob (); below.  */
@@ -4003,16 +3997,16 @@ f = jlimit_startjob;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4006: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4000: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:4009: \$? = $ac_status" >&5
+  echo "$as_me:4003: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4012: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4006: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:4015: \$? = $ac_status" >&5
+  echo "$as_me:4009: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_func_jlimit_startjob=yes
 else
@@ -4022,7 +4016,7 @@ ac_cv_func_jlimit_startjob=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4025: result: $ac_cv_func_jlimit_startjob" >&5
+echo "$as_me:4019: 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
@@ -4048,6 +4042,10 @@ EOF
 EOF
        cat >>confdefs.h <<\EOF
+#define BROKEN_UPDWTMPX 1
+EOF
+        cat >>confdefs.h <<\EOF
 #define WITH_ABBREV_NO_TTY 1
 EOF
@@ -4069,7 +4067,7 @@ EOF
 EOF
        cat >>confdefs.h <<\EOF
-#define LOCKED_PASSWD_PREFIX "!!"
+#define LOCKED_PASSWD_PREFIX "!"
 EOF
        cat >>confdefs.h <<\EOF
@@ -4139,6 +4137,9 @@ EOF
        ;;
 *-*-solaris*)
+        if test "x$withval" != "xno" ; then
+                need_dash_r=1
+        fi
        cat >>confdefs.h <<\EOF
 #define PAM_SUN_CODEBASE 1
 EOF
@@ -4167,11 +4168,11 @@ EOF
        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:4170: checking for obsolete utmp and wtmp in solaris2.x" >&5
+        echo "$as_me:4171: 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:4174: result: yes" >&5
+                echo "$as_me:4175: result: yes" >&5
 echo "${ECHO_T}yes" >&6
                cat >>confdefs.h <<\EOF
 #define DISABLE_UTMP 1
@@ -4182,7 +4183,7 @@ EOF
 EOF
        else
-                echo "$as_me:4185: result: no" >&5
+                echo "$as_me:4186: result: no" >&5
 echo "${ECHO_T}no" >&6
        fi
        ;;
@@ -4192,13 +4193,13 @@ echo "${ECHO_T}no" >&6
 for ac_func in getpwanam
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:4195: checking for $ac_func" >&5
+echo "$as_me:4196: 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 4201 "configure"
+#line 4202 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -4229,16 +4230,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4232: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4233: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:4235: \$? = $ac_status" >&5
+  echo "$as_me:4236: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4238: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4239: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:4241: \$? = $ac_status" >&5
+  echo "$as_me:4242: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -4248,7 +4249,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4251: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:4252: 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
@@ -4296,7 +4297,7 @@ EOF
 *-sni-sysv*)
        # /usr/ucblib MUST NOT be searched on ReliantUNIX
-echo "$as_me:4299: checking for dlsym in -ldl" >&5
+echo "$as_me:4300: 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
@@ -4304,7 +4305,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4307 "configure"
+#line 4308 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4323,16 +4324,16 @@ dlsym ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4326: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4327: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:4329: \$? = $ac_status" >&5
+  echo "$as_me:4330: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4332: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4333: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:4335: \$? = $ac_status" >&5
+  echo "$as_me:4336: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_dl_dlsym=yes
 else
@@ -4343,7 +4344,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4346: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:4347: 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
@@ -4448,19 +4449,31 @@ EOF
 EOF
        cat >>confdefs.h <<\EOF
+#define SETEUID_BREAKS_SETUID 1
+EOF
+        cat >>confdefs.h <<\EOF
+#define BROKEN_SETREUID 1
+EOF
+        cat >>confdefs.h <<\EOF
+#define BROKEN_SETREGID 1
+EOF
+        cat >>confdefs.h <<\EOF
 #define WITH_ABBREV_NO_TTY 1
 EOF
 for ac_func in getluid setluid
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:4457: checking for $ac_func" >&5
+echo "$as_me:4470: 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 4463 "configure"
+#line 4476 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -4491,16 +4504,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4494: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4507: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:4497: \$? = $ac_status" >&5
+  echo "$as_me:4510: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4500: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4513: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:4503: \$? = $ac_status" >&5
+  echo "$as_me:4516: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -4510,7 +4523,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4513: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:4526: 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
@@ -4564,13 +4577,13 @@ EOF
 for ac_func in getluid setluid
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:4567: checking for $ac_func" >&5
+echo "$as_me:4580: 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 4573 "configure"
+#line 4586 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -4601,16 +4614,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4604: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4617: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:4607: \$? = $ac_status" >&5
+  echo "$as_me:4620: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4610: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4623: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:4613: \$? = $ac_status" >&5
+  echo "$as_me:4626: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -4620,7 +4633,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4623: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:4636: 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
@@ -4720,7 +4733,7 @@ EOF
        MANTYPE=cat
        ;;
 *-dec-osf*)
-        echo "$as_me:4723: checking for Digital Unix SIA" >&5
+        echo "$as_me:4736: checking for Digital Unix SIA" >&5
 echo $ECHO_N "checking for Digital Unix SIA... $ECHO_C" >&6
        no_osfsia=""
@@ -4729,7 +4742,7 @@ if test "${with_osfsia+set}" = set; then
  withval="$with_osfsia"
                        if test "x$withval" = "xno" ; then
-                                echo "$as_me:4732: result: disabled" >&5
+                                echo "$as_me:4745: result: disabled" >&5
 echo "${ECHO_T}disabled" >&6
                                no_osfsia=1
                        fi
@@ -4737,7 +4750,7 @@ echo "${ECHO_T}disabled" >&6
 fi;
        if test -z "$no_osfsia" ; then
                if test -f /etc/sia/matrix.conf; then
-                        echo "$as_me:4740: result: yes" >&5
+                        echo "$as_me:4753: result: yes" >&5
 echo "${ECHO_T}yes" >&6
                        cat >>confdefs.h <<\EOF
 #define HAVE_OSF_SIA 1
@@ -4753,7 +4766,7 @@ EOF
                        LIBS="$LIBS -lsecurity -ldb -lm -laud"
                else
-                        echo "$as_me:4756: result: no" >&5
+                        echo "$as_me:4769: result: no" >&5
 echo "${ECHO_T}no" >&6
                        cat >>confdefs.h <<\EOF
 #define LOCKED_PASSWD_SUBSTR "Nologin"
@@ -4845,15 +4858,15 @@ if test "${with_libs+set}" = set; then
 fi;
-echo "$as_me:4848: checking compiler and flags for sanity" >&5
+echo "$as_me:4861: 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:4851: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:4864: 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 4856 "configure"
+#line 4869 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -4861,26 +4874,26 @@ int main(){exit(0);}
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4864: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4877: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:4867: \$? = $ac_status" >&5
+  echo "$as_me:4880: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4869: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4882: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:4872: \$? = $ac_status" >&5
+  echo "$as_me:4885: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-        echo "$as_me:4874: result: yes" >&5
+        echo "$as_me:4887: 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:4881: result: no" >&5
+                echo "$as_me:4894: result: no" >&5
 echo "${ECHO_T}no" >&6
-                { { echo "$as_me:4883: error: *** compiler cannot create working executables, check config.log ***" >&5
+                { { echo "$as_me:4896: 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; }; }
@@ -4896,29 +4909,29 @@ for ac_header in bstring.h crypt.h endian.h features.h floatingpoint.h \
        netinet/in_systm.h pam/pam_appl.h paths.h pty.h readpassphrase.h \
        rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \
        strings.h sys/strtio.h sys/audit.h sys/bitypes.h sys/bsdtty.h \
-        sys/cdefs.h sys/mman.h sys/pstat.h sys/ptms.h sys/select.h sys/stat.h \
+        sys/cdefs.h sys/mman.h sys/prctl.h sys/pstat.h sys/ptms.h \
-        sys/stream.h sys/stropts.h sys/sysmacros.h sys/time.h sys/timers.h \
+        sys/select.h sys/stat.h sys/stream.h sys/stropts.h \
-        sys/un.h time.h tmpdir.h ttyent.h usersec.h \
+        sys/sysmacros.h sys/time.h sys/timers.h sys/un.h time.h tmpdir.h \
-        util.h utime.h utmp.h utmpx.h vis.h
+        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:4905: checking for $ac_header" >&5
+echo "$as_me:4918: 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 4911 "configure"
+#line 4924 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4915: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4928: \"$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:4921: \$? = $ac_status" >&5
+  echo "$as_me:4934: \$? = $ac_status" >&5
  (exit $ac_status); } >/dev/null; then
  if test -s conftest.err; then
    ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4937,7 +4950,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4940: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4953: 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
@@ -4948,13 +4961,13 @@ fi
 done
 # Checks for libraries.
-echo "$as_me:4951: checking for yp_match" >&5
+echo "$as_me:4964: 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 4957 "configure"
+#line 4970 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char yp_match (); below.  */
@@ -4985,16 +4998,16 @@ f = yp_match;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4988: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5001: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:4991: \$? = $ac_status" >&5
+  echo "$as_me:5004: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4994: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5007: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:4997: \$? = $ac_status" >&5
+  echo "$as_me:5010: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_func_yp_match=yes
 else
@@ -5004,13 +5017,13 @@ ac_cv_func_yp_match=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5007: result: $ac_cv_func_yp_match" >&5
+echo "$as_me:5020: 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:5013: checking for yp_match in -lnsl" >&5
+echo "$as_me:5026: 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
@@ -5018,7 +5031,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 5021 "configure"
+#line 5034 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5037,16 +5050,16 @@ yp_match ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5040: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5053: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:5043: \$? = $ac_status" >&5
+  echo "$as_me:5056: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5046: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5059: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:5049: \$? = $ac_status" >&5
+  echo "$as_me:5062: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_nsl_yp_match=yes
 else
@@ -5057,7 +5070,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:5060: result: $ac_cv_lib_nsl_yp_match" >&5
+echo "$as_me:5073: 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
@@ -5070,13 +5083,13 @@ fi
 fi
-echo "$as_me:5073: checking for setsockopt" >&5
+echo "$as_me:5086: 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 5079 "configure"
+#line 5092 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char setsockopt (); below.  */
@@ -5107,16 +5120,16 @@ f = setsockopt;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5110: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5123: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:5113: \$? = $ac_status" >&5
+  echo "$as_me:5126: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5116: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5129: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:5119: \$? = $ac_status" >&5
+  echo "$as_me:5132: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_func_setsockopt=yes
 else
@@ -5126,13 +5139,13 @@ ac_cv_func_setsockopt=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5129: result: $ac_cv_func_setsockopt" >&5
+echo "$as_me:5142: 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:5135: checking for setsockopt in -lsocket" >&5
+echo "$as_me:5148: 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
@@ -5140,7 +5153,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 5143 "configure"
+#line 5156 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5159,16 +5172,16 @@ setsockopt ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5162: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5175: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:5165: \$? = $ac_status" >&5
+  echo "$as_me:5178: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5168: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5181: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:5171: \$? = $ac_status" >&5
+  echo "$as_me:5184: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_socket_setsockopt=yes
 else
@@ -5179,7 +5192,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:5182: result: $ac_cv_lib_socket_setsockopt" >&5
+echo "$as_me:5195: 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
@@ -5194,7 +5207,7 @@ fi
 if test "x$with_tcp_wrappers" != "xno" ; then
    if test "x$do_sco3_extra_lib_check" = "xyes" ; then
-        echo "$as_me:5197: checking for innetgr in -lrpc" >&5
+        echo "$as_me:5210: 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
@@ -5202,7 +5215,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrpc -lyp -lrpc $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 5205 "configure"
+#line 5218 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5221,16 +5234,16 @@ innetgr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5224: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5237: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:5227: \$? = $ac_status" >&5
+  echo "$as_me:5240: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5230: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5243: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:5233: \$? = $ac_status" >&5
+  echo "$as_me:5246: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_rpc_innetgr=yes
 else
@@ -5241,7 +5254,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:5244: result: $ac_cv_lib_rpc_innetgr" >&5
+echo "$as_me:5257: 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"
@@ -5253,13 +5266,13 @@ fi
 for ac_func in dirname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5256: checking for $ac_func" >&5
+echo "$as_me:5269: 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 5262 "configure"
+#line 5275 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -5290,16 +5303,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5293: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5306: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:5296: \$? = $ac_status" >&5
+  echo "$as_me:5309: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5299: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5312: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:5302: \$? = $ac_status" >&5
+  echo "$as_me:5315: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -5309,7 +5322,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5312: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5325: 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
@@ -5319,23 +5332,23 @@ EOF
 for ac_header in libgen.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5322: checking for $ac_header" >&5
+echo "$as_me:5335: 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 5328 "configure"
+#line 5341 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5332: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5345: \"$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:5338: \$? = $ac_status" >&5
+  echo "$as_me:5351: \$? = $ac_status" >&5
  (exit $ac_status); } >/dev/null; then
  if test -s conftest.err; then
    ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5354,7 +5367,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5357: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5370: 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
@@ -5366,7 +5379,7 @@ done
 else
-        echo "$as_me:5369: checking for dirname in -lgen" >&5
+        echo "$as_me:5382: 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
@@ -5374,7 +5387,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 5377 "configure"
+#line 5390 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5393,16 +5406,16 @@ dirname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5396: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5409: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:5399: \$? = $ac_status" >&5
+  echo "$as_me:5412: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5402: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5415: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:5405: \$? = $ac_status" >&5
+  echo "$as_me:5418: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_gen_dirname=yes
 else
@@ -5413,11 +5426,11 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:5416: result: $ac_cv_lib_gen_dirname" >&5
+echo "$as_me:5429: 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:5420: checking for broken dirname" >&5
+                echo "$as_me:5433: 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
@@ -5426,12 +5439,12 @@ else
                        save_LIBS="$LIBS"
                        LIBS="$LIBS -lgen"
                        if test "$cross_compiling" = yes; then
-  { { echo "$as_me:5429: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:5442: 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 5434 "configure"
+#line 5447 "configure"
 #include "confdefs.h"
 #include <libgen.h>
@@ -5451,15 +5464,15 @@ int main(int argc, char **argv) {
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5454: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5467: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:5457: \$? = $ac_status" >&5
+  echo "$as_me:5470: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5459: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5472: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:5462: \$? = $ac_status" >&5
+  echo "$as_me:5475: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_broken_dirname="no"
 else
@@ -5474,7 +5487,7 @@ fi
                        LIBS="$save_LIBS"
 fi
-echo "$as_me:5477: result: $ac_cv_have_broken_dirname" >&5
+echo "$as_me:5490: 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"
@@ -5485,23 +5498,23 @@ EOF
 for ac_header in libgen.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5488: checking for $ac_header" >&5
+echo "$as_me:5501: 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 5494 "configure"
+#line 5507 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5498: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5511: \"$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:5504: \$? = $ac_status" >&5
+  echo "$as_me:5517: \$? = $ac_status" >&5
  (exit $ac_status); } >/dev/null; then
  if test -s conftest.err; then
    ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5520,7 +5533,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5523: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5536: 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
@@ -5537,13 +5550,13 @@ fi
 fi
 done
-echo "$as_me:5540: checking for getspnam" >&5
+echo "$as_me:5553: 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 5546 "configure"
+#line 5559 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char getspnam (); below.  */
@@ -5574,16 +5587,16 @@ f = getspnam;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5577: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5590: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:5580: \$? = $ac_status" >&5
+  echo "$as_me:5593: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5583: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5596: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:5586: \$? = $ac_status" >&5
+  echo "$as_me:5599: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_func_getspnam=yes
 else
@@ -5593,12 +5606,12 @@ ac_cv_func_getspnam=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5596: result: $ac_cv_func_getspnam" >&5
+echo "$as_me:5609: 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:5601: checking for getspnam in -lgen" >&5
+  echo "$as_me:5614: 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
@@ -5606,7 +5619,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 5609 "configure"
+#line 5622 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5625,16 +5638,16 @@ getspnam ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5628: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5641: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:5631: \$? = $ac_status" >&5
+  echo "$as_me:5644: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5634: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5647: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:5637: \$? = $ac_status" >&5
+  echo "$as_me:5650: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_gen_getspnam=yes
 else
@@ -5645,7 +5658,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:5648: result: $ac_cv_lib_gen_getspnam" >&5
+echo "$as_me:5661: 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"
@@ -5653,7 +5666,7 @@ fi
 fi
-echo "$as_me:5656: checking for library containing basename" >&5
+echo "$as_me:5669: 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
@@ -5661,7 +5674,7 @@ else
  ac_func_search_save_LIBS=$LIBS
 ac_cv_search_basename=no
 cat >conftest.$ac_ext <<_ACEOF
-#line 5664 "configure"
+#line 5677 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5680,16 +5693,16 @@ basename ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5683: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5696: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:5686: \$? = $ac_status" >&5
+  echo "$as_me:5699: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5689: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5702: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:5692: \$? = $ac_status" >&5
+  echo "$as_me:5705: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_search_basename="none required"
 else
@@ -5701,7 +5714,7 @@ if test "$ac_cv_search_basename" = no; then
  for ac_lib in gen; do
    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
    cat >conftest.$ac_ext <<_ACEOF
-#line 5704 "configure"
+#line 5717 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5720,16 +5733,16 @@ basename ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5723: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5736: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:5726: \$? = $ac_status" >&5
+  echo "$as_me:5739: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5729: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5742: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:5732: \$? = $ac_status" >&5
+  echo "$as_me:5745: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_search_basename="-l$ac_lib"
 break
@@ -5742,7 +5755,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:5745: result: $ac_cv_search_basename" >&5
+echo "$as_me:5758: 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"
@@ -5757,7 +5770,7 @@ if test "${with_zlib+set}" = set; then
  withval="$with_zlib"
                if test "x$withval" = "xno" ; then
-                        { { echo "$as_me:5760: error: *** zlib is required ***" >&5
+                        { { echo "$as_me:5773: error: *** zlib is required ***" >&5
 echo "$as_me: error: *** zlib is required ***" >&2;}
   { (exit 1); exit 1; }; }
                fi
@@ -5782,7 +5795,7 @@ echo "$as_me: error: *** zlib is required ***" >&2;}
 fi;
-echo "$as_me:5785: checking for deflate in -lz" >&5
+echo "$as_me:5798: 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
@@ -5790,7 +5803,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lz  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 5793 "configure"
+#line 5806 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5809,16 +5822,16 @@ deflate ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5812: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5825: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:5815: \$? = $ac_status" >&5
+  echo "$as_me:5828: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5818: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5831: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:5821: \$? = $ac_status" >&5
+  echo "$as_me:5834: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_z_deflate=yes
 else
@@ -5829,7 +5842,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:5832: result: $ac_cv_lib_z_deflate" >&5
+echo "$as_me:5845: 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
@@ -5851,7 +5864,7 @@ else
                CPPFLAGS="-I/usr/local/include ${saved_CPPFLAGS}"
                LIBS="$LIBS -lz"
                cat >conftest.$ac_ext <<_ACEOF
-#line 5854 "configure"
+#line 5867 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5870,16 +5883,16 @@ deflate ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5873: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5886: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:5876: \$? = $ac_status" >&5
+  echo "$as_me:5889: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5879: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5892: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:5882: \$? = $ac_status" >&5
+  echo "$as_me:5895: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  cat >>confdefs.h <<\EOF
 #define HAVE_LIBZ 1
@@ -5889,7 +5902,7 @@ else
  echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-                                { { echo "$as_me:5892: error: *** zlib missing - please install first or check config.log ***" >&5
+                                { { echo "$as_me:5905: 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; }; }
@@ -5898,23 +5911,23 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5901: checking for zlib.h" >&5
+echo "$as_me:5914: 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 5907 "configure"
+#line 5920 "configure"
 #include "confdefs.h"
 #include <zlib.h>
 _ACEOF
-if { (eval echo "$as_me:5911: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5924: \"$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:5917: \$? = $ac_status" >&5
+  echo "$as_me:5930: \$? = $ac_status" >&5
  (exit $ac_status); } >/dev/null; then
  if test -s conftest.err; then
    ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5933,12 +5946,12 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5936: result: $ac_cv_header_zlib_h" >&5
+echo "$as_me:5949: 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:5941: error: *** zlib.h missing - please install first or check config.log ***" >&5
+  { { echo "$as_me:5954: 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
@@ -5952,15 +5965,15 @@ if test "${with_zlib_version_check+set}" = set; then
 fi;
-echo "$as_me:5955: checking for zlib 1.1.4 or greater" >&5
+echo "$as_me:5968: 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:5958: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:5971: 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 5963 "configure"
+#line 5976 "configure"
 #include "confdefs.h"
 #include <zlib.h>
@@ -5977,26 +5990,26 @@ int main()
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5980: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5993: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:5983: \$? = $ac_status" >&5
+  echo "$as_me:5996: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5985: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5998: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:5988: \$? = $ac_status" >&5
+  echo "$as_me:6001: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-  echo "$as_me:5990: result: yes" >&5
+  echo "$as_me:6003: 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:5996: result: no" >&5
+ echo "$as_me:6009: result: no" >&5
 echo "${ECHO_T}no" >&6
          if test -z "$zlib_check_nonfatal" ; then
-                { { echo "$as_me:5999: error: *** zlib too old - check config.log ***
+                { { echo "$as_me:6012: 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
@@ -6010,7 +6023,7 @@ are sure this is the case, you can disable the check by running
 If you are in doubt, upgrade zlib to version 1.1.4 or greater." >&2;}
   { (exit 1); exit 1; }; }
          else
-                { echo "$as_me:6013: WARNING: zlib version may have security problems" >&5
+                { echo "$as_me:6026: WARNING: zlib version may have security problems" >&5
 echo "$as_me: WARNING: zlib version may have security problems" >&2;}
          fi
@@ -6018,13 +6031,13 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6021: checking for strcasecmp" >&5
+echo "$as_me:6034: 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 6027 "configure"
+#line 6040 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char strcasecmp (); below.  */
@@ -6055,16 +6068,16 @@ f = strcasecmp;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6058: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6071: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:6061: \$? = $ac_status" >&5
+  echo "$as_me:6074: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6064: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6077: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:6067: \$? = $ac_status" >&5
+  echo "$as_me:6080: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_func_strcasecmp=yes
 else
@@ -6074,12 +6087,12 @@ ac_cv_func_strcasecmp=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6077: result: $ac_cv_func_strcasecmp" >&5
+echo "$as_me:6090: 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:6082: checking for strcasecmp in -lresolv" >&5
+   echo "$as_me:6095: 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
@@ -6087,7 +6100,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6090 "configure"
+#line 6103 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6106,16 +6119,16 @@ strcasecmp ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6109: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6122: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:6112: \$? = $ac_status" >&5
+  echo "$as_me:6125: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6115: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6128: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:6118: \$? = $ac_status" >&5
+  echo "$as_me:6131: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_resolv_strcasecmp=yes
 else
@@ -6126,7 +6139,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6129: result: $ac_cv_lib_resolv_strcasecmp" >&5
+echo "$as_me:6142: 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"
@@ -6134,13 +6147,13 @@ fi
 fi
-echo "$as_me:6137: checking for utimes" >&5
+echo "$as_me:6150: 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 6143 "configure"
+#line 6156 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char utimes (); below.  */
@@ -6171,16 +6184,16 @@ f = utimes;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6174: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6187: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:6177: \$? = $ac_status" >&5
+  echo "$as_me:6190: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6180: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6193: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:6183: \$? = $ac_status" >&5
+  echo "$as_me:6196: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_func_utimes=yes
 else
@@ -6190,12 +6203,12 @@ ac_cv_func_utimes=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6193: result: $ac_cv_func_utimes" >&5
+echo "$as_me:6206: 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:6198: checking for utimes in -lc89" >&5
+   echo "$as_me:6211: 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
@@ -6203,7 +6216,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc89  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6206 "configure"
+#line 6219 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6222,16 +6235,16 @@ utimes ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6225: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6238: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:6228: \$? = $ac_status" >&5
+  echo "$as_me:6241: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6231: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6244: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:6234: \$? = $ac_status" >&5
+  echo "$as_me:6247: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_c89_utimes=yes
 else
@@ -6242,7 +6255,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6245: result: $ac_cv_lib_c89_utimes" >&5
+echo "$as_me:6258: 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
@@ -6257,23 +6270,23 @@ fi
 for ac_header in libutil.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6260: checking for $ac_header" >&5
+echo "$as_me:6273: 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 6266 "configure"
+#line 6279 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6270: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:6283: \"$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:6276: \$? = $ac_status" >&5
+  echo "$as_me:6289: \$? = $ac_status" >&5
  (exit $ac_status); } >/dev/null; then
  if test -s conftest.err; then
    ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6292,7 +6305,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:6295: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:6308: 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
@@ -6302,7 +6315,7 @@ EOF
 fi
 done
-echo "$as_me:6305: checking for library containing login" >&5
+echo "$as_me:6318: 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
@@ -6310,7 +6323,7 @@ else
  ac_func_search_save_LIBS=$LIBS
 ac_cv_search_login=no
 cat >conftest.$ac_ext <<_ACEOF
-#line 6313 "configure"
+#line 6326 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6329,16 +6342,16 @@ login ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6332: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6345: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:6335: \$? = $ac_status" >&5
+  echo "$as_me:6348: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6338: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6351: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:6341: \$? = $ac_status" >&5
+  echo "$as_me:6354: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_search_login="none required"
 else
@@ -6350,7 +6363,7 @@ if test "$ac_cv_search_login" = no; then
  for ac_lib in util bsd; do
    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
    cat >conftest.$ac_ext <<_ACEOF
-#line 6353 "configure"
+#line 6366 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6369,16 +6382,16 @@ login ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6372: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6385: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:6375: \$? = $ac_status" >&5
+  echo "$as_me:6388: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6378: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6391: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:6381: \$? = $ac_status" >&5
+  echo "$as_me:6394: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_search_login="-l$ac_lib"
 break
@@ -6391,7 +6404,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:6394: result: $ac_cv_search_login" >&5
+echo "$as_me:6407: 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"
@@ -6404,13 +6417,13 @@ fi
 for ac_func in logout updwtmp logwtmp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:6407: checking for $ac_func" >&5
+echo "$as_me:6420: 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 6413 "configure"
+#line 6426 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -6441,16 +6454,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6444: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6457: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:6447: \$? = $ac_status" >&5
+  echo "$as_me:6460: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6450: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6463: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:6453: \$? = $ac_status" >&5
+  echo "$as_me:6466: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -6460,7 +6473,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6463: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6476: 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
@@ -6473,13 +6486,13 @@ done
 for ac_func in strftime
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:6476: checking for $ac_func" >&5
+echo "$as_me:6489: 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 6482 "configure"
+#line 6495 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -6510,16 +6523,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6513: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6526: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:6516: \$? = $ac_status" >&5
+  echo "$as_me:6529: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6519: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6532: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:6522: \$? = $ac_status" >&5
+  echo "$as_me:6535: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -6529,7 +6542,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6532: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6545: 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
@@ -6538,7 +6551,7 @@ EOF
 else
  # strftime is in -lintl on SCO UNIX.
-echo "$as_me:6541: checking for strftime in -lintl" >&5
+echo "$as_me:6554: 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
@@ -6546,7 +6559,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6549 "configure"
+#line 6562 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6565,16 +6578,16 @@ strftime ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6568: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6581: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:6571: \$? = $ac_status" >&5
+  echo "$as_me:6584: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6574: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6587: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:6577: \$? = $ac_status" >&5
+  echo "$as_me:6590: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_intl_strftime=yes
 else
@@ -6585,7 +6598,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6588: result: $ac_cv_lib_intl_strftime" >&5
+echo "$as_me:6601: 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
@@ -6599,10 +6612,10 @@ fi
 done
 # Check for ALTDIRFUNC glob() extension
-echo "$as_me:6602: checking for GLOB_ALTDIRFUNC support" >&5
+echo "$as_me:6615: checking for GLOB_ALTDIRFUNC support" >&5
 echo $ECHO_N "checking for GLOB_ALTDIRFUNC support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 6605 "configure"
+#line 6618 "configure"
 #include "confdefs.h"
                #include <glob.h>
@@ -6618,22 +6631,22 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 #define GLOB_HAS_ALTDIRFUNC 1
 EOF
-                echo "$as_me:6621: result: yes" >&5
+                echo "$as_me:6634: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-                echo "$as_me:6626: result: no" >&5
+                echo "$as_me:6639: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest*
 # Check for g.gl_matchc glob() extension
-echo "$as_me:6633: checking for gl_matchc field in glob_t" >&5
+echo "$as_me:6646: 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 6636 "configure"
+#line 6649 "configure"
 #include "confdefs.h"
                #include <glob.h>
@@ -6647,26 +6660,26 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 #define GLOB_HAS_GL_MATCHC 1
 EOF
-                echo "$as_me:6650: result: yes" >&5
+                echo "$as_me:6663: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-                echo "$as_me:6655: result: no" >&5
+                echo "$as_me:6668: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest*
-echo "$as_me:6661: checking whether struct dirent allocates space for d_name" >&5
+echo "$as_me:6674: 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:6664: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:6677: 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 6669 "configure"
+#line 6682 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -6675,24 +6688,24 @@ int main(void){struct dirent d;exit(sizeof(d.d_name)<=sizeof(char));}
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6678: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6691: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:6681: \$? = $ac_status" >&5
+  echo "$as_me:6694: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:6683: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6696: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:6686: \$? = $ac_status" >&5
+  echo "$as_me:6699: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-  echo "$as_me:6688: result: yes" >&5
+  echo "$as_me:6701: 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:6695: result: no" >&5
+                echo "$as_me:6708: result: no" >&5
 echo "${ECHO_T}no" >&6
                cat >>confdefs.h <<\EOF
 #define BROKEN_ONE_BYTE_DIRENT_D_NAME 1
@@ -6723,15 +6736,15 @@ EOF
                        LIBS="-lskey $LIBS"
                        SKEY_MSG="yes"
-                        echo "$as_me:6726: checking for s/key support" >&5
+                        echo "$as_me:6739: 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:6729: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:6742: 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 6734 "configure"
+#line 6747 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -6740,32 +6753,73 @@ int main() { char *ff = skey_keyinfo(""); ff=""; exit(0); }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6743: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6756: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:6746: \$? = $ac_status" >&5
+  echo "$as_me:6759: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:6748: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6761: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:6751: \$? = $ac_status" >&5
+  echo "$as_me:6764: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-  echo "$as_me:6753: result: yes" >&5
+  echo "$as_me:6766: 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:6760: result: no" >&5
+                                        echo "$as_me:6773: result: no" >&5
 echo "${ECHO_T}no" >&6
-                                        { { echo "$as_me:6762: error: ** Incomplete or missing s/key libraries." >&5
+                                        { { echo "$as_me:6775: 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:6782: 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 6785 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+                                 #include <skey.h>
+int
+main ()
+{
+(void)skeychallenge(NULL,"name","",0);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:6798: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:6801: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:6804: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6807: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  echo "$as_me:6809: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+                                 cat >>confdefs.h <<\EOF
+#define SKEYCHALLENGE_4ARG 1
+EOF
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+echo "$as_me:6818: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
                fi
 fi;
@@ -6803,12 +6857,15 @@ if test "${with_tcp_wrappers+set}" = set; then
                        fi
                        LIBWRAP="-lwrap"
                        LIBS="$LIBWRAP $LIBS"
-                        echo "$as_me:6806: checking for libwrap" >&5
+                        echo "$as_me:6860: checking for libwrap" >&5
 echo $ECHO_N "checking for libwrap... $ECHO_C" >&6
                        cat >conftest.$ac_ext <<_ACEOF
-#line 6809 "configure"
+#line 6863 "configure"
 #include "confdefs.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
 #include <tcpd.h>
                                        int deny_severity = 0, allow_severity = 0;
@@ -6821,19 +6878,19 @@ hosts_access(0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6824: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6881: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:6827: \$? = $ac_status" >&5
+  echo "$as_me:6884: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6830: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6887: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:6833: \$? = $ac_status" >&5
+  echo "$as_me:6890: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-                                        echo "$as_me:6836: result: yes" >&5
+                                        echo "$as_me:6893: result: yes" >&5
 echo "${ECHO_T}yes" >&6
                                        cat >>confdefs.h <<\EOF
 #define LIBWRAP 1
@@ -6845,7 +6902,7 @@ else
  echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-                                        { { echo "$as_me:6848: error: *** libwrap missing" >&5
+                                        { { echo "$as_me:6905: error: *** libwrap missing" >&5
 echo "$as_me: error: *** libwrap missing" >&2;}
   { (exit 1); exit 1; }; }
@@ -6863,22 +6920,22 @@ for ac_func in \
        getpeereid _getpty getrlimit getttyent glob inet_aton \
        inet_ntoa inet_ntop innetgr login_getcapbool md5_crypt memmove \
        mkdtemp mmap ngetaddrinfo nsleep ogetaddrinfo openlog_r openpty \
-        pstat readpassphrase realpath recvmsg rresvport_af sendmsg \
+        pstat prctl readpassphrase realpath recvmsg rresvport_af sendmsg \
        setdtablesize setegid setenv seteuid setgroups setlogin setpcred \
        setproctitle setregid setreuid setrlimit \
        setsid setvbuf sigaction sigvec snprintf socketpair strerror \
        strlcat strlcpy strmode strnvis strtoul sysconf tcgetpgrp \
-        truncate updwtmpx utimes vhangup vsnprintf waitpid \
+        truncate unsetenv updwtmpx utimes vhangup vsnprintf waitpid \
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:6875: checking for $ac_func" >&5
+echo "$as_me:6932: 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 6881 "configure"
+#line 6938 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -6909,16 +6966,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6912: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6969: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:6915: \$? = $ac_status" >&5
+  echo "$as_me:6972: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6918: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6975: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:6921: \$? = $ac_status" >&5
+  echo "$as_me:6978: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -6928,7 +6985,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6931: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6988: 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
@@ -6943,13 +7000,13 @@ done
 for ac_func in gai_strerror
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:6946: checking for $ac_func" >&5
+echo "$as_me:7003: 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 6952 "configure"
+#line 7009 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -6980,16 +7037,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6983: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7040: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:6986: \$? = $ac_status" >&5
+  echo "$as_me:7043: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6989: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7046: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:6992: \$? = $ac_status" >&5
+  echo "$as_me:7049: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -6999,7 +7056,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7002: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:7059: 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
@@ -7011,7 +7068,7 @@ EOF
 EOF
        cat >conftest.$ac_ext <<_ACEOF
-#line 7014 "configure"
+#line 7071 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -7031,16 +7088,16 @@ str = gai_strerror(0);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7034: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7091: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:7037: \$? = $ac_status" >&5
+  echo "$as_me:7094: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7040: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7097: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7043: \$? = $ac_status" >&5
+  echo "$as_me:7100: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
 cat >>confdefs.h <<\EOF
@@ -7055,7 +7112,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 done
-echo "$as_me:7058: checking for library containing nanosleep" >&5
+echo "$as_me:7115: 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
@@ -7063,7 +7120,7 @@ else
  ac_func_search_save_LIBS=$LIBS
 ac_cv_search_nanosleep=no
 cat >conftest.$ac_ext <<_ACEOF
-#line 7066 "configure"
+#line 7123 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7082,16 +7139,16 @@ nanosleep ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7085: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7142: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:7088: \$? = $ac_status" >&5
+  echo "$as_me:7145: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7091: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7148: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7094: \$? = $ac_status" >&5
+  echo "$as_me:7151: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_search_nanosleep="none required"
 else
@@ -7103,7 +7160,7 @@ if test "$ac_cv_search_nanosleep" = no; then
  for ac_lib in rt posix4; do
    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
    cat >conftest.$ac_ext <<_ACEOF
-#line 7106 "configure"
+#line 7163 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7122,16 +7179,16 @@ nanosleep ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7125: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7182: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:7128: \$? = $ac_status" >&5
+  echo "$as_me:7185: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7131: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7188: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7134: \$? = $ac_status" >&5
+  echo "$as_me:7191: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_search_nanosleep="-l$ac_lib"
 break
@@ -7144,7 +7201,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:7147: result: $ac_cv_search_nanosleep" >&5
+echo "$as_me:7204: 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"
@@ -7154,13 +7211,13 @@ EOF
 fi
-echo "$as_me:7157: checking for ANSI C header files" >&5
+echo "$as_me:7214: 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 7163 "configure"
+#line 7220 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -7168,13 +7225,13 @@ else
 #include <float.h>
 _ACEOF
-if { (eval echo "$as_me:7171: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7228: \"$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:7177: \$? = $ac_status" >&5
+  echo "$as_me:7234: \$? = $ac_status" >&5
  (exit $ac_status); } >/dev/null; then
  if test -s conftest.err; then
    ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7196,7 +7253,7 @@ rm -f conftest.err conftest.$ac_ext
 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 7199 "configure"
+#line 7256 "configure"
 #include "confdefs.h"
 #include <string.h>
@@ -7214,7 +7271,7 @@ fi
 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 7217 "configure"
+#line 7274 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
@@ -7235,7 +7292,7 @@ if test $ac_cv_header_stdc = yes; then
  :
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 7238 "configure"
+#line 7295 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -7261,15 +7318,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:7264: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7321: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:7267: \$? = $ac_status" >&5
+  echo "$as_me:7324: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:7269: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7326: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7272: \$? = $ac_status" >&5
+  echo "$as_me:7329: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  :
 else
@@ -7282,7 +7339,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:7285: result: $ac_cv_header_stdc" >&5
+echo "$as_me:7342: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
@@ -7298,28 +7355,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                  inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:7301: checking for $ac_header" >&5
+echo "$as_me:7358: 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 7307 "configure"
+#line 7364 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7313: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7370: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:7316: \$? = $ac_status" >&5
+  echo "$as_me:7373: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7319: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7376: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7322: \$? = $ac_status" >&5
+  echo "$as_me:7379: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_Header=yes"
 else
@@ -7329,7 +7386,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:7332: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:7389: 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
@@ -7339,13 +7396,13 @@ EOF
 fi
 done
-echo "$as_me:7342: checking whether strsep is declared" >&5
+echo "$as_me:7399: 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 7348 "configure"
+#line 7405 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -7360,16 +7417,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7363: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7420: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:7366: \$? = $ac_status" >&5
+  echo "$as_me:7423: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7369: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7426: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7372: \$? = $ac_status" >&5
+  echo "$as_me:7429: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_have_decl_strsep=yes
 else
@@ -7379,20 +7436,20 @@ ac_cv_have_decl_strsep=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:7382: result: $ac_cv_have_decl_strsep" >&5
+echo "$as_me:7439: 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:7389: checking for $ac_func" >&5
+echo "$as_me:7446: 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 7395 "configure"
+#line 7452 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -7423,16 +7480,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7426: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7483: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:7429: \$? = $ac_status" >&5
+  echo "$as_me:7486: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7432: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7489: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7435: \$? = $ac_status" >&5
+  echo "$as_me:7492: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -7442,7 +7499,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7445: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:7502: 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
@@ -7454,13 +7511,13 @@ done
 fi
-echo "$as_me:7457: checking whether getrusage is declared" >&5
+echo "$as_me:7514: 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 7463 "configure"
+#line 7520 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -7475,16 +7532,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7478: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7535: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:7481: \$? = $ac_status" >&5
+  echo "$as_me:7538: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7484: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7541: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7487: \$? = $ac_status" >&5
+  echo "$as_me:7544: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_have_decl_getrusage=yes
 else
@@ -7494,20 +7551,20 @@ ac_cv_have_decl_getrusage=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:7497: result: $ac_cv_have_decl_getrusage" >&5
+echo "$as_me:7554: 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:7504: checking for $ac_func" >&5
+echo "$as_me:7561: 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 7510 "configure"
+#line 7567 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -7538,16 +7595,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7541: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7598: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:7544: \$? = $ac_status" >&5
+  echo "$as_me:7601: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7547: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7604: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7550: \$? = $ac_status" >&5
+  echo "$as_me:7607: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -7557,7 +7614,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7560: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:7617: 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
@@ -7569,13 +7626,13 @@ done
 fi
-echo "$as_me:7572: checking whether tcsendbreak is declared" >&5
+echo "$as_me:7629: 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 7578 "configure"
+#line 7635 "configure"
 #include "confdefs.h"
 #include <termios.h>
@@ -7591,16 +7648,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7594: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7651: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:7597: \$? = $ac_status" >&5
+  echo "$as_me:7654: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7600: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7657: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7603: \$? = $ac_status" >&5
+  echo "$as_me:7660: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_have_decl_tcsendbreak=yes
 else
@@ -7610,7 +7667,7 @@ ac_cv_have_decl_tcsendbreak=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:7613: result: $ac_cv_have_decl_tcsendbreak" >&5
+echo "$as_me:7670: 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
@@ -7622,13 +7679,13 @@ else
 for ac_func in tcsendbreak
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:7625: checking for $ac_func" >&5
+echo "$as_me:7682: 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 7631 "configure"
+#line 7688 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -7659,16 +7716,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7662: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7719: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:7665: \$? = $ac_status" >&5
+  echo "$as_me:7722: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7668: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7725: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7671: \$? = $ac_status" >&5
+  echo "$as_me:7728: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -7678,7 +7735,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7681: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:7738: 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
@@ -7693,13 +7750,13 @@ fi
 for ac_func in setresuid
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:7696: checking for $ac_func" >&5
+echo "$as_me:7753: 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 7702 "configure"
+#line 7759 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -7730,16 +7787,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7733: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7790: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:7736: \$? = $ac_status" >&5
+  echo "$as_me:7793: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7739: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7796: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7742: \$? = $ac_status" >&5
+  echo "$as_me:7799: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -7749,22 +7806,22 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7752: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:7809: 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:7759: checking if setresuid seems to work" >&5
+                echo "$as_me:7816: 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:7762: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:7819: 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 7767 "configure"
+#line 7824 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
@@ -7773,17 +7830,17 @@ int main(){errno=0; setresuid(0,0,0); if (errno==ENOSYS) exit(1); else exit(0);}
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:7776: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7833: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:7779: \$? = $ac_status" >&5
+  echo "$as_me:7836: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:7781: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7838: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7784: \$? = $ac_status" >&5
+  echo "$as_me:7841: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-  echo "$as_me:7786: result: yes" >&5
+  echo "$as_me:7843: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
  echo "$as_me: program exited with status $ac_status" >&5
@@ -7793,7 +7850,7 @@ cat >>confdefs.h <<\EOF
 #define BROKEN_SETRESUID 1
 EOF
-                 echo "$as_me:7796: result: not implemented" >&5
+                 echo "$as_me:7853: result: not implemented" >&5
 echo "${ECHO_T}not implemented" >&6
 fi
@@ -7806,13 +7863,13 @@ done
 for ac_func in setresgid
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:7809: checking for $ac_func" >&5
+echo "$as_me:7866: 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 7815 "configure"
+#line 7872 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -7843,16 +7900,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7846: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7903: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:7849: \$? = $ac_status" >&5
+  echo "$as_me:7906: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7852: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7909: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7855: \$? = $ac_status" >&5
+  echo "$as_me:7912: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -7862,22 +7919,22 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7865: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:7922: 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:7872: checking if setresgid seems to work" >&5
+                echo "$as_me:7929: 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:7875: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:7932: 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 7880 "configure"
+#line 7937 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
@@ -7886,17 +7943,17 @@ int main(){errno=0; setresgid(0,0,0); if (errno==ENOSYS) exit(1); else exit(0);}
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:7889: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7946: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:7892: \$? = $ac_status" >&5
+  echo "$as_me:7949: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:7894: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7951: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7897: \$? = $ac_status" >&5
+  echo "$as_me:7954: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-  echo "$as_me:7899: result: yes" >&5
+  echo "$as_me:7956: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
  echo "$as_me: program exited with status $ac_status" >&5
@@ -7906,7 +7963,7 @@ cat >>confdefs.h <<\EOF
 #define BROKEN_SETRESGID 1
 EOF
-                 echo "$as_me:7909: result: not implemented" >&5
+                 echo "$as_me:7966: result: not implemented" >&5
 echo "${ECHO_T}not implemented" >&6
 fi
@@ -7919,13 +7976,13 @@ done
 for ac_func in gettimeofday time
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:7922: checking for $ac_func" >&5
+echo "$as_me:7979: 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 7928 "configure"
+#line 7985 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -7956,16 +8013,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7959: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8016: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:7962: \$? = $ac_status" >&5
+  echo "$as_me:8019: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7965: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8022: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7968: \$? = $ac_status" >&5
+  echo "$as_me:8025: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -7975,7 +8032,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7978: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8035: 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
@@ -7988,13 +8045,13 @@ done
 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:7991: checking for $ac_func" >&5
+echo "$as_me:8048: 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 7997 "configure"
+#line 8054 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -8025,16 +8082,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8028: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8085: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:8031: \$? = $ac_status" >&5
+  echo "$as_me:8088: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8034: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8091: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:8037: \$? = $ac_status" >&5
+  echo "$as_me:8094: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -8044,7 +8101,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8047: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8104: 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
@@ -8057,13 +8114,13 @@ done
 for ac_func in utmpname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8060: checking for $ac_func" >&5
+echo "$as_me:8117: 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 8066 "configure"
+#line 8123 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -8094,16 +8151,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8097: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8154: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:8100: \$? = $ac_status" >&5
+  echo "$as_me:8157: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8103: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8160: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:8106: \$? = $ac_status" >&5
+  echo "$as_me:8163: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -8113,7 +8170,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8116: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8173: 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
@@ -8126,13 +8183,13 @@ done
 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:8129: checking for $ac_func" >&5
+echo "$as_me:8186: 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 8135 "configure"
+#line 8192 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -8163,16 +8220,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8166: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8223: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:8169: \$? = $ac_status" >&5
+  echo "$as_me:8226: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8172: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8229: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:8175: \$? = $ac_status" >&5
+  echo "$as_me:8232: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -8182,7 +8239,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8185: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8242: 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
@@ -8195,13 +8252,13 @@ done
 for ac_func in setutxent utmpxname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8198: checking for $ac_func" >&5
+echo "$as_me:8255: 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 8204 "configure"
+#line 8261 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -8232,16 +8289,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8235: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8292: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:8238: \$? = $ac_status" >&5
+  echo "$as_me:8295: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8241: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8298: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:8244: \$? = $ac_status" >&5
+  echo "$as_me:8301: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -8251,7 +8308,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8254: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8311: 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
@@ -8261,13 +8318,13 @@ EOF
 fi
 done
-echo "$as_me:8264: checking for daemon" >&5
+echo "$as_me:8321: 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 8270 "configure"
+#line 8327 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char daemon (); below.  */
@@ -8298,16 +8355,16 @@ f = daemon;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8301: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8358: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:8304: \$? = $ac_status" >&5
+  echo "$as_me:8361: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8307: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8364: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:8310: \$? = $ac_status" >&5
+  echo "$as_me:8367: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_func_daemon=yes
 else
@@ -8317,7 +8374,7 @@ ac_cv_func_daemon=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8320: result: $ac_cv_func_daemon" >&5
+echo "$as_me:8377: 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
@@ -8325,7 +8382,7 @@ if test $ac_cv_func_daemon = yes; then
 EOF
 else
-  echo "$as_me:8328: checking for daemon in -lbsd" >&5
+  echo "$as_me:8385: 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
@@ -8333,7 +8390,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8336 "configure"
+#line 8393 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8352,16 +8409,16 @@ daemon ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8355: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8412: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:8358: \$? = $ac_status" >&5
+  echo "$as_me:8415: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8361: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8418: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:8364: \$? = $ac_status" >&5
+  echo "$as_me:8421: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_bsd_daemon=yes
 else
@@ -8372,7 +8429,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8375: result: $ac_cv_lib_bsd_daemon" >&5
+echo "$as_me:8432: 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
@@ -8383,13 +8440,13 @@ fi
 fi
-echo "$as_me:8386: checking for getpagesize" >&5
+echo "$as_me:8443: 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 8392 "configure"
+#line 8449 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char getpagesize (); below.  */
@@ -8420,16 +8477,16 @@ f = getpagesize;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8423: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8480: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:8426: \$? = $ac_status" >&5
+  echo "$as_me:8483: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8429: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8486: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:8432: \$? = $ac_status" >&5
+  echo "$as_me:8489: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_func_getpagesize=yes
 else
@@ -8439,7 +8496,7 @@ ac_cv_func_getpagesize=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8442: result: $ac_cv_func_getpagesize" >&5
+echo "$as_me:8499: 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
@@ -8447,7 +8504,7 @@ if test $ac_cv_func_getpagesize = yes; then
 EOF
 else
-  echo "$as_me:8450: checking for getpagesize in -lucb" >&5
+  echo "$as_me:8507: 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
@@ -8455,7 +8512,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lucb  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8458 "configure"
+#line 8515 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8474,16 +8531,16 @@ getpagesize ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8477: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8534: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:8480: \$? = $ac_status" >&5
+  echo "$as_me:8537: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8483: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8540: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:8486: \$? = $ac_status" >&5
+  echo "$as_me:8543: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_ucb_getpagesize=yes
 else
@@ -8494,7 +8551,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8497: result: $ac_cv_lib_ucb_getpagesize" >&5
+echo "$as_me:8554: 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
@@ -8507,15 +8564,15 @@ fi
 # Check for broken snprintf
 if test "x$ac_cv_func_snprintf" = "xyes" ; then
-        echo "$as_me:8510: checking whether snprintf correctly terminates long strings" >&5
+        echo "$as_me:8567: 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:8513: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:8570: 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 8518 "configure"
+#line 8575 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -8523,30 +8580,30 @@ int main(void){char b[5];snprintf(b,5,"123456789");exit(b[4]!='\0');}
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8526: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8583: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:8529: \$? = $ac_status" >&5
+  echo "$as_me:8586: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8531: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8588: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:8534: \$? = $ac_status" >&5
+  echo "$as_me:8591: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-  echo "$as_me:8536: result: yes" >&5
+  echo "$as_me:8593: 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:8543: result: no" >&5
+                        echo "$as_me:8600: result: no" >&5
 echo "${ECHO_T}no" >&6
                        cat >>confdefs.h <<\EOF
 #define BROKEN_SNPRINTF 1
 EOF
-                        { echo "$as_me:8549: WARNING: ****** Your snprintf() function is broken, complain to your vendor" >&5
+                        { echo "$as_me:8606: 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
@@ -8555,11 +8612,11 @@ fi
 fi
 if test "x$ac_cv_func_mkdtemp" = "xyes" ; then
-echo "$as_me:8558: checking for (overly) strict mkstemp" >&5
+echo "$as_me:8615: 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:8562: result: yes" >&5
+                echo "$as_me:8619: result: yes" >&5
 echo "${ECHO_T}yes" >&6
                cat >>confdefs.h <<\EOF
 #define HAVE_STRICT_MKSTEMP 1
@@ -8567,7 +8624,7 @@ EOF
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 8570 "configure"
+#line 8627 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
@@ -8579,18 +8636,18 @@ unlink(template); exit(0);
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8582: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8639: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:8585: \$? = $ac_status" >&5
+  echo "$as_me:8642: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8587: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8644: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:8590: \$? = $ac_status" >&5
+  echo "$as_me:8647: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-                echo "$as_me:8593: result: no" >&5
+                echo "$as_me:8650: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
@@ -8598,7 +8655,7 @@ else
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-                echo "$as_me:8601: result: yes" >&5
+                echo "$as_me:8658: result: yes" >&5
 echo "${ECHO_T}yes" >&6
                cat >>confdefs.h <<\EOF
 #define HAVE_STRICT_MKSTEMP 1
@@ -8610,15 +8667,15 @@ fi
 fi
 if test ! -z "$check_for_openpty_ctty_bug"; then
-        echo "$as_me:8613: checking if openpty correctly handles controlling tty" >&5
+        echo "$as_me:8670: 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:8616: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:8673: 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 8621 "configure"
+#line 8678 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -8655,18 +8712,18 @@ main()
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8658: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8715: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:8661: \$? = $ac_status" >&5
+  echo "$as_me:8718: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8663: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8720: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:8666: \$? = $ac_status" >&5
+  echo "$as_me:8723: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-                        echo "$as_me:8669: result: yes" >&5
+                        echo "$as_me:8726: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
@@ -8674,7 +8731,7 @@ else
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-                        echo "$as_me:8677: result: no" >&5
+                        echo "$as_me:8734: result: no" >&5
 echo "${ECHO_T}no" >&6
                        cat >>confdefs.h <<\EOF
 #define SSHD_ACQUIRES_CTTY 1
@@ -8685,14 +8742,112 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:8688: checking whether getpgrp takes no argument" >&5
+if test "x$ac_cv_func_getaddrinfo" = "xyes" -a "x$check_for_hpux_broken_getaddrinfo" = "x1"; then
+        echo "$as_me:8746: 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:8749: 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 8754 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <errno.h>
+#include <netinet/in.h>
+#define TEST_PORT "2222"
+int
+main(void)
+{
+        int err, sock;
+        struct addrinfo *gai_ai, *ai, hints;
+        char ntop[NI_MAXHOST], strport[NI_MAXSERV], *name = NULL;
+        memset(&hints, 0, sizeof(hints));
+        hints.ai_family = PF_UNSPEC;
+        hints.ai_socktype = SOCK_STREAM;
+        hints.ai_flags = AI_PASSIVE;
+        err = getaddrinfo(name, TEST_PORT, &hints, &gai_ai);
+        if (err != 0) {
+                fprintf(stderr, "getaddrinfo failed (%s)", gai_strerror(err));
+                exit(1);
+        }
+        for (ai = gai_ai; ai != NULL; ai = ai->ai_next) {
+                if (ai->ai_family != AF_INET6)
+                        continue;
+                err = getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop,
+                    sizeof(ntop), strport, sizeof(strport),
+                    NI_NUMERICHOST|NI_NUMERICSERV);
+                if (err != 0) {
+                        if (err == EAI_SYSTEM)
+                                perror("getnameinfo EAI_SYSTEM");
+                        else
+                                fprintf(stderr, "getnameinfo failed: %s\n",
+                                    gai_strerror(err));
+                        exit(2);
+                }
+                sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+                if (sock < 0)
+                        perror("socket");
+                if (bind(sock, ai->ai_addr, ai->ai_addrlen) < 0) {
+                        if (errno == EBADF)
+                                exit(3);
+                }
+        }
+        exit(0);
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:8813: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8816: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:8818: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8821: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+                        echo "$as_me:8824: 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:8832: result: no" >&5
+echo "${ECHO_T}no" >&6
+                        cat >>confdefs.h <<\EOF
+#define BROKEN_GETADDRINFO 1
+EOF
+fi
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+echo "$as_me:8843: 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 8695 "configure"
+#line 8850 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8704,16 +8859,16 @@ getpgrp (0);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8707: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8862: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:8710: \$? = $ac_status" >&5
+  echo "$as_me:8865: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8713: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8868: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:8716: \$? = $ac_status" >&5
+  echo "$as_me:8871: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_func_getpgrp_1=yes
 else
@@ -8724,7 +8879,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 # Use it with no arg.
 cat >conftest.$ac_ext <<_ACEOF
-#line 8727 "configure"
+#line 8882 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8736,16 +8891,16 @@ getpgrp ();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8739: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8894: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:8742: \$? = $ac_status" >&5
+  echo "$as_me:8897: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8745: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8900: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:8748: \$? = $ac_status" >&5
+  echo "$as_me:8903: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_func_getpgrp_0=yes
 else
@@ -8759,12 +8914,12 @@ case $ac_func_getpgrp_0:$ac_func_getpgrp_1 in
  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:8762: error: cannot check getpgrp if cross compiling" >&5
+  { { echo "$as_me:8917: 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 8767 "configure"
+#line 8922 "configure"
 #include "confdefs.h"
 $ac_includes_default
@@ -8818,15 +8973,15 @@ main ()
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8821: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8976: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:8824: \$? = $ac_status" >&5
+  echo "$as_me:8979: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8826: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8981: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:8829: \$? = $ac_status" >&5
+  echo "$as_me:8984: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_func_getpgrp_void=yes
 else
@@ -8840,7 +8995,7 @@ fi;;
 esac # $ac_func_getpgrp_0:$ac_func_getpgrp_1
 fi
-echo "$as_me:8843: result: $ac_cv_func_getpgrp_void" >&5
+echo "$as_me:8998: 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
@@ -8860,12 +9015,12 @@ if test "${with_pam+set}" = set; then
                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:8863: error: PAM headers not found" >&5
+                                { { echo "$as_me:9018: error: PAM headers not found" >&5
 echo "$as_me: error: PAM headers not found" >&2;}
   { (exit 1); exit 1; }; }
                        fi
-echo "$as_me:8868: checking for dlopen in -ldl" >&5
+echo "$as_me:9023: 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
@@ -8873,7 +9028,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8876 "configure"
+#line 9031 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8892,16 +9047,16 @@ dlopen ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8895: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9050: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:8898: \$? = $ac_status" >&5
+  echo "$as_me:9053: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8901: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9056: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:8904: \$? = $ac_status" >&5
+  echo "$as_me:9059: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_dl_dlopen=yes
 else
@@ -8912,7 +9067,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8915: result: $ac_cv_lib_dl_dlopen" >&5
+echo "$as_me:9070: 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
@@ -8923,7 +9078,7 @@ EOF
 fi
-echo "$as_me:8926: checking for pam_set_item in -lpam" >&5
+echo "$as_me:9081: 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
@@ -8931,7 +9086,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpam  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8934 "configure"
+#line 9089 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8950,16 +9105,16 @@ pam_set_item ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8953: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9108: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:8956: \$? = $ac_status" >&5
+  echo "$as_me:9111: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8959: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9114: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:8962: \$? = $ac_status" >&5
+  echo "$as_me:9117: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_pam_pam_set_item=yes
 else
@@ -8970,7 +9125,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8973: result: $ac_cv_lib_pam_pam_set_item" >&5
+echo "$as_me:9128: 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
@@ -8980,7 +9135,7 @@ EOF
  LIBS="-lpam $LIBS"
 else
-  { { echo "$as_me:8983: error: *** libpam missing" >&5
+  { { echo "$as_me:9138: error: *** libpam missing" >&5
 echo "$as_me: error: *** libpam missing" >&2;}
   { (exit 1); exit 1; }; }
 fi
@@ -8988,13 +9143,13 @@ fi
 for ac_func in pam_getenvlist
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8991: checking for $ac_func" >&5
+echo "$as_me:9146: 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 8997 "configure"
+#line 9152 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -9025,16 +9180,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9028: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9183: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:9031: \$? = $ac_status" >&5
+  echo "$as_me:9186: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9034: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9189: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:9037: \$? = $ac_status" >&5
+  echo "$as_me:9192: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -9044,7 +9199,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9047: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:9202: 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
@@ -9057,13 +9212,13 @@ done
 for ac_func in pam_putenv
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:9060: checking for $ac_func" >&5
+echo "$as_me:9215: 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 9066 "configure"
+#line 9221 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -9094,16 +9249,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9097: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9252: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:9100: \$? = $ac_status" >&5
+  echo "$as_me:9255: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9103: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9258: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:9106: \$? = $ac_status" >&5
+  echo "$as_me:9261: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -9113,7 +9268,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9116: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:9271: 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
@@ -9142,10 +9297,10 @@ fi;
 # Check for older PAM
 if test "x$PAM_MSG" = "xyes" ; then
        # Check PAM strerror arguments (old PAM)
-        echo "$as_me:9145: checking whether pam_strerror takes only one argument" >&5
+        echo "$as_me:9300: 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 9148 "configure"
+#line 9303 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
@@ -9164,18 +9319,18 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9167: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9322: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:9170: \$? = $ac_status" >&5
+  echo "$as_me:9325: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9173: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9328: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:9176: \$? = $ac_status" >&5
+  echo "$as_me:9331: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-  echo "$as_me:9178: result: no" >&5
+  echo "$as_me:9333: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
  echo "$as_me: failed program was:" >&5
@@ -9185,7 +9340,7 @@ cat conftest.$ac_ext >&5
 #define HAVE_OLD_PAM 1
 EOF
-                        echo "$as_me:9188: result: yes" >&5
+                        echo "$as_me:9343: result: yes" >&5
 echo "${ECHO_T}yes" >&6
                        PAM_MSG="yes (old library)"
@@ -9225,7 +9380,7 @@ if test "${with_ssl_dir+set}" = set; then
 fi;
 LIBS="-lcrypto $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9228 "configure"
+#line 9383 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9244,16 +9399,16 @@ RAND_add ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9247: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9402: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:9250: \$? = $ac_status" >&5
+  echo "$as_me:9405: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9253: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9408: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:9256: \$? = $ac_status" >&5
+  echo "$as_me:9411: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  cat >>confdefs.h <<\EOF
 #define HAVE_OPENSSL 1
@@ -9270,7 +9425,7 @@ cat conftest.$ac_ext >&5
                fi
                CPPFLAGS="-I/usr/local/ssl/include ${saved_CPPFLAGS}"
                cat >conftest.$ac_ext <<_ACEOF
-#line 9273 "configure"
+#line 9428 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9289,16 +9444,16 @@ RAND_add ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9292: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9447: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:9295: \$? = $ac_status" >&5
+  echo "$as_me:9450: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9298: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9453: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:9301: \$? = $ac_status" >&5
+  echo "$as_me:9456: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  cat >>confdefs.h <<\EOF
 #define HAVE_OPENSSL 1
@@ -9308,7 +9463,7 @@ else
  echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-                                { { echo "$as_me:9311: error: *** Can't find recent OpenSSL libcrypto (see config.log for details) ***" >&5
+                                { { echo "$as_me:9466: 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; }; }
@@ -9319,15 +9474,15 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 # Determine OpenSSL header version
-echo "$as_me:9322: checking OpenSSL header version" >&5
+echo "$as_me:9477: checking OpenSSL header version" >&5
 echo $ECHO_N "checking OpenSSL header version... $ECHO_C" >&6
 if test "$cross_compiling" = yes; then
-  { { echo "$as_me:9325: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:9480: 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 9330 "configure"
+#line 9485 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -9350,19 +9505,19 @@ int main(void) {
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:9353: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9508: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:9356: \$? = $ac_status" >&5
+  echo "$as_me:9511: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:9358: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9513: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:9361: \$? = $ac_status" >&5
+  echo "$as_me:9516: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
                ssl_header_ver=`cat conftest.sslincver`
-                echo "$as_me:9365: result: $ssl_header_ver" >&5
+                echo "$as_me:9520: result: $ssl_header_ver" >&5
 echo "${ECHO_T}$ssl_header_ver" >&6
 else
@@ -9370,9 +9525,9 @@ else
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-                echo "$as_me:9373: result: not found" >&5
+                echo "$as_me:9528: result: not found" >&5
 echo "${ECHO_T}not found" >&6
-                { { echo "$as_me:9375: error: OpenSSL version header not found." >&5
+                { { echo "$as_me:9530: error: OpenSSL version header not found." >&5
 echo "$as_me: error: OpenSSL version header not found." >&2;}
   { (exit 1); exit 1; }; }
@@ -9381,15 +9536,15 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 # Determine OpenSSL library version
-echo "$as_me:9384: checking OpenSSL library version" >&5
+echo "$as_me:9539: checking OpenSSL library version" >&5
 echo $ECHO_N "checking OpenSSL library version... $ECHO_C" >&6
 if test "$cross_compiling" = yes; then
-  { { echo "$as_me:9387: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:9542: 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 9392 "configure"
+#line 9547 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -9413,19 +9568,19 @@ int main(void) {
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:9416: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9571: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:9419: \$? = $ac_status" >&5
+  echo "$as_me:9574: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:9421: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9576: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:9424: \$? = $ac_status" >&5
+  echo "$as_me:9579: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
                ssl_library_ver=`cat conftest.ssllibver`
-                echo "$as_me:9428: result: $ssl_library_ver" >&5
+                echo "$as_me:9583: result: $ssl_library_ver" >&5
 echo "${ECHO_T}$ssl_library_ver" >&6
 else
@@ -9433,9 +9588,9 @@ else
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-                echo "$as_me:9436: result: not found" >&5
+                echo "$as_me:9591: result: not found" >&5
 echo "${ECHO_T}not found" >&6
-                { { echo "$as_me:9438: error: OpenSSL library not found." >&5
+                { { echo "$as_me:9593: error: OpenSSL library not found." >&5
 echo "$as_me: error: OpenSSL library not found." >&2;}
   { (exit 1); exit 1; }; }
@@ -9444,15 +9599,15 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 # Sanity check OpenSSL headers
-echo "$as_me:9447: checking whether OpenSSL's headers match the library" >&5
+echo "$as_me:9602: 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:9450: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:9605: 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 9455 "configure"
+#line 9610 "configure"
 #include "confdefs.h"
 #include <string.h>
@@ -9461,18 +9616,18 @@ int main(void) { exit(SSLeay() == OPENSSL_VERSION_NUMBER ? 0 : 1); }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:9464: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9619: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:9467: \$? = $ac_status" >&5
+  echo "$as_me:9622: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:9469: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9624: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:9472: \$? = $ac_status" >&5
+  echo "$as_me:9627: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-                echo "$as_me:9475: result: yes" >&5
+                echo "$as_me:9630: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
@@ -9480,9 +9635,9 @@ else
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-                echo "$as_me:9483: result: no" >&5
+                echo "$as_me:9638: result: no" >&5
 echo "${ECHO_T}no" >&6
-                { { echo "$as_me:9485: error: Your OpenSSL headers do not match your library.
+                { { echo "$as_me:9640: 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.
@@ -9498,7 +9653,7 @@ fi
 # because the system crypt() is more featureful.
 if test "x$check_for_libcrypt_before" = "x1"; then
-echo "$as_me:9501: checking for crypt in -lcrypt" >&5
+echo "$as_me:9656: 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
@@ -9506,7 +9661,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypt  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9509 "configure"
+#line 9664 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9525,16 +9680,16 @@ crypt ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9528: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9683: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:9531: \$? = $ac_status" >&5
+  echo "$as_me:9686: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9534: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9689: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:9537: \$? = $ac_status" >&5
+  echo "$as_me:9692: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_crypt_crypt=yes
 else
@@ -9545,7 +9700,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9548: result: $ac_cv_lib_crypt_crypt" >&5
+echo "$as_me:9703: 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
@@ -9561,7 +9716,7 @@ fi
 # 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:9564: checking for crypt in -lcrypt" >&5
+        echo "$as_me:9719: 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
@@ -9569,7 +9724,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypt  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9572 "configure"
+#line 9727 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9588,16 +9743,16 @@ crypt ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9591: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9746: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:9594: \$? = $ac_status" >&5
+  echo "$as_me:9749: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9597: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9752: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:9600: \$? = $ac_status" >&5
+  echo "$as_me:9755: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_crypt_crypt=yes
 else
@@ -9608,7 +9763,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9611: result: $ac_cv_lib_crypt_crypt" >&5
+echo "$as_me:9766: 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"
@@ -9619,15 +9774,15 @@ fi
 ### Configure cryptographic random number support
 # Check wheter OpenSSL seeds itself
-echo "$as_me:9622: checking whether OpenSSL's PRNG is internally seeded" >&5
+echo "$as_me:9777: 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:9625: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:9780: 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 9630 "configure"
+#line 9785 "configure"
 #include "confdefs.h"
 #include <string.h>
@@ -9636,19 +9791,19 @@ int main(void) { exit(RAND_status() == 1 ? 0 : 1); }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:9639: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9794: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:9642: \$? = $ac_status" >&5
+  echo "$as_me:9797: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:9644: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9799: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:9647: \$? = $ac_status" >&5
+  echo "$as_me:9802: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
                OPENSSL_SEEDS_ITSELF=yes
-                echo "$as_me:9651: result: yes" >&5
+                echo "$as_me:9806: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
@@ -9656,7 +9811,7 @@ else
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-                echo "$as_me:9659: result: no" >&5
+                echo "$as_me:9814: result: no" >&5
 echo "${ECHO_T}no" >&6
                # Default to use of the rand helper if OpenSSL doesn't
                # seed itself
@@ -9676,7 +9831,7 @@ if test "${with_rand_helper+set}" = set; then
                        # 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:9679: WARNING: *** Forcing use of OpenSSL's non-self-seeding PRNG" >&5
+                                { echo "$as_me:9834: 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=""
@@ -9717,7 +9872,7 @@ if test "${with_prngd_port+set}" = set; then
                [0-9]*)
                        ;;
                *)
-                        { { echo "$as_me:9720: error: You must specify a numeric port number for --with-prngd-port" >&5
+                        { { echo "$as_me:9875: 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; }; }
                        ;;
@@ -9748,7 +9903,7 @@ if test "${with_prngd_socket+set}" = set; then
                /*)
                        ;;
                *)
-                        { { echo "$as_me:9751: error: You must specify an absolute path to the entropy socket" >&5
+                        { { echo "$as_me:9906: 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; }; }
                        ;;
@@ -9756,12 +9911,12 @@ echo "$as_me: error: You must specify an absolute path to the entropy socket" >&
                if test ! -z "$withval" ; then
                        if test ! -z "$PRNGD_PORT" ; then
-                                { { echo "$as_me:9759: error: You may not specify both a PRNGD/EGD port and socket" >&5
+                                { { echo "$as_me:9914: 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:9764: WARNING: Entropy socket is not readable" >&5
+                                { echo "$as_me:9919: WARNING: Entropy socket is not readable" >&5
 echo "$as_me: WARNING: Entropy socket is not readable" >&2;}
                        fi
                        PRNGD_SOCKET="$withval"
@@ -9775,7 +9930,7 @@ else
                # Check for existing socket only if we don't have a random device already
                if test "$USE_RAND_HELPER" = yes ; then
-                        echo "$as_me:9778: checking for PRNGD/EGD socket" >&5
+                        echo "$as_me:9933: 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
@@ -9789,10 +9944,10 @@ EOF
                                fi
                        done
                        if test ! -z "$PRNGD_SOCKET" ; then
-                                echo "$as_me:9792: result: $PRNGD_SOCKET" >&5
+                                echo "$as_me:9947: result: $PRNGD_SOCKET" >&5
 echo "${ECHO_T}$PRNGD_SOCKET" >&6
                        else
-                                echo "$as_me:9795: result: not found" >&5
+                                echo "$as_me:9950: result: not found" >&5
 echo "${ECHO_T}not found" >&6
                        fi
                fi
@@ -9848,7 +10003,7 @@ PATH=$PATH:/etc:$OPATH
        # Extract the first word of "ls", so it can be a program name with args.
 set dummy ls; ac_word=$2
-echo "$as_me:9851: checking for $ac_word" >&5
+echo "$as_me:10006: 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
@@ -9865,7 +10020,7 @@ for ac_dir in $ac_dummy; do
  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:9868: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10023: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -9876,10 +10031,10 @@ fi
 PROG_LS=$ac_cv_path_PROG_LS
 if test -n "$PROG_LS"; then
-  echo "$as_me:9879: result: $PROG_LS" >&5
+  echo "$as_me:10034: result: $PROG_LS" >&5
 echo "${ECHO_T}$PROG_LS" >&6
 else
-  echo "$as_me:9882: result: no" >&5
+  echo "$as_me:10037: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -9889,7 +10044,7 @@ fi
        # Extract the first word of "netstat", so it can be a program name with args.
 set dummy netstat; ac_word=$2
-echo "$as_me:9892: checking for $ac_word" >&5
+echo "$as_me:10047: 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
@@ -9906,7 +10061,7 @@ for ac_dir in $ac_dummy; do
  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:9909: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10064: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -9917,10 +10072,10 @@ fi
 PROG_NETSTAT=$ac_cv_path_PROG_NETSTAT
 if test -n "$PROG_NETSTAT"; then
-  echo "$as_me:9920: result: $PROG_NETSTAT" >&5
+  echo "$as_me:10075: result: $PROG_NETSTAT" >&5
 echo "${ECHO_T}$PROG_NETSTAT" >&6
 else
-  echo "$as_me:9923: result: no" >&5
+  echo "$as_me:10078: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -9930,7 +10085,7 @@ fi
        # Extract the first word of "arp", so it can be a program name with args.
 set dummy arp; ac_word=$2
-echo "$as_me:9933: checking for $ac_word" >&5
+echo "$as_me:10088: 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
@@ -9947,7 +10102,7 @@ for ac_dir in $ac_dummy; do
  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:9950: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10105: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -9958,10 +10113,10 @@ fi
 PROG_ARP=$ac_cv_path_PROG_ARP
 if test -n "$PROG_ARP"; then
-  echo "$as_me:9961: result: $PROG_ARP" >&5
+  echo "$as_me:10116: result: $PROG_ARP" >&5
 echo "${ECHO_T}$PROG_ARP" >&6
 else
-  echo "$as_me:9964: result: no" >&5
+  echo "$as_me:10119: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -9971,7 +10126,7 @@ fi
        # Extract the first word of "ifconfig", so it can be a program name with args.
 set dummy ifconfig; ac_word=$2
-echo "$as_me:9974: checking for $ac_word" >&5
+echo "$as_me:10129: 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
@@ -9988,7 +10143,7 @@ for ac_dir in $ac_dummy; do
  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:9991: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10146: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -9999,10 +10154,10 @@ fi
 PROG_IFCONFIG=$ac_cv_path_PROG_IFCONFIG
 if test -n "$PROG_IFCONFIG"; then
-  echo "$as_me:10002: result: $PROG_IFCONFIG" >&5
+  echo "$as_me:10157: result: $PROG_IFCONFIG" >&5
 echo "${ECHO_T}$PROG_IFCONFIG" >&6
 else
-  echo "$as_me:10005: result: no" >&5
+  echo "$as_me:10160: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -10012,7 +10167,7 @@ fi
        # Extract the first word of "jstat", so it can be a program name with args.
 set dummy jstat; ac_word=$2
-echo "$as_me:10015: checking for $ac_word" >&5
+echo "$as_me:10170: 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
@@ -10029,7 +10184,7 @@ for ac_dir in $ac_dummy; do
  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:10032: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10187: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -10040,10 +10195,10 @@ fi
 PROG_JSTAT=$ac_cv_path_PROG_JSTAT
 if test -n "$PROG_JSTAT"; then
-  echo "$as_me:10043: result: $PROG_JSTAT" >&5
+  echo "$as_me:10198: result: $PROG_JSTAT" >&5
 echo "${ECHO_T}$PROG_JSTAT" >&6
 else
-  echo "$as_me:10046: result: no" >&5
+  echo "$as_me:10201: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -10053,7 +10208,7 @@ fi
        # Extract the first word of "ps", so it can be a program name with args.
 set dummy ps; ac_word=$2
-echo "$as_me:10056: checking for $ac_word" >&5
+echo "$as_me:10211: 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
@@ -10070,7 +10225,7 @@ for ac_dir in $ac_dummy; do
  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:10073: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10228: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -10081,10 +10236,10 @@ fi
 PROG_PS=$ac_cv_path_PROG_PS
 if test -n "$PROG_PS"; then
-  echo "$as_me:10084: result: $PROG_PS" >&5
+  echo "$as_me:10239: result: $PROG_PS" >&5
 echo "${ECHO_T}$PROG_PS" >&6
 else
-  echo "$as_me:10087: result: no" >&5
+  echo "$as_me:10242: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -10094,7 +10249,7 @@ fi
        # Extract the first word of "sar", so it can be a program name with args.
 set dummy sar; ac_word=$2
-echo "$as_me:10097: checking for $ac_word" >&5
+echo "$as_me:10252: 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
@@ -10111,7 +10266,7 @@ for ac_dir in $ac_dummy; do
  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:10114: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10269: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -10122,10 +10277,10 @@ fi
 PROG_SAR=$ac_cv_path_PROG_SAR
 if test -n "$PROG_SAR"; then
-  echo "$as_me:10125: result: $PROG_SAR" >&5
+  echo "$as_me:10280: result: $PROG_SAR" >&5
 echo "${ECHO_T}$PROG_SAR" >&6
 else
-  echo "$as_me:10128: result: no" >&5
+  echo "$as_me:10283: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -10135,7 +10290,7 @@ fi
        # Extract the first word of "w", so it can be a program name with args.
 set dummy w; ac_word=$2
-echo "$as_me:10138: checking for $ac_word" >&5
+echo "$as_me:10293: 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
@@ -10152,7 +10307,7 @@ for ac_dir in $ac_dummy; do
  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:10155: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10310: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -10163,10 +10318,10 @@ fi
 PROG_W=$ac_cv_path_PROG_W
 if test -n "$PROG_W"; then
-  echo "$as_me:10166: result: $PROG_W" >&5
+  echo "$as_me:10321: result: $PROG_W" >&5
 echo "${ECHO_T}$PROG_W" >&6
 else
-  echo "$as_me:10169: result: no" >&5
+  echo "$as_me:10324: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -10176,7 +10331,7 @@ fi
        # Extract the first word of "who", so it can be a program name with args.
 set dummy who; ac_word=$2
-echo "$as_me:10179: checking for $ac_word" >&5
+echo "$as_me:10334: 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
@@ -10193,7 +10348,7 @@ for ac_dir in $ac_dummy; do
  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:10196: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10351: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -10204,10 +10359,10 @@ fi
 PROG_WHO=$ac_cv_path_PROG_WHO
 if test -n "$PROG_WHO"; then
-  echo "$as_me:10207: result: $PROG_WHO" >&5
+  echo "$as_me:10362: result: $PROG_WHO" >&5
 echo "${ECHO_T}$PROG_WHO" >&6
 else
-  echo "$as_me:10210: result: no" >&5
+  echo "$as_me:10365: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -10217,7 +10372,7 @@ fi
        # Extract the first word of "last", so it can be a program name with args.
 set dummy last; ac_word=$2
-echo "$as_me:10220: checking for $ac_word" >&5
+echo "$as_me:10375: 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
@@ -10234,7 +10389,7 @@ for ac_dir in $ac_dummy; do
  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:10237: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10392: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -10245,10 +10400,10 @@ fi
 PROG_LAST=$ac_cv_path_PROG_LAST
 if test -n "$PROG_LAST"; then
-  echo "$as_me:10248: result: $PROG_LAST" >&5
+  echo "$as_me:10403: result: $PROG_LAST" >&5
 echo "${ECHO_T}$PROG_LAST" >&6
 else
-  echo "$as_me:10251: result: no" >&5
+  echo "$as_me:10406: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -10258,7 +10413,7 @@ fi
        # Extract the first word of "lastlog", so it can be a program name with args.
 set dummy lastlog; ac_word=$2
-echo "$as_me:10261: checking for $ac_word" >&5
+echo "$as_me:10416: 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
@@ -10275,7 +10430,7 @@ for ac_dir in $ac_dummy; do
  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:10278: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10433: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -10286,10 +10441,10 @@ fi
 PROG_LASTLOG=$ac_cv_path_PROG_LASTLOG
 if test -n "$PROG_LASTLOG"; then
-  echo "$as_me:10289: result: $PROG_LASTLOG" >&5
+  echo "$as_me:10444: result: $PROG_LASTLOG" >&5
 echo "${ECHO_T}$PROG_LASTLOG" >&6
 else
-  echo "$as_me:10292: result: no" >&5
+  echo "$as_me:10447: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -10299,7 +10454,7 @@ fi
        # Extract the first word of "df", so it can be a program name with args.
 set dummy df; ac_word=$2
-echo "$as_me:10302: checking for $ac_word" >&5
+echo "$as_me:10457: 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
@@ -10316,7 +10471,7 @@ for ac_dir in $ac_dummy; do
  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:10319: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10474: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -10327,10 +10482,10 @@ fi
 PROG_DF=$ac_cv_path_PROG_DF
 if test -n "$PROG_DF"; then
-  echo "$as_me:10330: result: $PROG_DF" >&5
+  echo "$as_me:10485: result: $PROG_DF" >&5
 echo "${ECHO_T}$PROG_DF" >&6
 else
-  echo "$as_me:10333: result: no" >&5
+  echo "$as_me:10488: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -10340,7 +10495,7 @@ fi
        # Extract the first word of "vmstat", so it can be a program name with args.
 set dummy vmstat; ac_word=$2
-echo "$as_me:10343: checking for $ac_word" >&5
+echo "$as_me:10498: 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
@@ -10357,7 +10512,7 @@ for ac_dir in $ac_dummy; do
  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:10360: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10515: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -10368,10 +10523,10 @@ fi
 PROG_VMSTAT=$ac_cv_path_PROG_VMSTAT
 if test -n "$PROG_VMSTAT"; then
-  echo "$as_me:10371: result: $PROG_VMSTAT" >&5
+  echo "$as_me:10526: result: $PROG_VMSTAT" >&5
 echo "${ECHO_T}$PROG_VMSTAT" >&6
 else
-  echo "$as_me:10374: result: no" >&5
+  echo "$as_me:10529: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -10381,7 +10536,7 @@ fi
        # Extract the first word of "uptime", so it can be a program name with args.
 set dummy uptime; ac_word=$2
-echo "$as_me:10384: checking for $ac_word" >&5
+echo "$as_me:10539: 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
@@ -10398,7 +10553,7 @@ for ac_dir in $ac_dummy; do
  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:10401: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10556: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -10409,10 +10564,10 @@ fi
 PROG_UPTIME=$ac_cv_path_PROG_UPTIME
 if test -n "$PROG_UPTIME"; then
-  echo "$as_me:10412: result: $PROG_UPTIME" >&5
+  echo "$as_me:10567: result: $PROG_UPTIME" >&5
 echo "${ECHO_T}$PROG_UPTIME" >&6
 else
-  echo "$as_me:10415: result: no" >&5
+  echo "$as_me:10570: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -10422,7 +10577,7 @@ fi
        # Extract the first word of "ipcs", so it can be a program name with args.
 set dummy ipcs; ac_word=$2
-echo "$as_me:10425: checking for $ac_word" >&5
+echo "$as_me:10580: 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
@@ -10439,7 +10594,7 @@ for ac_dir in $ac_dummy; do
  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:10442: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10597: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -10450,10 +10605,10 @@ fi
 PROG_IPCS=$ac_cv_path_PROG_IPCS
 if test -n "$PROG_IPCS"; then
-  echo "$as_me:10453: result: $PROG_IPCS" >&5
+  echo "$as_me:10608: result: $PROG_IPCS" >&5
 echo "${ECHO_T}$PROG_IPCS" >&6
 else
-  echo "$as_me:10456: result: no" >&5
+  echo "$as_me:10611: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -10463,7 +10618,7 @@ fi
        # Extract the first word of "tail", so it can be a program name with args.
 set dummy tail; ac_word=$2
-echo "$as_me:10466: checking for $ac_word" >&5
+echo "$as_me:10621: 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
@@ -10480,7 +10635,7 @@ for ac_dir in $ac_dummy; do
  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:10483: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10638: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -10491,10 +10646,10 @@ fi
 PROG_TAIL=$ac_cv_path_PROG_TAIL
 if test -n "$PROG_TAIL"; then
-  echo "$as_me:10494: result: $PROG_TAIL" >&5
+  echo "$as_me:10649: result: $PROG_TAIL" >&5
 echo "${ECHO_T}$PROG_TAIL" >&6
 else
-  echo "$as_me:10497: result: no" >&5
+  echo "$as_me:10652: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -10525,13 +10680,13 @@ if test ! -z "$SONY" ; then
 fi
 # Checks for data types
-echo "$as_me:10528: checking for char" >&5
+echo "$as_me:10683: 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 10534 "configure"
+#line 10689 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10546,16 +10701,16 @@ if (sizeof (char))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10549: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10704: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:10552: \$? = $ac_status" >&5
+  echo "$as_me:10707: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10555: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10710: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10558: \$? = $ac_status" >&5
+  echo "$as_me:10713: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_type_char=yes
 else
@@ -10565,10 +10720,10 @@ ac_cv_type_char=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:10568: result: $ac_cv_type_char" >&5
+echo "$as_me:10723: result: $ac_cv_type_char" >&5
 echo "${ECHO_T}$ac_cv_type_char" >&6
-echo "$as_me:10571: checking size of char" >&5
+echo "$as_me:10726: 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
@@ -10577,7 +10732,7 @@ else
  if test "$cross_compiling" = yes; then
  # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 10580 "configure"
+#line 10735 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10589,21 +10744,21 @@ int _array_ [1 - 2 * !((sizeof (char)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10592: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10747: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:10595: \$? = $ac_status" >&5
+  echo "$as_me:10750: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10598: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10753: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10601: \$? = $ac_status" >&5
+  echo "$as_me:10756: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_lo=0 ac_mid=0
  while :; do
    cat >conftest.$ac_ext <<_ACEOF
-#line 10606 "configure"
+#line 10761 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10615,16 +10770,16 @@ int _array_ [1 - 2 * !((sizeof (char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10618: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10773: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:10621: \$? = $ac_status" >&5
+  echo "$as_me:10776: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10624: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10779: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10627: \$? = $ac_status" >&5
+  echo "$as_me:10782: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_hi=$ac_mid; break
 else
@@ -10640,7 +10795,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
  while :; do
    cat >conftest.$ac_ext <<_ACEOF
-#line 10643 "configure"
+#line 10798 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10652,16 +10807,16 @@ int _array_ [1 - 2 * !((sizeof (char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10655: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10810: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:10658: \$? = $ac_status" >&5
+  echo "$as_me:10813: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10661: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10816: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10664: \$? = $ac_status" >&5
+  echo "$as_me:10819: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_lo=$ac_mid; break
 else
@@ -10677,7 +10832,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 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 10680 "configure"
+#line 10835 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10689,16 +10844,16 @@ int _array_ [1 - 2 * !((sizeof (char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10692: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10847: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:10695: \$? = $ac_status" >&5
+  echo "$as_me:10850: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10698: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10853: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10701: \$? = $ac_status" >&5
+  echo "$as_me:10856: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_hi=$ac_mid
 else
@@ -10711,12 +10866,12 @@ done
 ac_cv_sizeof_char=$ac_lo
 else
  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:10714: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:10869: 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 10719 "configure"
+#line 10874 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10732,15 +10887,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10735: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10890: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:10738: \$? = $ac_status" >&5
+  echo "$as_me:10893: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:10740: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10895: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10743: \$? = $ac_status" >&5
+  echo "$as_me:10898: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_sizeof_char=`cat conftest.val`
 else
@@ -10756,19 +10911,19 @@ else
  ac_cv_sizeof_char=0
 fi
 fi
-echo "$as_me:10759: result: $ac_cv_sizeof_char" >&5
+echo "$as_me:10914: 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:10765: checking for short int" >&5
+echo "$as_me:10920: 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 10771 "configure"
+#line 10926 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10783,16 +10938,16 @@ if (sizeof (short int))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10786: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10941: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:10789: \$? = $ac_status" >&5
+  echo "$as_me:10944: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10792: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10947: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10795: \$? = $ac_status" >&5
+  echo "$as_me:10950: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_type_short_int=yes
 else
@@ -10802,10 +10957,10 @@ ac_cv_type_short_int=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:10805: result: $ac_cv_type_short_int" >&5
+echo "$as_me:10960: result: $ac_cv_type_short_int" >&5
 echo "${ECHO_T}$ac_cv_type_short_int" >&6
-echo "$as_me:10808: checking size of short int" >&5
+echo "$as_me:10963: 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
@@ -10814,7 +10969,7 @@ else
  if test "$cross_compiling" = yes; then
  # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 10817 "configure"
+#line 10972 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10826,21 +10981,21 @@ int _array_ [1 - 2 * !((sizeof (short int)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10829: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10984: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:10832: \$? = $ac_status" >&5
+  echo "$as_me:10987: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10835: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10990: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10838: \$? = $ac_status" >&5
+  echo "$as_me:10993: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_lo=0 ac_mid=0
  while :; do
    cat >conftest.$ac_ext <<_ACEOF
-#line 10843 "configure"
+#line 10998 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10852,16 +11007,16 @@ int _array_ [1 - 2 * !((sizeof (short int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10855: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11010: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:10858: \$? = $ac_status" >&5
+  echo "$as_me:11013: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10861: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11016: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10864: \$? = $ac_status" >&5
+  echo "$as_me:11019: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_hi=$ac_mid; break
 else
@@ -10877,7 +11032,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
  while :; do
    cat >conftest.$ac_ext <<_ACEOF
-#line 10880 "configure"
+#line 11035 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10889,16 +11044,16 @@ int _array_ [1 - 2 * !((sizeof (short int)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10892: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11047: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:10895: \$? = $ac_status" >&5
+  echo "$as_me:11050: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10898: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11053: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10901: \$? = $ac_status" >&5
+  echo "$as_me:11056: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_lo=$ac_mid; break
 else
@@ -10914,7 +11069,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 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 10917 "configure"
+#line 11072 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10926,16 +11081,16 @@ int _array_ [1 - 2 * !((sizeof (short int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10929: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11084: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:10932: \$? = $ac_status" >&5
+  echo "$as_me:11087: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10935: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11090: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10938: \$? = $ac_status" >&5
+  echo "$as_me:11093: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_hi=$ac_mid
 else
@@ -10948,12 +11103,12 @@ done
 ac_cv_sizeof_short_int=$ac_lo
 else
  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:10951: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:11106: 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 10956 "configure"
+#line 11111 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10969,15 +11124,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10972: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11127: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:10975: \$? = $ac_status" >&5
+  echo "$as_me:11130: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:10977: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11132: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10980: \$? = $ac_status" >&5
+  echo "$as_me:11135: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_sizeof_short_int=`cat conftest.val`
 else
@@ -10993,19 +11148,19 @@ else
  ac_cv_sizeof_short_int=0
 fi
 fi
-echo "$as_me:10996: result: $ac_cv_sizeof_short_int" >&5
+echo "$as_me:11151: 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:11002: checking for int" >&5
+echo "$as_me:11157: 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 11008 "configure"
+#line 11163 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11020,16 +11175,16 @@ if (sizeof (int))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11023: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11178: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11026: \$? = $ac_status" >&5
+  echo "$as_me:11181: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11029: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11184: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11032: \$? = $ac_status" >&5
+  echo "$as_me:11187: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_type_int=yes
 else
@@ -11039,10 +11194,10 @@ ac_cv_type_int=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11042: result: $ac_cv_type_int" >&5
+echo "$as_me:11197: result: $ac_cv_type_int" >&5
 echo "${ECHO_T}$ac_cv_type_int" >&6
-echo "$as_me:11045: checking size of int" >&5
+echo "$as_me:11200: 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
@@ -11051,7 +11206,7 @@ else
  if test "$cross_compiling" = yes; then
  # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 11054 "configure"
+#line 11209 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11063,21 +11218,21 @@ int _array_ [1 - 2 * !((sizeof (int)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11066: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11221: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11069: \$? = $ac_status" >&5
+  echo "$as_me:11224: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11072: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11227: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11075: \$? = $ac_status" >&5
+  echo "$as_me:11230: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_lo=0 ac_mid=0
  while :; do
    cat >conftest.$ac_ext <<_ACEOF
-#line 11080 "configure"
+#line 11235 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11089,16 +11244,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11092: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11247: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11095: \$? = $ac_status" >&5
+  echo "$as_me:11250: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11098: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11253: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11101: \$? = $ac_status" >&5
+  echo "$as_me:11256: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_hi=$ac_mid; break
 else
@@ -11114,7 +11269,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
  while :; do
    cat >conftest.$ac_ext <<_ACEOF
-#line 11117 "configure"
+#line 11272 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11126,16 +11281,16 @@ int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11129: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11284: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11132: \$? = $ac_status" >&5
+  echo "$as_me:11287: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11135: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11290: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11138: \$? = $ac_status" >&5
+  echo "$as_me:11293: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_lo=$ac_mid; break
 else
@@ -11151,7 +11306,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 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 11154 "configure"
+#line 11309 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11163,16 +11318,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11166: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11321: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11169: \$? = $ac_status" >&5
+  echo "$as_me:11324: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11172: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11327: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11175: \$? = $ac_status" >&5
+  echo "$as_me:11330: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_hi=$ac_mid
 else
@@ -11185,12 +11340,12 @@ done
 ac_cv_sizeof_int=$ac_lo
 else
  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:11188: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:11343: 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 11193 "configure"
+#line 11348 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11206,15 +11361,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11209: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11364: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:11212: \$? = $ac_status" >&5
+  echo "$as_me:11367: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11214: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11369: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11217: \$? = $ac_status" >&5
+  echo "$as_me:11372: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_sizeof_int=`cat conftest.val`
 else
@@ -11230,19 +11385,19 @@ else
  ac_cv_sizeof_int=0
 fi
 fi
-echo "$as_me:11233: result: $ac_cv_sizeof_int" >&5
+echo "$as_me:11388: 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:11239: checking for long int" >&5
+echo "$as_me:11394: 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 11245 "configure"
+#line 11400 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11257,16 +11412,16 @@ if (sizeof (long int))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11260: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11415: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11263: \$? = $ac_status" >&5
+  echo "$as_me:11418: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11266: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11421: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11269: \$? = $ac_status" >&5
+  echo "$as_me:11424: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_type_long_int=yes
 else
@@ -11276,10 +11431,10 @@ ac_cv_type_long_int=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11279: result: $ac_cv_type_long_int" >&5
+echo "$as_me:11434: result: $ac_cv_type_long_int" >&5
 echo "${ECHO_T}$ac_cv_type_long_int" >&6
-echo "$as_me:11282: checking size of long int" >&5
+echo "$as_me:11437: 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
@@ -11288,7 +11443,7 @@ else
  if test "$cross_compiling" = yes; then
  # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 11291 "configure"
+#line 11446 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11300,21 +11455,21 @@ int _array_ [1 - 2 * !((sizeof (long int)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11303: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11458: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11306: \$? = $ac_status" >&5
+  echo "$as_me:11461: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11309: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11464: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11312: \$? = $ac_status" >&5
+  echo "$as_me:11467: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_lo=0 ac_mid=0
  while :; do
    cat >conftest.$ac_ext <<_ACEOF
-#line 11317 "configure"
+#line 11472 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11326,16 +11481,16 @@ int _array_ [1 - 2 * !((sizeof (long int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11329: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11484: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11332: \$? = $ac_status" >&5
+  echo "$as_me:11487: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11335: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11490: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11338: \$? = $ac_status" >&5
+  echo "$as_me:11493: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_hi=$ac_mid; break
 else
@@ -11351,7 +11506,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
  while :; do
    cat >conftest.$ac_ext <<_ACEOF
-#line 11354 "configure"
+#line 11509 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11363,16 +11518,16 @@ int _array_ [1 - 2 * !((sizeof (long int)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11366: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11521: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11369: \$? = $ac_status" >&5
+  echo "$as_me:11524: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11372: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11527: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11375: \$? = $ac_status" >&5
+  echo "$as_me:11530: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_lo=$ac_mid; break
 else
@@ -11388,7 +11543,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 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 11391 "configure"
+#line 11546 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11400,16 +11555,16 @@ int _array_ [1 - 2 * !((sizeof (long int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11403: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11558: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11406: \$? = $ac_status" >&5
+  echo "$as_me:11561: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11409: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11564: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11412: \$? = $ac_status" >&5
+  echo "$as_me:11567: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_hi=$ac_mid
 else
@@ -11422,12 +11577,12 @@ done
 ac_cv_sizeof_long_int=$ac_lo
 else
  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:11425: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:11580: 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 11430 "configure"
+#line 11585 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11443,15 +11598,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11446: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11601: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:11449: \$? = $ac_status" >&5
+  echo "$as_me:11604: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11451: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11606: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11454: \$? = $ac_status" >&5
+  echo "$as_me:11609: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_sizeof_long_int=`cat conftest.val`
 else
@@ -11467,19 +11622,19 @@ else
  ac_cv_sizeof_long_int=0
 fi
 fi
-echo "$as_me:11470: result: $ac_cv_sizeof_long_int" >&5
+echo "$as_me:11625: 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:11476: checking for long long int" >&5
+echo "$as_me:11631: 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 11482 "configure"
+#line 11637 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11494,16 +11649,16 @@ if (sizeof (long long int))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11497: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11652: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11500: \$? = $ac_status" >&5
+  echo "$as_me:11655: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11503: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11658: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11506: \$? = $ac_status" >&5
+  echo "$as_me:11661: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_type_long_long_int=yes
 else
@@ -11513,10 +11668,10 @@ ac_cv_type_long_long_int=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11516: result: $ac_cv_type_long_long_int" >&5
+echo "$as_me:11671: result: $ac_cv_type_long_long_int" >&5
 echo "${ECHO_T}$ac_cv_type_long_long_int" >&6
-echo "$as_me:11519: checking size of long long int" >&5
+echo "$as_me:11674: 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
@@ -11525,7 +11680,7 @@ else
  if test "$cross_compiling" = yes; then
  # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 11528 "configure"
+#line 11683 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11537,21 +11692,21 @@ int _array_ [1 - 2 * !((sizeof (long long int)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11540: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11695: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11543: \$? = $ac_status" >&5
+  echo "$as_me:11698: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11546: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11701: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11549: \$? = $ac_status" >&5
+  echo "$as_me:11704: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_lo=0 ac_mid=0
  while :; do
    cat >conftest.$ac_ext <<_ACEOF
-#line 11554 "configure"
+#line 11709 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11563,16 +11718,16 @@ int _array_ [1 - 2 * !((sizeof (long long int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11566: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11721: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11569: \$? = $ac_status" >&5
+  echo "$as_me:11724: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11572: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11727: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11575: \$? = $ac_status" >&5
+  echo "$as_me:11730: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_hi=$ac_mid; break
 else
@@ -11588,7 +11743,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
  while :; do
    cat >conftest.$ac_ext <<_ACEOF
-#line 11591 "configure"
+#line 11746 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11600,16 +11755,16 @@ int _array_ [1 - 2 * !((sizeof (long long int)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11603: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11758: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11606: \$? = $ac_status" >&5
+  echo "$as_me:11761: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11609: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11764: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11612: \$? = $ac_status" >&5
+  echo "$as_me:11767: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_lo=$ac_mid; break
 else
@@ -11625,7 +11780,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 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 11628 "configure"
+#line 11783 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11637,16 +11792,16 @@ int _array_ [1 - 2 * !((sizeof (long long int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11640: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11795: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11643: \$? = $ac_status" >&5
+  echo "$as_me:11798: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11646: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11801: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11649: \$? = $ac_status" >&5
+  echo "$as_me:11804: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_hi=$ac_mid
 else
@@ -11659,12 +11814,12 @@ done
 ac_cv_sizeof_long_long_int=$ac_lo
 else
  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:11662: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:11817: 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 11667 "configure"
+#line 11822 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11680,15 +11835,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11683: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11838: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:11686: \$? = $ac_status" >&5
+  echo "$as_me:11841: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11688: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11843: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11691: \$? = $ac_status" >&5
+  echo "$as_me:11846: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_sizeof_long_long_int=`cat conftest.val`
 else
@@ -11704,7 +11859,7 @@ else
  ac_cv_sizeof_long_long_int=0
 fi
 fi
-echo "$as_me:11707: result: $ac_cv_sizeof_long_long_int" >&5
+echo "$as_me:11862: 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
@@ -11716,14 +11871,14 @@ if test "x$ac_cv_sizeof_long_long_int" = "x4" ; then
 fi
 # More checks for data types
-echo "$as_me:11719: checking for u_int type" >&5
+echo "$as_me:11874: 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 11726 "configure"
+#line 11881 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11735,16 +11890,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11738: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11893: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11741: \$? = $ac_status" >&5
+  echo "$as_me:11896: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11744: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11899: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11747: \$? = $ac_status" >&5
+  echo "$as_me:11902: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_u_int="yes"
 else
@@ -11756,7 +11911,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11759: result: $ac_cv_have_u_int" >&5
+echo "$as_me:11914: 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
@@ -11766,14 +11921,14 @@ EOF
        have_u_int=1
 fi
-echo "$as_me:11769: checking for intXX_t types" >&5
+echo "$as_me:11924: 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 11776 "configure"
+#line 11931 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11785,16 +11940,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11788: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11943: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11791: \$? = $ac_status" >&5
+  echo "$as_me:11946: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11794: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11949: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11797: \$? = $ac_status" >&5
+  echo "$as_me:11952: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_intxx_t="yes"
 else
@@ -11806,7 +11961,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11809: result: $ac_cv_have_intxx_t" >&5
+echo "$as_me:11964: 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
@@ -11819,10 +11974,10 @@ fi
 if (test -z "$have_intxx_t" && \
           test "x$ac_cv_header_stdint_h" = "xyes")
 then
-    echo "$as_me:11822: checking for intXX_t types in stdint.h" >&5
+    echo "$as_me:11977: 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 11825 "configure"
+#line 11980 "configure"
 #include "confdefs.h"
 #include <stdint.h>
 int
@@ -11834,43 +11989,43 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11837: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11992: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11840: \$? = $ac_status" >&5
+  echo "$as_me:11995: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11998: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11846: \$? = $ac_status" >&5
+  echo "$as_me:12001: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
                        cat >>confdefs.h <<\EOF
 #define HAVE_INTXX_T 1
 EOF
-                        echo "$as_me:11853: result: yes" >&5
+                        echo "$as_me:12008: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
  echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:11859: result: no" >&5
+ echo "$as_me:12014: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11866: checking for int64_t type" >&5
+echo "$as_me:12021: 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 11873 "configure"
+#line 12028 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -11891,16 +12046,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11894: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12049: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11897: \$? = $ac_status" >&5
+  echo "$as_me:12052: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11900: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12055: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11903: \$? = $ac_status" >&5
+  echo "$as_me:12058: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_int64_t="yes"
 else
@@ -11912,7 +12067,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11915: result: $ac_cv_have_int64_t" >&5
+echo "$as_me:12070: 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
@@ -11921,14 +12076,14 @@ EOF
 fi
-echo "$as_me:11924: checking for u_intXX_t types" >&5
+echo "$as_me:12079: 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 11931 "configure"
+#line 12086 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11940,16 +12095,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11943: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12098: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11946: \$? = $ac_status" >&5
+  echo "$as_me:12101: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11949: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12104: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11952: \$? = $ac_status" >&5
+  echo "$as_me:12107: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_u_intxx_t="yes"
 else
@@ -11961,7 +12116,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11964: result: $ac_cv_have_u_intxx_t" >&5
+echo "$as_me:12119: 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
@@ -11972,10 +12127,10 @@ EOF
 fi
 if test -z "$have_u_intxx_t" ; then
-    echo "$as_me:11975: checking for u_intXX_t types in sys/socket.h" >&5
+    echo "$as_me:12130: 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 11978 "configure"
+#line 12133 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 int
@@ -11987,43 +12142,43 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11990: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12145: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11993: \$? = $ac_status" >&5
+  echo "$as_me:12148: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11996: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12151: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11999: \$? = $ac_status" >&5
+  echo "$as_me:12154: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
                        cat >>confdefs.h <<\EOF
 #define HAVE_U_INTXX_T 1
 EOF
-                        echo "$as_me:12006: result: yes" >&5
+                        echo "$as_me:12161: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
  echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:12012: result: no" >&5
+ echo "$as_me:12167: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12019: checking for u_int64_t types" >&5
+echo "$as_me:12174: 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 12026 "configure"
+#line 12181 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12035,16 +12190,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12038: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12193: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:12041: \$? = $ac_status" >&5
+  echo "$as_me:12196: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12044: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12199: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:12047: \$? = $ac_status" >&5
+  echo "$as_me:12202: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_u_int64_t="yes"
 else
@@ -12056,7 +12211,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12059: result: $ac_cv_have_u_int64_t" >&5
+echo "$as_me:12214: 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
@@ -12067,10 +12222,10 @@ EOF
 fi
 if test -z "$have_u_int64_t" ; then
-    echo "$as_me:12070: checking for u_int64_t type in sys/bitypes.h" >&5
+    echo "$as_me:12225: 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 12073 "configure"
+#line 12228 "configure"
 #include "confdefs.h"
 #include <sys/bitypes.h>
 int
@@ -12082,29 +12237,29 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12085: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12240: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:12088: \$? = $ac_status" >&5
+  echo "$as_me:12243: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12091: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12246: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:12094: \$? = $ac_status" >&5
+  echo "$as_me:12249: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
                        cat >>confdefs.h <<\EOF
 #define HAVE_U_INT64_T 1
 EOF
-                        echo "$as_me:12101: result: yes" >&5
+                        echo "$as_me:12256: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
  echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:12107: result: no" >&5
+ echo "$as_me:12262: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -12112,14 +12267,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 if test -z "$have_u_intxx_t" ; then
-        echo "$as_me:12115: checking for uintXX_t types" >&5
+        echo "$as_me:12270: 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 12122 "configure"
+#line 12277 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -12133,16 +12288,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12136: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12291: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:12139: \$? = $ac_status" >&5
+  echo "$as_me:12294: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12142: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12297: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:12145: \$? = $ac_status" >&5
+  echo "$as_me:12300: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_uintxx_t="yes"
 else
@@ -12154,7 +12309,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12157: result: $ac_cv_have_uintxx_t" >&5
+echo "$as_me:12312: 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
@@ -12165,10 +12320,10 @@ EOF
 fi
 if test -z "$have_uintxx_t" ; then
-    echo "$as_me:12168: checking for uintXX_t types in stdint.h" >&5
+    echo "$as_me:12323: 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 12171 "configure"
+#line 12326 "configure"
 #include "confdefs.h"
 #include <stdint.h>
 int
@@ -12180,29 +12335,29 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12183: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12338: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:12186: \$? = $ac_status" >&5
+  echo "$as_me:12341: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12189: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12344: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:12192: \$? = $ac_status" >&5
+  echo "$as_me:12347: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
                        cat >>confdefs.h <<\EOF
 #define HAVE_UINTXX_T 1
 EOF
-                        echo "$as_me:12199: result: yes" >&5
+                        echo "$as_me:12354: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
  echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:12205: result: no" >&5
+ echo "$as_me:12360: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -12212,10 +12367,10 @@ fi
 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:12215: checking for intXX_t and u_intXX_t types in sys/bitypes.h" >&5
+        echo "$as_me:12370: 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 12218 "configure"
+#line 12373 "configure"
 #include "confdefs.h"
 #include <sys/bitypes.h>
@@ -12233,16 +12388,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12236: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12391: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:12239: \$? = $ac_status" >&5
+  echo "$as_me:12394: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12397: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:12245: \$? = $ac_status" >&5
+  echo "$as_me:12400: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
                        cat >>confdefs.h <<\EOF
@@ -12253,27 +12408,27 @@ EOF
 #define HAVE_INTXX_T 1
 EOF
-                        echo "$as_me:12256: result: yes" >&5
+                        echo "$as_me:12411: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
  echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:12262: result: no" >&5
+echo "$as_me:12417: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12269: checking for u_char" >&5
+echo "$as_me:12424: 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 12276 "configure"
+#line 12431 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -12287,16 +12442,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12290: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12445: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:12293: \$? = $ac_status" >&5
+  echo "$as_me:12448: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12296: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12451: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:12299: \$? = $ac_status" >&5
+  echo "$as_me:12454: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_u_char="yes"
 else
@@ -12308,7 +12463,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12311: result: $ac_cv_have_u_char" >&5
+echo "$as_me:12466: 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
@@ -12317,13 +12472,13 @@ EOF
 fi
-   echo "$as_me:12320: checking for socklen_t" >&5
+   echo "$as_me:12475: 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 12326 "configure"
+#line 12481 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -12340,16 +12495,16 @@ if (sizeof (socklen_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12343: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12498: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:12346: \$? = $ac_status" >&5
+  echo "$as_me:12501: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12349: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12504: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:12352: \$? = $ac_status" >&5
+  echo "$as_me:12507: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_type_socklen_t=yes
 else
@@ -12359,13 +12514,13 @@ ac_cv_type_socklen_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12362: result: $ac_cv_type_socklen_t" >&5
+echo "$as_me:12517: 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:12368: checking for socklen_t equivalent" >&5
+      echo "$as_me:12523: 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
@@ -12377,7 +12532,7 @@ else
         for arg2 in "struct sockaddr" void; do
            for t in int size_t unsigned long "unsigned long"; do
               cat >conftest.$ac_ext <<_ACEOF
-#line 12380 "configure"
+#line 12535 "configure"
 #include "confdefs.h"
                  #include <sys/types.h>
@@ -12397,16 +12552,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12400: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12555: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:12403: \$? = $ac_status" >&5
+  echo "$as_me:12558: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12406: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12561: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:12409: \$? = $ac_status" >&5
+  echo "$as_me:12564: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
                  curl_cv_socklen_t_equiv="$t"
@@ -12421,14 +12576,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
         done
         if test "x$curl_cv_socklen_t_equiv" = x; then
-            { { echo "$as_me:12424: error: Cannot find a type to use in place of socklen_t" >&5
+            { { echo "$as_me:12579: 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:12431: result: $curl_cv_socklen_t_equiv" >&5
+      echo "$as_me:12586: result: $curl_cv_socklen_t_equiv" >&5
 echo "${ECHO_T}$curl_cv_socklen_t_equiv" >&6
 cat >>confdefs.h <<EOF
@@ -12437,13 +12592,13 @@ EOF
 fi
-echo "$as_me:12440: checking for sig_atomic_t" >&5
+echo "$as_me:12595: 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 12446 "configure"
+#line 12601 "configure"
 #include "confdefs.h"
 #include <signal.h>
@@ -12459,16 +12614,16 @@ if (sizeof (sig_atomic_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12462: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12617: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:12465: \$? = $ac_status" >&5
+  echo "$as_me:12620: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12468: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12623: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:12471: \$? = $ac_status" >&5
+  echo "$as_me:12626: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_type_sig_atomic_t=yes
 else
@@ -12478,7 +12633,7 @@ ac_cv_type_sig_atomic_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12481: result: $ac_cv_type_sig_atomic_t" >&5
+echo "$as_me:12636: 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
@@ -12488,14 +12643,14 @@ EOF
 fi
-echo "$as_me:12491: checking for size_t" >&5
+echo "$as_me:12646: 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 12498 "configure"
+#line 12653 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -12509,16 +12664,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12512: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12667: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:12515: \$? = $ac_status" >&5
+  echo "$as_me:12670: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12518: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12673: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:12521: \$? = $ac_status" >&5
+  echo "$as_me:12676: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_size_t="yes"
 else
@@ -12530,7 +12685,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12533: result: $ac_cv_have_size_t" >&5
+echo "$as_me:12688: 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
@@ -12539,14 +12694,14 @@ EOF
 fi
-echo "$as_me:12542: checking for ssize_t" >&5
+echo "$as_me:12697: 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 12549 "configure"
+#line 12704 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -12560,16 +12715,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12563: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12718: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:12566: \$? = $ac_status" >&5
+  echo "$as_me:12721: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12569: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12724: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:12572: \$? = $ac_status" >&5
+  echo "$as_me:12727: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_ssize_t="yes"
 else
@@ -12581,7 +12736,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12584: result: $ac_cv_have_ssize_t" >&5
+echo "$as_me:12739: 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
@@ -12590,14 +12745,14 @@ EOF
 fi
-echo "$as_me:12593: checking for clock_t" >&5
+echo "$as_me:12748: 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 12600 "configure"
+#line 12755 "configure"
 #include "confdefs.h"
 #include <time.h>
@@ -12611,16 +12766,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12614: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12769: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:12617: \$? = $ac_status" >&5
+  echo "$as_me:12772: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12620: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12775: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:12623: \$? = $ac_status" >&5
+  echo "$as_me:12778: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_clock_t="yes"
 else
@@ -12632,7 +12787,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12635: result: $ac_cv_have_clock_t" >&5
+echo "$as_me:12790: 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
@@ -12641,14 +12796,14 @@ EOF
 fi
-echo "$as_me:12644: checking for sa_family_t" >&5
+echo "$as_me:12799: 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 12651 "configure"
+#line 12806 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -12663,23 +12818,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12666: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12821: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:12669: \$? = $ac_status" >&5
+  echo "$as_me:12824: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12672: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12827: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:12675: \$? = $ac_status" >&5
+  echo "$as_me:12830: \$? = $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 12682 "configure"
+#line 12837 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -12695,16 +12850,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12698: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12853: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:12701: \$? = $ac_status" >&5
+  echo "$as_me:12856: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12704: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12859: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:12707: \$? = $ac_status" >&5
+  echo "$as_me:12862: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_sa_family_t="yes"
 else
@@ -12719,7 +12874,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12722: result: $ac_cv_have_sa_family_t" >&5
+echo "$as_me:12877: 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
@@ -12728,14 +12883,14 @@ EOF
 fi
-echo "$as_me:12731: checking for pid_t" >&5
+echo "$as_me:12886: 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 12738 "configure"
+#line 12893 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -12749,16 +12904,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12752: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12907: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:12755: \$? = $ac_status" >&5
+  echo "$as_me:12910: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12758: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12913: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:12761: \$? = $ac_status" >&5
+  echo "$as_me:12916: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_pid_t="yes"
 else
@@ -12770,7 +12925,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12773: result: $ac_cv_have_pid_t" >&5
+echo "$as_me:12928: 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
@@ -12779,14 +12934,14 @@ EOF
 fi
-echo "$as_me:12782: checking for mode_t" >&5
+echo "$as_me:12937: 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 12789 "configure"
+#line 12944 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -12800,16 +12955,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12803: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12958: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:12806: \$? = $ac_status" >&5
+  echo "$as_me:12961: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12809: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12964: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:12812: \$? = $ac_status" >&5
+  echo "$as_me:12967: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_mode_t="yes"
 else
@@ -12821,7 +12976,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12824: result: $ac_cv_have_mode_t" >&5
+echo "$as_me:12979: 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
@@ -12830,14 +12985,14 @@ EOF
 fi
-echo "$as_me:12833: checking for struct sockaddr_storage" >&5
+echo "$as_me:12988: 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 12840 "configure"
+#line 12995 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -12852,16 +13007,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12855: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13010: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:12858: \$? = $ac_status" >&5
+  echo "$as_me:13013: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12861: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13016: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:12864: \$? = $ac_status" >&5
+  echo "$as_me:13019: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_struct_sockaddr_storage="yes"
 else
@@ -12873,7 +13028,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12876: result: $ac_cv_have_struct_sockaddr_storage" >&5
+echo "$as_me:13031: 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
@@ -12882,14 +13037,14 @@ EOF
 fi
-echo "$as_me:12885: checking for struct sockaddr_in6" >&5
+echo "$as_me:13040: 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 12892 "configure"
+#line 13047 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -12904,16 +13059,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12907: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13062: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:12910: \$? = $ac_status" >&5
+  echo "$as_me:13065: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12913: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13068: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:12916: \$? = $ac_status" >&5
+  echo "$as_me:13071: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_struct_sockaddr_in6="yes"
 else
@@ -12925,7 +13080,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12928: result: $ac_cv_have_struct_sockaddr_in6" >&5
+echo "$as_me:13083: 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
@@ -12934,14 +13089,14 @@ EOF
 fi
-echo "$as_me:12937: checking for struct in6_addr" >&5
+echo "$as_me:13092: 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 12944 "configure"
+#line 13099 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -12956,16 +13111,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12959: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13114: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:12962: \$? = $ac_status" >&5
+  echo "$as_me:13117: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12965: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13120: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:12968: \$? = $ac_status" >&5
+  echo "$as_me:13123: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_struct_in6_addr="yes"
 else
@@ -12977,7 +13132,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12980: result: $ac_cv_have_struct_in6_addr" >&5
+echo "$as_me:13135: 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
@@ -12986,14 +13141,14 @@ EOF
 fi
-echo "$as_me:12989: checking for struct addrinfo" >&5
+echo "$as_me:13144: 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 12996 "configure"
+#line 13151 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -13009,16 +13164,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13012: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13167: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:13015: \$? = $ac_status" >&5
+  echo "$as_me:13170: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13018: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13173: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:13021: \$? = $ac_status" >&5
+  echo "$as_me:13176: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_struct_addrinfo="yes"
 else
@@ -13030,7 +13185,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:13033: result: $ac_cv_have_struct_addrinfo" >&5
+echo "$as_me:13188: 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
@@ -13039,14 +13194,14 @@ EOF
 fi
-echo "$as_me:13042: checking for struct timeval" >&5
+echo "$as_me:13197: 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 13049 "configure"
+#line 13204 "configure"
 #include "confdefs.h"
 #include <sys/time.h>
 int
@@ -13058,16 +13213,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13061: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13216: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:13064: \$? = $ac_status" >&5
+  echo "$as_me:13219: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13067: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13222: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:13070: \$? = $ac_status" >&5
+  echo "$as_me:13225: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_struct_timeval="yes"
 else
@@ -13079,7 +13234,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:13082: result: $ac_cv_have_struct_timeval" >&5
+echo "$as_me:13237: 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
@@ -13089,13 +13244,13 @@ EOF
        have_struct_timeval=1
 fi
-echo "$as_me:13092: checking for struct timespec" >&5
+echo "$as_me:13247: 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 13098 "configure"
+#line 13253 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -13110,16 +13265,16 @@ if (sizeof (struct timespec))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13113: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13268: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:13116: \$? = $ac_status" >&5
+  echo "$as_me:13271: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13119: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13274: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:13122: \$? = $ac_status" >&5
+  echo "$as_me:13277: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_type_struct_timespec=yes
 else
@@ -13129,7 +13284,7 @@ ac_cv_type_struct_timespec=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:13132: result: $ac_cv_type_struct_timespec" >&5
+echo "$as_me:13287: 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
@@ -13149,12 +13304,12 @@ if test "x$ac_cv_have_int64_t" = "xno" -a \
        exit 1;
 else
        if test "$cross_compiling" = yes; then
-  { { echo "$as_me:13152: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:13307: 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 13157 "configure"
+#line 13312 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -13182,15 +13337,15 @@ main() { exit(0); }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:13185: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13340: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:13188: \$? = $ac_status" >&5
+  echo "$as_me:13343: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:13190: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13345: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:13193: \$? = $ac_status" >&5
+  echo "$as_me:13348: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   true
 else
@@ -13209,14 +13364,14 @@ fi
 # 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:13212: checking for ut_host field in utmp.h" >&5
+        echo "$as_me:13367: 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 13219 "configure"
+#line 13374 "configure"
 #include "confdefs.h"
 #include <utmp.h>
@@ -13233,7 +13388,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:13236: result: $ossh_result" >&5
+                echo "$as_me:13391: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -13242,21 +13397,21 @@ EOF
                fi
        else
-                echo "$as_me:13245: result: no" >&5
+                echo "$as_me:13400: 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:13252: checking for ut_host field in utmpx.h" >&5
+        echo "$as_me:13407: 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 13259 "configure"
+#line 13414 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
@@ -13273,7 +13428,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:13276: result: $ossh_result" >&5
+                echo "$as_me:13431: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -13282,21 +13437,21 @@ EOF
                fi
        else
-                echo "$as_me:13285: result: no" >&5
+                echo "$as_me:13440: 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:13292: checking for syslen field in utmpx.h" >&5
+        echo "$as_me:13447: 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 13299 "configure"
+#line 13454 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
@@ -13313,7 +13468,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:13316: result: $ossh_result" >&5
+                echo "$as_me:13471: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -13322,21 +13477,21 @@ EOF
                fi
        else
-                echo "$as_me:13325: result: no" >&5
+                echo "$as_me:13480: 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:13332: checking for ut_pid field in utmp.h" >&5
+        echo "$as_me:13487: 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 13339 "configure"
+#line 13494 "configure"
 #include "confdefs.h"
 #include <utmp.h>
@@ -13353,7 +13508,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:13356: result: $ossh_result" >&5
+                echo "$as_me:13511: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -13362,21 +13517,21 @@ EOF
                fi
        else
-                echo "$as_me:13365: result: no" >&5
+                echo "$as_me:13520: 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:13372: checking for ut_type field in utmp.h" >&5
+        echo "$as_me:13527: 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 13379 "configure"
+#line 13534 "configure"
 #include "confdefs.h"
 #include <utmp.h>
@@ -13393,7 +13548,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:13396: result: $ossh_result" >&5
+                echo "$as_me:13551: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -13402,21 +13557,21 @@ EOF
                fi
        else
-                echo "$as_me:13405: result: no" >&5
+                echo "$as_me:13560: 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:13412: checking for ut_type field in utmpx.h" >&5
+        echo "$as_me:13567: 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 13419 "configure"
+#line 13574 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
@@ -13433,7 +13588,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:13436: result: $ossh_result" >&5
+                echo "$as_me:13591: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -13442,21 +13597,21 @@ EOF
                fi
        else
-                echo "$as_me:13445: result: no" >&5
+                echo "$as_me:13600: 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:13452: checking for ut_tv field in utmp.h" >&5
+        echo "$as_me:13607: 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 13459 "configure"
+#line 13614 "configure"
 #include "confdefs.h"
 #include <utmp.h>
@@ -13473,7 +13628,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:13476: result: $ossh_result" >&5
+                echo "$as_me:13631: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -13482,21 +13637,21 @@ EOF
                fi
        else
-                echo "$as_me:13485: result: no" >&5
+                echo "$as_me:13640: 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:13492: checking for ut_id field in utmp.h" >&5
+        echo "$as_me:13647: 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 13499 "configure"
+#line 13654 "configure"
 #include "confdefs.h"
 #include <utmp.h>
@@ -13513,7 +13668,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:13516: result: $ossh_result" >&5
+                echo "$as_me:13671: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -13522,21 +13677,21 @@ EOF
                fi
        else
-                echo "$as_me:13525: result: no" >&5
+                echo "$as_me:13680: 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:13532: checking for ut_id field in utmpx.h" >&5
+        echo "$as_me:13687: 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 13539 "configure"
+#line 13694 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
@@ -13553,7 +13708,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:13556: result: $ossh_result" >&5
+                echo "$as_me:13711: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -13562,21 +13717,21 @@ EOF
                fi
        else
-                echo "$as_me:13565: result: no" >&5
+                echo "$as_me:13720: 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:13572: checking for ut_addr field in utmp.h" >&5
+        echo "$as_me:13727: 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 13579 "configure"
+#line 13734 "configure"
 #include "confdefs.h"
 #include <utmp.h>
@@ -13593,7 +13748,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:13596: result: $ossh_result" >&5
+                echo "$as_me:13751: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -13602,21 +13757,21 @@ EOF
                fi
        else
-                echo "$as_me:13605: result: no" >&5
+                echo "$as_me:13760: 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:13612: checking for ut_addr field in utmpx.h" >&5
+        echo "$as_me:13767: 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 13619 "configure"
+#line 13774 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
@@ -13633,7 +13788,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:13636: result: $ossh_result" >&5
+                echo "$as_me:13791: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -13642,21 +13797,21 @@ EOF
                fi
        else
-                echo "$as_me:13645: result: no" >&5
+                echo "$as_me:13800: 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:13652: checking for ut_addr_v6 field in utmp.h" >&5
+        echo "$as_me:13807: 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 13659 "configure"
+#line 13814 "configure"
 #include "confdefs.h"
 #include <utmp.h>
@@ -13673,7 +13828,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:13676: result: $ossh_result" >&5
+                echo "$as_me:13831: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -13682,21 +13837,21 @@ EOF
                fi
        else
-                echo "$as_me:13685: result: no" >&5
+                echo "$as_me:13840: 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:13692: checking for ut_addr_v6 field in utmpx.h" >&5
+        echo "$as_me:13847: 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 13699 "configure"
+#line 13854 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
@@ -13713,7 +13868,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:13716: result: $ossh_result" >&5
+                echo "$as_me:13871: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -13722,21 +13877,21 @@ EOF
                fi
        else
-                echo "$as_me:13725: result: no" >&5
+                echo "$as_me:13880: 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:13732: checking for ut_exit field in utmp.h" >&5
+        echo "$as_me:13887: 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 13739 "configure"
+#line 13894 "configure"
 #include "confdefs.h"
 #include <utmp.h>
@@ -13753,7 +13908,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:13756: result: $ossh_result" >&5
+                echo "$as_me:13911: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -13762,21 +13917,21 @@ EOF
                fi
        else
-                echo "$as_me:13765: result: no" >&5
+                echo "$as_me:13920: 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:13772: checking for ut_time field in utmp.h" >&5
+        echo "$as_me:13927: 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 13779 "configure"
+#line 13934 "configure"
 #include "confdefs.h"
 #include <utmp.h>
@@ -13793,7 +13948,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:13796: result: $ossh_result" >&5
+                echo "$as_me:13951: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -13802,21 +13957,21 @@ EOF
                fi
        else
-                echo "$as_me:13805: result: no" >&5
+                echo "$as_me:13960: 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:13812: checking for ut_time field in utmpx.h" >&5
+        echo "$as_me:13967: 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 13819 "configure"
+#line 13974 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
@@ -13833,7 +13988,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:13836: result: $ossh_result" >&5
+                echo "$as_me:13991: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -13842,21 +13997,21 @@ EOF
                fi
        else
-                echo "$as_me:13845: result: no" >&5
+                echo "$as_me:14000: 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:13852: checking for ut_tv field in utmpx.h" >&5
+        echo "$as_me:14007: 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 13859 "configure"
+#line 14014 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
@@ -13873,7 +14028,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:13876: result: $ossh_result" >&5
+                echo "$as_me:14031: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -13882,17 +14037,17 @@ EOF
                fi
        else
-                echo "$as_me:13885: result: no" >&5
+                echo "$as_me:14040: result: no" >&5
 echo "${ECHO_T}no" >&6
        fi
-echo "$as_me:13889: checking for struct stat.st_blksize" >&5
+echo "$as_me:14044: 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 13895 "configure"
+#line 14050 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -13906,16 +14061,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13909: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14064: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:13912: \$? = $ac_status" >&5
+  echo "$as_me:14067: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13915: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14070: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:13918: \$? = $ac_status" >&5
+  echo "$as_me:14073: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_member_struct_stat_st_blksize=yes
 else
@@ -13925,7 +14080,7 @@ ac_cv_member_struct_stat_st_blksize=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:13928: result: $ac_cv_member_struct_stat_st_blksize" >&5
+echo "$as_me:14083: 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
@@ -13935,14 +14090,14 @@ EOF
 fi
-echo "$as_me:13938: checking for ss_family field in struct sockaddr_storage" >&5
+echo "$as_me:14093: 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 13945 "configure"
+#line 14100 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -13957,16 +14112,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13960: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14115: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:13963: \$? = $ac_status" >&5
+  echo "$as_me:14118: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13966: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14121: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:13969: \$? = $ac_status" >&5
+  echo "$as_me:14124: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_ss_family_in_struct_ss="yes"
 else
@@ -13977,7 +14132,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:13980: result: $ac_cv_have_ss_family_in_struct_ss" >&5
+echo "$as_me:14135: 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
@@ -13986,14 +14141,14 @@ EOF
 fi
-echo "$as_me:13989: checking for __ss_family field in struct sockaddr_storage" >&5
+echo "$as_me:14144: 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 13996 "configure"
+#line 14151 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -14008,16 +14163,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14011: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14166: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:14014: \$? = $ac_status" >&5
+  echo "$as_me:14169: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14017: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14172: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:14020: \$? = $ac_status" >&5
+  echo "$as_me:14175: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have___ss_family_in_struct_ss="yes"
 else
@@ -14029,7 +14184,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:14032: result: $ac_cv_have___ss_family_in_struct_ss" >&5
+echo "$as_me:14187: 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
@@ -14038,14 +14193,14 @@ EOF
 fi
-echo "$as_me:14041: checking for pw_class field in struct passwd" >&5
+echo "$as_me:14196: 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 14048 "configure"
+#line 14203 "configure"
 #include "confdefs.h"
 #include <pwd.h>
@@ -14059,16 +14214,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14062: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14217: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:14065: \$? = $ac_status" >&5
+  echo "$as_me:14220: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14068: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14223: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:14071: \$? = $ac_status" >&5
+  echo "$as_me:14226: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_pw_class_in_struct_passwd="yes"
 else
@@ -14080,7 +14235,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:14083: result: $ac_cv_have_pw_class_in_struct_passwd" >&5
+echo "$as_me:14238: 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
@@ -14089,14 +14244,14 @@ EOF
 fi
-echo "$as_me:14092: checking for pw_expire field in struct passwd" >&5
+echo "$as_me:14247: 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 14099 "configure"
+#line 14254 "configure"
 #include "confdefs.h"
 #include <pwd.h>
@@ -14110,16 +14265,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14113: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14268: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:14116: \$? = $ac_status" >&5
+  echo "$as_me:14271: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14119: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14274: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:14122: \$? = $ac_status" >&5
+  echo "$as_me:14277: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_pw_expire_in_struct_passwd="yes"
 else
@@ -14131,7 +14286,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:14134: result: $ac_cv_have_pw_expire_in_struct_passwd" >&5
+echo "$as_me:14289: 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
@@ -14140,14 +14295,14 @@ EOF
 fi
-echo "$as_me:14143: checking for pw_change field in struct passwd" >&5
+echo "$as_me:14298: 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 14150 "configure"
+#line 14305 "configure"
 #include "confdefs.h"
 #include <pwd.h>
@@ -14161,16 +14316,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14164: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14319: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:14167: \$? = $ac_status" >&5
+  echo "$as_me:14322: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14170: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14325: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:14173: \$? = $ac_status" >&5
+  echo "$as_me:14328: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_pw_change_in_struct_passwd="yes"
 else
@@ -14182,7 +14337,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:14185: result: $ac_cv_have_pw_change_in_struct_passwd" >&5
+echo "$as_me:14340: 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
@@ -14191,19 +14346,19 @@ EOF
 fi
-echo "$as_me:14194: checking for msg_accrights field in struct msghdr" >&5
+echo "$as_me:14349: 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:14201: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:14356: 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 14206 "configure"
+#line 14361 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -14220,15 +14375,15 @@ exit(0);
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:14223: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14378: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:14226: \$? = $ac_status" >&5
+  echo "$as_me:14381: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:14228: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14383: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:14231: \$? = $ac_status" >&5
+  echo "$as_me:14386: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_accrights_in_msghdr="yes"
 else
@@ -14242,7 +14397,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:14245: result: $ac_cv_have_accrights_in_msghdr" >&5
+echo "$as_me:14400: 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
@@ -14251,19 +14406,19 @@ EOF
 fi
-echo "$as_me:14254: checking for msg_control field in struct msghdr" >&5
+echo "$as_me:14409: 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:14261: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:14416: 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 14266 "configure"
+#line 14421 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -14280,15 +14435,15 @@ exit(0);
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:14283: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14438: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:14286: \$? = $ac_status" >&5
+  echo "$as_me:14441: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:14288: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14443: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:14291: \$? = $ac_status" >&5
+  echo "$as_me:14446: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_control_in_msghdr="yes"
 else
@@ -14302,7 +14457,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:14305: result: $ac_cv_have_control_in_msghdr" >&5
+echo "$as_me:14460: 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
@@ -14311,14 +14466,14 @@ EOF
 fi
-echo "$as_me:14314: checking if libc defines __progname" >&5
+echo "$as_me:14469: 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 14321 "configure"
+#line 14476 "configure"
 #include "confdefs.h"
 int
@@ -14330,16 +14485,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14333: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14488: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:14336: \$? = $ac_status" >&5
+  echo "$as_me:14491: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14339: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14494: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:14342: \$? = $ac_status" >&5
+  echo "$as_me:14497: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_libc_defines___progname="yes"
 else
@@ -14351,7 +14506,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14354: result: $ac_cv_libc_defines___progname" >&5
+echo "$as_me:14509: 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
@@ -14360,14 +14515,14 @@ EOF
 fi
-echo "$as_me:14363: checking whether $CC implements __FUNCTION__" >&5
+echo "$as_me:14518: 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 14370 "configure"
+#line 14525 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -14381,16 +14536,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14384: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14539: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:14387: \$? = $ac_status" >&5
+  echo "$as_me:14542: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14390: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14545: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:14393: \$? = $ac_status" >&5
+  echo "$as_me:14548: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_cc_implements___FUNCTION__="yes"
 else
@@ -14402,7 +14557,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14405: result: $ac_cv_cc_implements___FUNCTION__" >&5
+echo "$as_me:14560: 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
@@ -14411,14 +14566,14 @@ EOF
 fi
-echo "$as_me:14414: checking whether $CC implements __func__" >&5
+echo "$as_me:14569: 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 14421 "configure"
+#line 14576 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -14432,16 +14587,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14435: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14590: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:14438: \$? = $ac_status" >&5
+  echo "$as_me:14593: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14441: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14596: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:14444: \$? = $ac_status" >&5
+  echo "$as_me:14599: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_cc_implements___func__="yes"
 else
@@ -14453,7 +14608,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14456: result: $ac_cv_cc_implements___func__" >&5
+echo "$as_me:14611: 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
@@ -14462,14 +14617,14 @@ EOF
 fi
-echo "$as_me:14465: checking whether getopt has optreset support" >&5
+echo "$as_me:14620: 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 14472 "configure"
+#line 14627 "configure"
 #include "confdefs.h"
 #include <getopt.h>
@@ -14483,16 +14638,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14486: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14641: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:14489: \$? = $ac_status" >&5
+  echo "$as_me:14644: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14492: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14647: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:14495: \$? = $ac_status" >&5
+  echo "$as_me:14650: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_getopt_optreset="yes"
 else
@@ -14504,7 +14659,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14507: result: $ac_cv_have_getopt_optreset" >&5
+echo "$as_me:14662: 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
@@ -14513,14 +14668,14 @@ EOF
 fi
-echo "$as_me:14516: checking if libc defines sys_errlist" >&5
+echo "$as_me:14671: 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 14523 "configure"
+#line 14678 "configure"
 #include "confdefs.h"
 int
@@ -14532,16 +14687,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14535: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14690: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:14538: \$? = $ac_status" >&5
+  echo "$as_me:14693: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14541: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14696: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:14544: \$? = $ac_status" >&5
+  echo "$as_me:14699: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_libc_defines_sys_errlist="yes"
 else
@@ -14553,7 +14708,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14556: result: $ac_cv_libc_defines_sys_errlist" >&5
+echo "$as_me:14711: 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
@@ -14562,14 +14717,14 @@ EOF
 fi
-echo "$as_me:14565: checking if libc defines sys_nerr" >&5
+echo "$as_me:14720: 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 14572 "configure"
+#line 14727 "configure"
 #include "confdefs.h"
 int
@@ -14581,16 +14736,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14584: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14739: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:14587: \$? = $ac_status" >&5
+  echo "$as_me:14742: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14590: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14745: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:14593: \$? = $ac_status" >&5
+  echo "$as_me:14748: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_libc_defines_sys_nerr="yes"
 else
@@ -14602,7 +14757,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14605: result: $ac_cv_libc_defines_sys_nerr" >&5
+echo "$as_me:14760: 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
@@ -14633,23 +14788,23 @@ if test "${with_sectok+set}" = set; then
 for ac_header in sectok.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:14636: checking for $ac_header" >&5
+echo "$as_me:14791: 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 14642 "configure"
+#line 14797 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:14646: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14801: \"$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:14652: \$? = $ac_status" >&5
+  echo "$as_me:14807: \$? = $ac_status" >&5
  (exit $ac_status); } >/dev/null; then
  if test -s conftest.err; then
    ac_cpp_err=$ac_c_preproc_warn_flag
@@ -14668,7 +14823,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:14671: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:14826: 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
@@ -14679,12 +14834,12 @@ fi
 done
                        if test "$ac_cv_header_sectok_h" != yes; then
-                                { { echo "$as_me:14682: error: Can't find sectok.h" >&5
+                                { { echo "$as_me:14837: 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:14687: checking for sectok_open in -lsectok" >&5
+echo "$as_me:14842: 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
@@ -14692,7 +14847,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsectok  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14695 "configure"
+#line 14850 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14711,16 +14866,16 @@ sectok_open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14714: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14869: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:14717: \$? = $ac_status" >&5
+  echo "$as_me:14872: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14720: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14875: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:14723: \$? = $ac_status" >&5
+  echo "$as_me:14878: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_sectok_sectok_open=yes
 else
@@ -14731,7 +14886,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14734: result: $ac_cv_lib_sectok_sectok_open" >&5
+echo "$as_me:14889: 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
@@ -14743,7 +14898,7 @@ EOF
 fi
                        if test "$ac_cv_lib_sectok_sectok_open" != yes; then
-                                { { echo "$as_me:14746: error: Can't find libsectok" >&5
+                                { { echo "$as_me:14901: error: Can't find libsectok" >&5
 echo "$as_me: error: Can't find libsectok" >&2;}
   { (exit 1); exit 1; }; }
                        fi
@@ -14773,7 +14928,7 @@ if test x$opensc_config_prefix != x ; then
  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:14776: checking for $ac_word" >&5
+echo "$as_me:14931: 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
@@ -14790,7 +14945,7 @@ for ac_dir in $ac_dummy; do
  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:14793: found $ac_dir/$ac_word" >&5
+   echo "$as_me:14948: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -14802,10 +14957,10 @@ fi
 OPENSC_CONFIG=$ac_cv_path_OPENSC_CONFIG
 if test -n "$OPENSC_CONFIG"; then
-  echo "$as_me:14805: result: $OPENSC_CONFIG" >&5
+  echo "$as_me:14960: result: $OPENSC_CONFIG" >&5
 echo "${ECHO_T}$OPENSC_CONFIG" >&6
 else
-  echo "$as_me:14808: result: no" >&5
+  echo "$as_me:14963: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -14827,7 +14982,7 @@ EOF
 fi
 # Check libraries needed by DNS fingerprint support
-echo "$as_me:14830: checking for library containing getrrsetbyname" >&5
+echo "$as_me:14985: 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
@@ -14835,7 +14990,7 @@ else
  ac_func_search_save_LIBS=$LIBS
 ac_cv_search_getrrsetbyname=no
 cat >conftest.$ac_ext <<_ACEOF
-#line 14838 "configure"
+#line 14993 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14854,16 +15009,16 @@ getrrsetbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14857: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15012: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:14860: \$? = $ac_status" >&5
+  echo "$as_me:15015: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14863: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15018: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:14866: \$? = $ac_status" >&5
+  echo "$as_me:15021: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_search_getrrsetbyname="none required"
 else
@@ -14875,7 +15030,7 @@ if test "$ac_cv_search_getrrsetbyname" = no; then
  for ac_lib in resolv; do
    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
    cat >conftest.$ac_ext <<_ACEOF
-#line 14878 "configure"
+#line 15033 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14894,16 +15049,16 @@ getrrsetbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14897: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15052: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:14900: \$? = $ac_status" >&5
+  echo "$as_me:15055: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14903: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15058: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:14906: \$? = $ac_status" >&5
+  echo "$as_me:15061: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_search_getrrsetbyname="-l$ac_lib"
 break
@@ -14916,7 +15071,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:14919: result: $ac_cv_search_getrrsetbyname" >&5
+echo "$as_me:15074: 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"
@@ -14927,7 +15082,7 @@ EOF
 else
                # Needed by our getrrsetbyname()
-                echo "$as_me:14930: checking for library containing res_query" >&5
+                echo "$as_me:15085: 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
@@ -14935,7 +15090,7 @@ else
  ac_func_search_save_LIBS=$LIBS
 ac_cv_search_res_query=no
 cat >conftest.$ac_ext <<_ACEOF
-#line 14938 "configure"
+#line 15093 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14954,16 +15109,16 @@ res_query ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14957: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15112: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:14960: \$? = $ac_status" >&5
+  echo "$as_me:15115: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14963: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15118: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:14966: \$? = $ac_status" >&5
+  echo "$as_me:15121: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_search_res_query="none required"
 else
@@ -14975,7 +15130,7 @@ if test "$ac_cv_search_res_query" = no; then
  for ac_lib in resolv; do
    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
    cat >conftest.$ac_ext <<_ACEOF
-#line 14978 "configure"
+#line 15133 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14994,16 +15149,16 @@ res_query ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14997: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15152: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:15000: \$? = $ac_status" >&5
+  echo "$as_me:15155: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15003: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15158: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:15006: \$? = $ac_status" >&5
+  echo "$as_me:15161: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_search_res_query="-l$ac_lib"
 break
@@ -15016,14 +15171,14 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:15019: result: $ac_cv_search_res_query" >&5
+echo "$as_me:15174: 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:15026: checking for library containing dn_expand" >&5
+                echo "$as_me:15181: 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
@@ -15031,7 +15186,7 @@ else
  ac_func_search_save_LIBS=$LIBS
 ac_cv_search_dn_expand=no
 cat >conftest.$ac_ext <<_ACEOF
-#line 15034 "configure"
+#line 15189 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15050,16 +15205,16 @@ dn_expand ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15053: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15208: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:15056: \$? = $ac_status" >&5
+  echo "$as_me:15211: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15059: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15214: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:15062: \$? = $ac_status" >&5
+  echo "$as_me:15217: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_search_dn_expand="none required"
 else
@@ -15071,7 +15226,7 @@ if test "$ac_cv_search_dn_expand" = no; then
  for ac_lib in resolv; do
    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
    cat >conftest.$ac_ext <<_ACEOF
-#line 15074 "configure"
+#line 15229 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15090,16 +15245,16 @@ dn_expand ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15093: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15248: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:15096: \$? = $ac_status" >&5
+  echo "$as_me:15251: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15099: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15254: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:15102: \$? = $ac_status" >&5
+  echo "$as_me:15257: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_search_dn_expand="-l$ac_lib"
 break
@@ -15112,7 +15267,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:15115: result: $ac_cv_search_dn_expand" >&5
+echo "$as_me:15270: 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"
@@ -15122,13 +15277,13 @@ fi
 for ac_func in _getshort _getlong
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15125: checking for $ac_func" >&5
+echo "$as_me:15280: 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 15131 "configure"
+#line 15286 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -15159,16 +15314,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15162: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15317: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:15165: \$? = $ac_status" >&5
+  echo "$as_me:15320: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15168: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15323: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:15171: \$? = $ac_status" >&5
+  echo "$as_me:15326: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -15178,7 +15333,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:15181: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:15336: 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
@@ -15188,13 +15343,13 @@ EOF
 fi
 done
-                echo "$as_me:15191: checking for HEADER.ad" >&5
+                echo "$as_me:15346: 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 15197 "configure"
+#line 15352 "configure"
 #include "confdefs.h"
 #include <arpa/nameser.h>
@@ -15209,16 +15364,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15212: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15367: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:15215: \$? = $ac_status" >&5
+  echo "$as_me:15370: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15218: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15373: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:15221: \$? = $ac_status" >&5
+  echo "$as_me:15376: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_member_HEADER_ad=yes
 else
@@ -15228,7 +15383,7 @@ ac_cv_member_HEADER_ad=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:15231: result: $ac_cv_member_HEADER_ad" >&5
+echo "$as_me:15386: 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
@@ -15258,17 +15413,17 @@ EOF
                KRB5_MSG="yes"
-                echo "$as_me:15261: checking for krb5-config" >&5
+                echo "$as_me:15416: 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:15265: result: $KRB5CONF" >&5
+                        echo "$as_me:15420: result: $KRB5CONF" >&5
 echo "${ECHO_T}$KRB5CONF" >&6
-                        echo "$as_me:15268: checking for gssapi support" >&5
+                        echo "$as_me:15423: 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:15271: result: yes" >&5
+                                echo "$as_me:15426: result: yes" >&5
 echo "${ECHO_T}yes" >&6
                                cat >>confdefs.h <<\EOF
 #define GSSAPI 1
@@ -15276,17 +15431,17 @@ EOF
                                k5confopts=gssapi
                        else
-                                echo "$as_me:15279: result: no" >&5
+                                echo "$as_me:15434: result: no" >&5
 echo "${ECHO_T}no" >&6
                                k5confopts=""
                        fi
                        K5CFLAGS="`$KRB5CONF --cflags $k5confopts`"
                        K5LIBS="`$KRB5CONF --libs $k5confopts`"
                        CPPFLAGS="$CPPFLAGS $K5CFLAGS"
-                        echo "$as_me:15286: checking whether we are using Heimdal" >&5
+                        echo "$as_me:15441: 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 15289 "configure"
+#line 15444 "configure"
 #include "confdefs.h"
 #include <krb5.h>
 int
@@ -15298,18 +15453,18 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15301: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15456: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:15304: \$? = $ac_status" >&5
+  echo "$as_me:15459: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15307: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15462: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:15310: \$? = $ac_status" >&5
+  echo "$as_me:15465: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-   echo "$as_me:15312: result: yes" >&5
+   echo "$as_me:15467: result: yes" >&5
 echo "${ECHO_T}yes" >&6
                                         cat >>confdefs.h <<\EOF
 #define HEIMDAL 1
@@ -15318,20 +15473,20 @@ EOF
 else
  echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:15321: result: no" >&5
+echo "$as_me:15476: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
                else
-                        echo "$as_me:15327: result: no" >&5
+                        echo "$as_me:15482: result: no" >&5
 echo "${ECHO_T}no" >&6
                        CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include"
                        LDFLAGS="$LDFLAGS -L${KRB5ROOT}/lib"
-                        echo "$as_me:15331: checking whether we are using Heimdal" >&5
+                        echo "$as_me:15486: 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 15334 "configure"
+#line 15489 "configure"
 #include "confdefs.h"
 #include <krb5.h>
 int
@@ -15343,18 +15498,18 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15346: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15501: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:15349: \$? = $ac_status" >&5
+  echo "$as_me:15504: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15352: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15507: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:15355: \$? = $ac_status" >&5
+  echo "$as_me:15510: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-   echo "$as_me:15357: result: yes" >&5
+   echo "$as_me:15512: result: yes" >&5
 echo "${ECHO_T}yes" >&6
                                         cat >>confdefs.h <<\EOF
 #define HEIMDAL 1
@@ -15365,13 +15520,13 @@ EOF
 else
  echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:15368: result: no" >&5
+ echo "$as_me:15523: 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:15374: checking for library containing dn_expand" >&5
+                        echo "$as_me:15529: 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
@@ -15379,7 +15534,7 @@ else
  ac_func_search_save_LIBS=$LIBS
 ac_cv_search_dn_expand=no
 cat >conftest.$ac_ext <<_ACEOF
-#line 15382 "configure"
+#line 15537 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15398,16 +15553,16 @@ dn_expand ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15401: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15556: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:15404: \$? = $ac_status" >&5
+  echo "$as_me:15559: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15407: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15562: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:15410: \$? = $ac_status" >&5
+  echo "$as_me:15565: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_search_dn_expand="none required"
 else
@@ -15419,7 +15574,7 @@ if test "$ac_cv_search_dn_expand" = no; then
  for ac_lib in resolv; do
    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
    cat >conftest.$ac_ext <<_ACEOF
-#line 15422 "configure"
+#line 15577 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15438,16 +15593,16 @@ dn_expand ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15441: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15596: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:15444: \$? = $ac_status" >&5
+  echo "$as_me:15599: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15447: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15602: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:15450: \$? = $ac_status" >&5
+  echo "$as_me:15605: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_search_dn_expand="-l$ac_lib"
 break
@@ -15460,14 +15615,14 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:15463: result: $ac_cv_search_dn_expand" >&5
+echo "$as_me:15618: 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:15470: checking for gss_init_sec_context in -lgssapi" >&5
+                        echo "$as_me:15625: 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
@@ -15475,7 +15630,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgssapi $K5LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15478 "configure"
+#line 15633 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15494,16 +15649,16 @@ gss_init_sec_context ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15497: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15652: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:15500: \$? = $ac_status" >&5
+  echo "$as_me:15655: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15503: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15658: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:15506: \$? = $ac_status" >&5
+  echo "$as_me:15661: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_gssapi_gss_init_sec_context=yes
 else
@@ -15514,7 +15669,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15517: result: $ac_cv_lib_gssapi_gss_init_sec_context" >&5
+echo "$as_me:15672: 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
@@ -15523,7 +15678,7 @@ EOF
                                  K5LIBS="-lgssapi $K5LIBS"
 else
-   echo "$as_me:15526: checking for gss_init_sec_context in -lgssapi_krb5" >&5
+   echo "$as_me:15681: 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
@@ -15531,7 +15686,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgssapi_krb5 $K5LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15534 "configure"
+#line 15689 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15550,16 +15705,16 @@ gss_init_sec_context ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15553: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15708: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:15556: \$? = $ac_status" >&5
+  echo "$as_me:15711: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15559: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15714: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:15562: \$? = $ac_status" >&5
+  echo "$as_me:15717: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_gssapi_krb5_gss_init_sec_context=yes
 else
@@ -15570,7 +15725,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15573: result: $ac_cv_lib_gssapi_krb5_gss_init_sec_context" >&5
+echo "$as_me:15728: 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
@@ -15579,29 +15734,29 @@ EOF
                                          K5LIBS="-lgssapi_krb5 $K5LIBS"
 else
-  { echo "$as_me:15582: WARNING: Cannot find any suitable gss-api library - build may fail" >&5
+  { echo "$as_me:15737: 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:15588: checking for gssapi.h" >&5
+                        echo "$as_me:15743: 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 15594 "configure"
+#line 15749 "configure"
 #include "confdefs.h"
 #include <gssapi.h>
 _ACEOF
-if { (eval echo "$as_me:15598: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15753: \"$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:15604: \$? = $ac_status" >&5
+  echo "$as_me:15759: \$? = $ac_status" >&5
  (exit $ac_status); } >/dev/null; then
  if test -s conftest.err; then
    ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15620,7 +15775,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:15623: result: $ac_cv_header_gssapi_h" >&5
+echo "$as_me:15778: 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
  :
@@ -15631,23 +15786,23 @@ else
 for ac_header in gssapi.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:15634: checking for $ac_header" >&5
+echo "$as_me:15789: 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 15640 "configure"
+#line 15795 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:15644: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15799: \"$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:15650: \$? = $ac_status" >&5
+  echo "$as_me:15805: \$? = $ac_status" >&5
  (exit $ac_status); } >/dev/null; then
  if test -s conftest.err; then
    ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15666,7 +15821,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:15669: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:15824: 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
@@ -15674,7 +15829,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
 EOF
 else
-  { echo "$as_me:15677: WARNING: Cannot find any suitable gss-api header - build may fail" >&5
+  { echo "$as_me:15832: 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
@@ -15684,23 +15839,23 @@ fi
                        oldCPP="$CPPFLAGS"
                        CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include/gssapi"
-                        echo "$as_me:15687: checking for gssapi_krb5.h" >&5
+                        echo "$as_me:15842: 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 15693 "configure"
+#line 15848 "configure"
 #include "confdefs.h"
 #include <gssapi_krb5.h>
 _ACEOF
-if { (eval echo "$as_me:15697: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15852: \"$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:15703: \$? = $ac_status" >&5
+  echo "$as_me:15858: \$? = $ac_status" >&5
  (exit $ac_status); } >/dev/null; then
  if test -s conftest.err; then
    ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15719,7 +15874,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:15722: result: $ac_cv_header_gssapi_krb5_h" >&5
+echo "$as_me:15877: 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
  :
@@ -15739,23 +15894,23 @@ fi
 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:15742: checking for $ac_header" >&5
+echo "$as_me:15897: 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 15748 "configure"
+#line 15903 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:15752: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15907: \"$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:15758: \$? = $ac_status" >&5
+  echo "$as_me:15913: \$? = $ac_status" >&5
  (exit $ac_status); } >/dev/null; then
  if test -s conftest.err; then
    ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15774,7 +15929,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:15777: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:15932: 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
@@ -15787,23 +15942,23 @@ done
 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:15790: checking for $ac_header" >&5
+echo "$as_me:15945: 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 15796 "configure"
+#line 15951 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:15800: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15955: \"$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:15806: \$? = $ac_status" >&5
+  echo "$as_me:15961: \$? = $ac_status" >&5
  (exit $ac_status); } >/dev/null; then
  if test -s conftest.err; then
    ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15822,7 +15977,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:15825: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:15980: 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
@@ -15835,23 +15990,23 @@ done
 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:15838: checking for $ac_header" >&5
+echo "$as_me:15993: 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 15844 "configure"
+#line 15999 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:15848: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:16003: \"$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:15854: \$? = $ac_status" >&5
+  echo "$as_me:16009: \$? = $ac_status" >&5
  (exit $ac_status); } >/dev/null; then
  if test -s conftest.err; then
    ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15870,7 +16025,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:15873: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:16028: 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
@@ -15881,7 +16036,7 @@ fi
 done
        LIBS="$LIBS $K5LIBS"
-        echo "$as_me:15884: checking for library containing k_hasafs" >&5
+        echo "$as_me:16039: 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
@@ -15889,7 +16044,7 @@ else
  ac_func_search_save_LIBS=$LIBS
 ac_cv_search_k_hasafs=no
 cat >conftest.$ac_ext <<_ACEOF
-#line 15892 "configure"
+#line 16047 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15908,16 +16063,16 @@ k_hasafs ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15911: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16066: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:15914: \$? = $ac_status" >&5
+  echo "$as_me:16069: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15917: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16072: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:15920: \$? = $ac_status" >&5
+  echo "$as_me:16075: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_search_k_hasafs="none required"
 else
@@ -15929,7 +16084,7 @@ if test "$ac_cv_search_k_hasafs" = no; then
  for ac_lib in kafs; do
    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
    cat >conftest.$ac_ext <<_ACEOF
-#line 15932 "configure"
+#line 16087 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15948,16 +16103,16 @@ k_hasafs ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15951: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16106: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:15954: \$? = $ac_status" >&5
+  echo "$as_me:16109: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15957: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16112: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:15960: \$? = $ac_status" >&5
+  echo "$as_me:16115: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_search_k_hasafs="-l$ac_lib"
 break
@@ -15970,7 +16125,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:15973: result: $ac_cv_search_k_hasafs" >&5
+echo "$as_me:16128: 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"
@@ -15980,6 +16135,105 @@ EOF
 fi
+        echo "$as_me:16138: 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
+else
+  ac_func_search_save_LIBS=$LIBS
+ac_cv_search_krb5_init_ets=no
+cat >conftest.$ac_ext <<_ACEOF
+#line 16146 "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 krb5_init_ets ();
+int
+main ()
+{
+krb5_init_ets ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:16165: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:16168: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:16171: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:16174: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_search_krb5_init_ets="none required"
+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 "$ac_cv_search_krb5_init_ets" = no; then
+  for ac_lib in $K5LIBS; do
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+    cat >conftest.$ac_ext <<_ACEOF
+#line 16186 "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 krb5_init_ets ();
+int
+main ()
+{
+krb5_init_ets ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:16205: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:16208: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:16211: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:16214: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_search_krb5_init_ets="-l$ac_lib"
+break
+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
+  done
+fi
+LIBS=$ac_func_search_save_LIBS
+fi
+echo "$as_me:16227: 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"
+  cat >>confdefs.h <<\EOF
+#define KRB5_INIT_ETS 1
+EOF
+fi
 fi;
 # Looking for programs, paths and files
@@ -16013,7 +16267,7 @@ else
                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:16016: checking for $ac_word" >&5
+echo "$as_me:16270: 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
@@ -16030,7 +16284,7 @@ for ac_dir in $ac_dummy; do
  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:16033: found $ac_dir/$ac_word" >&5
+   echo "$as_me:16287: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -16041,10 +16295,10 @@ fi
 xauth_path=$ac_cv_path_xauth_path
 if test -n "$xauth_path"; then
-  echo "$as_me:16044: result: $xauth_path" >&5
+  echo "$as_me:16298: result: $xauth_path" >&5
 echo "${ECHO_T}$xauth_path" >&6
 else
-  echo "$as_me:16047: result: no" >&5
+  echo "$as_me:16301: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -16088,13 +16342,13 @@ fi
 if test -z "$no_dev_ptmx" ; then
        if test "x$disable_ptmx_check" != "xyes" ; then
-                echo "$as_me:16091: checking for \"/dev/ptmx\"" >&5
+                echo "$as_me:16345: 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:16097: error: cannot check for file existence when cross compiling" >&5
+  { { echo "$as_me:16351: 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
@@ -16103,7 +16357,7 @@ else
  ac_cv_file___dev_ptmx_=no
 fi
 fi
-echo "$as_me:16106: result: $ac_cv_file___dev_ptmx_" >&5
+echo "$as_me:16360: 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
@@ -16117,13 +16371,13 @@ fi
        fi
 fi
-echo "$as_me:16120: checking for \"/dev/ptc\"" >&5
+echo "$as_me:16374: 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:16126: error: cannot check for file existence when cross compiling" >&5
+  { { echo "$as_me:16380: 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
@@ -16132,7 +16386,7 @@ else
  ac_cv_file___dev_ptc_=no
 fi
 fi
-echo "$as_me:16135: result: $ac_cv_file___dev_ptc_" >&5
+echo "$as_me:16389: 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
@@ -16155,7 +16409,7 @@ if test "${with_mantype+set}" = set; then
                        MANTYPE=$withval
                        ;;
                *)
-                        { { echo "$as_me:16158: error: invalid man type: $withval" >&5
+                        { { echo "$as_me:16412: error: invalid man type: $withval" >&5
 echo "$as_me: error: invalid man type: $withval" >&2;}
   { (exit 1); exit 1; }; }
                        ;;
@@ -16168,7 +16422,7 @@ if test -z "$MANTYPE"; then
 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:16171: checking for $ac_word" >&5
+echo "$as_me:16425: 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
@@ -16185,7 +16439,7 @@ for ac_dir in $ac_dummy; do
  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:16188: found $ac_dir/$ac_word" >&5
+   echo "$as_me:16442: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -16196,10 +16450,10 @@ fi
 NROFF=$ac_cv_path_NROFF
 if test -n "$NROFF"; then
-  echo "$as_me:16199: result: $NROFF" >&5
+  echo "$as_me:16453: result: $NROFF" >&5
 echo "${ECHO_T}$NROFF" >&6
 else
-  echo "$as_me:16202: result: no" >&5
+  echo "$as_me:16456: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -16256,10 +16510,10 @@ EOF
 fi;
 if test -z "$disable_shadow" ; then
-        echo "$as_me:16259: checking if the systems has expire shadow information" >&5
+        echo "$as_me:16513: 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 16262 "configure"
+#line 16516 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -16275,16 +16529,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16278: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16532: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:16281: \$? = $ac_status" >&5
+  echo "$as_me:16535: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16284: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16538: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:16287: \$? = $ac_status" >&5
+  echo "$as_me:16541: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   sp_expire_available=yes
 else
@@ -16295,14 +16549,14 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
        if test "x$sp_expire_available" = "xyes" ; then
-                echo "$as_me:16298: result: yes" >&5
+                echo "$as_me:16552: result: yes" >&5
 echo "${ECHO_T}yes" >&6
                cat >>confdefs.h <<\EOF
 #define HAS_SHADOW_EXPIRE 1
 EOF
        else
-                echo "$as_me:16305: result: no" >&5
+                echo "$as_me:16559: result: no" >&5
 echo "${ECHO_T}no" >&6
        fi
 fi
@@ -16339,13 +16593,13 @@ if test "${enable_etc_default_login+set}" = set; then
 else
-echo "$as_me:16342: checking for \"/etc/default/login\"" >&5
+echo "$as_me:16596: 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:16348: error: cannot check for file existence when cross compiling" >&5
+  { { echo "$as_me:16602: 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
@@ -16354,7 +16608,7 @@ else
  ac_cv_file___etc_default_login_=no
 fi
 fi
-echo "$as_me:16357: result: $ac_cv_file___etc_default_login_" >&5
+echo "$as_me:16611: 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
@@ -16382,7 +16636,7 @@ if test "${with_default_path+set}" = set; then
  withval="$with_default_path"
                if test "x$external_path_file" = "x/etc/login.conf" ; then
-                        { echo "$as_me:16385: WARNING:
+                        { echo "$as_me:16639: WARNING:
 --with-default-path=PATH has no effect on this system.
 Edit /etc/login.conf instead." >&5
 echo "$as_me: WARNING:
@@ -16390,7 +16644,7 @@ echo "$as_me: WARNING:
 Edit /etc/login.conf instead." >&2;}
                elif test "x$withval" != "xno" ; then
                        if test ! -z "$external_path_file" ; then
-                                { echo "$as_me:16393: WARNING:
+                                { echo "$as_me:16647: WARNING:
 --with-default-path=PATH will only be used if PATH is not defined in
 $external_path_file ." >&5
 echo "$as_me: WARNING:
@@ -16403,11 +16657,11 @@ $external_path_file ." >&2;}
 else
   if test "x$external_path_file" = "x/etc/login.conf" ; then
-                { echo "$as_me:16406: WARNING: Make sure the path to scp is in /etc/login.conf" >&5
+                { echo "$as_me:16660: 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:16410: WARNING:
+                        { echo "$as_me:16664: 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:
@@ -16419,7 +16673,7 @@ otherwise scp will not work." >&2;}
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 16422 "configure"
+#line 16676 "configure"
 #include "confdefs.h"
 /* find out what STDPATH is */
@@ -16456,15 +16710,15 @@ main()
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:16459: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16713: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:16462: \$? = $ac_status" >&5
+  echo "$as_me:16716: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:16464: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16718: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:16467: \$? = $ac_status" >&5
+  echo "$as_me:16721: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   user_path=`cat conftest.stdpath`
 else
@@ -16488,7 +16742,7 @@ fi
                        echo $user_path | grep "^$t_bindir"  > /dev/null 2>&1
                        if test $? -ne 0  ; then
                                user_path=$user_path:$t_bindir
-                                echo "$as_me:16491: result: Adding $t_bindir to USER_PATH so scp will work" >&5
+                                echo "$as_me:16745: 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
@@ -16518,7 +16772,7 @@ EOF
 fi;
-echo "$as_me:16521: checking if we need to convert IPv4 in IPv6-mapped addresses" >&5
+echo "$as_me:16775: 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"
@@ -16527,7 +16781,7 @@ if test "${with_4in6+set}" = set; then
  withval="$with_4in6"
                if test "x$withval" != "xno" ; then
-                        echo "$as_me:16530: result: yes" >&5
+                        echo "$as_me:16784: result: yes" >&5
 echo "${ECHO_T}yes" >&6
                        cat >>confdefs.h <<\EOF
 #define IPV4_IN_IPV6 1
@@ -16535,14 +16789,14 @@ EOF
                        IPV4_IN6_HACK_MSG="yes"
                else
-                        echo "$as_me:16538: result: no" >&5
+                        echo "$as_me:16792: result: no" >&5
 echo "${ECHO_T}no" >&6
                fi
 else
                if test "x$inet6_default_4in6" = "xyes"; then
-                        echo "$as_me:16545: result: yes (default)" >&5
+                        echo "$as_me:16799: result: yes (default)" >&5
 echo "${ECHO_T}yes (default)" >&6
                        cat >>confdefs.h <<\EOF
 #define IPV4_IN_IPV6 1
@@ -16550,7 +16804,7 @@ EOF
                        IPV4_IN6_HACK_MSG="yes"
                else
-                        echo "$as_me:16553: result: no (default)" >&5
+                        echo "$as_me:16807: result: no (default)" >&5
 echo "${ECHO_T}no (default)" >&6
                fi
@@ -16590,7 +16844,7 @@ if test "${with_pid_dir+set}" = set; then
                if test "x$withval" != "xno" ; then
                        piddir=$withval
                        if test ! -d $piddir ; then
-                        { echo "$as_me:16593: WARNING: ** no $piddir directory on this system **" >&5
+                        { echo "$as_me:16847: WARNING: ** no $piddir directory on this system **" >&5
 echo "$as_me: WARNING: ** no $piddir directory on this system **" >&2;}
                        fi
                fi
@@ -16713,10 +16967,10 @@ EOF
 fi;
-echo "$as_me:16716: checking if your system defines LASTLOG_FILE" >&5
+echo "$as_me:16970: 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 16719 "configure"
+#line 16973 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -16740,29 +16994,29 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16743: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16997: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:16746: \$? = $ac_status" >&5
+  echo "$as_me:17000: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16749: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17003: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:16752: \$? = $ac_status" >&5
+  echo "$as_me:17006: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-   echo "$as_me:16754: result: yes" >&5
+   echo "$as_me:17008: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
  echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-                echo "$as_me:16760: result: no" >&5
+                echo "$as_me:17014: result: no" >&5
 echo "${ECHO_T}no" >&6
-                echo "$as_me:16762: checking if your system defines _PATH_LASTLOG" >&5
+                echo "$as_me:17016: 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 16765 "configure"
+#line 17019 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -16783,24 +17037,24 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16786: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17040: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:16789: \$? = $ac_status" >&5
+  echo "$as_me:17043: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16792: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17046: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:16795: \$? = $ac_status" >&5
+  echo "$as_me:17049: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-   echo "$as_me:16797: result: yes" >&5
+   echo "$as_me:17051: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
  echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-                        echo "$as_me:16803: result: no" >&5
+                        echo "$as_me:17057: result: no" >&5
 echo "${ECHO_T}no" >&6
                        system_lastlog_path=no
@@ -16818,7 +17072,7 @@ if test -z "$conf_lastlog_location"; then
                                fi
                done
                if test -z "$conf_lastlog_location"; then
-                        { echo "$as_me:16821: WARNING: ** Cannot find lastlog **" >&5
+                        { echo "$as_me:17075: WARNING: ** Cannot find lastlog **" >&5
 echo "$as_me: WARNING: ** Cannot find lastlog **" >&2;}
                                        fi
        fi
@@ -16831,10 +17085,10 @@ EOF
 fi
-echo "$as_me:16834: checking if your system defines UTMP_FILE" >&5
+echo "$as_me:17088: 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 16837 "configure"
+#line 17091 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -16852,23 +17106,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16855: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17109: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:16858: \$? = $ac_status" >&5
+  echo "$as_me:17112: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16861: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17115: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:16864: \$? = $ac_status" >&5
+  echo "$as_me:17118: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-   echo "$as_me:16866: result: yes" >&5
+   echo "$as_me:17120: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
  echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:16871: result: no" >&5
+ echo "$as_me:17125: result: no" >&5
 echo "${ECHO_T}no" >&6
          system_utmp_path=no
@@ -16896,10 +17150,10 @@ EOF
 fi
-echo "$as_me:16899: checking if your system defines WTMP_FILE" >&5
+echo "$as_me:17153: 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 16902 "configure"
+#line 17156 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -16917,23 +17171,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16920: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17174: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:16923: \$? = $ac_status" >&5
+  echo "$as_me:17177: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16926: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17180: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:16929: \$? = $ac_status" >&5
+  echo "$as_me:17183: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-   echo "$as_me:16931: result: yes" >&5
+   echo "$as_me:17185: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
  echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:16936: result: no" >&5
+ echo "$as_me:17190: result: no" >&5
 echo "${ECHO_T}no" >&6
          system_wtmp_path=no
@@ -16961,10 +17215,10 @@ EOF
 fi
-echo "$as_me:16964: checking if your system defines UTMPX_FILE" >&5
+echo "$as_me:17218: 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 16967 "configure"
+#line 17221 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -16985,23 +17239,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16988: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17242: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:16991: \$? = $ac_status" >&5
+  echo "$as_me:17245: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16994: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17248: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:16997: \$? = $ac_status" >&5
+  echo "$as_me:17251: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-   echo "$as_me:16999: result: yes" >&5
+   echo "$as_me:17253: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
  echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:17004: result: no" >&5
+ echo "$as_me:17258: result: no" >&5
 echo "${ECHO_T}no" >&6
          system_utmpx_path=no
@@ -17021,10 +17275,10 @@ EOF
 fi
-echo "$as_me:17024: checking if your system defines WTMPX_FILE" >&5
+echo "$as_me:17278: 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 17027 "configure"
+#line 17281 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -17045,23 +17299,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17048: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17302: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:17051: \$? = $ac_status" >&5
+  echo "$as_me:17305: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17054: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17308: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:17057: \$? = $ac_status" >&5
+  echo "$as_me:17311: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-   echo "$as_me:17059: result: yes" >&5
+   echo "$as_me:17313: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
  echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:17064: result: no" >&5
+ echo "$as_me:17318: result: no" >&5
 echo "${ECHO_T}no" >&6
          system_wtmpx_path=no
@@ -17083,7 +17337,7 @@ fi
 if test ! -z "$blibpath" ; then
        LDFLAGS="$LDFLAGS $blibflags$blibpath"
-        { echo "$as_me:17086: WARNING: Please check and edit blibpath in LDFLAGS in Makefile" >&5
+        { echo "$as_me:17340: 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
@@ -17175,7 +17429,7 @@ DEFS=-DHAVE_CONFIG_H
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:17178: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:17432: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -17348,7 +17602,7 @@ cat >>$CONFIG_STATUS <<\EOF
    echo "$ac_cs_version"; exit 0 ;;
  --he | --h)
    # Conflict between --help and --header
-    { { echo "$as_me:17351: error: ambiguous option: $1
+    { { echo "$as_me:17605: 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;}
@@ -17367,7 +17621,7 @@ Try \`$0 --help' for more information." >&2;}
    ac_need_defaults=false;;
  # This is an error.
-  -*) { { echo "$as_me:17370: error: unrecognized option: $1
+  -*) { { echo "$as_me:17624: 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;}
@@ -17407,7 +17661,7 @@ do
  "scard/Makefile" ) CONFIG_FILES="$CONFIG_FILES scard/Makefile" ;;
  "ssh_prng_cmds" ) CONFIG_FILES="$CONFIG_FILES ssh_prng_cmds" ;;
  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-  *) { { echo "$as_me:17410: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:17664: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
   { (exit 1); exit 1; }; };;
  esac
@@ -17664,7 +17918,7 @@ done; }
  esac
  if test x"$ac_file" != x-; then
-    { echo "$as_me:17667: creating $ac_file" >&5
+    { echo "$as_me:17921: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
    rm -f "$ac_file"
  fi
@@ -17682,7 +17936,7 @@ echo "$as_me: creating $ac_file" >&6;}
      -) echo $tmp/stdin ;;
      [\\/$]*)
         # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:17685: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:17939: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
   { (exit 1); exit 1; }; }
         echo $f;;
@@ -17695,7 +17949,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
           echo $srcdir/$f
         else
           # /dev/null tree
-           { { echo "$as_me:17698: error: cannot find input file: $f" >&5
+           { { echo "$as_me:17952: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
   { (exit 1); exit 1; }; }
         fi;;
@@ -17756,7 +18010,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
  * )   ac_file_in=$ac_file.in ;;
  esac
-  test x"$ac_file" != x- && { echo "$as_me:17759: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:18013: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
  # First look for the input files in the build tree, otherwise in the
@@ -17767,7 +18021,7 @@ echo "$as_me: creating $ac_file" >&6;}
      -) echo $tmp/stdin ;;
      [\\/$]*)
         # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:17770: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:18024: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
   { (exit 1); exit 1; }; }
         echo $f;;
@@ -17780,7 +18034,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
           echo $srcdir/$f
         else
           # /dev/null tree
-           { { echo "$as_me:17783: error: cannot find input file: $f" >&5
+           { { echo "$as_me:18037: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
   { (exit 1); exit 1; }; }
         fi;;
@@ -17810,7 +18064,7 @@ s/[\\&,]/\\&/g
 s,[\\$`],\\&,g
 t clear
 : clear
-s,^[    ]*#[    ]*define[       ][      ]*\(\([^        (][^    (]*\)([^)]*)\)[         ]*\(.*\)$,${ac_dA}\2${ac_dB}\1${ac_dC}\3${ac_dD},gp
+s,^[    ]*#[    ]*define[       ][      ]*\([^  (][^    (]*\)\(([^)]*)\)[       ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
 t end
 s,^[    ]*#[    ]*define[       ][      ]*\([^  ][^     ]*\)[   ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
 : end
@@ -17897,7 +18151,7 @@ cat >>$CONFIG_STATUS <<\EOF
  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:17900: $ac_file is unchanged" >&5
+      { echo "$as_me:18154: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
    else
      ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
diff --git a/configure.ac b/configure.ac
index 836e31730..6ba4d244a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,18 @@
-# $Id: configure.ac,v 1.202 2004/02/24 05:47:04 tim Exp $
+# $Id: configure.ac,v 1.214 2004/04/17 03:03:07 tim Exp $
+#
+# Copyright (c) 1999-2004 Damien Miller
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -195,10 +209,7 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
        AC_DEFINE(DISABLE_UTMP)
        AC_DEFINE(LOCKED_PASSWD_STRING, "*")
        AC_DEFINE(SPT_TYPE,SPT_PSTAT)
-        case "$host" in
+        check_for_hpux_broken_getaddrinfo=1
-        *-*-hpux11.11*)
-                AC_DEFINE(BROKEN_GETADDRINFO);;
-        esac
        LIBS="$LIBS -lsec"
        AC_CHECK_LIB(xnet, t_error, ,AC_MSG_ERROR([*** -lxnet needed on HP-UX - check config.log ***]))
        ;;
@@ -221,6 +232,7 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
        AC_DEFINE(SETEUID_BREAKS_SETUID)
        AC_DEFINE(BROKEN_SETREUID)
        AC_DEFINE(BROKEN_SETREGID)
+        AC_DEFINE(BROKEN_UPDWTMPX)
        AC_DEFINE(WITH_ABBREV_NO_TTY)
        AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")
        ;;
@@ -230,7 +242,7 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
        check_for_openpty_ctty_bug=1
        AC_DEFINE(DONT_TRY_OTHER_AF)
        AC_DEFINE(PAM_TTY_KLUDGE)
-        AC_DEFINE(LOCKED_PASSWD_PREFIX, "!!")
+        AC_DEFINE(LOCKED_PASSWD_PREFIX, "!")
        AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)
        inet6_default_4in6=yes
        case `uname -r` in
@@ -268,6 +280,9 @@ mips-sony-bsd|mips-sony-newsos4)
        AC_DEFINE(BROKEN_SAVED_UIDS)
        ;;
 *-*-solaris*)
+        if test "x$withval" != "xno" ; then     
+                need_dash_r=1
+        fi
        AC_DEFINE(PAM_SUN_CODEBASE)
        AC_DEFINE(LOGIN_NEEDS_UTMPX)
        AC_DEFINE(LOGIN_NEEDS_TERM)
@@ -344,6 +359,9 @@ mips-sony-bsd|mips-sony-newsos4)
        AC_DEFINE(HAVE_SECUREWARE)
        AC_DEFINE(DISABLE_SHADOW)
        AC_DEFINE(BROKEN_SAVED_UIDS)
+        AC_DEFINE(SETEUID_BREAKS_SETUID)
+        AC_DEFINE(BROKEN_SETREUID)
+        AC_DEFINE(BROKEN_SETREGID)
        AC_DEFINE(WITH_ABBREV_NO_TTY)
        AC_CHECK_FUNCS(getluid setluid)
        MANTYPE=man
@@ -491,10 +509,10 @@ AC_CHECK_HEADERS(bstring.h crypt.h endian.h features.h floatingpoint.h \
        netinet/in_systm.h pam/pam_appl.h paths.h pty.h readpassphrase.h \
        rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \
        strings.h sys/strtio.h sys/audit.h sys/bitypes.h sys/bsdtty.h \
-        sys/cdefs.h sys/mman.h sys/pstat.h sys/ptms.h sys/select.h sys/stat.h \
+        sys/cdefs.h sys/mman.h sys/prctl.h sys/pstat.h sys/ptms.h \
-        sys/stream.h sys/stropts.h sys/sysmacros.h sys/time.h sys/timers.h \
+        sys/select.h sys/stat.h sys/stream.h sys/stropts.h \
-        sys/un.h time.h tmpdir.h ttyent.h usersec.h \
+        sys/sysmacros.h sys/time.h sys/timers.h sys/un.h time.h tmpdir.h \
-        util.h utime.h utmp.h utmpx.h vis.h)
+        ttyent.h usersec.h util.h utime.h utmp.h utmpx.h vis.h)
 # Checks for libraries.
 AC_CHECK_FUNC(yp_match, , AC_CHECK_LIB(nsl, yp_match))
@@ -728,6 +746,15 @@ int main() { char *ff = skey_keyinfo(""); ff=""; exit(0); }
                                        AC_MSG_RESULT(no)
                                        AC_MSG_ERROR([** Incomplete or missing s/key libraries.])
                                ])
+                        AC_MSG_CHECKING(if skeychallenge takes 4 arguments)
+                        AC_TRY_COMPILE(
+                                [#include <stdio.h>
+                                 #include <skey.h>],
+                                [(void)skeychallenge(NULL,"name","",0);],
+                                [AC_MSG_RESULT(yes)
+                                 AC_DEFINE(SKEYCHALLENGE_4ARG)],
+                                [AC_MSG_RESULT(no)]
+                        )
                fi
        ]
 )
@@ -767,6 +794,9 @@ AC_ARG_WITH(tcp-wrappers,
                        AC_MSG_CHECKING(for libwrap)
                        AC_TRY_LINK(
                                [
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
 #include <tcpd.h>
                                        int deny_severity = 0, allow_severity = 0;
                                ],
@@ -794,12 +824,12 @@ AC_CHECK_FUNCS(\
        getpeereid _getpty getrlimit getttyent glob inet_aton \
        inet_ntoa inet_ntop innetgr login_getcapbool md5_crypt memmove \
        mkdtemp mmap ngetaddrinfo nsleep ogetaddrinfo openlog_r openpty \
-        pstat readpassphrase realpath recvmsg rresvport_af sendmsg \
+        pstat prctl readpassphrase realpath recvmsg rresvport_af sendmsg \
        setdtablesize setegid setenv seteuid setgroups setlogin setpcred \
        setproctitle setregid setreuid setrlimit \
        setsid setvbuf sigaction sigvec snprintf socketpair strerror \
        strlcat strlcpy strmode strnvis strtoul sysconf tcgetpgrp \
-        truncate updwtmpx utimes vhangup vsnprintf waitpid \
+        truncate unsetenv updwtmpx utimes vhangup vsnprintf waitpid \
 )
 # IRIX has a const char return value for gai_strerror()
@@ -967,6 +997,74 @@ main()
        )
 fi
+if test "x$ac_cv_func_getaddrinfo" = "xyes" -a "x$check_for_hpux_broken_getaddrinfo" = "x1"; then
+        AC_MSG_CHECKING(if getaddrinfo seems to work)
+        AC_TRY_RUN(
+                [
+#include <stdio.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <errno.h>
+#include <netinet/in.h>
+#define TEST_PORT "2222"
+int
+main(void)
+{
+        int err, sock;
+        struct addrinfo *gai_ai, *ai, hints;
+        char ntop[NI_MAXHOST], strport[NI_MAXSERV], *name = NULL;
+        memset(&hints, 0, sizeof(hints));
+        hints.ai_family = PF_UNSPEC;
+        hints.ai_socktype = SOCK_STREAM;
+        hints.ai_flags = AI_PASSIVE;
+        err = getaddrinfo(name, TEST_PORT, &hints, &gai_ai);
+        if (err != 0) {
+                fprintf(stderr, "getaddrinfo failed (%s)", gai_strerror(err));
+                exit(1);
+        }
+        for (ai = gai_ai; ai != NULL; ai = ai->ai_next) {
+                if (ai->ai_family != AF_INET6)
+                        continue;
+                err = getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop,
+                    sizeof(ntop), strport, sizeof(strport),
+                    NI_NUMERICHOST|NI_NUMERICSERV);
+                if (err != 0) {
+                        if (err == EAI_SYSTEM)
+                                perror("getnameinfo EAI_SYSTEM");
+                        else
+                                fprintf(stderr, "getnameinfo failed: %s\n",
+                                    gai_strerror(err));
+                        exit(2);
+                }
+                sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+                if (sock < 0)
+                        perror("socket");
+                if (bind(sock, ai->ai_addr, ai->ai_addrlen) < 0) {
+                        if (errno == EBADF)
+                                exit(3);
+                }
+        }
+        exit(0);
+}
+                ],
+                [
+                        AC_MSG_RESULT(yes)
+                ],
+                [
+                        AC_MSG_RESULT(no)
+                        AC_DEFINE(BROKEN_GETADDRINFO)
+                ]
+        )
+fi
 AC_FUNC_GETPGRP
 # Check for PAM libs
@@ -2157,6 +2255,7 @@ AC_ARG_WITH(kerberos5,
        LIBS="$LIBS $K5LIBS"
        AC_SEARCH_LIBS(k_hasafs, kafs, AC_DEFINE(USE_AFS))
+        AC_SEARCH_LIBS(krb5_init_ets, $K5LIBS, AC_DEFINE(KRB5_INIT_ETS))
        ]
 )
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index 599244b5d..e690f102f 100644
--- a/contrib/caldera/openssh.spec
+++ b/contrib/caldera/openssh.spec
@@ -17,11 +17,11 @@
 #old cvs stuff.  please update before use.  may be deprecated.
 %define use_stable      1
 %if %{use_stable}
-  %define version       3.8p1
+  %define version       3.8.1p1
  %define cvs           %{nil}
  %define release       1
 %else
-  %define version       3.8p1
+  %define version       3.8.1p1
  %define cvs           cvs20011009
  %define release       0r1
 %endif
@@ -363,4 +363,4 @@ fi
 * Mon Jan 01 1998 ...
 Template Version: 1.31
-$Id: openssh.spec,v 1.48 2004/02/24 05:00:04 djm Exp $
+$Id: openssh.spec,v 1.49 2004/03/21 22:40:04 djm Exp $
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 05750e3a9..b7470092b 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -1,4 +1,4 @@
-%define ver 3.8p1
+%define ver 3.8.1p1
 %define rel 1
 # OpenSSH privilege separation requires a user & group ID
diff --git a/contrib/redhat/sshd.pam b/contrib/redhat/sshd.pam
index d2ab073fc..24f3b4651 100644
--- a/contrib/redhat/sshd.pam
+++ b/contrib/redhat/sshd.pam
@@ -1,8 +1,8 @@
 #%PAM-1.0
-auth       required     /lib/security/pam_stack.so service=system-auth
+auth       required     pam_stack.so service=system-auth
-auth       required     /lib/security/pam_nologin.so
+auth       required     pam_nologin.so
-account    required     /lib/security/pam_stack.so service=system-auth
+account    required     pam_stack.so service=system-auth
-password   required     /lib/security/pam_stack.so service=system-auth
+password   required     pam_stack.so service=system-auth
-session    required     /lib/security/pam_stack.so service=system-auth
+session    required     pam_stack.so service=system-auth
-session    required     /lib/security/pam_limits.so
+session    required     pam_limits.so
-session    optional     /lib/security/pam_console.so
+session    optional     pam_console.so
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index 7eb71adf4..2b43d0368 100644
--- a/contrib/suse/openssh.spec
+++ b/contrib/suse/openssh.spec
@@ -1,6 +1,6 @@
 Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation
 Name: openssh
-Version: 3.8p1
+Version: 3.8.1p1
 URL: http://www.openssh.com/
 Release: 1
 Source0: openssh-%{version}.tar.gz
diff --git a/defines.h b/defines.h
index 5e1cac7bc..9b72afecb 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
-/* $Id: defines.h,v 1.110 2004/02/10 02:01:14 dtucker Exp $ */
+/* $Id: defines.h,v 1.115 2004/04/14 07:24:30 dtucker Exp $ */
 /* Constants */
@@ -507,6 +507,10 @@ struct winsize {
 # undef HAVE_GAI_STRERROR
 #endif
+#if defined(BROKEN_UPDWTMPX) && defined(HAVE_UPDWTMPX)
+# undef HAVE_UPDWTMPX
+#endif
 #if !defined(HAVE_MEMMOVE) && defined(HAVE_BCOPY)
 # define memmove(s1, s2, n) bcopy((s2), (s1), (n))
 #endif /* !defined(HAVE_MEMMOVE) && defined(HAVE_BCOPY) */
@@ -534,6 +538,12 @@ struct winsize {
 #  define krb5_get_err_text(context,code) error_message(code)
 #endif
+#if defined(SKEYCHALLENGE_4ARG)
+# define _compat_skeychallenge(a,b,c,d) skeychallenge(a,b,c,d)
+#else
+# define _compat_skeychallenge(a,b,c,d) skeychallenge(a,b,c)
+#endif
 /* Maximum number of file descriptors available */
 #ifdef HAVE_SYSCONF
 # define SSH_SYSFDMAX sysconf(_SC_OPEN_MAX)
@@ -611,11 +621,22 @@ struct winsize {
 #endif
+#ifndef UT_LINESIZE
+# define UT_LINESIZE 8
+#endif
 /* I hope that the presence of LASTLOG_FILE is enough to detect this */
 #if defined(LASTLOG_FILE) && !defined(DISABLE_LASTLOG)
 #  define USE_LASTLOG
 #endif
+#ifdef HAVE_OSF_SIA
+# ifdef USE_SHADOW
+#  undef USE_SHADOW
+# endif
+# define CUSTOM_SYS_AUTH_PASSWD 1
+#endif
 /** end of login recorder definitions */
 #endif /* _DEFINES_H */
diff --git a/dh.c b/dh.c
index c7a3e18be..afd1e05d0 100644
--- a/dh.c
+++ b/dh.c
@@ -23,7 +23,7 @@
 */
 #include "includes.h"
-RCSID("$OpenBSD: dh.c,v 1.26 2003/12/16 15:51:54 markus Exp $");
+RCSID("$OpenBSD: dh.c,v 1.29 2004/02/27 22:49:27 dtucker Exp $");
 #include "xmalloc.h"
@@ -91,6 +91,9 @@ parse_prime(int linenum, char *line, struct dhgroup *dhg)
        if (BN_num_bits(dhg->p) != dhg->size)
                goto failclean;
+        if (BN_is_zero(dhg->g) || BN_is_one(dhg->g))
+                goto failclean;
        return (1);
 failclean:
@@ -105,7 +108,7 @@ DH *
 choose_dh(int min, int wantbits, int max)
 {
        FILE *f;
-        char line[2048];
+        char line[4096];
        int best, bestcount, which;
        int linenum;
        struct dhgroup dhg;
@@ -194,7 +197,7 @@ dh_pub_is_valid(DH *dh, BIGNUM *dh_pub)
 void
 dh_gen_key(DH *dh, int need)
 {
-        int i, bits_set = 0, tries = 0;
+        int i, bits_set, tries = 0;
        if (dh->p == NULL)
                fatal("dh_gen_key: dh->p == NULL");
@@ -211,7 +214,7 @@ dh_gen_key(DH *dh, int need)
                        fatal("dh_gen_key: BN_rand failed");
                if (DH_generate_key(dh) == 0)
                        fatal("DH_generate_key");
-                for (i = 0; i <= BN_num_bits(dh->priv_key); i++)
+                for (i = 0, bits_set = 0; i <= BN_num_bits(dh->priv_key); i++)
                        if (BN_is_bit_set(dh->priv_key, i))
                                bits_set++;
                debug2("dh_gen_key: priv key bits set: %d/%d",
diff --git a/gss-serv-krb5.c b/gss-serv-krb5.c
index 8ba3e7182..4e3598ead 100644
--- a/gss-serv-krb5.c
+++ b/gss-serv-krb5.c
@@ -65,7 +65,9 @@ ssh_gssapi_krb5_init()
                logit("Cannot initialize krb5 context");
                return 0;
        }
+#ifdef KRB5_INIT_ETS
        krb5_init_ets(krb_context);
+#endif
        return 1;
 }
diff --git a/loginrec.c b/loginrec.c
index 71dbaea15..b74d412e6 100644
--- a/loginrec.c
+++ b/loginrec.c
@@ -158,7 +158,7 @@
 #include "log.h"
 #include "atomicio.h"
-RCSID("$Id: loginrec.c,v 1.54 2004/02/10 05:49:35 dtucker Exp $");
+RCSID("$Id: loginrec.c,v 1.56 2004/04/08 06:16:06 dtucker Exp $");
 #ifdef HAVE_UTIL_H
 #  include <util.h>
@@ -1354,7 +1354,7 @@ static int
 syslogin_perform_logout(struct logininfo *li)
 {
 # ifdef HAVE_LOGOUT
-        char line[8];
+        char line[UT_LINESIZE];
        (void)line_stripname(line, li->line, sizeof(line));
diff --git a/monitor.c b/monitor.c
index 30f7258a0..9c30c1c39 100644
--- a/monitor.c
+++ b/monitor.c
@@ -37,7 +37,13 @@ RCSID("$OpenBSD: monitor.c,v 1.55 2004/02/05 05:37:17 dtucker Exp $");
 #include "auth.h"
 #include "kex.h"
 #include "dh.h"
+#ifdef TARGET_OS_MAC    /* XXX Broken krb5 headers on Mac */
+#undef TARGET_OS_MAC
 #include "zlib.h"
+#define TARGET_OS_MAC 1
+#else
+#include "zlib.h"
+#endif
 #include "packet.h"
 #include "auth-options.h"
 #include "sshpty.h"
@@ -738,7 +744,8 @@ mm_answer_skeyquery(int socket, Buffer *m)
        char challenge[1024];
        u_int success;
-        success = skeychallenge(&skey, authctxt->user, challenge) < 0 ? 0 : 1;
+        success = _compat_skeychallenge(&skey, authctxt->user, challenge,
+            sizeof(challenge)) < 0 ? 0 : 1;
        buffer_clear(m);
        buffer_put_int(m, success);
diff --git a/monitor_wrap.c b/monitor_wrap.c
index b1b1c3a61..ee2dc2027 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -40,7 +40,13 @@ RCSID("$OpenBSD: monitor_wrap.c,v 1.35 2003/11/17 11:06:07 markus Exp $");
 #include "packet.h"
 #include "mac.h"
 #include "log.h"
+#ifdef TARGET_OS_MAC    /* XXX Broken krb5 headers on Mac */
+#undef TARGET_OS_MAC
 #include "zlib.h"
+#define TARGET_OS_MAC 1
+#else
+#include "zlib.h"
+#endif
 #include "monitor.h"
 #include "monitor_wrap.h"
 #include "xmalloc.h"
diff --git a/openbsd-compat/bsd-cygwin_util.c b/openbsd-compat/bsd-cygwin_util.c
index a87cf3c97..92cdba6e0 100644
--- a/openbsd-compat/bsd-cygwin_util.c
+++ b/openbsd-compat/bsd-cygwin_util.c
@@ -29,7 +29,7 @@
 #include "includes.h"
-RCSID("$Id: bsd-cygwin_util.c,v 1.11 2003/08/07 06:23:43 dtucker Exp $");
+RCSID("$Id: bsd-cygwin_util.c,v 1.12 2004/04/18 11:15:45 djm Exp $");
 #ifdef HAVE_CYGWIN
@@ -77,6 +77,7 @@ binary_pipe(int fd[2])
 #define HAS_CREATE_TOKEN 1
 #define HAS_NTSEC_BY_DEFAULT 2
+#define HAS_CREATE_TOKEN_WO_NTSEC 3
 static int 
 has_capability(int what)
@@ -84,6 +85,7 @@ has_capability(int what)
        static int inited;
        static int has_create_token;
        static int has_ntsec_by_default;
+        static int has_create_token_wo_ntsec;
        /* 
         * has_capability() basically calls uname() and checks if
@@ -113,6 +115,9 @@ has_capability(int what)
                                has_create_token = 1;
                        if (api_major_version > 0 || api_minor_version >= 56)
                                has_ntsec_by_default = 1;
+                        if (major_high > 1 ||
+                            (major_high == 1 && major_low >= 5))
+                                has_create_token_wo_ntsec = 1;
                        inited = 1;
                }
        }
@@ -121,6 +126,8 @@ has_capability(int what)
                return (has_create_token);
        case HAS_NTSEC_BY_DEFAULT:
                return (has_ntsec_by_default);
+        case HAS_CREATE_TOKEN_WO_NTSEC:
+                return (has_create_token_wo_ntsec);
        }
        return (0);
 }
@@ -151,7 +158,8 @@ check_nt_auth(int pwd_authenticated, struct passwd *pw)
                        if (has_capability(HAS_CREATE_TOKEN) &&
                            (ntsec_on(cygwin) ||
                            (has_capability(HAS_NTSEC_BY_DEFAULT) &&
-                            !ntsec_off(cygwin))))
+                             !ntsec_off(cygwin)) ||
+                             has_capability(HAS_CREATE_TOKEN_WO_NTSEC)))
                                has_create_token = 1;
                }
                if (has_create_token < 1 &&
diff --git a/openbsd-compat/bsd-misc.h b/openbsd-compat/bsd-misc.h
index c8073942c..009739b14 100644
--- a/openbsd-compat/bsd-misc.h
+++ b/openbsd-compat/bsd-misc.h
@@ -1,4 +1,4 @@
-/* $Id: bsd-misc.h,v 1.14 2004/02/17 05:49:55 djm Exp $ */
+/* $Id: bsd-misc.h,v 1.15 2004/03/08 11:59:03 dtucker Exp $ */
 /*
 * Copyright (c) 1999-2004 Damien Miller <djm@mindrot.org>
@@ -89,6 +89,10 @@ pid_t tcgetpgrp(int);
 int tcsendbreak(int, int);
 #endif
+#ifndef HAVE_UNSETENV
+void unsetenv(const char *);
+#endif
 /* wrapper for signal interface */
 typedef void (*mysig_t)(int);
 mysig_t mysignal(int sig, mysig_t act);
diff --git a/openbsd-compat/fake-rfc2553.h b/openbsd-compat/fake-rfc2553.h
index eb88605fa..baea07038 100644
--- a/openbsd-compat/fake-rfc2553.h
+++ b/openbsd-compat/fake-rfc2553.h
@@ -1,4 +1,4 @@
-/* $Id: fake-rfc2553.h,v 1.8 2004/02/10 02:05:41 dtucker Exp $ */
+/* $Id: fake-rfc2553.h,v 1.9 2004/03/10 10:06:33 dtucker Exp $ */
 /*
 * Copyright (C) 2000-2003 Damien Miller.  All rights reserved.
@@ -133,6 +133,9 @@ struct addrinfo {
 #endif /* !HAVE_STRUCT_ADDRINFO */
 #ifndef HAVE_GETADDRINFO
+#ifdef getaddrinfo
+# undef getaddrinfo
+#endif
 #define getaddrinfo(a,b,c,d)    (ssh_getaddrinfo(a,b,c,d))
 int getaddrinfo(const char *, const char *, 
    const struct addrinfo *, struct addrinfo **);
diff --git a/openbsd-compat/setenv.c b/openbsd-compat/setenv.c
index b7ba0ce83..c3a86c651 100644
--- a/openbsd-compat/setenv.c
+++ b/openbsd-compat/setenv.c
@@ -30,7 +30,7 @@
 */
 #include "includes.h"
-#ifndef HAVE_SETENV
+#if !defined(HAVE_SETENV) || !defined(HAVE_UNSETENV)
 #if defined(LIBC_SCCS) && !defined(lint)
 static char *rcsid = "$OpenBSD: setenv.c,v 1.6 2003/06/02 20:18:38 millert Exp $";
@@ -77,6 +77,7 @@ __findenv(name, offset)
        return (NULL);
 }
+#ifndef HAVE_SETENV
 /*
 * setenv --
 *      Set the value of the environmental variable "name" to be
@@ -138,7 +139,9 @@ setenv(name, value, rewrite)
                ;
        return (0);
 }
+#endif /* HAVE_SETENV */
+#ifndef HAVE_UNSETENV
 /*
 * unsetenv(name) --
 *      Delete environmental variable "name".
@@ -157,5 +160,6 @@ unsetenv(name)
                        if (!(*P = *(P + 1)))
                                break;
 }
+#endif /* HAVE_UNSETENV */
-#endif /* HAVE_SETENV */
+#endif /* !defined(HAVE_SETENV) || !defined(HAVE_UNSETENV) */
diff --git a/openbsd-compat/xcrypt.c b/openbsd-compat/xcrypt.c
index a0fe6c620..c3cea3c86 100644
--- a/openbsd-compat/xcrypt.c
+++ b/openbsd-compat/xcrypt.c
@@ -24,8 +24,6 @@
 #include "includes.h"
-#if !defined(HAVE_OSF_SIA)
 # ifdef HAVE_CRYPT_H
 #  include <crypt.h>
 # endif
@@ -108,5 +106,3 @@ shadow_pw(struct passwd *pw)
        return pw_password;
 }
-#endif /* !defined(HAVE_OSF_SIA) */
diff --git a/readconf.c b/readconf.c
index dfd83c1b9..2b8ff58d6 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
 */
 #include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.127 2003/12/16 15:49:51 markus Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.128 2004/03/05 10:53:58 markus Exp $");
 #include "ssh.h"
 #include "xmalloc.h"
@@ -105,7 +105,7 @@ typedef enum {
        oClearAllForwardings, oNoHostAuthenticationForLocalhost,
        oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
        oAddressFamily, oGssAuthentication, oGssDelegateCreds,
-        oServerAliveInterval, oServerAliveCountMax,
+        oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
        oProtocolKeepAlives, oSetupTimeOut,
        oDeprecated, oUnsupported
 } OpCodes;
@@ -148,6 +148,7 @@ static struct {
        { "usersh", oDeprecated },
        { "identityfile", oIdentityFile },
        { "identityfile2", oIdentityFile },                     /* alias */
+        { "identitiesonly", oIdentitiesOnly },
        { "hostname", oHostName },
        { "hostkeyalias", oHostKeyAlias },
        { "proxycommand", oProxyCommand },
@@ -739,6 +740,10 @@ parse_int:
                intptr = &options->enable_ssh_keysign;
                goto parse_flag;
+        case oIdentitiesOnly:
+                intptr = &options->identities_only;
+                goto parse_flag;
        case oServerAliveInterval:
        case oProtocolKeepAlives: /* Debian-specific compatibility alias */
                intptr = &options->server_alive_interval;
@@ -878,6 +883,7 @@ initialize_options(Options * options)
        options->smartcard_device = NULL;
        options->enable_ssh_keysign = - 1;
        options->no_host_authentication_for_localhost = - 1;
+        options->identities_only = - 1;
        options->rekey_limit = - 1;
        options->verify_host_key_dns = -1;
        options->server_alive_interval = -1;
@@ -990,6 +996,8 @@ fill_default_options(Options * options)
                clear_forwardings(options);
        if (options->no_host_authentication_for_localhost == - 1)
                options->no_host_authentication_for_localhost = 0;
+        if (options->identities_only == -1)
+                options->identities_only = 0;
        if (options->enable_ssh_keysign == -1)
                options->enable_ssh_keysign = 0;
        if (options->rekey_limit == -1)
diff --git a/readconf.h b/readconf.h
index 8521f85ac..97b6c2be4 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: readconf.h,v 1.59 2003/12/16 15:49:51 markus Exp $    */
+/*      $OpenBSD: readconf.h,v 1.60 2004/03/05 10:53:58 markus Exp $    */
 /*
 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -101,6 +101,7 @@ typedef struct {
        int     enable_ssh_keysign;
        int     rekey_limit;
        int     no_host_authentication_for_localhost;
+        int     identities_only;
        int     server_alive_interval; 
        int     server_alive_count_max;
 }       Options;
diff --git a/regress/Makefile b/regress/Makefile
index 76e28d36d..cf65b3630 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.26 2003/10/11 11:49:49 dtucker Exp $
+#       $OpenBSD: Makefile,v 1.27 2004/02/17 08:23:20 dtucker Exp $
 REGRESS_TARGETS=        t1 t2 t3 t4 t5 t6 t7 t-exec
 tests:          $(REGRESS_TARGETS)
@@ -21,6 +21,7 @@ LTESTS= 	connect \
                broken-pipe \
                try-ciphers \
                yes-head \
+                login-timeout \
                agent \
                agent-getpeereid \
                agent-timeout \
diff --git a/regress/README.regress b/regress/README.regress
index b479c6c07..6ff032b68 100644
--- a/regress/README.regress
+++ b/regress/README.regress
@@ -90,5 +90,8 @@ Known Issues.
  fail (because it's not a tcp socket) and will be identified as
  "unknown", which is then checked against tcpwrappers.
+- If your build requires ssh-rand-helper regress tests will fail
+  unless ssh-rand-helper is in pre-installed (the path to
+  ssh-rand-helper is hard coded).
-$Id: README.regress,v 1.3 2004/01/28 01:26:14 dtucker Exp $
+$Id: README.regress,v 1.4 2004/03/08 20:12:18 tim Exp $
diff --git a/regress/dynamic-forward.sh b/regress/dynamic-forward.sh
index 2b0b825d0..3a6e5c1ef 100644
--- a/regress/dynamic-forward.sh
+++ b/regress/dynamic-forward.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: dynamic-forward.sh,v 1.2 2003/07/03 08:21:46 markus Exp $
+#       $OpenBSD: dynamic-forward.sh,v 1.3 2004/02/28 12:16:57 dtucker Exp $
 #       Placed in the Public Domain.
 tid="dynamic forwarding"
@@ -7,7 +7,7 @@ PORT=4242
 FWDPORT=4243
 DATA=/bin/ls${EXEEXT}
-if have_prog nc && nc -h 2>&1 | grep "x proxy address" >/dev/null; then
+if have_prog nc && nc -h 2>&1 | grep "proxy address" >/dev/null; then
        proxycmd="nc -x 127.0.0.1:$FWDPORT -X"
 elif have_prog connect; then
        proxycmd="connect -S 127.0.0.1:$FWDPORT -"
diff --git a/regress/login-timeout.sh b/regress/login-timeout.sh
new file mode 100644
index 000000000..dfc6e6b44
--- /dev/null
+++ b/regress/login-timeout.sh
@@ -0,0 +1,29 @@
+#       $OpenBSD: login-timeout.sh,v 1.1 2004/02/17 08:23:20 dtucker Exp $
+#       Placed in the Public Domain.
+tid="connect after login grace timeout"
+trace "test login grace with privsep"
+echo "LoginGraceTime 10s" >> $OBJ/sshd_config
+echo "MaxStartups 1" >> $OBJ/sshd_config
+start_sshd
+(echo SSH-2.0-fake; sleep 60) | telnet localhost ${PORT} >/dev/null 2>&1 & 
+sleep 15
+${SSH} -F $OBJ/ssh_config somehost true
+if [ $? -ne 0 ]; then
+        fail "ssh connect after login grace timeout failed with privsep"
+fi
+kill `cat $PIDFILE`
+trace "test login grace without privsep"
+echo "UsePrivilegeSeparation no" >> $OBJ/sshd_config
+start_sshd
+(echo SSH-2.0-fake; sleep 60) | telnet localhost ${PORT} >/dev/null 2>&1 & 
+sleep 15
+${SSH} -F $OBJ/ssh_config somehost true
+if [ $? -ne 0 ]; then
+        fail "ssh connect after login grace timeout failed without privsep"
+fi
diff --git a/regress/sftp-cmds.sh b/regress/sftp-cmds.sh
index 3669b19ff..31b21d1f2 100644
--- a/regress/sftp-cmds.sh
+++ b/regress/sftp-cmds.sh
@@ -85,6 +85,7 @@ echo "get \"$DATA\" $COPY" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
        || fail "get failed"
 cmp $DATA ${COPY} || fail "corrupted copy after get"
+if [ "$os" != "cygwin" ]; then
 rm -f ${QUOTECOPY}
 cp $DATA ${QUOTECOPY}
 verbose "$tid: get filename with quotes"
@@ -92,6 +93,7 @@ echo "get \"$QUOTECOPY_ARG\" ${COPY}" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1
        || fail "put failed"
 cmp ${COPY} ${QUOTECOPY} || fail "corrupted copy after get with quotes"
 rm -f ${QUOTECOPY} ${COPY}
+fi
 rm -f ${COPY}.dd/*
 verbose "$tid: get to directory"
diff --git a/regress/ssh-com-client.sh b/regress/ssh-com-client.sh
index fc953228e..324a0a723 100644
--- a/regress/ssh-com-client.sh
+++ b/regress/ssh-com-client.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: ssh-com-client.sh,v 1.5 2003/05/14 22:08:27 markus Exp $
+#       $OpenBSD: ssh-com-client.sh,v 1.6 2004/02/24 17:06:52 markus Exp $
 #       Placed in the Public Domain.
 tid="connect with ssh.com client"
@@ -19,6 +19,9 @@ VERSIONS="
        3.2.0
        3.2.2
        3.2.3
+        3.2.5
+        3.2.9
+        3.2.9.1
        3.3.0"
 # 2.0.10 2.0.12 2.0.13 don't like the test setup
diff --git a/regress/ssh-com-keygen.sh b/regress/ssh-com-keygen.sh
index dbe9b0a6b..29b02d946 100644
--- a/regress/ssh-com-keygen.sh
+++ b/regress/ssh-com-keygen.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: ssh-com-keygen.sh,v 1.3 2003/05/14 22:08:27 markus Exp $
+#       $OpenBSD: ssh-com-keygen.sh,v 1.4 2004/02/24 17:06:52 markus Exp $
 #       Placed in the Public Domain.
 tid="ssh.com key import"
@@ -22,6 +22,9 @@ VERSIONS="
        3.2.0
        3.2.2
        3.2.3
+        3.2.5
+        3.2.9
+        3.2.9.1
        3.3.0"
 COMPRV=${OBJ}/comkey
diff --git a/regress/ssh-com-sftp.sh b/regress/ssh-com-sftp.sh
index 6ca7dad51..936b4cca7 100644
--- a/regress/ssh-com-sftp.sh
+++ b/regress/ssh-com-sftp.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: ssh-com-sftp.sh,v 1.4 2003/05/14 22:08:27 markus Exp $
+#       $OpenBSD: ssh-com-sftp.sh,v 1.5 2004/02/24 17:06:52 markus Exp $
 #       Placed in the Public Domain.
 tid="basic sftp put/get with ssh.com server"
@@ -35,6 +35,9 @@ VERSIONS="
        3.2.0
        3.2.2
        3.2.3
+        3.2.5
+        3.2.9
+        3.2.9.1
        3.3.0"
 # go for it
diff --git a/regress/ssh-com.sh b/regress/ssh-com.sh
index c3715a242..7bcd85b65 100644
--- a/regress/ssh-com.sh
+++ b/regress/ssh-com.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: ssh-com.sh,v 1.6 2003/11/07 10:16:44 jmc Exp $
+#       $OpenBSD: ssh-com.sh,v 1.7 2004/02/24 17:06:52 markus Exp $
 #       Placed in the Public Domain.
 tid="connect to ssh.com server"
@@ -20,6 +20,9 @@ VERSIONS="
        3.2.0
        3.2.2
        3.2.3
+        3.2.5
+        3.2.9
+        3.2.9.1
        3.3.0"
 # 2.0.10 does not support UserConfigDirectory
 # 2.3.1 requires a config in $HOME/.ssh2
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 98851dc97..986d99287 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: test-exec.sh,v 1.14 2002/04/15 15:19:48 markus Exp $
+#       $OpenBSD: test-exec.sh,v 1.15 2004/02/24 16:56:30 markus Exp $
 #       Placed in the Public Domain.
 PORT=4242
@@ -49,28 +49,28 @@ SFTP=sftp
 SFTPSERVER=/usr/libexec/openssh/sftp-server
 if [ "x$TEST_SSH_SSH" != "x" ]; then
-        SSH=${TEST_SSH_SSH}
+        SSH="${TEST_SSH_SSH}"
 fi
 if [ "x$TEST_SSH_SSHD" != "x" ]; then
-        SSHD=${TEST_SSH_SSHD}
+        SSHD="${TEST_SSH_SSHD}"
 fi
 if [ "x$TEST_SSH_SSHAGENT" != "x" ]; then
-        SSHAGENT=${TEST_SSH_SSHAGENT}
+        SSHAGENT="${TEST_SSH_SSHAGENT}"
 fi
 if [ "x$TEST_SSH_SSHADD" != "x" ]; then
-        SSHADD=${TEST_SSH_SSHADD}
+        SSHADD="${TEST_SSH_SSHADD}"
 fi
 if [ "x$TEST_SSH_SSHKEYGEN" != "x" ]; then
-        SSHKEYGEN=${TEST_SSH_SSHKEYGEN}
+        SSHKEYGEN="${TEST_SSH_SSHKEYGEN}"
 fi
 if [ "x$TEST_SSH_SSHKEYSCAN" != "x" ]; then
-        SSHKEYSCAN=${TEST_SSH_SSHKEYSCAN}
+        SSHKEYSCAN="${TEST_SSH_SSHKEYSCAN}"
 fi
 if [ "x$TEST_SSH_SFTP" != "x" ]; then
-        SFTP=${TEST_SSH_SFTP}
+        SFTP="${TEST_SSH_SFTP}"
 fi
 if [ "x$TEST_SSH_SFTPSERVER" != "x" ]; then
-        SFTPSERVER=${TEST_SSH_SFTPSERVER}
+        SFTPSERVER="${TEST_SSH_SFTPSERVER}"
 fi
 # these should be used in tests
diff --git a/regress/try-ciphers.sh b/regress/try-ciphers.sh
index 2c727f66c..15827e250 100644
--- a/regress/try-ciphers.sh
+++ b/regress/try-ciphers.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: try-ciphers.sh,v 1.8 2003/06/12 15:40:01 markus Exp $
+#       $OpenBSD: try-ciphers.sh,v 1.9 2004/02/28 13:44:45 dtucker Exp $
 #       Placed in the Public Domain.
 tid="try ciphers"
@@ -28,3 +28,19 @@ for c in $ciphers; do
                fail "ssh -1 failed with cipher $c"
        fi
 done
+if ! ${SSH} -oCiphers=acss@openssh.org 2>&1 | grep "Bad SSH2 cipher" >/dev/null
+then
+echo "Ciphers acss@openssh.org" >> $OBJ/sshd_proxy
+c=acss@openssh.org
+for m in $macs; do
+        trace "proto 2 $c mac $m"
+        verbose "test $tid: proto 2 cipher $c mac $m"
+        ${SSH} -F $OBJ/ssh_proxy -2 -m $m -c $c somehost true
+        if [ $? -ne 0 ]; then
+                fail "ssh -2 failed with mac $m cipher $c"
+        fi
+done
+fi
diff --git a/scp.0 b/scp.0
index d107ae7f7..91465bec2 100644
--- a/scp.0
+++ b/scp.0
@@ -77,6 +77,7 @@ DESCRIPTION
                   HostKeyAlias
                   HostName
                   IdentityFile
+                   IdentitiesOnly
                   LogLevel
                   MACs
                   NoHostAuthenticationForLocalhost
@@ -135,4 +136,4 @@ AUTHORS
     Timo Rinne <tri@iki.fi>
     Tatu Ylonen <ylo@cs.hut.fi>
-OpenBSD 3.4                   September 25, 1999                             3
+OpenBSD 3.5                   September 25, 1999                             3
diff --git a/scp.1 b/scp.1
index f5ca1e45a..5a3221127 100644
--- a/scp.1
+++ b/scp.1
@@ -9,7 +9,7 @@
 .\"
 .\" Created: Sun May  7 00:14:37 1995 ylo
 .\"
-.\" $OpenBSD: scp.1,v 1.32 2003/12/16 15:49:51 markus Exp $
+.\" $OpenBSD: scp.1,v 1.33 2004/03/05 10:53:58 markus Exp $
 .\"
 .Dd September 25, 1999
 .Dt SCP 1
@@ -137,6 +137,7 @@ For full details of the options listed below, and their possible values, see
 .It HostKeyAlias
 .It HostName
 .It IdentityFile
+.It IdentitiesOnly
 .It LogLevel
 .It MACs
 .It NoHostAuthenticationForLocalhost
diff --git a/session.c b/session.c
index af2e71992..55db2ffd2 100644
--- a/session.c
+++ b/session.c
@@ -201,6 +201,7 @@ display_loginmsg(void)
                printf("%s\n", (char *)buffer_ptr(&loginmsg));
                buffer_clear(&loginmsg);
        }
+        fflush(stdout);
 }
 void
@@ -492,6 +493,13 @@ do_exec_no_pty(Session *s, const char *command)
        close(err[0]);
        /*
+         * Clear loginmsg, since it's the child's responsibility to display
+         * it to the user, otherwise multiple sessions may accumulate
+         * multiple copies of the login messages.
+         */
+        buffer_clear(&loginmsg);
+        /*
         * Enter the interactive session.  Note: server_loop must be able to
         * handle the case that fdin and fdout are the same.
         */
@@ -1085,9 +1093,9 @@ do_setup_env(Session *s, const char *shell)
        }
 #endif
 #ifdef KRB5
-        if (s->authctxt->krb5_ticket_file)
+        if (s->authctxt->krb5_ccname)
                child_set_env(&env, &envsize, "KRB5CCNAME",
-                    s->authctxt->krb5_ticket_file);
+                    s->authctxt->krb5_ccname);
 #endif
 #ifdef USE_PAM
        /*
diff --git a/sftp-client.c b/sftp-client.c
index 81c5dd497..781d9827a 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -20,7 +20,7 @@
 /* XXX: copy between two remote sites */
 #include "includes.h"
-RCSID("$OpenBSD: sftp-client.c,v 1.46 2004/02/17 05:39:51 djm Exp $");
+RCSID("$OpenBSD: sftp-client.c,v 1.47 2004/03/03 09:30:42 djm Exp $");
 #include "openbsd-compat/sys-queue.h"
@@ -805,13 +805,8 @@ do_download(struct sftp_conn *conn, char *remote_path, char *local_path,
        max_req = 1;
        progress_counter = 0;
-        if (showprogress) {
+        if (showprogress && size != 0)
-                if (size)
+                start_progress_meter(remote_path, size, &progress_counter);
-                        start_progress_meter(remote_path, size,
-                            &progress_counter);
-                else
-                        printf("Fetching %s to %s\n", remote_path, local_path);
-        }
        while (num_req > 0 || max_req > 0) {
                char *data;
@@ -1036,8 +1031,6 @@ do_upload(struct sftp_conn *conn, char *local_path, char *remote_path,
        offset = 0;
        if (showprogress)
                start_progress_meter(local_path, sb.st_size, &offset);
-        else
-                printf("Uploading %s to %s\n", local_path, remote_path);
        for (;;) {
                int len;
diff --git a/sftp-server.0 b/sftp-server.0
index dad6bda73..b18c84c3a 100644
--- a/sftp-server.0
+++ b/sftp-server.0
@@ -15,7 +15,7 @@ DESCRIPTION
 SEE ALSO
     sftp(1), ssh(1), sshd_config(5), sshd(8)
-     T. Ylonen, and S. Lehtinen, SSH File Transfer Protocol, draft-ietf-secsh-
+     T. Ylonen and S. Lehtinen, SSH File Transfer Protocol, draft-ietf-secsh-
     filexfer-00.txt, January 2001, work in progress material.
 AUTHORS
@@ -24,4 +24,4 @@ AUTHORS
 HISTORY
     sftp-server first appeared in OpenBSD 2.8 .
-OpenBSD 3.4                     August 30, 2000                              1
+OpenBSD 3.5                     August 30, 2000                              1
diff --git a/sftp.0 b/sftp.0
index acb400dad..0cb4ac35b 100644
--- a/sftp.0
+++ b/sftp.0
@@ -82,6 +82,7 @@ DESCRIPTION
                   HostKeyAlias
                   HostName
                   IdentityFile
+                   IdentitiesOnly
                   LogLevel
                   MACs
                   NoHostAuthenticationForLocalhost
@@ -214,7 +215,7 @@ SEE ALSO
     ftp(1), scp(1), ssh(1), ssh-add(1), ssh-keygen(1), ssh_config(5),
     sftp-server(8), sshd(8)
-     T. Ylonen, and S. Lehtinen, SSH File Transfer Protocol, draft-ietf-secsh-
+     T. Ylonen and S. Lehtinen, SSH File Transfer Protocol, draft-ietf-secsh-
     filexfer-00.txt, January 2001, work in progress material.
-OpenBSD 3.4                    February 4, 2001                              4
+OpenBSD 3.5                    February 4, 2001                              4
diff --git a/sftp.1 b/sftp.1
index 2a67a888e..b2cab0cda 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.51 2004/01/13 12:17:33 jmc Exp $
+.\" $OpenBSD: sftp.1,v 1.52 2004/03/05 10:53:58 markus Exp $
 .\"
 .\" Copyright (c) 2001 Damien Miller.  All rights reserved.
 .\"
@@ -163,6 +163,7 @@ For full details of the options listed below, and their possible values, see
 .It HostKeyAlias
 .It HostName
 .It IdentityFile
+.It IdentitiesOnly
 .It LogLevel
 .It MACs
 .It NoHostAuthenticationForLocalhost
diff --git a/sftp.c b/sftp.c
index 7f7f50731..a47ccf5a2 100644
--- a/sftp.c
+++ b/sftp.c
@@ -16,7 +16,7 @@
 #include "includes.h"
-RCSID("$OpenBSD: sftp.c,v 1.44 2004/02/17 11:03:08 djm Exp $");
+RCSID("$OpenBSD: sftp.c,v 1.45 2004/03/03 09:31:20 djm Exp $");
 #include "buffer.h"
 #include "xmalloc.h"
@@ -44,7 +44,7 @@ size_t num_requests = 16;
 static pid_t sshpid = -1;
 /* This is set to 0 if the progressmeter is not desired. */
-int showprogress;
+int showprogress = 1;
 int remote_glob(struct sftp_conn *, const char *, int,
    int (*)(const char *, int), glob_t *); /* proto for sftp-glob.c */
@@ -1357,6 +1357,9 @@ main(int argc, char **argv)
                }
        }
+        if (!isatty(STDERR_FILENO))
+                showprogress = 0;
        log_init(argv[0], ll, SYSLOG_FACILITY_USER, 1);
        if (sftp_direct == NULL) {
diff --git a/ssh-add.0 b/ssh-add.0
index 93116334b..62d2b49a8 100644
--- a/ssh-add.0
+++ b/ssh-add.0
@@ -99,4 +99,4 @@ AUTHORS
     ated OpenSSH.  Markus Friedl contributed the support for SSH protocol
     versions 1.5 and 2.0.
-OpenBSD 3.4                   September 25, 1999                             2
+OpenBSD 3.5                   September 25, 1999                             2
diff --git a/ssh-agent.0 b/ssh-agent.0
index 990cbc29b..8967f76a9 100644
--- a/ssh-agent.0
+++ b/ssh-agent.0
@@ -1,4 +1,4 @@
-SSH-AGENT(1)              BSD General Commands Manual             SSH-AGENT(1)
+SSH-AGENT(1)               OpenBSD Reference Manual               SSH-AGENT(1)
 NAME
     ssh-agent - authentication agent
@@ -18,14 +18,14 @@ DESCRIPTION
     The options are as follows:
     -a bind_address
-             Bind the agent to the unix-domain socket bind_address.  The
+             Bind the agent to the unix-domain socket bind_address.  The de-
-             default is /tmp/ssh-XXXXXXXX/agent.<ppid>.
+             fault is /tmp/ssh-XXXXXXXX/agent.<ppid>.
     -c      Generate C-shell commands on stdout.  This is the default if
-             SHELL looks like itM-bM-^@M-^Ys a csh style of shell.
+             SHELL looks like it's a csh style of shell.
     -s      Generate Bourne shell commands on stdout.  This is the default if
-             SHELL does not look like itM-bM-^@M-^Ys a csh style of shell.
+             SHELL does not look like it's a csh style of shell.
     -k      Kill the current agent (given by the SSH_AGENT_PID environment
             variable).
@@ -34,8 +34,8 @@ DESCRIPTION
             Set a default value for the maximum lifetime of identities added
             to the agent.  The lifetime may be specified in seconds or in a
             time format specified in sshd(8).  A lifetime specified for an
-             identity with ssh-add(1) overrides this value.  Without this
+             identity with ssh-add(1) overrides this value.  Without this op-
-             option the default maximum lifetime is forever.
+             tion the default maximum lifetime is forever.
     -d      Debug mode.  When this option is specified ssh-agent will not
             fork.
@@ -53,7 +53,7 @@ DESCRIPTION
     these identities.  ssh-add -l displays the identities currently held by
     the agent.
-     The idea is that the agent is run in the userM-bM-^@M-^Ys local PC, laptop, or ter-
+     The idea is that the agent is run in the user's local PC, laptop, or ter-
     minal.  Authentication data need not be stored on any other machine, and
     authentication passphrases never go over the network.  However, the con-
     nection to the agent is forwarded over SSH remote logins, and the user
@@ -67,17 +67,17 @@ DESCRIPTION
     looks at these variables and uses them to establish a connection to the
     agent.
-     The agent will never send a private key over its request channel.
+     The agent will never send a private key over its request channel.  In-
-     Instead, operations that require a private key will be performed by the
+     stead, operations that require a private key will be performed by the
     agent, and the result will be returned to the requester.  This way, pri-
     vate keys are not exposed to clients using the agent.
     A unix-domain socket is created and the name of this socket is stored in
     the SSH_AUTH_SOCK environment variable.  The socket is made accessible
-     only to the current user.  This method is easily abused by root or
+     only to the current user.  This method is easily abused by root or anoth-
-     another instance of the same user.
+     er instance of the same user.
-     The SSH_AGENT_PID environment variable holds the agentM-bM-^@M-^Ys process ID.
+     The SSH_AGENT_PID environment variable holds the agent's process ID.
     The agent exits automatically when the command given on the command line
     terminates.
@@ -111,4 +111,4 @@ AUTHORS
     ated OpenSSH.  Markus Friedl contributed the support for SSH protocol
     versions 1.5 and 2.0.
-BSD                           September 25, 1999                           BSD
+OpenBSD 3.5                   September 25, 1999                             2
diff --git a/ssh-agent.c b/ssh-agent.c
index e5232fc9b..f5fce6b2a 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -57,6 +57,10 @@ RCSID("$OpenBSD: ssh-agent.c,v 1.117 2003/12/02 17:01:15 markus Exp $");
 #include "scard.h"
 #endif
+#if defined(HAVE_SYS_PRCTL_H)
+#include <sys/prctl.h>  /* For prctl() and PR_SET_DUMPABLE */
+#endif
 typedef enum {
        AUTH_UNUSED,
        AUTH_SOCKET,
@@ -1023,6 +1027,11 @@ main(int ac, char **av)
        setegid(getgid());
        setgid(getgid());
+#if defined(HAVE_PRCTL) && defined(PR_SET_DUMPABLE)
+        /* Disable ptrace on Linux without sgid bit */
+        prctl(PR_SET_DUMPABLE, 0);
+#endif
        SSLeay_add_all_algorithms();
        __progname = ssh_get_progname(av[0]);
diff --git a/ssh-keygen.0 b/ssh-keygen.0
index d4fcc682b..0ca92abc7 100644
--- a/ssh-keygen.0
+++ b/ssh-keygen.0
@@ -247,7 +247,7 @@ FILES
 SEE ALSO
     ssh(1), ssh-add(1), ssh-agent(1), moduli(5), sshd(8)
-     J. Galbraith, and R. Thayer, SECSH Public Key File Format, draft-ietf-
+     J. Galbraith and R. Thayer, SECSH Public Key File Format, draft-ietf-
     secsh-publickeyfile-01.txt, March 2001, work in progress material.
 AUTHORS
@@ -257,4 +257,4 @@ AUTHORS
     created OpenSSH.  Markus Friedl contributed the support for SSH protocol
     versions 1.5 and 2.0.
-OpenBSD 3.4                   September 25, 1999                             4
+OpenBSD 3.5                   September 25, 1999                             4
diff --git a/ssh-keyscan.0 b/ssh-keyscan.0
index 23d9f943c..c1334378f 100644
--- a/ssh-keyscan.0
+++ b/ssh-keyscan.0
@@ -1,4 +1,4 @@
-SSH-KEYSCAN(1)            BSD General Commands Manual           SSH-KEYSCAN(1)
+SSH-KEYSCAN(1)             OpenBSD Reference Manual             SSH-KEYSCAN(1)
 NAME
     ssh-keyscan - gather ssh public keys
@@ -29,14 +29,15 @@ DESCRIPTION
             Set the timeout for connection attempts.  If timeout seconds have
             elapsed since a connection was initiated to a host or since the
             last time anything was read from that host, then the connection
-             is closed and the host in question considered unavailable.
+             is closed and the host in question considered unavailable.  De-
-             Default is 5 seconds.
+             fault is 5 seconds.
     -t type
             Specifies the type of the key to fetch from the scanned hosts.
-             The possible values are M-bM-^@M-^\rsa1M-bM-^@M-^] for protocol version 1 and M-bM-^@M-^\rsaM-bM-^@M-^]
+             The possible values are ``rsa1'' for protocol version 1 and
-             or M-bM-^@M-^\dsaM-bM-^@M-^] for protocol version 2.  Multiple values may be speci-
+             ``rsa'' or ``dsa'' for protocol version 2.  Multiple values may
-             fied by separating them with commas.  The default is M-bM-^@M-^\rsa1M-bM-^@M-^].
+             be specified by separating them with commas.  The default is
+             ``rsa1''.
     -f filename
             Read hosts or addrlist namelist pairs from this file, one per
@@ -53,9 +54,9 @@ DESCRIPTION
 SECURITY
     If a ssh_known_hosts file is constructed using ssh-keyscan without veri-
     fying the keys, users will be vulnerable to attacks.  On the other hand,
-     if the security model allows such a risk, ssh-keyscan can help in the
+     if the security model allows such a risk, ssh-keyscan can help in the de-
-     detection of tampered keyfiles or man in the middle attacks which have
+     tection of tampered keyfiles or man in the middle attacks which have be-
-     begun after the ssh_known_hosts file was created.
+     gun after the ssh_known_hosts file was created.
 FILES
     Input format:
@@ -70,7 +71,7 @@ FILES
     host-or-namelist keytype base64-encoded-key
-     Where keytype is either M-bM-^@M-^\ssh-rsaM-bM-^@M-^] or M-bM-^@M-^\ssh-dssM-bM-^@M-^].
+     Where keytype is either ``ssh-rsa'' or ``ssh-dss''.
     /etc/ssh/ssh_known_hosts
@@ -89,8 +90,8 @@ SEE ALSO
     ssh(1), sshd(8)
 AUTHORS
-     David Mazieres M-bM-^LM-)dm@lcs.mit.eduM-bM-^LM-* wrote the initial version, and
+     David Mazieres <dm@lcs.mit.edu> wrote the initial version, and
-     Wayne Davison M-bM-^LM-)wayned@users.sourceforge.netM-bM-^LM-* added support for protocol
+     Wayne Davison <wayned@users.sourceforge.net> added support for protocol
     version 2.
 BUGS
@@ -99,4 +100,4 @@ BUGS
     This is because it opens a connection to the ssh port, reads the public
     key, and drops the connection as soon as it gets the key.
-BSD                             January 1, 1996                            BSD
+OpenBSD 3.5                     January 1, 1996                              2
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 6fc624c63..770409b86 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -7,7 +7,7 @@
 */
 #include "includes.h"
-RCSID("$OpenBSD: ssh-keyscan.c,v 1.46 2003/11/23 23:17:34 djm Exp $");
+RCSID("$OpenBSD: ssh-keyscan.c,v 1.47 2004/03/08 09:38:05 djm Exp $");
 #include "openbsd-compat/sys-queue.h"
@@ -489,7 +489,7 @@ conrecycle(int s)
 static void
 congreet(int s)
 {
-        int remote_major, remote_minor, n = 0;
+        int remote_major = 0, remote_minor = 0, n = 0;
        char buf[256], *cp;
        char remote_version[sizeof buf];
        size_t bufsiz;
diff --git a/ssh-keysign.0 b/ssh-keysign.0
index 5e9c6f9c7..950a21b88 100644
--- a/ssh-keysign.0
+++ b/ssh-keysign.0
@@ -1,4 +1,4 @@
-SSH-KEYSIGN(8)            BSD System ManagerM-bM-^@M-^Ys Manual           SSH-KEYSIGN(8)
+SSH-KEYSIGN(8)          OpenBSD System Manager's Manual         SSH-KEYSIGN(8)
 NAME
     ssh-keysign - ssh helper program for hostbased authentication
@@ -13,7 +13,7 @@ DESCRIPTION
     ssh-keysign is disabled by default and can only be enabled in the global
     client configuration file /etc/ssh/ssh_config by setting EnableSSHKeysign
-     to M-bM-^@M-^\yesM-bM-^@M-^].
+     to ``yes''.
     ssh-keysign is not intended to be invoked by the user, but from ssh(1).
     See ssh(1) and sshd(8) for more information about hostbased authentica-
@@ -37,6 +37,6 @@ HISTORY
     ssh-keysign first appeared in OpenBSD 3.2.
 AUTHORS
-     Markus Friedl M-bM-^LM-)markus@openbsd.orgM-bM-^LM-*
+     Markus Friedl <markus@openbsd.org>
-BSD                              May 24, 2002                              BSD
+OpenBSD 3.5                      May 24, 2002                                1
diff --git a/ssh-rand-helper.0 b/ssh-rand-helper.0
index 885bf19df..2020359f9 100644
--- a/ssh-rand-helper.0
+++ b/ssh-rand-helper.0
@@ -46,4 +46,4 @@ AUTHORS
 SEE ALSO
     ssh(1), ssh-add(1), ssh-keygen(1), sshd(8)
-OpenBSD 3.4                     April 14, 2002                               1
+OpenBSD 3.5                     April 14, 2002                               1
diff --git a/ssh.0 b/ssh.0
index 4f5a282f8..5bb6639c7 100644
--- a/ssh.0
+++ b/ssh.0
@@ -374,6 +374,7 @@ DESCRIPTION
                   HostKeyAlias
                   HostName
                   IdentityFile
+                   IdentitiesOnly
                   LocalForward
                   LogLevel
                   MACs
@@ -665,4 +666,4 @@ AUTHORS
     created OpenSSH.  Markus Friedl contributed the support for SSH protocol
     versions 1.5 and 2.0.
-OpenBSD 3.4                   September 25, 1999                            11
+OpenBSD 3.5                   September 25, 1999                            11
diff --git a/ssh.1 b/ssh.1
index 6c9ac5909..d90951352 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,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.
 .\"
-.\" $OpenBSD: ssh.1,v 1.181 2003/12/16 15:49:51 markus Exp $
+.\" $OpenBSD: ssh.1,v 1.182 2004/03/05 10:53:58 markus Exp $
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
@@ -634,6 +634,7 @@ For full details of the options listed below, and their possible values, see
 .It HostKeyAlias
 .It HostName
 .It IdentityFile
+.It IdentitiesOnly
 .It LocalForward
 .It LogLevel
 .It MACs
diff --git a/ssh.c b/ssh.c
index 05960af98..376b38b0a 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
 */
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.206 2003/12/16 15:49:51 markus Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.209 2004/03/11 10:21:17 markus Exp $");
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -146,49 +146,12 @@ pid_t proxy_command_pid = 0;
 static void
 usage(void)
 {
-        fprintf(stderr, "Usage: %s [options] host [command]\n", __progname);
+        fprintf(stderr,
-        fprintf(stderr, "Options:\n");
+"usage: ssh [-1246AaCfghkNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n"
-        fprintf(stderr, "  -l user     Log in using this user name.\n");
+"           [-D port] [-e escape_char] [-F configfile] [-i identity_file]\n"
-        fprintf(stderr, "  -n          Redirect input from " _PATH_DEVNULL ".\n");
+"           [-L port:host:hostport] [-l login_name] [-m mac_spec] [-o option]\n"
-        fprintf(stderr, "  -F config   Config file (default: ~/%s).\n",
+"           [-p port] [-R port:host:hostport] [user@]hostname [command]\n"
-             _PATH_SSH_USER_CONFFILE);
+        );
-        fprintf(stderr, "  -A          Enable authentication agent forwarding.\n");
-        fprintf(stderr, "  -a          Disable authentication agent forwarding (default).\n");
-        fprintf(stderr, "  -X          Enable X11 connection forwarding.\n");
-        fprintf(stderr, "  -Y          Enable trusted X11 connection forwarding.\n");
-        fprintf(stderr, "  -x          Disable X11 connection forwarding (default).\n");
-        fprintf(stderr, "  -i file     Identity for public key authentication "
-            "(default: ~/.ssh/identity)\n");
-#ifdef SMARTCARD
-        fprintf(stderr, "  -I reader   Set smartcard reader.\n");
-#endif
-        fprintf(stderr, "  -t          Tty; allocate a tty even if command is given.\n");
-        fprintf(stderr, "  -T          Do not allocate a tty.\n");
-        fprintf(stderr, "  -v          Verbose; display verbose debugging messages.\n");
-        fprintf(stderr, "              Multiple -v increases verbosity.\n");
-        fprintf(stderr, "  -V          Display version number only.\n");
-        fprintf(stderr, "  -q          Quiet; don't display any warning messages.\n");
-        fprintf(stderr, "  -f          Fork into background after authentication.\n");
-        fprintf(stderr, "  -e char     Set escape character; ``none'' = disable (default: ~).\n");
-        fprintf(stderr, "  -c cipher   Select encryption algorithm\n");
-        fprintf(stderr, "  -m macs     Specify MAC algorithms for protocol version 2.\n");
-        fprintf(stderr, "  -p port     Connect to this port.  Server must be on the same port.\n");
-        fprintf(stderr, "  -L listen-port:host:port   Forward local port to remote address\n");
-        fprintf(stderr, "  -R listen-port:host:port   Forward remote port to local address\n");
-        fprintf(stderr, "              These cause %s to listen for connections on a port, and\n", __progname);
-        fprintf(stderr, "              forward them to the other side by connecting to host:port.\n");
-        fprintf(stderr, "  -D port     Enable dynamic application-level port forwarding.\n");
-        fprintf(stderr, "  -C          Enable compression.\n");
-        fprintf(stderr, "  -N          Do not execute a shell or command.\n");
-        fprintf(stderr, "  -g          Allow remote hosts to connect to forwarded ports.\n");
-        fprintf(stderr, "  -1          Force protocol version 1.\n");
-        fprintf(stderr, "  -2          Force protocol version 2.\n");
-        fprintf(stderr, "  -4          Use IPv4 only.\n");
-        fprintf(stderr, "  -6          Use IPv6 only.\n");
-        fprintf(stderr, "  -o 'option' Process the option as if it was read from a configuration file.\n");
-        fprintf(stderr, "  -s          Invoke command (mandatory) as SSH2 subsystem.\n");
-        fprintf(stderr, "  -b addr     Local IP address.\n");
        exit(1);
 }
@@ -347,12 +310,8 @@ again:
                        }
                        /* fallthrough */
                case 'V':
-                        fprintf(stderr,
+                        fprintf(stderr, "%s, %s\n",
-                            "%s, SSH protocols %d.%d/%d.%d, %s\n",
+                            SSH_VERSION, SSLeay_version(SSLEAY_VERSION));
-                            SSH_VERSION,
-                            PROTOCOL_MAJOR_1, PROTOCOL_MINOR_1,
-                            PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2,
-                            SSLeay_version(SSLEAY_VERSION));
                        if (opt == 'V')
                                exit(0);
                        break;
@@ -782,7 +741,7 @@ x11_get_proto(char **_proto, char **_data)
                                    xauthdir);
                                snprintf(cmd, sizeof(cmd),
                                    "%s -f %s generate %s " SSH_X11_PROTO
-                                    " untrusted timeout 120 2>" _PATH_DEVNULL,
+                                    " untrusted timeout 1200 2>" _PATH_DEVNULL,
                                    options.xauth_location, xauthfile, display);
                                debug2("x11_get_proto: %s", cmd);
                                if (system(cmd) == 0)
diff --git a/ssh_config.0 b/ssh_config.0
index 40e9d3001..4be1d7f3f 100644
--- a/ssh_config.0
+++ b/ssh_config.0
@@ -238,6 +238,14 @@ DESCRIPTION
             fied in configuration files; all these identities will be tried
             in sequence.
+     IdentitiesOnly
+             Specifies that ssh should only use the authentication identity
+             files configured in the ssh_config files, even if the ssh-agent
+             offers more identities.  The argument to this keyword must be
+             ``yes'' or ``no''.  This option is intented for situations where
+             ssh-agent offers many different identities.  The default is
+             ``no''.
     LocalForward
             Specifies that a TCP/IP port on the local machine be forwarded
             over the secure channel to the specified host and port from the
@@ -454,4 +462,4 @@ AUTHORS
     ated OpenSSH.  Markus Friedl contributed the support for SSH protocol
     versions 1.5 and 2.0.
-OpenBSD 3.4                   September 25, 1999                             7
+OpenBSD 3.5                   September 25, 1999                             8
diff --git a/ssh_config.5 b/ssh_config.5
index e4a59a2ad..0fd3ea5f8 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,7 +34,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.
 .\"
-.\" $OpenBSD: ssh_config.5,v 1.28 2003/12/16 15:49:51 markus Exp $
+.\" $OpenBSD: ssh_config.5,v 1.29 2004/03/05 10:53:58 markus Exp $
 .Dd September 25, 1999
 .Dt SSH_CONFIG 5
 .Os
@@ -414,6 +414,24 @@ 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.
+.It Cm IdentitiesOnly
+Specifies that
+.Nm ssh
+should only use the authentication identity files configured in the
+.Nm 
+files,
+even if the
+.Nm ssh-agent
+offers more identities.
+The argument to this keyword must be
+.Dq yes
+or
+.Dq no .
+This option is intented for situations where
+.Nm ssh-agent
+offers many different identities.
+The default is
+.Dq no .
 .It Cm LocalForward
 Specifies that a TCP/IP port on the local machine be forwarded over
 the secure channel to the specified host and port from the remote machine.
diff --git a/sshconnect2.c b/sshconnect2.c
index 3a218113c..c261dfd18 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,7 +23,7 @@
 */
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect2.c,v 1.134 2004/01/19 21:25:15 markus Exp $");
+RCSID("$OpenBSD: sshconnect2.c,v 1.135 2004/03/05 10:53:58 markus Exp $");
 #include "openbsd-compat/sys-queue.h"
@@ -1044,7 +1044,7 @@ pubkey_prepare(Authctxt *authctxt)
                                        break;
                                }
                        }
-                        if (!found) {
+                        if (!found && !options.identities_only) {
                                id = xmalloc(sizeof(*id));
                                memset(id, 0, sizeof(*id));
                                id->key = key;
diff --git a/sshd.0 b/sshd.0
index 339d872b9..a99f6ce6e 100644
--- a/sshd.0
+++ b/sshd.0
@@ -552,4 +552,4 @@ AUTHORS
     versions 1.5 and 2.0.  Niels Provos and Markus Friedl contributed support
     for privilege separation.
-OpenBSD 3.4                   September 25, 1999                             9
+OpenBSD 3.5                   September 25, 1999                             9
diff --git a/sshd.c b/sshd.c
index 1f0d7747a..a5ec0b3e7 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,7 @@
 */
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.286 2004/02/23 12:02:33 markus Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.290 2004/03/11 10:21:17 markus Exp $");
 #include <openssl/dh.h>
 #include <openssl/bn.h>
@@ -101,7 +101,6 @@ extern char *__progname;
 #else
 char *__progname;
 #endif
-extern char **environ;
 /* Server configuration options. */
 ServerOptions options;
@@ -568,7 +567,7 @@ privsep_preauth_child(void)
        debug3("privsep user:group %u:%u", (u_int)pw->pw_uid,
            (u_int)pw->pw_gid);
 #if 0
-        /* XXX not ready, to heavy after chroot */
+        /* XXX not ready, too heavy after chroot */
        do_setusercontext(pw);
 #else
        gidset[0] = pw->pw_gid;
@@ -764,26 +763,12 @@ drop_connection(int startups)
 static void
 usage(void)
 {
-        fprintf(stderr, "sshd version %s, %s\n",
+        fprintf(stderr, "%s, %s\n",
            SSH_VERSION, SSLeay_version(SSLEAY_VERSION));
-        fprintf(stderr, "Usage: %s [options]\n", __progname);
+        fprintf(stderr,
-        fprintf(stderr, "Options:\n");
+"usage: sshd [-46Ddeiqt] [-b bits] [-f config_file] [-g login_grace_time]\n"
-        fprintf(stderr, "  -f file    Configuration file (default %s)\n", _PATH_SERVER_CONFIG_FILE);
+"            [-h host_key_file] [-k key_gen_time] [-o option] [-p port] [-u len]\n"
-        fprintf(stderr, "  -d         Debugging mode (multiple -d means more debugging)\n");
+        );
-        fprintf(stderr, "  -i         Started from inetd\n");
-        fprintf(stderr, "  -D         Do not fork into daemon mode\n");
-        fprintf(stderr, "  -t         Only test configuration file and keys\n");
-        fprintf(stderr, "  -q         Quiet (no logging)\n");
-        fprintf(stderr, "  -p port    Listen on the specified port (default: 22)\n");
-        fprintf(stderr, "  -k seconds Regenerate server key every this many seconds (default: 3600)\n");
-        fprintf(stderr, "  -g seconds Grace period for authentication (default: 600)\n");
-        fprintf(stderr, "  -b bits    Size of server RSA key (default: 768 bits)\n");
-        fprintf(stderr, "  -h file    File from which to read host key (default: %s)\n",
-            _PATH_HOST_KEY_FILE);
-        fprintf(stderr, "  -u len     Maximum hostname length for utmp recording\n");
-        fprintf(stderr, "  -4         Use IPv4 only\n");
-        fprintf(stderr, "  -6         Use IPv6 only\n");
-        fprintf(stderr, "  -o option  Process the option as if it was read from a configuration file.\n");
        exit(1);
 }
@@ -832,6 +817,9 @@ main(int ac, char **av)
        av = saved_argv;
 #endif
+        if (geteuid() == 0 && setgroups(0, NULL) == -1)
+                debug("setgroups(): %.200s", strerror(errno));
        /* Initialize configuration options to their default values. */
        initialize_server_options(&options);
@@ -945,6 +933,13 @@ main(int ac, char **av)
            SYSLOG_FACILITY_AUTH : options.log_facility,
            log_stderr || !inetd_flag);
+#ifdef _AIX
+        /*
+         * Unset KRB5CCNAME, otherwise the user's session may inherit it from
+         * root's environment
+         */ 
+        unsetenv("KRB5CCNAME");
+#endif /* _AIX */
 #ifdef _UNICOS
        /* Cray can define user privs drop all prives now!
         * Not needed on PRIV_SU systems!
@@ -1111,11 +1106,6 @@ main(int ac, char **av)
           unmounted if desired. */
        chdir("/");
-#ifndef HAVE_CYGWIN
-        /* Clear environment */
-        environ[0] = NULL;
-#endif
        /* ignore SIGPIPE */
        signal(SIGPIPE, SIG_IGN);
@@ -1394,6 +1384,7 @@ main(int ac, char **av)
        }
        /* This is the child processing a new connection. */
+        setproctitle("%s", "[accepted]");
        /*
         * Create a new session and process group since the 4.4BSD
diff --git a/sshd_config.0 b/sshd_config.0
index 981e91042..8a922666e 100644
--- a/sshd_config.0
+++ b/sshd_config.0
@@ -169,6 +169,11 @@ DESCRIPTION
             which allows the verification of the KDC's identity.  Default is
             ``no''.
+     KerberosGetAFSToken
+             If AFS is active and the user has a Kerberos 5 TGT, attempt to
+             aquire an AFS token before accessing the user's home directory.
+             Default is ``no''.
     KerberosOrLocalPasswd
             If set then if password authentication through Kerberos fails
             then the password will be validated via any additional local
@@ -248,7 +253,9 @@ DESCRIPTION
             ``no''.  The default is ``yes''.
             If this option is set to ``without-password'' password authenti-
-             cation is disabled for root.
+             cation is disabled for root.  Note that other authentication
+             methods (e.g., keyboard-interactive/PAM) may still allow root to
+             login using a password.
             If this option is set to ``forced-commands-only'' root login with
             public key authentication will be allowed, but only if the
@@ -456,4 +463,4 @@ AUTHORS
     versions 1.5 and 2.0.  Niels Provos and Markus Friedl contributed support
     for privilege separation.
-OpenBSD 3.4                   September 25, 1999                             7
+OpenBSD 3.5                   September 25, 1999                             8
diff --git a/sshd_config.5 b/sshd_config.5
index 41228248c..e15a225f2 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -34,7 +34,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.
 .\"
-.\" $OpenBSD: sshd_config.5,v 1.28 2004/02/17 19:35:21 jmc Exp $
+.\" $OpenBSD: sshd_config.5,v 1.29 2004/03/08 10:18:57 dtucker Exp $
 .Dd September 25, 1999
 .Dt SSHD_CONFIG 5
 .Os
@@ -300,6 +300,11 @@ To use this option, the server needs a
 Kerberos servtab which allows the verification of the KDC's identity.
 Default is
 .Dq no .
+.It Cm KerberosGetAFSToken
+If AFS is active and the user has a Kerberos 5 TGT, attempt to aquire
+an AFS token before accessing the user's home directory.
+Default is
+.Dq no .
 .It Cm KerberosOrLocalPasswd
 If set then if password authentication through Kerberos fails then
 the password will be validated via any additional local mechanism
@@ -429,7 +434,9 @@ The default is
 .Pp
 If this option is set to
 .Dq without-password
-password authentication is disabled for root.
+password authentication is disabled for root.  Note that other authentication
+methods (e.g., keyboard-interactive/PAM) may still allow root to login using
+a password.
 .Pp
 If this option is set to
 .Dq forced-commands-only
diff --git a/sshlogin.c b/sshlogin.c
index 36b648934..e1cc4cc82 100644
--- a/sshlogin.c
+++ b/sshlogin.c
@@ -52,11 +52,11 @@ u_long
 get_last_login_time(uid_t uid, const char *logname,
    char *buf, u_int bufsize)
 {
-  struct logininfo li;
+        struct logininfo li;
-  login_get_lastlog(&li, uid);
+        login_get_lastlog(&li, uid);
-  strlcpy(buf, li.hostname, bufsize);
+        strlcpy(buf, li.hostname, bufsize);
-  return li.tv_sec;
+        return li.tv_sec;
 }
 /*
@@ -67,12 +67,12 @@ void
 record_login(pid_t pid, const char *ttyname, const char *user, uid_t uid,
    const char *host, struct sockaddr * addr, socklen_t addrlen)
 {
-  struct logininfo *li;
+        struct logininfo *li;
-  li = login_alloc_entry(pid, user, host, ttyname);
+        li = login_alloc_entry(pid, user, host, ttyname);
-  login_set_addr(li, addr, addrlen);
+        login_set_addr(li, addr, addrlen);
-  login_login(li);
+        login_login(li);
-  login_free_entry(li);
+        login_free_entry(li);
 }
 #ifdef LOGIN_NEEDS_UTMPX
@@ -80,12 +80,12 @@ void
 record_utmp_only(pid_t pid, const char *ttyname, const char *user,
                 const char *host, struct sockaddr * addr, socklen_t addrlen)
 {
-  struct logininfo *li;
+        struct logininfo *li;
-  li = login_alloc_entry(pid, user, host, ttyname);
+        li = login_alloc_entry(pid, user, host, ttyname);
-  login_set_addr(li, addr, addrlen);
+        login_set_addr(li, addr, addrlen);
-  login_utmp_only(li);
+        login_utmp_only(li);
-  login_free_entry(li);
+        login_free_entry(li);
 }
 #endif
@@ -93,9 +93,9 @@ record_utmp_only(pid_t pid, const char *ttyname, const char *user,
 void
 record_logout(pid_t pid, const char *ttyname, const char *user)
 {
-  struct logininfo *li;
+        struct logininfo *li;
-  li = login_alloc_entry(pid, user, NULL, ttyname);
+        li = login_alloc_entry(pid, user, NULL, ttyname);
-  login_logout(li);
+        login_logout(li);
-  login_free_entry(li);
+        login_free_entry(li);
 }
diff --git a/version.h b/version.h
index 082a69b57..ec9bcd9ec 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
-/* $OpenBSD: version.h,v 1.40 2004/02/23 15:16:46 markus Exp $ */
+/* $OpenBSD: version.h,v 1.41 2004/03/20 10:40:59 markus Exp $ */
 #ifndef SSH_VERSION
-#define SSH_VERSION     "OpenSSH_3.8p1"
+#define SSH_VERSION     "OpenSSH_3.8.1p1"
 #endif /* SSH_VERSION */