diff -ru openssh-3.0.2p1/.cvsignore openssh-3.1p1/.cvsignore --- openssh-3.0.2p1/.cvsignore 2001-04-30 13:58:08.000000000 +1000 +++ openssh-3.1p1/.cvsignore 2001-12-29 18:00:08.000000000 +1100 @@ -19,3 +19,5 @@ *.out *.0 buildit.sh +autom4te.cache +ssh-rand-helper diff -ru openssh-3.0.2p1/CREDITS openssh-3.1p1/CREDITS --- openssh-3.0.2p1/CREDITS 2001-11-12 10:34:22.000000000 +1100 +++ openssh-3.1p1/CREDITS 2002-03-05 14:38:35.000000000 +1100 @@ -26,6 +26,7 @@ Corinna Vinschen - Cygwin support Dan Brosemer - Autoconf support, build fixes Darren Hall - AIX patches +Darren Tucker - AIX BFF package scripts David Agraz - Build fixes David Del Piero - bug fixes David Hesprich - Configure fixes @@ -35,7 +36,7 @@ Gary E. Miller - SCO support Ged Lodder - HPUX fixes and enhancements Gert Doering - bug and portability fixes -HARUYAMA Seigo - Translations & doc fixes +HARUYAMA Seigo - Translations & doc fixes Hideaki YOSHIFUJI - IPv6 and bug fixes Hiroshi Takekawa - Configure fixes Holger Trapp - KRB4/AFS config patch @@ -89,5 +90,5 @@ Damien Miller -$Id: CREDITS,v 1.63 2001/11/11 23:34:22 djm Exp $ +$Id: CREDITS,v 1.65 2002/03/05 03:38:35 mouring Exp $ diff -ru openssh-3.0.2p1/ChangeLog openssh-3.1p1/ChangeLog --- openssh-3.0.2p1/ChangeLog 2001-12-02 10:37:07.000000000 +1100 +++ openssh-3.1p1/ChangeLog 2002-03-07 13:04:37.000000000 +1100 @@ -1,9 +1,904 @@ -20011202 - - (djm) Syn with OpenBSD OpenSSH-3.0.2 - - markus@cvs.openbsd.org - [session.c sshd.8 version.h] - Don't allow authorized_keys specified environment variables when - UseLogin in active +20020307 + - (djm) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2002/03/06 00:20:54 + [compat.c dh.c] + compat.c + - markus@cvs.openbsd.org 2002/03/06 00:23:27 + [compat.c dh.c] + undo + - markus@cvs.openbsd.org 2002/03/06 00:24:39 + [compat.c] + compat.c + - markus@cvs.openbsd.org 2002/03/06 00:25:55 + [version.h] + OpenSSH_3.1 + - (djm) Update RPM spec files with new version number + +20020305 + - stevesk@cvs.openbsd.org 2002/03/02 09:34:42 + [LICENCE] + correct copyright dates for scp license; ok markus@ + +20020304 + - OpenBSD CVS Sync + - deraadt@cvs.openbsd.org 2002/02/26 18:52:32 + [sftp.1] + Ic cannot have that many arguments; spotted by mouring@etoh.eviladmin.org + - mouring@cvs.openbsd.org 2002/02/26 19:04:37 + [sftp.1] + > Ic cannot have that many arguments; spotted by mouring@etoh.eviladmin.org + Last Ic on the first line should not have a space between it and the final + comma. + - deraadt@cvs.openbsd.org 2002/02/26 19:06:43 + [sftp.1] + no, look closely. the comma was highlighted. split .Ic even more + - stevesk@cvs.openbsd.org 2002/02/26 20:03:51 + [misc.c] + use socklen_t + - stevesk@cvs.openbsd.org 2002/02/27 21:23:13 + [canohost.c channels.c packet.c sshd.c] + remove unneeded casts in [gs]etsockopt(); ok markus@ + - markus@cvs.openbsd.org 2002/02/28 15:46:33 + [authfile.c kex.c kexdh.c kexgex.c key.c ssh-dss.c] + add some const EVP_MD for openssl-0.9.7 + - stevesk@cvs.openbsd.org 2002/02/28 19:36:28 + [auth.c match.c match.h] + delay hostname lookup until we see a ``@'' in DenyUsers and AllowUsers + for sshd -u0; ok markus@ + - stevesk@cvs.openbsd.org 2002/02/28 20:36:42 + [sshd.8] + DenyUsers allows user@host pattern also + - stevesk@cvs.openbsd.org 2002/02/28 20:46:10 + [sshd.8] + -u0 DNS for user@host + - stevesk@cvs.openbsd.org 2002/02/28 20:56:00 + [auth.c] + log user not allowed details, from dwd@bell-labs.com; ok markus@ + - markus@cvs.openbsd.org 2002/03/01 13:12:10 + [auth.c match.c match.h] + undo the 'delay hostname lookup' change + match.c must not use compress.c (via canonhost.c/packet.c) + thanks to wilfried@ + - markus@cvs.openbsd.org 2002/03/04 12:43:06 + [auth-passwd.c auth-rh-rsa.c auth-rhosts.c] + - markus@cvs.openbsd.org 2002/03/04 13:10:46 + [misc.c] + error-> debug, because O_NONBLOCK for /dev/null causes too many different + errnos; ok stevesk@, deraadt@ + unused include + - stevesk@cvs.openbsd.org 2002/03/04 17:27:39 + [auth-krb5.c auth-options.h auth.h authfd.h authfile.h bufaux.h buffer.h + channels.h cipher.h compat.h compress.h crc32.h deattack.c getput.h + groupaccess.c misc.c mpaux.h packet.h readconf.h rsa.h scard.h + servconf.h ssh-agent.c ssh.h ssh2.h sshpty.h sshtty.c ttymodes.h + uuencode.c xmalloc.h] + $OpenBSD$ and RCSID() cleanup: don't use RCSID() in .h files; add + missing RCSID() to .c files and remove dup /*$OpenBSD$*/ from .c + files. ok markus@ + - stevesk@cvs.openbsd.org 2002/03/04 18:30:23 + [ssh-keyscan.c] + handle connection close during read of protocol version string. + fixes erroneous "bad greeting". ok markus@ + - markus@cvs.openbsd.org 2002/03/04 19:37:58 + [channels.c] + off by one; thanks to joost@pine.nl + - (bal) Added contrib/aix/ to support BFF package generation provided + by Darren Tucker +20020226 + - (tim) Bug 12 [configure.ac] add sys/bitypes.h to int64_t tests + based on patch by mooney@dogbert.cc.ndsu.nodak.edu (Tim Mooney) + Bug 45 [configure.ac] modify skey test to work around conflict with autoconf + reported by nolan@naic.edu (Michael Nolan) + patch by Pekka Savola + Bug 74 [configure.ac defines.h] add sig_atomic_t test + reported by dwd@bell-labs.com (Dave Dykstra) + Bug 102 [defines.h] UNICOS fixes. patch by wendyp@cray.com + [configure.ac Makefile.in] link libwrap only with sshd + based on patch by Maciej W. Rozycki + Bug 123 link libpam only with sshd + reported by peak@argo.troja.mff.cuni.cz (Pavel Kankovsky) + [configure.ac defines.h] modify previous SCO3 fix to not break Solaris 7 + [acconfig.h] remove unused HAVE_REGCOMP + [configure.ac] put back in search for prngd-socket + - (stevesk) openbsd-compat/base64.h: typo in comment + - (bal) Update sshd_config CVSID + - (bal) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2002/02/15 23:54:10 + [auth-krb5.c] + krb5_get_err_text() does not like context==NULL; he@nordu.net via google; + ok provos@ + - markus@cvs.openbsd.org 2002/02/22 12:20:34 + [log.c log.h ssh-keyscan.c] + overwrite fatal() in ssh-keyscan.c; fixes pr 2354; ok provos@ + - markus@cvs.openbsd.org 2002/02/23 17:59:02 + [kex.c kexdh.c kexgex.c] + don't allow garbage after payload. + - stevesk@cvs.openbsd.org 2002/02/24 16:09:52 + [sshd.c] + use u_char* here; ok markus@ + - markus@cvs.openbsd.org 2002/02/24 16:57:19 + [sftp-client.c] + early close(), missing free; ok stevesk@ + - markus@cvs.openbsd.org 2002/02/24 16:58:32 + [packet.c] + make 'cp' unsigned and merge with 'ucp'; ok stevesk@ + - markus@cvs.openbsd.org 2002/02/24 18:31:09 + [uuencode.c] + typo in comment + - markus@cvs.openbsd.org 2002/02/24 19:14:59 + [auth2.c authfd.c authfd.h authfile.c kexdh.c kexgex.c key.c key.h + ssh-dss.c ssh-dss.h ssh-keygen.c ssh-rsa.c ssh-rsa.h sshconnect2.c] + signed vs. unsigned: make size arguments u_int, ok stevesk@ + - stevesk@cvs.openbsd.org 2002/02/24 19:59:42 + [channels.c misc.c] + disable Nagle in connect_to() and channel_post_port_listener() (port + forwarding endpoints). the intention is to preserve the on-the-wire + appearance to applications at either end; the applications can then + enable TCP_NODELAY according to their requirements. ok markus@ + - markus@cvs.openbsd.org 2002/02/25 16:33:27 + [ssh-keygen.c sshconnect2.c uuencode.c uuencode.h] + more u_* fixes + - (bal) Imported missing fatal.c and fixed up Makefile.in + - (tim) [configure.ac] correction to Bug 123 fix + [configure.ac] correction to sig_atomic_t test + +20020225 + - (bal) Last AIX patch. Moved aix_usrinfo() outside of do_setuserconext() + since we need more session information than provided by that function. + +20020224 + - (bal) Drop Session *s usage in ports-aix.[ch] and pass just what we + need to do the jobs (AIX still does not fully compile, but that is + coming). + - (bal) Part two.. Drop unused AIX header, fix up missing char *cp. All + that is left is handling aix_usrinfo(). + - (tim) [loginrec.c session.c sshlogin.c sshlogin.h] Bug 84 + patch by wknox@mitre.org (William Knox). + [sshlogin.h] declare record_utmp_only for session.c + +20020221 + - (bal) Minor session.c fixup for cygwin. mispelt 'is_winnt' variable. + +20020219 + - (djm) OpenBSD CVS Sync + - mpech@cvs.openbsd.org 2002/02/13 08:33:47 + [ssh-keyscan.1] + When you give command examples and etc., in a manual page prefix them with: $ command + or + # command + - markus@cvs.openbsd.org 2002/02/14 23:27:59 + [channels.c] + increase the SSH v2 window size to 4 packets. comsumes a little + bit more memory for slow receivers but increases througput. + - markus@cvs.openbsd.org 2002/02/14 23:28:00 + [channels.h session.c ssh.c] + increase the SSH v2 window size to 4 packets. comsumes a little + bit more memory for slow receivers but increases througput. + - markus@cvs.openbsd.org 2002/02/14 23:41:01 + [authfile.c cipher.c cipher.h kex.c kex.h packet.c] + hide some more implementation details of cipher.[ch] and prepares for move + to EVP, ok deraadt@ + - stevesk@cvs.openbsd.org 2002/02/16 14:53:37 + [ssh-keygen.1] + -t required now for key generation + - stevesk@cvs.openbsd.org 2002/02/16 20:40:08 + [ssh-keygen.c] + default to rsa keyfile path for non key generation operations where + keyfile not specified. fixes core dump in those cases. ok markus@ + - millert@cvs.openbsd.org 2002/02/16 21:27:53 + [auth.h] + Part one of userland __P removal. Done with a simple regexp with + some minor hand editing to make comments line up correctly. Another + pass is forthcoming that handles the cases that could not be done + automatically. + - millert@cvs.openbsd.org 2002/02/17 19:42:32 + [auth.h] + Manual cleanup of remaining userland __P use (excluding packages + maintained outside the tree) + - markus@cvs.openbsd.org 2002/02/18 13:05:32 + [cipher.c cipher.h] + switch to EVP, ok djm@ deraadt@ + - markus@cvs.openbsd.org 2002/02/18 17:55:20 + [ssh.1] + -q: Fatal errors are _not_ displayed. + - deraadt@cvs.openbsd.org 2002/02/19 02:50:59 + [sshd_config] + stategy is not an english word + - (bal) Migrated IRIX jobs/projects/audit/etc code to + openbsd-compat/port-irix.[ch] to improve readiblity of do_child() + - (bal) Migrated AIX getuserattr and usrinfo code to + openbsd-compat/port-aix.[c] to improve readilbity of do_child() and + simplify our diffs against upstream source. + - (bal) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2002/02/15 23:11:26 + [session.c] + split do_child(), ok mouring@ + - markus@cvs.openbsd.org 2002/02/16 00:51:44 + [session.c] + typo + - (bal) CVS ID sync since the last two patches were merged mistakenly + +20020218 + - (tim) newer config.guess from ftp://ftp.gnu.org/gnu/config/config.guess + +20020213 + - (djm) Don't use system sys/queue.h on AIX. Report from + gert@greenie.muc.de + - (djm) Bug #114 - not starting PAM for SSH protocol 1 invalid users + +20020213 + - (djm) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2002/02/11 16:10:15 + [kex.c] + restore kexinit handler if we reset the dispatcher, this unbreaks + rekeying s/kex_clear_dispatch/kex_reset_dispatch/ + - markus@cvs.openbsd.org 2002/02/11 16:15:46 + [sshconnect1.c] + include md5.h, not evp.h + - markus@cvs.openbsd.org 2002/02/11 16:17:55 + [sshd.c] + do not complain about port > 1024 if rhosts-auth is disabled + - markus@cvs.openbsd.org 2002/02/11 16:19:39 + [sshd.c] + include md5.h not hmac.h + - markus@cvs.openbsd.org 2002/02/11 16:21:42 + [match.c] + support up to 40 algorithms per proposal + - djm@cvs.openbsd.org 2002/02/12 12:32:27 + [sftp.1 sftp.c sftp-client.c sftp-client.h sftp-int.c] + Perform multiple overlapping read/write requests in file transfer. Mostly + done by Tobias Ringstrom ; ok markus@ + - djm@cvs.openbsd.org 2002/02/12 12:44:46 + [sftp-client.c] + Let overlapped upload path handle servers which reorder ACKs. This may be + permitted by the protocol spec; ok markus@ + - markus@cvs.openbsd.org 2002/02/13 00:28:13 + [sftp-server.c] + handle SSH2_FILEXFER_ATTR_SIZE in SSH2_FXP_(F)SETSTAT; ok djm@ + - markus@cvs.openbsd.org 2002/02/13 00:39:15 + [readpass.c] + readpass.c is not longer from UCB, since we now use readpassphrase(3) + - djm@cvs.openbsd.org 2002/02/13 00:59:23 + [sftp-client.c sftp-client.h sftp-glob.c sftp-glob.h sftp.h] + [sftp-int.c sftp-int.h] + API cleanup and backwards compat for filexfer v.0 servers; ok markus@ + - (djm) Sync openbsd-compat with OpenBSD CVS too + - (djm) Bug #106: Add --without-rpath configure option. Patch from + Nicolas.Williams@ubsw.com + - (tim) [configure.ac, defines.h ] add rpc/rpc.h for INADDR_LOOPBACK + on SCO OSR3 + +20020210 + - (djm) OpenBSD CVS Sync + - deraadt@cvs.openbsd.org 2002/02/09 17:37:34 + [pathnames.h session.c ssh.1 sshd.8 sshd_config ssh-keyscan.1] + move ssh config files to /etc/ssh + - (djm) Adjust portable Makefile.in tnd ssh-rand-helper.c o match + - deraadt@cvs.openbsd.org 2002/02/10 01:07:05 + [readconf.h sshd.8] + more /etc/ssh; openbsd@davidkrause.com + +20020208 + - (djm) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2002/02/04 12:15:25 + [sshd.c] + add SYSLOG_FACILITY_NOT_SET = -1, SYSLOG_LEVEL_NOT_SET = -1, + fixes arm/netbsd; based on patch from bjh21@netbsd.org; ok djm@ + - stevesk@cvs.openbsd.org 2002/02/04 20:41:16 + [ssh-agent.1] + more sync for default ssh-add identities; ok markus@ + - djm@cvs.openbsd.org 2002/02/05 00:00:46 + [sftp.1 sftp.c sftp-client.c sftp-client.h sftp-int.c] + Add "-B" option to specify copy buffer length (default 32k); ok markus@ + - markus@cvs.openbsd.org 2002/02/05 14:32:55 + [channels.c channels.h ssh.c] + merge channel_request() into channel_request_start() + - markus@cvs.openbsd.org 2002/02/06 14:22:42 + [sftp.1] + sort options; ok mpech@, stevesk@ + - mpech@cvs.openbsd.org 2002/02/06 14:27:23 + [sftp.c] + sync usage() with manual. + - markus@cvs.openbsd.org 2002/02/06 14:37:22 + [session.c] + minor KNF + - markus@cvs.openbsd.org 2002/02/06 14:55:16 + [channels.c clientloop.c serverloop.c ssh.c] + channel_new never returns NULL, mouring@; ok djm@ + - markus@cvs.openbsd.org 2002/02/07 09:35:39 + [ssh.c] + remove bogus comments + +20020205 + - (djm) Cleanup after sync: + - :%s/reverse_mapping_check/verify_reverse_mapping/g + - (djm) OpenBSD CVS Sync + - stevesk@cvs.openbsd.org 2002/01/24 21:09:25 + [channels.c misc.c misc.h packet.c] + add set_nodelay() to set TCP_NODELAY on a socket (prep for nagle tuning). + no nagle changes just yet; ok djm@ markus@ + - stevesk@cvs.openbsd.org 2002/01/24 21:13:23 + [packet.c] + need misc.h for set_nodelay() + - markus@cvs.openbsd.org 2002/01/25 21:00:24 + [sshconnect2.c] + unused include + - markus@cvs.openbsd.org 2002/01/25 21:42:11 + [ssh-dss.c ssh-rsa.c] + use static EVP_MAX_MD_SIZE buffers for EVP_DigestFinal; ok stevesk@ + don't use evp_md->md_size, it's not public. + - markus@cvs.openbsd.org 2002/01/25 22:07:40 + [kex.c kexdh.c kexgex.c key.c mac.c] + use EVP_MD_size(evp_md) and not evp_md->md_size; ok steveks@ + - stevesk@cvs.openbsd.org 2002/01/26 16:44:22 + [includes.h session.c] + revert code to add x11 localhost display authorization entry for + hostname/unix:d and uts.nodename/unix:d if nodename was different than + hostname. just add entry for unix:d instead. ok markus@ + - stevesk@cvs.openbsd.org 2002/01/27 14:57:46 + [channels.c servconf.c servconf.h session.c sshd.8 sshd_config] + add X11UseLocalhost; ok markus@ + - stevesk@cvs.openbsd.org 2002/01/27 18:08:17 + [ssh.c] + handle simple case to identify FamilyLocal display; ok markus@ + - markus@cvs.openbsd.org 2002/01/29 14:27:57 + [ssh-add.c] + exit 2 if no agent, exit 1 if list fails; debian#61078; ok djm@ + - markus@cvs.openbsd.org 2002/01/29 14:32:03 + [auth2.c auth.c auth-options.c auth-rhosts.c auth-rh-rsa.c canohost.c] + [servconf.c servconf.h session.c sshd.8 sshd_config] + s/ReverseMappingCheck/VerifyReverseMapping/ and avoid confusion; + ok stevesk@ + - stevesk@cvs.openbsd.org 2002/01/29 16:29:02 + [session.c] + limit subsystem length in log; ok markus@ + - markus@cvs.openbsd.org 2002/01/29 16:41:19 + [ssh-add.1] + add DIAGNOSTICS; ok stevesk@ + - markus@cvs.openbsd.org 2002/01/29 22:46:41 + [session.c] + don't depend on servconf.c; ok djm@ + - markus@cvs.openbsd.org 2002/01/29 23:50:37 + [scp.1 ssh.1] + mention exit status; ok stevesk@ + - markus@cvs.openbsd.org 2002/01/31 13:35:11 + [kexdh.c kexgex.c] + cross check announced key type and type from key blob + - markus@cvs.openbsd.org 2002/01/31 15:00:05 + [serverloop.c] + no need for WNOHANG; ok stevesk@ + - markus@cvs.openbsd.org 2002/02/03 17:53:25 + [auth1.c serverloop.c session.c session.h] + don't use channel_input_channel_request and callback + use new server_input_channel_req() instead: + server_input_channel_req does generic request parsing on server side + session_input_channel_req handles just session specific things now + ok djm@ + - markus@cvs.openbsd.org 2002/02/03 17:55:55 + [channels.c channels.h] + remove unused channel_input_channel_request + - markus@cvs.openbsd.org 2002/02/03 17:58:21 + [channels.c channels.h ssh.c] + generic callbacks are not really used, remove and + add a callback for msg of type SSH2_MSG_CHANNEL_OPEN_CONFIRMATION + ok djm@ + - markus@cvs.openbsd.org 2002/02/03 17:59:23 + [sshconnect2.c] + more cross checking if announced vs. used key type; ok stevesk@ + - stevesk@cvs.openbsd.org 2002/02/03 22:35:57 + [ssh.1 sshd.8] + some KeepAlive cleanup/clarify; ok markus@ + - stevesk@cvs.openbsd.org 2002/02/03 23:22:59 + [ssh-agent.1] + ssh-add also adds $HOME/.ssh/id_rsa and $HOME/.ssh/id_dsa now. + - stevesk@cvs.openbsd.org 2002/02/04 00:53:39 + [ssh-agent.c] + unneeded includes + - markus@cvs.openbsd.org 2002/02/04 11:58:10 + [auth2.c] + cross checking of announced vs actual pktype in pubkey/hostbaed auth; + ok stevesk@ + - markus@cvs.openbsd.org 2002/02/04 12:15:25 + [log.c log.h readconf.c servconf.c] + add SYSLOG_FACILITY_NOT_SET = -1, SYSLOG_LEVEL_NOT_SET = -1, + fixes arm/netbsd; based on patch from bjh21@netbsd.org; ok djm@ + - stevesk@cvs.openbsd.org 2002/02/04 20:41:16 + [ssh-add.1] + more sync for default ssh-add identities; ok markus@ + - djm@cvs.openbsd.org 2002/02/04 21:53:12 + [sftp.1 sftp.c] + Add "-P" option to directly connect to a local sftp-server. Should be + useful for regression testing; ok markus@ + - djm@cvs.openbsd.org 2002/02/05 00:00:46 + [sftp.1 sftp.c sftp-client.c sftp-client.h sftp-int.c] + Add "-B" option to specify copy buffer length (default 32k); ok markus@ + +20020130 + - (djm) Delay PRNG seeding until we need it in ssh-keygen, from markus@ + - (tim) [configure.ac] fix logic on when ssh-rand-helper is installed. + [sshd_config] put back in line that tells what PATH was compiled into sshd. + +20020125 + - (djm) Don't grab Xserver or pointer by default. x11-ssh-askpass doesn't + and grabbing can cause deadlocks with kinput2. + +20020124 + - (stevesk) Makefile.in: bug #61; delete commented line for now. + +20020123 + - (djm) Fix non-standard shell syntax in autoconf. Patch from + Dave Dykstra + - (stevesk) fix --with-zlib= + - (djm) Use case statements in autoconf to clean up some tests + - (bal) reverted out of 5/2001 change to atexit(). I assume I + did it to handle SonyOS. If that is the case than we will + do a special case for them. + +20020122 + - (djm) autoconf hacking: + - We don't support --without-zlib currently, so don't allow it. + - Rework cryptographic random number support detection. We now detect + whether OpenSSL seeds itself. If it does, then we don't bother with + the ssh-rand-helper program. You can force the use of ssh-rand-helper + using the --with-rand-helper configure argument + - Simplify and clean up ssh-rand-helper configuration + - Add OpenSSL sanity check: verify that header version matches version + reported by library + - (djm) Fix some bugs I introduced into ssh-rand-helper yesterday + - OpenBSD CVS Sync + - djm@cvs.openbsd.org 2001/12/21 08:52:22 + [ssh-keygen.1 ssh-keygen.c] + Remove default (rsa1) key type; ok markus@ + - djm@cvs.openbsd.org 2001/12/21 08:53:45 + [readpass.c] + Avoid interruptable passphrase read; ok markus@ + - djm@cvs.openbsd.org 2001/12/21 10:06:43 + [ssh-add.1 ssh-add.c] + Try all standard key files (id_rsa, id_dsa, identity) when invoked with + no arguments; ok markus@ + - markus@cvs.openbsd.org 2001/12/21 12:17:33 + [serverloop.c] + remove ifdef for USE_PIPES since fdin != fdout; ok djm@ + - deraadt@cvs.openbsd.org 2001/12/24 07:29:43 + [ssh-add.c] + try all listed keys.. how did this get broken? + - markus@cvs.openbsd.org 2001/12/25 18:49:56 + [key.c] + be more careful on allocation + - markus@cvs.openbsd.org 2001/12/25 18:53:00 + [auth1.c] + be more carefull on allocation + - markus@cvs.openbsd.org 2001/12/27 18:10:29 + [ssh-keygen.c] + -t is only needed for key generation (unbreaks -i, -e, etc). + - markus@cvs.openbsd.org 2001/12/27 18:22:16 + [auth1.c authfile.c auth-rsa.c dh.c kexdh.c kexgex.c key.c rsa.c] + [scard.c ssh-agent.c sshconnect1.c sshd.c ssh-dss.c] + call fatal() for openssl allocation failures + - stevesk@cvs.openbsd.org 2001/12/27 18:22:53 + [sshd.8] + clarify -p; ok markus@ + - markus@cvs.openbsd.org 2001/12/27 18:26:13 + [authfile.c] + missing include + - markus@cvs.openbsd.org 2001/12/27 19:37:23 + [dh.c kexdh.c kexgex.c] + always use BN_clear_free instead of BN_free + - markus@cvs.openbsd.org 2001/12/27 19:54:53 + [auth1.c auth.h auth-rh-rsa.c] + auth_rhosts_rsa now accept generic keys. + - markus@cvs.openbsd.org 2001/12/27 20:39:58 + [auth1.c auth-rsa.c channels.c clientloop.c packet.c packet.h] + [serverloop.c session.c ssh.c sshconnect1.c sshd.c ttymodes.c] + get rid of packet_integrity_check, use packet_done() instead. + - markus@cvs.openbsd.org 2001/12/28 12:14:27 + [auth1.c auth2.c auth2-chall.c auth-rsa.c channels.c clientloop.c] + [kex.c kexdh.c kexgex.c packet.c packet.h serverloop.c session.c] + [ssh.c sshconnect1.c sshconnect2.c sshd.c] + s/packet_done/packet_check_eom/ (end-of-message); ok djm@ + - markus@cvs.openbsd.org 2001/12/28 13:57:33 + [auth1.c kexdh.c kexgex.c packet.c packet.h sshconnect1.c sshd.c] + packet_get_bignum* no longer returns a size + - markus@cvs.openbsd.org 2001/12/28 14:13:13 + [bufaux.c bufaux.h packet.c] + buffer_get_bignum: int -> void + - markus@cvs.openbsd.org 2001/12/28 14:50:54 + [auth1.c auth-rsa.c channels.c dispatch.c kex.c kexdh.c kexgex.c] + [packet.c packet.h serverloop.c session.c ssh.c sshconnect1.c] + [sshconnect2.c sshd.c] + packet_read* no longer return the packet length, since it's not used. + - markus@cvs.openbsd.org 2001/12/28 15:06:00 + [auth2.c auth2-chall.c channels.c channels.h clientloop.c dispatch.c] + [dispatch.h kex.c kex.h serverloop.c ssh.c sshconnect2.c] + remove plen from the dispatch fn. it's no longer used. + - stevesk@cvs.openbsd.org 2001/12/28 22:37:48 + [ssh.1 sshd.8] + document LogLevel DEBUG[123]; ok markus@ + - stevesk@cvs.openbsd.org 2001/12/29 21:56:01 + [authfile.c channels.c compress.c packet.c sftp-server.c] + [ssh-agent.c ssh-keygen.c] + remove unneeded casts and some char->u_char cleanup; ok markus@ + - stevesk@cvs.openbsd.org 2002/01/03 04:11:08 + [ssh_config] + grammar in comment + - stevesk@cvs.openbsd.org 2002/01/04 17:59:17 + [readconf.c servconf.c] + remove #ifdef _PATH_XAUTH/#endif; ok markus@ + - stevesk@cvs.openbsd.org 2002/01/04 18:14:16 + [servconf.c sshd.8] + protocol 2 HostKey code default is now /etc/ssh_host_rsa_key and + /etc/ssh_host_dsa_key like we have in sshd_config. ok markus@ + - markus@cvs.openbsd.org 2002/01/05 10:43:40 + [channels.c] + fix hanging x11 channels for rejected cookies (e.g. + XAUTHORITY=/dev/null xbiff) bug #36, based on patch from + djast@cs.toronto.edu + - stevesk@cvs.openbsd.org 2002/01/05 21:51:56 + [ssh.1 sshd.8] + some missing and misplaced periods + - markus@cvs.openbsd.org 2002/01/09 13:49:27 + [ssh-keygen.c] + append \n only for public keys + - markus@cvs.openbsd.org 2002/01/09 17:16:00 + [channels.c] + merge channel_pre_open_15/channel_pre_open_20; ok provos@ + - markus@cvs.openbsd.org 2002/01/09 17:26:35 + [channels.c nchan.c] + replace buffer_consume(b, buffer_len(b)) with buffer_clear(b); + ok provos@ + - markus@cvs.openbsd.org 2002/01/10 11:13:29 + [serverloop.c] + skip client_alive_check until there are channels; ok beck@ + - markus@cvs.openbsd.org 2002/01/10 11:24:04 + [clientloop.c] + handle SSH2_MSG_GLOBAL_REQUEST (just reply with failure); ok djm@ + - markus@cvs.openbsd.org 2002/01/10 12:38:26 + [nchan.c] + remove dead code (skip drain) + - markus@cvs.openbsd.org 2002/01/10 12:47:59 + [nchan.c] + more unused code (with channels.c:1.156) + - markus@cvs.openbsd.org 2002/01/11 10:31:05 + [packet.c] + handle received SSH2_MSG_UNIMPLEMENTED messages; ok djm@ + - markus@cvs.openbsd.org 2002/01/11 13:36:43 + [ssh2.h] + add defines for msg type ranges + - markus@cvs.openbsd.org 2002/01/11 13:39:36 + [auth2.c dispatch.c dispatch.h kex.c] + a single dispatch_protocol_error() that sends a message of + type 'UNIMPLEMENTED' + dispatch_range(): set handler for a ranges message types + use dispatch_protocol_ignore() for authentication requests after + successful authentication (the drafts requirement). + serverloop/clientloop now send a 'UNIMPLEMENTED' message instead + of exiting. + - markus@cvs.openbsd.org 2002/01/11 20:14:11 + [auth2-chall.c auth-skey.c] + use strlcpy not strlcat; mouring@ + - markus@cvs.openbsd.org 2002/01/11 23:02:18 + [readpass.c] + use _PATH_TTY + - markus@cvs.openbsd.org 2002/01/11 23:02:51 + [auth2-chall.c] + use snprintf; mouring@ + - markus@cvs.openbsd.org 2002/01/11 23:26:30 + [auth-skey.c] + use snprintf; mouring@ + - markus@cvs.openbsd.org 2002/01/12 13:10:29 + [auth-skey.c] + undo local change + - provos@cvs.openbsd.org 2002/01/13 17:27:07 + [ssh-agent.c] + change to use queue.h macros; okay markus@ + - markus@cvs.openbsd.org 2002/01/13 17:57:37 + [auth2.c auth2-chall.c compat.c sshconnect2.c sshd.c] + use buffer API and avoid static strings of fixed size; + ok provos@/mouring@ + - markus@cvs.openbsd.org 2002/01/13 21:31:20 + [channels.h nchan.c] + add chan_set_[io]state(), order states, state is now an u_int, + simplifies debugging messages; ok provos@ + - markus@cvs.openbsd.org 2002/01/14 13:22:35 + [nchan.c] + chan_send_oclose1() no longer calls chan_shutdown_write(); ok provos@ + - markus@cvs.openbsd.org 2002/01/14 13:34:07 + [nchan.c] + merge chan_[io]buf_empty[12]; ok provos@ + - markus@cvs.openbsd.org 2002/01/14 13:40:10 + [nchan.c] + correct fn names for ssh2, do not switch from closed to closed; + ok provos@ + - markus@cvs.openbsd.org 2002/01/14 13:41:13 + [nchan.c] + remove duplicated code; ok provos@ + - markus@cvs.openbsd.org 2002/01/14 13:55:55 + [channels.c channels.h nchan.c] + remove function pointers for events, remove chan_init*; ok provos@ + - markus@cvs.openbsd.org 2002/01/14 13:57:03 + [channels.h nchan.c] + (c) 2002 + - markus@cvs.openbsd.org 2002/01/16 13:17:51 + [channels.c channels.h serverloop.c ssh.c] + wrapper for channel_setup_fwd_listener + - stevesk@cvs.openbsd.org 2002/01/16 17:40:23 + [sshd_config] + The stategy now used for options in the default sshd_config shipped + with OpenSSH is to specify options with their default value where + possible, but leave them commented. Uncommented options change a + default value. Subsystem is currently the only default option + changed. ok markus@ + - stevesk@cvs.openbsd.org 2002/01/16 17:42:33 + [ssh.1] + correct defaults for -i/IdentityFile; ok markus@ + - stevesk@cvs.openbsd.org 2002/01/16 17:55:33 + [ssh_config] + correct some commented defaults. add Ciphers default. ok markus@ + - stevesk@cvs.openbsd.org 2002/01/17 04:27:37 + [log.c] + casts to silence enum type warnings for bugzilla bug 37; ok markus@ + - stevesk@cvs.openbsd.org 2002/01/18 17:14:16 + [sshd.8] + correct Ciphers default; paola.mannaro@ubs.com + - stevesk@cvs.openbsd.org 2002/01/18 18:14:17 + [authfd.c bufaux.c buffer.c cipher.c packet.c ssh-agent.c ssh-keygen.c] + unneeded cast cleanup; ok markus@ + - stevesk@cvs.openbsd.org 2002/01/18 20:46:34 + [sshd.8] + clarify Allow(Groups|Users) and Deny(Groups|Users); suggestion from + allard@oceanpark.com; ok markus@ + - markus@cvs.openbsd.org 2002/01/21 15:13:51 + [sshconnect.c] + use read_passphrase+ECHO in confirm(), allows use of ssh-askpass + for hostkey confirm. + - markus@cvs.openbsd.org 2002/01/21 22:30:12 + [cipher.c compat.c myproposal.h] + remove "rijndael-*", just use "aes-" since this how rijndael is called + in the drafts; ok stevesk@ + - markus@cvs.openbsd.org 2002/01/21 23:27:10 + [channels.c nchan.c] + cleanup channels faster if the are empty and we are in drain-state; + ok deraadt@ + - stevesk@cvs.openbsd.org 2002/01/22 02:52:41 + [servconf.c] + typo in error message; from djast@cs.toronto.edu + - (djm) Make auth2-pam.c compile again after dispatch.h and packet.h + changes + - (djm) Recent Glibc includes an incompatible sys/queue.h. Treat it as + bogus in configure + - (djm) Use local sys/queue.h if necessary in ssh-agent.c + +20020121 + - (djm) Rework ssh-rand-helper: + - Reduce quantity of ifdef code, in preparation for ssh_rand_conf + - Always seed from system calls, even when doing PRNGd seeding + - Tidy and comment #define knobs + - Remove unused facility for multiple runs through command list + - KNF, cleanup, update copyright + +20020114 + - (djm) Bug #50 - make autoconf entropy path checks more robust + +20020108 + - (djm) Merge Cygwin copy_environment with do_pam_environment, removing + fixed env var size limit in the process. Report from Corinna Vinschen + + - (stevesk) defines.h: use "/var/spool/sockets/X11/%u" for HP-UX. does + not depend on transition links. from Lutz Jaenicke. + +20020106 + - (stevesk) defines.h: determine _PATH_UNIX_X; currently "/tmp/.X11-unix/X%u" + for all platforms except HP-UX, which is "/usr/spool/sockets/X11/%u". + +20020105 + - (bal) NCR requies use_pipes to operate correctly. + - (stevesk) fix spurious ; from NCR change. + +20020103 + - (djm) Use bigcrypt() on systems with SCO_PROTECTED_PW. Patch from + Roger Cornelius + +20011229 + - (djm) Apply Cygwin pointer deref fix from Corinna Vinschen + Could be abused to guess valid usernames + - (djm) Typo in contrib/cygwin/README Fix from Corinna Vinschen + + +20011228 + - (djm) Remove recommendation to use GNU make, we should support most + make programs. + +20011225 + - (stevesk) [Makefile.in ssh-rand-helper.c] + portable lib and __progname support for ssh-rand-helper; ok djm@ + +20011223 + - (bal) Removed contrib/chroot.diff and noted in contrib/README that it + was not being maintained. + +20011222 + - (djm) Ignore fix & patchlevel in OpenSSL version check. Patch from + solar@openwall.com + - (djm) Rework entropy code. If the OpenSSL PRNG is has not been + internally seeded, execute a subprogram "ssh-rand-helper" to obtain + some entropy for us. Rewrite the old in-process entropy collecter as + an example ssh-rand-helper. + - (djm) Always perform ssh_prng_cmds path lookups in configure, even if + we don't end up using ssh_prng_cmds (so we always get a valid file) + +20011221 + - (djm) Add option to gnome-ssh-askpass to stop it from grabbing the X + server. I have found this necessary to avoid server hangs with X input + extensions (e.g. kinput2). Enable by setting the environment variable + "GNOME_SSH_ASKPASS_NOGRAB" + - OpenBSD CVS Sync + - stevesk@cvs.openbsd.org 2001/12/08 17:49:28 + [channels.c pathnames.h] + use only one path to X11 UNIX domain socket vs. an array of paths + to try. report from djast@cs.toronto.edu. ok markus@ + - markus@cvs.openbsd.org 2001/12/09 18:45:56 + [auth2.c auth2-chall.c auth.h] + add auth2_challenge_stop(), simplifies cleanup of kbd-int sessions, + fixes memleak. + - stevesk@cvs.openbsd.org 2001/12/10 16:45:04 + [sshd.c] + possible fd leak on error; ok markus@ + - markus@cvs.openbsd.org 2001/12/10 20:34:31 + [ssh-keyscan.c] + check that server supports v1 for -t rsa1, report from wirth@dfki.de + - jakob@cvs.openbsd.org 2001/12/18 10:04:21 + [auth.h hostfile.c hostfile.h] + remove auth_rsa_read_key, make hostfile_ready_key non static; ok markus@ + - jakob@cvs.openbsd.org 2001/12/18 10:05:15 + [auth2.c] + log fingerprint on successful public key authentication; ok markus@ + - jakob@cvs.openbsd.org 2001/12/18 10:06:24 + [auth-rsa.c] + log fingerprint on successful public key authentication, simplify + usage of key structs; ok markus@ + - deraadt@cvs.openbsd.org 2001/12/19 07:18:56 + [auth1.c auth2.c auth2-chall.c auth-bsdauth.c auth.c authfile.c auth.h] + [auth-krb4.c auth-rhosts.c auth-skey.c bufaux.c canohost.c channels.c] + [cipher.c clientloop.c compat.c compress.c deattack.c key.c log.c mac.c] + [match.c misc.c nchan.c packet.c readconf.c rijndael.c rijndael.h scard.c] + [servconf.c servconf.h serverloop.c session.c sftp.c sftp-client.c] + [sftp-glob.c sftp-int.c sftp-server.c ssh-add.c ssh-agent.c ssh.c] + [sshconnect1.c sshconnect2.c sshconnect.c sshd.8 sshd.c sshd_config] + [ssh-keygen.c sshlogin.c sshpty.c sshtty.c ttymodes.c uidswap.c] + basic KNF done while i was looking for something else + - markus@cvs.openbsd.org 2001/12/19 16:09:39 + [serverloop.c] + fix race between SIGCHLD and select with an additional pipe. writing + to the pipe on SIGCHLD wakes up select(). using pselect() is not + portable and siglongjmp() ugly. W. R. Stevens suggests similar solution. + initial idea by pmenage@ensim.com; ok deraadt@, djm@ + - stevesk@cvs.openbsd.org 2001/12/19 17:16:13 + [authfile.c bufaux.c bufaux.h buffer.c buffer.h packet.c packet.h ssh.c] + change the buffer/packet interface to use void* vs. char*; ok markus@ + - markus@cvs.openbsd.org 2001/12/20 16:37:29 + [channels.c channels.h session.c] + setup x11 listen socket for just one connect if the client requests so. + (v2 only, but the openssh client does not support this feature). + - djm@cvs.openbsd.org 2001/12/20 22:50:24 + [auth2.c auth2-chall.c channels.c channels.h clientloop.c dispatch.c] + [dispatch.h kex.c kex.h packet.c packet.h serverloop.c ssh.c] + [sshconnect2.c] + Conformance fix: we should send failing packet sequence number when + responding with a SSH_MSG_UNIMPLEMENTED message. Spotted by + yakk@yakk.dot.net; ok markus@ + +20011219 + - (stevesk) OpenBSD CVS sync X11 localhost display + - stevesk@cvs.openbsd.org 2001/11/29 14:10:51 + [channels.h channels.c session.c] + sshd X11 fake server will now listen on localhost by default: + $ echo $DISPLAY + localhost:12.0 + $ netstat -an|grep 6012 + tcp 0 0 127.0.0.1.6012 *.* LISTEN + tcp6 0 0 ::1.6012 *.* LISTEN + sshd_config gatewayports=yes can be used to revert back to the old + behavior. will control this with another option later. ok markus@ + - stevesk@cvs.openbsd.org 2001/12/19 08:43:11 + [includes.h session.c] + handle utsname.nodename case for FamilyLocal X authorization; ok markus@ + +20011207 + - (bal) PCRE no longer required. Banished from the source along with + fake-regex.h + - (bal) OpenBSD CVS Sync + - stevesk@cvs.openbsd.org 2001/12/06 18:02:32 + [channels.c sshconnect.c] + shutdown(sock, SHUT_RDWR) not needed here; ok markus@ + - stevesk@cvs.openbsd.org 2001/12/06 18:09:23 + [channels.c session.c] + strncpy->strlcpy. remaining strncpy's are necessary. ok markus@ + - stevesk@cvs.openbsd.org 2001/12/06 18:20:32 + [channels.c] + disable nagle for X11 fake server and client TCPs. from netbsd. + ok markus@ + +20011206 + - (bal) OpenBSD CVS Sync + - deraadt@cvs.openbsd.org 2001/11/14 20:45:08 + [sshd.c] + errno saving wrapping in a signal handler + - markus@cvs.openbsd.org 2001/11/16 12:46:13 + [ssh-keyscan.c] + handle empty lines instead of dumping core; report from sha@sha-1.net + - stevesk@cvs.openbsd.org 2001/11/17 19:14:34 + [auth2.c auth.c readconf.c servconf.c ssh-agent.c ssh-keygen.c] + enum/int type cleanup where it made sense to do so; ok markus@ + - markus@cvs.openbsd.org 2001/11/19 11:20:21 + [sshd.c] + fd leak on HUP; ok stevesk@ + - stevesk@cvs.openbsd.org 2001/11/19 18:40:46 + [ssh-agent.1] + clarify/state that private keys are not exposed to clients using the + agent; ok markus@ + - mpech@cvs.openbsd.org 2001/11/19 19:02:16 + [deattack.c radix.c] + kill more registers + millert@ ok + - markus@cvs.openbsd.org 2001/11/21 15:51:24 + [key.c] + mem leak + - stevesk@cvs.openbsd.org 2001/11/21 18:49:14 + [ssh-keygen.1] + more on passphrase construction; ok markus@ + - stevesk@cvs.openbsd.org 2001/11/22 05:27:29 + [ssh-keyscan.c] + don't use "\n" in fatal() + - markus@cvs.openbsd.org 2001/11/22 12:34:22 + [clientloop.c serverloop.c sshd.c] + volatile sig_atomic_t + - stevesk@cvs.openbsd.org 2001/11/29 19:06:39 + [channels.h] + remove dead function prototype; ok markus@ + - markus@cvs.openbsd.org 2001/11/29 22:08:48 + [auth-rsa.c] + fix protocol error: send 'failed' message instead of a 2nd challenge + (happens if the same key is in authorized_keys twice). + reported Ralf_Meister@genua.de; ok djm@ + - stevesk@cvs.openbsd.org 2001/11/30 20:39:28 + [ssh.c] + sscanf() length dependencies are clearer now; can also shrink proto + and data if desired, but i have not done that. ok markus@ + - markus@cvs.openbsd.org 2001/12/01 21:41:48 + [session.c sshd.8] + don't pass user defined variables to /usr/bin/login + - deraadt@cvs.openbsd.org 2001/12/02 02:08:32 + [sftp-common.c] + zap }; + - itojun@cvs.openbsd.org 2001/12/05 03:50:01 + [clientloop.c serverloop.c sshd.c] + deal with LP64 printf issue with sig_atomic_t. from thorpej + - itojun@cvs.openbsd.org 2001/12/05 03:56:39 + [auth1.c auth2.c canohost.c channels.c deattack.c packet.c scp.c + sshconnect2.c] + make it compile with more strict prototype checking + - deraadt@cvs.openbsd.org 2001/12/05 10:06:12 + [authfd.c authfile.c bufaux.c channels.c compat.c kex.c kexgex.c + key.c misc.c packet.c servconf.c ssh-agent.c sshconnect2.c + sshconnect.c sshd.c ssh-dss.c ssh-keygen.c ssh-rsa.c] + minor KNF + - markus@cvs.openbsd.org 2001/12/05 15:04:48 + [version.h] + post 3.0.2 + - markus@cvs.openbsd.org 2001/12/05 16:54:51 + [compat.c match.c match.h] + make theo and djm happy: bye bye regexp + - markus@cvs.openbsd.org 2001/12/06 13:30:06 + [servconf.c servconf.h sshd.8 sshd.c] + add -o to sshd, too. ok deraadt@ + - (bal) Minor white space fix up in servconf.c + +20011126 + - (tim) [contrib/cygwin/README, openbsd-compat/bsd-cygwin_util.c, + openbsd-compat/bsd-cygwin_util.h, openbsd-compat/daemon.c] + Allow SSHD to install as service under WIndows 9x/Me + [configure.ac] Fix to allow linking against PCRE on Cygwin + Patches by Corinna Vinschen 20011115 - (djm) Fix IPv4 default in ssh-keyscan. Spotted by Dan Astoorian @@ -6919,4 +7814,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1665.4.1 2001/12/01 23:37:07 djm Exp $ +$Id: ChangeLog,v 1.1913 2002/03/07 02:04:37 djm Exp $ diff -ru openssh-3.0.2p1/INSTALL openssh-3.1p1/INSTALL --- openssh-3.0.2p1/INSTALL 2001-06-29 22:39:24.000000000 +1000 +++ openssh-3.1p1/INSTALL 2001-12-28 09:57:34.000000000 +1100 @@ -45,18 +45,6 @@ http://www.lothar.com/tech/crypto/ -GNU Make: -ftp://ftp.gnu.org/gnu/make/ - -OpenSSH has only been tested with GNU make. It may work with other -'make' programs, but you are on your own. - -PCRE (PERL-compatible Regular Expression library): -ftp://ftp.cus.cam.ac.uk/pub/software/programing/pcre/ - -Most platforms do not require this. However older Unices may not have a -posix regex library. PCRE provides a POSIX interface. - S/Key Libraries: http://www.sparc.spb.su/solaris/skey/ @@ -230,4 +218,4 @@ http://www.openssh.com/ -$Id: INSTALL,v 1.46 2001/06/29 12:39:24 mouring Exp $ +$Id: INSTALL,v 1.48 2001/12/27 22:57:34 djm Exp $ diff -ru openssh-3.0.2p1/LICENCE openssh-3.1p1/LICENCE --- openssh-3.0.2p1/LICENCE 2001-09-23 23:58:38.000000000 +1000 +++ openssh-3.1p1/LICENCE 2002-03-06 05:03:10.000000000 +1100 @@ -140,8 +140,46 @@ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + 6) + One component of the ssh source code is under a 4-clause BSD license, + held by the University of California, since we pulled these parts from + original Berkeley code. The Regents of the University of California + have declared that term 3 is no longer enforceable on their source code, + but we retain that license as is. + + * Copyright (c) 1983, 1990, 1992, 1993, 1995 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + +7) Remaining components of the software are provided under a standard 2-term BSD licence with the following names as copyright holders: diff -ru openssh-3.0.2p1/Makefile.in openssh-3.1p1/Makefile.in --- openssh-3.0.2p1/Makefile.in 2001-11-12 10:34:23.000000000 +1100 +++ openssh-3.1p1/Makefile.in 2002-02-27 06:24:22.000000000 +1100 @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.190 2001/11/11 23:34:23 djm Exp $ +# $Id: Makefile.in,v 1.197 2002/02/26 19:24:22 mouring Exp $ prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -19,17 +19,20 @@ ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass SFTP_SERVER=$(libexecdir)/sftp-server -PATHS= -DETCDIR=\"$(sysconfdir)\" \ +PATHS= -DSSHDIR=\"$(sysconfdir)\" \ -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \ -D_PATH_SSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" \ -D_PATH_SFTP_SERVER=\"$(SFTP_SERVER)\" \ - -D_PATH_SSH_PIDDIR=\"$(piddir)\" + -D_PATH_SSH_PIDDIR=\"$(piddir)\" \ + -DSSH_RAND_HELPER=\"$(libexecdir)/ssh-rand-helper\" CC=@CC@ LD=@LD@ CFLAGS=@CFLAGS@ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ LIBS=@LIBS@ +LIBPAM=@LIBPAM@ +LIBWRAP=@LIBWRAP@ AR=@AR@ RANLIB=@RANLIB@ INSTALL=@INSTALL@ @@ -41,12 +44,13 @@ SSH_MODE= @SSHMODE@ INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@ +INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@ @NO_SFTP@SFTP_PROGS=sftp-server$(EXEEXT) sftp$(EXEEXT) -TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-agent$(EXEEXT) scp$(EXEEXT) $(SFTP_PROGS) +TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-agent$(EXEEXT) scp$(EXEEXT) ssh-rand-helper${EXEEXT} $(SFTP_PROGS) -LIBSSH_OBJS=atomicio.o authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o cipher.o compat.o compress.o crc32.o deattack.o dh.o dispatch.o mac.o hostfile.o key.o kex.o kexdh.o kexgex.o log.o match.o misc.o mpaux.o nchan.o packet.o radix.o rijndael.o entropy.o readpass.o rsa.o scard.o ssh-dss.o ssh-rsa.o tildexpand.o ttymodes.o uidswap.o uuencode.o xmalloc.o +LIBSSH_OBJS=atomicio.o authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o cipher.o compat.o compress.o crc32.o deattack.o dh.o dispatch.o fatal.o mac.o hostfile.o key.o kex.o kexdh.o kexgex.o log.o match.o misc.o mpaux.o nchan.o packet.o radix.o rijndael.o entropy.o readpass.o rsa.o scard.o ssh-dss.o ssh-rsa.o tildexpand.o ttymodes.o uidswap.o uuencode.o xmalloc.o SSHOBJS= ssh.o sshconnect.o sshconnect1.o sshconnect2.o sshtty.o readconf.o clientloop.o @@ -60,17 +64,17 @@ CONFIGFILES_IN=sshd_config ssh_config moduli PATHSUBS = \ - -D/etc/ssh_config=$(sysconfdir)/ssh_config \ - -D/etc/ssh_known_hosts=$(sysconfdir)/ssh_known_hosts \ - -D/etc/sshd_config=$(sysconfdir)/sshd_config \ + -D/etc/ssh/ssh_config=$(sysconfdir)/ssh_config \ + -D/etc/ssh/ssh_known_hosts=$(sysconfdir)/ssh_known_hosts \ + -D/etc/ssh/sshd_config=$(sysconfdir)/sshd_config \ -D/usr/libexec=$(libexecdir) \ -D/etc/shosts.equiv=$(sysconfdir)/shosts.equiv \ - -D/etc/ssh_host_key=$(sysconfdir)/ssh_host_key \ - -D/etc/ssh_host_dsa_key=$(sysconfdir)/ssh_host_dsa_key \ - -D/etc/ssh_host_rsa_key=$(sysconfdir)/ssh_host_rsa_key \ + -D/etc/ssh/ssh_host_key=$(sysconfdir)/ssh_host_key \ + -D/etc/ssh/ssh_host_dsa_key=$(sysconfdir)/ssh_host_dsa_key \ + -D/etc/ssh/ssh_host_rsa_key=$(sysconfdir)/ssh_host_rsa_key \ -D/var/run/sshd.pid=$(piddir)/sshd.pid \ - -D/etc/moduli=$(sysconfdir)/moduli \ - -D/etc/sshrc=$(sysconfdir)/sshrc \ + -D/etc/ssh/moduli=$(sysconfdir)/moduli \ + -D/etc/ssh/sshrc=$(sysconfdir)/sshrc \ -D/usr/X11R6/bin/xauth=$(XAUTH_PATH) \ -D/usr/bin:/bin:/usr/sbin:/sbin=@user_path@ @@ -98,7 +102,7 @@ $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) - $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) + $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBWRAP) $(LIBPAM) $(LIBS) scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o $(LD) -o $@ scp.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) @@ -121,6 +125,9 @@ sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-int.o sftp-common.o sftp-glob.o $(LD) -o $@ sftp.o sftp-client.o sftp-common.o sftp-int.o sftp-glob.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) +ssh-rand-helper${EXEEXT}: $(LIBCOMPAT) libssh.a ssh-rand-helper.o + $(LD) -o $@ ssh-rand-helper.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) + # test driver for the loginrec code - not built by default logintest: logintest.o $(LIBCOMPAT) libssh.a loginrec.o $(LD) -o $@ logintest.o $(LDFLAGS) loginrec.o -lopenbsd-compat -lssh $(LIBS) @@ -197,6 +204,9 @@ $(INSTALL) -m 0755 -s ssh-keygen $(DESTDIR)$(bindir)/ssh-keygen $(INSTALL) -m 0755 -s ssh-keyscan $(DESTDIR)$(bindir)/ssh-keyscan $(INSTALL) -m 0755 -s sshd $(DESTDIR)$(sbindir)/sshd + if test ! -z "$(INSTALL_SSH_RAND_HELPER)" ; then \ + $(INSTALL) -m 0755 -s ssh-rand-helper $(DESTDIR)$(libexecdir)/ssh-rand-helper ; \ + fi @NO_SFTP@$(INSTALL) -m 0755 -s sftp $(DESTDIR)$(bindir)/sftp @NO_SFTP@$(INSTALL) -m 0755 -s sftp-server $(DESTDIR)$(SFTP_SERVER) $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 @@ -212,7 +222,6 @@ ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 - #@FILEPRIV@ -f dev,filesys,driver $(DESTDIR)$(bindir)/ssh $(DESTDIR)$(bindir)/slogin if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ fi diff -ru openssh-3.0.2p1/README openssh-3.1p1/README --- openssh-3.0.2p1/README 2001-10-29 05:10:23.000000000 +1100 +++ openssh-3.1p1/README 2001-12-24 14:17:21.000000000 +1100 @@ -1,6 +1,6 @@ - A Japanese translation of this document and of the OpenSSH FAQ is - available at http://www.unixuser.org/~haruyama/security/openssh/index.html -- Thanks to HARUYAMA Seigo +- Thanks to HARUYAMA Seigo This is the port of OpenBSD's excellent OpenSSH[0] to Linux and other Unices. @@ -63,4 +63,4 @@ [6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9 [7] http://www.openssh.com/faq.html -$Id: README,v 1.49 2001/10/28 18:10:23 stevesk Exp $ +$Id: README,v 1.50 2001/12/24 03:17:21 djm Exp $ diff -ru openssh-3.0.2p1/TODO openssh-3.1p1/TODO --- openssh-3.0.2p1/TODO 2001-10-30 13:50:40.000000000 +1100 +++ openssh-3.1p1/TODO 2002-01-22 22:26:20.000000000 +1100 @@ -75,6 +75,10 @@ - Consider splitting the u_intXX_t test for sys/bitype.h into seperate test to allow people to (right/wrongfully) link against Bind directly. +- Consider splitting configure.ac into seperate files which do logically + similar tests. E.g move all the type detection stuff into one file, + entropy related stuff into another. + Packaging: - Solaris: Update packaging scripts and build new sysv startup scripts Ideally the package metadata should be generated by autoconf. @@ -83,4 +87,4 @@ - HP-UX: Provide DEPOT package scripts. (gilbert.r.loomis@saic.com) -$Id: TODO,v 1.45 2001/10/30 02:50:40 tim Exp $ +$Id: TODO,v 1.46 2002/01/22 11:26:20 djm Exp $ diff -ru openssh-3.0.2p1/acconfig.h openssh-3.1p1/acconfig.h --- openssh-3.0.2p1/acconfig.h 2001-11-04 06:09:33.000000000 +1100 +++ openssh-3.1p1/acconfig.h 2002-02-27 03:40:49.000000000 +1100 @@ -1,4 +1,4 @@ -/* $Id: acconfig.h,v 1.119 2001/11/03 19:09:33 tim Exp $ */ +/* $Id: acconfig.h,v 1.122 2002/02/26 16:40:49 tim Exp $ */ #ifndef _CONFIG_H #define _CONFIG_H @@ -59,9 +59,6 @@ /* Define if you are on Cygwin */ #undef HAVE_CYGWIN -/* Define if you lack native POSIX regex and you are using PCRE */ -#undef HAVE_LIBPCRE - /* Define if you have a broken realpath. */ #undef BROKEN_REALPATH @@ -89,9 +86,6 @@ /* Define if you want IRIX kernel jobs */ #undef WITH_IRIX_JOBS -/* Location of random number pool */ -#undef RANDOM_POOL - /* Location of PRNGD/EGD random number socket */ #undef PRNGD_SOCKET @@ -263,9 +257,6 @@ #undef HAVE_SS_FAMILY_IN_SS #undef HAVE___SS_FAMILY_IN_SS -/* Define if you have a regcomp() function */ -#undef HAVE_REGCOMP - /* Define if you have /dev/ptmx */ #undef HAVE_DEV_PTMX @@ -329,6 +320,9 @@ /* Define if you want smartcard support */ #undef SMARTCARD +/* Define if you want to use OpenSSL's internally seeded PRNG only */ +#undef OPENSSL_PRNG_ONLY + @BOTTOM@ /* ******************* Shouldn't need to edit below this line ************** */ diff -ru openssh-3.0.2p1/auth-bsdauth.c openssh-3.1p1/auth-bsdauth.c --- openssh-3.0.2p1/auth-bsdauth.c 2001-06-10 10:41:19.000000000 +1000 +++ openssh-3.1p1/auth-bsdauth.c 2001-12-21 14:45:47.000000000 +1100 @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "includes.h" -RCSID("$OpenBSD: auth-bsdauth.c,v 1.1 2001/05/18 14:13:28 markus Exp $"); +RCSID("$OpenBSD: auth-bsdauth.c,v 1.2 2001/12/19 07:18:56 deraadt Exp $"); #ifdef BSD_AUTH #include "xmalloc.h" @@ -36,74 +36,74 @@ } static int -bsdauth_query(void *ctx, char **name, char **infotxt, +bsdauth_query(void *ctx, char **name, char **infotxt, u_int *numprompts, char ***prompts, u_int **echo_on) { - Authctxt *authctxt = ctx; - char *challenge = NULL; + Authctxt *authctxt = ctx; + char *challenge = NULL; - if (authctxt->as != NULL) { - debug2("bsdauth_query: try reuse session"); - challenge = auth_getitem(authctxt->as, AUTHV_CHALLENGE); - if (challenge == NULL) { - auth_close(authctxt->as); - authctxt->as = NULL; - } - } - - if (challenge == NULL) { - debug2("bsdauth_query: new bsd auth session"); - debug3("bsdauth_query: style %s", + if (authctxt->as != NULL) { + debug2("bsdauth_query: try reuse session"); + challenge = auth_getitem(authctxt->as, AUTHV_CHALLENGE); + if (challenge == NULL) { + auth_close(authctxt->as); + authctxt->as = NULL; + } + } + + if (challenge == NULL) { + debug2("bsdauth_query: new bsd auth session"); + debug3("bsdauth_query: style %s", authctxt->style ? authctxt->style : ""); - authctxt->as = auth_userchallenge(authctxt->user, + authctxt->as = auth_userchallenge(authctxt->user, authctxt->style, "auth-ssh", &challenge); - if (authctxt->as == NULL) - challenge = NULL; - debug2("bsdauth_query: <%s>", challenge ? challenge : "empty"); - } - - if (challenge == NULL) - return -1; - - *name = xstrdup(""); - *infotxt = xstrdup(""); - *numprompts = 1; - *prompts = xmalloc(*numprompts * sizeof(char*)); - *echo_on = xmalloc(*numprompts * sizeof(u_int)); - (*echo_on)[0] = 0; - (*prompts)[0] = xstrdup(challenge); + if (authctxt->as == NULL) + challenge = NULL; + debug2("bsdauth_query: <%s>", challenge ? challenge : "empty"); + } + + if (challenge == NULL) + return -1; + + *name = xstrdup(""); + *infotxt = xstrdup(""); + *numprompts = 1; + *prompts = xmalloc(*numprompts * sizeof(char*)); + *echo_on = xmalloc(*numprompts * sizeof(u_int)); + (*echo_on)[0] = 0; + (*prompts)[0] = xstrdup(challenge); - return 0; + return 0; } static int bsdauth_respond(void *ctx, u_int numresponses, char **responses) { - Authctxt *authctxt = ctx; - int authok; - - if (authctxt->as == 0) - error("bsdauth_respond: no bsd auth session"); - - if (numresponses != 1) - return -1; - - authok = auth_userresponse(authctxt->as, responses[0], 0); - authctxt->as = NULL; - debug3("bsdauth_respond: <%s> = <%d>", responses[0], authok); + Authctxt *authctxt = ctx; + int authok; - return (authok == 0) ? -1 : 0; + if (authctxt->as == 0) + error("bsdauth_respond: no bsd auth session"); + + if (numresponses != 1) + return -1; + + authok = auth_userresponse(authctxt->as, responses[0], 0); + authctxt->as = NULL; + debug3("bsdauth_respond: <%s> = <%d>", responses[0], authok); + + return (authok == 0) ? -1 : 0; } static void bsdauth_free_ctx(void *ctx) { - Authctxt *authctxt = ctx; + Authctxt *authctxt = ctx; - if (authctxt && authctxt->as) { - auth_close(authctxt->as); - authctxt->as = NULL; - } + if (authctxt && authctxt->as) { + auth_close(authctxt->as); + authctxt->as = NULL; + } } KbdintDevice bsdauth_device = { diff -ru openssh-3.0.2p1/auth-krb4.c openssh-3.1p1/auth-krb4.c --- openssh-3.0.2p1/auth-krb4.c 2001-07-04 14:21:15.000000000 +1000 +++ openssh-3.1p1/auth-krb4.c 2001-12-21 14:45:47.000000000 +1100 @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth-krb4.c,v 1.24 2001/06/26 16:15:22 dugsong Exp $"); +RCSID("$OpenBSD: auth-krb4.c,v 1.25 2001/12/19 07:18:56 deraadt Exp $"); #include "ssh.h" #include "ssh1.h" @@ -49,7 +49,7 @@ const char *tkt_root = TKT_ROOT; struct stat st; int fd; - + if (!authctxt->krb4_ticket_file) { /* Set unique ticket string manually since we're still root. */ authctxt->krb4_ticket_file = xmalloc(MAXPATHLEN); @@ -79,13 +79,13 @@ } /* Failure - cancel cleanup function, leaving ticket for inspection. */ log("WARNING: bad ticket file %s", authctxt->krb4_ticket_file); - + fatal_remove_cleanup(krb4_cleanup_proc, authctxt); cleanup_registered = 0; - + xfree(authctxt->krb4_ticket_file); authctxt->krb4_ticket_file = NULL; - + return (0); } @@ -103,10 +103,10 @@ char localhost[MAXHOSTNAMELEN], phost[INST_SZ], realm[REALM_SZ]; u_int32_t faddr; int r; - + if ((pw = authctxt->pw) == NULL) return (0); - + /* * Try Kerberos password authentication only for non-root * users and only if Kerberos is installed. @@ -128,7 +128,7 @@ } /* Successful authentication. */ chown(tkt_string(), pw->pw_uid, pw->pw_gid); - + /* * Now that we have a TGT, try to get a local * "rcmd" ticket to ensure that we are not talking @@ -138,7 +138,7 @@ strlcpy(phost, (char *)krb_get_phost(localhost), sizeof(phost)); r = krb_mk_req(&tkt, KRB4_SERVICE_NAME, phost, realm, 33); - + if (r == KSUCCESS) { if ((hp = gethostbyname(localhost)) == NULL) { log("Couldn't get local host address!"); @@ -146,7 +146,7 @@ } memmove((void *)&faddr, (void *)hp->h_addr, sizeof(faddr)); - + /* Verify our "rcmd" ticket. */ r = krb_rd_req(&tkt, KRB4_SERVICE_NAME, phost, faddr, &adata, ""); @@ -186,13 +186,13 @@ } else /* Logging in as root or no local Kerberos realm. */ debug("Unable to authenticate to Kerberos."); - + failure: krb4_cleanup_proc(authctxt); - + if (!options.kerberos_or_local_passwd) return (0); - + /* Fall back to ordinary passwd authentication. */ return (-1); } @@ -220,9 +220,9 @@ socklen_t slen; u_int cksum; int r, s; - + s = packet_get_connection_in(); - + slen = sizeof(local); memset(&local, 0, sizeof(local)); if (getsockname(s, (struct sockaddr *) & local, &slen) < 0) @@ -235,7 +235,7 @@ } instance[0] = '*'; instance[1] = 0; - + /* Get the encrypted request, challenge, and session key. */ if ((r = krb_rd_req(auth, KRB4_SERVICE_NAME, instance, 0, &adat, ""))) { @@ -243,11 +243,11 @@ return (0); } des_key_sched((des_cblock *) adat.session, schedule); - + *client = xmalloc(MAX_K_NAME_SZ); (void) snprintf(*client, MAX_K_NAME_SZ, "%s%s%s@%s", adat.pname, *adat.pinst ? "." : "", adat.pinst, adat.prealm); - + /* Check ~/.klogin authorization now. */ if (kuserok(&adat, authctxt->user) != KSUCCESS) { log("Kerberos v4 .klogin authorization failed for %s to " @@ -259,7 +259,7 @@ session key. */ cksum = adat.checksum + 1; cksum = htonl(cksum); - + /* If we can't successfully encrypt the checksum, we send back an empty message, admitting our failure. */ if ((r = krb_mk_priv((u_char *) & cksum, reply.dat, sizeof(cksum) + 1, @@ -269,10 +269,10 @@ reply.length = 0; } else reply.length = r; - + /* Clear session key. */ memset(&adat.session, 0, sizeof(&adat.session)); - + packet_start(SSH_SMSG_AUTH_KERBEROS_RESPONSE); packet_put_string((char *) reply.dat, reply.length); packet_send(); @@ -287,19 +287,19 @@ { CREDENTIALS creds; struct passwd *pw; - + if ((pw = authctxt->pw) == NULL) goto failure; - + temporarily_use_uid(pw); - + if (!radix_to_creds(string, &creds)) { log("Protocol error decoding Kerberos v4 TGT"); goto failure; } if (strncmp(creds.service, "", 1) == 0) /* backward compatibility */ strlcpy(creds.service, "krbtgt", sizeof creds.service); - + if (strcmp(creds.service, "krbtgt")) { log("Kerberos v4 TGT (%s%s%s@%s) rejected for %s", creds.pname, creds.pinst[0] ? "." : "", creds.pinst, @@ -308,10 +308,10 @@ } if (!krb4_init(authctxt)) goto failure; - + if (in_tkt(creds.pname, creds.pinst) != KSUCCESS) goto failure; - + if (save_credentials(creds.service, creds.instance, creds.realm, creds.session, creds.lifetime, creds.kvno, &creds.ticket_st, creds.issue_date) != KSUCCESS) { @@ -320,20 +320,20 @@ } /* Successful authentication, passed all checks. */ chown(tkt_string(), pw->pw_uid, pw->pw_gid); - + debug("Kerberos v4 TGT accepted (%s%s%s@%s)", creds.pname, creds.pinst[0] ? "." : "", creds.pinst, creds.realm); memset(&creds, 0, sizeof(creds)); - + restore_uid(); - + return (1); - + failure: krb4_cleanup_proc(authctxt); memset(&creds, 0, sizeof(creds)); restore_uid(); - + return (0); } @@ -343,22 +343,22 @@ CREDENTIALS creds; struct passwd *pw; uid_t uid; - + if ((pw = authctxt->pw) == NULL) return (0); - + if (!radix_to_creds(token_string, &creds)) { log("Protocol error decoding AFS token"); return (0); } if (strncmp(creds.service, "", 1) == 0) /* backward compatibility */ strlcpy(creds.service, "afs", sizeof creds.service); - + if (strncmp(creds.pname, "AFS ID ", 7) == 0) uid = atoi(creds.pname + 7); else uid = pw->pw_uid; - + if (kafs_settoken(creds.realm, uid, &creds)) { log("AFS token (%s@%s) rejected for %s", creds.pname, creds.realm, pw->pw_name); @@ -367,7 +367,7 @@ } debug("AFS token accepted (%s@%s)", creds.pname, creds.realm); memset(&creds, 0, sizeof(creds)); - + return (1); } #endif /* AFS */ diff -ru openssh-3.0.2p1/auth-krb5.c openssh-3.1p1/auth-krb5.c --- openssh-3.0.2p1/auth-krb5.c 2001-11-14 00:02:11.000000000 +1100 +++ openssh-3.1p1/auth-krb5.c 2002-03-05 12:53:04.000000000 +1100 @@ -2,10 +2,11 @@ * Kerberos v5 authentication and ticket-passing routines. * * $FreeBSD: src/crypto/openssh/auth-krb5.c,v 1.6 2001/02/13 16:58:04 assar Exp $ - * $OpenBSD: auth-krb5.c,v 1.2 2001/11/12 01:47:09 dugsong Exp $ */ #include "includes.h" +RCSID("$OpenBSD: auth-krb5.c,v 1.6 2002/03/04 17:27:39 stevesk Exp $"); + #include "ssh.h" #include "ssh1.h" #include "packet.h" @@ -26,7 +27,7 @@ Authctxt *authctxt = (Authctxt *)context; krb5_error_code problem; static int cleanup_registered = 0; - + if (authctxt->krb5_ctx == NULL) { problem = krb5_init_context(&authctxt->krb5_ctx); if (problem) @@ -45,7 +46,7 @@ * only, in auth is received ticket, in client is returned principal * from the ticket */ -int +int auth_krb5(Authctxt *authctxt, krb5_data *auth, char **client) { krb5_error_code problem; @@ -58,52 +59,52 @@ server = NULL; ticket = NULL; reply.length = 0; - + problem = krb5_init(authctxt); - if (problem) + if (problem) goto err; - + problem = krb5_auth_con_init(authctxt->krb5_ctx, &authctxt->krb5_auth_ctx); if (problem) goto err; - + fd = packet_get_connection_in(); problem = krb5_auth_con_setaddrs_from_fd(authctxt->krb5_ctx, authctxt->krb5_auth_ctx, &fd); if (problem) goto err; - + problem = krb5_sname_to_principal(authctxt->krb5_ctx, NULL, NULL , KRB5_NT_SRV_HST, &server); if (problem) goto err; - + problem = krb5_rd_req(authctxt->krb5_ctx, &authctxt->krb5_auth_ctx, auth, server, NULL, NULL, &ticket); if (problem) goto err; - + problem = krb5_copy_principal(authctxt->krb5_ctx, ticket->client, &authctxt->krb5_user); if (problem) goto err; - + /* if client wants mutual auth */ problem = krb5_mk_rep(authctxt->krb5_ctx, authctxt->krb5_auth_ctx, &reply); if (problem) goto err; - + /* Check .k5login authorization now. */ if (!krb5_kuserok(authctxt->krb5_ctx, authctxt->krb5_user, authctxt->pw->pw_name)) goto err; - + if (client) krb5_unparse_name(authctxt->krb5_ctx, authctxt->krb5_user, client); - + packet_start(SSH_SMSG_AUTH_KERBEROS_RESPONSE); packet_put_string((char *) reply.data, reply.length); packet_send(); @@ -117,10 +118,15 @@ krb5_free_ticket(authctxt->krb5_ctx, ticket); if (reply.length) xfree(reply.data); - - if (problem) - debug("Kerberos v5 authentication failed: %s", - krb5_get_err_text(authctxt->krb5_ctx, problem)); + + if (problem) { + if (authctxt->krb5_ctx != NULL) + debug("Kerberos v5 authentication failed: %s", + krb5_get_err_text(authctxt->krb5_ctx, problem)); + else + debug("Kerberos v5 authentication failed: %d", + problem); + } return (ret); } @@ -131,51 +137,51 @@ krb5_error_code problem; krb5_ccache ccache = NULL; char *pname; - + if (authctxt->pw == NULL || authctxt->krb5_user == NULL) return (0); - + temporarily_use_uid(authctxt->pw); - + problem = krb5_cc_gen_new(authctxt->krb5_ctx, &krb5_fcc_ops, &ccache); if (problem) goto fail; - + problem = krb5_cc_initialize(authctxt->krb5_ctx, ccache, authctxt->krb5_user); if (problem) goto fail; - + problem = krb5_rd_cred2(authctxt->krb5_ctx, authctxt->krb5_auth_ctx, ccache, tgt); if (problem) goto fail; - + authctxt->krb5_fwd_ccache = ccache; ccache = NULL; - + authctxt->krb5_ticket_file = (char *)krb5_cc_get_name(authctxt->krb5_ctx, authctxt->krb5_fwd_ccache); - + problem = krb5_unparse_name(authctxt->krb5_ctx, authctxt->krb5_user, &pname); if (problem) goto fail; - + debug("Kerberos v5 TGT accepted (%s)", pname); - + restore_uid(); - + return (1); - + fail: if (problem) debug("Kerberos v5 TGT passing failed: %s", krb5_get_err_text(authctxt->krb5_ctx, problem)); if (ccache) krb5_cc_destroy(authctxt->krb5_ctx, ccache); - + restore_uid(); - + return (0); } @@ -183,47 +189,54 @@ auth_krb5_password(Authctxt *authctxt, const char *password) { krb5_error_code problem; - + if (authctxt->pw == NULL) return (0); - + temporarily_use_uid(authctxt->pw); - + problem = krb5_init(authctxt); if (problem) goto out; - + problem = krb5_parse_name(authctxt->krb5_ctx, authctxt->pw->pw_name, &authctxt->krb5_user); if (problem) goto out; - + problem = krb5_cc_gen_new(authctxt->krb5_ctx, &krb5_mcc_ops, &authctxt->krb5_fwd_ccache); if (problem) goto out; - + problem = krb5_cc_initialize(authctxt->krb5_ctx, authctxt->krb5_fwd_ccache, authctxt->krb5_user); if (problem) goto out; - + + restore_uid(); problem = krb5_verify_user(authctxt->krb5_ctx, authctxt->krb5_user, authctxt->krb5_fwd_ccache, password, 1, NULL); + temporarily_use_uid(authctxt->pw); + if (problem) goto out; - + authctxt->krb5_ticket_file = (char *)krb5_cc_get_name(authctxt->krb5_ctx, authctxt->krb5_fwd_ccache); - + out: restore_uid(); - + if (problem) { - debug("Kerberos password authentication failed: %s", - krb5_get_err_text(authctxt->krb5_ctx, problem)); - + if (authctxt->krb5_ctx != NULL) + debug("Kerberos password authentication failed: %s", + krb5_get_err_text(authctxt->krb5_ctx, problem)); + else + debug("Kerberos password authentication failed: %d", + problem); + krb5_cleanup_proc(authctxt); - + if (options.kerberos_or_local_passwd) return (-1); else @@ -236,7 +249,7 @@ krb5_cleanup_proc(void *context) { Authctxt *authctxt = (Authctxt *)context; - + debug("krb5_cleanup_proc called"); if (authctxt->krb5_fwd_ccache) { krb5_cc_destroy(authctxt->krb5_ctx, authctxt->krb5_fwd_ccache); diff -ru openssh-3.0.2p1/auth-options.c openssh-3.1p1/auth-options.c --- openssh-3.0.2p1/auth-options.c 2001-09-13 04:03:31.000000000 +1000 +++ openssh-3.1p1/auth-options.c 2002-02-05 12:13:41.000000000 +1100 @@ -10,7 +10,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth-options.c,v 1.20 2001/08/30 20:36:34 stevesk Exp $"); +RCSID("$OpenBSD: auth-options.c,v 1.21 2002/01/29 14:32:03 markus Exp $"); #include "packet.h" #include "xmalloc.h" @@ -170,7 +170,7 @@ if (strncasecmp(opts, cp, strlen(cp)) == 0) { const char *remote_ip = get_remote_ipaddr(); const char *remote_host = get_canonical_hostname( - options.reverse_mapping_check); + options.verify_reverse_mapping); char *patterns = xmalloc(strlen(opts) + 1); opts += strlen(cp); diff -ru openssh-3.0.2p1/auth-options.h openssh-3.1p1/auth-options.h --- openssh-3.0.2p1/auth-options.h 2001-07-04 14:46:57.000000000 +1000 +++ openssh-3.1p1/auth-options.h 2002-03-05 12:53:04.000000000 +1100 @@ -1,3 +1,5 @@ +/* $OpenBSD: auth-options.h,v 1.11 2002/03/04 17:27:39 stevesk Exp $ */ + /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -11,8 +13,6 @@ * called by a name other than "ssh" or "Secure Shell". */ -/* $OpenBSD: auth-options.h,v 1.10 2001/06/26 17:27:22 markus Exp $ */ - #ifndef AUTH_OPTIONS_H #define AUTH_OPTIONS_H diff -ru openssh-3.0.2p1/auth-pam.c openssh-3.1p1/auth-pam.c --- openssh-3.0.2p1/auth-pam.c 2001-11-10 07:22:17.000000000 +1100 +++ openssh-3.1p1/auth-pam.c 2002-02-05 12:40:47.000000000 +1100 @@ -35,7 +35,7 @@ extern char *__progname; -RCSID("$Id: auth-pam.c,v 1.41 2001/11/09 20:22:17 stevesk Exp $"); +RCSID("$Id: auth-pam.c,v 1.42 2002/02/05 01:40:47 djm Exp $"); #define NEW_AUTHTOK_MSG \ "Warning: Your password has expired, please change it now" @@ -360,7 +360,7 @@ fatal("PAM initialisation failed[%d]: %.200s", pam_retval, PAM_STRERROR(__pamh, pam_retval)); - rhost = get_remote_name_or_ip(utmp_len, options.reverse_mapping_check); + rhost = get_remote_name_or_ip(utmp_len, options.verify_reverse_mapping); debug("PAM setting rhost to \"%.200s\"", rhost); pam_retval = pam_set_item(__pamh, PAM_RHOST, rhost); diff -ru openssh-3.0.2p1/auth-passwd.c openssh-3.1p1/auth-passwd.c --- openssh-3.0.2p1/auth-passwd.c 2001-07-04 14:21:15.000000000 +1000 +++ openssh-3.1p1/auth-passwd.c 2002-03-05 12:45:57.000000000 +1100 @@ -36,12 +36,11 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth-passwd.c,v 1.23 2001/06/26 16:15:23 dugsong Exp $"); +RCSID("$OpenBSD: auth-passwd.c,v 1.24 2002/03/04 12:43:06 markus Exp $"); #if !defined(USE_PAM) && !defined(HAVE_OSF_SIA) #include "packet.h" -#include "xmalloc.h" #include "log.h" #include "servconf.h" #include "auth.h" @@ -212,7 +211,11 @@ else encrypted_password = crypt(password, salt); # else +# ifdef HAVE_SCO_PROTECTED_PW + encrypted_password = bigcrypt(password, salt); +# else encrypted_password = crypt(password, salt); +# endif /* HAVE_SCO_PROTECTED_PW */ # endif /* __hpux */ #endif /* HAVE_MD5_PASSWORDS */ diff -ru openssh-3.0.2p1/auth-rh-rsa.c openssh-3.1p1/auth-rh-rsa.c --- openssh-3.0.2p1/auth-rh-rsa.c 2001-11-12 11:04:28.000000000 +1100 +++ openssh-3.1p1/auth-rh-rsa.c 2002-03-05 12:45:57.000000000 +1100 @@ -13,10 +13,9 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth-rh-rsa.c,v 1.26 2001/11/07 22:41:51 markus Exp $"); +RCSID("$OpenBSD: auth-rh-rsa.c,v 1.29 2002/03/04 12:43:06 markus Exp $"); #include "packet.h" -#include "xmalloc.h" #include "uidswap.h" #include "log.h" #include "servconf.h" @@ -32,16 +31,15 @@ */ int -auth_rhosts_rsa(struct passwd *pw, const char *client_user, RSA *client_host_key) +auth_rhosts_rsa(struct passwd *pw, const char *client_user, Key *client_host_key) { extern ServerOptions options; const char *canonical_hostname; HostStatus host_status; - Key *client_key; debug("Trying rhosts with RSA host authentication for client user %.100s", client_user); - if (pw == NULL || client_host_key == NULL) + if (pw == NULL || client_host_key == NULL || client_host_key->rsa == NULL) return 0; /* Check if we would accept it using rhosts authentication. */ @@ -49,21 +47,14 @@ return 0; canonical_hostname = get_canonical_hostname( - options.reverse_mapping_check); + options.verify_reverse_mapping); debug("Rhosts RSA authentication: canonical host %.900s", canonical_hostname); - /* wrap the RSA key into a 'generic' key */ - client_key = key_new(KEY_RSA1); - BN_copy(client_key->rsa->e, client_host_key->e); - BN_copy(client_key->rsa->n, client_host_key->n); - - host_status = check_key_in_hostfiles(pw, client_key, canonical_hostname, - _PATH_SSH_SYSTEM_HOSTFILE, + host_status = check_key_in_hostfiles(pw, client_host_key, + canonical_hostname, _PATH_SSH_SYSTEM_HOSTFILE, options.ignore_user_known_hosts ? NULL : _PATH_SSH_USER_HOSTFILE); - key_free(client_key); - if (host_status != HOST_OK) { debug("Rhosts with RSA host authentication denied: unknown or invalid host key"); packet_send_debug("Your host key cannot be verified: unknown or invalid host key."); @@ -72,7 +63,7 @@ /* A matching host key was found and is known. */ /* Perform the challenge-response dialog with the client for the host key. */ - if (!auth_rsa_challenge_dialog(client_host_key)) { + if (!auth_rsa_challenge_dialog(client_host_key->rsa)) { log("Client on %.800s failed to respond correctly to host authentication.", canonical_hostname); return 0; diff -ru openssh-3.0.2p1/auth-rhosts.c openssh-3.1p1/auth-rhosts.c --- openssh-3.0.2p1/auth-rhosts.c 2001-06-25 15:01:24.000000000 +1000 +++ openssh-3.1p1/auth-rhosts.c 2002-03-05 12:45:57.000000000 +1100 @@ -14,10 +14,9 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth-rhosts.c,v 1.24 2001/06/23 15:12:17 itojun Exp $"); +RCSID("$OpenBSD: auth-rhosts.c,v 1.27 2002/03/04 12:43:06 markus Exp $"); #include "packet.h" -#include "xmalloc.h" #include "uidswap.h" #include "pathnames.h" #include "log.h" @@ -156,7 +155,7 @@ const char *hostname, *ipaddr; int ret; - hostname = get_canonical_hostname(options.reverse_mapping_check); + hostname = get_canonical_hostname(options.verify_reverse_mapping); ipaddr = get_remote_ipaddr(); ret = auth_rhosts2(pw, client_user, hostname, ipaddr); return ret; @@ -186,7 +185,7 @@ * servers. */ for (rhosts_file_index = 0; rhosts_files[rhosts_file_index]; - rhosts_file_index++) { + rhosts_file_index++) { /* Check users .rhosts or .shosts. */ snprintf(buf, sizeof buf, "%.500s/%.100s", pw->pw_dir, rhosts_files[rhosts_file_index]); @@ -204,16 +203,16 @@ /* If not logging in as superuser, try /etc/hosts.equiv and shosts.equiv. */ if (pw->pw_uid != 0) { - if (check_rhosts_file(_PATH_RHOSTS_EQUIV, hostname, ipaddr, client_user, - pw->pw_name)) { + if (check_rhosts_file(_PATH_RHOSTS_EQUIV, hostname, ipaddr, + client_user, pw->pw_name)) { packet_send_debug("Accepted for %.100s [%.100s] by /etc/hosts.equiv.", - hostname, ipaddr); + hostname, ipaddr); return 1; } - if (check_rhosts_file(_PATH_SSH_HOSTS_EQUIV, hostname, ipaddr, client_user, - pw->pw_name)) { + if (check_rhosts_file(_PATH_SSH_HOSTS_EQUIV, hostname, ipaddr, + client_user, pw->pw_name)) { packet_send_debug("Accepted for %.100s [%.100s] by %.100s.", - hostname, ipaddr, _PATH_SSH_HOSTS_EQUIV); + hostname, ipaddr, _PATH_SSH_HOSTS_EQUIV); return 1; } } @@ -230,7 +229,7 @@ } if (options.strict_modes && ((st.st_uid != 0 && st.st_uid != pw->pw_uid) || - (st.st_mode & 022) != 0)) { + (st.st_mode & 022) != 0)) { log("Rhosts authentication refused for %.100s: bad ownership or modes for home directory.", pw->pw_name); packet_send_debug("Rhosts authentication refused for %.100s: bad ownership or modes for home directory.", @@ -242,7 +241,7 @@ /* Check all .rhosts files (currently .shosts and .rhosts). */ for (rhosts_file_index = 0; rhosts_files[rhosts_file_index]; - rhosts_file_index++) { + rhosts_file_index++) { /* Check users .rhosts or .shosts. */ snprintf(buf, sizeof buf, "%.500s/%.100s", pw->pw_dir, rhosts_files[rhosts_file_index]); @@ -257,7 +256,7 @@ */ if (options.strict_modes && ((st.st_uid != 0 && st.st_uid != pw->pw_uid) || - (st.st_mode & 022) != 0)) { + (st.st_mode & 022) != 0)) { log("Rhosts authentication refused for %.100s: bad modes for %.200s", pw->pw_name, buf); packet_send_debug("Bad file modes for %.200s", buf); diff -ru openssh-3.0.2p1/auth-rsa.c openssh-3.1p1/auth-rsa.c --- openssh-3.0.2p1/auth-rsa.c 2001-08-07 07:01:49.000000000 +1000 +++ openssh-3.1p1/auth-rsa.c 2002-01-22 23:16:33.000000000 +1100 @@ -14,7 +14,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth-rsa.c,v 1.44 2001/07/23 18:14:58 stevesk Exp $"); +RCSID("$OpenBSD: auth-rsa.c,v 1.50 2001/12/28 14:50:54 markus Exp $"); #include #include @@ -31,6 +31,7 @@ #include "log.h" #include "servconf.h" #include "auth.h" +#include "hostfile.h" /* import */ extern ServerOptions options; @@ -65,14 +66,17 @@ u_char buf[32], mdbuf[16], response[16]; MD5_CTX md; u_int i; - int plen, len; + int len; - encrypted_challenge = BN_new(); - challenge = BN_new(); + if ((encrypted_challenge = BN_new()) == NULL) + fatal("auth_rsa_challenge_dialog: BN_new() failed"); + if ((challenge = BN_new()) == NULL) + fatal("auth_rsa_challenge_dialog: BN_new() failed"); /* Generate a random challenge. */ BN_rand(challenge, 256, 0, 0); - ctx = BN_CTX_new(); + if ((ctx = BN_CTX_new()) == NULL) + fatal("auth_rsa_challenge_dialog: BN_CTX_new() failed"); BN_mod(challenge, challenge, pk->n, ctx); BN_CTX_free(ctx); @@ -87,10 +91,10 @@ packet_write_wait(); /* Wait for a response. */ - packet_read_expect(&plen, SSH_CMSG_AUTH_RSA_RESPONSE); - packet_integrity_check(plen, 16, SSH_CMSG_AUTH_RSA_RESPONSE); + packet_read_expect(SSH_CMSG_AUTH_RSA_RESPONSE); for (i = 0; i < 16; i++) response[i] = packet_get_char(); + packet_check_eom(); /* The response is MD5 of decrypted challenge plus session id. */ len = BN_num_bytes(challenge); @@ -128,7 +132,8 @@ FILE *f; u_long linenum = 0; struct stat st; - RSA *pk; + Key *key; + char *fp; /* no user given */ if (pw == NULL) @@ -170,9 +175,7 @@ /* Flag indicating whether authentication has succeeded. */ authenticated = 0; - pk = RSA_new(); - pk->e = BN_new(); - pk->n = BN_new(); + key = key_new(KEY_RSA1); /* * Go though the accepted keys, looking for the current key. If @@ -210,7 +213,7 @@ options = NULL; /* Parse the key from the line. */ - if (!auth_rsa_read_key(&cp, &bits, pk->e, pk->n)) { + if (hostfile_read_key(&cp, &bits, key) == 0) { debug("%.100s, line %lu: non ssh1 key syntax", file, linenum); continue; @@ -218,14 +221,14 @@ /* cp now points to the comment part. */ /* Check if the we have found the desired key (identified by its modulus). */ - if (BN_cmp(pk->n, client_n) != 0) + if (BN_cmp(key->rsa->n, client_n) != 0) continue; /* check the real bits */ - if (bits != BN_num_bits(pk->n)) + if (bits != BN_num_bits(key->rsa->n)) log("Warning: %s, line %lu: keysize mismatch: " "actual %d vs. announced %d.", - file, linenum, BN_num_bits(pk->n), bits); + file, linenum, BN_num_bits(key->rsa->n), bits); /* We have found the desired key. */ /* @@ -236,11 +239,15 @@ continue; /* Perform the challenge-response dialog for this key. */ - if (!auth_rsa_challenge_dialog(pk)) { + if (!auth_rsa_challenge_dialog(key->rsa)) { /* Wrong response. */ verbose("Wrong response to RSA authentication challenge."); packet_send_debug("Wrong response to RSA authentication challenge."); - continue; + /* + * Break out of the loop. Otherwise we might send + * another challenge and break the protocol. + */ + break; } /* * Correct response. The client has been successfully @@ -251,6 +258,12 @@ * otherwise continue searching. */ authenticated = 1; + + fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); + verbose("Found matching %s key: %s", + key_type(key), fp); + xfree(fp); + break; } @@ -261,7 +274,7 @@ xfree(file); fclose(f); - RSA_free(pk); + key_free(key); if (authenticated) packet_send_debug("RSA authentication accepted."); diff -ru openssh-3.0.2p1/auth-sia.c openssh-3.1p1/auth-sia.c --- openssh-3.0.2p1/auth-sia.c 2001-04-16 18:37:05.000000000 +1000 +++ openssh-3.1p1/auth-sia.c 2002-02-05 12:40:47.000000000 +1100 @@ -29,7 +29,7 @@ SIAENTITY *ent = NULL; const char *host; - host = get_canonical_hostname(options.reverse_mapping_check); + host = get_canonical_hostname(options.verify_reverse_mapping); if (!user || !pass) return(0); @@ -58,7 +58,7 @@ SIAENTITY *ent = NULL; const char *host; - host = get_canonical_hostname (options.reverse_mapping_check); + host = get_canonical_hostname (options.verify_reverse_mapping); if (sia_ses_init(&ent, saved_argc, saved_argv, host, user, tty, 0, NULL) != SIASUCCESS) { diff -ru openssh-3.0.2p1/auth-skey.c openssh-3.1p1/auth-skey.c --- openssh-3.0.2p1/auth-skey.c 2001-06-10 10:41:19.000000000 +1000 +++ openssh-3.1p1/auth-skey.c 2002-01-22 23:25:48.000000000 +1100 @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "includes.h" -RCSID("$OpenBSD: auth-skey.c,v 1.12 2001/05/18 14:13:28 markus Exp $"); +RCSID("$OpenBSD: auth-skey.c,v 1.16 2002/01/12 13:10:29 markus Exp $"); #ifdef SKEY @@ -40,7 +40,7 @@ #define PROMPT "\nS/Key Password: " static int -skey_query(void *ctx, char **name, char **infotxt, +skey_query(void *ctx, char **name, char **infotxt, u_int* numprompts, char ***prompts, u_int **echo_on) { Authctxt *authctxt = ctx; @@ -60,8 +60,7 @@ len = strlen(challenge) + strlen(PROMPT) + 1; p = xmalloc(len); - p[0] = '\0'; - strlcat(p, challenge, len); + strlcpy(p, challenge, len); strlcat(p, PROMPT, len); (*prompts)[0] = p; @@ -72,9 +71,9 @@ skey_respond(void *ctx, u_int numresponses, char **responses) { Authctxt *authctxt = ctx; - + if (authctxt->valid && - numresponses == 1 && + numresponses == 1 && skey_haskey(authctxt->pw->pw_name) == 0 && skey_passcheck(authctxt->pw->pw_name, responses[0]) != -1) return 0; diff -ru openssh-3.0.2p1/auth.c openssh-3.1p1/auth.c --- openssh-3.0.2p1/auth.c 2001-11-12 11:06:07.000000000 +1100 +++ openssh-3.1p1/auth.c 2002-03-05 12:42:43.000000000 +1100 @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth.c,v 1.29 2001/11/08 20:02:24 markus Exp $"); +RCSID("$OpenBSD: auth.c,v 1.35 2002/03/01 13:12:10 markus Exp $"); #ifdef HAVE_LOGIN_H #include @@ -105,43 +105,60 @@ shell = (pw->pw_shell[0] == '\0') ? _PATH_BSHELL : pw->pw_shell; /* deny if shell does not exists or is not executable */ - if (stat(shell, &st) != 0) + if (stat(shell, &st) != 0) { + log("User %.100s not allowed because shell %.100s does not exist", + pw->pw_name, shell); return 0; - if (!((st.st_mode & S_IFREG) && (st.st_mode & (S_IXOTH|S_IXUSR|S_IXGRP)))) + } + if (!((st.st_mode & S_IFREG) && (st.st_mode & (S_IXOTH|S_IXUSR|S_IXGRP)))) { + log("User %.100s not allowed because shell %.100s is not executable", + pw->pw_name, shell); return 0; + } if (options.num_deny_users > 0 || options.num_allow_users > 0) { - hostname = get_canonical_hostname(options.reverse_mapping_check); + hostname = get_canonical_hostname(options.verify_reverse_mapping); ipaddr = get_remote_ipaddr(); } /* Return false if user is listed in DenyUsers */ if (options.num_deny_users > 0) { for (i = 0; i < options.num_deny_users; i++) - if (match_user(pw->pw_name, hostname, ipaddr, - options.deny_users[i])) + if (match_user(pw->pw_name, hostname, ipaddr, + options.deny_users[i])) { + log("User %.100s not allowed because listed in DenyUsers", + pw->pw_name); return 0; + } } /* Return false if AllowUsers isn't empty and user isn't listed there */ if (options.num_allow_users > 0) { for (i = 0; i < options.num_allow_users; i++) - if (match_user(pw->pw_name, hostname, ipaddr, + if (match_user(pw->pw_name, hostname, ipaddr, options.allow_users[i])) break; /* i < options.num_allow_users iff we break for loop */ - if (i >= options.num_allow_users) + if (i >= options.num_allow_users) { + log("User %.100s not allowed because not listed in AllowUsers", + pw->pw_name); return 0; + } } if (options.num_deny_groups > 0 || options.num_allow_groups > 0) { /* Get the user's group access list (primary and supplementary) */ - if (ga_init(pw->pw_name, pw->pw_gid) == 0) + if (ga_init(pw->pw_name, pw->pw_gid) == 0) { + log("User %.100s not allowed because not in any group", + pw->pw_name); return 0; + } /* Return false if one of user's groups is listed in DenyGroups */ if (options.num_deny_groups > 0) if (ga_match(options.deny_groups, options.num_deny_groups)) { ga_free(); + log("User %.100s not allowed because a group is listed in DenyGroups", + pw->pw_name); return 0; } /* @@ -152,6 +169,8 @@ if (!ga_match(options.allow_groups, options.num_allow_groups)) { ga_free(); + log("User %.100s not allowed because none of user's groups are listed in AllowGroups", + pw->pw_name); return 0; } ga_free(); @@ -272,7 +291,7 @@ } if (cp[0] == '%' && cp[1] == 'u') { buffer_append(&buffer, pw->pw_name, - strlen(pw->pw_name)); + strlen(pw->pw_name)); cp++; continue; } @@ -315,7 +334,7 @@ Key *found; char *user_hostfile; struct stat st; - int host_status; + HostStatus host_status; /* Check if we know the host and its host key. */ found = key_new(key->type); @@ -326,7 +345,7 @@ if (options.strict_modes && (stat(user_hostfile, &st) == 0) && ((st.st_uid != 0 && st.st_uid != pw->pw_uid) || - (st.st_mode & 022) != 0)) { + (st.st_mode & 022) != 0)) { log("Authentication refused for %.100s: " "bad owner or modes for %.200s", pw->pw_name, user_hostfile); @@ -399,7 +418,7 @@ if (stat(buf, &st) < 0 || (st.st_uid != 0 && st.st_uid != uid) || (st.st_mode & 022) != 0) { - snprintf(err, errlen, + snprintf(err, errlen, "bad ownership or modes for directory %s", buf); return -1; } diff -ru openssh-3.0.2p1/auth.h openssh-3.1p1/auth.h --- openssh-3.0.2p1/auth.h 2001-07-04 14:46:57.000000000 +1000 +++ openssh-3.1p1/auth.h 2002-03-05 12:53:04.000000000 +1100 @@ -1,3 +1,5 @@ +/* $OpenBSD: auth.h,v 1.29 2002/03/04 17:27:39 stevesk Exp $ */ + /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -21,8 +23,8 @@ * (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: auth.h,v 1.22 2001/06/26 17:27:22 markus Exp $ */ + #ifndef AUTH_H #define AUTH_H @@ -71,30 +73,28 @@ /* * Keyboard interactive device: - * init_ctx returns: non NULL upon success - * query returns: 0 - success, otherwise failure + * init_ctx returns: non NULL upon success + * query returns: 0 - success, otherwise failure * respond returns: 0 - success, 1 - need further interaction, * otherwise - failure */ struct KbdintDevice { const char *name; - void* (*init_ctx) __P((Authctxt*)); - int (*query) __P((void *ctx, char **name, char **infotxt, - u_int *numprompts, char ***prompts, - u_int **echo_on)); - int (*respond) __P((void *ctx, u_int numresp, char **responses)); - void (*free_ctx) __P((void *ctx)); + void* (*init_ctx)(Authctxt*); + int (*query)(void *ctx, char **name, char **infotxt, + u_int *numprompts, char ***prompts, u_int **echo_on); + int (*respond)(void *ctx, u_int numresp, char **responses); + void (*free_ctx)(void *ctx); }; int auth_rhosts(struct passwd *, const char *); int auth_rhosts2(struct passwd *, const char *, const char *, const char *); -int auth_rhosts_rsa(struct passwd *, const char *, RSA *); +int auth_rhosts_rsa(struct passwd *, const char *, Key *); int auth_password(Authctxt *, const char *); int auth_rsa(struct passwd *, BIGNUM *); -int auth_rsa_read_key(char **, u_int *, BIGNUM *, BIGNUM *); int auth_rsa_challenge_dialog(RSA *); #ifdef KRB4 @@ -130,6 +130,7 @@ int auth_root_allowed(char *); int auth2_challenge(Authctxt *, char *); +void auth2_challenge_stop(Authctxt *); int allowed_user(struct passwd *); diff -ru openssh-3.0.2p1/auth1.c openssh-3.1p1/auth1.c --- openssh-3.0.2p1/auth1.c 2001-11-13 23:46:19.000000000 +1100 +++ openssh-3.1p1/auth1.c 2002-02-14 20:39:50.000000000 +1100 @@ -10,7 +10,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth1.c,v 1.25 2001/06/26 16:15:23 dugsong Exp $"); +RCSID("$OpenBSD: auth1.c,v 1.35 2002/02/03 17:53:25 markus Exp $"); #include "xmalloc.h" #include "rsa.h" @@ -22,6 +22,7 @@ #include "servconf.h" #include "compat.h" #include "auth.h" +#include "channels.h" #include "session.h" #include "misc.h" #include "uidswap.h" @@ -66,18 +67,17 @@ { int authenticated = 0; u_int bits; - RSA *client_host_key; + Key *client_host_key; BIGNUM *n; char *client_user, *password; char info[1024]; u_int dlen; - int plen, nlen, elen; u_int ulen; int type = 0; struct passwd *pw = authctxt->pw; debug("Attempting authentication for %s%.100s.", - authctxt->valid ? "" : "illegal user ", authctxt->user); + authctxt->valid ? "" : "illegal user ", authctxt->user); /* If the user has no password, accept authentication immediately. */ if (options.password_authentication && @@ -109,7 +109,7 @@ info[0] = '\0'; /* Get a packet from the client. */ - type = packet_read(&plen); + type = packet_read(); /* Process the packet. */ switch (type) { @@ -120,17 +120,16 @@ verbose("Kerberos authentication disabled."); } else { char *kdata = packet_get_string(&dlen); - - packet_integrity_check(plen, 4 + dlen, type); - + packet_check_eom(); + if (kdata[0] == 4) { /* KRB_PROT_VERSION */ #ifdef KRB4 KTEXT_ST tkt; - + tkt.length = dlen; if (tkt.length < MAX_KTXT_LEN) memcpy(tkt.dat, kdata, tkt.length); - + if (auth_krb4(authctxt, &tkt, &client_user)) { authenticated = 1; snprintf(info, sizeof(info), @@ -143,7 +142,7 @@ krb5_data tkt; tkt.length = dlen; tkt.data = kdata; - + if (auth_krb5(authctxt, &tkt, &client_user)) { authenticated = 1; snprintf(info, sizeof(info), @@ -156,7 +155,7 @@ } break; #endif /* KRB4 || KRB5 */ - + #if defined(AFS) || defined(KRB5) /* XXX - punt on backward compatibility here. */ case SSH_CMSG_HAVE_KERBEROS_TGT: @@ -168,7 +167,7 @@ break; #endif /* AFS */ #endif /* AFS || KRB5 */ - + case SSH_CMSG_AUTH_RHOSTS: if (!options.rhosts_authentication) { verbose("Rhosts authentication disabled."); @@ -181,7 +180,7 @@ * IP-spoofing on a local network.) */ client_user = packet_get_string(&ulen); - packet_integrity_check(plen, 4 + ulen, type); + packet_check_eom(); /* Try to authenticate using /etc/hosts.equiv and .rhosts. */ authenticated = auth_rhosts(pw, client_user); @@ -202,24 +201,20 @@ client_user = packet_get_string(&ulen); /* Get the client host key. */ - client_host_key = RSA_new(); - if (client_host_key == NULL) - fatal("RSA_new failed"); - client_host_key->e = BN_new(); - client_host_key->n = BN_new(); - if (client_host_key->e == NULL || client_host_key->n == NULL) - fatal("BN_new failed"); + client_host_key = key_new(KEY_RSA1); bits = packet_get_int(); - packet_get_bignum(client_host_key->e, &elen); - packet_get_bignum(client_host_key->n, &nlen); + packet_get_bignum(client_host_key->rsa->e); + packet_get_bignum(client_host_key->rsa->n); - if (bits != BN_num_bits(client_host_key->n)) + if (bits != BN_num_bits(client_host_key->rsa->n)) verbose("Warning: keysize mismatch for client_host_key: " - "actual %d, announced %d", BN_num_bits(client_host_key->n), bits); - packet_integrity_check(plen, (4 + ulen) + 4 + elen + nlen, type); - - authenticated = auth_rhosts_rsa(pw, client_user, client_host_key); - RSA_free(client_host_key); + "actual %d, announced %d", + BN_num_bits(client_host_key->rsa->n), bits); + packet_check_eom(); + + authenticated = auth_rhosts_rsa(pw, client_user, + client_host_key); + key_free(client_host_key); snprintf(info, sizeof info, " ruser %.100s", client_user); break; @@ -230,9 +225,10 @@ break; } /* RSA authentication requested. */ - n = BN_new(); - packet_get_bignum(n, &nlen); - packet_integrity_check(plen, nlen, type); + if ((n = BN_new()) == NULL) + fatal("do_authloop: BN_new failed"); + packet_get_bignum(n); + packet_check_eom(); authenticated = auth_rsa(pw, n); BN_clear_free(n); break; @@ -248,7 +244,7 @@ * not visible to an outside observer. */ password = packet_get_string(&dlen); - packet_integrity_check(plen, 4 + dlen, type); + packet_check_eom(); #ifdef USE_PAM /* Do PAM auth with password */ @@ -286,7 +282,7 @@ if (options.challenge_response_authentication == 1) { char *response = packet_get_string(&dlen); debug("got response '%s'", response); - packet_integrity_check(plen, 4 + dlen, type); + packet_check_eom(); authenticated = verify_response(authctxt, response); memset(response, 'r', dlen); xfree(response); @@ -313,9 +309,9 @@ #ifdef HAVE_CYGWIN if (authenticated && - !check_nt_auth(type == SSH_CMSG_AUTH_PASSWORD,pw->pw_uid)) { + !check_nt_auth(type == SSH_CMSG_AUTH_PASSWORD, pw)) { packet_disconnect("Authentication rejected for uid %d.", - (int)pw->pw_uid); + pw == NULL ? -1 : pw->pw_uid); authenticated = 0; } #else @@ -343,7 +339,7 @@ if (authctxt->failures++ > AUTH_FAIL_MAX) { #ifdef WITH_AIXAUTHENTICATE loginfailed(authctxt->user, - get_canonical_hostname(options.reverse_mapping_check), + get_canonical_hostname(options.verify_reverse_mapping), "ssh"); #endif /* WITH_AIXAUTHENTICATE */ packet_disconnect(AUTH_FAIL_MSG, authctxt->user); @@ -360,20 +356,19 @@ * been exchanged and encryption is enabled. */ void -do_authentication() +do_authentication(void) { Authctxt *authctxt; struct passwd *pw; - int plen; u_int ulen; char *p, *user, *style = NULL; /* Get the name of the user that we wish to log in as. */ - packet_read_expect(&plen, SSH_CMSG_USER); + packet_read_expect(SSH_CMSG_USER); /* Get the user name. */ user = packet_get_string(&ulen); - packet_integrity_check(plen, (4 + ulen), SSH_CMSG_USER); + packet_check_eom(); if ((style = strchr(user, ':')) != NULL) *style++ = '\0'; @@ -381,7 +376,7 @@ /* XXX - SSH.com Kerberos v5 braindeath. */ if ((p = strchr(user, '@')) != NULL) *p = '\0'; - + authctxt = authctxt_new(); authctxt->user = user; authctxt->style = style; @@ -400,8 +395,7 @@ setproctitle("%s", pw ? user : "unknown"); #ifdef USE_PAM - if (pw) - start_pam(user); + start_pam(pw == NULL ? "NOUSER" : user); #endif /* diff -ru openssh-3.0.2p1/auth2-chall.c openssh-3.1p1/auth2-chall.c --- openssh-3.0.2p1/auth2-chall.c 2001-10-04 03:12:44.000000000 +1000 +++ openssh-3.1p1/auth2-chall.c 2002-01-22 23:26:40.000000000 +1100 @@ -23,10 +23,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "includes.h" -RCSID("$OpenBSD: auth2-chall.c,v 1.8 2001/09/27 15:31:17 markus Exp $"); +RCSID("$OpenBSD: auth2-chall.c,v 1.16 2002/01/13 17:57:37 markus Exp $"); #include "ssh2.h" #include "auth.h" +#include "buffer.h" #include "packet.h" #include "xmalloc.h" #include "dispatch.h" @@ -35,7 +36,7 @@ static int auth2_challenge_start(Authctxt *); static int send_userauth_info_request(Authctxt *); -static void input_userauth_info_response(int, int, void *); +static void input_userauth_info_response(int, u_int32_t, void *); #ifdef BSD_AUTH extern KbdintDevice bsdauth_device; @@ -68,22 +69,25 @@ kbdint_alloc(const char *devs) { KbdintAuthctxt *kbdintctxt; + Buffer b; int i; - char buf[1024]; kbdintctxt = xmalloc(sizeof(KbdintAuthctxt)); if (strcmp(devs, "") == 0) { - buf[0] = '\0'; + buffer_init(&b); for (i = 0; devices[i]; i++) { - if (i != 0) - strlcat(buf, ",", sizeof(buf)); - strlcat(buf, devices[i]->name, sizeof(buf)); + if (buffer_len(&b) > 0) + buffer_append(&b, ",", 1); + buffer_append(&b, devices[i]->name, + strlen(devices[i]->name)); } - debug("kbdint_alloc: devices '%s'", buf); - kbdintctxt->devices = xstrdup(buf); + buffer_append(&b, "\0", 1); + kbdintctxt->devices = xstrdup(buffer_ptr(&b)); + buffer_free(&b); } else { kbdintctxt->devices = xstrdup(devs); } + debug("kbdint_alloc: devices '%s'", kbdintctxt->devices); kbdintctxt->ctxt = NULL; kbdintctxt->device = NULL; @@ -151,11 +155,23 @@ if (authctxt->user == NULL || !devs) return 0; - if (authctxt->kbdintctxt == NULL) + if (authctxt->kbdintctxt == NULL) authctxt->kbdintctxt = kbdint_alloc(devs); return auth2_challenge_start(authctxt); } +/* unregister kbd-int callbacks and context */ +void +auth2_challenge_stop(Authctxt *authctxt) +{ + /* unregister callback */ + dispatch_set(SSH2_MSG_USERAUTH_INFO_RESPONSE, NULL); + if (authctxt->kbdintctxt != NULL) { + kbdint_free(authctxt->kbdintctxt); + authctxt->kbdintctxt = NULL; + } +} + /* side effect: sets authctxt->postponed if a reply was sent*/ static int auth2_challenge_start(Authctxt *authctxt) @@ -166,21 +182,18 @@ kbdintctxt->devices ? kbdintctxt->devices : ""); if (kbdint_next_device(kbdintctxt) == 0) { - kbdint_free(kbdintctxt); - authctxt->kbdintctxt = NULL; + auth2_challenge_stop(authctxt); return 0; } debug("auth2_challenge_start: trying authentication method '%s'", kbdintctxt->device->name); if ((kbdintctxt->ctxt = kbdintctxt->device->init_ctx(authctxt)) == NULL) { - kbdint_free(kbdintctxt); - authctxt->kbdintctxt = NULL; + auth2_challenge_stop(authctxt); return 0; } if (send_userauth_info_request(authctxt) == 0) { - kbdint_free(kbdintctxt); - authctxt->kbdintctxt = NULL; + auth2_challenge_stop(authctxt); return 0; } dispatch_set(SSH2_MSG_USERAUTH_INFO_RESPONSE, @@ -225,7 +238,7 @@ } static void -input_userauth_info_response(int type, int plen, void *ctxt) +input_userauth_info_response(int type, u_int32_t seq, void *ctxt) { Authctxt *authctxt = ctxt; KbdintAuthctxt *kbdintctxt; @@ -248,7 +261,7 @@ for (i = 0; i < nresp; i++) response[i] = packet_get_string(NULL); } - packet_done(); + packet_check_eom(); if (authctxt->valid) { res = kbdintctxt->device->respond(kbdintctxt->ctxt, @@ -271,10 +284,8 @@ break; case 1: /* Authentication needs further interaction */ - authctxt->postponed = 1; - if (send_userauth_info_request(authctxt) == 0) { - authctxt->postponed = 0; - } + if (send_userauth_info_request(authctxt) == 1) + authctxt->postponed = 1; break; default: /* Failure! */ @@ -284,18 +295,12 @@ len = strlen("keyboard-interactive") + 2 + strlen(kbdintctxt->device->name); method = xmalloc(len); - method[0] = '\0'; - strlcat(method, "keyboard-interactive", len); - strlcat(method, "/", len); - strlcat(method, kbdintctxt->device->name, len); + snprintf(method, len, "keyboard-interactive/%s", + kbdintctxt->device->name); if (!authctxt->postponed) { - /* unregister callback */ - dispatch_set(SSH2_MSG_USERAUTH_INFO_RESPONSE, NULL); - if (authenticated) { - kbdint_free(kbdintctxt); - authctxt->kbdintctxt = NULL; + auth2_challenge_stop(authctxt); } else { /* start next device */ /* may set authctxt->postponed */ diff -ru openssh-3.0.2p1/auth2-pam.c openssh-3.1p1/auth2-pam.c --- openssh-3.0.2p1/auth2-pam.c 2001-06-27 15:36:44.000000000 +1000 +++ openssh-3.1p1/auth2-pam.c 2002-01-22 23:43:13.000000000 +1100 @@ -1,5 +1,5 @@ #include "includes.h" -RCSID("$Id: auth2-pam.c,v 1.11 2001/06/27 05:36:44 djm Exp $"); +RCSID("$Id: auth2-pam.c,v 1.12 2002/01/22 12:43:13 djm Exp $"); #ifdef USE_PAM #include @@ -16,7 +16,7 @@ static int do_pam_conversation_kbd_int(int num_msg, const struct pam_message **msg, struct pam_response **resp, void *appdata_ptr); -void input_userauth_info_response_pam(int type, int plen, void *ctxt); +void input_userauth_info_response_pam(int type, u_int32_t seqnr, void *ctxt); struct { int finished, num_received, num_expected; @@ -128,7 +128,7 @@ } void -input_userauth_info_response_pam(int type, int plen, void *ctxt) +input_userauth_info_response_pam(int type, u_int32_t seqnr, void *ctxt) { Authctxt *authctxt = ctxt; unsigned int nresp = 0, rlen = 0, i = 0; @@ -152,7 +152,7 @@ context_pam2.finished = 1; - packet_done(); + packet_check_eom(); } #endif diff -ru openssh-3.0.2p1/auth2.c openssh-3.1p1/auth2.c --- openssh-3.0.2p1/auth2.c 2001-11-13 23:46:19.000000000 +1100 +++ openssh-3.1p1/auth2.c 2002-02-27 05:09:43.000000000 +1100 @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth2.c,v 1.72 2001/11/07 22:41:51 markus Exp $"); +RCSID("$OpenBSD: auth2.c,v 1.85 2002/02/24 19:14:59 markus Exp $"); #include @@ -69,9 +69,8 @@ /* protocol */ -static void input_service_request(int, int, void *); -static void input_userauth_request(int, int, void *); -static void protocol_error(int, int, void *); +static void input_service_request(int, u_int32_t, void *); +static void input_userauth_request(int, u_int32_t, void *); /* helper */ static Authmethod *authmethod_lookup(const char *); @@ -111,7 +110,7 @@ */ void -do_authentication2() +do_authentication2(void) { Authctxt *authctxt = authctxt_new(); @@ -123,30 +122,20 @@ if (options.pam_authentication_via_kbd_int) options.kbd_interactive_authentication = 1; - dispatch_init(&protocol_error); + dispatch_init(&dispatch_protocol_error); dispatch_set(SSH2_MSG_SERVICE_REQUEST, &input_service_request); dispatch_run(DISPATCH_BLOCK, &authctxt->success, authctxt); do_authenticated(authctxt); } static void -protocol_error(int type, int plen, void *ctxt) -{ - log("auth: protocol error: type %d plen %d", type, plen); - packet_start(SSH2_MSG_UNIMPLEMENTED); - packet_put_int(0); - packet_send(); - packet_write_wait(); -} - -static void -input_service_request(int type, int plen, void *ctxt) +input_service_request(int type, u_int32_t seq, void *ctxt) { Authctxt *authctxt = ctxt; u_int len; int accept = 0; char *service = packet_get_string(&len); - packet_done(); + packet_check_eom(); if (authctxt == NULL) fatal("input_service_request: no authctxt"); @@ -173,7 +162,7 @@ } static void -input_userauth_request(int type, int plen, void *ctxt) +input_userauth_request(int type, u_int32_t seq, void *ctxt) { Authctxt *authctxt = ctxt; Authmethod *m = NULL; @@ -220,14 +209,8 @@ authctxt->user, authctxt->service, user, service); } /* reset state */ - dispatch_set(SSH2_MSG_USERAUTH_INFO_RESPONSE, &protocol_error); + auth2_challenge_stop(authctxt); authctxt->postponed = 0; -#ifdef BSD_AUTH - if (authctxt->as) { - auth_close(authctxt->as); - authctxt->as = NULL; - } -#endif /* try to authenticate user */ m = authmethod_lookup(method); @@ -271,7 +254,7 @@ /* XXX todo: check if multiple auth methods are needed */ if (authenticated == 1) { /* turn off userauth */ - dispatch_set(SSH2_MSG_USERAUTH_REQUEST, &protocol_error); + dispatch_set(SSH2_MSG_USERAUTH_REQUEST, &dispatch_protocol_ignore); packet_start(SSH2_MSG_USERAUTH_SUCCESS); packet_send(); packet_write_wait(); @@ -281,7 +264,7 @@ if (authctxt->failures++ > AUTH_FAIL_MAX) { #ifdef WITH_AIXAUTHENTICATE loginfailed(authctxt->user, - get_canonical_hostname(options.reverse_mapping_check), + get_canonical_hostname(options.verify_reverse_mapping), "ssh"); #endif /* WITH_AIXAUTHENTICATE */ packet_disconnect(AUTH_FAIL_MSG, authctxt->user); @@ -334,14 +317,14 @@ Authmethod *m = authmethod_lookup("none"); if (m != NULL) m->enabled = NULL; - packet_done(); + packet_check_eom(); userauth_banner(); if (authctxt->valid == 0) return(0); #ifdef HAVE_CYGWIN - if (check_nt_auth(1, authctxt->pw->pw_uid) == 0) + if (check_nt_auth(1, authctxt->pw) == 0) return(0); #endif #ifdef USE_PAM @@ -364,10 +347,10 @@ if (change) log("password change not supported"); password = packet_get_string(&len); - packet_done(); + packet_check_eom(); if (authctxt->valid && #ifdef HAVE_CYGWIN - check_nt_auth(1, authctxt->pw->pw_uid) && + check_nt_auth(1, authctxt->pw) && #endif #ifdef USE_PAM auth_pam_password(authctxt->pw, password) == 1) @@ -390,7 +373,7 @@ lang = packet_get_string(NULL); devs = packet_get_string(NULL); - packet_done(); + packet_check_eom(); debug("keyboard-interactive devs %s", devs); @@ -404,7 +387,7 @@ xfree(devs); xfree(lang); #ifdef HAVE_CYGWIN - if (check_nt_auth(0, authctxt->pw->pw_uid) == 0) + if (check_nt_auth(0, authctxt->pw) == 0) return(0); #endif return authenticated; @@ -414,8 +397,9 @@ userauth_pubkey(Authctxt *authctxt) { Buffer b; - Key *key; - char *pkalg, *pkblob, *sig; + Key *key = NULL; + char *pkalg; + u_char *pkblob, *sig; u_int alen, blen, slen; int have_sig, pktype; int authenticated = 0; @@ -441,76 +425,84 @@ pktype = key_type_from_name(pkalg); if (pktype == KEY_UNSPEC) { /* this is perfectly legal */ - log("userauth_pubkey: unsupported public key algorithm: %s", pkalg); - xfree(pkalg); - xfree(pkblob); - return 0; + log("userauth_pubkey: unsupported public key algorithm: %s", + pkalg); + goto done; } key = key_from_blob(pkblob, blen); - if (key != NULL) { - if (have_sig) { - sig = packet_get_string(&slen); - packet_done(); - buffer_init(&b); - if (datafellows & SSH_OLD_SESSIONID) { - buffer_append(&b, session_id2, session_id2_len); - } else { - buffer_put_string(&b, session_id2, session_id2_len); - } - /* reconstruct packet */ - buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST); - buffer_put_cstring(&b, authctxt->user); - buffer_put_cstring(&b, - datafellows & SSH_BUG_PKSERVICE ? - "ssh-userauth" : - authctxt->service); - if (datafellows & SSH_BUG_PKAUTH) { - buffer_put_char(&b, have_sig); - } else { - buffer_put_cstring(&b, "publickey"); - buffer_put_char(&b, have_sig); - buffer_put_cstring(&b, pkalg); - } - buffer_put_string(&b, pkblob, blen); + if (key == NULL) { + error("userauth_pubkey: cannot decode key: %s", pkalg); + goto done; + } + if (key->type != pktype) { + error("userauth_pubkey: type mismatch for decoded key " + "(received %d, expected %d)", key->type, pktype); + goto done; + } + if (have_sig) { + sig = packet_get_string(&slen); + packet_check_eom(); + buffer_init(&b); + if (datafellows & SSH_OLD_SESSIONID) { + buffer_append(&b, session_id2, session_id2_len); + } else { + buffer_put_string(&b, session_id2, session_id2_len); + } + /* reconstruct packet */ + buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST); + buffer_put_cstring(&b, authctxt->user); + buffer_put_cstring(&b, + datafellows & SSH_BUG_PKSERVICE ? + "ssh-userauth" : + authctxt->service); + if (datafellows & SSH_BUG_PKAUTH) { + buffer_put_char(&b, have_sig); + } else { + buffer_put_cstring(&b, "publickey"); + buffer_put_char(&b, have_sig); + buffer_put_cstring(&b, pkalg); + } + buffer_put_string(&b, pkblob, blen); #ifdef DEBUG_PK - buffer_dump(&b); + buffer_dump(&b); #endif - /* test for correct signature */ - if (user_key_allowed(authctxt->pw, key) && - key_verify(key, sig, slen, buffer_ptr(&b), buffer_len(&b)) == 1) - authenticated = 1; - buffer_clear(&b); - xfree(sig); - } else { - debug("test whether pkalg/pkblob are acceptable"); - packet_done(); + /* test for correct signature */ + if (user_key_allowed(authctxt->pw, key) && + key_verify(key, sig, slen, buffer_ptr(&b), buffer_len(&b)) == 1) + authenticated = 1; + buffer_clear(&b); + xfree(sig); + } else { + debug("test whether pkalg/pkblob are acceptable"); + packet_check_eom(); - /* XXX fake reply and always send PK_OK ? */ - /* - * XXX this allows testing whether a user is allowed - * to login: if you happen to have a valid pubkey this - * message is sent. the message is NEVER sent at all - * if a user is not allowed to login. is this an - * issue? -markus - */ - if (user_key_allowed(authctxt->pw, key)) { - packet_start(SSH2_MSG_USERAUTH_PK_OK); - packet_put_string(pkalg, alen); - packet_put_string(pkblob, blen); - packet_send(); - packet_write_wait(); - authctxt->postponed = 1; - } + /* XXX fake reply and always send PK_OK ? */ + /* + * XXX this allows testing whether a user is allowed + * to login: if you happen to have a valid pubkey this + * message is sent. the message is NEVER sent at all + * if a user is not allowed to login. is this an + * issue? -markus + */ + if (user_key_allowed(authctxt->pw, key)) { + packet_start(SSH2_MSG_USERAUTH_PK_OK); + packet_put_string(pkalg, alen); + packet_put_string(pkblob, blen); + packet_send(); + packet_write_wait(); + authctxt->postponed = 1; } - if (authenticated != 1) - auth_clear_options(); - key_free(key); } + if (authenticated != 1) + auth_clear_options(); +done: debug2("userauth_pubkey: authenticated %d pkalg %s", authenticated, pkalg); + if (key != NULL) + key_free(key); xfree(pkalg); xfree(pkblob); #ifdef HAVE_CYGWIN - if (check_nt_auth(0, authctxt->pw->pw_uid) == 0) + if (check_nt_auth(0, authctxt->pw) == 0) return(0); #endif return authenticated; @@ -520,8 +512,9 @@ userauth_hostbased(Authctxt *authctxt) { Buffer b; - Key *key; - char *pkalg, *pkblob, *sig, *cuser, *chost, *service; + Key *key = NULL; + char *pkalg, *cuser, *chost, *service; + u_char *pkblob, *sig; u_int alen, blen, slen; int pktype; int authenticated = 0; @@ -554,7 +547,12 @@ } key = key_from_blob(pkblob, blen); if (key == NULL) { - debug("userauth_hostbased: cannot decode key: %s", pkalg); + error("userauth_hostbased: cannot decode key: %s", pkalg); + goto done; + } + if (key->type != pktype) { + error("userauth_hostbased: type mismatch for decoded key " + "(received %d, expected %d)", key->type, pktype); goto done; } service = datafellows & SSH_BUG_HBSERVICE ? "ssh-userauth" : @@ -579,10 +577,10 @@ authenticated = 1; buffer_clear(&b); - key_free(key); - done: debug2("userauth_hostbased: authenticated %d", authenticated); + if (key != NULL) + key_free(key); xfree(pkalg); xfree(pkblob); xfree(cuser); @@ -605,31 +603,22 @@ authmethods_get(void) { Authmethod *method = NULL; - u_int size = 0; + Buffer b; char *list; + buffer_init(&b); for (method = authmethods; method->name != NULL; method++) { if (strcmp(method->name, "none") == 0) continue; if (method->enabled != NULL && *(method->enabled) != 0) { - if (size != 0) - size += strlen(DELIM); - size += strlen(method->name); - } - } - size++; /* trailing '\0' */ - list = xmalloc(size); - list[0] = '\0'; - - for (method = authmethods; method->name != NULL; method++) { - if (strcmp(method->name, "none") == 0) - continue; - if (method->enabled != NULL && *(method->enabled) != 0) { - if (list[0] != '\0') - strlcat(list, DELIM, size); - strlcat(list, method->name, size); + if (buffer_len(&b) > 0) + buffer_append(&b, ",", 1); + buffer_append(&b, method->name, strlen(method->name)); } } + buffer_append(&b, "\0", 1); + list = xstrdup(buffer_ptr(&b)); + buffer_free(&b); return list; } @@ -657,6 +646,7 @@ u_long linenum = 0; struct stat st; Key *found; + char *fp; if (pw == NULL) return 0; @@ -724,6 +714,10 @@ found_key = 1; debug("matching key found: file %s, line %lu", file, linenum); + fp = key_fingerprint(found, SSH_FP_MD5, SSH_FP_HEX); + verbose("Found matching %s key: %s", + key_type(found), fp); + xfree(fp); break; } } @@ -761,9 +755,10 @@ Key *key) { const char *resolvedname, *ipaddr, *lookup; - int host_status, len; + HostStatus host_status; + int len; - resolvedname = get_canonical_hostname(options.reverse_mapping_check); + resolvedname = get_canonical_hostname(options.verify_reverse_mapping); ipaddr = get_remote_ipaddr(); debug2("userauth_hostbased: chost %s resolvedname %s ipaddr %s", @@ -801,4 +796,3 @@ return (host_status == HOST_OK); } - diff -ru openssh-3.0.2p1/authfd.c openssh-3.1p1/authfd.c --- openssh-3.0.2p1/authfd.c 2001-09-20 11:03:32.000000000 +1000 +++ openssh-3.1p1/authfd.c 2002-02-27 05:09:43.000000000 +1100 @@ -35,7 +35,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: authfd.c,v 1.45 2001/09/19 19:35:30 stevesk Exp $"); +RCSID("$OpenBSD: authfd.c,v 1.48 2002/02/24 19:14:59 markus Exp $"); #include @@ -217,7 +217,7 @@ int type, code1 = 0, code2 = 0; Buffer request; - switch(version){ + switch (version) { case 1: code1 = SSH_AGENTC_REQUEST_RSA_IDENTITIES; code2 = SSH_AGENT_RSA_IDENTITIES_ANSWER; @@ -286,7 +286,7 @@ * Get the next entry from the packet. These will abort with a fatal * error if the packet is too short or contains corrupt data. */ - switch(version){ + switch (version) { case 1: key = key_new(KEY_RSA1); bits = buffer_get_int(&auth->identities); @@ -344,7 +344,7 @@ buffer_put_bignum(&buffer, key->rsa->e); buffer_put_bignum(&buffer, key->rsa->n); buffer_put_bignum(&buffer, challenge); - buffer_append(&buffer, (char *) session_id, 16); + buffer_append(&buffer, session_id, 16); buffer_put_int(&buffer, response_type); if (ssh_request_reply(auth, &buffer, &buffer) == 0) { @@ -374,8 +374,8 @@ int ssh_agent_sign(AuthenticationConnection *auth, Key *key, - u_char **sigp, int *lenp, - u_char *data, int datalen) + u_char **sigp, u_int *lenp, + u_char *data, u_int datalen) { extern int datafellows; Buffer msg; @@ -438,7 +438,7 @@ buffer_clear(b); buffer_put_char(b, SSH2_AGENTC_ADD_IDENTITY); buffer_put_cstring(b, key_ssh_name(key)); - switch(key->type){ + switch (key->type) { case KEY_RSA: buffer_put_bignum2(b, key->rsa->n); buffer_put_bignum2(b, key->rsa->e); diff -ru openssh-3.0.2p1/authfd.h openssh-3.1p1/authfd.h --- openssh-3.0.2p1/authfd.h 2001-08-16 09:04:50.000000000 +1000 +++ openssh-3.1p1/authfd.h 2002-03-05 12:53:04.000000000 +1100 @@ -1,3 +1,5 @@ +/* $OpenBSD: authfd.h,v 1.23 2002/03/04 17:27:39 stevesk Exp $ */ + /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -11,8 +13,6 @@ * called by a name other than "ssh" or "Secure Shell". */ -/* RCSID("$OpenBSD: authfd.h,v 1.21 2001/08/07 10:37:46 markus Exp $"); */ - #ifndef AUTHFD_H #define AUTHFD_H @@ -74,7 +74,7 @@ u_int, u_char[16]); int -ssh_agent_sign(AuthenticationConnection *, Key *, u_char **, int *, u_char *, - int); +ssh_agent_sign(AuthenticationConnection *, Key *, u_char **, u_int *, u_char *, + u_int); #endif /* AUTHFD_H */ diff -ru openssh-3.0.2p1/authfile.c openssh-3.1p1/authfile.c --- openssh-3.0.2p1/authfile.c 2001-10-10 15:03:36.000000000 +1000 +++ openssh-3.1p1/authfile.c 2002-03-05 12:33:38.000000000 +1100 @@ -36,7 +36,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: authfile.c,v 1.39 2001/10/07 10:29:52 markus Exp $"); +RCSID("$OpenBSD: authfile.c,v 1.48 2002/02/28 15:46:33 markus Exp $"); #include #include @@ -50,6 +50,7 @@ #include "ssh.h" #include "log.h" #include "authfile.h" +#include "rsa.h" /* Version identification string for SSH v1 identity files. */ static const char authfile_id_string[] = @@ -67,8 +68,8 @@ const char *comment) { Buffer buffer, encrypted; - char buf[100], *cp; - int fd, i; + u_char buf[100], *cp; + int fd, i, cipher_num; CipherContext ciphercontext; Cipher *cipher; u_int32_t rand; @@ -77,11 +78,9 @@ * If the passphrase is empty, use SSH_CIPHER_NONE to ease converting * to another cipher; otherwise use SSH_AUTHFILE_CIPHER. */ - if (strcmp(passphrase, "") == 0) - cipher = cipher_by_number(SSH_CIPHER_NONE); - else - cipher = cipher_by_number(SSH_AUTHFILE_CIPHER); - if (cipher == NULL) + cipher_num = (strcmp(passphrase, "") == 0) ? + SSH_CIPHER_NONE : SSH_AUTHFILE_CIPHER; + if ((cipher = cipher_by_number(cipher_num)) == NULL) fatal("save_private_key_rsa: bad cipher"); /* This buffer is used to built the secret part of the private key. */ @@ -118,7 +117,7 @@ buffer_put_char(&encrypted, 0); /* Store cipher type. */ - buffer_put_char(&encrypted, cipher->number); + buffer_put_char(&encrypted, cipher_num); buffer_put_int(&encrypted, 0); /* For future extension */ /* Store public key. This will be in plain text. */ @@ -128,11 +127,13 @@ buffer_put_cstring(&encrypted, comment); /* Allocate space for the private part of the key in the buffer. */ - buffer_append_space(&encrypted, &cp, buffer_len(&buffer)); + cp = buffer_append_space(&encrypted, buffer_len(&buffer)); - cipher_set_key_string(&ciphercontext, cipher, passphrase); - cipher_encrypt(&ciphercontext, (u_char *) cp, - (u_char *) buffer_ptr(&buffer), buffer_len(&buffer)); + cipher_set_key_string(&ciphercontext, cipher, passphrase, + CIPHER_ENCRYPT); + cipher_crypt(&ciphercontext, cp, + buffer_ptr(&buffer), buffer_len(&buffer)); + cipher_cleanup(&ciphercontext); memset(&ciphercontext, 0, sizeof(ciphercontext)); /* Destroy temporary data. */ @@ -147,7 +148,7 @@ if (write(fd, buffer_ptr(&encrypted), buffer_len(&encrypted)) != buffer_len(&encrypted)) { error("write to key file %s failed: %s", filename, - strerror(errno)); + strerror(errno)); buffer_free(&encrypted); close(fd); unlink(filename); @@ -167,8 +168,8 @@ int fd; int success = 0; int len = strlen(_passphrase); - char *passphrase = (len > 0) ? (char *)_passphrase : NULL; - EVP_CIPHER *cipher = (len > 0) ? EVP_des_ede3_cbc() : NULL; + u_char *passphrase = (len > 0) ? (u_char *)_passphrase : NULL; + const EVP_CIPHER *cipher = (len > 0) ? EVP_des_ede3_cbc() : NULL; if (len > 0 && len <= 4) { error("passphrase too short: have %d bytes, need > 4", len); @@ -239,7 +240,7 @@ lseek(fd, (off_t) 0, SEEK_SET); buffer_init(&buffer); - buffer_append_space(&buffer, &cp, len); + cp = buffer_append_space(&buffer, len); if (read(fd, cp, (size_t) len) != (size_t) len) { debug("Read from key file %.200s failed: %.100s", filename, @@ -313,18 +314,16 @@ int i, check1, check2, cipher_type; off_t len; Buffer buffer, decrypted; - char *cp; + u_char *cp; CipherContext ciphercontext; Cipher *cipher; - BN_CTX *ctx; - BIGNUM *aux; Key *prv = NULL; len = lseek(fd, (off_t) 0, SEEK_END); lseek(fd, (off_t) 0, SEEK_SET); buffer_init(&buffer); - buffer_append_space(&buffer, &cp, len); + cp = buffer_append_space(&buffer, len); if (read(fd, cp, (size_t) len) != (size_t) len) { debug("Read from key file %.200s failed: %.100s", filename, @@ -378,12 +377,14 @@ } /* Initialize space for decrypted data. */ buffer_init(&decrypted); - buffer_append_space(&decrypted, &cp, buffer_len(&buffer)); + cp = buffer_append_space(&decrypted, buffer_len(&buffer)); /* Rest of the buffer is encrypted. Decrypt it using the passphrase. */ - cipher_set_key_string(&ciphercontext, cipher, passphrase); - cipher_decrypt(&ciphercontext, (u_char *) cp, - (u_char *) buffer_ptr(&buffer), buffer_len(&buffer)); + cipher_set_key_string(&ciphercontext, cipher, passphrase, + CIPHER_DECRYPT); + cipher_crypt(&ciphercontext, cp, + buffer_ptr(&buffer), buffer_len(&buffer)); + cipher_cleanup(&ciphercontext); memset(&ciphercontext, 0, sizeof(ciphercontext)); buffer_free(&buffer); @@ -406,17 +407,7 @@ buffer_get_bignum(&decrypted, prv->rsa->p); /* q */ /* calculate p-1 and q-1 */ - ctx = BN_CTX_new(); - aux = BN_new(); - - BN_sub(aux, prv->rsa->q, BN_value_one()); - BN_mod(prv->rsa->dmq1, prv->rsa->d, aux, ctx); - - BN_sub(aux, prv->rsa->p, BN_value_one()); - BN_mod(prv->rsa->dmp1, prv->rsa->d, aux, ctx); - - BN_clear_free(aux); - BN_CTX_free(ctx); + rsa_generate_additional_parameters(prv->rsa); buffer_free(&decrypted); close(fd); @@ -450,7 +441,7 @@ debug("PEM_read_PrivateKey failed"); (void)ERR_get_error(); } else if (pk->type == EVP_PKEY_RSA && - (type == KEY_UNSPEC||type==KEY_RSA)) { + (type == KEY_UNSPEC||type==KEY_RSA)) { prv = key_new(KEY_UNSPEC); prv->rsa = EVP_PKEY_get1_RSA(pk); prv->type = KEY_RSA; @@ -459,7 +450,7 @@ RSA_print_fp(stderr, prv->rsa, 8); #endif } else if (pk->type == EVP_PKEY_DSA && - (type == KEY_UNSPEC||type==KEY_DSA)) { + (type == KEY_UNSPEC||type==KEY_DSA)) { prv = key_new(KEY_UNSPEC); prv->dsa = EVP_PKEY_get1_DSA(pk); prv->type = KEY_DSA; @@ -586,7 +577,7 @@ while (fgets(line, sizeof(line), f)) { line[sizeof(line)-1] = '\0'; cp = line; - switch(*cp){ + switch (*cp) { case '#': case '\n': case '\0': diff -ru openssh-3.0.2p1/authfile.h openssh-3.1p1/authfile.h --- openssh-3.0.2p1/authfile.h 2001-07-04 14:46:57.000000000 +1000 +++ openssh-3.1p1/authfile.h 2002-03-05 12:53:04.000000000 +1100 @@ -1,3 +1,5 @@ +/* $OpenBSD: authfile.h,v 1.9 2002/03/04 17:27:39 stevesk Exp $ */ + /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -10,8 +12,6 @@ * called by a name other than "ssh" or "Secure Shell". */ -/* $OpenBSD: authfile.h,v 1.8 2001/06/26 17:27:22 markus Exp $ */ - #ifndef AUTHFILE_H #define AUTHFILE_H diff -ru openssh-3.0.2p1/autom4te.cache/output.0 openssh-3.1p1/autom4te.cache/output.0 --- openssh-3.0.2p1/autom4te.cache/output.0 2001-12-02 10:38:54.000000000 +1100 +++ openssh-3.1p1/autom4te.cache/output.0 2002-03-07 13:22:28.000000000 +1100 @@ -697,8 +697,7 @@ --with-cppflags Specify additional flags to pass to preprocessor --with-ldflags Specify additional flags to pass to linker --with-libs Specify additional libraries to link with - --with-pcre[=PATH] Override built in regex library with pcre - (optionally in PATH) + --without-rpath Disable auto-added -R linker paths --with-zlib=PATH Use zlib in PATH --with-skey[=PATH] Enable S/Key support (optionally in PATH) @@ -706,14 +705,15 @@ (optionally in PATH) --with-pam Enable PAM support --with-ssl-dir=PATH Specify path to OpenSSL installation + --with-rand-helper Use subprocess to gather strong randomness + --with-prngd-port=PORT read entropy from PRNGD/EGD TCP localhost:PORT + --with-prngd-socket=FILE read entropy from PRNGD/EGD socket FILE (default=/var/run/egd-pool) + --with-entropy-timeout Specify entropy gathering command timeout (msec) --with-smartcard Enable smartcard support --with-kerberos4=PATH Enable Kerberos 4 support --with-afs=PATH Enable AFS support --with-rsh=PATH Specify path to remote shell program --with-xauth=PATH Specify path to xauth program - --with-random=FILE read entropy from FILE (default=/dev/urandom) - --with-prngd-port=PORT read entropy from PRNGD/EGD localhost:PORT - --with-prngd-socket=FILE read entropy from PRNGD/EGD socket FILE (default=/var/run/egd-pool) --with-mantype=man|cat|doc Set man page type --with-md5-passwords Enable use of MD5 passwords --without-shadow Disable shadow password support @@ -724,7 +724,6 @@ --with-bsd-auth Enable BSD auth support --with-pid-dir=PATH Specify location of ssh.pid file --with-lastlog=FILE|DIR specify lastlog location common locations - --with-entropy-timeout Specify entropy gathering command timeout (msec) Some influential environment variables: CC C compiler command @@ -3317,9 +3316,13 @@ @%:@define DISABLE_LASTLOG 1 _ACEOF + cat >>confdefs.h <<\_ACEOF +@%:@define HAVE_BOGUS_SYS_QUEUE_H 1 +_ACEOF + ;; *-*-cygwin*) - LIBS="$LIBS -lregex /usr/lib/textmode.o" + LIBS="$LIBS /usr/lib/textmode.o" cat >>confdefs.h <<\_ACEOF @%:@define HAVE_CYGWIN 1 _ACEOF @@ -3518,6 +3521,10 @@ @%:@define PAM_TTY_KLUDGE 1 _ACEOF + cat >>confdefs.h <<\_ACEOF +@%:@define HAVE_BOGUS_SYS_QUEUE_H 1 +_ACEOF + inet6_default_4in6=yes ;; mips-sony-bsd|mips-sony-newsos4) @@ -3767,6 +3774,10 @@ @%:@define HAVE_BOGUS_SYS_QUEUE_H 1 _ACEOF + cat >>confdefs.h <<\_ACEOF +@%:@define USE_PIPES 1 +_ACEOF + ;; *-sni-sysv*) CPPFLAGS="$CPPFLAGS -I/usr/local/include" @@ -4139,6 +4150,7 @@ fi; +# Checks for header files. echo "$as_me:__oline__: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 @@ -4337,51 +4349,75 @@ -# Check whether --with-pcre or --without-pcre was given. -if test "${with_pcre+set}" = set; then - withval="$with_pcre" - - case "$withval" in - no) ;; - *) - if test "x$withval" != "xyes"; then - if test -d "$withval/lib"; then - if test -n "${need_dash_r}"; then - LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}" - else - LDFLAGS="-L${withval}/lib ${LDFLAGS}" - fi - else - if test -n "${need_dash_r}"; then - LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}" - else - LDFLAGS="-L${withval} ${LDFLAGS}" - fi - fi - if test -d "$withval/include"; then - CPPFLAGS="-I${withval}/include ${CPPFLAGS}" - else - CPPFLAGS="-I${withval} ${CPPFLAGS}" - fi - fi - if test "${ac_cv_header_pcreposix_h+set}" = set; then - echo "$as_me:__oline__: checking for pcreposix.h" >&5 -echo $ECHO_N "checking for pcreposix.h... $ECHO_C" >&6 -if test "${ac_cv_header_pcreposix_h+set}" = set; then + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +for ac_header in bstring.h crypt.h endian.h floatingpoint.h \ + getopt.h glob.h lastlog.h limits.h login.h \ + login_cap.h maillock.h netdb.h netgroup.h \ + netinet/in_systm.h paths.h poll.h pty.h \ + security/pam_appl.h shadow.h stddef.h stdint.h \ + strings.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h \ + sys/poll.h sys/queue.h sys/select.h sys/stat.h \ + sys/stropts.h sys/sysmacros.h sys/time.h \ + sys/ttcompat.h sys/un.h time.h ttyent.h usersec.h \ + util.h utime.h utmp.h utmpx.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:__oline__: 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 fi -echo "$as_me:__oline__: result: $ac_cv_header_pcreposix_h" >&5 -echo "${ECHO_T}$ac_cv_header_pcreposix_h" >&6 +echo "$as_me:__oline__: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else # Is the header compilable? -echo "$as_me:__oline__: checking pcreposix.h usability" >&5 -echo $ECHO_N "checking pcreposix.h usability... $ECHO_C" >&6 +echo "$as_me:__oline__: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line __oline__ "configure" #include "confdefs.h" $ac_includes_default -@%:@include +@%:@include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 @@ -4406,12 +4442,12 @@ echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -echo "$as_me:__oline__: checking pcreposix.h presence" >&5 -echo $ECHO_N "checking pcreposix.h presence... $ECHO_C" >&6 +echo "$as_me:__oline__: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line __oline__ "configure" #include "confdefs.h" -@%:@include +@%:@include <$ac_header> _ACEOF if { (eval echo "$as_me:__oline__: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -4443,111 +4479,38 @@ # So? What about this header? case $ac_header_compiler:$ac_header_preproc in yes:no ) - { echo "$as_me:__oline__: WARNING: pcreposix.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: pcreposix.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:__oline__: WARNING: pcreposix.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: pcreposix.h: proceeding with the preprocessor's result" >&2;};; + { echo "$as_me:__oline__: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:__oline__: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; no:yes ) - { echo "$as_me:__oline__: WARNING: pcreposix.h: present but cannot be compiled." >&5 -echo "$as_me: WARNING: pcreposix.h: present but cannot be compiled." >&2;} - { echo "$as_me:__oline__: WARNING: pcreposix.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: pcreposix.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:__oline__: WARNING: pcreposix.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: pcreposix.h: proceeding with the preprocessor's result" >&2;};; + { echo "$as_me:__oline__: WARNING: $ac_header: present but cannot be compiled." >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled." >&2;} + { echo "$as_me:__oline__: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:__oline__: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; esac -echo "$as_me:__oline__: checking for pcreposix.h" >&5 -echo $ECHO_N "checking for pcreposix.h... $ECHO_C" >&6 -if test "${ac_cv_header_pcreposix_h+set}" = set; then +echo "$as_me:__oline__: 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 - ac_cv_header_pcreposix_h=$ac_header_preproc -fi -echo "$as_me:__oline__: result: $ac_cv_header_pcreposix_h" >&5 -echo "${ECHO_T}$ac_cv_header_pcreposix_h" >&6 - + eval "$as_ac_Header=$ac_header_preproc" fi -if test $ac_cv_header_pcreposix_h = yes; then - echo "$as_me:__oline__: checking for pcre_info in -lpcre" >&5 -echo $ECHO_N "checking for pcre_info in -lpcre... $ECHO_C" >&6 -if test "${ac_cv_lib_pcre_pcre_info+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpcre $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line __oline__ "configure" -#include "confdefs.h" +echo "$as_me:__oline__: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -/* 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 pcre_info (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -pcre_info (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:__oline__: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_pcre_pcre_info=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_pcre_pcre_info=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:__oline__: result: $ac_cv_lib_pcre_pcre_info" >&5 -echo "${ECHO_T}$ac_cv_lib_pcre_pcre_info" >&6 -if test $ac_cv_lib_pcre_pcre_info = yes; then - - cat >>confdefs.h <<\_ACEOF -@%:@define HAVE_LIBPCRE 1 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - - LIBS="$LIBS -lpcreposix -lpcre" - no_comp_check=yes -else - { { echo "$as_me:__oline__: error: *** unable to locate pcre library ***" >&5 -echo "$as_me: error: *** unable to locate pcre library ***" >&2;} - { (exit 1); exit 1; }; } -fi - -else - { { echo "$as_me:__oline__: error: *** unable to locate pcreposix.h include file ***" >&5 -echo "$as_me: error: *** unable to locate pcreposix.h include file ***" >&2;} - { (exit 1); exit 1; }; } + fi +done - ;; - esac - - -fi; # Checks for libraries. echo "$as_me:__oline__: checking for yp_match" >&5 @@ -5013,10 +4976,30 @@ +# Check whether --with-rpath or --without-rpath was given. +if test "${with_rpath+set}" = set; then + withval="$with_rpath" + + if test "x$withval" = "xno" ; then + need_dash_r="" + fi + if test "x$withval" = "xyes" ; then + need_dash_r=1 + fi + + +fi; + + # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then withval="$with_zlib" + if test "x$withval" = "xno" ; then + { { echo "$as_me:__oline__: error: *** zlib is required ***" >&5 +echo "$as_me: error: *** zlib is required ***" >&2;} + { (exit 1); exit 1; }; } + fi if test -d "$withval/lib"; then if test -n "${need_dash_r}"; then LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}" @@ -5109,18 +5092,16 @@ fi -# We don't want to check if we did an pcre override. -if test -z "$no_comp_check" ; then - echo "$as_me:__oline__: checking for regcomp" >&5 -echo $ECHO_N "checking for regcomp... $ECHO_C" >&6 -if test "${ac_cv_func_regcomp+set}" = set; then +echo "$as_me:__oline__: 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 __oline__ "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char regcomp (); below. */ + which can conflict with char strcasecmp (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -5128,7 +5109,7 @@ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char regcomp (); +char strcasecmp (); char (*f) (); #ifdef F77_DUMMY_MAIN @@ -5143,10 +5124,10 @@ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_regcomp) || defined (__stub___regcomp) +#if defined (__stub_strcasecmp) || defined (__stub___strcasecmp) choke me #else -f = regcomp; +f = strcasecmp; #endif ; @@ -5165,30 +5146,26 @@ ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_regcomp=yes + ac_cv_func_strcasecmp=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_func_regcomp=no +ac_cv_func_strcasecmp=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:__oline__: result: $ac_cv_func_regcomp" >&5 -echo "${ECHO_T}$ac_cv_func_regcomp" >&6 -if test $ac_cv_func_regcomp = yes; then - cat >>confdefs.h <<\_ACEOF -@%:@define HAVE_REGCOMP 1 -_ACEOF - +echo "$as_me:__oline__: 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:__oline__: checking for pcre_info in -lpcre" >&5 -echo $ECHO_N "checking for pcre_info in -lpcre... $ECHO_C" >&6 -if test "${ac_cv_lib_pcre_pcre_info+set}" = set; then + echo "$as_me:__oline__: 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 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lpcre $LIBS" +LIBS="-lresolv $LIBS" cat >conftest.$ac_ext <<_ACEOF #line __oline__ "configure" #include "confdefs.h" @@ -5199,7 +5176,7 @@ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char pcre_info (); +char strcasecmp (); #ifdef F77_DUMMY_MAIN # ifdef __cplusplus extern "C" @@ -5209,7 +5186,7 @@ int main () { -pcre_info (); +strcasecmp (); ; return 0; } @@ -5226,49 +5203,34 @@ ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_pcre_pcre_info=yes + ac_cv_lib_resolv_strcasecmp=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_pcre_pcre_info=no +ac_cv_lib_resolv_strcasecmp=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:__oline__: result: $ac_cv_lib_pcre_pcre_info" >&5 -echo "${ECHO_T}$ac_cv_lib_pcre_pcre_info" >&6 -if test $ac_cv_lib_pcre_pcre_info = yes; then - - cat >>confdefs.h <<\_ACEOF -@%:@define HAVE_LIBPCRE 1 -_ACEOF - - LIBS="$LIBS -lpcreposix -lpcre" - -else - - { { echo "$as_me:__oline__: error: *** No regex library found." >&5 -echo "$as_me: error: *** No regex library found." >&2;} - { (exit 1); exit 1; }; } - -fi - - - +echo "$as_me:__oline__: 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" fi + fi -echo "$as_me:__oline__: checking for strcasecmp" >&5 -echo $ECHO_N "checking for strcasecmp... $ECHO_C" >&6 -if test "${ac_cv_func_strcasecmp+set}" = set; then +echo "$as_me:__oline__: 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 __oline__ "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char strcasecmp (); below. */ + which can conflict with char utimes (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -5276,7 +5238,7 @@ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char strcasecmp (); +char utimes (); char (*f) (); #ifdef F77_DUMMY_MAIN @@ -5291,10 +5253,10 @@ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_strcasecmp) || defined (__stub___strcasecmp) +#if defined (__stub_utimes) || defined (__stub___utimes) choke me #else -f = strcasecmp; +f = utimes; #endif ; @@ -5313,140 +5275,11 @@ ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_strcasecmp=yes + ac_cv_func_utimes=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_func_strcasecmp=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:__oline__: 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:__oline__: 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 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lresolv $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line __oline__ "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 strcasecmp (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -strcasecmp (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:__oline__: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_resolv_strcasecmp=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_resolv_strcasecmp=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:__oline__: 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" -fi - - -fi - -echo "$as_me:__oline__: 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 __oline__ "configure" -#include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char utimes (); below. */ -#include -/* 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 utimes (); -char (*f) (); - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_utimes) || defined (__stub___utimes) -choke me -#else -f = utimes; -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:__oline__: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_utimes=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_func_utimes=no +ac_cv_func_utimes=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi @@ -5964,473 +5797,279 @@ done -# Checks for header files. - - - - - - - - - - +# Check for ALTDIRFUNC glob() extension +echo "$as_me:__oline__: checking for GLOB_ALTDIRFUNC support" >&5 +echo $ECHO_N "checking for GLOB_ALTDIRFUNC support... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line __oline__ "configure" +#include "confdefs.h" + #include + #ifdef GLOB_ALTDIRFUNC + FOUNDIT + #endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "FOUNDIT" >/dev/null 2>&1; then + + cat >>confdefs.h <<\_ACEOF +@%:@define GLOB_HAS_ALTDIRFUNC 1 +_ACEOF + echo "$as_me:__oline__: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + +else + + echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 + +fi +rm -f conftest* +# Check for g.gl_matchc glob() extension +echo "$as_me:__oline__: 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 __oline__ "configure" +#include "confdefs.h" + #include + int main(void){glob_t g; g.gl_matchc = 1;} + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "FOUNDIT" >/dev/null 2>&1; then + + cat >>confdefs.h <<\_ACEOF +@%:@define GLOB_HAS_GL_MATCHC 1 +_ACEOF + echo "$as_me:__oline__: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + +else + + echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 + +fi +rm -f conftest* +echo "$as_me:__oline__: 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:__oline__: 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 __oline__ "configure" +#include "confdefs.h" +#include +#include +int main(void){struct dirent d;return(sizeof(d.d_name)<=sizeof(char));} + +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:__oline__: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:__oline__: 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:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 + cat >>confdefs.h <<\_ACEOF +@%:@define BROKEN_ONE_BYTE_DIRENT_D_NAME 1 +_ACEOF + +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +# Check whether user wants S/Key support +SKEY_MSG="no" +# Check whether --with-skey or --without-skey was given. +if test "${with_skey+set}" = set; then + withval="$with_skey" + + if test "x$withval" != "xno" ; then + if test "x$withval" != "xyes" ; then + CPPFLAGS="$CPPFLAGS -I${withval}/include" + LDFLAGS="$LDFLAGS -L${withval}/lib" + fi + cat >>confdefs.h <<\_ACEOF +@%:@define SKEY 1 +_ACEOF + LIBS="-lskey $LIBS" + SKEY_MSG="yes" + + echo "$as_me:__oline__: 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:__oline__: 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 __oline__ "configure" +#include "confdefs.h" - - - - - - - - - - - - -for ac_header in bstring.h crypt.h endian.h floatingpoint.h \ - getopt.h glob.h lastlog.h limits.h login.h \ - login_cap.h maillock.h netdb.h netgroup.h \ - netinet/in_systm.h paths.h poll.h pty.h regex.h \ - security/pam_appl.h shadow.h stddef.h stdint.h \ - strings.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h \ - sys/poll.h sys/queue.h sys/select.h sys/stat.h \ - sys/stropts.h sys/sysmacros.h sys/time.h \ - sys/ttcompat.h sys/un.h time.h ttyent.h usersec.h \ - util.h utime.h utmp.h utmpx.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:__oline__: 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 -fi -echo "$as_me:__oline__: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:__oline__: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line __oline__ "configure" -#include "confdefs.h" -$ac_includes_default -@%:@include <$ac_header> +#include +#include +int main() { char *ff = skey_keyinfo(""); ff=""; return 0; } + _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest$ac_exeext +if { (eval echo "$as_me:__oline__: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + echo "$as_me:__oline__: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_header_compiler=no + + echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 + { { echo "$as_me:__oline__: 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 conftest.$ac_objext conftest.$ac_ext -echo "$as_me:__oline__: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + fi + -# Is the header present? -echo "$as_me:__oline__: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF +fi; + +# Check whether user wants TCP wrappers support +TCPW_MSG="no" + +# Check whether --with-tcp-wrappers or --without-tcp-wrappers was given. +if test "${with_tcp_wrappers+set}" = set; then + withval="$with_tcp_wrappers" + + if test "x$withval" != "xno" ; then + saved_LIBS="$LIBS" + saved_LDFLAGS="$LDFLAGS" + saved_CPPFLAGS="$CPPFLAGS" + if test -n "${withval}" -a "${withval}" != "yes"; then + if test -d "${withval}/lib"; then + if test -n "${need_dash_r}"; then + LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}" + else + LDFLAGS="-L${withval}/lib ${LDFLAGS}" + fi + else + if test -n "${need_dash_r}"; then + LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}" + else + LDFLAGS="-L${withval} ${LDFLAGS}" + fi + fi + if test -d "${withval}/include"; then + CPPFLAGS="-I${withval}/include ${CPPFLAGS}" + else + CPPFLAGS="-I${withval} ${CPPFLAGS}" + fi + fi + LIBWRAP="-lwrap" + LIBS="$LIBWRAP $LIBS" + echo "$as_me:__oline__: checking for libwrap" >&5 +echo $ECHO_N "checking for libwrap... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF #line __oline__ "configure" #include "confdefs.h" -@%:@include <$ac_header> + +#include + int deny_severity = 0, allow_severity = 0; + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +hosts_access(0); + ; + return 0; +} _ACEOF -if { (eval echo "$as_me:__oline__: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:__oline__: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + echo "$as_me:__oline__: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + cat >>confdefs.h <<\_ACEOF +@%:@define LIBWRAP 1 +_ACEOF + + + TCPW_MSG="yes" + else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:__oline__: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +cat conftest.$ac_ext >&5 -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:__oline__: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:__oline__: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; - no:yes ) - { echo "$as_me:__oline__: WARNING: $ac_header: present but cannot be compiled." >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled." >&2;} - { echo "$as_me:__oline__: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:__oline__: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -esac -echo "$as_me:__oline__: 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 - eval "$as_ac_Header=$ac_header_preproc" + { { echo "$as_me:__oline__: error: *** libwrap missing" >&5 +echo "$as_me: error: *** libwrap missing" >&2;} + { (exit 1); exit 1; }; } + + fi -echo "$as_me:__oline__: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS="$saved_LIBS" + fi + -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -# Check for ALTDIRFUNC glob() extension -echo "$as_me:__oline__: checking for GLOB_ALTDIRFUNC support" >&5 -echo $ECHO_N "checking for GLOB_ALTDIRFUNC support... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line __oline__ "configure" -#include "confdefs.h" - - #include - #ifdef GLOB_ALTDIRFUNC - FOUNDIT - #endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "FOUNDIT" >/dev/null 2>&1; then - - cat >>confdefs.h <<\_ACEOF -@%:@define GLOB_HAS_ALTDIRFUNC 1 -_ACEOF - - echo "$as_me:__oline__: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - -else - - echo "$as_me:__oline__: result: no" >&5 -echo "${ECHO_T}no" >&6 - - -fi -rm -f conftest* - - -# Check for g.gl_matchc glob() extension -echo "$as_me:__oline__: 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 __oline__ "configure" -#include "confdefs.h" - - #include - int main(void){glob_t g; g.gl_matchc = 1;} - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "FOUNDIT" >/dev/null 2>&1; then - - cat >>confdefs.h <<\_ACEOF -@%:@define GLOB_HAS_GL_MATCHC 1 -_ACEOF - - echo "$as_me:__oline__: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - -else - - echo "$as_me:__oline__: result: no" >&5 -echo "${ECHO_T}no" >&6 - - -fi -rm -f conftest* - - -echo "$as_me:__oline__: 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:__oline__: 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 __oline__ "configure" -#include "confdefs.h" - -#include -#include -int main(void){struct dirent d;return(sizeof(d.d_name)<=sizeof(char));} - -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:__oline__: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:__oline__: 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:__oline__: result: no" >&5 -echo "${ECHO_T}no" >&6 - cat >>confdefs.h <<\_ACEOF -@%:@define BROKEN_ONE_BYTE_DIRENT_D_NAME 1 -_ACEOF - - - -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - -# Check whether user wants S/Key support -SKEY_MSG="no" - -# Check whether --with-skey or --without-skey was given. -if test "${with_skey+set}" = set; then - withval="$with_skey" - - if test "x$withval" != "xno" ; then - - if test "x$withval" != "xyes" ; then - CPPFLAGS="$CPPFLAGS -I${withval}/include" - LDFLAGS="$LDFLAGS -L${withval}/lib" - fi - - cat >>confdefs.h <<\_ACEOF -@%:@define SKEY 1 -_ACEOF - - LIBS="-lskey $LIBS" - SKEY_MSG="yes" - - echo "$as_me:__oline__: checking for skey_keyinfo" >&5 -echo $ECHO_N "checking for skey_keyinfo... $ECHO_C" >&6 -if test "${ac_cv_func_skey_keyinfo+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line __oline__ "configure" -#include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char skey_keyinfo (); below. */ -#include -/* 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 skey_keyinfo (); -char (*f) (); - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_skey_keyinfo) || defined (__stub___skey_keyinfo) -choke me -#else -f = skey_keyinfo; -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:__oline__: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_skey_keyinfo=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_func_skey_keyinfo=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:__oline__: result: $ac_cv_func_skey_keyinfo" >&5 -echo "${ECHO_T}$ac_cv_func_skey_keyinfo" >&6 -if test $ac_cv_func_skey_keyinfo = yes; then - : -else - - { { echo "$as_me:__oline__: error: ** Incomplete or missing s/key libraries." >&5 -echo "$as_me: error: ** Incomplete or missing s/key libraries." >&2;} - { (exit 1); exit 1; }; } - -fi - - fi - - -fi; - -# Check whether user wants TCP wrappers support -TCPW_MSG="no" - -# Check whether --with-tcp-wrappers or --without-tcp-wrappers was given. -if test "${with_tcp_wrappers+set}" = set; then - withval="$with_tcp_wrappers" - - if test "x$withval" != "xno" ; then - saved_LIBS="$LIBS" - saved_LDFLAGS="$LDFLAGS" - saved_CPPFLAGS="$CPPFLAGS" - if test -n "${withval}" -a "${withval}" != "yes"; then - if test -d "${withval}/lib"; then - if test -n "${need_dash_r}"; then - LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}" - else - LDFLAGS="-L${withval}/lib ${LDFLAGS}" - fi - else - if test -n "${need_dash_r}"; then - LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}" - else - LDFLAGS="-L${withval} ${LDFLAGS}" - fi - fi - if test -d "${withval}/include"; then - CPPFLAGS="-I${withval}/include ${CPPFLAGS}" - else - CPPFLAGS="-I${withval} ${CPPFLAGS}" - fi - fi - LIBS="-lwrap $LIBS" - echo "$as_me:__oline__: checking for libwrap" >&5 -echo $ECHO_N "checking for libwrap... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line __oline__ "configure" -#include "confdefs.h" - -#include - int deny_severity = 0, allow_severity = 0; - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -hosts_access(0); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:__oline__: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - echo "$as_me:__oline__: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - cat >>confdefs.h <<\_ACEOF -@%:@define LIBWRAP 1 -_ACEOF - - TCPW_MSG="yes" - -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - - { { echo "$as_me:__oline__: error: *** libwrap missing" >&5 -echo "$as_me: error: *** libwrap missing" >&2;} - { (exit 1); exit 1; }; } - - -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi - - -fi; +fi; @@ -8271,6 +7910,12 @@ @%:@define USE_PAM 1 _ACEOF + if test $ac_cv_lib_dl_dlopen = yes; then + LIBPAM="-lpam -ldl" + else + LIBPAM="-lpam" + fi + fi @@ -8571,13 +8216,61 @@ fi fi -# Some Linux systems (Slackware) need crypt() from libcrypt, *not* the -# version in OpenSSL. Skip this for PAM -if test "x$PAM_MSG" = "xno" -a "x$check_for_libcrypt_later" = "x1"; then - echo "$as_me:__oline__: 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 +# Sanity check OpenSSL headers +echo "$as_me:__oline__: 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:__oline__: 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 __oline__ "configure" +#include "confdefs.h" + +#include +#include +int main(void) { return(SSLeay() == OPENSSL_VERSION_NUMBER ? 0 : 1); } + +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:__oline__: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + echo "$as_me:__oline__: 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:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 + { { echo "$as_me:__oline__: error: Your OpenSSL headers do not match your library" >&5 +echo "$as_me: error: Your OpenSSL headers do not match your library" >&2;} + { (exit 1); exit 1; }; } + + +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + +# Some Linux systems (Slackware) need crypt() from libcrypt, *not* the +# version in OpenSSL. Skip this for PAM +if test "x$PAM_MSG" = "xno" -a "x$check_for_libcrypt_later" = "x1"; then + echo "$as_me:__oline__: 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 else ac_check_lib_save_LIBS=$LIBS LIBS="-lcrypt $LIBS" @@ -8635,183 +8328,1097 @@ fi -# Cheap hack to ensure NEWS-OS libraries are arranged right. -if test ! -z "$SONY" ; then - LIBS="$LIBS -liberty"; -fi -# Checks for data types -echo "$as_me:__oline__: 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 +### Configure cryptographic random number support + +# Check wheter OpenSSL seeds itself +echo "$as_me:__oline__: 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:__oline__: 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 __oline__ "configure" #include "confdefs.h" -$ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -if ((char *) 0) - return 0; -if (sizeof (char)) - return 0; - ; - return 0; -} + +#include +#include +int main(void) { return(RAND_status() == 1 ? 0 : 1); } + _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest$ac_exeext +if { (eval echo "$as_me:__oline__: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_char=yes + + OPENSSL_SEEDS_ITSELF=yes + echo "$as_me:__oline__: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_type_char=no + + echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 + # Default to use of the rand helper if OpenSSL doesn't + # seed itself + USE_RAND_HELPER=yes + + fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:__oline__: result: $ac_cv_type_char" >&5 -echo "${ECHO_T}$ac_cv_type_char" >&6 -echo "$as_me:__oline__: 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 -else - if test "$ac_cv_type_char" = yes; then - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -#line __oline__ "configure" -#include "confdefs.h" -$ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -int _array_ @<:@1 - 2 * !((sizeof (char)) >= 0)@:>@ - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -#line __oline__ "configure" -#include "confdefs.h" -$ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -int _array_ @<:@1 - 2 * !((sizeof (char)) <= $ac_mid)@:>@ - ; - return 0; -} + +# Do we want to force the use of the rand helper? + +# Check whether --with-rand-helper or --without-rand-helper was given. +if test "${with_rand_helper+set}" = set; then + withval="$with_rand_helper" + + if test "x$withval" = "xno" ; 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:__oline__: 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="" + fi + else + USE_RAND_HELPER=yes + fi + +fi; + +# Which randomness source do we use? +if test ! -z "$OPENSSL_SEEDS_ITSELF" -a -z "$USE_RAND_HELPER" ; then + # OpenSSL only + cat >>confdefs.h <<\_ACEOF +@%:@define OPENSSL_PRNG_ONLY 1 _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` + + RAND_MSG="OpenSSL internal ONLY" + INSTALL_SSH_RAND_HELPER="" +elif test ! -z "$USE_RAND_HELPER" ; then + # install rand helper + RAND_MSG="ssh-rand-helper" + INSTALL_SSH_RAND_HELPER="yes" fi -rm -f conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -#line __oline__ "configure" -#include "confdefs.h" -$ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -int _array_ @<:@1 - 2 * !((sizeof (char)) >= $ac_mid)@:>@ - ; - return 0; -} + + +### Configuration of ssh-rand-helper + +# PRNGD TCP socket + +# Check whether --with-prngd-port or --without-prngd-port was given. +if test "${with_prngd_port+set}" = set; then + withval="$with_prngd_port" + + case "$withval" in + no) + withval="" + ;; + [0-9]*) + ;; + *) + { { echo "$as_me:__oline__: 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; }; } + ;; + esac + if test ! -z "$withval" ; then + PRNGD_PORT="$withval" + cat >>confdefs.h <<_ACEOF +@%:@define PRNGD_PORT $PRNGD_PORT _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_lo=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` -fi -rm -f conftest.$ac_objext conftest.$ac_ext - done -fi + + fi + + +fi; + +# PRNGD Unix domain socket + +# Check whether --with-prngd-socket or --without-prngd-socket was given. +if test "${with_prngd_socket+set}" = set; then + withval="$with_prngd_socket" + + case "$withval" in + yes) + withval="/var/run/egd-pool" + ;; + no) + withval="" + ;; + /*) + ;; + *) + { { echo "$as_me:__oline__: 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; }; } + ;; + esac + + if test ! -z "$withval" ; then + if test ! -z "$PRNGD_PORT" ; then + { { echo "$as_me:__oline__: 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:__oline__: WARNING: Entropy socket is not readable" >&5 +echo "$as_me: WARNING: Entropy socket is not readable" >&2;} + fi + PRNGD_SOCKET="$withval" + cat >>confdefs.h <<_ACEOF +@%:@define PRNGD_SOCKET "$PRNGD_SOCKET" +_ACEOF + + fi + +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:__oline__: 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 + if test -r $sock && $TEST_MINUS_S_SH -c "test -S $sock -o -p $sock" ; then + PRNGD_SOCKET="$sock" + cat >>confdefs.h <<_ACEOF +@%:@define PRNGD_SOCKET "$PRNGD_SOCKET" +_ACEOF + + break; + fi + done + if test ! -z "$PRNGD_SOCKET" ; then + echo "$as_me:__oline__: result: $PRNGD_SOCKET" >&5 +echo "${ECHO_T}$PRNGD_SOCKET" >&6 + else + echo "$as_me:__oline__: result: not found" >&5 +echo "${ECHO_T}not found" >&6 + fi + fi + + +fi; + +# Change default command timeout for hashing entropy source +entropy_timeout=200 + +# Check whether --with-entropy-timeout or --without-entropy-timeout was given. +if test "${with_entropy_timeout+set}" = set; then + withval="$with_entropy_timeout" + + if test "x$withval" != "xno" ; then + entropy_timeout=$withval + fi + + +fi; + +cat >>confdefs.h <<_ACEOF +@%:@define ENTROPY_TIMEOUT_MSEC $entropy_timeout +_ACEOF + + +# These programs are used by the command hashing source to gather entropy + + # Extract the first word of "ls", so it can be a program name with args. +set dummy ls; ac_word=$2 +echo "$as_me:__oline__: 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 +else + case $PROG_LS in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROG_LS="$PROG_LS" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + 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:__oline__: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PROG_LS=$ac_cv_path_PROG_LS + +if test -n "$PROG_LS"; then + echo "$as_me:__oline__: result: $PROG_LS" >&5 +echo "${ECHO_T}$PROG_LS" >&6 +else + echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$PROG_LS" ; then + PROG_LS="undef" + 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:__oline__: 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 +else + case $PROG_NETSTAT in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROG_NETSTAT="$PROG_NETSTAT" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + 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:__oline__: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PROG_NETSTAT=$ac_cv_path_PROG_NETSTAT + +if test -n "$PROG_NETSTAT"; then + echo "$as_me:__oline__: result: $PROG_NETSTAT" >&5 +echo "${ECHO_T}$PROG_NETSTAT" >&6 +else + echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$PROG_NETSTAT" ; then + PROG_NETSTAT="undef" + 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:__oline__: 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 +else + case $PROG_ARP in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROG_ARP="$PROG_ARP" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + 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:__oline__: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PROG_ARP=$ac_cv_path_PROG_ARP + +if test -n "$PROG_ARP"; then + echo "$as_me:__oline__: result: $PROG_ARP" >&5 +echo "${ECHO_T}$PROG_ARP" >&6 +else + echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$PROG_ARP" ; then + PROG_ARP="undef" + 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:__oline__: 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 +else + case $PROG_IFCONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROG_IFCONFIG="$PROG_IFCONFIG" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + 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:__oline__: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PROG_IFCONFIG=$ac_cv_path_PROG_IFCONFIG + +if test -n "$PROG_IFCONFIG"; then + echo "$as_me:__oline__: result: $PROG_IFCONFIG" >&5 +echo "${ECHO_T}$PROG_IFCONFIG" >&6 +else + echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$PROG_IFCONFIG" ; then + PROG_IFCONFIG="undef" + 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:__oline__: 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 +else + case $PROG_JSTAT in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROG_JSTAT="$PROG_JSTAT" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + 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:__oline__: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PROG_JSTAT=$ac_cv_path_PROG_JSTAT + +if test -n "$PROG_JSTAT"; then + echo "$as_me:__oline__: result: $PROG_JSTAT" >&5 +echo "${ECHO_T}$PROG_JSTAT" >&6 +else + echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$PROG_JSTAT" ; then + PROG_JSTAT="undef" + 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:__oline__: 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 +else + case $PROG_PS in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROG_PS="$PROG_PS" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + 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:__oline__: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PROG_PS=$ac_cv_path_PROG_PS + +if test -n "$PROG_PS"; then + echo "$as_me:__oline__: result: $PROG_PS" >&5 +echo "${ECHO_T}$PROG_PS" >&6 +else + echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$PROG_PS" ; then + PROG_PS="undef" + 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:__oline__: 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 +else + case $PROG_SAR in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROG_SAR="$PROG_SAR" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + 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:__oline__: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PROG_SAR=$ac_cv_path_PROG_SAR + +if test -n "$PROG_SAR"; then + echo "$as_me:__oline__: result: $PROG_SAR" >&5 +echo "${ECHO_T}$PROG_SAR" >&6 +else + echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$PROG_SAR" ; then + PROG_SAR="undef" + 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:__oline__: 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 +else + case $PROG_W in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROG_W="$PROG_W" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + 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:__oline__: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PROG_W=$ac_cv_path_PROG_W + +if test -n "$PROG_W"; then + echo "$as_me:__oline__: result: $PROG_W" >&5 +echo "${ECHO_T}$PROG_W" >&6 +else + echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$PROG_W" ; then + PROG_W="undef" + 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:__oline__: 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 +else + case $PROG_WHO in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROG_WHO="$PROG_WHO" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + 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:__oline__: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PROG_WHO=$ac_cv_path_PROG_WHO + +if test -n "$PROG_WHO"; then + echo "$as_me:__oline__: result: $PROG_WHO" >&5 +echo "${ECHO_T}$PROG_WHO" >&6 +else + echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$PROG_WHO" ; then + PROG_WHO="undef" + 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:__oline__: 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 +else + case $PROG_LAST in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROG_LAST="$PROG_LAST" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + 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:__oline__: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PROG_LAST=$ac_cv_path_PROG_LAST + +if test -n "$PROG_LAST"; then + echo "$as_me:__oline__: result: $PROG_LAST" >&5 +echo "${ECHO_T}$PROG_LAST" >&6 +else + echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$PROG_LAST" ; then + PROG_LAST="undef" + 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:__oline__: 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 +else + case $PROG_LASTLOG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROG_LASTLOG="$PROG_LASTLOG" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + 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:__oline__: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PROG_LASTLOG=$ac_cv_path_PROG_LASTLOG + +if test -n "$PROG_LASTLOG"; then + echo "$as_me:__oline__: result: $PROG_LASTLOG" >&5 +echo "${ECHO_T}$PROG_LASTLOG" >&6 +else + echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$PROG_LASTLOG" ; then + PROG_LASTLOG="undef" + 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:__oline__: 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 +else + case $PROG_DF in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROG_DF="$PROG_DF" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + 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:__oline__: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PROG_DF=$ac_cv_path_PROG_DF + +if test -n "$PROG_DF"; then + echo "$as_me:__oline__: result: $PROG_DF" >&5 +echo "${ECHO_T}$PROG_DF" >&6 +else + echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$PROG_DF" ; then + PROG_DF="undef" + 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:__oline__: 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 +else + case $PROG_VMSTAT in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROG_VMSTAT="$PROG_VMSTAT" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + 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:__oline__: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PROG_VMSTAT=$ac_cv_path_PROG_VMSTAT + +if test -n "$PROG_VMSTAT"; then + echo "$as_me:__oline__: result: $PROG_VMSTAT" >&5 +echo "${ECHO_T}$PROG_VMSTAT" >&6 +else + echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$PROG_VMSTAT" ; then + PROG_VMSTAT="undef" + 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:__oline__: 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 +else + case $PROG_UPTIME in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROG_UPTIME="$PROG_UPTIME" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + 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:__oline__: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PROG_UPTIME=$ac_cv_path_PROG_UPTIME + +if test -n "$PROG_UPTIME"; then + echo "$as_me:__oline__: result: $PROG_UPTIME" >&5 +echo "${ECHO_T}$PROG_UPTIME" >&6 +else + echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$PROG_UPTIME" ; then + PROG_UPTIME="undef" + 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:__oline__: 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 +else + case $PROG_IPCS in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROG_IPCS="$PROG_IPCS" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + 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:__oline__: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PROG_IPCS=$ac_cv_path_PROG_IPCS + +if test -n "$PROG_IPCS"; then + echo "$as_me:__oline__: result: $PROG_IPCS" >&5 +echo "${ECHO_T}$PROG_IPCS" >&6 +else + echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$PROG_IPCS" ; then + PROG_IPCS="undef" + 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:__oline__: 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 +else + case $PROG_TAIL in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROG_TAIL="$PROG_TAIL" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + 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:__oline__: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PROG_TAIL=$ac_cv_path_PROG_TAIL + +if test -n "$PROG_TAIL"; then + echo "$as_me:__oline__: result: $PROG_TAIL" >&5 +echo "${ECHO_T}$PROG_TAIL" >&6 +else + echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$PROG_TAIL" ; then + PROG_TAIL="undef" + fi + + + +# Where does ssh-rand-helper get its randomness from? +INSTALL_SSH_PRNG_CMDS="" +if test ! -z "$INSTALL_SSH_RAND_HELPER" ; then + if test ! -z "$PRNGD_PORT" ; then + RAND_HELPER_MSG="TCP localhost:$PRNGD_PORT" + elif test ! -z "$PRNGD_SOCKET" ; then + RAND_HELPER_MSG="Unix domain socket \"$PRNGD_SOCKET\"" + else + RAND_HELPER_MSG="Command hashing (timeout $entropy_timeout)" + RAND_HELPER_CMDHASH=yes + INSTALL_SSH_PRNG_CMDS="yes" + fi +fi + + + +# Cheap hack to ensure NEWS-OS libraries are arranged right. +if test ! -z "$SONY" ; then + LIBS="$LIBS -liberty"; +fi + +# Checks for data types +echo "$as_me:__oline__: 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 __oline__ "configure" +#include "confdefs.h" +$ac_includes_default +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +if ((char *) 0) + return 0; +if (sizeof (char)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_char=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_char=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:__oline__: result: $ac_cv_type_char" >&5 +echo "${ECHO_T}$ac_cv_type_char" >&6 + +echo "$as_me:__oline__: 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 +else + if test "$ac_cv_type_char" = yes; then + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +#line __oline__ "configure" +#include "confdefs.h" +$ac_includes_default +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +int _array_ @<:@1 - 2 * !((sizeof (char)) >= 0)@:>@ + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +#line __oline__ "configure" +#include "confdefs.h" +$ac_includes_default +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +int _array_ @<:@1 - 2 * !((sizeof (char)) <= $ac_mid)@:>@ + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` +fi +rm -f conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +#line __oline__ "configure" +#include "confdefs.h" +$ac_includes_default +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +int _array_ @<:@1 - 2 * !((sizeof (char)) >= $ac_mid)@:>@ + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` +fi +rm -f conftest.$ac_objext conftest.$ac_ext + done +fi rm -f conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do @@ -10197,221 +10804,7 @@ int main () { - int64_t a; a = 1; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_have_int64_t="yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - ac_cv_have_int64_t="no" - -fi -rm -f conftest.$ac_objext conftest.$ac_ext - -fi -echo "$as_me:__oline__: 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 <<\_ACEOF -@%:@define HAVE_INT64_T 1 -_ACEOF - - have_int64_t=1 -fi - -if test -z "$have_int64_t" ; then - echo "$as_me:__oline__: checking for int64_t type in sys/socket.h" >&5 -echo $ECHO_N "checking for int64_t type in sys/socket.h... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line __oline__ "configure" -#include "confdefs.h" - #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ - int64_t a; a = 1 - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cat >>confdefs.h <<\_ACEOF -@%:@define HAVE_INT64_T 1 -_ACEOF - - echo "$as_me:__oline__: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - echo "$as_me:__oline__: result: no" >&5 -echo "${ECHO_T}no" >&6 - -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi - -echo "$as_me:__oline__: 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 __oline__ "configure" -#include "confdefs.h" - #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ - u_int8_t a; u_int16_t b; u_int32_t c; a = b = c = 1; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_have_u_intxx_t="yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - ac_cv_have_u_intxx_t="no" - -fi -rm -f conftest.$ac_objext conftest.$ac_ext - -fi -echo "$as_me:__oline__: 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 <<\_ACEOF -@%:@define HAVE_U_INTXX_T 1 -_ACEOF - - have_u_intxx_t=1 -fi - -if test -z "$have_u_intxx_t" ; then - echo "$as_me:__oline__: 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 __oline__ "configure" -#include "confdefs.h" - #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ - u_int8_t a; u_int16_t b; u_int32_t c; a = b = c = 1; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cat >>confdefs.h <<\_ACEOF -@%:@define HAVE_U_INTXX_T 1 -_ACEOF - - echo "$as_me:__oline__: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - echo "$as_me:__oline__: result: no" >&5 -echo "${ECHO_T}no" >&6 - -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi - -echo "$as_me:__oline__: 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 __oline__ "configure" -#include "confdefs.h" - #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ - u_int64_t a; a = 1; + int64_t a; a = 1; ; return 0; } @@ -10428,39 +10821,33 @@ ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_have_u_int64_t="yes" + ac_cv_have_int64_t="yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - ac_cv_have_u_int64_t="no" + ac_cv_have_int64_t="no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:__oline__: 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 +echo "$as_me:__oline__: 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 <<\_ACEOF -@%:@define HAVE_U_INT64_T 1 +@%:@define HAVE_INT64_T 1 _ACEOF - have_u_int64_t=1 + have_int64_t=1 fi - -if test -z "$have_u_intxx_t" ; then - echo "$as_me:__oline__: 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 + +if test -z "$have_int64_t" ; then + echo "$as_me:__oline__: checking for int64_t type in sys/socket.h" >&5 +echo $ECHO_N "checking for int64_t type in sys/socket.h... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF #line __oline__ "configure" #include "confdefs.h" - -#include - + #include #ifdef F77_DUMMY_MAIN # ifdef __cplusplus extern "C" @@ -10470,7 +10857,7 @@ int main () { - uint8_t a; uint16_t b; uint32_t c; a = b = c = 1; + int64_t a; a = 1 ; return 0; } @@ -10487,33 +10874,31 @@ ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_have_uintxx_t="yes" + + cat >>confdefs.h <<\_ACEOF +@%:@define HAVE_INT64_T 1 +_ACEOF + + echo "$as_me:__oline__: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - ac_cv_have_uintxx_t="no" - -fi -rm -f conftest.$ac_objext conftest.$ac_ext + echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -echo "$as_me:__oline__: 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 <<\_ACEOF -@%:@define HAVE_UINTXX_T 1 -_ACEOF - - fi +rm -f conftest.$ac_objext conftest.$ac_ext fi -if test -z "$have_uintxx_t" ; then - echo "$as_me:__oline__: checking for uintXX_t types in stdint.h" >&5 -echo $ECHO_N "checking for uintXX_t types in stdint.h... $ECHO_C" >&6 +if test -z "$have_int64_t" ; then + echo "$as_me:__oline__: checking for int64_t type in sys/bitypes.h" >&5 +echo $ECHO_N "checking for int64_t type in sys/bitypes.h... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line __oline__ "configure" #include "confdefs.h" - #include + #include #ifdef F77_DUMMY_MAIN # ifdef __cplusplus extern "C" @@ -10523,7 +10908,7 @@ int main () { - uint8_t a; uint16_t b; uint32_t c; a = b = c = 1; + int64_t a; a = 1 ; return 0; } @@ -10542,7 +10927,7 @@ (exit $ac_status); }; }; then cat >>confdefs.h <<\_ACEOF -@%:@define HAVE_UINTXX_T 1 +@%:@define HAVE_INT64_T 1 _ACEOF echo "$as_me:__oline__: result: yes" >&5 @@ -10558,17 +10943,16 @@ rm -f conftest.$ac_objext conftest.$ac_ext 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:__oline__: 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 +echo "$as_me:__oline__: 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 __oline__ "configure" #include "confdefs.h" - -#include - + #include #ifdef F77_DUMMY_MAIN # ifdef __cplusplus extern "C" @@ -10578,11 +10962,7 @@ int main () { - - int8_t a; int16_t b; int32_t c; - u_int8_t e; u_int16_t f; u_int32_t g; - a = b = c = e = f = g = 1; - + u_int8_t a; u_int16_t b; u_int32_t c; a = b = c = 1; ; return 0; } @@ -10599,13 +10979,62 @@ ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - cat >>confdefs.h <<\_ACEOF + ac_cv_have_u_intxx_t="yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + ac_cv_have_u_intxx_t="no" + +fi +rm -f conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:__oline__: 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 <<\_ACEOF @%:@define HAVE_U_INTXX_T 1 _ACEOF + have_u_intxx_t=1 +fi + +if test -z "$have_u_intxx_t" ; then + echo "$as_me:__oline__: 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 __oline__ "configure" +#include "confdefs.h" + #include +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ + u_int8_t a; u_int16_t b; u_int32_t c; a = b = c = 1; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cat >>confdefs.h <<\_ACEOF -@%:@define HAVE_INTXX_T 1 +@%:@define HAVE_U_INTXX_T 1 _ACEOF echo "$as_me:__oline__: result: yes" >&5 @@ -10614,26 +11043,23 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:__oline__: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$as_me:__oline__: 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 "$as_me:__oline__: 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 __oline__ "configure" #include "confdefs.h" - -#include - + #include #ifdef F77_DUMMY_MAIN # ifdef __cplusplus extern "C" @@ -10643,7 +11069,7 @@ int main () { - u_char foo; foo = 125; + u_int64_t a; a = 1; ; return 0; } @@ -10660,37 +11086,33 @@ ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_have_u_char="yes" + ac_cv_have_u_int64_t="yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - ac_cv_have_u_char="no" + ac_cv_have_u_int64_t="no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:__oline__: 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 +echo "$as_me:__oline__: 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 <<\_ACEOF -@%:@define HAVE_U_CHAR 1 +@%:@define HAVE_U_INT64_T 1 _ACEOF + have_u_int64_t=1 fi - - echo "$as_me:__oline__: 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 +if test -z "$have_u_int64_t" ; then + echo "$as_me:__oline__: 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 __oline__ "configure" #include "confdefs.h" -#include -#include - + #include #ifdef F77_DUMMY_MAIN # ifdef __cplusplus extern "C" @@ -10700,10 +11122,7 @@ int main () { -if ((socklen_t *) 0) - return 0; -if (sizeof (socklen_t)) - return 0; + u_int64_t a; a = 1 ; return 0; } @@ -10720,40 +11139,37 @@ ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_socklen_t=yes + + cat >>confdefs.h <<\_ACEOF +@%:@define HAVE_U_INT64_T 1 +_ACEOF + + echo "$as_me:__oline__: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_type_socklen_t=no + echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:__oline__: 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:__oline__: 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 + +if test -z "$have_u_intxx_t" ; then + echo "$as_me:__oline__: 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 - # Systems have either "struct sockaddr *" or - # "void *" as the second argument to getpeername - curl_cv_socklen_t_equiv= - for arg2 in "struct sockaddr" void; do - for t in int size_t unsigned long "unsigned long"; do - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF #line __oline__ "configure" #include "confdefs.h" - #include - #include - - int getpeername (int, $arg2 *, $t *); - +#include + #ifdef F77_DUMMY_MAIN # ifdef __cplusplus extern "C" @@ -10763,10 +11179,7 @@ int main () { - - $t len; - getpeername(0,0,&len); - + uint8_t a; uint16_t b; uint32_t c; a = b = c = 1; ; return 0; } @@ -10783,49 +11196,33 @@ ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - curl_cv_socklen_t_equiv="$t" - break - + ac_cv_have_uintxx_t="yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 + ac_cv_have_uintxx_t="no" + fi -rm -f conftest.$ac_objext conftest.$ac_ext - done - done - - if test "x$curl_cv_socklen_t_equiv" = x; then - { { echo "$as_me:__oline__: 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:__oline__: result: $curl_cv_socklen_t_equiv" >&5 -echo "${ECHO_T}$curl_cv_socklen_t_equiv" >&6 - -cat >>confdefs.h <<_ACEOF -@%:@define socklen_t $curl_cv_socklen_t_equiv +rm -f conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:__oline__: 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 <<\_ACEOF +@%:@define HAVE_UINTXX_T 1 _ACEOF + fi fi - - -echo "$as_me:__oline__: 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 - +if test -z "$have_uintxx_t" ; then + echo "$as_me:__oline__: 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 __oline__ "configure" #include "confdefs.h" - -#include - + #include #ifdef F77_DUMMY_MAIN # ifdef __cplusplus extern "C" @@ -10835,7 +11232,7 @@ int main () { - size_t foo; foo = 1235; + uint8_t a; uint16_t b; uint32_t c; a = b = c = 1; ; return 0; } @@ -10852,36 +11249,34 @@ ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_have_size_t="yes" + + cat >>confdefs.h <<\_ACEOF +@%:@define HAVE_UINTXX_T 1 +_ACEOF + + echo "$as_me:__oline__: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - ac_cv_have_size_t="no" + echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 fi rm -f conftest.$ac_objext conftest.$ac_ext - -fi -echo "$as_me:__oline__: 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 <<\_ACEOF -@%:@define HAVE_SIZE_T 1 -_ACEOF - fi -echo "$as_me:__oline__: 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 - +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:__oline__: 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 __oline__ "configure" #include "confdefs.h" -#include +#include #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -10892,7 +11287,11 @@ int main () { - ssize_t foo; foo = 1235; + + int8_t a; int16_t b; int32_t c; + u_int8_t e; u_int16_t f; u_int32_t g; + a = b = c = e = f = g = 1; + ; return 0; } @@ -10909,28 +11308,32 @@ ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_have_ssize_t="yes" + + cat >>confdefs.h <<\_ACEOF +@%:@define HAVE_U_INTXX_T 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +@%:@define HAVE_INTXX_T 1 +_ACEOF + + echo "$as_me:__oline__: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - ac_cv_have_ssize_t="no" +echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -rm -f conftest.$ac_objext conftest.$ac_ext - +rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:__oline__: 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 <<\_ACEOF -@%:@define HAVE_SSIZE_T 1 -_ACEOF -fi -echo "$as_me:__oline__: 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 "$as_me:__oline__: 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 @@ -10938,7 +11341,7 @@ #line __oline__ "configure" #include "confdefs.h" -#include +#include #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -10949,7 +11352,7 @@ int main () { - clock_t foo; foo = 1235; + u_char foo; foo = 125; ; return 0; } @@ -10966,38 +11369,37 @@ ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_have_clock_t="yes" + ac_cv_have_u_char="yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - ac_cv_have_clock_t="no" + ac_cv_have_u_char="no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:__oline__: 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 +echo "$as_me:__oline__: 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 <<\_ACEOF -@%:@define HAVE_CLOCK_T 1 +@%:@define HAVE_U_CHAR 1 _ACEOF fi -echo "$as_me:__oline__: 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 "$as_me:__oline__: 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 + cat >conftest.$ac_ext <<_ACEOF #line __oline__ "configure" #include "confdefs.h" - #include #include - + #ifdef F77_DUMMY_MAIN # ifdef __cplusplus extern "C" @@ -11007,7 +11409,10 @@ int main () { - sa_family_t foo; foo = 1235; +if ((socklen_t *) 0) + return 0; +if (sizeof (socklen_t)) + return 0; ; return 0; } @@ -11024,18 +11429,40 @@ ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_have_sa_family_t="yes" + ac_cv_type_socklen_t=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF +ac_cv_type_socklen_t=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:__oline__: 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:__oline__: 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 +else + + # Systems have either "struct sockaddr *" or + # "void *" as the second argument to getpeername + curl_cv_socklen_t_equiv= + for arg2 in "struct sockaddr" void; do + for t in int size_t unsigned long "unsigned long"; do + cat >conftest.$ac_ext <<_ACEOF #line __oline__ "configure" #include "confdefs.h" -#include -#include -#include - + #include + #include + + int getpeername (int, $arg2 *, $t *); + #ifdef F77_DUMMY_MAIN # ifdef __cplusplus extern "C" @@ -11045,7 +11472,10 @@ int main () { - sa_family_t foo; foo = 1235; + + $t len; + getpeername(0,0,&len); + ; return 0; } @@ -11062,40 +11492,47 @@ ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_have_sa_family_t="yes" + + curl_cv_socklen_t_equiv="$t" + break + else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - ac_cv_have_sa_family_t="no" - -fi -rm -f conftest.$ac_objext conftest.$ac_ext - fi rm -f conftest.$ac_objext conftest.$ac_ext + done + done + if test "x$curl_cv_socklen_t_equiv" = x; then + { { echo "$as_me:__oline__: 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:__oline__: 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 <<\_ACEOF -@%:@define HAVE_SA_FAMILY_T 1 + + echo "$as_me:__oline__: result: $curl_cv_socklen_t_equiv" >&5 +echo "${ECHO_T}$curl_cv_socklen_t_equiv" >&6 + +cat >>confdefs.h <<_ACEOF +@%:@define socklen_t $curl_cv_socklen_t_equiv _ACEOF fi -echo "$as_me:__oline__: 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 "$as_me:__oline__: 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 + cat >conftest.$ac_ext <<_ACEOF #line __oline__ "configure" #include "confdefs.h" +#include -#include - #ifdef F77_DUMMY_MAIN # ifdef __cplusplus extern "C" @@ -11105,7 +11542,10 @@ int main () { - pid_t foo; foo = 1235; +if ((sig_atomic_t *) 0) + return 0; +if (sizeof (sig_atomic_t)) + return 0; ; return 0; } @@ -11122,28 +11562,29 @@ ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_have_pid_t="yes" + ac_cv_type_sig_atomic_t=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - ac_cv_have_pid_t="no" - +ac_cv_type_sig_atomic_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext - fi -echo "$as_me:__oline__: 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 <<\_ACEOF -@%:@define HAVE_PID_T 1 +echo "$as_me:__oline__: 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 + +cat >>confdefs.h <<_ACEOF +@%:@define HAVE_SIG_ATOMIC_T 1 _ACEOF + fi -echo "$as_me:__oline__: 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 "$as_me:__oline__: 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 @@ -11162,7 +11603,7 @@ int main () { - mode_t foo; foo = 1235; + size_t foo; foo = 1235; ; return 0; } @@ -11179,29 +11620,28 @@ ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_have_mode_t="yes" + ac_cv_have_size_t="yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - ac_cv_have_mode_t="no" + ac_cv_have_size_t="no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:__oline__: 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 +echo "$as_me:__oline__: 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 <<\_ACEOF -@%:@define HAVE_MODE_T 1 +@%:@define HAVE_SIZE_T 1 _ACEOF fi - -echo "$as_me:__oline__: 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 "$as_me:__oline__: 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 @@ -11210,7 +11650,6 @@ #include "confdefs.h" #include -#include #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -11221,7 +11660,7 @@ int main () { - struct sockaddr_storage s; + ssize_t foo; foo = 1235; ; return 0; } @@ -11238,28 +11677,28 @@ ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_have_struct_sockaddr_storage="yes" + ac_cv_have_ssize_t="yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - ac_cv_have_struct_sockaddr_storage="no" + ac_cv_have_ssize_t="no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:__oline__: 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 +echo "$as_me:__oline__: 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 <<\_ACEOF -@%:@define HAVE_STRUCT_SOCKADDR_STORAGE 1 +@%:@define HAVE_SSIZE_T 1 _ACEOF fi -echo "$as_me:__oline__: 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 "$as_me:__oline__: 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 @@ -11267,8 +11706,7 @@ #line __oline__ "configure" #include "confdefs.h" -#include -#include +#include #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -11279,7 +11717,7 @@ int main () { - struct sockaddr_in6 s; s.sin6_family = 0; + clock_t foo; foo = 1235; ; return 0; } @@ -11296,28 +11734,28 @@ ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_have_struct_sockaddr_in6="yes" + ac_cv_have_clock_t="yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - ac_cv_have_struct_sockaddr_in6="no" + ac_cv_have_clock_t="no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:__oline__: 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 +echo "$as_me:__oline__: 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 <<\_ACEOF -@%:@define HAVE_STRUCT_SOCKADDR_IN6 1 +@%:@define HAVE_CLOCK_T 1 _ACEOF fi -echo "$as_me:__oline__: 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 "$as_me:__oline__: 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 @@ -11326,7 +11764,7 @@ #include "confdefs.h" #include -#include +#include #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -11337,7 +11775,7 @@ int main () { - struct in6_addr s; s.s6_addr[0] = 0; + sa_family_t foo; foo = 1235; ; return 0; } @@ -11354,38 +11792,17 @@ ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_have_struct_in6_addr="yes" + ac_cv_have_sa_family_t="yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - ac_cv_have_struct_in6_addr="no" - -fi -rm -f conftest.$ac_objext conftest.$ac_ext - -fi -echo "$as_me:__oline__: 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 <<\_ACEOF -@%:@define HAVE_STRUCT_IN6_ADDR 1 -_ACEOF - -fi - -echo "$as_me:__oline__: 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 + cat >conftest.$ac_ext <<_ACEOF #line __oline__ "configure" #include "confdefs.h" #include #include -#include +#include #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -11396,7 +11813,7 @@ int main () { - struct addrinfo s; s.ai_flags = AI_PASSIVE; + sa_family_t foo; foo = 1235; ; return 0; } @@ -11413,35 +11830,40 @@ ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_have_struct_addrinfo="yes" + ac_cv_have_sa_family_t="yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - ac_cv_have_struct_addrinfo="no" + ac_cv_have_sa_family_t="no" + +fi +rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:__oline__: 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 +echo "$as_me:__oline__: 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 <<\_ACEOF -@%:@define HAVE_STRUCT_ADDRINFO 1 +@%:@define HAVE_SA_FAMILY_T 1 _ACEOF fi -echo "$as_me:__oline__: 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 "$as_me:__oline__: 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 __oline__ "configure" #include "confdefs.h" - #include + +#include + #ifdef F77_DUMMY_MAIN # ifdef __cplusplus extern "C" @@ -11451,7 +11873,7 @@ int main () { - struct timeval tv; tv.tv_sec = 1; + pid_t foo; foo = 1235; ; return 0; } @@ -11468,386 +11890,445 @@ ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_have_struct_timeval="yes" + ac_cv_have_pid_t="yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - ac_cv_have_struct_timeval="no" + ac_cv_have_pid_t="no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:__oline__: 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 +echo "$as_me:__oline__: 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 <<\_ACEOF -@%:@define HAVE_STRUCT_TIMEVAL 1 +@%:@define HAVE_PID_T 1 _ACEOF - have_struct_timeval=1 fi -# If we don't have int64_t then we can't compile sftp-server. So don't -# even attempt to do it. -if test "x$ac_cv_have_int64_t" = "xno" -a \ - "x$ac_cv_sizeof_long_int" != "x8" -a \ - "x$ac_cv_sizeof_long_long_int" = "x0" ; then - NO_SFTP='#' -else - if test "$cross_compiling" = yes; then - { { echo "$as_me:__oline__: 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; }; } +echo "$as_me:__oline__: 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 + + cat >conftest.$ac_ext <<_ACEOF #line __oline__ "configure" #include "confdefs.h" -#include -#include -#ifdef HAVE_SNPRINTF -main() -{ - char buf[50]; - char expected_out[50]; - int mazsize = 50 ; -#if (SIZEOF_LONG_INT == 8) - long int num = 0x7fffffffffffffff; -#else - long long num = 0x7fffffffffffffffll; +#include + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } #endif - strcpy(expected_out, "9223372036854775807"); - snprintf(buf, mazsize, "%lld", num); - if(strcmp(buf, expected_out) != 0) - exit(1); - exit(0); +int +main () +{ + mode_t foo; foo = 1235; + ; + return 0; } -#else -main() { exit(0); } -#endif - _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:__oline__: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - true + ac_cv_have_mode_t="yes" else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - cat >>confdefs.h <<\_ACEOF -@%:@define BROKEN_SNPRINTF 1 -_ACEOF - + ac_cv_have_mode_t="no" fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -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:__oline__: 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 __oline__ "configure" -#include "confdefs.h" -#include +rm -f conftest.$ac_objext conftest.$ac_ext -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "ut_host" >/dev/null 2>&1; then - eval "$ossh_varname=yes" -else - eval "$ossh_varname=no" -fi -rm -f conftest* - fi - - ossh_result=`eval 'echo $'"$ossh_varname"` - if test -n "`echo $ossh_varname`"; then - echo "$as_me:__oline__: result: $ossh_result" >&5 -echo "${ECHO_T}$ossh_result" >&6 - if test "x$ossh_result" = "xyes"; then - cat >>confdefs.h <<\_ACEOF -@%:@define HAVE_HOST_IN_UTMP 1 +echo "$as_me:__oline__: 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 <<\_ACEOF +@%:@define HAVE_MODE_T 1 _ACEOF - fi - else - echo "$as_me:__oline__: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi +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:__oline__: 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 "$as_me:__oline__: 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 + cat >conftest.$ac_ext <<_ACEOF #line __oline__ "configure" #include "confdefs.h" -#include +#include +#include + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ + struct sockaddr_storage s; + ; + return 0; +} _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "ut_host" >/dev/null 2>&1; then - eval "$ossh_varname=yes" +rm -f conftest.$ac_objext +if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_have_struct_sockaddr_storage="yes" else - eval "$ossh_varname=no" -fi -rm -f conftest* - + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + ac_cv_have_struct_sockaddr_storage="no" + fi +rm -f conftest.$ac_objext conftest.$ac_ext - ossh_result=`eval 'echo $'"$ossh_varname"` - if test -n "`echo $ossh_varname`"; then - echo "$as_me:__oline__: result: $ossh_result" >&5 -echo "${ECHO_T}$ossh_result" >&6 - if test "x$ossh_result" = "xyes"; then - cat >>confdefs.h <<\_ACEOF -@%:@define HAVE_HOST_IN_UTMPX 1 +fi +echo "$as_me:__oline__: 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 <<\_ACEOF +@%:@define HAVE_STRUCT_SOCKADDR_STORAGE 1 _ACEOF - fi - else - echo "$as_me:__oline__: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - +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:__oline__: 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 "$as_me:__oline__: 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 + cat >conftest.$ac_ext <<_ACEOF #line __oline__ "configure" #include "confdefs.h" -#include +#include +#include + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ + struct sockaddr_in6 s; s.sin6_family = 0; + ; + return 0; +} _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "syslen" >/dev/null 2>&1; then - eval "$ossh_varname=yes" +rm -f conftest.$ac_objext +if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_have_struct_sockaddr_in6="yes" else - eval "$ossh_varname=no" -fi -rm -f conftest* - + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + ac_cv_have_struct_sockaddr_in6="no" + fi +rm -f conftest.$ac_objext conftest.$ac_ext - ossh_result=`eval 'echo $'"$ossh_varname"` - if test -n "`echo $ossh_varname`"; then - echo "$as_me:__oline__: result: $ossh_result" >&5 -echo "${ECHO_T}$ossh_result" >&6 - if test "x$ossh_result" = "xyes"; then - cat >>confdefs.h <<\_ACEOF -@%:@define HAVE_SYSLEN_IN_UTMPX 1 +fi +echo "$as_me:__oline__: 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 <<\_ACEOF +@%:@define HAVE_STRUCT_SOCKADDR_IN6 1 _ACEOF - fi - else - echo "$as_me:__oline__: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - +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:__oline__: 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 "$as_me:__oline__: 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 + cat >conftest.$ac_ext <<_ACEOF #line __oline__ "configure" #include "confdefs.h" -#include +#include +#include + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ + struct in6_addr s; s.s6_addr[0] = 0; + ; + return 0; +} _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "ut_pid" >/dev/null 2>&1; then - eval "$ossh_varname=yes" +rm -f conftest.$ac_objext +if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_have_struct_in6_addr="yes" else - eval "$ossh_varname=no" -fi -rm -f conftest* - + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + ac_cv_have_struct_in6_addr="no" + fi +rm -f conftest.$ac_objext conftest.$ac_ext - ossh_result=`eval 'echo $'"$ossh_varname"` - if test -n "`echo $ossh_varname`"; then - echo "$as_me:__oline__: result: $ossh_result" >&5 -echo "${ECHO_T}$ossh_result" >&6 - if test "x$ossh_result" = "xyes"; then - cat >>confdefs.h <<\_ACEOF -@%:@define HAVE_PID_IN_UTMP 1 +fi +echo "$as_me:__oline__: 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 <<\_ACEOF +@%:@define HAVE_STRUCT_IN6_ADDR 1 _ACEOF - fi - else - echo "$as_me:__oline__: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - +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:__oline__: 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 "$as_me:__oline__: 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 + cat >conftest.$ac_ext <<_ACEOF #line __oline__ "configure" #include "confdefs.h" -#include +#include +#include +#include + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ + struct addrinfo s; s.ai_flags = AI_PASSIVE; + ; + return 0; +} _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "ut_type" >/dev/null 2>&1; then - eval "$ossh_varname=yes" +rm -f conftest.$ac_objext +if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_have_struct_addrinfo="yes" else - eval "$ossh_varname=no" -fi -rm -f conftest* - + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + ac_cv_have_struct_addrinfo="no" + fi +rm -f conftest.$ac_objext conftest.$ac_ext - ossh_result=`eval 'echo $'"$ossh_varname"` - if test -n "`echo $ossh_varname`"; then - echo "$as_me:__oline__: result: $ossh_result" >&5 -echo "${ECHO_T}$ossh_result" >&6 - if test "x$ossh_result" = "xyes"; then - cat >>confdefs.h <<\_ACEOF -@%:@define HAVE_TYPE_IN_UTMP 1 +fi +echo "$as_me:__oline__: 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 <<\_ACEOF +@%:@define HAVE_STRUCT_ADDRINFO 1 _ACEOF - fi - else - echo "$as_me:__oline__: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - +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:__oline__: 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 "$as_me:__oline__: 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 + cat >conftest.$ac_ext <<_ACEOF #line __oline__ "configure" #include "confdefs.h" -#include - + #include +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ + struct timeval tv; tv.tv_sec = 1; + ; + return 0; +} _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "ut_type" >/dev/null 2>&1; then - eval "$ossh_varname=yes" +rm -f conftest.$ac_objext +if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_have_struct_timeval="yes" else - eval "$ossh_varname=no" -fi -rm -f conftest* - + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + ac_cv_have_struct_timeval="no" + fi +rm -f conftest.$ac_objext conftest.$ac_ext - ossh_result=`eval 'echo $'"$ossh_varname"` - if test -n "`echo $ossh_varname`"; then - echo "$as_me:__oline__: result: $ossh_result" >&5 -echo "${ECHO_T}$ossh_result" >&6 - if test "x$ossh_result" = "xyes"; then - cat >>confdefs.h <<\_ACEOF -@%:@define HAVE_TYPE_IN_UTMPX 1 +fi +echo "$as_me:__oline__: 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 <<\_ACEOF +@%:@define HAVE_STRUCT_TIMEVAL 1 _ACEOF - fi - else - echo "$as_me:__oline__: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - + have_struct_timeval=1 +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:__oline__: 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 +# If we don't have int64_t then we can't compile sftp-server. So don't +# even attempt to do it. +if test "x$ac_cv_have_int64_t" = "xno" -a \ + "x$ac_cv_sizeof_long_int" != "x8" -a \ + "x$ac_cv_sizeof_long_long_int" = "x0" ; then + NO_SFTP='#' else - - cat >conftest.$ac_ext <<_ACEOF + if test "$cross_compiling" = yes; then + { { echo "$as_me:__oline__: 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 __oline__ "configure" #include "confdefs.h" -#include +#include +#include +#ifdef HAVE_SNPRINTF +main() +{ + char buf[50]; + char expected_out[50]; + int mazsize = 50 ; +#if (SIZEOF_LONG_INT == 8) + long int num = 0x7fffffffffffffff; +#else + long long num = 0x7fffffffffffffffll; +#endif + strcpy(expected_out, "9223372036854775807"); + snprintf(buf, mazsize, "%lld", num); + if(strcmp(buf, expected_out) != 0) + exit(1); + exit(0); +} +#else +main() { exit(0); } +#endif + _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "ut_tv" >/dev/null 2>&1; then - eval "$ossh_varname=yes" +rm -f conftest$ac_exeext +if { (eval echo "$as_me:__oline__: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + true else - eval "$ossh_varname=no" + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + cat >>confdefs.h <<\_ACEOF +@%:@define BROKEN_SNPRINTF 1 +_ACEOF + + +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest* - fi - ossh_result=`eval 'echo $'"$ossh_varname"` - if test -n "`echo $ossh_varname`"; then - echo "$as_me:__oline__: result: $ossh_result" >&5 -echo "${ECHO_T}$ossh_result" >&6 - if test "x$ossh_result" = "xyes"; then - cat >>confdefs.h <<\_ACEOF -@%:@define HAVE_TV_IN_UTMP 1 -_ACEOF - - fi - else - echo "$as_me:__oline__: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi -# look for field 'ut_id' in header 'utmp.h' +# 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_id - echo "$as_me:__oline__: checking for ut_id field in utmp.h" >&5 -echo $ECHO_N "checking for ut_id field in utmp.h... $ECHO_C" >&6 + ossh_varname="ossh_cv_$ossh_safe""_has_"ut_host + echo "$as_me:__oline__: 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 @@ -11859,7 +12340,7 @@ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "ut_id" >/dev/null 2>&1; then + egrep "ut_host" >/dev/null 2>&1; then eval "$ossh_varname=yes" else eval "$ossh_varname=no" @@ -11874,7 +12355,7 @@ echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then cat >>confdefs.h <<\_ACEOF -@%:@define HAVE_ID_IN_UTMP 1 +@%:@define HAVE_HOST_IN_UTMP 1 _ACEOF fi @@ -11884,11 +12365,11 @@ fi -# look for field 'ut_id' in header 'utmpx.h' +# 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_id - echo "$as_me:__oline__: checking for ut_id field in utmpx.h" >&5 -echo $ECHO_N "checking for ut_id field in utmpx.h... $ECHO_C" >&6 + ossh_varname="ossh_cv_$ossh_safe""_has_"ut_host + echo "$as_me:__oline__: 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 @@ -11900,48 +12381,7 @@ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "ut_id" >/dev/null 2>&1; then - eval "$ossh_varname=yes" -else - eval "$ossh_varname=no" -fi -rm -f conftest* - -fi - - ossh_result=`eval 'echo $'"$ossh_varname"` - if test -n "`echo $ossh_varname`"; then - echo "$as_me:__oline__: result: $ossh_result" >&5 -echo "${ECHO_T}$ossh_result" >&6 - if test "x$ossh_result" = "xyes"; then - cat >>confdefs.h <<\_ACEOF -@%:@define HAVE_ID_IN_UTMPX 1 -_ACEOF - - fi - else - echo "$as_me:__oline__: 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:__oline__: 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 __oline__ "configure" -#include "confdefs.h" -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "ut_addr" >/dev/null 2>&1; then + egrep "ut_host" >/dev/null 2>&1; then eval "$ossh_varname=yes" else eval "$ossh_varname=no" @@ -11956,7 +12396,7 @@ echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then cat >>confdefs.h <<\_ACEOF -@%:@define HAVE_ADDR_IN_UTMP 1 +@%:@define HAVE_HOST_IN_UTMPX 1 _ACEOF fi @@ -11966,11 +12406,11 @@ fi -# look for field 'ut_addr' in header 'utmpx.h' +# look for field 'syslen' in header 'utmpx.h' ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` - ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr - echo "$as_me:__oline__: checking for ut_addr field in utmpx.h" >&5 -echo $ECHO_N "checking for ut_addr field in utmpx.h... $ECHO_C" >&6 + ossh_varname="ossh_cv_$ossh_safe""_has_"syslen + echo "$as_me:__oline__: 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 @@ -11982,7 +12422,7 @@ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "ut_addr" >/dev/null 2>&1; then + egrep "syslen" >/dev/null 2>&1; then eval "$ossh_varname=yes" else eval "$ossh_varname=no" @@ -11997,7 +12437,7 @@ echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then cat >>confdefs.h <<\_ACEOF -@%:@define HAVE_ADDR_IN_UTMPX 1 +@%:@define HAVE_SYSLEN_IN_UTMPX 1 _ACEOF fi @@ -12007,11 +12447,11 @@ fi -# look for field 'ut_addr_v6' in header 'utmp.h' +# 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_addr_v6 - echo "$as_me:__oline__: 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 + ossh_varname="ossh_cv_$ossh_safe""_has_"ut_pid + echo "$as_me:__oline__: 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 @@ -12023,7 +12463,7 @@ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "ut_addr_v6" >/dev/null 2>&1; then + egrep "ut_pid" >/dev/null 2>&1; then eval "$ossh_varname=yes" else eval "$ossh_varname=no" @@ -12038,7 +12478,7 @@ echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then cat >>confdefs.h <<\_ACEOF -@%:@define HAVE_ADDR_V6_IN_UTMP 1 +@%:@define HAVE_PID_IN_UTMP 1 _ACEOF fi @@ -12048,11 +12488,11 @@ 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:__oline__: 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 +# 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:__oline__: 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 @@ -12060,11 +12500,11 @@ cat >conftest.$ac_ext <<_ACEOF #line __oline__ "configure" #include "confdefs.h" -#include +#include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "ut_addr_v6" >/dev/null 2>&1; then + egrep "ut_type" >/dev/null 2>&1; then eval "$ossh_varname=yes" else eval "$ossh_varname=no" @@ -12079,7 +12519,7 @@ echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then cat >>confdefs.h <<\_ACEOF -@%:@define HAVE_ADDR_V6_IN_UTMPX 1 +@%:@define HAVE_TYPE_IN_UTMP 1 _ACEOF fi @@ -12089,11 +12529,11 @@ 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:__oline__: checking for ut_exit field in utmp.h" >&5 -echo $ECHO_N "checking for ut_exit field in utmp.h... $ECHO_C" >&6 +# 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:__oline__: 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 @@ -12101,11 +12541,11 @@ cat >conftest.$ac_ext <<_ACEOF #line __oline__ "configure" #include "confdefs.h" -#include +#include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "ut_exit" >/dev/null 2>&1; then + egrep "ut_type" >/dev/null 2>&1; then eval "$ossh_varname=yes" else eval "$ossh_varname=no" @@ -12120,7 +12560,7 @@ echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then cat >>confdefs.h <<\_ACEOF -@%:@define HAVE_EXIT_IN_UTMP 1 +@%:@define HAVE_TYPE_IN_UTMPX 1 _ACEOF fi @@ -12130,11 +12570,11 @@ fi -# look for field 'ut_time' in header 'utmp.h' +# 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_time - echo "$as_me:__oline__: checking for ut_time field in utmp.h" >&5 -echo $ECHO_N "checking for ut_time field in utmp.h... $ECHO_C" >&6 + ossh_varname="ossh_cv_$ossh_safe""_has_"ut_tv + echo "$as_me:__oline__: 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 @@ -12146,7 +12586,7 @@ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "ut_time" >/dev/null 2>&1; then + egrep "ut_tv" >/dev/null 2>&1; then eval "$ossh_varname=yes" else eval "$ossh_varname=no" @@ -12161,7 +12601,7 @@ echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then cat >>confdefs.h <<\_ACEOF -@%:@define HAVE_TIME_IN_UTMP 1 +@%:@define HAVE_TV_IN_UTMP 1 _ACEOF fi @@ -12171,11 +12611,11 @@ 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:__oline__: checking for ut_time field in utmpx.h" >&5 -echo $ECHO_N "checking for ut_time field in utmpx.h... $ECHO_C" >&6 +# 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:__oline__: 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 @@ -12183,11 +12623,11 @@ cat >conftest.$ac_ext <<_ACEOF #line __oline__ "configure" #include "confdefs.h" -#include +#include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "ut_time" >/dev/null 2>&1; then + egrep "ut_id" >/dev/null 2>&1; then eval "$ossh_varname=yes" else eval "$ossh_varname=no" @@ -12202,7 +12642,7 @@ echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then cat >>confdefs.h <<\_ACEOF -@%:@define HAVE_TIME_IN_UTMPX 1 +@%:@define HAVE_ID_IN_UTMP 1 _ACEOF fi @@ -12212,11 +12652,11 @@ fi -# look for field 'ut_tv' in header 'utmpx.h' +# 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_tv - echo "$as_me:__oline__: checking for ut_tv field in utmpx.h" >&5 -echo $ECHO_N "checking for ut_tv field in utmpx.h... $ECHO_C" >&6 + ossh_varname="ossh_cv_$ossh_safe""_has_"ut_id + echo "$as_me:__oline__: 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 @@ -12228,7 +12668,7 @@ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "ut_tv" >/dev/null 2>&1; then + egrep "ut_id" >/dev/null 2>&1; then eval "$ossh_varname=yes" else eval "$ossh_varname=no" @@ -12243,7 +12683,7 @@ echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then cat >>confdefs.h <<\_ACEOF -@%:@define HAVE_TV_IN_UTMPX 1 +@%:@define HAVE_ID_IN_UTMPX 1 _ACEOF fi @@ -12253,612 +12693,358 @@ fi -echo "$as_me:__oline__: 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 __oline__ "configure" -#include "confdefs.h" -$ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -static struct stat ac_aggr; -if (ac_aggr.st_blksize) -return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_member_struct_stat_st_blksize=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_member_struct_stat_st_blksize=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:__oline__: 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 - -cat >>confdefs.h <<_ACEOF -@%:@define HAVE_STRUCT_STAT_ST_BLKSIZE 1 -_ACEOF - - -fi - - -echo "$as_me:__oline__: 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 +# 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:__oline__: 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 + cat >conftest.$ac_ext <<_ACEOF #line __oline__ "configure" #include "confdefs.h" +#include -#include -#include - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ - struct sockaddr_storage s; s.ss_family = 1; - ; - return 0; -} _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_have_ss_family_in_struct_ss="yes" +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "ut_addr" >/dev/null 2>&1; then + eval "$ossh_varname=yes" else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - ac_cv_have_ss_family_in_struct_ss="no" -fi -rm -f conftest.$ac_objext conftest.$ac_ext - -fi -echo "$as_me:__oline__: 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 <<\_ACEOF -@%:@define HAVE_SS_FAMILY_IN_SS 1 -_ACEOF - + eval "$ossh_varname=no" fi - -echo "$as_me:__oline__: 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 __oline__ "configure" -#include "confdefs.h" - -#include -#include - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ - struct sockaddr_storage s; s.__ss_family = 1; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_have___ss_family_in_struct_ss="yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - ac_cv_have___ss_family_in_struct_ss="no" - +rm -f conftest* + fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:__oline__: 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 <<\_ACEOF -@%:@define HAVE___SS_FAMILY_IN_SS 1 + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + echo "$as_me:__oline__: result: $ossh_result" >&5 +echo "${ECHO_T}$ossh_result" >&6 + if test "x$ossh_result" = "xyes"; then + cat >>confdefs.h <<\_ACEOF +@%:@define HAVE_ADDR_IN_UTMP 1 _ACEOF -fi + fi + else + echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi -echo "$as_me:__oline__: 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 + +# 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:__oline__: 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 + cat >conftest.$ac_ext <<_ACEOF #line __oline__ "configure" #include "confdefs.h" +#include -#include - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ - struct passwd p; p.pw_class = 0; - ; - return 0; -} _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_have_pw_class_in_struct_passwd="yes" +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "ut_addr" >/dev/null 2>&1; then + eval "$ossh_varname=yes" else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - ac_cv_have_pw_class_in_struct_passwd="no" - + eval "$ossh_varname=no" fi -rm -f conftest.$ac_objext conftest.$ac_ext - +rm -f conftest* + fi -echo "$as_me:__oline__: 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 <<\_ACEOF -@%:@define HAVE_PW_CLASS_IN_PASSWD 1 + + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + echo "$as_me:__oline__: result: $ossh_result" >&5 +echo "${ECHO_T}$ossh_result" >&6 + if test "x$ossh_result" = "xyes"; then + cat >>confdefs.h <<\_ACEOF +@%:@define HAVE_ADDR_IN_UTMPX 1 _ACEOF -fi + fi + else + echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi -echo "$as_me:__oline__: 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 + +# 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:__oline__: 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 + cat >conftest.$ac_ext <<_ACEOF #line __oline__ "configure" #include "confdefs.h" +#include -#include - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ - struct passwd p; p.pw_expire = 0; - ; - return 0; -} _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_have_pw_expire_in_struct_passwd="yes" +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "ut_addr_v6" >/dev/null 2>&1; then + eval "$ossh_varname=yes" else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - ac_cv_have_pw_expire_in_struct_passwd="no" - + eval "$ossh_varname=no" fi -rm -f conftest.$ac_objext conftest.$ac_ext - +rm -f conftest* + fi -echo "$as_me:__oline__: 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 <<\_ACEOF -@%:@define HAVE_PW_EXPIRE_IN_PASSWD 1 + + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + echo "$as_me:__oline__: result: $ossh_result" >&5 +echo "${ECHO_T}$ossh_result" >&6 + if test "x$ossh_result" = "xyes"; then + cat >>confdefs.h <<\_ACEOF +@%:@define HAVE_ADDR_V6_IN_UTMP 1 _ACEOF -fi + fi + else + echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi -echo "$as_me:__oline__: 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 + +# 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:__oline__: 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 + cat >conftest.$ac_ext <<_ACEOF #line __oline__ "configure" #include "confdefs.h" +#include -#include - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ - struct passwd p; p.pw_change = 0; - ; - return 0; -} _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_have_pw_change_in_struct_passwd="yes" +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "ut_addr_v6" >/dev/null 2>&1; then + eval "$ossh_varname=yes" else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - ac_cv_have_pw_change_in_struct_passwd="no" - + eval "$ossh_varname=no" fi -rm -f conftest.$ac_objext conftest.$ac_ext - +rm -f conftest* + fi -echo "$as_me:__oline__: 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 <<\_ACEOF -@%:@define HAVE_PW_CHANGE_IN_PASSWD 1 + + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + echo "$as_me:__oline__: result: $ossh_result" >&5 +echo "${ECHO_T}$ossh_result" >&6 + if test "x$ossh_result" = "xyes"; then + cat >>confdefs.h <<\_ACEOF +@%:@define HAVE_ADDR_V6_IN_UTMPX 1 _ACEOF -fi + fi + else + echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi -echo "$as_me:__oline__: 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 + +# 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:__oline__: 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 + cat >conftest.$ac_ext <<_ACEOF #line __oline__ "configure" -#include "confdefs.h" - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ - extern char *__progname; printf("%s", __progname); - ; - return 0; -} +#include "confdefs.h" +#include + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:__oline__: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_libc_defines___progname="yes" +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "ut_exit" >/dev/null 2>&1; then + eval "$ossh_varname=yes" else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - ac_cv_libc_defines___progname="no" - + eval "$ossh_varname=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - +rm -f conftest* + fi -echo "$as_me:__oline__: 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 <<\_ACEOF -@%:@define HAVE___PROGNAME 1 + + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + echo "$as_me:__oline__: result: $ossh_result" >&5 +echo "${ECHO_T}$ossh_result" >&6 + if test "x$ossh_result" = "xyes"; then + cat >>confdefs.h <<\_ACEOF +@%:@define HAVE_EXIT_IN_UTMP 1 _ACEOF -fi + fi + else + echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi -echo "$as_me:__oline__: 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 + +# 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:__oline__: 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 + cat >conftest.$ac_ext <<_ACEOF #line __oline__ "configure" #include "confdefs.h" +#include -#include - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ - extern int optreset; optreset = 0; - ; - return 0; -} _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:__oline__: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_have_getopt_optreset="yes" +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "ut_time" >/dev/null 2>&1; then + eval "$ossh_varname=yes" else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - ac_cv_have_getopt_optreset="no" - + eval "$ossh_varname=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - +rm -f conftest* + fi -echo "$as_me:__oline__: 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 <<\_ACEOF -@%:@define HAVE_GETOPT_OPTRESET 1 + + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + echo "$as_me:__oline__: result: $ossh_result" >&5 +echo "${ECHO_T}$ossh_result" >&6 + if test "x$ossh_result" = "xyes"; then + cat >>confdefs.h <<\_ACEOF +@%:@define HAVE_TIME_IN_UTMP 1 _ACEOF -fi + fi + else + echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi -echo "$as_me:__oline__: 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 + +# 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:__oline__: 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 + cat >conftest.$ac_ext <<_ACEOF #line __oline__ "configure" #include "confdefs.h" +#include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ - extern const char *const sys_errlist[]; printf("%s", sys_errlist[0]); - ; - return 0; -} _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:__oline__: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_libc_defines_sys_errlist="yes" +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "ut_time" >/dev/null 2>&1; then + eval "$ossh_varname=yes" else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - ac_cv_libc_defines_sys_errlist="no" - + eval "$ossh_varname=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - +rm -f conftest* + fi -echo "$as_me:__oline__: 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 <<\_ACEOF -@%:@define HAVE_SYS_ERRLIST 1 + + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + echo "$as_me:__oline__: result: $ossh_result" >&5 +echo "${ECHO_T}$ossh_result" >&6 + if test "x$ossh_result" = "xyes"; then + cat >>confdefs.h <<\_ACEOF +@%:@define HAVE_TIME_IN_UTMPX 1 _ACEOF -fi + fi + else + echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi -echo "$as_me:__oline__: 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 +# 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:__oline__: 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 + cat >conftest.$ac_ext <<_ACEOF #line __oline__ "configure" #include "confdefs.h" +#include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ - extern int sys_nerr; printf("%i", sys_nerr); - ; - return 0; -} _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:__oline__: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_libc_defines_sys_nerr="yes" +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "ut_tv" >/dev/null 2>&1; then + eval "$ossh_varname=yes" else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - ac_cv_libc_defines_sys_nerr="no" - + eval "$ossh_varname=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - +rm -f conftest* + fi -echo "$as_me:__oline__: 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 <<\_ACEOF -@%:@define HAVE_SYS_NERR 1 -_ACEOF -fi + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + echo "$as_me:__oline__: result: $ossh_result" >&5 +echo "${ECHO_T}$ossh_result" >&6 + if test "x$ossh_result" = "xyes"; then + cat >>confdefs.h <<\_ACEOF +@%:@define HAVE_TV_IN_UTMPX 1 +_ACEOF + fi + else + echo "$as_me:__oline__: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi -# Check whether user wants Kerberos support -SCARD_MSG="no" -# Check whether --with-smartcard or --without-smartcard was given. -if test "${with_smartcard+set}" = set; then - withval="$with_smartcard" - - if test "x$withval" != "xno" ; then - if test "x$withval" != "xyes" ; then - CPPFLAGS="$CPPFLAGS -I${withval}" - LDFLAGS="$LDFLAGS -L${withval}" - if test ! -z "$need_dash_r" ; then - LDFLAGS="$LDFLAGS -R${withval}" - fi - if test ! -z "$blibpath" ; then - blibpath="$blibpath:${withval}" - fi - fi - -for ac_header in sectok.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:__oline__: 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 "$as_me:__oline__: 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 -fi -echo "$as_me:__oline__: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - # Is the header compilable? -echo "$as_me:__oline__: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF #line __oline__ "configure" #include "confdefs.h" $ac_includes_default -@%:@include <$ac_header> +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +static struct stat ac_aggr; +if (ac_aggr.st_blksize) +return 0; + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 @@ -12872,110 +13058,39 @@ ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + ac_cv_member_struct_stat_st_blksize=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_header_compiler=no +ac_cv_member_struct_stat_st_blksize=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:__oline__: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:__oline__: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line __oline__ "configure" -#include "confdefs.h" -@%:@include <$ac_header> -_ACEOF -if { (eval echo "$as_me:__oline__: \"$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:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:__oline__: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +echo "$as_me:__oline__: 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 + +cat >>confdefs.h <<_ACEOF +@%:@define HAVE_STRUCT_STAT_ST_BLKSIZE 1 +_ACEOF -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:__oline__: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:__oline__: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; - no:yes ) - { echo "$as_me:__oline__: WARNING: $ac_header: present but cannot be compiled." >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled." >&2;} - { echo "$as_me:__oline__: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:__oline__: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -esac -echo "$as_me:__oline__: 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 - eval "$as_ac_Header=$ac_header_preproc" -fi -echo "$as_me:__oline__: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi -done - if test "$ac_cv_header_sectok_h" != yes; then - { { echo "$as_me:__oline__: 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:__oline__: 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 "$as_me:__oline__: 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 - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsectok $LIBS" -cat >conftest.$ac_ext <<_ACEOF + + cat >conftest.$ac_ext <<_ACEOF #line __oline__ "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 sectok_open (); +#include +#include + #ifdef F77_DUMMY_MAIN # ifdef __cplusplus extern "C" @@ -12985,102 +13100,67 @@ int main () { -sectok_open (); + struct sockaddr_storage s; s.ss_family = 1; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:__oline__: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_sectok_sectok_open=yes + ac_cv_have_ss_family_in_struct_ss="yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_sectok_sectok_open=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + ac_cv_have_ss_family_in_struct_ss="no" fi -echo "$as_me:__oline__: 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 <<_ACEOF -@%:@define HAVE_LIBSECTOK 1 -_ACEOF - - LIBS="-lsectok $LIBS" +rm -f conftest.$ac_objext conftest.$ac_ext fi - - if test "$ac_cv_lib_sectok_sectok_open" != yes; then - { { echo "$as_me:__oline__: error: Can't find libsectok" >&5 -echo "$as_me: error: Can't find libsectok" >&2;} - { (exit 1); exit 1; }; } - fi - cat >>confdefs.h <<\_ACEOF -@%:@define SMARTCARD 1 +echo "$as_me:__oline__: 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 <<\_ACEOF +@%:@define HAVE_SS_FAMILY_IN_SS 1 _ACEOF - SCARD_MSG="yes" - fi - - -fi; - -# Check whether user wants Kerberos support -KRB4_MSG="no" - -# Check whether --with-kerberos4 or --without-kerberos4 was given. -if test "${with_kerberos4+set}" = set; then - withval="$with_kerberos4" - - if test "x$withval" != "xno" ; then - if test "x$withval" != "xyes" ; then - CPPFLAGS="$CPPFLAGS -I${withval}/include" - LDFLAGS="$LDFLAGS -L${withval}/lib" - if test ! -z "$need_dash_r" ; then - LDFLAGS="$LDFLAGS -R${withval}/lib" - fi - if test ! -z "$blibpath" ; then - blibpath="$blibpath:${withval}/lib" - fi - else - if test -d /usr/include/kerberosIV ; then - CPPFLAGS="$CPPFLAGS -I/usr/include/kerberosIV" - fi - fi +fi - -for ac_header in krb.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:__oline__: 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 "$as_me:__oline__: 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 -fi -echo "$as_me:__oline__: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - # Is the header compilable? -echo "$as_me:__oline__: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF + + cat >conftest.$ac_ext <<_ACEOF #line __oline__ "configure" #include "confdefs.h" -$ac_includes_default -@%:@include <$ac_header> + +#include +#include + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ + struct sockaddr_storage s; s.__ss_family = 1; + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 @@ -13094,103 +13174,94 @@ ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + ac_cv_have___ss_family_in_struct_ss="yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_header_compiler=no + ac_cv_have___ss_family_in_struct_ss="no" + fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:__oline__: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 -# Is the header present? -echo "$as_me:__oline__: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF +fi +echo "$as_me:__oline__: 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 <<\_ACEOF +@%:@define HAVE___SS_FAMILY_IN_SS 1 +_ACEOF + +fi + +echo "$as_me:__oline__: 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 __oline__ "configure" #include "confdefs.h" -@%:@include <$ac_header> + +#include + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ + struct passwd p; p.pw_class = 0; + ; + return 0; +} _ACEOF -if { (eval echo "$as_me:__oline__: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_have_pw_class_in_struct_passwd="yes" else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:__oline__: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:__oline__: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:__oline__: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; - no:yes ) - { echo "$as_me:__oline__: WARNING: $ac_header: present but cannot be compiled." >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled." >&2;} - { echo "$as_me:__oline__: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:__oline__: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -esac -echo "$as_me:__oline__: 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 - eval "$as_ac_Header=$ac_header_preproc" +cat conftest.$ac_ext >&5 + ac_cv_have_pw_class_in_struct_passwd="no" + fi -echo "$as_me:__oline__: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +rm -f conftest.$ac_objext conftest.$ac_ext fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +echo "$as_me:__oline__: 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 <<\_ACEOF +@%:@define HAVE_PW_CLASS_IN_PASSWD 1 _ACEOF - -fi -done +fi - if test "$ac_cv_header_krb_h" != yes; then - { echo "$as_me:__oline__: WARNING: Cannot find krb.h, build may fail" >&5 -echo "$as_me: WARNING: Cannot find krb.h, build may fail" >&2;} - fi - -echo "$as_me:__oline__: checking for main in -lkrb" >&5 -echo $ECHO_N "checking for main in -lkrb... $ECHO_C" >&6 -if test "${ac_cv_lib_krb_main+set}" = set; then +echo "$as_me:__oline__: 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 - ac_check_lib_save_LIBS=$LIBS -LIBS="-lkrb $LIBS" -cat >conftest.$ac_ext <<_ACEOF + + cat >conftest.$ac_ext <<_ACEOF #line __oline__ "configure" #include "confdefs.h" - +#include + #ifdef F77_DUMMY_MAIN # ifdef __cplusplus extern "C" @@ -13200,57 +13271,54 @@ int main () { -main (); + struct passwd p; p.pw_expire = 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:__oline__: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_krb_main=yes + ac_cv_have_pw_expire_in_struct_passwd="yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_krb_main=no + ac_cv_have_pw_expire_in_struct_passwd="no" + fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f conftest.$ac_objext conftest.$ac_ext + fi -echo "$as_me:__oline__: result: $ac_cv_lib_krb_main" >&5 -echo "${ECHO_T}$ac_cv_lib_krb_main" >&6 -if test $ac_cv_lib_krb_main = yes; then - cat >>confdefs.h <<_ACEOF -@%:@define HAVE_LIBKRB 1 +echo "$as_me:__oline__: 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 <<\_ACEOF +@%:@define HAVE_PW_EXPIRE_IN_PASSWD 1 _ACEOF - LIBS="-lkrb $LIBS" - fi - if test "$ac_cv_lib_krb_main" != yes; then - -echo "$as_me:__oline__: checking for main in -lkrb4" >&5 -echo $ECHO_N "checking for main in -lkrb4... $ECHO_C" >&6 -if test "${ac_cv_lib_krb4_main+set}" = set; then +echo "$as_me:__oline__: 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 - ac_check_lib_save_LIBS=$LIBS -LIBS="-lkrb4 $LIBS" -cat >conftest.$ac_ext <<_ACEOF + + cat >conftest.$ac_ext <<_ACEOF #line __oline__ "configure" #include "confdefs.h" - +#include + #ifdef F77_DUMMY_MAIN # ifdef __cplusplus extern "C" @@ -13260,71 +13328,52 @@ int main () { -main (); + struct passwd p; p.pw_change = 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:__oline__: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_krb4_main=yes + ac_cv_have_pw_change_in_struct_passwd="yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_krb4_main=no + ac_cv_have_pw_change_in_struct_passwd="no" + fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f conftest.$ac_objext conftest.$ac_ext + fi -echo "$as_me:__oline__: result: $ac_cv_lib_krb4_main" >&5 -echo "${ECHO_T}$ac_cv_lib_krb4_main" >&6 -if test $ac_cv_lib_krb4_main = yes; then - cat >>confdefs.h <<_ACEOF -@%:@define HAVE_LIBKRB4 1 +echo "$as_me:__oline__: 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 <<\_ACEOF +@%:@define HAVE_PW_CHANGE_IN_PASSWD 1 _ACEOF - LIBS="-lkrb4 $LIBS" - fi - if test "$ac_cv_lib_krb4_main" != yes; then - { echo "$as_me:__oline__: WARNING: Cannot find libkrb nor libkrb4, build may fail" >&5 -echo "$as_me: WARNING: Cannot find libkrb nor libkrb4, build may fail" >&2;} - else - KLIBS="-lkrb4" - fi - else - KLIBS="-lkrb" - fi - -echo "$as_me:__oline__: checking for des_cbc_encrypt in -ldes" >&5 -echo $ECHO_N "checking for des_cbc_encrypt in -ldes... $ECHO_C" >&6 -if test "${ac_cv_lib_des_des_cbc_encrypt+set}" = set; then +echo "$as_me:__oline__: 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 - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldes $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line __oline__ "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 des_cbc_encrypt (); + + cat >conftest.$ac_ext <<_ACEOF +#line __oline__ "configure" +#include "confdefs.h" + #ifdef F77_DUMMY_MAIN # ifdef __cplusplus extern "C" @@ -13334,7 +13383,7 @@ int main () { -des_cbc_encrypt (); + extern char *__progname; printf("%s", __progname); ; return 0; } @@ -13351,46 +13400,37 @@ ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_des_des_cbc_encrypt=yes + ac_cv_libc_defines___progname="yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_des_des_cbc_encrypt=no + ac_cv_libc_defines___progname="no" + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + fi -echo "$as_me:__oline__: result: $ac_cv_lib_des_des_cbc_encrypt" >&5 -echo "${ECHO_T}$ac_cv_lib_des_des_cbc_encrypt" >&6 -if test $ac_cv_lib_des_des_cbc_encrypt = yes; then - cat >>confdefs.h <<_ACEOF -@%:@define HAVE_LIBDES 1 +echo "$as_me:__oline__: 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 <<\_ACEOF +@%:@define HAVE___PROGNAME 1 _ACEOF - LIBS="-ldes $LIBS" - fi - if test "$ac_cv_lib_des_des_cbc_encrypt" != yes; then - -echo "$as_me:__oline__: checking for des_cbc_encrypt in -ldes425" >&5 -echo $ECHO_N "checking for des_cbc_encrypt in -ldes425... $ECHO_C" >&6 -if test "${ac_cv_lib_des425_des_cbc_encrypt+set}" = set; then +echo "$as_me:__oline__: 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 - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldes425 $LIBS" -cat >conftest.$ac_ext <<_ACEOF + + cat >conftest.$ac_ext <<_ACEOF #line __oline__ "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 des_cbc_encrypt (); +#include + #ifdef F77_DUMMY_MAIN # ifdef __cplusplus extern "C" @@ -13400,7 +13440,7 @@ int main () { -des_cbc_encrypt (); + extern int optreset; optreset = 0; ; return 0; } @@ -13417,54 +13457,35 @@ ac_status=$? echo "$as_me:__oline__: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_des425_des_cbc_encrypt=yes + ac_cv_have_getopt_optreset="yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_des425_des_cbc_encrypt=no + ac_cv_have_getopt_optreset="no" + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + fi -echo "$as_me:__oline__: result: $ac_cv_lib_des425_des_cbc_encrypt" >&5 -echo "${ECHO_T}$ac_cv_lib_des425_des_cbc_encrypt" >&6 -if test $ac_cv_lib_des425_des_cbc_encrypt = yes; then - cat >>confdefs.h <<_ACEOF -@%:@define HAVE_LIBDES425 1 +echo "$as_me:__oline__: 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 <<\_ACEOF +@%:@define HAVE_GETOPT_OPTRESET 1 _ACEOF - LIBS="-ldes425 $LIBS" - fi - if test "$ac_cv_lib_des425_des_cbc_encrypt" != yes; then - { echo "$as_me:__oline__: WARNING: Cannot find libdes nor libdes425, build may fail" >&5 -echo "$as_me: WARNING: Cannot find libdes nor libdes425, build may fail" >&2;} - else - KLIBS="-ldes425" - fi - else - KLIBS="-ldes" - fi - -echo "$as_me:__oline__: checking for dn_expand in -lresolv" >&5 -echo $ECHO_N "checking for dn_expand in -lresolv... $ECHO_C" >&6 -if test "${ac_cv_lib_resolv_dn_expand+set}" = set; then +echo "$as_me:__oline__: 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 - ac_check_lib_save_LIBS=$LIBS -LIBS="-lresolv $LIBS" -cat >conftest.$ac_ext <<_ACEOF + + cat >conftest.$ac_ext <<_ACEOF #line __oline__ "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 dn_expand (); #ifdef F77_DUMMY_MAIN # ifdef __cplusplus extern "C" @@ -13474,7 +13495,7 @@ int main () { -dn_expand (); + extern const char *const sys_errlist[]; printf("%s", sys_errlist[0]); ; return 0; } @@ -13483,918 +13504,848 @@ if { (eval echo "$as_me:__oline__: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:__oline__: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_resolv_dn_expand=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_resolv_dn_expand=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:__oline__: result: $ac_cv_lib_resolv_dn_expand" >&5 -echo "${ECHO_T}$ac_cv_lib_resolv_dn_expand" >&6 -if test $ac_cv_lib_resolv_dn_expand = yes; then - cat >>confdefs.h <<_ACEOF -@%:@define HAVE_LIBRESOLV 1 -_ACEOF - - LIBS="-lresolv $LIBS" - -fi - - KRB4=yes - KRB4_MSG="yes" - cat >>confdefs.h <<\_ACEOF -@%:@define KRB4 1 -_ACEOF - - fi - - -fi; - -# Check whether user wants AFS support -AFS_MSG="no" - -# Check whether --with-afs or --without-afs was given. -if test "${with_afs+set}" = set; then - withval="$with_afs" - - if test "x$withval" != "xno" ; then - - if test "x$withval" != "xyes" ; then - CPPFLAGS="$CPPFLAGS -I${withval}/include" - LDFLAGS="$LDFLAGS -L${withval}/lib" - fi - - if test -z "$KRB4" ; then - { echo "$as_me:__oline__: WARNING: AFS requires Kerberos IV support, build may fail" >&5 -echo "$as_me: WARNING: AFS requires Kerberos IV support, build may fail" >&2;} - fi - - LIBS="-lkafs $LIBS" - if test ! -z "$AFS_LIBS" ; then - LIBS="$LIBS $AFS_LIBS" - fi - cat >>confdefs.h <<\_ACEOF -@%:@define AFS 1 -_ACEOF - - AFS_MSG="yes" - fi - - -fi; -LIBS="$LIBS $KLIBS" - -# Looking for programs, paths and files - -# Check whether --with-rsh or --without-rsh was given. -if test "${with_rsh+set}" = set; then - withval="$with_rsh" - - if test "x$withval" != "$no" ; then - rsh_path=$withval - fi - -else - - # Extract the first word of "rsh", so it can be a program name with args. -set dummy rsh; ac_word=$2 -echo "$as_me:__oline__: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_rsh_path+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $rsh_path in - [\\/]* | ?:[\\/]*) - ac_cv_path_rsh_path="$rsh_path" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_rsh_path="$ac_dir/$ac_word" - echo "$as_me:__oline__: found $ac_dir/$ac_word" >&5 - break -fi -done - - ;; -esac -fi -rsh_path=$ac_cv_path_rsh_path - -if test -n "$rsh_path"; then - echo "$as_me:__oline__: result: $rsh_path" >&5 -echo "${ECHO_T}$rsh_path" >&6 -else - echo "$as_me:__oline__: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - - -fi; - - -# Check whether --with-xauth or --without-xauth was given. -if test "${with_xauth+set}" = set; then - withval="$with_xauth" - - if test "x$withval" != "xno" ; then - xauth_path=$withval - fi - -else - - # Extract the first word of "xauth", so it can be a program name with args. -set dummy xauth; ac_word=$2 -echo "$as_me:__oline__: 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 -else - case $xauth_path in - [\\/]* | ?:[\\/]*) - ac_cv_path_xauth_path="$xauth_path" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH:/usr/X/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/openwin/bin" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - 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:__oline__: found $ac_dir/$ac_word" >&5 - break + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_libc_defines_sys_errlist="yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + ac_cv_libc_defines_sys_errlist="no" + fi -done +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - ;; -esac fi -xauth_path=$ac_cv_path_xauth_path +echo "$as_me:__oline__: 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 <<\_ACEOF +@%:@define HAVE_SYS_ERRLIST 1 +_ACEOF -if test -n "$xauth_path"; then - echo "$as_me:__oline__: result: $xauth_path" >&5 -echo "${ECHO_T}$xauth_path" >&6 -else - echo "$as_me:__oline__: result: no" >&5 -echo "${ECHO_T}no" >&6 fi - if (test ! -z "$xauth_path" && test -x "/usr/openwin/bin/xauth") ; then - xauth_path="/usr/openwin/bin/xauth" - fi - - -fi; -if test -z "$xauth_path" ; then - XAUTH_PATH="undefined" - +echo "$as_me:__oline__: 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 >>confdefs.h <<_ACEOF -@%:@define XAUTH_PATH "$xauth_path" -_ACEOF + + cat >conftest.$ac_ext <<_ACEOF +#line __oline__ "configure" +#include "confdefs.h" - XAUTH_PATH=$xauth_path +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ + extern int sys_nerr; printf("%i", sys_nerr); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:__oline__: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_libc_defines_sys_nerr="yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + ac_cv_libc_defines_sys_nerr="no" fi -if test ! -z "$rsh_path" ; then - cat >>confdefs.h <<_ACEOF -@%:@define RSH_PATH "$rsh_path" -_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - -# Check for mail directory (last resort if we cannot get it from headers) -if test ! -z "$MAIL" ; then - maildir=`dirname $MAIL` - cat >>confdefs.h <<_ACEOF -@%:@define MAIL_DIRECTORY "$maildir" +echo "$as_me:__oline__: 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 <<\_ACEOF +@%:@define HAVE_SYS_NERR 1 _ACEOF fi -if test -z "$no_dev_ptmx" ; then - echo "$as_me:__oline__: 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 + +# Check whether user wants Kerberos support +SCARD_MSG="no" + +# Check whether --with-smartcard or --without-smartcard was given. +if test "${with_smartcard+set}" = set; then + withval="$with_smartcard" + + if test "x$withval" != "xno" ; then + if test "x$withval" != "xyes" ; then + CPPFLAGS="$CPPFLAGS -I${withval}" + LDFLAGS="$LDFLAGS -L${withval}" + if test ! -z "$need_dash_r" ; then + LDFLAGS="$LDFLAGS -R${withval}" + fi + if test ! -z "$blibpath" ; then + blibpath="$blibpath:${withval}" + fi + fi + +for ac_header in sectok.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:__oline__: 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 +fi +echo "$as_me:__oline__: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - test "$cross_compiling" = yes && - { { echo "$as_me:__oline__: 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 - ac_cv_file___dev_ptmx_=yes + # Is the header compilable? +echo "$as_me:__oline__: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line __oline__ "configure" +#include "confdefs.h" +$ac_includes_default +@%:@include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes else - ac_cv_file___dev_ptmx_=no -fi + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no fi -echo "$as_me:__oline__: 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 - - cat >>confdefs.h <<_ACEOF -@%:@define HAVE_DEV_PTMX 1 -_ACEOF +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:__oline__: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 - have_dev_ptmx=1 - - +# Is the header present? +echo "$as_me:__oline__: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line __oline__ "configure" +#include "confdefs.h" +@%:@include <$ac_header> +_ACEOF +if { (eval echo "$as_me:__oline__: \"$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:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes fi - +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_header_preproc=no fi -echo "$as_me:__oline__: 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 +rm -f conftest.err conftest.$ac_ext +echo "$as_me:__oline__: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:__oline__: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:__oline__: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:__oline__: WARNING: $ac_header: present but cannot be compiled." >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled." >&2;} + { echo "$as_me:__oline__: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:__oline__: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:__oline__: 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 - test "$cross_compiling" = yes && - { { echo "$as_me:__oline__: 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 - ac_cv_file___dev_ptc_=yes -else - ac_cv_file___dev_ptc_=no -fi + eval "$as_ac_Header=$ac_header_preproc" fi -echo "$as_me:__oline__: 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 - - cat >>confdefs.h <<_ACEOF -@%:@define HAVE_DEV_PTS_AND_PTC 1 -_ACEOF - - have_dev_ptc=1 - +echo "$as_me:__oline__: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 fi - - -# Options from here on. Some of these are preset by platform above - -# Check for user-specified random device, otherwise check /dev/urandom - -# Check whether --with-random or --without-random was given. -if test "${with_random+set}" = set; then - withval="$with_random" - - if test "x$withval" != "xno" ; then - RANDOM_POOL="$withval"; - cat >>confdefs.h <<_ACEOF -@%:@define RANDOM_POOL "$RANDOM_POOL" +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF + +fi - fi - -else - - # Check for random device - echo "$as_me:__oline__: checking for \"/dev/urandom\"" >&5 -echo $ECHO_N "checking for \"/dev/urandom\"... $ECHO_C" >&6 -if test "${ac_cv_file___dev_urandom_+set}" = set; then +done + + if test "$ac_cv_header_sectok_h" != yes; then + { { echo "$as_me:__oline__: 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:__oline__: 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 else - test "$cross_compiling" = yes && - { { echo "$as_me:__oline__: 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/urandom""; then - ac_cv_file___dev_urandom_=yes + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsectok $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line __oline__ "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 sectok_open (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +sectok_open (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:__oline__: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_sectok_sectok_open=yes else - ac_cv_file___dev_urandom_=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_sectok_sectok_open=no fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:__oline__: result: $ac_cv_file___dev_urandom_" >&5 -echo "${ECHO_T}$ac_cv_file___dev_urandom_" >&6 -if test $ac_cv_file___dev_urandom_ = yes; then - - RANDOM_POOL="/dev/urandom"; - - cat >>confdefs.h <<_ACEOF -@%:@define RANDOM_POOL "$RANDOM_POOL" +echo "$as_me:__oline__: 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 <<_ACEOF +@%:@define HAVE_LIBSECTOK 1 _ACEOF - - -fi - - - -fi; + LIBS="-lsectok $LIBS" -# Check for PRNGD/EGD pool file +fi -# Check whether --with-prngd-port or --without-prngd-port was given. -if test "${with_prngd_port+set}" = set; then - withval="$with_prngd_port" - - if test ! -z "$withval" -a "x$withval" != "xno" ; then - PRNGD_PORT="$withval" - cat >>confdefs.h <<_ACEOF -@%:@define PRNGD_PORT $PRNGD_PORT + if test "$ac_cv_lib_sectok_sectok_open" != yes; then + { { echo "$as_me:__oline__: error: Can't find libsectok" >&5 +echo "$as_me: error: Can't find libsectok" >&2;} + { (exit 1); exit 1; }; } + fi + cat >>confdefs.h <<\_ACEOF +@%:@define SMARTCARD 1 _ACEOF + SCARD_MSG="yes" fi fi; -# Check for PRNGD/EGD pool file +# Check whether user wants Kerberos support +KRB4_MSG="no" -# Check whether --with-prngd-socket or --without-prngd-socket was given. -if test "${with_prngd_socket+set}" = set; then - withval="$with_prngd_socket" +# Check whether --with-kerberos4 or --without-kerberos4 was given. +if test "${with_kerberos4+set}" = set; then + withval="$with_kerberos4" if test "x$withval" != "xno" ; then - PRNGD_SOCKET="$withval" - cat >>confdefs.h <<_ACEOF -@%:@define PRNGD_SOCKET "$PRNGD_SOCKET" -_ACEOF - - fi - -else - - # Check for existing socket only if we don't have a random device already - if test -z "$RANDOM_POOL" ; then - echo "$as_me:__oline__: 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 - if test -r $sock && $TEST_MINUS_S_SH -c "test -S $sock -o -p $sock" ; then - PRNGD_SOCKET="$sock" - cat >>confdefs.h <<_ACEOF -@%:@define PRNGD_SOCKET "$PRNGD_SOCKET" -_ACEOF - - break; + if test "x$withval" != "xyes" ; then + CPPFLAGS="$CPPFLAGS -I${withval}/include" + LDFLAGS="$LDFLAGS -L${withval}/lib" + if test ! -z "$need_dash_r" ; then + LDFLAGS="$LDFLAGS -R${withval}/lib" + fi + if test ! -z "$blibpath" ; then + blibpath="$blibpath:${withval}/lib" fi - done - if test ! -z "$PRNGD_SOCKET" ; then - echo "$as_me:__oline__: result: $PRNGD_SOCKET" >&5 -echo "${ECHO_T}$PRNGD_SOCKET" >&6 else - echo "$as_me:__oline__: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + if test -d /usr/include/kerberosIV ; then + CPPFLAGS="$CPPFLAGS -I/usr/include/kerberosIV" + fi fi - fi - -fi; - - -# detect pathnames for entropy gathering commands, if we need them -INSTALL_SSH_PRNG_CMDS="" -rm -f prng_commands -if (test -z "$RANDOM_POOL" && test -z "$PRNGD") ; then - # Use these commands to collect entropy - - # Extract the first word of "ls", so it can be a program name with args. -set dummy ls; ac_word=$2 -echo "$as_me:__oline__: 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 + +for ac_header in krb.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:__oline__: 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 - case $PROG_LS in - [\\/]* | ?:[\\/]*) - ac_cv_path_PROG_LS="$PROG_LS" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - 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:__oline__: found $ac_dir/$ac_word" >&5 - break -fi -done - - ;; -esac -fi -PROG_LS=$ac_cv_path_PROG_LS - -if test -n "$PROG_LS"; then - echo "$as_me:__oline__: result: $PROG_LS" >&5 -echo "${ECHO_T}$PROG_LS" >&6 -else - echo "$as_me:__oline__: result: no" >&5 -echo "${ECHO_T}no" >&6 fi - - if test -z "$PROG_LS" ; then - PROG_LS="undef" - 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:__oline__: 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 +echo "$as_me:__oline__: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - case $PROG_NETSTAT in - [\\/]* | ?:[\\/]*) - ac_cv_path_PROG_NETSTAT="$PROG_NETSTAT" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - 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:__oline__: found $ac_dir/$ac_word" >&5 - break -fi -done - - ;; -esac -fi -PROG_NETSTAT=$ac_cv_path_PROG_NETSTAT - -if test -n "$PROG_NETSTAT"; then - echo "$as_me:__oline__: result: $PROG_NETSTAT" >&5 -echo "${ECHO_T}$PROG_NETSTAT" >&6 + # Is the header compilable? +echo "$as_me:__oline__: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line __oline__ "configure" +#include "confdefs.h" +$ac_includes_default +@%:@include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:__oline__: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes else - echo "$as_me:__oline__: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:__oline__: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 - if test -z "$PROG_NETSTAT" ; then - PROG_NETSTAT="undef" - 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:__oline__: 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 +# Is the header present? +echo "$as_me:__oline__: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line __oline__ "configure" +#include "confdefs.h" +@%:@include <$ac_header> +_ACEOF +if { (eval echo "$as_me:__oline__: \"$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:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - case $PROG_ARP in - [\\/]* | ?:[\\/]*) - ac_cv_path_PROG_ARP="$PROG_ARP" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - 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:__oline__: found $ac_dir/$ac_word" >&5 - break -fi -done - - ;; -esac + ac_cpp_err=yes fi -PROG_ARP=$ac_cv_path_PROG_ARP - -if test -n "$PROG_ARP"; then - echo "$as_me:__oline__: result: $PROG_ARP" >&5 -echo "${ECHO_T}$PROG_ARP" >&6 +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes else - echo "$as_me:__oline__: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_header_preproc=no fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:__oline__: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 - if test -z "$PROG_ARP" ; then - PROG_ARP="undef" - 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:__oline__: 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 +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:__oline__: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:__oline__: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:__oline__: WARNING: $ac_header: present but cannot be compiled." >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled." >&2;} + { echo "$as_me:__oline__: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:__oline__: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:__oline__: 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 - case $PROG_IFCONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PROG_IFCONFIG="$PROG_IFCONFIG" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - 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:__oline__: found $ac_dir/$ac_word" >&5 - break + eval "$as_ac_Header=$ac_header_preproc" fi -done +echo "$as_me:__oline__: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - ;; -esac fi -PROG_IFCONFIG=$ac_cv_path_PROG_IFCONFIG - -if test -n "$PROG_IFCONFIG"; then - echo "$as_me:__oline__: result: $PROG_IFCONFIG" >&5 -echo "${ECHO_T}$PROG_IFCONFIG" >&6 -else - echo "$as_me:__oline__: result: no" >&5 -echo "${ECHO_T}no" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + fi - if test -z "$PROG_IFCONFIG" ; then - PROG_IFCONFIG="undef" - fi - +done - - # Extract the first word of "jstat", so it can be a program name with args. -set dummy jstat; ac_word=$2 -echo "$as_me:__oline__: 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 + if test "$ac_cv_header_krb_h" != yes; then + { echo "$as_me:__oline__: WARNING: Cannot find krb.h, build may fail" >&5 +echo "$as_me: WARNING: Cannot find krb.h, build may fail" >&2;} + fi + +echo "$as_me:__oline__: checking for main in -lkrb" >&5 +echo $ECHO_N "checking for main in -lkrb... $ECHO_C" >&6 +if test "${ac_cv_lib_krb_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $PROG_JSTAT in - [\\/]* | ?:[\\/]*) - ac_cv_path_PROG_JSTAT="$PROG_JSTAT" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - 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:__oline__: found $ac_dir/$ac_word" >&5 - break -fi -done + ac_check_lib_save_LIBS=$LIBS +LIBS="-lkrb $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line __oline__ "configure" +#include "confdefs.h" - ;; -esac -fi -PROG_JSTAT=$ac_cv_path_PROG_JSTAT -if test -n "$PROG_JSTAT"; then - echo "$as_me:__oline__: result: $PROG_JSTAT" >&5 -echo "${ECHO_T}$PROG_JSTAT" >&6 +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +main (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:__oline__: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_krb_main=yes else - echo "$as_me:__oline__: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_krb_main=no fi - - if test -z "$PROG_JSTAT" ; then - PROG_JSTAT="undef" - 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:__oline__: 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 -else - case $PROG_PS in - [\\/]* | ?:[\\/]*) - ac_cv_path_PROG_PS="$PROG_PS" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - 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:__oline__: found $ac_dir/$ac_word" >&5 - break +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -done +echo "$as_me:__oline__: result: $ac_cv_lib_krb_main" >&5 +echo "${ECHO_T}$ac_cv_lib_krb_main" >&6 +if test $ac_cv_lib_krb_main = yes; then + cat >>confdefs.h <<_ACEOF +@%:@define HAVE_LIBKRB 1 +_ACEOF - ;; -esac -fi -PROG_PS=$ac_cv_path_PROG_PS + LIBS="-lkrb $LIBS" -if test -n "$PROG_PS"; then - echo "$as_me:__oline__: result: $PROG_PS" >&5 -echo "${ECHO_T}$PROG_PS" >&6 -else - echo "$as_me:__oline__: result: no" >&5 -echo "${ECHO_T}no" >&6 fi - if test -z "$PROG_PS" ; then - PROG_PS="undef" - 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:__oline__: 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 + if test "$ac_cv_lib_krb_main" != yes; then + +echo "$as_me:__oline__: checking for main in -lkrb4" >&5 +echo $ECHO_N "checking for main in -lkrb4... $ECHO_C" >&6 +if test "${ac_cv_lib_krb4_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $PROG_SAR in - [\\/]* | ?:[\\/]*) - ac_cv_path_PROG_SAR="$PROG_SAR" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - 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:__oline__: found $ac_dir/$ac_word" >&5 - break -fi -done + ac_check_lib_save_LIBS=$LIBS +LIBS="-lkrb4 $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line __oline__ "configure" +#include "confdefs.h" - ;; -esac -fi -PROG_SAR=$ac_cv_path_PROG_SAR -if test -n "$PROG_SAR"; then - echo "$as_me:__oline__: result: $PROG_SAR" >&5 -echo "${ECHO_T}$PROG_SAR" >&6 +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +main (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:__oline__: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_krb4_main=yes else - echo "$as_me:__oline__: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_krb4_main=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi +echo "$as_me:__oline__: result: $ac_cv_lib_krb4_main" >&5 +echo "${ECHO_T}$ac_cv_lib_krb4_main" >&6 +if test $ac_cv_lib_krb4_main = yes; then + cat >>confdefs.h <<_ACEOF +@%:@define HAVE_LIBKRB4 1 +_ACEOF - if test -z "$PROG_SAR" ; then - PROG_SAR="undef" - fi - + LIBS="-lkrb4 $LIBS" - - # Extract the first word of "w", so it can be a program name with args. -set dummy w; ac_word=$2 -echo "$as_me:__oline__: 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 -else - case $PROG_W in - [\\/]* | ?:[\\/]*) - ac_cv_path_PROG_W="$PROG_W" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - 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:__oline__: found $ac_dir/$ac_word" >&5 - break fi -done - ;; -esac -fi -PROG_W=$ac_cv_path_PROG_W + if test "$ac_cv_lib_krb4_main" != yes; then + { echo "$as_me:__oline__: WARNING: Cannot find libkrb nor libkrb4, build may fail" >&5 +echo "$as_me: WARNING: Cannot find libkrb nor libkrb4, build may fail" >&2;} + else + KLIBS="-lkrb4" + fi + else + KLIBS="-lkrb" + fi + +echo "$as_me:__oline__: checking for des_cbc_encrypt in -ldes" >&5 +echo $ECHO_N "checking for des_cbc_encrypt in -ldes... $ECHO_C" >&6 +if test "${ac_cv_lib_des_des_cbc_encrypt+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldes $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line __oline__ "configure" +#include "confdefs.h" -if test -n "$PROG_W"; then - echo "$as_me:__oline__: result: $PROG_W" >&5 -echo "${ECHO_T}$PROG_W" >&6 +/* 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 des_cbc_encrypt (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +des_cbc_encrypt (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:__oline__: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_des_des_cbc_encrypt=yes else - echo "$as_me:__oline__: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_des_des_cbc_encrypt=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi +echo "$as_me:__oline__: result: $ac_cv_lib_des_des_cbc_encrypt" >&5 +echo "${ECHO_T}$ac_cv_lib_des_des_cbc_encrypt" >&6 +if test $ac_cv_lib_des_des_cbc_encrypt = yes; then + cat >>confdefs.h <<_ACEOF +@%:@define HAVE_LIBDES 1 +_ACEOF - if test -z "$PROG_W" ; then - PROG_W="undef" - fi - + LIBS="-ldes $LIBS" - - # Extract the first word of "who", so it can be a program name with args. -set dummy who; ac_word=$2 -echo "$as_me:__oline__: 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 +fi + + if test "$ac_cv_lib_des_des_cbc_encrypt" != yes; then + +echo "$as_me:__oline__: checking for des_cbc_encrypt in -ldes425" >&5 +echo $ECHO_N "checking for des_cbc_encrypt in -ldes425... $ECHO_C" >&6 +if test "${ac_cv_lib_des425_des_cbc_encrypt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $PROG_WHO in - [\\/]* | ?:[\\/]*) - ac_cv_path_PROG_WHO="$PROG_WHO" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - 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:__oline__: found $ac_dir/$ac_word" >&5 - break + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldes425 $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line __oline__ "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 des_cbc_encrypt (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +des_cbc_encrypt (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:__oline__: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_des425_des_cbc_encrypt=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_des425_des_cbc_encrypt=no fi -done - - ;; -esac +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -PROG_WHO=$ac_cv_path_PROG_WHO +echo "$as_me:__oline__: result: $ac_cv_lib_des425_des_cbc_encrypt" >&5 +echo "${ECHO_T}$ac_cv_lib_des425_des_cbc_encrypt" >&6 +if test $ac_cv_lib_des425_des_cbc_encrypt = yes; then + cat >>confdefs.h <<_ACEOF +@%:@define HAVE_LIBDES425 1 +_ACEOF -if test -n "$PROG_WHO"; then - echo "$as_me:__oline__: result: $PROG_WHO" >&5 -echo "${ECHO_T}$PROG_WHO" >&6 -else - echo "$as_me:__oline__: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi + LIBS="-ldes425 $LIBS" - if test -z "$PROG_WHO" ; then - PROG_WHO="undef" - fi - +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:__oline__: 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 + if test "$ac_cv_lib_des425_des_cbc_encrypt" != yes; then + { echo "$as_me:__oline__: WARNING: Cannot find libdes nor libdes425, build may fail" >&5 +echo "$as_me: WARNING: Cannot find libdes nor libdes425, build may fail" >&2;} + else + KLIBS="-ldes425" + fi + else + KLIBS="-ldes" + fi + +echo "$as_me:__oline__: checking for dn_expand in -lresolv" >&5 +echo $ECHO_N "checking for dn_expand in -lresolv... $ECHO_C" >&6 +if test "${ac_cv_lib_resolv_dn_expand+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $PROG_LAST in - [\\/]* | ?:[\\/]*) - ac_cv_path_PROG_LAST="$PROG_LAST" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - 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:__oline__: found $ac_dir/$ac_word" >&5 - break -fi -done + ac_check_lib_save_LIBS=$LIBS +LIBS="-lresolv $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line __oline__ "configure" +#include "confdefs.h" - ;; -esac +/* 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 dn_expand (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +dn_expand (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:__oline__: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:__oline__: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:__oline__: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_resolv_dn_expand=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_resolv_dn_expand=no fi -PROG_LAST=$ac_cv_path_PROG_LAST +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:__oline__: result: $ac_cv_lib_resolv_dn_expand" >&5 +echo "${ECHO_T}$ac_cv_lib_resolv_dn_expand" >&6 +if test $ac_cv_lib_resolv_dn_expand = yes; then + cat >>confdefs.h <<_ACEOF +@%:@define HAVE_LIBRESOLV 1 +_ACEOF + + LIBS="-lresolv $LIBS" -if test -n "$PROG_LAST"; then - echo "$as_me:__oline__: result: $PROG_LAST" >&5 -echo "${ECHO_T}$PROG_LAST" >&6 -else - echo "$as_me:__oline__: result: no" >&5 -echo "${ECHO_T}no" >&6 fi - if test -z "$PROG_LAST" ; then - PROG_LAST="undef" - fi - + KRB4=yes + KRB4_MSG="yes" + cat >>confdefs.h <<\_ACEOF +@%:@define KRB4 1 +_ACEOF + 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:__oline__: 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 -else - case $PROG_LASTLOG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PROG_LASTLOG="$PROG_LASTLOG" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - 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:__oline__: found $ac_dir/$ac_word" >&5 - break -fi -done - ;; -esac -fi -PROG_LASTLOG=$ac_cv_path_PROG_LASTLOG +fi; -if test -n "$PROG_LASTLOG"; then - echo "$as_me:__oline__: result: $PROG_LASTLOG" >&5 -echo "${ECHO_T}$PROG_LASTLOG" >&6 -else - echo "$as_me:__oline__: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi +# Check whether user wants AFS support +AFS_MSG="no" - if test -z "$PROG_LASTLOG" ; then - PROG_LASTLOG="undef" - fi - +# Check whether --with-afs or --without-afs was given. +if test "${with_afs+set}" = set; then + withval="$with_afs" + + if test "x$withval" != "xno" ; then - - # Extract the first word of "df", so it can be a program name with args. -set dummy df; ac_word=$2 -echo "$as_me:__oline__: 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 -else - case $PROG_DF in - [\\/]* | ?:[\\/]*) - ac_cv_path_PROG_DF="$PROG_DF" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - 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:__oline__: found $ac_dir/$ac_word" >&5 - break -fi -done + if test "x$withval" != "xyes" ; then + CPPFLAGS="$CPPFLAGS -I${withval}/include" + LDFLAGS="$LDFLAGS -L${withval}/lib" + fi - ;; -esac -fi -PROG_DF=$ac_cv_path_PROG_DF + if test -z "$KRB4" ; then + { echo "$as_me:__oline__: WARNING: AFS requires Kerberos IV support, build may fail" >&5 +echo "$as_me: WARNING: AFS requires Kerberos IV support, build may fail" >&2;} + fi -if test -n "$PROG_DF"; then - echo "$as_me:__oline__: result: $PROG_DF" >&5 -echo "${ECHO_T}$PROG_DF" >&6 -else - echo "$as_me:__oline__: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi + LIBS="-lkafs $LIBS" + if test ! -z "$AFS_LIBS" ; then + LIBS="$LIBS $AFS_LIBS" + fi + cat >>confdefs.h <<\_ACEOF +@%:@define AFS 1 +_ACEOF - if test -z "$PROG_DF" ; then - PROG_DF="undef" - fi + AFS_MSG="yes" + fi +fi; +LIBS="$LIBS $KLIBS" + +# Looking for programs, paths and files + +# Check whether --with-rsh or --without-rsh was given. +if test "${with_rsh+set}" = set; then + withval="$with_rsh" + + if test "x$withval" != "$no" ; then + rsh_path=$withval + fi - # Extract the first word of "vmstat", so it can be a program name with args. -set dummy vmstat; ac_word=$2 +else + + # Extract the first word of "rsh", so it can be a program name with args. +set dummy rsh; ac_word=$2 echo "$as_me:__oline__: 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 +if test "${ac_cv_path_rsh_path+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $PROG_VMSTAT in + case $rsh_path in [\\/]* | ?:[\\/]*) - ac_cv_path_PROG_VMSTAT="$PROG_VMSTAT" # Let the user override the test with a path. + ac_cv_path_rsh_path="$rsh_path" # Let the user override the test with a path. ;; *) ac_save_IFS=$IFS; IFS=$ac_path_separator @@ -14403,7 +14354,7 @@ IFS=$ac_save_IFS test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_PROG_VMSTAT="$ac_dir/$ac_word" + ac_cv_path_rsh_path="$ac_dir/$ac_word" echo "$as_me:__oline__: found $ac_dir/$ac_word" >&5 break fi @@ -14412,41 +14363,50 @@ ;; esac fi -PROG_VMSTAT=$ac_cv_path_PROG_VMSTAT +rsh_path=$ac_cv_path_rsh_path -if test -n "$PROG_VMSTAT"; then - echo "$as_me:__oline__: result: $PROG_VMSTAT" >&5 -echo "${ECHO_T}$PROG_VMSTAT" >&6 +if test -n "$rsh_path"; then + echo "$as_me:__oline__: result: $rsh_path" >&5 +echo "${ECHO_T}$rsh_path" >&6 else echo "$as_me:__oline__: result: no" >&5 echo "${ECHO_T}no" >&6 fi - if test -z "$PROG_VMSTAT" ; then - PROG_VMSTAT="undef" - fi +fi; + + +# Check whether --with-xauth or --without-xauth was given. +if test "${with_xauth+set}" = set; then + withval="$with_xauth" + + if test "x$withval" != "xno" ; then + xauth_path=$withval + fi - # Extract the first word of "uptime", so it can be a program name with args. -set dummy uptime; ac_word=$2 +else + + # Extract the first word of "xauth", so it can be a program name with args. +set dummy xauth; ac_word=$2 echo "$as_me:__oline__: 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 +if test "${ac_cv_path_xauth_path+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $PROG_UPTIME in + case $xauth_path in [\\/]* | ?:[\\/]*) - ac_cv_path_PROG_UPTIME="$PROG_UPTIME" # Let the user override the test with a path. + ac_cv_path_xauth_path="$xauth_path" # Let the user override the test with a path. ;; *) ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" +ac_dummy="$PATH:/usr/X/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/openwin/bin" for ac_dir in $ac_dummy; do IFS=$ac_save_IFS test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_PROG_UPTIME="$ac_dir/$ac_word" + ac_cv_path_xauth_path="$ac_dir/$ac_word" echo "$as_me:__oline__: found $ac_dir/$ac_word" >&5 break fi @@ -14455,113 +14415,110 @@ ;; esac fi -PROG_UPTIME=$ac_cv_path_PROG_UPTIME +xauth_path=$ac_cv_path_xauth_path -if test -n "$PROG_UPTIME"; then - echo "$as_me:__oline__: result: $PROG_UPTIME" >&5 -echo "${ECHO_T}$PROG_UPTIME" >&6 +if test -n "$xauth_path"; then + echo "$as_me:__oline__: result: $xauth_path" >&5 +echo "${ECHO_T}$xauth_path" >&6 else echo "$as_me:__oline__: result: no" >&5 echo "${ECHO_T}no" >&6 fi - if test -z "$PROG_UPTIME" ; then - PROG_UPTIME="undef" - fi + if (test ! -z "$xauth_path" && test -x "/usr/openwin/bin/xauth") ; then + xauth_path="/usr/openwin/bin/xauth" + fi +fi; + +if test -z "$xauth_path" ; then + XAUTH_PATH="undefined" - # Extract the first word of "ipcs", so it can be a program name with args. -set dummy ipcs; ac_word=$2 -echo "$as_me:__oline__: 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 else - case $PROG_IPCS in - [\\/]* | ?:[\\/]*) - ac_cv_path_PROG_IPCS="$PROG_IPCS" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - 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:__oline__: found $ac_dir/$ac_word" >&5 - break -fi -done + cat >>confdefs.h <<_ACEOF +@%:@define XAUTH_PATH "$xauth_path" +_ACEOF - ;; -esac + XAUTH_PATH=$xauth_path + fi -PROG_IPCS=$ac_cv_path_PROG_IPCS +if test ! -z "$rsh_path" ; then + cat >>confdefs.h <<_ACEOF +@%:@define RSH_PATH "$rsh_path" +_ACEOF -if test -n "$PROG_IPCS"; then - echo "$as_me:__oline__: result: $PROG_IPCS" >&5 -echo "${ECHO_T}$PROG_IPCS" >&6 -else - echo "$as_me:__oline__: result: no" >&5 -echo "${ECHO_T}no" >&6 fi - if test -z "$PROG_IPCS" ; then - PROG_IPCS="undef" - fi - +# Check for mail directory (last resort if we cannot get it from headers) +if test ! -z "$MAIL" ; then + maildir=`dirname $MAIL` + cat >>confdefs.h <<_ACEOF +@%:@define MAIL_DIRECTORY "$maildir" +_ACEOF - - # Extract the first word of "tail", so it can be a program name with args. -set dummy tail; ac_word=$2 -echo "$as_me:__oline__: 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 +fi + +if test -z "$no_dev_ptmx" ; then + echo "$as_me:__oline__: 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 - case $PROG_TAIL in - [\\/]* | ?:[\\/]*) - ac_cv_path_PROG_TAIL="$PROG_TAIL" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - 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:__oline__: found $ac_dir/$ac_word" >&5 - break + test "$cross_compiling" = yes && + { { echo "$as_me:__oline__: 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 + ac_cv_file___dev_ptmx_=yes +else + ac_cv_file___dev_ptmx_=no fi -done +fi +echo "$as_me:__oline__: 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 + + cat >>confdefs.h <<_ACEOF +@%:@define HAVE_DEV_PTMX 1 +_ACEOF - ;; -esac + have_dev_ptmx=1 + + fi -PROG_TAIL=$ac_cv_path_PROG_TAIL -if test -n "$PROG_TAIL"; then - echo "$as_me:__oline__: result: $PROG_TAIL" >&5 -echo "${ECHO_T}$PROG_TAIL" >&6 +fi +echo "$as_me:__oline__: 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 - echo "$as_me:__oline__: result: no" >&5 -echo "${ECHO_T}no" >&6 + test "$cross_compiling" = yes && + { { echo "$as_me:__oline__: 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 + ac_cv_file___dev_ptc_=yes +else + ac_cv_file___dev_ptc_=no +fi fi +echo "$as_me:__oline__: 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 + + cat >>confdefs.h <<_ACEOF +@%:@define HAVE_DEV_PTS_AND_PTC 1 +_ACEOF - if test -z "$PROG_TAIL" ; then - PROG_TAIL="undef" - fi + have_dev_ptc=1 - - INSTALL_SSH_PRNG_CMDS="yes" fi - +# Options from here on. Some of these are preset by platform above # Check whether --with-mantype or --without-mantype was given. if test "${with_mantype+set}" = set; then @@ -14915,6 +14872,7 @@ fi; # Whether to enable BSD auth support +BSD_AUTH_MSG=no # Check whether --with-bsd-auth or --without-bsd-auth was given. if test "${with_bsd_auth+set}" = set; then @@ -14925,7 +14883,7 @@ @%:@define BSD_AUTH 1 _ACEOF - bsd_auth=yes + BSD_AUTH_MSG=yes fi @@ -15481,31 +15439,18 @@ fi -# Change default command timeout for builtin PRNG -entropy_timeout=200 - -# Check whether --with-entropy-timeout or --without-entropy-timeout was given. -if test "${with_entropy_timeout+set}" = set; then - withval="$with_entropy_timeout" - - if test "x$withval" != "xno" ; then - entropy_timeout=$withval - fi - - -fi; -cat >>confdefs.h <<_ACEOF -@%:@define ENTROPY_TIMEOUT_MSEC $entropy_timeout -_ACEOF - - - if test ! -z "$blibpath" ; then LDFLAGS="$LDFLAGS -blibpath:$blibpath" { echo "$as_me:__oline__: 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 +if test "$PAM_MSG" = yes ; then + LIBS=`echo $LIBS | sed 's/-lpam //'` +fi +if test "$ac_cv_lib_pam_pam_set_item" = yes ; then + LIBS=`echo $LIBS | sed 's/-ldl //'` +fi ac_config_files="$ac_config_files Makefile openbsd-compat/Makefile scard/Makefile ssh_prng_cmds" @@ -15948,11 +15893,9 @@ s,@TEST_MINUS_S_SH@,$TEST_MINUS_S_SH,;t t s,@LOGIN_PROGRAM_FALLBACK@,$LOGIN_PROGRAM_FALLBACK,;t t s,@LD@,$LD,;t t -s,@NO_SFTP@,$NO_SFTP,;t t -s,@rsh_path@,$rsh_path,;t t -s,@xauth_path@,$xauth_path,;t t -s,@XAUTH_PATH@,$XAUTH_PATH,;t t -s,@RANDOM_POOL@,$RANDOM_POOL,;t t +s,@LIBWRAP@,$LIBWRAP,;t t +s,@LIBPAM@,$LIBPAM,;t t +s,@INSTALL_SSH_RAND_HELPER@,$INSTALL_SSH_RAND_HELPER,;t t s,@PROG_LS@,$PROG_LS,;t t s,@PROG_NETSTAT@,$PROG_NETSTAT,;t t s,@PROG_ARP@,$PROG_ARP,;t t @@ -15970,6 +15913,10 @@ s,@PROG_IPCS@,$PROG_IPCS,;t t s,@PROG_TAIL@,$PROG_TAIL,;t t s,@INSTALL_SSH_PRNG_CMDS@,$INSTALL_SSH_PRNG_CMDS,;t t +s,@NO_SFTP@,$NO_SFTP,;t t +s,@rsh_path@,$rsh_path,;t t +s,@xauth_path@,$xauth_path,;t t +s,@XAUTH_PATH@,$XAUTH_PATH,;t t s,@NROFF@,$NROFF,;t t s,@MANTYPE@,$MANTYPE,;t t s,@mansubdir@,$mansubdir,;t t @@ -16402,19 +16349,6 @@ # Print summary of options -if test ! -z "$RANDOM_POOL" ; then - RAND_MSG="Device ($RANDOM_POOL)" -else - if test ! -z "$PRNGD_PORT" ; then - RAND_MSG="PRNGD/EGD (port localhost:$PRNGD_PORT)" - elif test ! -z "$PRNGD_SOCKET" ; then - RAND_MSG="PRNGD/EGD (socket $PRNGD_SOCKET)" - else - RAND_MSG="Builtin (timeout $entropy_timeout)" - BUILTIN_RNG=1 - fi -fi - # Someone please show me a better way :) A=`eval echo ${prefix}` ; A=`eval echo ${A}` B=`eval echo ${bindir}` ; B=`eval echo ${B}` @@ -16434,7 +16368,6 @@ echo " Manual pages: $F" echo " PID file: $G" echo " sshd default user PATH: $H" -echo " Random number collection: $RAND_MSG" echo " Manpage format: $MANTYPE" echo " PAM support: ${PAM_MSG}" echo " KerberosIV support: $KRB4_MSG" @@ -16446,9 +16379,10 @@ echo " IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG" echo " Use IPv4 by default hack: $IPV4_HACK_MSG" echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG" - -if test ! -z "$bsd_auth"; then - echo " BSD Auth support: yes" +echo " BSD Auth support: $BSD_AUTH_MSG" +echo " Random number source: $RAND_MSG" +if test ! -z "$USE_RAND_HELPER" ; then + echo " ssh-rand-helper collects from: $RAND_HELPER_MSG" fi echo "" @@ -16458,27 +16392,29 @@ echo " Compiler flags: ${CFLAGS}" echo "Preprocessor flags: ${CPPFLAGS}" echo " Linker flags: ${LDFLAGS}" -echo " Libraries: ${LIBS}" +echo " Libraries: ${LIBWRAP} ${LIBPAM} ${LIBS}" echo "" if test "x$PAM_MSG" = "xyes" ; then - echo "PAM is enabled. You may need to install a PAM control file for sshd," - echo "otherwise password authentication may fail. Example PAM control files" - echo "can be found in the contrib/ subdirectory" + echo "PAM is enabled. You may need to install a PAM control file " + echo "for sshd, otherwise password authentication may fail. " + echo "Example PAM control files can be found in the contrib/ " + echo "subdirectory" echo "" fi -if test ! -z "$BUILTIN_RNG" ; then - echo "WARNING: you are using the builtin random number collection service." - echo "Please read WARNING.RNG and request that your OS vendor includes" - echo "/dev/random in future versions of their OS." +if test ! -z "$NO_SFTP"; then + echo "sftp-server will be disabled. Your compiler does not " + echo "support 64bit integers." echo "" fi -if test ! -z "$NO_SFTP"; then - echo "sftp-server will be disabled. Your compiler does not support" - echo "64bit integers." +if test ! -z "$RAND_HELPER_CMDHASH" ; then + echo "WARNING: you are using the builtin random number collection " + echo "service. Please read WARNING.RNG and request that your OS " + echo "vendor includes kernel-based random number collection in " + echo "future versions of your OS." echo "" fi diff -ru openssh-3.0.2p1/autom4te.cache/traces.0 openssh-3.1p1/autom4te.cache/traces.0 --- openssh-3.0.2p1/autom4te.cache/traces.0 2001-12-02 10:38:54.000000000 +1100 +++ openssh-3.1p1/autom4te.cache/traces.0 2002-03-07 13:22:28.000000000 +1100 @@ -100,268 +100,255 @@ m4trace:configure.ac:62: -1- AC_DEFINE_TRACE_LITERAL([WITH_AIXAUTHENTICATE]) m4trace:configure.ac:63: -1- AC_DEFINE_TRACE_LITERAL([BROKEN_GETADDRINFO]) m4trace:configure.ac:65: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_LASTLOG]) -m4trace:configure.ac:69: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CYGWIN]) -m4trace:configure.ac:70: -1- AC_DEFINE_TRACE_LITERAL([USE_PIPES]) -m4trace:configure.ac:71: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_SHADOW]) -m4trace:configure.ac:72: -1- AC_DEFINE_TRACE_LITERAL([IPV4_DEFAULT]) -m4trace:configure.ac:73: -1- AC_DEFINE_TRACE_LITERAL([IP_TOS_IS_BROKEN]) -m4trace:configure.ac:74: -1- AC_DEFINE_TRACE_LITERAL([NO_X11_UNIX_SOCKETS]) -m4trace:configure.ac:77: -1- AC_DEFINE_TRACE_LITERAL([IP_TOS_IS_BROKEN]) -m4trace:configure.ac:80: -1- AC_DEFINE_TRACE_LITERAL([BROKEN_GETADDRINFO]) -m4trace:configure.ac:88: -1- AC_DEFINE_TRACE_LITERAL([USE_PIPES]) -m4trace:configure.ac:89: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_SHADOW]) -m4trace:configure.ac:90: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_UTMP]) -m4trace:configure.ac:91: -1- AC_DEFINE_TRACE_LITERAL([SPT_TYPE]) -m4trace:configure.ac:97: -1- AC_DEFINE_TRACE_LITERAL([PAM_SUN_CODEBASE]) -m4trace:configure.ac:98: -1- AC_DEFINE_TRACE_LITERAL([USE_PIPES]) -m4trace:configure.ac:99: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_SHADOW]) -m4trace:configure.ac:100: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_UTMP]) -m4trace:configure.ac:101: -1- AC_DEFINE_TRACE_LITERAL([SPT_TYPE]) -m4trace:configure.ac:108: -1- AC_DEFINE_TRACE_LITERAL([BROKEN_INET_NTOA]) -m4trace:configure.ac:114: -1- AC_DEFINE_TRACE_LITERAL([WITH_IRIX_ARRAY]) -m4trace:configure.ac:115: -1- AC_DEFINE_TRACE_LITERAL([WITH_IRIX_PROJECT]) -m4trace:configure.ac:116: -1- AC_DEFINE_TRACE_LITERAL([WITH_IRIX_AUDIT]) -m4trace:configure.ac:117: -1- AC_DEFINE_TRACE_LITERAL([WITH_IRIX_JOBS]) -m4trace:configure.ac:118: -1- AC_DEFINE_TRACE_LITERAL([BROKEN_INET_NTOA]) -m4trace:configure.ac:123: -1- AC_DEFINE_TRACE_LITERAL([DONT_TRY_OTHER_AF]) -m4trace:configure.ac:124: -1- AC_DEFINE_TRACE_LITERAL([PAM_TTY_KLUDGE]) -m4trace:configure.ac:128: -1- AC_DEFINE_TRACE_LITERAL([HAVE_NEWS4]) -m4trace:configure.ac:130: -2- AC_DEFINE_TRACE_LITERAL([HAVE_XATEXIT]) -m4trace:configure.ac:132: -1- AC_CHECK_LIB([iberty], [xatexit], [cat >>confdefs.h <<\_ACEOF +m4trace:configure.ac:66: -1- AC_DEFINE_TRACE_LITERAL([HAVE_BOGUS_SYS_QUEUE_H]) +m4trace:configure.ac:70: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CYGWIN]) +m4trace:configure.ac:71: -1- AC_DEFINE_TRACE_LITERAL([USE_PIPES]) +m4trace:configure.ac:72: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_SHADOW]) +m4trace:configure.ac:73: -1- AC_DEFINE_TRACE_LITERAL([IPV4_DEFAULT]) +m4trace:configure.ac:74: -1- AC_DEFINE_TRACE_LITERAL([IP_TOS_IS_BROKEN]) +m4trace:configure.ac:75: -1- AC_DEFINE_TRACE_LITERAL([NO_X11_UNIX_SOCKETS]) +m4trace:configure.ac:78: -1- AC_DEFINE_TRACE_LITERAL([IP_TOS_IS_BROKEN]) +m4trace:configure.ac:81: -1- AC_DEFINE_TRACE_LITERAL([BROKEN_GETADDRINFO]) +m4trace:configure.ac:89: -1- AC_DEFINE_TRACE_LITERAL([USE_PIPES]) +m4trace:configure.ac:90: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_SHADOW]) +m4trace:configure.ac:91: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_UTMP]) +m4trace:configure.ac:92: -1- AC_DEFINE_TRACE_LITERAL([SPT_TYPE]) +m4trace:configure.ac:98: -1- AC_DEFINE_TRACE_LITERAL([PAM_SUN_CODEBASE]) +m4trace:configure.ac:99: -1- AC_DEFINE_TRACE_LITERAL([USE_PIPES]) +m4trace:configure.ac:100: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_SHADOW]) +m4trace:configure.ac:101: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_UTMP]) +m4trace:configure.ac:102: -1- AC_DEFINE_TRACE_LITERAL([SPT_TYPE]) +m4trace:configure.ac:109: -1- AC_DEFINE_TRACE_LITERAL([BROKEN_INET_NTOA]) +m4trace:configure.ac:115: -1- AC_DEFINE_TRACE_LITERAL([WITH_IRIX_ARRAY]) +m4trace:configure.ac:116: -1- AC_DEFINE_TRACE_LITERAL([WITH_IRIX_PROJECT]) +m4trace:configure.ac:117: -1- AC_DEFINE_TRACE_LITERAL([WITH_IRIX_AUDIT]) +m4trace:configure.ac:118: -1- AC_DEFINE_TRACE_LITERAL([WITH_IRIX_JOBS]) +m4trace:configure.ac:119: -1- AC_DEFINE_TRACE_LITERAL([BROKEN_INET_NTOA]) +m4trace:configure.ac:124: -1- AC_DEFINE_TRACE_LITERAL([DONT_TRY_OTHER_AF]) +m4trace:configure.ac:125: -1- AC_DEFINE_TRACE_LITERAL([PAM_TTY_KLUDGE]) +m4trace:configure.ac:126: -1- AC_DEFINE_TRACE_LITERAL([HAVE_BOGUS_SYS_QUEUE_H]) +m4trace:configure.ac:130: -1- AC_DEFINE_TRACE_LITERAL([HAVE_NEWS4]) +m4trace:configure.ac:132: -2- AC_DEFINE_TRACE_LITERAL([HAVE_XATEXIT]) +m4trace:configure.ac:134: -1- AC_CHECK_LIB([iberty], [xatexit], [cat >>confdefs.h <<\_ACEOF @%:@define HAVE_XATEXIT 1 _ACEOF ], [{ { echo "$as_me:__oline__: error: *** libiberty missing - please install first or check config.log ***" >&5 echo "$as_me: error: *** libiberty missing - please install first or check config.log ***" >&2;} { (exit 1); exit 1; }; } ]) -m4trace:configure.ac:145: -1- AC_DEFINE_TRACE_LITERAL([HAVE_NEXT]) -m4trace:configure.ac:146: -1- AC_DEFINE_TRACE_LITERAL([BROKEN_REALPATH]) -m4trace:configure.ac:147: -1- AC_DEFINE_TRACE_LITERAL([USE_PIPES]) -m4trace:configure.ac:148: -1- AC_DEFINE_TRACE_LITERAL([BROKEN_SAVED_UIDS]) -m4trace:configure.ac:156: -1- AC_DEFINE_TRACE_LITERAL([PAM_SUN_CODEBASE]) -m4trace:configure.ac:157: -1- AC_DEFINE_TRACE_LITERAL([LOGIN_NEEDS_UTMPX]) -m4trace:configure.ac:158: -1- AC_DEFINE_TRACE_LITERAL([LOGIN_NEEDS_TERM]) -m4trace:configure.ac:159: -1- AC_DEFINE_TRACE_LITERAL([PAM_TTY_KLUDGE]) -m4trace:configure.ac:166: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_UTMP]) -m4trace:configure.ac:167: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_WTMP]) -m4trace:configure.ac:174: -1- AC_CHECK_FUNCS([getpwanam]) -m4trace:configure.ac:174: -1- AH_OUTPUT([HAVE_GETPWANAM], [/* Define if you have the \`getpwanam' function. */ +m4trace:configure.ac:147: -1- AC_DEFINE_TRACE_LITERAL([HAVE_NEXT]) +m4trace:configure.ac:148: -1- AC_DEFINE_TRACE_LITERAL([BROKEN_REALPATH]) +m4trace:configure.ac:149: -1- AC_DEFINE_TRACE_LITERAL([USE_PIPES]) +m4trace:configure.ac:150: -1- AC_DEFINE_TRACE_LITERAL([BROKEN_SAVED_UIDS]) +m4trace:configure.ac:158: -1- AC_DEFINE_TRACE_LITERAL([PAM_SUN_CODEBASE]) +m4trace:configure.ac:159: -1- AC_DEFINE_TRACE_LITERAL([LOGIN_NEEDS_UTMPX]) +m4trace:configure.ac:160: -1- AC_DEFINE_TRACE_LITERAL([LOGIN_NEEDS_TERM]) +m4trace:configure.ac:161: -1- AC_DEFINE_TRACE_LITERAL([PAM_TTY_KLUDGE]) +m4trace:configure.ac:168: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_UTMP]) +m4trace:configure.ac:169: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_WTMP]) +m4trace:configure.ac:176: -1- AC_CHECK_FUNCS([getpwanam]) +m4trace:configure.ac:176: -1- AH_OUTPUT([HAVE_GETPWANAM], [/* Define if you have the \`getpwanam' function. */ #undef HAVE_GETPWANAM]) -m4trace:configure.ac:175: -1- AC_DEFINE_TRACE_LITERAL([PAM_SUN_CODEBASE]) -m4trace:configure.ac:176: -1- AC_DEFINE_TRACE_LITERAL([HAVE_BOGUS_SYS_QUEUE_H]) -m4trace:configure.ac:180: -1- AC_DEFINE_TRACE_LITERAL([USE_PIPES]) -m4trace:configure.ac:186: -1- AC_DEFINE_TRACE_LITERAL([HAVE_BOGUS_SYS_QUEUE_H]) -m4trace:configure.ac:193: -1- AC_DEFINE_TRACE_LITERAL([USE_PIPES]) -m4trace:configure.ac:194: -1- AC_DEFINE_TRACE_LITERAL([IP_TOS_IS_BROKEN]) -m4trace:configure.ac:195: -1- AC_DEFINE_TRACE_LITERAL([HAVE_BOGUS_SYS_QUEUE_H]) -m4trace:configure.ac:204: -1- AC_DEFINE_TRACE_LITERAL([USE_PIPES]) -m4trace:configure.ac:210: -1- AC_DEFINE_TRACE_LITERAL([USE_PIPES]) -m4trace:configure.ac:223: -1- AC_DEFINE_TRACE_LITERAL([BROKEN_SYS_TERMIO_H]) -m4trace:configure.ac:224: -1- AC_DEFINE_TRACE_LITERAL([USE_PIPES]) -m4trace:configure.ac:225: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SCO_PROTECTED_PW]) -m4trace:configure.ac:226: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_SHADOW]) -m4trace:configure.ac:227: -1- AC_DEFINE_TRACE_LITERAL([HAVE_BOGUS_SYS_QUEUE_H]) -m4trace:configure.ac:228: -1- AC_DEFINE_TRACE_LITERAL([BROKEN_SAVED_UIDS]) -m4trace:configure.ac:229: -1- AC_CHECK_FUNCS([getluid setluid]) -m4trace:configure.ac:229: -1- AH_OUTPUT([HAVE_GETLUID], [/* Define if you have the \`getluid' function. */ +m4trace:configure.ac:177: -1- AC_DEFINE_TRACE_LITERAL([PAM_SUN_CODEBASE]) +m4trace:configure.ac:178: -1- AC_DEFINE_TRACE_LITERAL([HAVE_BOGUS_SYS_QUEUE_H]) +m4trace:configure.ac:182: -1- AC_DEFINE_TRACE_LITERAL([USE_PIPES]) +m4trace:configure.ac:188: -1- AC_DEFINE_TRACE_LITERAL([HAVE_BOGUS_SYS_QUEUE_H]) +m4trace:configure.ac:189: -1- AC_DEFINE_TRACE_LITERAL([USE_PIPES]) +m4trace:configure.ac:196: -1- AC_DEFINE_TRACE_LITERAL([USE_PIPES]) +m4trace:configure.ac:197: -1- AC_DEFINE_TRACE_LITERAL([IP_TOS_IS_BROKEN]) +m4trace:configure.ac:198: -1- AC_DEFINE_TRACE_LITERAL([HAVE_BOGUS_SYS_QUEUE_H]) +m4trace:configure.ac:207: -1- AC_DEFINE_TRACE_LITERAL([USE_PIPES]) +m4trace:configure.ac:213: -1- AC_DEFINE_TRACE_LITERAL([USE_PIPES]) +m4trace:configure.ac:226: -1- AC_DEFINE_TRACE_LITERAL([BROKEN_SYS_TERMIO_H]) +m4trace:configure.ac:227: -1- AC_DEFINE_TRACE_LITERAL([USE_PIPES]) +m4trace:configure.ac:228: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SCO_PROTECTED_PW]) +m4trace:configure.ac:229: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_SHADOW]) +m4trace:configure.ac:230: -1- AC_DEFINE_TRACE_LITERAL([HAVE_BOGUS_SYS_QUEUE_H]) +m4trace:configure.ac:231: -1- AC_DEFINE_TRACE_LITERAL([BROKEN_SAVED_UIDS]) +m4trace:configure.ac:232: -1- AC_CHECK_FUNCS([getluid setluid]) +m4trace:configure.ac:232: -1- AH_OUTPUT([HAVE_GETLUID], [/* Define if you have the \`getluid' function. */ #undef HAVE_GETLUID]) -m4trace:configure.ac:229: -1- AH_OUTPUT([HAVE_SETLUID], [/* Define if you have the \`setluid' function. */ +m4trace:configure.ac:232: -1- AH_OUTPUT([HAVE_SETLUID], [/* Define if you have the \`setluid' function. */ #undef HAVE_SETLUID]) -m4trace:configure.ac:239: -1- AC_DEFINE_TRACE_LITERAL([USE_PIPES]) -m4trace:configure.ac:240: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SCO_PROTECTED_PW]) -m4trace:configure.ac:241: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_SHADOW]) -m4trace:configure.ac:242: -1- AC_DEFINE_TRACE_LITERAL([HAVE_BOGUS_SYS_QUEUE_H]) -m4trace:configure.ac:243: -1- AC_CHECK_FUNCS([getluid setluid]) -m4trace:configure.ac:243: -1- AH_OUTPUT([HAVE_GETLUID], [/* Define if you have the \`getluid' function. */ +m4trace:configure.ac:242: -1- AC_DEFINE_TRACE_LITERAL([USE_PIPES]) +m4trace:configure.ac:243: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SCO_PROTECTED_PW]) +m4trace:configure.ac:244: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_SHADOW]) +m4trace:configure.ac:245: -1- AC_DEFINE_TRACE_LITERAL([HAVE_BOGUS_SYS_QUEUE_H]) +m4trace:configure.ac:246: -1- AC_CHECK_FUNCS([getluid setluid]) +m4trace:configure.ac:246: -1- AH_OUTPUT([HAVE_GETLUID], [/* Define if you have the \`getluid' function. */ #undef HAVE_GETLUID]) -m4trace:configure.ac:243: -1- AH_OUTPUT([HAVE_SETLUID], [/* Define if you have the \`setluid' function. */ +m4trace:configure.ac:246: -1- AH_OUTPUT([HAVE_SETLUID], [/* Define if you have the \`setluid' function. */ #undef HAVE_SETLUID]) -m4trace:configure.ac:249: -1- AC_DEFINE_TRACE_LITERAL([USE_PIPES]) -m4trace:configure.ac:268: -1- AC_DEFINE_TRACE_LITERAL([HAVE_OSF_SIA]) -m4trace:configure.ac:269: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_LOGIN]) -m4trace:configure.ac:278: -1- AC_DEFINE_TRACE_LITERAL([USE_PIPES]) -m4trace:configure.ac:279: -1- AC_DEFINE_TRACE_LITERAL([NO_X11_UNIX_SOCKETS]) -m4trace:configure.ac:280: -1- AC_DEFINE_TRACE_LITERAL([MISSING_NFDBITS]) -m4trace:configure.ac:281: -1- AC_DEFINE_TRACE_LITERAL([MISSING_HOWMANY]) -m4trace:configure.ac:282: -1- AC_DEFINE_TRACE_LITERAL([MISSING_FD_MASK]) -m4trace:configure.ac:358: -2- AC_CHECK_LIB([pcre], [pcre_info], [ - AC_DEFINE(HAVE_LIBPCRE) - LIBS="$LIBS -lpcreposix -lpcre" - no_comp_check=yes], [{ { echo "$as_me:__oline__: error: *** unable to locate pcre library ***" >&5 -echo "$as_me: error: *** unable to locate pcre library ***" >&2;} - { (exit 1); exit 1; }; }]) -m4trace:configure.ac:358: -2- AC_DEFINE_TRACE_LITERAL([HAVE_LIBPCRE]) -m4trace:configure.ac:358: -1- AC_HEADER_STDC -m4trace:configure.ac:358: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS]) -m4trace:configure.ac:358: -1- AH_OUTPUT([STDC_HEADERS], [/* Define if you have the ANSI C header files. */ -#undef STDC_HEADERS]) -m4trace:configure.ac:358: -1- AC_CHECK_HEADERS([sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h], [], [], [$ac_includes_default]) -m4trace:configure.ac:358: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define if you have the header file. */ -#undef HAVE_SYS_TYPES_H]) -m4trace:configure.ac:358: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define if you have the header file. */ -#undef HAVE_SYS_STAT_H]) -m4trace:configure.ac:358: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define if you have the header file. */ -#undef HAVE_STDLIB_H]) -m4trace:configure.ac:358: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define if you have the header file. */ -#undef HAVE_STRING_H]) -m4trace:configure.ac:358: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define if you have the header file. */ -#undef HAVE_MEMORY_H]) -m4trace:configure.ac:358: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define if you have the header file. */ -#undef HAVE_STRINGS_H]) -m4trace:configure.ac:358: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define if you have the header file. */ -#undef HAVE_INTTYPES_H]) -m4trace:configure.ac:358: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define if you have the header file. */ -#undef HAVE_STDINT_H]) -m4trace:configure.ac:358: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define if you have the header file. */ -#undef HAVE_UNISTD_H]) -m4trace:configure.ac:361: -2- AC_CHECK_LIB([nsl], [yp_match]) -m4trace:configure.ac:361: -2- AH_OUTPUT([HAVE_LIBNSL], [/* Define if you have the \`nsl' library (-lnsl). */ -#undef HAVE_LIBNSL]) -m4trace:configure.ac:361: -2- AC_DEFINE_TRACE_LITERAL([HAVE_LIBNSL]) -m4trace:configure.ac:362: -2- AC_CHECK_LIB([socket], [setsockopt]) -m4trace:configure.ac:362: -2- AH_OUTPUT([HAVE_LIBSOCKET], [/* Define if you have the \`socket' library (-lsocket). */ -#undef HAVE_LIBSOCKET]) -m4trace:configure.ac:362: -2- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSOCKET]) -m4trace:configure.ac:367: -1- AC_CHECK_LIB([rpc], [innetgr], [LIBS="-lrpc -lyp -lrpc $LIBS" ], [], [-lyp -lrpc]) -m4trace:configure.ac:372: -2- AC_CHECK_LIB([gen], [getspnam], [LIBS="$LIBS -lgen"]) -m4trace:configure.ac:399: -1- AC_CHECK_LIB([z], [deflate], [], [{ { echo "$as_me:__oline__: 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; }; }]) -m4trace:configure.ac:399: -1- AH_OUTPUT([HAVE_LIBZ], [/* Define if you have the \`z' library (-lz). */ -#undef HAVE_LIBZ]) -m4trace:configure.ac:399: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBZ]) -m4trace:configure.ac:415: -1- AC_DEFINE_TRACE_LITERAL([HAVE_REGCOMP]) -m4trace:configure.ac:415: -1- AC_CHECK_LIB([pcre], [pcre_info], [ - AC_DEFINE(HAVE_LIBPCRE) - LIBS="$LIBS -lpcreposix -lpcre" - ], [ - AC_MSG_ERROR([*** No regex library found.]) - ]) -m4trace:configure.ac:415: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBPCRE]) -m4trace:configure.ac:421: -1- AC_CHECK_LIB([resolv], [strcasecmp], [LIBS="$LIBS -lresolv"]) -m4trace:configure.ac:424: -1- AC_CHECK_LIB([c89], [utimes], [LIBS="$LIBS -lc89"]) -m4trace:configure.ac:427: -1- AC_CHECK_HEADERS([libutil.h]) -m4trace:configure.ac:427: -1- AH_OUTPUT([HAVE_LIBUTIL_H], [/* Define if you have the header file. */ -#undef HAVE_LIBUTIL_H]) -m4trace:configure.ac:428: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LOGIN]) -m4trace:configure.ac:429: -1- AC_CHECK_FUNCS([logout updwtmp logwtmp]) -m4trace:configure.ac:429: -1- AH_OUTPUT([HAVE_LOGOUT], [/* Define if you have the \`logout' function. */ -#undef HAVE_LOGOUT]) -m4trace:configure.ac:429: -1- AH_OUTPUT([HAVE_UPDWTMP], [/* Define if you have the \`updwtmp' function. */ -#undef HAVE_UPDWTMP]) -m4trace:configure.ac:429: -1- AH_OUTPUT([HAVE_LOGWTMP], [/* Define if you have the \`logwtmp' function. */ -#undef HAVE_LOGWTMP]) -m4trace:configure.ac:431: -1- AC_FUNC_STRFTIME -m4trace:configure.ac:431: -1- AC_CHECK_FUNCS([strftime], [], [# strftime is in -lintl on SCO UNIX. -AC_CHECK_LIB(intl, strftime, - [AC_DEFINE(HAVE_STRFTIME) -LIBS="-lintl $LIBS"])]) -m4trace:configure.ac:431: -1- AH_OUTPUT([HAVE_STRFTIME], [/* Define if you have the \`strftime' function. */ -#undef HAVE_STRFTIME]) -m4trace:configure.ac:431: -1- AC_CHECK_LIB([intl], [strftime], [AC_DEFINE(HAVE_STRFTIME) -LIBS="-lintl $LIBS"]) -m4trace:configure.ac:431: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRFTIME]) -m4trace:configure.ac:443: -1- AC_CHECK_HEADERS([bstring.h crypt.h endian.h floatingpoint.h \ +m4trace:configure.ac:252: -1- AC_DEFINE_TRACE_LITERAL([USE_PIPES]) +m4trace:configure.ac:271: -1- AC_DEFINE_TRACE_LITERAL([HAVE_OSF_SIA]) +m4trace:configure.ac:272: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_LOGIN]) +m4trace:configure.ac:281: -1- AC_DEFINE_TRACE_LITERAL([USE_PIPES]) +m4trace:configure.ac:282: -1- AC_DEFINE_TRACE_LITERAL([NO_X11_UNIX_SOCKETS]) +m4trace:configure.ac:283: -1- AC_DEFINE_TRACE_LITERAL([MISSING_NFDBITS]) +m4trace:configure.ac:284: -1- AC_DEFINE_TRACE_LITERAL([MISSING_HOWMANY]) +m4trace:configure.ac:285: -1- AC_DEFINE_TRACE_LITERAL([MISSING_FD_MASK]) +m4trace:configure.ac:333: -1- AC_CHECK_HEADERS([bstring.h crypt.h endian.h floatingpoint.h \ getopt.h glob.h lastlog.h limits.h login.h \ login_cap.h maillock.h netdb.h netgroup.h \ - netinet/in_systm.h paths.h poll.h pty.h regex.h \ + netinet/in_systm.h paths.h poll.h pty.h \ security/pam_appl.h shadow.h stddef.h stdint.h \ strings.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h \ sys/poll.h sys/queue.h sys/select.h sys/stat.h \ sys/stropts.h sys/sysmacros.h sys/time.h \ sys/ttcompat.h sys/un.h time.h ttyent.h usersec.h \ util.h utime.h utmp.h utmpx.h]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_BSTRING_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_BSTRING_H], [/* Define if you have the header file. */ #undef HAVE_BSTRING_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_CRYPT_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_CRYPT_H], [/* Define if you have the header file. */ #undef HAVE_CRYPT_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_ENDIAN_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_ENDIAN_H], [/* Define if you have the header file. */ #undef HAVE_ENDIAN_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_FLOATINGPOINT_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_FLOATINGPOINT_H], [/* Define if you have the header file. */ #undef HAVE_FLOATINGPOINT_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_GETOPT_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_GETOPT_H], [/* Define if you have the header file. */ #undef HAVE_GETOPT_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_GLOB_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_GLOB_H], [/* Define if you have the header file. */ #undef HAVE_GLOB_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_LASTLOG_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_LASTLOG_H], [/* Define if you have the header file. */ #undef HAVE_LASTLOG_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_LIMITS_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_LIMITS_H], [/* Define if you have the header file. */ #undef HAVE_LIMITS_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_LOGIN_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_LOGIN_H], [/* Define if you have the header file. */ #undef HAVE_LOGIN_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_LOGIN_CAP_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_LOGIN_CAP_H], [/* Define if you have the header file. */ #undef HAVE_LOGIN_CAP_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_MAILLOCK_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_MAILLOCK_H], [/* Define if you have the header file. */ #undef HAVE_MAILLOCK_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_NETDB_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_NETDB_H], [/* Define if you have the header file. */ #undef HAVE_NETDB_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_NETGROUP_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_NETGROUP_H], [/* Define if you have the header file. */ #undef HAVE_NETGROUP_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_NETINET_IN_SYSTM_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_NETINET_IN_SYSTM_H], [/* Define if you have the header file. */ #undef HAVE_NETINET_IN_SYSTM_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_PATHS_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_PATHS_H], [/* Define if you have the header file. */ #undef HAVE_PATHS_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_POLL_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_POLL_H], [/* Define if you have the header file. */ #undef HAVE_POLL_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_PTY_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_PTY_H], [/* Define if you have the header file. */ #undef HAVE_PTY_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_REGEX_H], [/* Define if you have the header file. */ -#undef HAVE_REGEX_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_SECURITY_PAM_APPL_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_SECURITY_PAM_APPL_H], [/* Define if you have the header file. */ #undef HAVE_SECURITY_PAM_APPL_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_SHADOW_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_SHADOW_H], [/* Define if you have the header file. */ #undef HAVE_SHADOW_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_STDDEF_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_STDDEF_H], [/* Define if you have the header file. */ #undef HAVE_STDDEF_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define if you have the header file. */ #undef HAVE_STDINT_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define if you have the header file. */ #undef HAVE_STRINGS_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_SYS_BITYPES_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_SYS_BITYPES_H], [/* Define if you have the header file. */ #undef HAVE_SYS_BITYPES_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_SYS_BSDTTY_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_SYS_BSDTTY_H], [/* Define if you have the header file. */ #undef HAVE_SYS_BSDTTY_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_SYS_CDEFS_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_SYS_CDEFS_H], [/* Define if you have the header file. */ #undef HAVE_SYS_CDEFS_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_SYS_POLL_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_SYS_POLL_H], [/* Define if you have the header file. */ #undef HAVE_SYS_POLL_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_SYS_QUEUE_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_SYS_QUEUE_H], [/* Define if you have the header file. */ #undef HAVE_SYS_QUEUE_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_SYS_SELECT_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_SYS_SELECT_H], [/* Define if you have the header file. */ #undef HAVE_SYS_SELECT_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define if you have the header file. */ #undef HAVE_SYS_STAT_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_SYS_STROPTS_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_SYS_STROPTS_H], [/* Define if you have the header file. */ #undef HAVE_SYS_STROPTS_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_SYS_SYSMACROS_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_SYS_SYSMACROS_H], [/* Define if you have the header file. */ #undef HAVE_SYS_SYSMACROS_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_SYS_TIME_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_SYS_TIME_H], [/* Define if you have the header file. */ #undef HAVE_SYS_TIME_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_SYS_TTCOMPAT_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_SYS_TTCOMPAT_H], [/* Define if you have the header file. */ #undef HAVE_SYS_TTCOMPAT_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_SYS_UN_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_SYS_UN_H], [/* Define if you have the header file. */ #undef HAVE_SYS_UN_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_TIME_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_TIME_H], [/* Define if you have the header file. */ #undef HAVE_TIME_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_TTYENT_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_TTYENT_H], [/* Define if you have the header file. */ #undef HAVE_TTYENT_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_USERSEC_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_USERSEC_H], [/* Define if you have the header file. */ #undef HAVE_USERSEC_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_UTIL_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_UTIL_H], [/* Define if you have the header file. */ #undef HAVE_UTIL_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_UTIME_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_UTIME_H], [/* Define if you have the header file. */ #undef HAVE_UTIME_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_UTMP_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_UTMP_H], [/* Define if you have the header file. */ #undef HAVE_UTMP_H]) -m4trace:configure.ac:443: -1- AH_OUTPUT([HAVE_UTMPX_H], [/* Define if you have the header file. */ +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_UTMPX_H], [/* Define if you have the header file. */ #undef HAVE_UTMPX_H]) -m4trace:configure.ac:461: -1- AC_DEFINE_TRACE_LITERAL([GLOB_HAS_ALTDIRFUNC]) -m4trace:configure.ac:477: -1- AC_DEFINE_TRACE_LITERAL([GLOB_HAS_GL_MATCHC]) -m4trace:configure.ac:491: -1- AC_DEFINE_TRACE_LITERAL([BROKEN_ONE_BYTE_DIRENT_D_NAME]) -m4trace:configure.ac:517: -1- AC_DEFINE_TRACE_LITERAL([SKEY]) -m4trace:configure.ac:568: -1- AC_DEFINE_TRACE_LITERAL([LIBWRAP]) -m4trace:configure.ac:581: -1- AC_CHECK_FUNCS([arc4random atexit b64_ntop bcopy bindresvport_sa \ +m4trace:configure.ac:333: -1- AC_HEADER_STDC +m4trace:configure.ac:333: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS]) +m4trace:configure.ac:333: -1- AH_OUTPUT([STDC_HEADERS], [/* Define if you have the ANSI C header files. */ +#undef STDC_HEADERS]) +m4trace:configure.ac:333: -1- AC_CHECK_HEADERS([sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h], [], [], [$ac_includes_default]) +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define if you have the header file. */ +#undef HAVE_SYS_TYPES_H]) +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define if you have the header file. */ +#undef HAVE_SYS_STAT_H]) +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define if you have the header file. */ +#undef HAVE_STDLIB_H]) +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define if you have the header file. */ +#undef HAVE_STRING_H]) +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define if you have the header file. */ +#undef HAVE_MEMORY_H]) +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define if you have the header file. */ +#undef HAVE_STRINGS_H]) +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define if you have the header file. */ +#undef HAVE_INTTYPES_H]) +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define if you have the header file. */ +#undef HAVE_STDINT_H]) +m4trace:configure.ac:333: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define if you have the header file. */ +#undef HAVE_UNISTD_H]) +m4trace:configure.ac:336: -2- AC_CHECK_LIB([nsl], [yp_match]) +m4trace:configure.ac:336: -2- AH_OUTPUT([HAVE_LIBNSL], [/* Define if you have the \`nsl' library (-lnsl). */ +#undef HAVE_LIBNSL]) +m4trace:configure.ac:336: -2- AC_DEFINE_TRACE_LITERAL([HAVE_LIBNSL]) +m4trace:configure.ac:337: -2- AC_CHECK_LIB([socket], [setsockopt]) +m4trace:configure.ac:337: -2- AH_OUTPUT([HAVE_LIBSOCKET], [/* Define if you have the \`socket' library (-lsocket). */ +#undef HAVE_LIBSOCKET]) +m4trace:configure.ac:337: -2- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSOCKET]) +m4trace:configure.ac:342: -1- AC_CHECK_LIB([rpc], [innetgr], [LIBS="-lrpc -lyp -lrpc $LIBS" ], [], [-lyp -lrpc]) +m4trace:configure.ac:347: -2- AC_CHECK_LIB([gen], [getspnam], [LIBS="$LIBS -lgen"]) +m4trace:configure.ac:389: -1- AC_CHECK_LIB([z], [deflate], [], [{ { echo "$as_me:__oline__: 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; }; }]) +m4trace:configure.ac:389: -1- AH_OUTPUT([HAVE_LIBZ], [/* Define if you have the \`z' library (-lz). */ +#undef HAVE_LIBZ]) +m4trace:configure.ac:389: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBZ]) +m4trace:configure.ac:394: -1- AC_CHECK_LIB([resolv], [strcasecmp], [LIBS="$LIBS -lresolv"]) +m4trace:configure.ac:397: -1- AC_CHECK_LIB([c89], [utimes], [LIBS="$LIBS -lc89"]) +m4trace:configure.ac:400: -1- AC_CHECK_HEADERS([libutil.h]) +m4trace:configure.ac:400: -1- AH_OUTPUT([HAVE_LIBUTIL_H], [/* Define if you have the header file. */ +#undef HAVE_LIBUTIL_H]) +m4trace:configure.ac:401: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LOGIN]) +m4trace:configure.ac:402: -1- AC_CHECK_FUNCS([logout updwtmp logwtmp]) +m4trace:configure.ac:402: -1- AH_OUTPUT([HAVE_LOGOUT], [/* Define if you have the \`logout' function. */ +#undef HAVE_LOGOUT]) +m4trace:configure.ac:402: -1- AH_OUTPUT([HAVE_UPDWTMP], [/* Define if you have the \`updwtmp' function. */ +#undef HAVE_UPDWTMP]) +m4trace:configure.ac:402: -1- AH_OUTPUT([HAVE_LOGWTMP], [/* Define if you have the \`logwtmp' function. */ +#undef HAVE_LOGWTMP]) +m4trace:configure.ac:404: -1- AC_FUNC_STRFTIME +m4trace:configure.ac:404: -1- AC_CHECK_FUNCS([strftime], [], [# strftime is in -lintl on SCO UNIX. +AC_CHECK_LIB(intl, strftime, + [AC_DEFINE(HAVE_STRFTIME) +LIBS="-lintl $LIBS"])]) +m4trace:configure.ac:404: -1- AH_OUTPUT([HAVE_STRFTIME], [/* Define if you have the \`strftime' function. */ +#undef HAVE_STRFTIME]) +m4trace:configure.ac:404: -1- AC_CHECK_LIB([intl], [strftime], [AC_DEFINE(HAVE_STRFTIME) +LIBS="-lintl $LIBS"]) +m4trace:configure.ac:404: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRFTIME]) +m4trace:configure.ac:422: -1- AC_DEFINE_TRACE_LITERAL([GLOB_HAS_ALTDIRFUNC]) +m4trace:configure.ac:438: -1- AC_DEFINE_TRACE_LITERAL([GLOB_HAS_GL_MATCHC]) +m4trace:configure.ac:452: -1- AC_DEFINE_TRACE_LITERAL([BROKEN_ONE_BYTE_DIRENT_D_NAME]) +m4trace:configure.ac:485: -1- AC_DEFINE_TRACE_LITERAL([SKEY]) +m4trace:configure.ac:539: -1- AC_DEFINE_TRACE_LITERAL([LIBWRAP]) +m4trace:configure.ac:539: -1- AC_SUBST([LIBWRAP]) +m4trace:configure.ac:552: -1- AC_CHECK_FUNCS([arc4random atexit b64_ntop bcopy bindresvport_sa \ clock fchmod fchown freeaddrinfo futimes gai_strerror \ getaddrinfo getcwd getgrouplist getnameinfo getopt \ getrlimit getrusage getttyent glob inet_aton inet_ntoa \ @@ -372,127 +359,127 @@ setsid setvbuf sigaction sigvec snprintf strerror \ strlcat strlcpy strmode strsep sysconf tcgetpgrp utimes \ vhangup vsnprintf waitpid __b64_ntop _getpty]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_ARC4RANDOM], [/* Define if you have the \`arc4random' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_ARC4RANDOM], [/* Define if you have the \`arc4random' function. */ #undef HAVE_ARC4RANDOM]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_ATEXIT], [/* Define if you have the \`atexit' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_ATEXIT], [/* Define if you have the \`atexit' function. */ #undef HAVE_ATEXIT]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_B64_NTOP], [/* Define if you have the \`b64_ntop' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_B64_NTOP], [/* Define if you have the \`b64_ntop' function. */ #undef HAVE_B64_NTOP]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_BCOPY], [/* Define if you have the \`bcopy' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_BCOPY], [/* Define if you have the \`bcopy' function. */ #undef HAVE_BCOPY]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_BINDRESVPORT_SA], [/* Define if you have the \`bindresvport_sa' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_BINDRESVPORT_SA], [/* Define if you have the \`bindresvport_sa' function. */ #undef HAVE_BINDRESVPORT_SA]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_CLOCK], [/* Define if you have the \`clock' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_CLOCK], [/* Define if you have the \`clock' function. */ #undef HAVE_CLOCK]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_FCHMOD], [/* Define if you have the \`fchmod' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_FCHMOD], [/* Define if you have the \`fchmod' function. */ #undef HAVE_FCHMOD]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_FCHOWN], [/* Define if you have the \`fchown' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_FCHOWN], [/* Define if you have the \`fchown' function. */ #undef HAVE_FCHOWN]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_FREEADDRINFO], [/* Define if you have the \`freeaddrinfo' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_FREEADDRINFO], [/* Define if you have the \`freeaddrinfo' function. */ #undef HAVE_FREEADDRINFO]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_FUTIMES], [/* Define if you have the \`futimes' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_FUTIMES], [/* Define if you have the \`futimes' function. */ #undef HAVE_FUTIMES]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_GAI_STRERROR], [/* Define if you have the \`gai_strerror' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_GAI_STRERROR], [/* Define if you have the \`gai_strerror' function. */ #undef HAVE_GAI_STRERROR]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_GETADDRINFO], [/* Define if you have the \`getaddrinfo' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_GETADDRINFO], [/* Define if you have the \`getaddrinfo' function. */ #undef HAVE_GETADDRINFO]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_GETCWD], [/* Define if you have the \`getcwd' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_GETCWD], [/* Define if you have the \`getcwd' function. */ #undef HAVE_GETCWD]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_GETGROUPLIST], [/* Define if you have the \`getgrouplist' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_GETGROUPLIST], [/* Define if you have the \`getgrouplist' function. */ #undef HAVE_GETGROUPLIST]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_GETNAMEINFO], [/* Define if you have the \`getnameinfo' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_GETNAMEINFO], [/* Define if you have the \`getnameinfo' function. */ #undef HAVE_GETNAMEINFO]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_GETOPT], [/* Define if you have the \`getopt' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_GETOPT], [/* Define if you have the \`getopt' function. */ #undef HAVE_GETOPT]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_GETRLIMIT], [/* Define if you have the \`getrlimit' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_GETRLIMIT], [/* Define if you have the \`getrlimit' function. */ #undef HAVE_GETRLIMIT]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_GETRUSAGE], [/* Define if you have the \`getrusage' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_GETRUSAGE], [/* Define if you have the \`getrusage' function. */ #undef HAVE_GETRUSAGE]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_GETTTYENT], [/* Define if you have the \`getttyent' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_GETTTYENT], [/* Define if you have the \`getttyent' function. */ #undef HAVE_GETTTYENT]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_GLOB], [/* Define if you have the \`glob' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_GLOB], [/* Define if you have the \`glob' function. */ #undef HAVE_GLOB]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_INET_ATON], [/* Define if you have the \`inet_aton' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_INET_ATON], [/* Define if you have the \`inet_aton' function. */ #undef HAVE_INET_ATON]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_INET_NTOA], [/* Define if you have the \`inet_ntoa' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_INET_NTOA], [/* Define if you have the \`inet_ntoa' function. */ #undef HAVE_INET_NTOA]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_INET_NTOP], [/* Define if you have the \`inet_ntop' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_INET_NTOP], [/* Define if you have the \`inet_ntop' function. */ #undef HAVE_INET_NTOP]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_INNETGR], [/* Define if you have the \`innetgr' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_INNETGR], [/* Define if you have the \`innetgr' function. */ #undef HAVE_INNETGR]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_LOGIN_GETCAPBOOL], [/* Define if you have the \`login_getcapbool' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_LOGIN_GETCAPBOOL], [/* Define if you have the \`login_getcapbool' function. */ #undef HAVE_LOGIN_GETCAPBOOL]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_MD5_CRYPT], [/* Define if you have the \`md5_crypt' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_MD5_CRYPT], [/* Define if you have the \`md5_crypt' function. */ #undef HAVE_MD5_CRYPT]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_MEMMOVE], [/* Define if you have the \`memmove' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_MEMMOVE], [/* Define if you have the \`memmove' function. */ #undef HAVE_MEMMOVE]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_MKDTEMP], [/* Define if you have the \`mkdtemp' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_MKDTEMP], [/* Define if you have the \`mkdtemp' function. */ #undef HAVE_MKDTEMP]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_ON_EXIT], [/* Define if you have the \`on_exit' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_ON_EXIT], [/* Define if you have the \`on_exit' function. */ #undef HAVE_ON_EXIT]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_OPENPTY], [/* Define if you have the \`openpty' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_OPENPTY], [/* Define if you have the \`openpty' function. */ #undef HAVE_OPENPTY]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_READPASSPHRASE], [/* Define if you have the \`readpassphrase' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_READPASSPHRASE], [/* Define if you have the \`readpassphrase' function. */ #undef HAVE_READPASSPHRASE]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_REALPATH], [/* Define if you have the \`realpath' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_REALPATH], [/* Define if you have the \`realpath' function. */ #undef HAVE_REALPATH]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_RRESVPORT_AF], [/* Define if you have the \`rresvport_af' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_RRESVPORT_AF], [/* Define if you have the \`rresvport_af' function. */ #undef HAVE_RRESVPORT_AF]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_SETDTABLESIZE], [/* Define if you have the \`setdtablesize' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_SETDTABLESIZE], [/* Define if you have the \`setdtablesize' function. */ #undef HAVE_SETDTABLESIZE]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_SETEGID], [/* Define if you have the \`setegid' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_SETEGID], [/* Define if you have the \`setegid' function. */ #undef HAVE_SETEGID]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_SETENV], [/* Define if you have the \`setenv' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_SETENV], [/* Define if you have the \`setenv' function. */ #undef HAVE_SETENV]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_SETEUID], [/* Define if you have the \`seteuid' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_SETEUID], [/* Define if you have the \`seteuid' function. */ #undef HAVE_SETEUID]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_SETLOGIN], [/* Define if you have the \`setlogin' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_SETLOGIN], [/* Define if you have the \`setlogin' function. */ #undef HAVE_SETLOGIN]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_SETPROCTITLE], [/* Define if you have the \`setproctitle' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_SETPROCTITLE], [/* Define if you have the \`setproctitle' function. */ #undef HAVE_SETPROCTITLE]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_SETRESGID], [/* Define if you have the \`setresgid' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_SETRESGID], [/* Define if you have the \`setresgid' function. */ #undef HAVE_SETRESGID]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_SETREUID], [/* Define if you have the \`setreuid' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_SETREUID], [/* Define if you have the \`setreuid' function. */ #undef HAVE_SETREUID]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_SETRLIMIT], [/* Define if you have the \`setrlimit' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_SETRLIMIT], [/* Define if you have the \`setrlimit' function. */ #undef HAVE_SETRLIMIT]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_SETSID], [/* Define if you have the \`setsid' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_SETSID], [/* Define if you have the \`setsid' function. */ #undef HAVE_SETSID]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_SETVBUF], [/* Define if you have the \`setvbuf' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_SETVBUF], [/* Define if you have the \`setvbuf' function. */ #undef HAVE_SETVBUF]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_SIGACTION], [/* Define if you have the \`sigaction' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_SIGACTION], [/* Define if you have the \`sigaction' function. */ #undef HAVE_SIGACTION]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_SIGVEC], [/* Define if you have the \`sigvec' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_SIGVEC], [/* Define if you have the \`sigvec' function. */ #undef HAVE_SIGVEC]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_SNPRINTF], [/* Define if you have the \`snprintf' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_SNPRINTF], [/* Define if you have the \`snprintf' function. */ #undef HAVE_SNPRINTF]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_STRERROR], [/* Define if you have the \`strerror' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_STRERROR], [/* Define if you have the \`strerror' function. */ #undef HAVE_STRERROR]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_STRLCAT], [/* Define if you have the \`strlcat' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_STRLCAT], [/* Define if you have the \`strlcat' function. */ #undef HAVE_STRLCAT]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_STRLCPY], [/* Define if you have the \`strlcpy' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_STRLCPY], [/* Define if you have the \`strlcpy' function. */ #undef HAVE_STRLCPY]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_STRMODE], [/* Define if you have the \`strmode' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_STRMODE], [/* Define if you have the \`strmode' function. */ #undef HAVE_STRMODE]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_STRSEP], [/* Define if you have the \`strsep' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_STRSEP], [/* Define if you have the \`strsep' function. */ #undef HAVE_STRSEP]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_SYSCONF], [/* Define if you have the \`sysconf' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_SYSCONF], [/* Define if you have the \`sysconf' function. */ #undef HAVE_SYSCONF]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_TCGETPGRP], [/* Define if you have the \`tcgetpgrp' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_TCGETPGRP], [/* Define if you have the \`tcgetpgrp' function. */ #undef HAVE_TCGETPGRP]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_UTIMES], [/* Define if you have the \`utimes' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_UTIMES], [/* Define if you have the \`utimes' function. */ #undef HAVE_UTIMES]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_VHANGUP], [/* Define if you have the \`vhangup' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_VHANGUP], [/* Define if you have the \`vhangup' function. */ #undef HAVE_VHANGUP]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_VSNPRINTF], [/* Define if you have the \`vsnprintf' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_VSNPRINTF], [/* Define if you have the \`vsnprintf' function. */ #undef HAVE_VSNPRINTF]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE_WAITPID], [/* Define if you have the \`waitpid' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE_WAITPID], [/* Define if you have the \`waitpid' function. */ #undef HAVE_WAITPID]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE___B64_NTOP], [/* Define if you have the \`__b64_ntop' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE___B64_NTOP], [/* Define if you have the \`__b64_ntop' function. */ #undef HAVE___B64_NTOP]) -m4trace:configure.ac:581: -1- AH_OUTPUT([HAVE__GETPTY], [/* Define if you have the \`_getpty' function. */ +m4trace:configure.ac:552: -1- AH_OUTPUT([HAVE__GETPTY], [/* Define if you have the \`_getpty' function. */ #undef HAVE__GETPTY]) -m4trace:configure.ac:618: -1- AC_CHECK_FUNCS([dirname], [AC_CHECK_HEADERS(libgen.h) ], [ +m4trace:configure.ac:589: -1- AC_CHECK_FUNCS([dirname], [AC_CHECK_HEADERS(libgen.h) ], [ AC_CHECK_LIB(gen, dirname,[ AC_CACHE_CHECK([for broken dirname], ac_cv_have_broken_dirname, [ @@ -527,12 +514,12 @@ fi ]) ]) -m4trace:configure.ac:618: -1- AH_OUTPUT([HAVE_DIRNAME], [/* Define if you have the \`dirname' function. */ +m4trace:configure.ac:589: -1- AH_OUTPUT([HAVE_DIRNAME], [/* Define if you have the \`dirname' function. */ #undef HAVE_DIRNAME]) -m4trace:configure.ac:618: -1- AC_CHECK_HEADERS([libgen.h]) -m4trace:configure.ac:618: -1- AH_OUTPUT([HAVE_LIBGEN_H], [/* Define if you have the header file. */ +m4trace:configure.ac:589: -1- AC_CHECK_HEADERS([libgen.h]) +m4trace:configure.ac:589: -1- AH_OUTPUT([HAVE_LIBGEN_H], [/* Define if you have the header file. */ #undef HAVE_LIBGEN_H]) -m4trace:configure.ac:618: -1- AC_CHECK_LIB([gen], [dirname], [ +m4trace:configure.ac:589: -1- AC_CHECK_LIB([gen], [dirname], [ AC_CACHE_CHECK([for broken dirname], ac_cv_have_broken_dirname, [ save_LIBS="$LIBS" @@ -565,265 +552,271 @@ AC_CHECK_HEADERS(libgen.h) fi ]) -m4trace:configure.ac:618: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DIRNAME]) -m4trace:configure.ac:618: -1- AC_CHECK_HEADERS([libgen.h]) -m4trace:configure.ac:618: -1- AH_OUTPUT([HAVE_LIBGEN_H], [/* Define if you have the header file. */ +m4trace:configure.ac:589: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DIRNAME]) +m4trace:configure.ac:589: -1- AC_CHECK_HEADERS([libgen.h]) +m4trace:configure.ac:589: -1- AH_OUTPUT([HAVE_LIBGEN_H], [/* Define if you have the header file. */ #undef HAVE_LIBGEN_H]) -m4trace:configure.ac:621: -1- AC_CHECK_FUNCS([gettimeofday time]) -m4trace:configure.ac:621: -1- AH_OUTPUT([HAVE_GETTIMEOFDAY], [/* Define if you have the \`gettimeofday' function. */ +m4trace:configure.ac:592: -1- AC_CHECK_FUNCS([gettimeofday time]) +m4trace:configure.ac:592: -1- AH_OUTPUT([HAVE_GETTIMEOFDAY], [/* Define if you have the \`gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY]) -m4trace:configure.ac:621: -1- AH_OUTPUT([HAVE_TIME], [/* Define if you have the \`time' function. */ +m4trace:configure.ac:592: -1- AH_OUTPUT([HAVE_TIME], [/* Define if you have the \`time' function. */ #undef HAVE_TIME]) -m4trace:configure.ac:623: -1- AC_CHECK_FUNCS([endutent getutent getutid getutline pututline setutent]) -m4trace:configure.ac:623: -1- AH_OUTPUT([HAVE_ENDUTENT], [/* Define if you have the \`endutent' function. */ +m4trace:configure.ac:594: -1- AC_CHECK_FUNCS([endutent getutent getutid getutline pututline setutent]) +m4trace:configure.ac:594: -1- AH_OUTPUT([HAVE_ENDUTENT], [/* Define if you have the \`endutent' function. */ #undef HAVE_ENDUTENT]) -m4trace:configure.ac:623: -1- AH_OUTPUT([HAVE_GETUTENT], [/* Define if you have the \`getutent' function. */ +m4trace:configure.ac:594: -1- AH_OUTPUT([HAVE_GETUTENT], [/* Define if you have the \`getutent' function. */ #undef HAVE_GETUTENT]) -m4trace:configure.ac:623: -1- AH_OUTPUT([HAVE_GETUTID], [/* Define if you have the \`getutid' function. */ +m4trace:configure.ac:594: -1- AH_OUTPUT([HAVE_GETUTID], [/* Define if you have the \`getutid' function. */ #undef HAVE_GETUTID]) -m4trace:configure.ac:623: -1- AH_OUTPUT([HAVE_GETUTLINE], [/* Define if you have the \`getutline' function. */ +m4trace:configure.ac:594: -1- AH_OUTPUT([HAVE_GETUTLINE], [/* Define if you have the \`getutline' function. */ #undef HAVE_GETUTLINE]) -m4trace:configure.ac:623: -1- AH_OUTPUT([HAVE_PUTUTLINE], [/* Define if you have the \`pututline' function. */ +m4trace:configure.ac:594: -1- AH_OUTPUT([HAVE_PUTUTLINE], [/* Define if you have the \`pututline' function. */ #undef HAVE_PUTUTLINE]) -m4trace:configure.ac:623: -1- AH_OUTPUT([HAVE_SETUTENT], [/* Define if you have the \`setutent' function. */ +m4trace:configure.ac:594: -1- AH_OUTPUT([HAVE_SETUTENT], [/* Define if you have the \`setutent' function. */ #undef HAVE_SETUTENT]) -m4trace:configure.ac:624: -1- AC_CHECK_FUNCS([utmpname]) -m4trace:configure.ac:624: -1- AH_OUTPUT([HAVE_UTMPNAME], [/* Define if you have the \`utmpname' function. */ +m4trace:configure.ac:595: -1- AC_CHECK_FUNCS([utmpname]) +m4trace:configure.ac:595: -1- AH_OUTPUT([HAVE_UTMPNAME], [/* Define if you have the \`utmpname' function. */ #undef HAVE_UTMPNAME]) -m4trace:configure.ac:626: -1- AC_CHECK_FUNCS([endutxent getutxent getutxid getutxline pututxline ]) -m4trace:configure.ac:626: -1- AH_OUTPUT([HAVE_ENDUTXENT], [/* Define if you have the \`endutxent' function. */ +m4trace:configure.ac:597: -1- AC_CHECK_FUNCS([endutxent getutxent getutxid getutxline pututxline ]) +m4trace:configure.ac:597: -1- AH_OUTPUT([HAVE_ENDUTXENT], [/* Define if you have the \`endutxent' function. */ #undef HAVE_ENDUTXENT]) -m4trace:configure.ac:626: -1- AH_OUTPUT([HAVE_GETUTXENT], [/* Define if you have the \`getutxent' function. */ +m4trace:configure.ac:597: -1- AH_OUTPUT([HAVE_GETUTXENT], [/* Define if you have the \`getutxent' function. */ #undef HAVE_GETUTXENT]) -m4trace:configure.ac:626: -1- AH_OUTPUT([HAVE_GETUTXID], [/* Define if you have the \`getutxid' function. */ +m4trace:configure.ac:597: -1- AH_OUTPUT([HAVE_GETUTXID], [/* Define if you have the \`getutxid' function. */ #undef HAVE_GETUTXID]) -m4trace:configure.ac:626: -1- AH_OUTPUT([HAVE_GETUTXLINE], [/* Define if you have the \`getutxline' function. */ +m4trace:configure.ac:597: -1- AH_OUTPUT([HAVE_GETUTXLINE], [/* Define if you have the \`getutxline' function. */ #undef HAVE_GETUTXLINE]) -m4trace:configure.ac:626: -1- AH_OUTPUT([HAVE_PUTUTXLINE], [/* Define if you have the \`pututxline' function. */ +m4trace:configure.ac:597: -1- AH_OUTPUT([HAVE_PUTUTXLINE], [/* Define if you have the \`pututxline' function. */ #undef HAVE_PUTUTXLINE]) -m4trace:configure.ac:627: -1- AC_CHECK_FUNCS([setutxent utmpxname]) -m4trace:configure.ac:627: -1- AH_OUTPUT([HAVE_SETUTXENT], [/* Define if you have the \`setutxent' function. */ +m4trace:configure.ac:598: -1- AC_CHECK_FUNCS([setutxent utmpxname]) +m4trace:configure.ac:598: -1- AH_OUTPUT([HAVE_SETUTXENT], [/* Define if you have the \`setutxent' function. */ #undef HAVE_SETUTXENT]) -m4trace:configure.ac:627: -1- AH_OUTPUT([HAVE_UTMPXNAME], [/* Define if you have the \`utmpxname' function. */ +m4trace:configure.ac:598: -1- AH_OUTPUT([HAVE_UTMPXNAME], [/* Define if you have the \`utmpxname' function. */ #undef HAVE_UTMPXNAME]) -m4trace:configure.ac:632: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETUSERATTR]) -m4trace:configure.ac:632: -1- AC_CHECK_LIB([s], [getuserattr], [LIBS="$LIBS -ls"; AC_DEFINE(HAVE_GETUSERATTR)]) -m4trace:configure.ac:632: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETUSERATTR]) -m4trace:configure.ac:637: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DAEMON]) -m4trace:configure.ac:637: -1- AC_CHECK_LIB([bsd], [daemon], [LIBS="$LIBS -lbsd"; AC_DEFINE(HAVE_DAEMON)]) -m4trace:configure.ac:637: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DAEMON]) -m4trace:configure.ac:642: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETPAGESIZE]) -m4trace:configure.ac:642: -1- AC_CHECK_LIB([ucb], [getpagesize], [LIBS="$LIBS -lucb"; AC_DEFINE(HAVE_GETPAGESIZE)]) -m4trace:configure.ac:642: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETPAGESIZE]) -m4trace:configure.ac:658: -1- AC_DEFINE_TRACE_LITERAL([BROKEN_SNPRINTF]) -m4trace:configure.ac:661: -1- AC_FUNC_GETPGRP -m4trace:configure.ac:661: -1- AC_DEFINE_TRACE_LITERAL([GETPGRP_VOID]) -m4trace:configure.ac:661: -1- AH_OUTPUT([GETPGRP_VOID], [/* Define if the \`getpgrp' function takes no argument. */ +m4trace:configure.ac:603: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETUSERATTR]) +m4trace:configure.ac:603: -1- AC_CHECK_LIB([s], [getuserattr], [LIBS="$LIBS -ls"; AC_DEFINE(HAVE_GETUSERATTR)]) +m4trace:configure.ac:603: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETUSERATTR]) +m4trace:configure.ac:608: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DAEMON]) +m4trace:configure.ac:608: -1- AC_CHECK_LIB([bsd], [daemon], [LIBS="$LIBS -lbsd"; AC_DEFINE(HAVE_DAEMON)]) +m4trace:configure.ac:608: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DAEMON]) +m4trace:configure.ac:613: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETPAGESIZE]) +m4trace:configure.ac:613: -1- AC_CHECK_LIB([ucb], [getpagesize], [LIBS="$LIBS -lucb"; AC_DEFINE(HAVE_GETPAGESIZE)]) +m4trace:configure.ac:613: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETPAGESIZE]) +m4trace:configure.ac:629: -1- AC_DEFINE_TRACE_LITERAL([BROKEN_SNPRINTF]) +m4trace:configure.ac:632: -1- AC_FUNC_GETPGRP +m4trace:configure.ac:632: -1- AC_DEFINE_TRACE_LITERAL([GETPGRP_VOID]) +m4trace:configure.ac:632: -1- AH_OUTPUT([GETPGRP_VOID], [/* Define if the \`getpgrp' function takes no argument. */ #undef GETPGRP_VOID]) -m4trace:configure.ac:683: -1- AC_CHECK_LIB([dl], [dlopen], [], []) -m4trace:configure.ac:683: -1- AH_OUTPUT([HAVE_LIBDL], [/* Define if you have the \`dl' library (-ldl). */ +m4trace:configure.ac:660: -1- AC_CHECK_LIB([dl], [dlopen], [], []) +m4trace:configure.ac:660: -1- AH_OUTPUT([HAVE_LIBDL], [/* Define if you have the \`dl' library (-ldl). */ #undef HAVE_LIBDL]) -m4trace:configure.ac:683: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDL]) -m4trace:configure.ac:683: -1- AC_CHECK_LIB([pam], [pam_set_item], [], [{ { echo "$as_me:__oline__: error: *** libpam missing" >&5 +m4trace:configure.ac:660: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDL]) +m4trace:configure.ac:660: -1- AC_CHECK_LIB([pam], [pam_set_item], [], [{ { echo "$as_me:__oline__: error: *** libpam missing" >&5 echo "$as_me: error: *** libpam missing" >&2;} { (exit 1); exit 1; }; }]) -m4trace:configure.ac:683: -1- AH_OUTPUT([HAVE_LIBPAM], [/* Define if you have the \`pam' library (-lpam). */ +m4trace:configure.ac:660: -1- AH_OUTPUT([HAVE_LIBPAM], [/* Define if you have the \`pam' library (-lpam). */ #undef HAVE_LIBPAM]) -m4trace:configure.ac:683: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBPAM]) -m4trace:configure.ac:683: -1- AC_CHECK_FUNCS([pam_getenvlist]) -m4trace:configure.ac:683: -1- AH_OUTPUT([HAVE_PAM_GETENVLIST], [/* Define if you have the \`pam_getenvlist' function. */ +m4trace:configure.ac:660: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBPAM]) +m4trace:configure.ac:660: -1- AC_CHECK_FUNCS([pam_getenvlist]) +m4trace:configure.ac:660: -1- AH_OUTPUT([HAVE_PAM_GETENVLIST], [/* Define if you have the \`pam_getenvlist' function. */ #undef HAVE_PAM_GETENVLIST]) -m4trace:configure.ac:683: -1- AC_DEFINE_TRACE_LITERAL([USE_PAM]) -m4trace:configure.ac:701: -1- AC_DEFINE_TRACE_LITERAL([HAVE_OLD_PAM]) -m4trace:configure.ac:789: -1- AC_DEFINE_TRACE_LITERAL([HAVE_OPENSSL]) -m4trace:configure.ac:871: -1- AC_CHECK_LIB([crypt], [crypt], [LIBS="$LIBS -lcrypt"]) -m4trace:configure.ac:880: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_CHAR]) -m4trace:configure.ac:880: -1- AH_OUTPUT([SIZEOF_CHAR], [/* The size of a \`char', as computed by sizeof. */ +m4trace:configure.ac:660: -1- AC_DEFINE_TRACE_LITERAL([USE_PAM]) +m4trace:configure.ac:660: -1- AC_SUBST([LIBPAM]) +m4trace:configure.ac:678: -1- AC_DEFINE_TRACE_LITERAL([HAVE_OLD_PAM]) +m4trace:configure.ac:766: -1- AC_DEFINE_TRACE_LITERAL([HAVE_OPENSSL]) +m4trace:configure.ac:865: -1- AC_CHECK_LIB([crypt], [crypt], [LIBS="$LIBS -lcrypt"]) +m4trace:configure.ac:913: -1- AC_DEFINE_TRACE_LITERAL([OPENSSL_PRNG_ONLY]) +m4trace:configure.ac:921: -1- AC_SUBST([INSTALL_SSH_RAND_HELPER]) +m4trace:configure.ac:944: -1- AC_DEFINE_TRACE_LITERAL([PRNGD_PORT]) +m4trace:configure.ac:994: -1- AC_DEFINE_TRACE_LITERAL([PRNGD_SOCKET]) +m4trace:configure.ac:994: -1- AC_DEFINE_TRACE_LITERAL([PRNGD_SOCKET]) +m4trace:configure.ac:1007: -1- AC_DEFINE_TRACE_LITERAL([ENTROPY_TIMEOUT_MSEC]) +m4trace:configure.ac:1010: -1- AC_SUBST([PROG_LS], [$ac_cv_path_PROG_LS]) +m4trace:configure.ac:1010: -1- AC_SUBST([PROG_LS]) +m4trace:configure.ac:1011: -1- AC_SUBST([PROG_NETSTAT], [$ac_cv_path_PROG_NETSTAT]) +m4trace:configure.ac:1011: -1- AC_SUBST([PROG_NETSTAT]) +m4trace:configure.ac:1012: -1- AC_SUBST([PROG_ARP], [$ac_cv_path_PROG_ARP]) +m4trace:configure.ac:1012: -1- AC_SUBST([PROG_ARP]) +m4trace:configure.ac:1013: -1- AC_SUBST([PROG_IFCONFIG], [$ac_cv_path_PROG_IFCONFIG]) +m4trace:configure.ac:1013: -1- AC_SUBST([PROG_IFCONFIG]) +m4trace:configure.ac:1014: -1- AC_SUBST([PROG_JSTAT], [$ac_cv_path_PROG_JSTAT]) +m4trace:configure.ac:1014: -1- AC_SUBST([PROG_JSTAT]) +m4trace:configure.ac:1015: -1- AC_SUBST([PROG_PS], [$ac_cv_path_PROG_PS]) +m4trace:configure.ac:1015: -1- AC_SUBST([PROG_PS]) +m4trace:configure.ac:1016: -1- AC_SUBST([PROG_SAR], [$ac_cv_path_PROG_SAR]) +m4trace:configure.ac:1016: -1- AC_SUBST([PROG_SAR]) +m4trace:configure.ac:1017: -1- AC_SUBST([PROG_W], [$ac_cv_path_PROG_W]) +m4trace:configure.ac:1017: -1- AC_SUBST([PROG_W]) +m4trace:configure.ac:1018: -1- AC_SUBST([PROG_WHO], [$ac_cv_path_PROG_WHO]) +m4trace:configure.ac:1018: -1- AC_SUBST([PROG_WHO]) +m4trace:configure.ac:1019: -1- AC_SUBST([PROG_LAST], [$ac_cv_path_PROG_LAST]) +m4trace:configure.ac:1019: -1- AC_SUBST([PROG_LAST]) +m4trace:configure.ac:1020: -1- AC_SUBST([PROG_LASTLOG], [$ac_cv_path_PROG_LASTLOG]) +m4trace:configure.ac:1020: -1- AC_SUBST([PROG_LASTLOG]) +m4trace:configure.ac:1021: -1- AC_SUBST([PROG_DF], [$ac_cv_path_PROG_DF]) +m4trace:configure.ac:1021: -1- AC_SUBST([PROG_DF]) +m4trace:configure.ac:1022: -1- AC_SUBST([PROG_VMSTAT], [$ac_cv_path_PROG_VMSTAT]) +m4trace:configure.ac:1022: -1- AC_SUBST([PROG_VMSTAT]) +m4trace:configure.ac:1023: -1- AC_SUBST([PROG_UPTIME], [$ac_cv_path_PROG_UPTIME]) +m4trace:configure.ac:1023: -1- AC_SUBST([PROG_UPTIME]) +m4trace:configure.ac:1024: -1- AC_SUBST([PROG_IPCS], [$ac_cv_path_PROG_IPCS]) +m4trace:configure.ac:1024: -1- AC_SUBST([PROG_IPCS]) +m4trace:configure.ac:1025: -1- AC_SUBST([PROG_TAIL], [$ac_cv_path_PROG_TAIL]) +m4trace:configure.ac:1025: -1- AC_SUBST([PROG_TAIL]) +m4trace:configure.ac:1040: -1- AC_SUBST([INSTALL_SSH_PRNG_CMDS]) +m4trace:configure.ac:1049: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_CHAR]) +m4trace:configure.ac:1049: -1- AH_OUTPUT([SIZEOF_CHAR], [/* The size of a \`char', as computed by sizeof. */ #undef SIZEOF_CHAR]) -m4trace:configure.ac:881: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_SHORT_INT]) -m4trace:configure.ac:881: -1- AH_OUTPUT([SIZEOF_SHORT_INT], [/* The size of a \`short int', as computed by sizeof. */ +m4trace:configure.ac:1050: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_SHORT_INT]) +m4trace:configure.ac:1050: -1- AH_OUTPUT([SIZEOF_SHORT_INT], [/* The size of a \`short int', as computed by sizeof. */ #undef SIZEOF_SHORT_INT]) -m4trace:configure.ac:882: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_INT]) -m4trace:configure.ac:882: -1- AH_OUTPUT([SIZEOF_INT], [/* The size of a \`int', as computed by sizeof. */ +m4trace:configure.ac:1051: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_INT]) +m4trace:configure.ac:1051: -1- AH_OUTPUT([SIZEOF_INT], [/* The size of a \`int', as computed by sizeof. */ #undef SIZEOF_INT]) -m4trace:configure.ac:883: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_LONG_INT]) -m4trace:configure.ac:883: -1- AH_OUTPUT([SIZEOF_LONG_INT], [/* The size of a \`long int', as computed by sizeof. */ +m4trace:configure.ac:1052: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_LONG_INT]) +m4trace:configure.ac:1052: -1- AH_OUTPUT([SIZEOF_LONG_INT], [/* The size of a \`long int', as computed by sizeof. */ #undef SIZEOF_LONG_INT]) -m4trace:configure.ac:884: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_LONG_LONG_INT]) -m4trace:configure.ac:884: -1- AH_OUTPUT([SIZEOF_LONG_LONG_INT], [/* The size of a \`long long int', as computed by sizeof. */ +m4trace:configure.ac:1053: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_LONG_LONG_INT]) +m4trace:configure.ac:1053: -1- AH_OUTPUT([SIZEOF_LONG_LONG_INT], [/* The size of a \`long long int', as computed by sizeof. */ #undef SIZEOF_LONG_LONG_INT]) -m4trace:configure.ac:896: -1- AC_DEFINE_TRACE_LITERAL([HAVE_U_INT]) -m4trace:configure.ac:909: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INTXX_T]) -m4trace:configure.ac:925: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INTXX_T]) -m4trace:configure.ac:937: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INT64_T]) -m4trace:configure.ac:951: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INT64_T]) -m4trace:configure.ac:963: -1- AC_DEFINE_TRACE_LITERAL([HAVE_U_INTXX_T]) -m4trace:configure.ac:977: -1- AC_DEFINE_TRACE_LITERAL([HAVE_U_INTXX_T]) -m4trace:configure.ac:989: -1- AC_DEFINE_TRACE_LITERAL([HAVE_U_INT64_T]) -m4trace:configure.ac:1005: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UINTXX_T]) -m4trace:configure.ac:1019: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UINTXX_T]) -m4trace:configure.ac:1041: -1- AC_DEFINE_TRACE_LITERAL([HAVE_U_INTXX_T]) -m4trace:configure.ac:1041: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INTXX_T]) -m4trace:configure.ac:1056: -1- AC_DEFINE_TRACE_LITERAL([HAVE_U_CHAR]) -m4trace:configure.ac:1059: -1- AC_DEFINE_TRACE_LITERAL([socklen_t]) -m4trace:configure.ac:1059: -1- AH_OUTPUT([socklen_t], [/* type to use in place of socklen_t if not defined */ +m4trace:configure.ac:1065: -1- AC_DEFINE_TRACE_LITERAL([HAVE_U_INT]) +m4trace:configure.ac:1078: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INTXX_T]) +m4trace:configure.ac:1094: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INTXX_T]) +m4trace:configure.ac:1106: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INT64_T]) +m4trace:configure.ac:1120: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INT64_T]) +m4trace:configure.ac:1133: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INT64_T]) +m4trace:configure.ac:1145: -1- AC_DEFINE_TRACE_LITERAL([HAVE_U_INTXX_T]) +m4trace:configure.ac:1159: -1- AC_DEFINE_TRACE_LITERAL([HAVE_U_INTXX_T]) +m4trace:configure.ac:1171: -1- AC_DEFINE_TRACE_LITERAL([HAVE_U_INT64_T]) +m4trace:configure.ac:1185: -1- AC_DEFINE_TRACE_LITERAL([HAVE_U_INT64_T]) +m4trace:configure.ac:1200: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UINTXX_T]) +m4trace:configure.ac:1214: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UINTXX_T]) +m4trace:configure.ac:1236: -1- AC_DEFINE_TRACE_LITERAL([HAVE_U_INTXX_T]) +m4trace:configure.ac:1236: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INTXX_T]) +m4trace:configure.ac:1251: -1- AC_DEFINE_TRACE_LITERAL([HAVE_U_CHAR]) +m4trace:configure.ac:1254: -1- AC_DEFINE_TRACE_LITERAL([socklen_t]) +m4trace:configure.ac:1254: -1- AH_OUTPUT([socklen_t], [/* type to use in place of socklen_t if not defined */ #undef socklen_t]) -m4trace:configure.ac:1072: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SIZE_T]) -m4trace:configure.ac:1086: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SSIZE_T]) -m4trace:configure.ac:1100: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CLOCK_T]) -m4trace:configure.ac:1125: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SA_FAMILY_T]) -m4trace:configure.ac:1139: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PID_T]) -m4trace:configure.ac:1153: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MODE_T]) -m4trace:configure.ac:1169: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_SOCKADDR_STORAGE]) -m4trace:configure.ac:1184: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_SOCKADDR_IN6]) -m4trace:configure.ac:1199: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_IN6_ADDR]) -m4trace:configure.ac:1215: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_ADDRINFO]) -m4trace:configure.ac:1227: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_TIMEVAL]) -m4trace:configure.ac:1264: -1- AC_DEFINE_TRACE_LITERAL([BROKEN_SNPRINTF]) -m4trace:configure.ac:1266: -1- AC_SUBST([NO_SFTP]) -m4trace:configure.ac:1269: -1- AC_DEFINE_TRACE_LITERAL([HAVE_HOST_IN_UTMP]) -m4trace:configure.ac:1270: -1- AC_DEFINE_TRACE_LITERAL([HAVE_HOST_IN_UTMPX]) -m4trace:configure.ac:1271: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYSLEN_IN_UTMPX]) -m4trace:configure.ac:1272: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PID_IN_UTMP]) -m4trace:configure.ac:1273: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TYPE_IN_UTMP]) -m4trace:configure.ac:1274: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TYPE_IN_UTMPX]) -m4trace:configure.ac:1275: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TV_IN_UTMP]) -m4trace:configure.ac:1276: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ID_IN_UTMP]) -m4trace:configure.ac:1277: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ID_IN_UTMPX]) -m4trace:configure.ac:1278: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ADDR_IN_UTMP]) -m4trace:configure.ac:1279: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ADDR_IN_UTMPX]) -m4trace:configure.ac:1280: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ADDR_V6_IN_UTMP]) -m4trace:configure.ac:1281: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ADDR_V6_IN_UTMPX]) -m4trace:configure.ac:1282: -1- AC_DEFINE_TRACE_LITERAL([HAVE_EXIT_IN_UTMP]) -m4trace:configure.ac:1283: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TIME_IN_UTMP]) -m4trace:configure.ac:1284: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TIME_IN_UTMPX]) -m4trace:configure.ac:1285: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TV_IN_UTMPX]) -m4trace:configure.ac:1287: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_STAT_ST_BLKSIZE]) -m4trace:configure.ac:1287: -1- AH_OUTPUT([HAVE_STRUCT_STAT_ST_BLKSIZE], [/* Define if \`st_blksize' is member of \`struct stat'. */ +m4trace:configure.ac:1256: -1- AC_CHECK_TYPES([sig_atomic_t], [], [], [#include ]) +m4trace:configure.ac:1256: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SIG_ATOMIC_T]) +m4trace:configure.ac:1256: -1- AH_OUTPUT([HAVE_SIG_ATOMIC_T], [/* Define if the system has the type \`sig_atomic_t'. */ +#undef HAVE_SIG_ATOMIC_T]) +m4trace:configure.ac:1269: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SIZE_T]) +m4trace:configure.ac:1283: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SSIZE_T]) +m4trace:configure.ac:1297: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CLOCK_T]) +m4trace:configure.ac:1322: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SA_FAMILY_T]) +m4trace:configure.ac:1336: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PID_T]) +m4trace:configure.ac:1350: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MODE_T]) +m4trace:configure.ac:1366: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_SOCKADDR_STORAGE]) +m4trace:configure.ac:1381: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_SOCKADDR_IN6]) +m4trace:configure.ac:1396: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_IN6_ADDR]) +m4trace:configure.ac:1412: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_ADDRINFO]) +m4trace:configure.ac:1424: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_TIMEVAL]) +m4trace:configure.ac:1461: -1- AC_DEFINE_TRACE_LITERAL([BROKEN_SNPRINTF]) +m4trace:configure.ac:1463: -1- AC_SUBST([NO_SFTP]) +m4trace:configure.ac:1466: -1- AC_DEFINE_TRACE_LITERAL([HAVE_HOST_IN_UTMP]) +m4trace:configure.ac:1467: -1- AC_DEFINE_TRACE_LITERAL([HAVE_HOST_IN_UTMPX]) +m4trace:configure.ac:1468: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYSLEN_IN_UTMPX]) +m4trace:configure.ac:1469: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PID_IN_UTMP]) +m4trace:configure.ac:1470: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TYPE_IN_UTMP]) +m4trace:configure.ac:1471: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TYPE_IN_UTMPX]) +m4trace:configure.ac:1472: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TV_IN_UTMP]) +m4trace:configure.ac:1473: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ID_IN_UTMP]) +m4trace:configure.ac:1474: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ID_IN_UTMPX]) +m4trace:configure.ac:1475: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ADDR_IN_UTMP]) +m4trace:configure.ac:1476: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ADDR_IN_UTMPX]) +m4trace:configure.ac:1477: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ADDR_V6_IN_UTMP]) +m4trace:configure.ac:1478: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ADDR_V6_IN_UTMPX]) +m4trace:configure.ac:1479: -1- AC_DEFINE_TRACE_LITERAL([HAVE_EXIT_IN_UTMP]) +m4trace:configure.ac:1480: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TIME_IN_UTMP]) +m4trace:configure.ac:1481: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TIME_IN_UTMPX]) +m4trace:configure.ac:1482: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TV_IN_UTMPX]) +m4trace:configure.ac:1484: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_STAT_ST_BLKSIZE]) +m4trace:configure.ac:1484: -1- AH_OUTPUT([HAVE_STRUCT_STAT_ST_BLKSIZE], [/* Define if \`st_blksize' is member of \`struct stat'. */ #undef HAVE_STRUCT_STAT_ST_BLKSIZE]) -m4trace:configure.ac:1302: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SS_FAMILY_IN_SS]) -m4trace:configure.ac:1318: -1- AC_DEFINE_TRACE_LITERAL([HAVE___SS_FAMILY_IN_SS]) -m4trace:configure.ac:1333: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PW_CLASS_IN_PASSWD]) -m4trace:configure.ac:1348: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PW_EXPIRE_IN_PASSWD]) -m4trace:configure.ac:1363: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PW_CHANGE_IN_PASSWD]) -m4trace:configure.ac:1374: -1- AC_DEFINE_TRACE_LITERAL([HAVE___PROGNAME]) -m4trace:configure.ac:1389: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETOPT_OPTRESET]) -m4trace:configure.ac:1400: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_ERRLIST]) -m4trace:configure.ac:1412: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_NERR]) -m4trace:configure.ac:1444: -1- AC_CHECK_HEADERS([sectok.h]) -m4trace:configure.ac:1444: -1- AH_OUTPUT([HAVE_SECTOK_H], [/* Define if you have the header file. */ +m4trace:configure.ac:1499: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SS_FAMILY_IN_SS]) +m4trace:configure.ac:1515: -1- AC_DEFINE_TRACE_LITERAL([HAVE___SS_FAMILY_IN_SS]) +m4trace:configure.ac:1530: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PW_CLASS_IN_PASSWD]) +m4trace:configure.ac:1545: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PW_EXPIRE_IN_PASSWD]) +m4trace:configure.ac:1560: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PW_CHANGE_IN_PASSWD]) +m4trace:configure.ac:1571: -1- AC_DEFINE_TRACE_LITERAL([HAVE___PROGNAME]) +m4trace:configure.ac:1586: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETOPT_OPTRESET]) +m4trace:configure.ac:1597: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_ERRLIST]) +m4trace:configure.ac:1609: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_NERR]) +m4trace:configure.ac:1641: -1- AC_CHECK_HEADERS([sectok.h]) +m4trace:configure.ac:1641: -1- AH_OUTPUT([HAVE_SECTOK_H], [/* Define if you have the header file. */ #undef HAVE_SECTOK_H]) -m4trace:configure.ac:1444: -1- AC_CHECK_LIB([sectok], [sectok_open]) -m4trace:configure.ac:1444: -1- AH_OUTPUT([HAVE_LIBSECTOK], [/* Define if you have the \`sectok' library (-lsectok). */ +m4trace:configure.ac:1641: -1- AC_CHECK_LIB([sectok], [sectok_open]) +m4trace:configure.ac:1641: -1- AH_OUTPUT([HAVE_LIBSECTOK], [/* Define if you have the \`sectok' library (-lsectok). */ #undef HAVE_LIBSECTOK]) -m4trace:configure.ac:1444: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSECTOK]) -m4trace:configure.ac:1444: -1- AC_DEFINE_TRACE_LITERAL([SMARTCARD]) -m4trace:configure.ac:1499: -1- AC_CHECK_HEADERS([krb.h]) -m4trace:configure.ac:1499: -1- AH_OUTPUT([HAVE_KRB_H], [/* Define if you have the header file. */ +m4trace:configure.ac:1641: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSECTOK]) +m4trace:configure.ac:1641: -1- AC_DEFINE_TRACE_LITERAL([SMARTCARD]) +m4trace:configure.ac:1696: -1- AC_CHECK_HEADERS([krb.h]) +m4trace:configure.ac:1696: -1- AH_OUTPUT([HAVE_KRB_H], [/* Define if you have the header file. */ #undef HAVE_KRB_H]) -m4trace:configure.ac:1499: -1- AC_CHECK_LIB([krb], [main]) -m4trace:configure.ac:1499: -1- AH_OUTPUT([HAVE_LIBKRB], [/* Define if you have the \`krb' library (-lkrb). */ +m4trace:configure.ac:1696: -1- AC_CHECK_LIB([krb], [main]) +m4trace:configure.ac:1696: -1- AH_OUTPUT([HAVE_LIBKRB], [/* Define if you have the \`krb' library (-lkrb). */ #undef HAVE_LIBKRB]) -m4trace:configure.ac:1499: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBKRB]) -m4trace:configure.ac:1499: -1- AC_CHECK_LIB([krb4], [main]) -m4trace:configure.ac:1499: -1- AH_OUTPUT([HAVE_LIBKRB4], [/* Define if you have the \`krb4' library (-lkrb4). */ +m4trace:configure.ac:1696: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBKRB]) +m4trace:configure.ac:1696: -1- AC_CHECK_LIB([krb4], [main]) +m4trace:configure.ac:1696: -1- AH_OUTPUT([HAVE_LIBKRB4], [/* Define if you have the \`krb4' library (-lkrb4). */ #undef HAVE_LIBKRB4]) -m4trace:configure.ac:1499: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBKRB4]) -m4trace:configure.ac:1499: -1- AC_CHECK_LIB([des], [des_cbc_encrypt]) -m4trace:configure.ac:1499: -1- AH_OUTPUT([HAVE_LIBDES], [/* Define if you have the \`des' library (-ldes). */ +m4trace:configure.ac:1696: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBKRB4]) +m4trace:configure.ac:1696: -1- AC_CHECK_LIB([des], [des_cbc_encrypt]) +m4trace:configure.ac:1696: -1- AH_OUTPUT([HAVE_LIBDES], [/* Define if you have the \`des' library (-ldes). */ #undef HAVE_LIBDES]) -m4trace:configure.ac:1499: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDES]) -m4trace:configure.ac:1499: -1- AC_CHECK_LIB([des425], [des_cbc_encrypt]) -m4trace:configure.ac:1499: -1- AH_OUTPUT([HAVE_LIBDES425], [/* Define if you have the \`des425' library (-ldes425). */ +m4trace:configure.ac:1696: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDES]) +m4trace:configure.ac:1696: -1- AC_CHECK_LIB([des425], [des_cbc_encrypt]) +m4trace:configure.ac:1696: -1- AH_OUTPUT([HAVE_LIBDES425], [/* Define if you have the \`des425' library (-ldes425). */ #undef HAVE_LIBDES425]) -m4trace:configure.ac:1499: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDES425]) -m4trace:configure.ac:1499: -1- AC_CHECK_LIB([resolv], [dn_expand], [], []) -m4trace:configure.ac:1499: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define if you have the \`resolv' library (-lresolv). */ +m4trace:configure.ac:1696: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDES425]) +m4trace:configure.ac:1696: -1- AC_CHECK_LIB([resolv], [dn_expand], [], []) +m4trace:configure.ac:1696: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define if you have the \`resolv' library (-lresolv). */ #undef HAVE_LIBRESOLV]) -m4trace:configure.ac:1499: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV]) -m4trace:configure.ac:1499: -1- AC_DEFINE_TRACE_LITERAL([KRB4]) -m4trace:configure.ac:1525: -1- AC_DEFINE_TRACE_LITERAL([AFS]) -m4trace:configure.ac:1539: -1- AC_SUBST([rsh_path], [$ac_cv_path_rsh_path]) -m4trace:configure.ac:1554: -1- AC_SUBST([xauth_path], [$ac_cv_path_xauth_path]) -m4trace:configure.ac:1558: -1- AC_SUBST([XAUTH_PATH]) -m4trace:configure.ac:1560: -1- AC_DEFINE_TRACE_LITERAL([XAUTH_PATH]) -m4trace:configure.ac:1562: -1- AC_SUBST([XAUTH_PATH]) -m4trace:configure.ac:1565: -1- AC_DEFINE_TRACE_LITERAL([RSH_PATH]) -m4trace:configure.ac:1571: -1- AC_DEFINE_TRACE_LITERAL([MAIL_DIRECTORY]) -m4trace:configure.ac:1580: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DEV_PTMX]) -m4trace:configure.ac:1587: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DEV_PTS_AND_PTC]) -m4trace:configure.ac:1610: -1- AC_DEFINE_TRACE_LITERAL([RANDOM_POOL]) -m4trace:configure.ac:1610: -1- AC_SUBST([RANDOM_POOL]) -m4trace:configure.ac:1610: -1- AC_DEFINE_TRACE_LITERAL([RANDOM_POOL]) -m4trace:configure.ac:1621: -1- AC_DEFINE_TRACE_LITERAL([PRNGD_PORT]) -m4trace:configure.ac:1651: -1- AC_DEFINE_TRACE_LITERAL([PRNGD_SOCKET]) -m4trace:configure.ac:1651: -1- AC_DEFINE_TRACE_LITERAL([PRNGD_SOCKET]) -m4trace:configure.ac:1659: -1- AC_SUBST([PROG_LS], [$ac_cv_path_PROG_LS]) -m4trace:configure.ac:1659: -1- AC_SUBST([PROG_LS]) -m4trace:configure.ac:1660: -1- AC_SUBST([PROG_NETSTAT], [$ac_cv_path_PROG_NETSTAT]) -m4trace:configure.ac:1660: -1- AC_SUBST([PROG_NETSTAT]) -m4trace:configure.ac:1661: -1- AC_SUBST([PROG_ARP], [$ac_cv_path_PROG_ARP]) -m4trace:configure.ac:1661: -1- AC_SUBST([PROG_ARP]) -m4trace:configure.ac:1662: -1- AC_SUBST([PROG_IFCONFIG], [$ac_cv_path_PROG_IFCONFIG]) -m4trace:configure.ac:1662: -1- AC_SUBST([PROG_IFCONFIG]) -m4trace:configure.ac:1663: -1- AC_SUBST([PROG_JSTAT], [$ac_cv_path_PROG_JSTAT]) -m4trace:configure.ac:1663: -1- AC_SUBST([PROG_JSTAT]) -m4trace:configure.ac:1664: -1- AC_SUBST([PROG_PS], [$ac_cv_path_PROG_PS]) -m4trace:configure.ac:1664: -1- AC_SUBST([PROG_PS]) -m4trace:configure.ac:1665: -1- AC_SUBST([PROG_SAR], [$ac_cv_path_PROG_SAR]) -m4trace:configure.ac:1665: -1- AC_SUBST([PROG_SAR]) -m4trace:configure.ac:1666: -1- AC_SUBST([PROG_W], [$ac_cv_path_PROG_W]) -m4trace:configure.ac:1666: -1- AC_SUBST([PROG_W]) -m4trace:configure.ac:1667: -1- AC_SUBST([PROG_WHO], [$ac_cv_path_PROG_WHO]) -m4trace:configure.ac:1667: -1- AC_SUBST([PROG_WHO]) -m4trace:configure.ac:1668: -1- AC_SUBST([PROG_LAST], [$ac_cv_path_PROG_LAST]) -m4trace:configure.ac:1668: -1- AC_SUBST([PROG_LAST]) -m4trace:configure.ac:1669: -1- AC_SUBST([PROG_LASTLOG], [$ac_cv_path_PROG_LASTLOG]) -m4trace:configure.ac:1669: -1- AC_SUBST([PROG_LASTLOG]) -m4trace:configure.ac:1670: -1- AC_SUBST([PROG_DF], [$ac_cv_path_PROG_DF]) -m4trace:configure.ac:1670: -1- AC_SUBST([PROG_DF]) -m4trace:configure.ac:1671: -1- AC_SUBST([PROG_VMSTAT], [$ac_cv_path_PROG_VMSTAT]) -m4trace:configure.ac:1671: -1- AC_SUBST([PROG_VMSTAT]) -m4trace:configure.ac:1672: -1- AC_SUBST([PROG_UPTIME], [$ac_cv_path_PROG_UPTIME]) -m4trace:configure.ac:1672: -1- AC_SUBST([PROG_UPTIME]) -m4trace:configure.ac:1673: -1- AC_SUBST([PROG_IPCS], [$ac_cv_path_PROG_IPCS]) -m4trace:configure.ac:1673: -1- AC_SUBST([PROG_IPCS]) -m4trace:configure.ac:1674: -1- AC_SUBST([PROG_TAIL], [$ac_cv_path_PROG_TAIL]) -m4trace:configure.ac:1674: -1- AC_SUBST([PROG_TAIL]) -m4trace:configure.ac:1678: -1- AC_SUBST([INSTALL_SSH_PRNG_CMDS]) -m4trace:configure.ac:1695: -1- AC_SUBST([NROFF], [$ac_cv_path_NROFF]) -m4trace:configure.ac:1704: -1- AC_SUBST([MANTYPE]) -m4trace:configure.ac:1710: -1- AC_SUBST([mansubdir]) -m4trace:configure.ac:1722: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MD5_PASSWORDS]) -m4trace:configure.ac:1733: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_SHADOW]) -m4trace:configure.ac:1748: -1- AC_DEFINE_TRACE_LITERAL([HAS_SHADOW_EXPIRE]) -m4trace:configure.ac:1757: -1- AC_DEFINE_TRACE_LITERAL([IPADDR_IN_DISPLAY]) -m4trace:configure.ac:1768: -1- AC_DEFINE_TRACE_LITERAL([IPADDR_IN_DISPLAY]) -m4trace:configure.ac:1833: -1- AC_DEFINE_TRACE_LITERAL([USER_PATH]) -m4trace:configure.ac:1834: -1- AC_SUBST([user_path]) -m4trace:configure.ac:1846: -1- AC_DEFINE_TRACE_LITERAL([IPV4_DEFAULT]) -m4trace:configure.ac:1869: -1- AC_DEFINE_TRACE_LITERAL([IPV4_IN_IPV6]) -m4trace:configure.ac:1869: -1- AC_DEFINE_TRACE_LITERAL([IPV4_IN_IPV6]) -m4trace:configure.ac:1880: -1- AC_DEFINE_TRACE_LITERAL([BSD_AUTH]) -m4trace:configure.ac:1898: -1- AC_SUBST([SSHMODE]) -m4trace:configure.ac:1920: -1- AC_DEFINE_TRACE_LITERAL([_PATH_SSH_PIDDIR]) -m4trace:configure.ac:1921: -1- AC_SUBST([piddir]) -m4trace:configure.ac:1927: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_LASTLOG]) -m4trace:configure.ac:1931: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_UTMP]) -m4trace:configure.ac:1935: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_UTMPX]) -m4trace:configure.ac:1939: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_WTMP]) -m4trace:configure.ac:1943: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_WTMPX]) -m4trace:configure.ac:1947: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_LOGIN]) -m4trace:configure.ac:1951: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_PUTUTLINE]) -m4trace:configure.ac:1955: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_PUTUTXLINE]) -m4trace:configure.ac:1965: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_LASTLOG]) -m4trace:configure.ac:2027: -1- AC_DEFINE_TRACE_LITERAL([CONF_LASTLOG_FILE]) -m4trace:configure.ac:2052: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_UTMP]) -m4trace:configure.ac:2057: -1- AC_DEFINE_TRACE_LITERAL([CONF_UTMP_FILE]) -m4trace:configure.ac:2082: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_WTMP]) -m4trace:configure.ac:2087: -1- AC_DEFINE_TRACE_LITERAL([CONF_WTMP_FILE]) -m4trace:configure.ac:2112: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_UTMPX]) -m4trace:configure.ac:2115: -1- AC_DEFINE_TRACE_LITERAL([CONF_UTMPX_FILE]) -m4trace:configure.ac:2137: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_WTMPX]) -m4trace:configure.ac:2140: -1- AC_DEFINE_TRACE_LITERAL([CONF_WTMPX_FILE]) -m4trace:configure.ac:2154: -1- AC_DEFINE_TRACE_LITERAL([ENTROPY_TIMEOUT_MSEC]) +m4trace:configure.ac:1696: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV]) +m4trace:configure.ac:1696: -1- AC_DEFINE_TRACE_LITERAL([KRB4]) +m4trace:configure.ac:1722: -1- AC_DEFINE_TRACE_LITERAL([AFS]) +m4trace:configure.ac:1736: -1- AC_SUBST([rsh_path], [$ac_cv_path_rsh_path]) +m4trace:configure.ac:1751: -1- AC_SUBST([xauth_path], [$ac_cv_path_xauth_path]) +m4trace:configure.ac:1755: -1- AC_SUBST([XAUTH_PATH]) +m4trace:configure.ac:1757: -1- AC_DEFINE_TRACE_LITERAL([XAUTH_PATH]) +m4trace:configure.ac:1759: -1- AC_SUBST([XAUTH_PATH]) +m4trace:configure.ac:1762: -1- AC_DEFINE_TRACE_LITERAL([RSH_PATH]) +m4trace:configure.ac:1768: -1- AC_DEFINE_TRACE_LITERAL([MAIL_DIRECTORY]) +m4trace:configure.ac:1777: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DEV_PTMX]) +m4trace:configure.ac:1784: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DEV_PTS_AND_PTC]) +m4trace:configure.ac:1801: -1- AC_SUBST([NROFF], [$ac_cv_path_NROFF]) +m4trace:configure.ac:1810: -1- AC_SUBST([MANTYPE]) +m4trace:configure.ac:1816: -1- AC_SUBST([mansubdir]) +m4trace:configure.ac:1828: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MD5_PASSWORDS]) +m4trace:configure.ac:1839: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_SHADOW]) +m4trace:configure.ac:1854: -1- AC_DEFINE_TRACE_LITERAL([HAS_SHADOW_EXPIRE]) +m4trace:configure.ac:1863: -1- AC_DEFINE_TRACE_LITERAL([IPADDR_IN_DISPLAY]) +m4trace:configure.ac:1874: -1- AC_DEFINE_TRACE_LITERAL([IPADDR_IN_DISPLAY]) +m4trace:configure.ac:1939: -1- AC_DEFINE_TRACE_LITERAL([USER_PATH]) +m4trace:configure.ac:1940: -1- AC_SUBST([user_path]) +m4trace:configure.ac:1952: -1- AC_DEFINE_TRACE_LITERAL([IPV4_DEFAULT]) +m4trace:configure.ac:1975: -1- AC_DEFINE_TRACE_LITERAL([IPV4_IN_IPV6]) +m4trace:configure.ac:1975: -1- AC_DEFINE_TRACE_LITERAL([IPV4_IN_IPV6]) +m4trace:configure.ac:1987: -1- AC_DEFINE_TRACE_LITERAL([BSD_AUTH]) +m4trace:configure.ac:2005: -1- AC_SUBST([SSHMODE]) +m4trace:configure.ac:2027: -1- AC_DEFINE_TRACE_LITERAL([_PATH_SSH_PIDDIR]) +m4trace:configure.ac:2028: -1- AC_SUBST([piddir]) +m4trace:configure.ac:2034: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_LASTLOG]) +m4trace:configure.ac:2038: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_UTMP]) +m4trace:configure.ac:2042: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_UTMPX]) +m4trace:configure.ac:2046: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_WTMP]) +m4trace:configure.ac:2050: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_WTMPX]) +m4trace:configure.ac:2054: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_LOGIN]) +m4trace:configure.ac:2058: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_PUTUTLINE]) +m4trace:configure.ac:2062: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_PUTUTXLINE]) +m4trace:configure.ac:2072: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_LASTLOG]) +m4trace:configure.ac:2134: -1- AC_DEFINE_TRACE_LITERAL([CONF_LASTLOG_FILE]) +m4trace:configure.ac:2159: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_UTMP]) +m4trace:configure.ac:2164: -1- AC_DEFINE_TRACE_LITERAL([CONF_UTMP_FILE]) +m4trace:configure.ac:2189: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_WTMP]) +m4trace:configure.ac:2194: -1- AC_DEFINE_TRACE_LITERAL([CONF_WTMP_FILE]) +m4trace:configure.ac:2219: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_UTMPX]) +m4trace:configure.ac:2222: -1- AC_DEFINE_TRACE_LITERAL([CONF_UTMPX_FILE]) +m4trace:configure.ac:2244: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_WTMPX]) +m4trace:configure.ac:2247: -1- AC_DEFINE_TRACE_LITERAL([CONF_WTMPX_FILE]) diff -ru openssh-3.0.2p1/bufaux.c openssh-3.1p1/bufaux.c --- openssh-3.0.2p1/bufaux.c 2001-01-24 03:26:52.000000000 +1100 +++ openssh-3.1p1/bufaux.c 2002-01-22 23:33:32.000000000 +1100 @@ -37,7 +37,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: bufaux.c,v 1.17 2001/01/21 19:05:45 markus Exp $"); +RCSID("$OpenBSD: bufaux.c,v 1.22 2002/01/18 18:14:17 stevesk Exp $"); #include #include "bufaux.h" @@ -62,7 +62,7 @@ oi = BN_bn2bin(value, buf); if (oi != bin_size) fatal("buffer_put_bignum: BN_bn2bin() failed: oi %d != bin_size %d", - oi, bin_size); + oi, bin_size); /* Store the number of bits in the buffer in two bytes, msb first. */ PUT_16BIT(msg, bits); @@ -77,7 +77,7 @@ /* * Retrieves an BIGNUM from the buffer. */ -int +void buffer_get_bignum(Buffer *buffer, BIGNUM *value) { int bits, bytes; @@ -90,11 +90,9 @@ bytes = (bits + 7) / 8; if (buffer_len(buffer) < bytes) fatal("buffer_get_bignum: input buffer too small"); - bin = (u_char *) buffer_ptr(buffer); + bin = buffer_ptr(buffer); BN_bin2bn(bin, bytes, value); buffer_consume(buffer, bytes); - - return 2 + bytes; } /* @@ -112,16 +110,16 @@ oi = BN_bn2bin(value, buf+1); if (oi != bytes-1) fatal("buffer_put_bignum: BN_bn2bin() failed: oi %d != bin_size %d", - oi, bytes); + oi, bytes); hasnohigh = (buf[1] & 0x80) ? 0 : 1; if (value->neg) { /**XXX should be two's-complement */ int i, carry; u_char *uc = buf; log("negativ!"); - for(i = bytes-1, carry = 1; i>=0; i--) { + for (i = bytes-1, carry = 1; i>=0; i--) { uc[i] ^= 0xff; - if(carry) + if (carry) carry = !++uc[i]; } } @@ -130,15 +128,14 @@ xfree(buf); } -int +void buffer_get_bignum2(Buffer *buffer, BIGNUM *value) { /**XXX should be two's-complement */ int len; - u_char *bin = (u_char *)buffer_get_string(buffer, (u_int *)&len); + u_char *bin = buffer_get_string(buffer, (u_int *)&len); BN_bin2bn(bin, len, value); xfree(bin); - return len; } /* @@ -191,11 +188,11 @@ * will be stored there. A null character will be automatically appended * to the returned string, and is not counted in length. */ -char * +void * buffer_get_string(Buffer *buffer, u_int *length_ptr) { u_int len; - char *value; + u_char *value; /* Get the length. */ len = buffer_get_int(buffer); if (len > 256 * 1024) diff -ru openssh-3.0.2p1/bufaux.h openssh-3.1p1/bufaux.h --- openssh-3.0.2p1/bufaux.h 2001-07-04 14:46:57.000000000 +1000 +++ openssh-3.1p1/bufaux.h 2002-03-06 05:59:45.000000000 +1100 @@ -1,3 +1,5 @@ +/* $OpenBSD: bufaux.h,v 1.16 2002/03/04 17:27:39 stevesk Exp $ */ + /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -10,8 +12,6 @@ * called by a name other than "ssh" or "Secure Shell". */ -/* RCSID("$OpenBSD: bufaux.h,v 1.13 2001/06/26 17:27:22 markus Exp $"); */ - #ifndef BUFAUX_H #define BUFAUX_H @@ -20,11 +20,10 @@ void buffer_put_bignum(Buffer *, BIGNUM *); void buffer_put_bignum2(Buffer *, BIGNUM *); +void buffer_get_bignum(Buffer *, BIGNUM *); +void buffer_get_bignum2(Buffer *, BIGNUM *); -int buffer_get_bignum(Buffer *, BIGNUM *); -int buffer_get_bignum2(Buffer *, BIGNUM *); - -u_int buffer_get_int(Buffer *); +u_int buffer_get_int(Buffer *); void buffer_put_int(Buffer *, u_int); #ifdef HAVE_U_INT64_T @@ -33,11 +32,9 @@ #endif int buffer_get_char(Buffer *); - void buffer_put_char(Buffer *, int); -char *buffer_get_string(Buffer *, u_int *); - +void *buffer_get_string(Buffer *, u_int *); void buffer_put_string(Buffer *, const void *, u_int); void buffer_put_cstring(Buffer *, const char *); diff -ru openssh-3.0.2p1/buffer.c openssh-3.1p1/buffer.c --- openssh-3.0.2p1/buffer.c 2001-04-13 09:34:35.000000000 +1000 +++ openssh-3.1p1/buffer.c 2002-01-22 23:33:32.000000000 +1100 @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: buffer.c,v 1.13 2001/04/12 19:15:24 markus Exp $"); +RCSID("$OpenBSD: buffer.c,v 1.15 2002/01/18 18:14:17 stevesk Exp $"); #include "xmalloc.h" #include "buffer.h" @@ -53,11 +53,11 @@ /* Appends data to the buffer, expanding it if necessary. */ void -buffer_append(Buffer *buffer, const char *data, u_int len) +buffer_append(Buffer *buffer, const void *data, u_int len) { - char *cp; - buffer_append_space(buffer, &cp, len); - memcpy(cp, data, len); + void *p; + p = buffer_append_space(buffer, len); + memcpy(p, data, len); } /* @@ -66,9 +66,11 @@ * to the allocated region. */ -void -buffer_append_space(Buffer *buffer, char **datap, u_int len) +void * +buffer_append_space(Buffer *buffer, u_int len) { + void *p; + /* If the buffer is empty, start using it from the beginning. */ if (buffer->offset == buffer->end) { buffer->offset = 0; @@ -77,9 +79,9 @@ restart: /* If there is enough space to store all data, store it now. */ if (buffer->end + len < buffer->alloc) { - *datap = buffer->buf + buffer->end; + p = buffer->buf + buffer->end; buffer->end += len; - return; + return p; } /* * If the buffer is quite empty, but all data is at the end, move the @@ -96,6 +98,7 @@ buffer->alloc += len + 32768; buffer->buf = xrealloc(buffer->buf, buffer->alloc); goto restart; + /* NOTREACHED */ } /* Returns the number of bytes of data in the buffer. */ @@ -109,7 +112,7 @@ /* Gets data from the beginning of the buffer. */ void -buffer_get(Buffer *buffer, char *buf, u_int len) +buffer_get(Buffer *buffer, void *buf, u_int len) { if (len > buffer->end - buffer->offset) fatal("buffer_get: trying to get more bytes %d than in buffer %d", @@ -140,7 +143,7 @@ /* Returns a pointer to the first used byte in the buffer. */ -char * +void * buffer_ptr(Buffer *buffer) { return buffer->buf + buffer->offset; @@ -152,7 +155,7 @@ buffer_dump(Buffer *buffer) { int i; - u_char *ucp = (u_char *) buffer->buf; + u_char *ucp = buffer->buf; for (i = buffer->offset; i < buffer->end; i++) { fprintf(stderr, "%02x", ucp[i]); diff -ru openssh-3.0.2p1/buffer.h openssh-3.1p1/buffer.h --- openssh-3.0.2p1/buffer.h 2001-07-04 14:46:57.000000000 +1000 +++ openssh-3.1p1/buffer.h 2002-03-05 12:53:04.000000000 +1100 @@ -1,3 +1,5 @@ +/* $OpenBSD: buffer.h,v 1.11 2002/03/04 17:27:39 stevesk Exp $ */ + /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -11,13 +13,11 @@ * called by a name other than "ssh" or "Secure Shell". */ -/* RCSID("$OpenBSD: buffer.h,v 1.9 2001/06/26 17:27:23 markus Exp $"); */ - #ifndef BUFFER_H #define BUFFER_H typedef struct { - char *buf; /* Buffer for data. */ + u_char *buf; /* Buffer for data. */ u_int alloc; /* Number of bytes allocated for data. */ u_int offset; /* Offset of first byte containing data. */ u_int end; /* Offset of last byte containing data. */ @@ -28,12 +28,12 @@ void buffer_free(Buffer *); u_int buffer_len(Buffer *); -char *buffer_ptr(Buffer *); +void *buffer_ptr(Buffer *); -void buffer_append(Buffer *, const char *, u_int); -void buffer_append_space(Buffer *, char **, u_int); +void buffer_append(Buffer *, const void *, u_int); +void *buffer_append_space(Buffer *, u_int); -void buffer_get(Buffer *, char *, u_int); +void buffer_get(Buffer *, void *, u_int); void buffer_consume(Buffer *, u_int); void buffer_consume_end(Buffer *, u_int); diff -ru openssh-3.0.2p1/canohost.c openssh-3.1p1/canohost.c --- openssh-3.0.2p1/canohost.c 2001-06-25 15:01:24.000000000 +1000 +++ openssh-3.1p1/canohost.c 2002-03-05 12:31:29.000000000 +1100 @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: canohost.c,v 1.27 2001/06/23 15:12:17 itojun Exp $"); +RCSID("$OpenBSD: canohost.c,v 1.31 2002/02/27 21:23:13 stevesk Exp $"); #include "packet.h" #include "xmalloc.h" @@ -27,7 +27,7 @@ */ static char * -get_remote_hostname(int socket, int reverse_mapping_check) +get_remote_hostname(int socket, int verify_reverse_mapping) { struct sockaddr_storage from; int i; @@ -68,13 +68,13 @@ check_ip_options(socket, ntop); if (getnameinfo((struct sockaddr *)&from, fromlen, ntop, sizeof(ntop), - NULL, 0, NI_NUMERICHOST) != 0) + NULL, 0, NI_NUMERICHOST) != 0) fatal("get_remote_hostname: getnameinfo NI_NUMERICHOST failed"); 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), - NULL, 0, NI_NAMEREQD) != 0) { + NULL, 0, NI_NAMEREQD) != 0) { /* Host name not found. Use ip address. */ log("Could not reverse map address %.100s.", ntop); return xstrdup(ntop); @@ -90,7 +90,7 @@ if (isupper(name[i])) name[i] = tolower(name[i]); - if (!reverse_mapping_check) + if (!verify_reverse_mapping) return xstrdup(name); /* * Map it back to an IP address and check that the given @@ -154,7 +154,7 @@ else ipproto = IPPROTO_IP; option_size = sizeof(options); - if (getsockopt(socket, ipproto, IP_OPTIONS, (void *)options, + if (getsockopt(socket, ipproto, IP_OPTIONS, options, &option_size) >= 0 && option_size != 0) { text[0] = '\0'; for (i = 0; i < option_size; i++) @@ -174,14 +174,14 @@ */ const char * -get_canonical_hostname(int reverse_mapping_check) +get_canonical_hostname(int verify_reverse_mapping) { static char *canonical_host_name = NULL; - static int reverse_mapping_checked = 0; + static int verify_reverse_mapping_done = 0; /* Check if we have previously retrieved name with same option. */ if (canonical_host_name != NULL) { - if (reverse_mapping_checked != reverse_mapping_check) + if (verify_reverse_mapping_done != verify_reverse_mapping) xfree(canonical_host_name); else return canonical_host_name; @@ -190,11 +190,11 @@ /* Get the real hostname if socket; otherwise return UNKNOWN. */ if (packet_connection_is_on_socket()) canonical_host_name = get_remote_hostname( - packet_get_connection_in(), reverse_mapping_check); + packet_get_connection_in(), verify_reverse_mapping); else canonical_host_name = xstrdup("UNKNOWN"); - reverse_mapping_checked = reverse_mapping_check; + verify_reverse_mapping_done = verify_reverse_mapping; return canonical_host_name; } @@ -230,7 +230,7 @@ } /* Get the address in ascii. */ if (getnameinfo((struct sockaddr *)&addr, addrlen, ntop, sizeof(ntop), - NULL, 0, flags) != 0) { + NULL, 0, flags) != 0) { error("get_socket_ipaddr: getnameinfo %d failed", flags); return NULL; } @@ -261,7 +261,7 @@ */ const char * -get_remote_ipaddr() +get_remote_ipaddr(void) { static char *canonical_host_ip = NULL; @@ -281,11 +281,11 @@ } const char * -get_remote_name_or_ip(u_int utmp_len, int reverse_mapping_check) +get_remote_name_or_ip(u_int utmp_len, int verify_reverse_mapping) { static const char *remote = ""; if (utmp_len > 0) - remote = get_canonical_hostname(reverse_mapping_check); + remote = get_canonical_hostname(verify_reverse_mapping); if (utmp_len == 0 || strlen(remote) > utmp_len) remote = get_remote_ipaddr(); return remote; @@ -316,7 +316,7 @@ } /* Return port number. */ if (getnameinfo((struct sockaddr *)&from, fromlen, NULL, 0, - strport, sizeof(strport), NI_NUMERICSERV) != 0) + strport, sizeof(strport), NI_NUMERICSERV) != 0) fatal("get_sock_port: getnameinfo NI_NUMERICSERV failed"); return atoi(strport); } @@ -344,13 +344,13 @@ } int -get_remote_port() +get_remote_port(void) { return get_port(0); } int -get_local_port() +get_local_port(void) { return get_port(1); } diff -ru openssh-3.0.2p1/channels.c openssh-3.1p1/channels.c --- openssh-3.0.2p1/channels.c 2001-10-12 11:35:05.000000000 +1000 +++ openssh-3.1p1/channels.c 2002-03-05 12:57:45.000000000 +1100 @@ -13,7 +13,7 @@ * called by a name other than "ssh" or "Secure Shell". * * SSH2 support added by Markus Friedl. - * Copyright (c) 1999, 2000, 2001 Markus Friedl. All rights reserved. + * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. * Copyright (c) 1999 Dug Song. All rights reserved. * Copyright (c) 1999 Theo de Raadt. All rights reserved. * @@ -39,7 +39,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: channels.c,v 1.140 2001/10/10 22:18:47 markus Exp $"); +RCSID("$OpenBSD: channels.c,v 1.171 2002/03/04 19:37:58 markus Exp $"); #include "ssh.h" #include "ssh1.h" @@ -54,6 +54,7 @@ #include "canohost.h" #include "key.h" #include "authfd.h" +#include "pathnames.h" /* -- channel core */ @@ -145,7 +146,7 @@ { Channel *c; - if (id < 0 || id > channels_alloc) { + if (id < 0 || id >= channels_alloc) { log("channel_lookup: %d: bad id", id); return NULL; } @@ -216,7 +217,6 @@ /* Do initial allocation if this is the first call. */ if (channels_alloc == 0) { - chan_init(); channels_alloc = 10; channels = xmalloc(channels_alloc * sizeof(Channel *)); for (i = 0; i < channels_alloc; i++) @@ -245,7 +245,9 @@ buffer_init(&c->input); buffer_init(&c->output); buffer_init(&c->extended); - chan_init_iostates(c); + c->ostate = CHAN_OUTPUT_OPEN; + c->istate = CHAN_INPUT_OPEN; + c->flags = 0; channel_register_fds(c, rfd, wfd, efd, extusage, nonblock); c->self = found; c->type = type; @@ -258,11 +260,10 @@ c->remote_name = remote_name; c->remote_window = 0; c->remote_maxpacket = 0; - c->cb_fn = NULL; - c->cb_arg = NULL; - c->cb_event = 0; c->force_drain = 0; + c->single_connection = 0; c->detach_user = NULL; + c->confirm = NULL; c->input_filter = NULL; debug("channel %d: new [%s]", found, remote_name); return c; @@ -361,7 +362,7 @@ */ void -channel_close_all() +channel_close_all(void) { int i; @@ -402,7 +403,7 @@ */ int -channel_not_very_much_buffered_data() +channel_not_very_much_buffered_data(void) { u_int i; Channel *c; @@ -432,7 +433,7 @@ /* Returns true if any channel is still open. */ int -channel_still_open() +channel_still_open(void) { int i; Channel *c; @@ -475,7 +476,7 @@ /* Returns the id of an open channel suitable for keepaliving */ int -channel_find_open() +channel_find_open(void) { int i; Channel *c; @@ -520,7 +521,7 @@ */ char * -channel_open_message() +channel_open_message(void) { Buffer buffer; Channel *c; @@ -587,36 +588,28 @@ } void -channel_request(int id, char *service, int wantconfirm) +channel_request_start(int local_id, char *service, int wantconfirm) { - channel_request_start(id, service, wantconfirm); - packet_send(); - debug("channel request %d: %s", id, service) ; -} -void -channel_request_start(int id, char *service, int wantconfirm) -{ - Channel *c = channel_lookup(id); + Channel *c = channel_lookup(local_id); if (c == NULL) { - log("channel_request: %d: bad id", id); + log("channel_request_start: %d: unknown channel id", local_id); return; } + debug("channel request %d: %s", local_id, service) ; packet_start(SSH2_MSG_CHANNEL_REQUEST); packet_put_int(c->remote_id); packet_put_cstring(service); packet_put_char(wantconfirm); } void -channel_register_callback(int id, int mtype, channel_callback_fn *fn, void *arg) +channel_register_confirm(int id, channel_callback_fn *fn) { Channel *c = channel_lookup(id); if (c == NULL) { - log("channel_register_callback: %d: bad id", id); + log("channel_register_comfirm: %d: bad id", id); return; } - c->cb_event = mtype; - c->cb_fn = fn; - c->cb_arg = arg; + c->confirm = fn; } void channel_register_cleanup(int id, channel_callback_fn *fn) @@ -651,15 +644,14 @@ void channel_set_fds(int id, int rfd, int wfd, int efd, - int extusage, int nonblock) + int extusage, int nonblock, u_int window_max) { Channel *c = channel_lookup(id); if (c == NULL || c->type != SSH_CHANNEL_LARVAL) fatal("channel_activate for non-larval channel %d.", id); channel_register_fds(c, rfd, wfd, efd, extusage, nonblock); c->type = SSH_CHANNEL_OPEN; - /* XXX window size? */ - c->local_window = c->local_window_max = c->local_maxpacket * 2; + c->local_window = c->local_window_max = window_max; packet_start(SSH2_MSG_CHANNEL_WINDOW_ADJUST); packet_put_int(c->remote_id); packet_put_int(c->local_window); @@ -701,28 +693,13 @@ } static void -channel_pre_open_15(Channel *c, fd_set * readset, fd_set * writeset) +channel_pre_open(Channel *c, fd_set * readset, fd_set * writeset) { - /* test whether sockets are 'alive' for read/write */ - if (c->istate == CHAN_INPUT_OPEN) - if (buffer_len(&c->input) < packet_get_maxsize()) - FD_SET(c->sock, readset); - if (c->ostate == CHAN_OUTPUT_OPEN || - c->ostate == CHAN_OUTPUT_WAIT_DRAIN) { - if (buffer_len(&c->output) > 0) { - FD_SET(c->sock, writeset); - } else if (c->ostate == CHAN_OUTPUT_WAIT_DRAIN) { - chan_obuf_empty(c); - } - } -} + u_int limit = compat20 ? c->remote_window : packet_get_maxsize(); -static void -channel_pre_open_20(Channel *c, fd_set * readset, fd_set * writeset) -{ if (c->istate == CHAN_INPUT_OPEN && - c->remote_window > 0 && - buffer_len(&c->input) < c->remote_window) + limit > 0 && + buffer_len(&c->input) < limit) FD_SET(c->rfd, readset); if (c->ostate == CHAN_OUTPUT_OPEN || c->ostate == CHAN_OUTPUT_WAIT_DRAIN) { @@ -733,7 +710,7 @@ } } /** XXX check close conditions, too */ - if (c->efd != -1) { + if (compat20 && c->efd != -1) { if (c->extended_usage == CHAN_EXTENDED_WRITE && buffer_len(&c->extended) > 0) FD_SET(c->efd, writeset); @@ -784,7 +761,7 @@ return 0; /* Parse the lengths of variable-length fields. */ - ucp = (u_char *) buffer_ptr(b); + ucp = buffer_ptr(b); if (ucp[0] == 0x42) { /* Byte order MSB first. */ proto_len = 256 * ucp[6] + ucp[7]; data_len = 256 * ucp[8] + ucp[9]; @@ -793,7 +770,7 @@ data_len = ucp[8] + 256 * ucp[9]; } else { debug("Initial X11 packet contains bad byte order byte: 0x%x", - ucp[0]); + ucp[0]); return -1; } @@ -865,14 +842,19 @@ if (ret == 1) { c->type = SSH_CHANNEL_OPEN; - if (compat20) - channel_pre_open_20(c, readset, writeset); - else - channel_pre_open_15(c, readset, writeset); + channel_pre_open(c, readset, writeset); } else if (ret == -1) { + log("X11 connection rejected because of wrong authentication."); debug("X11 rejected %d i%d/o%d", c->self, c->istate, c->ostate); - chan_read_failed(c); /** force close? */ - chan_write_failed(c); + chan_read_failed(c); + buffer_clear(&c->input); + chan_ibuf_empty(c); + buffer_clear(&c->output); + /* for proto v1, the peer will send an IEOF */ + if (compat20) + chan_write_failed(c); + else + c->type = SSH_CHANNEL_OPEN; debug("X11 closed %d i%d/o%d", c->self, c->istate, c->ostate); } } @@ -883,7 +865,7 @@ { u_char *p, *host; int len, have, i, found; - char username[256]; + char username[256]; struct { u_int8_t version; u_int8_t command; @@ -930,7 +912,7 @@ host = inet_ntoa(s4_req.dest_addr); strlcpy(c->path, host, sizeof(c->path)); c->host_port = ntohs(s4_req.dest_port); - + debug("channel %d: dynamic request: socks4 host %s port %u command %u", c->self, host, c->host_port, s4_req.command); @@ -1002,10 +984,16 @@ debug("X11 connection requested."); addrlen = sizeof(addr); newsock = accept(c->sock, &addr, &addrlen); + if (c->single_connection) { + debug("single_connection: closing X11 listener."); + channel_close_fd(&c->sock); + chan_mark_dead(c); + } if (newsock < 0) { error("accept: %.100s", strerror(errno)); return; } + set_nodelay(newsock); remote_ipaddr = get_peer_ipaddr(newsock); remote_port = get_peer_port(newsock); snprintf(buf, sizeof buf, "X11 connection from %.200s port %d", @@ -1015,17 +1003,12 @@ SSH_CHANNEL_OPENING, newsock, newsock, -1, c->local_window_max, c->local_maxpacket, 0, xstrdup(buf), 1); - if (nc == NULL) { - close(newsock); - xfree(remote_ipaddr); - return; - } if (compat20) { packet_start(SSH2_MSG_CHANNEL_OPEN); packet_put_cstring("x11"); packet_put_int(nc->self); - packet_put_int(c->local_window_max); - packet_put_int(c->local_maxpacket); + packet_put_int(nc->local_window_max); + packet_put_int(nc->local_maxpacket); /* originator ipaddr and port */ packet_put_cstring(remote_ipaddr); if (datafellows & SSH_BUG_X11FWD) { @@ -1133,15 +1116,11 @@ error("accept: %.100s", strerror(errno)); return; } + set_nodelay(newsock); nc = channel_new(rtype, nextstate, newsock, newsock, -1, c->local_window_max, c->local_maxpacket, 0, xstrdup(rtype), 1); - if (nc == NULL) { - error("channel_post_port_listener: no new channel:"); - close(newsock); - return; - } nc->listening_port = c->listening_port; nc->host_port = c->host_port; strlcpy(nc->path, c->path, sizeof(nc->path)); @@ -1184,11 +1163,6 @@ SSH_CHANNEL_OPENING, newsock, newsock, -1, c->local_window_max, c->local_maxpacket, 0, name, 1); - if (nc == NULL) { - error("channel_post_auth_listener: channel_new failed"); - xfree(name); - close(newsock); - } if (compat20) { packet_start(SSH2_MSG_CHANNEL_OPEN); packet_put_cstring("auth-agent@openssh.com"); @@ -1210,8 +1184,7 @@ socklen_t sz = sizeof(err); if (FD_ISSET(c->sock, writeset)) { - if (getsockopt(c->sock, SOL_SOCKET, SO_ERROR, (char *)&err, - &sz) < 0) { + if (getsockopt(c->sock, SOL_SOCKET, SO_ERROR, &err, &sz) < 0) { err = errno; error("getsockopt SO_ERROR failed"); } @@ -1269,7 +1242,7 @@ chan_mark_dead(c); return -1; } else if (compat13) { - buffer_consume(&c->output, buffer_len(&c->output)); + buffer_clear(&c->output); c->type = SSH_CHANNEL_INPUT_DRAINING; debug("channel %d: input draining.", c->self); } else { @@ -1277,7 +1250,7 @@ } return -1; } - if(c->input_filter != NULL) { + if (c->input_filter != NULL) { if (c->input_filter(c, buf, len) == -1) { debug("channel %d: filter stops", c->self); chan_read_failed(c); @@ -1311,7 +1284,7 @@ chan_mark_dead(c); return -1; } else if (compat13) { - buffer_consume(&c->output, buffer_len(&c->output)); + buffer_clear(&c->output); debug("channel %d: input draining.", c->self); c->type = SSH_CHANNEL_INPUT_DRAINING; } else { @@ -1368,7 +1341,7 @@ FD_ISSET(c->efd, readset)) { len = read(c->efd, buf, sizeof(buf)); debug2("channel %d: read %d from efd %d", - c->self, len, c->efd); + c->self, len, c->efd); if (len < 0 && (errno == EINTR || errno == EAGAIN)) return 1; if (len <= 0) { @@ -1403,23 +1376,15 @@ } static void -channel_post_open_1(Channel *c, fd_set * readset, fd_set * writeset) +channel_post_open(Channel *c, fd_set * readset, fd_set * writeset) { if (c->delayed) return; channel_handle_rfd(c, readset, writeset); channel_handle_wfd(c, readset, writeset); -} - -static void -channel_post_open_2(Channel *c, fd_set * readset, fd_set * writeset) -{ - if (c->delayed) + if (!compat20) return; - channel_handle_rfd(c, readset, writeset); - channel_handle_wfd(c, readset, writeset); channel_handle_efd(c, readset, writeset); - channel_check_window(c); } @@ -1432,7 +1397,7 @@ len = write(c->sock, buffer_ptr(&c->output), buffer_len(&c->output)); if (len <= 0) - buffer_consume(&c->output, buffer_len(&c->output)); + buffer_clear(&c->output); else buffer_consume(&c->output, len); } @@ -1441,7 +1406,7 @@ static void channel_handler_init_20(void) { - channel_pre[SSH_CHANNEL_OPEN] = &channel_pre_open_20; + channel_pre[SSH_CHANNEL_OPEN] = &channel_pre_open; channel_pre[SSH_CHANNEL_X11_OPEN] = &channel_pre_x11_open; channel_pre[SSH_CHANNEL_PORT_LISTENER] = &channel_pre_listener; channel_pre[SSH_CHANNEL_RPORT_LISTENER] = &channel_pre_listener; @@ -1450,13 +1415,13 @@ channel_pre[SSH_CHANNEL_CONNECTING] = &channel_pre_connecting; channel_pre[SSH_CHANNEL_DYNAMIC] = &channel_pre_dynamic; - channel_post[SSH_CHANNEL_OPEN] = &channel_post_open_2; + channel_post[SSH_CHANNEL_OPEN] = &channel_post_open; channel_post[SSH_CHANNEL_PORT_LISTENER] = &channel_post_port_listener; channel_post[SSH_CHANNEL_RPORT_LISTENER] = &channel_post_port_listener; channel_post[SSH_CHANNEL_X11_LISTENER] = &channel_post_x11_listener; channel_post[SSH_CHANNEL_AUTH_SOCKET] = &channel_post_auth_listener; channel_post[SSH_CHANNEL_CONNECTING] = &channel_post_connecting; - channel_post[SSH_CHANNEL_DYNAMIC] = &channel_post_open_2; + channel_post[SSH_CHANNEL_DYNAMIC] = &channel_post_open; } static void @@ -1472,19 +1437,19 @@ channel_pre[SSH_CHANNEL_CONNECTING] = &channel_pre_connecting; channel_pre[SSH_CHANNEL_DYNAMIC] = &channel_pre_dynamic; - channel_post[SSH_CHANNEL_OPEN] = &channel_post_open_1; + channel_post[SSH_CHANNEL_OPEN] = &channel_post_open; channel_post[SSH_CHANNEL_X11_LISTENER] = &channel_post_x11_listener; channel_post[SSH_CHANNEL_PORT_LISTENER] = &channel_post_port_listener; channel_post[SSH_CHANNEL_AUTH_SOCKET] = &channel_post_auth_listener; channel_post[SSH_CHANNEL_OUTPUT_DRAINING] = &channel_post_output_drain_13; channel_post[SSH_CHANNEL_CONNECTING] = &channel_post_connecting; - channel_post[SSH_CHANNEL_DYNAMIC] = &channel_post_open_1; + channel_post[SSH_CHANNEL_DYNAMIC] = &channel_post_open; } static void channel_handler_init_15(void) { - channel_pre[SSH_CHANNEL_OPEN] = &channel_pre_open_15; + channel_pre[SSH_CHANNEL_OPEN] = &channel_pre_open; channel_pre[SSH_CHANNEL_X11_OPEN] = &channel_pre_x11_open; channel_pre[SSH_CHANNEL_X11_LISTENER] = &channel_pre_listener; channel_pre[SSH_CHANNEL_PORT_LISTENER] = &channel_pre_listener; @@ -1495,16 +1460,16 @@ channel_post[SSH_CHANNEL_X11_LISTENER] = &channel_post_x11_listener; channel_post[SSH_CHANNEL_PORT_LISTENER] = &channel_post_port_listener; channel_post[SSH_CHANNEL_AUTH_SOCKET] = &channel_post_auth_listener; - channel_post[SSH_CHANNEL_OPEN] = &channel_post_open_1; + channel_post[SSH_CHANNEL_OPEN] = &channel_post_open; channel_post[SSH_CHANNEL_CONNECTING] = &channel_post_connecting; - channel_post[SSH_CHANNEL_DYNAMIC] = &channel_post_open_1; + channel_post[SSH_CHANNEL_DYNAMIC] = &channel_post_open; } static void channel_handler_init(void) { int i; - for(i = 0; i < SSH_CHANNEL_MAX_TYPE; i++) { + for (i = 0; i < SSH_CHANNEL_MAX_TYPE; i++) { channel_pre[i] = NULL; channel_post[i] = NULL; } @@ -1601,7 +1566,7 @@ /* If there is data to send to the connection, enqueue some of it now. */ void -channel_output_poll() +channel_output_poll(void) { int len, i; Channel *c; @@ -1699,7 +1664,7 @@ /* -- protocol input */ void -channel_input_data(int type, int plen, void *ctxt) +channel_input_data(int type, u_int32_t seq, void *ctxt) { int id; char *data; @@ -1723,9 +1688,8 @@ /* Get the data. */ data = packet_get_string(&data_len); - packet_done(); - if (compat20){ + if (compat20) { if (data_len > c->local_maxpacket) { log("channel %d: rcvd big packet %d, maxpack %d", c->self, data_len, c->local_maxpacket); @@ -1737,15 +1701,14 @@ return; } c->local_window -= data_len; - }else{ - packet_integrity_check(plen, 4 + 4 + data_len, type); } + packet_check_eom(); buffer_append(&c->output, data, data_len); xfree(data); } void -channel_input_extended_data(int type, int plen, void *ctxt) +channel_input_extended_data(int type, u_int32_t seq, void *ctxt) { int id; int tcode; @@ -1771,7 +1734,7 @@ return; } data = packet_get_string(&data_len); - packet_done(); + packet_check_eom(); if (data_len > c->local_window) { log("channel %d: rcvd too much extended_data %d, win %d", c->self, data_len, c->local_window); @@ -1785,36 +1748,36 @@ } void -channel_input_ieof(int type, int plen, void *ctxt) +channel_input_ieof(int type, u_int32_t seq, void *ctxt) { int id; Channel *c; - packet_integrity_check(plen, 4, type); - id = packet_get_int(); + packet_check_eom(); c = channel_lookup(id); if (c == NULL) packet_disconnect("Received ieof for nonexistent channel %d.", id); chan_rcvd_ieof(c); /* XXX force input close */ - if (c->force_drain) { + if (c->force_drain && c->istate == CHAN_INPUT_OPEN) { debug("channel %d: FORCE input drain", c->self); c->istate = CHAN_INPUT_WAIT_DRAIN; + if (buffer_len(&c->input) == 0) + chan_ibuf_empty(c); } } void -channel_input_close(int type, int plen, void *ctxt) +channel_input_close(int type, u_int32_t seq, void *ctxt) { int id; Channel *c; - packet_integrity_check(plen, 4, type); - id = packet_get_int(); + packet_check_eom(); c = channel_lookup(id); if (c == NULL) packet_disconnect("Received close for nonexistent channel %d.", id); @@ -1839,30 +1802,31 @@ * Not a closed channel - mark it as draining, which will * cause it to be freed later. */ - buffer_consume(&c->input, buffer_len(&c->input)); + buffer_clear(&c->input); c->type = SSH_CHANNEL_OUTPUT_DRAINING; } } /* proto version 1.5 overloads CLOSE_CONFIRMATION with OCLOSE */ void -channel_input_oclose(int type, int plen, void *ctxt) +channel_input_oclose(int type, u_int32_t seq, void *ctxt) { int id = packet_get_int(); Channel *c = channel_lookup(id); - packet_integrity_check(plen, 4, type); + + packet_check_eom(); if (c == NULL) packet_disconnect("Received oclose for nonexistent channel %d.", id); chan_rcvd_oclose(c); } void -channel_input_close_confirmation(int type, int plen, void *ctxt) +channel_input_close_confirmation(int type, u_int32_t seq, void *ctxt) { int id = packet_get_int(); Channel *c = channel_lookup(id); - packet_done(); + packet_check_eom(); if (c == NULL) packet_disconnect("Received close confirmation for " "out-of-range channel %d.", id); @@ -1873,14 +1837,11 @@ } void -channel_input_open_confirmation(int type, int plen, void *ctxt) +channel_input_open_confirmation(int type, u_int32_t seq, void *ctxt) { int id, remote_id; Channel *c; - if (!compat20) - packet_integrity_check(plen, 4 + 4, type); - id = packet_get_int(); c = channel_lookup(id); @@ -1895,21 +1856,21 @@ if (compat20) { c->remote_window = packet_get_int(); c->remote_maxpacket = packet_get_int(); - packet_done(); - if (c->cb_fn != NULL && c->cb_event == type) { + if (c->confirm) { debug2("callback start"); - c->cb_fn(c->self, c->cb_arg); + c->confirm(c->self, NULL); debug2("callback done"); } debug("channel %d: open confirm rwindow %d rmax %d", c->self, c->remote_window, c->remote_maxpacket); } + packet_check_eom(); } static char * reason2txt(int reason) { - switch(reason) { + switch (reason) { case SSH2_OPEN_ADMINISTRATIVELY_PROHIBITED: return "administratively prohibited"; case SSH2_OPEN_CONNECT_FAILED: @@ -1923,15 +1884,12 @@ } void -channel_input_open_failure(int type, int plen, void *ctxt) +channel_input_open_failure(int type, u_int32_t seq, void *ctxt) { int id, reason; char *msg = NULL, *lang = NULL; Channel *c; - if (!compat20) - packet_integrity_check(plen, 4, type); - id = packet_get_int(); c = channel_lookup(id); @@ -1944,7 +1902,6 @@ msg = packet_get_string(NULL); lang = packet_get_string(NULL); } - packet_done(); log("channel %d: open failed: %s%s%s", id, reason2txt(reason), msg ? ": ": "", msg ? msg : ""); if (msg != NULL) @@ -1952,37 +1909,13 @@ if (lang != NULL) xfree(lang); } + packet_check_eom(); /* Free the channel. This will also close the socket. */ channel_free(c); } void -channel_input_channel_request(int type, int plen, void *ctxt) -{ - int id; - Channel *c; - - id = packet_get_int(); - c = channel_lookup(id); - - if (c == NULL || - (c->type != SSH_CHANNEL_OPEN && c->type != SSH_CHANNEL_LARVAL)) - packet_disconnect("Received request for " - "non-open channel %d.", id); - if (c->cb_fn != NULL && c->cb_event == type) { - debug2("callback start"); - c->cb_fn(c->self, c->cb_arg); - debug2("callback done"); - } else { - char *service = packet_get_string(NULL); - debug("channel %d: rcvd request for %s", c->self, service); - debug("cb_fn %p cb_event %d", c->cb_fn , c->cb_event); - xfree(service); - } -} - -void -channel_input_window_adjust(int type, int plen, void *ctxt) +channel_input_window_adjust(int type, u_int32_t seq, void *ctxt) { Channel *c; int id, adjust; @@ -2000,13 +1933,13 @@ return; } adjust = packet_get_int(); - packet_done(); + packet_check_eom(); debug2("channel %d: rcvd adjust %d", id, adjust); c->remote_window += adjust; } void -channel_input_port_open(int type, int plen, void *ctxt) +channel_input_port_open(int type, u_int32_t seq, void *ctxt) { Channel *c = NULL; u_short host_port; @@ -2022,18 +1955,13 @@ } else { originator_string = xstrdup("unknown (remote did not supply name)"); } - packet_done(); + packet_check_eom(); sock = channel_connect_to(host, host_port); if (sock != -1) { c = channel_new("connected socket", SSH_CHANNEL_CONNECTING, sock, sock, -1, 0, 0, 0, originator_string, 1); - if (c == NULL) { - error("channel_input_port_open: channel_new failed"); - close(sock); - } else { - c->remote_id = remote_id; - } + c->remote_id = remote_id; } if (c == NULL) { packet_start(SSH_MSG_CHANNEL_OPEN_FAILURE); @@ -2052,53 +1980,30 @@ IPv4or6 = af; } -/* - * Initiate forwarding of connections to local port "port" through the secure - * channel to host:port from remote side. - */ -int -channel_request_local_forwarding(u_short listen_port, const char *host_to_connect, - u_short port_to_connect, int gateway_ports) -{ - return channel_request_forwarding( - NULL, listen_port, - host_to_connect, port_to_connect, - gateway_ports, /*remote_fwd*/ 0); -} - -/* - * If 'remote_fwd' is true we have a '-R style' listener for protocol 2 - * (SSH_CHANNEL_RPORT_LISTENER). - */ -int -channel_request_forwarding( - const char *listen_address, u_short listen_port, - const char *host_to_connect, u_short port_to_connect, - int gateway_ports, int remote_fwd) +static int +channel_setup_fwd_listener(int type, const char *listen_addr, u_short listen_port, + const char *host_to_connect, u_short port_to_connect, int gateway_ports) { Channel *c; - int success, sock, on = 1, type; + int success, sock, on = 1; struct addrinfo hints, *ai, *aitop; - char ntop[NI_MAXHOST], strport[NI_MAXSERV]; const char *host; + char ntop[NI_MAXHOST], strport[NI_MAXSERV]; struct linger linger; success = 0; + host = (type == SSH_CHANNEL_RPORT_LISTENER) ? + listen_addr : host_to_connect; - if (remote_fwd) { - host = listen_address; - type = SSH_CHANNEL_RPORT_LISTENER; - } else { - host = host_to_connect; - type = SSH_CHANNEL_PORT_LISTENER; + if (host == NULL) { + error("No forward host name."); + return success; } - if (strlen(host) > SSH_CHANNEL_PATH_LEN - 1) { error("Forward host name too long."); return success; } - /* XXX listen_address is currently ignored */ /* * getaddrinfo returns a loopback address if the hostname is * set to NULL and hints.ai_flags is not AI_PASSIVE @@ -2116,7 +2021,7 @@ continue; if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop, sizeof(ntop), strport, sizeof(strport), NI_NUMERICHOST|NI_NUMERICSERV) != 0) { - error("channel_request_forwarding: getnameinfo failed"); + error("channel_setup_fwd_listener: getnameinfo failed"); continue; } /* Create a port to listen for the host. */ @@ -2130,10 +2035,10 @@ * Set socket options. We would like the socket to disappear * as soon as it has been closed for whatever reason. */ - setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *)&on, sizeof(on)); + setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); linger.l_onoff = 1; linger.l_linger = 5; - setsockopt(sock, SOL_SOCKET, SO_LINGER, (void *)&linger, sizeof(linger)); + setsockopt(sock, SOL_SOCKET, SO_LINGER, &linger, sizeof(linger)); debug("Local forwarding listening on %s port %s.", ntop, strport); /* Bind the socket to the address. */ @@ -2157,23 +2062,36 @@ c = channel_new("port listener", type, sock, sock, -1, CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, xstrdup("port listener"), 1); - if (c == NULL) { - error("channel_request_forwarding: channel_new failed"); - close(sock); - continue; - } strlcpy(c->path, host, sizeof(c->path)); c->host_port = port_to_connect; c->listening_port = listen_port; success = 1; } if (success == 0) - error("channel_request_forwarding: cannot listen to port: %d", + error("channel_setup_fwd_listener: cannot listen to port: %d", listen_port); freeaddrinfo(aitop); return success; } +/* protocol local port fwd, used by ssh (and sshd in v1) */ +int +channel_setup_local_fwd_listener(u_short listen_port, + const char *host_to_connect, u_short port_to_connect, int gateway_ports) +{ + return channel_setup_fwd_listener(SSH_CHANNEL_PORT_LISTENER, + NULL, listen_port, host_to_connect, port_to_connect, gateway_ports); +} + +/* protocol v2 remote port fwd, used by sshd */ +int +channel_setup_remote_fwd_listener(const char *listen_address, + u_short listen_port, int gateway_ports) +{ + return channel_setup_fwd_listener(SSH_CHANNEL_RPORT_LISTENER, + listen_address, listen_port, NULL, 0, gateway_ports); +} + /* * Initiate forwarding of connections to port "port" on remote host through * the secure channel to host:port from local side. @@ -2183,7 +2101,7 @@ channel_request_remote_forwarding(u_short listen_port, const char *host_to_connect, u_short port_to_connect) { - int payload_len, type, success = 0; + int type, success = 0; /* Record locally that connection to this host/port is permitted. */ if (num_permitted_opens >= SSH_MAX_FORWARDS_PER_DIRECTION) @@ -2210,7 +2128,7 @@ packet_write_wait(); /* Wait for response from the remote side. */ - type = packet_read(&payload_len); + type = packet_read(); switch (type) { case SSH_SMSG_SUCCESS: success = 1; @@ -2259,7 +2177,7 @@ port); #endif /* Initiate forwarding */ - channel_request_local_forwarding(port, hostname, host_port, gateway_ports); + channel_setup_local_fwd_listener(port, hostname, host_port, gateway_ports); /* Free the argument string. */ xfree(hostname); @@ -2271,7 +2189,7 @@ * anyway, and the server has no way to know but to trust the client anyway. */ void -channel_permit_all_opens() +channel_permit_all_opens(void) { if (num_permitted_opens == 0) all_opens_permitted = 1; @@ -2352,6 +2270,7 @@ return -1; } /* success */ + set_nodelay(sock); return sock; } @@ -2396,32 +2315,32 @@ /* * Creates an internet domain socket for listening for X11 connections. - * Returns a suitable value for the DISPLAY variable, or NULL if an error - * occurs. + * Returns a suitable display number for the DISPLAY variable, or -1 if + * an error occurs. */ -char * -x11_create_display_inet(int screen_number, int x11_display_offset) +int +x11_create_display_inet(int x11_display_offset, int x11_use_localhost, + int single_connection) { + Channel *nc = NULL; int display_number, sock; u_short port; struct addrinfo hints, *ai, *aitop; char strport[NI_MAXSERV]; int gaierr, n, num_socks = 0, socks[NUM_SOCKS]; - char display[512]; - char hostname[MAXHOSTNAMELEN]; for (display_number = x11_display_offset; - display_number < MAX_DISPLAYS; - display_number++) { + display_number < MAX_DISPLAYS; + display_number++) { port = 6000 + display_number; memset(&hints, 0, sizeof(hints)); hints.ai_family = IPv4or6; - hints.ai_flags = AI_PASSIVE; /* XXX loopback only ? */ + hints.ai_flags = x11_use_localhost ? 0: AI_PASSIVE; hints.ai_socktype = SOCK_STREAM; snprintf(strport, sizeof strport, "%d", port); if ((gaierr = getaddrinfo(NULL, strport, &hints, &aitop)) != 0) { error("getaddrinfo: %.100s", gai_strerror(gaierr)); - return NULL; + return -1; } for (ai = aitop; ai; ai = ai->ai_next) { if (ai->ai_family != AF_INET && ai->ai_family != AF_INET6) @@ -2430,7 +2349,7 @@ if (sock < 0) { if ((errno != EINVAL) && (errno != EAFNOSUPPORT)) { error("socket: %.100s", strerror(errno)); - return NULL; + return -1; } else { debug("x11_create_display_inet: Socket family %d not supported", ai->ai_family); @@ -2439,14 +2358,12 @@ } if (bind(sock, ai->ai_addr, ai->ai_addrlen) < 0) { debug("bind port %d: %.100s", port, strerror(errno)); - shutdown(sock, SHUT_RDWR); close(sock); if (ai->ai_next) continue; for (n = 0; n < num_socks; n++) { - shutdown(socks[n], SHUT_RDWR); close(socks[n]); } num_socks = 0; @@ -2466,103 +2383,47 @@ } if (display_number >= MAX_DISPLAYS) { error("Failed to allocate internet-domain X11 display socket."); - return NULL; + return -1; } /* Start listening for connections on the socket. */ for (n = 0; n < num_socks; n++) { sock = socks[n]; if (listen(sock, 5) < 0) { error("listen: %.100s", strerror(errno)); - shutdown(sock, SHUT_RDWR); close(sock); - return NULL; - } - } - - /* Set up a suitable value for the DISPLAY variable. */ - if (gethostname(hostname, sizeof(hostname)) < 0) - fatal("gethostname: %.100s", strerror(errno)); - -#ifdef IPADDR_IN_DISPLAY - /* - * HPUX detects the local hostname in the DISPLAY variable and tries - * to set up a shared memory connection to the server, which it - * incorrectly supposes to be local. - * - * The workaround - as used in later $$H and other programs - is - * is to set display to the host's IP address. - */ - { - struct hostent *he; - struct in_addr my_addr; - - he = gethostbyname(hostname); - if (he == NULL) { - error("[X11-broken-fwd-hostname-workaround] Could not get " - "IP address for hostname %s.", hostname); - - packet_send_debug("[X11-broken-fwd-hostname-workaround]" - "Could not get IP address for hostname %s.", hostname); - - shutdown(sock, SHUT_RDWR); - close(sock); - - return NULL; + return -1; } - - memcpy(&my_addr, he->h_addr_list[0], sizeof(struct in_addr)); - - /* Set DISPLAY to :screen.display */ - snprintf(display, sizeof(display), "%.50s:%d.%d", inet_ntoa(my_addr), - display_number, screen_number); } -#else /* IPADDR_IN_DISPLAY */ - /* Just set DISPLAY to hostname:screen.display */ - snprintf(display, sizeof display, "%.400s:%d.%d", hostname, - display_number, screen_number); -#endif /* IPADDR_IN_DISPLAY */ /* Allocate a channel for each socket. */ for (n = 0; n < num_socks; n++) { sock = socks[n]; - (void) channel_new("x11 listener", + nc = channel_new("x11 listener", SSH_CHANNEL_X11_LISTENER, sock, sock, -1, CHAN_X11_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0, xstrdup("X11 inet listener"), 1); + nc->single_connection = single_connection; } - /* Return a suitable value for the DISPLAY environment variable. */ - return xstrdup(display); + /* Return the display number for the DISPLAY environment variable. */ + return display_number; } -#ifndef X_UNIX_PATH -#define X_UNIX_PATH "/tmp/.X11-unix/X" -#endif - static int connect_local_xsocket(u_int dnr) { - static const char *const x_sockets[] = { - X_UNIX_PATH "%u", - "/var/X/.X11-unix/X" "%u", - "/usr/spool/sockets/X11/" "%u", - NULL - }; int sock; struct sockaddr_un addr; - const char *const * path; - for (path = x_sockets; *path; ++path) { - sock = socket(AF_UNIX, SOCK_STREAM, 0); - if (sock < 0) - error("socket: %.100s", strerror(errno)); - memset(&addr, 0, sizeof(addr)); - addr.sun_family = AF_UNIX; - snprintf(addr.sun_path, sizeof addr.sun_path, *path, dnr); - if (connect(sock, (struct sockaddr *) & addr, sizeof(addr)) == 0) - return sock; - close(sock); - } + sock = socket(AF_UNIX, SOCK_STREAM, 0); + if (sock < 0) + error("socket: %.100s", strerror(errno)); + memset(&addr, 0, sizeof(addr)); + addr.sun_family = AF_UNIX; + snprintf(addr.sun_path, sizeof addr.sun_path, _PATH_UNIX_X, dnr); + if (connect(sock, (struct sockaddr *) & addr, sizeof(addr)) == 0) + return sock; + close(sock); error("connect %.100s: %.100s", addr.sun_path, strerror(errno)); return -1; } @@ -2597,7 +2458,7 @@ /* Connect to the unix domain socket. */ if (sscanf(strrchr(display, ':') + 1, "%d", &display_number) != 1) { error("Could not parse display number from DISPLAY: %.100s", - display); + display); return -1; } /* Create a socket. */ @@ -2612,8 +2473,7 @@ * Connect to an inet socket. The DISPLAY value is supposedly * hostname:d[.s], where hostname may also be numeric IP address. */ - strncpy(buf, display, sizeof(buf)); - buf[sizeof(buf) - 1] = 0; + strlcpy(buf, display, sizeof(buf)); cp = strchr(buf, ':'); if (!cp) { error("Could not find ':' in DISPLAY: %.100s", display); @@ -2623,7 +2483,7 @@ /* buf now contains the host name. But first we parse the display number. */ if (sscanf(cp + 1, "%d", &display_number) != 1) { error("Could not parse display number from DISPLAY: %.100s", - display); + display); return -1; } @@ -2659,6 +2519,7 @@ strerror(errno)); return -1; } + set_nodelay(sock); return sock; } @@ -2669,7 +2530,7 @@ */ void -x11_input_open(int type, int plen, void *ctxt) +x11_input_open(int type, u_int32_t seq, void *ctxt) { Channel *c = NULL; int remote_id, sock = 0; @@ -2684,7 +2545,7 @@ } else { remote_host = xstrdup("unknown (remote did not supply name)"); } - packet_done(); + packet_check_eom(); /* Obtain a connection to the real X display. */ sock = x11_connect_display(); @@ -2693,13 +2554,8 @@ c = channel_new("connected x11 socket", SSH_CHANNEL_X11_OPEN, sock, sock, -1, 0, 0, 0, remote_host, 1); - if (c == NULL) { - error("x11_input_open: channel_new failed"); - close(sock); - } else { - c->remote_id = remote_id; - c->force_drain = 1; - } + c->remote_id = remote_id; + c->force_drain = 1; } if (c == NULL) { /* Send refusal to the remote host. */ @@ -2716,10 +2572,10 @@ /* dummy protocol handler that denies SSH-1 requests (agent/x11) */ void -deny_input_open(int type, int plen, void *ctxt) +deny_input_open(int type, u_int32_t seq, void *ctxt) { int rchan = packet_get_int(); - switch(type){ + switch (type) { case SSH_SMSG_AGENT_OPEN: error("Warning: ssh server tried agent forwarding."); break; @@ -2727,7 +2583,7 @@ error("Warning: ssh server tried X11 forwarding."); break; default: - error("deny_input_open: type %d plen %d", type, plen); + error("deny_input_open: type %d", type); break; } error("Warning: this is probably a break in attempt by a malicious server."); @@ -2811,7 +2667,7 @@ /* Sends a message to the server to request authentication fd forwarding. */ void -auth_request_forwarding() +auth_request_forwarding(void) { packet_start(SSH_CMSG_AGENT_REQUEST_FORWARDING); packet_send(); @@ -2825,7 +2681,7 @@ */ char * -auth_get_socket_name() +auth_get_socket_name(void) { return auth_sock_name; } @@ -2896,8 +2752,7 @@ /* Bind it to the name. */ memset(&sunaddr, 0, sizeof(sunaddr)); sunaddr.sun_family = AF_UNIX; - strncpy(sunaddr.sun_path, auth_sock_name, - sizeof(sunaddr.sun_path)); + strlcpy(sunaddr.sun_path, auth_sock_name, sizeof(sunaddr.sun_path)); if (bind(sock, (struct sockaddr *) & sunaddr, sizeof(sunaddr)) < 0) packet_disconnect("bind: %.100s", strerror(errno)); @@ -2914,13 +2769,6 @@ SSH_CHANNEL_AUTH_SOCKET, sock, sock, -1, CHAN_X11_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0, xstrdup("auth socket"), 1); - if (nc == NULL) { - error("auth_input_request_forwarding: channel_new failed"); - auth_sock_cleanup_proc(pw); - fatal_remove_cleanup(auth_sock_cleanup_proc, pw); - close(sock); - return 0; - } strlcpy(nc->path, auth_sock_name, sizeof(nc->path)); return 1; } @@ -2928,16 +2776,15 @@ /* This is called to process an SSH_SMSG_AGENT_OPEN message. */ void -auth_input_open_request(int type, int plen, void *ctxt) +auth_input_open_request(int type, u_int32_t seq, void *ctxt) { Channel *c = NULL; int remote_id, sock; char *name; - packet_integrity_check(plen, 4, type); - /* Read the remote channel number from the message. */ remote_id = packet_get_int(); + packet_check_eom(); /* * Get a connection to the local authentication agent (this may again @@ -2955,14 +2802,8 @@ name = xstrdup("authentication agent connection"); c = channel_new("", SSH_CHANNEL_OPEN, sock, sock, -1, 0, 0, 0, name, 1); - if (c == NULL) { - error("auth_input_open_request: channel_new failed"); - xfree(name); - close(sock); - } else { - c->remote_id = remote_id; - c->force_drain = 1; - } + c->remote_id = remote_id; + c->force_drain = 1; } if (c == NULL) { packet_start(SSH_MSG_CHANNEL_OPEN_FAILURE); diff -ru openssh-3.0.2p1/channels.h openssh-3.1p1/channels.h --- openssh-3.0.2p1/channels.h 2001-11-12 11:04:55.000000000 +1100 +++ openssh-3.1p1/channels.h 2002-03-05 12:53:04.000000000 +1100 @@ -1,3 +1,5 @@ +/* $OpenBSD: channels.h,v 1.65 2002/03/04 17:27:39 stevesk Exp $ */ + /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -10,7 +12,7 @@ * called by a name other than "ssh" or "Secure Shell". */ /* - * Copyright (c) 1999, 2000, 2001 Markus Friedl. All rights reserved. + * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -32,7 +34,6 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* RCSID("$OpenBSD: channels.h,v 1.51 2001/11/07 22:53:21 markus Exp $"); */ #ifndef CHANNEL_H #define CHANNEL_H @@ -68,8 +69,8 @@ int type; /* channel type/state */ int self; /* my own channel identifier */ int remote_id; /* channel identifier for remote peer */ - int istate; /* input from channel (state of receive half) */ - int ostate; /* output to channel (state of transmit half) */ + u_int istate; /* input from channel (state of receive half) */ + u_int ostate; /* output to channel (state of transmit half) */ int flags; /* close sent/rcvd */ int rfd; /* read fd */ int wfd; /* write fd */ @@ -96,13 +97,12 @@ int local_consumed; int local_maxpacket; int extended_usage; + int single_connection; char *ctype; /* type */ /* callback */ - channel_callback_fn *cb_fn; - void *cb_arg; - int cb_event; + channel_callback_fn *confirm; channel_callback_fn *detach_user; /* filter */ @@ -114,24 +114,24 @@ #define CHAN_EXTENDED_WRITE 2 /* default window/packet sizes for tcp/x11-fwd-channel */ -#define CHAN_SES_WINDOW_DEFAULT (32*1024) -#define CHAN_SES_PACKET_DEFAULT (CHAN_SES_WINDOW_DEFAULT/2) -#define CHAN_TCP_WINDOW_DEFAULT (32*1024) -#define CHAN_TCP_PACKET_DEFAULT (CHAN_TCP_WINDOW_DEFAULT/2) -#define CHAN_X11_WINDOW_DEFAULT (4*1024) -#define CHAN_X11_PACKET_DEFAULT (CHAN_X11_WINDOW_DEFAULT/2) +#define CHAN_SES_PACKET_DEFAULT (32*1024) +#define CHAN_SES_WINDOW_DEFAULT (4*CHAN_SES_PACKET_DEFAULT) +#define CHAN_TCP_PACKET_DEFAULT (32*1024) +#define CHAN_TCP_WINDOW_DEFAULT (4*CHAN_TCP_PACKET_DEFAULT) +#define CHAN_X11_PACKET_DEFAULT (16*1024) +#define CHAN_X11_WINDOW_DEFAULT (4*CHAN_X11_PACKET_DEFAULT) /* possible input states */ -#define CHAN_INPUT_OPEN 0x01 -#define CHAN_INPUT_WAIT_DRAIN 0x02 -#define CHAN_INPUT_WAIT_OCLOSE 0x04 -#define CHAN_INPUT_CLOSED 0x08 +#define CHAN_INPUT_OPEN 0 +#define CHAN_INPUT_WAIT_DRAIN 1 +#define CHAN_INPUT_WAIT_OCLOSE 2 +#define CHAN_INPUT_CLOSED 3 /* possible output states */ -#define CHAN_OUTPUT_OPEN 0x10 -#define CHAN_OUTPUT_WAIT_DRAIN 0x20 -#define CHAN_OUTPUT_WAIT_IEOF 0x40 -#define CHAN_OUTPUT_CLOSED 0x80 +#define CHAN_OUTPUT_OPEN 0 +#define CHAN_OUTPUT_WAIT_DRAIN 1 +#define CHAN_OUTPUT_WAIT_IEOF 2 +#define CHAN_OUTPUT_CLOSED 3 #define CHAN_CLOSE_SENT 0x01 #define CHAN_CLOSE_RCVD 0x02 @@ -140,33 +140,31 @@ Channel *channel_lookup(int); Channel *channel_new(char *, int, int, int, int, int, int, int, char *, int); -void channel_set_fds(int, int, int, int, int, int); +void channel_set_fds(int, int, int, int, int, int, u_int); void channel_free(Channel *); void channel_free_all(void); void channel_stop_listening(void); void channel_send_open(int); -void channel_request(int, char *, int); void channel_request_start(int, char *, int); -void channel_register_callback(int, int mtype, channel_callback_fn *, void *); void channel_register_cleanup(int, channel_callback_fn *); +void channel_register_confirm(int, channel_callback_fn *); void channel_register_filter(int, channel_filter_fn *); void channel_cancel_cleanup(int); int channel_close_fd(int *); /* protocol handler */ -void channel_input_channel_request(int, int, void *); -void channel_input_close(int, int, void *); -void channel_input_close_confirmation(int, int, void *); -void channel_input_data(int, int, void *); -void channel_input_extended_data(int, int, void *); -void channel_input_ieof(int, int, void *); -void channel_input_oclose(int, int, void *); -void channel_input_open_confirmation(int, int, void *); -void channel_input_open_failure(int, int, void *); -void channel_input_port_open(int, int, void *); -void channel_input_window_adjust(int, int, void *); +void channel_input_close(int, u_int32_t, void *); +void channel_input_close_confirmation(int, u_int32_t, void *); +void channel_input_data(int, u_int32_t, void *); +void channel_input_extended_data(int, u_int32_t, void *); +void channel_input_ieof(int, u_int32_t, void *); +void channel_input_oclose(int, u_int32_t, void *); +void channel_input_open_confirmation(int, u_int32_t, void *); +void channel_input_open_failure(int, u_int32_t, void *); +void channel_input_port_open(int, u_int32_t, void *); +void channel_input_window_adjust(int, u_int32_t, void *); /* file descriptor handling (read/write) */ @@ -189,20 +187,16 @@ int channel_connect_to(const char *, u_short); int channel_connect_by_listen_address(u_short); void channel_request_remote_forwarding(u_short, const char *, u_short); -int channel_request_local_forwarding(u_short, const char *, u_short, int); -int -channel_request_forwarding(const char *, u_short, const char *, u_short, int, - int); +int channel_setup_local_fwd_listener(u_short, const char *, u_short, int); +int channel_setup_remote_fwd_listener(const char *, u_short, int); /* x11 forwarding */ int x11_connect_display(void); -char *x11_create_display(int); -char *x11_create_display_inet(int, int); -void x11_input_open(int, int, void *); -void x11_request_forwarding(void); +int x11_create_display_inet(int, int, int); +void x11_input_open(int, u_int32_t, void *); void x11_request_forwarding_with_spoofing(int, const char *, const char *); -void deny_input_open(int, int, void *); +void deny_input_open(int, u_int32_t, void *); /* agent forwarding */ @@ -210,25 +204,21 @@ char *auth_get_socket_name(void); void auth_sock_cleanup_proc(void *); int auth_input_request_forwarding(struct passwd *); -void auth_input_open_request(int, int, void *); +void auth_input_open_request(int, u_int32_t, void *); /* channel close */ int chan_is_dead(Channel *, int); void chan_mark_dead(Channel *); -void chan_init_iostates(Channel *); -void chan_init(void); -typedef void chan_event_fn(Channel *); +/* channel events */ -/* for the input state */ -extern chan_event_fn *chan_rcvd_oclose; -extern chan_event_fn *chan_read_failed; -extern chan_event_fn *chan_ibuf_empty; - -/* for the output state */ -extern chan_event_fn *chan_rcvd_ieof; -extern chan_event_fn *chan_write_failed; -extern chan_event_fn *chan_obuf_empty; +void chan_rcvd_oclose(Channel *); +void chan_read_failed(Channel *); +void chan_ibuf_empty(Channel *); + +void chan_rcvd_ieof(Channel *); +void chan_write_failed(Channel *); +void chan_obuf_empty(Channel *); #endif diff -ru openssh-3.0.2p1/cipher.c openssh-3.1p1/cipher.c --- openssh-3.0.2p1/cipher.c 2001-09-14 12:47:34.000000000 +1000 +++ openssh-3.1p1/cipher.c 2002-02-19 15:26:43.000000000 +1100 @@ -35,389 +35,60 @@ */ #include "includes.h" -RCSID("$OpenBSD: cipher.c,v 1.47 2001/08/23 11:31:59 markus Exp $"); +RCSID("$OpenBSD: cipher.c,v 1.52 2002/02/18 13:05:32 markus Exp $"); #include "xmalloc.h" #include "log.h" #include "cipher.h" #include +#include "rijndael.h" -/* no encryption */ -static void -none_setkey(CipherContext *cc, const u_char *key, u_int keylen) -{ -} -static void -none_setiv(CipherContext *cc, const u_char *iv, u_int ivlen) -{ -} -static void -none_crypt(CipherContext *cc, u_char *dest, const u_char *src, u_int len) -{ - memcpy(dest, src, len); -} - -/* DES */ -static void -des_ssh1_setkey(CipherContext *cc, const u_char *key, u_int keylen) -{ - static int dowarn = 1; - if (dowarn) { - error("Warning: use of DES is strongly discouraged " - "due to cryptographic weaknesses"); - dowarn = 0; - } - des_set_key((void *)key, cc->u.des.key); -} -static void -des_ssh1_setiv(CipherContext *cc, const u_char *iv, u_int ivlen) -{ - memset(cc->u.des.iv, 0, sizeof(cc->u.des.iv)); -} -static void -des_ssh1_encrypt(CipherContext *cc, u_char *dest, const u_char *src, u_int len) -{ - des_ncbc_encrypt(src, dest, len, cc->u.des.key, &cc->u.des.iv, - DES_ENCRYPT); -} -static void -des_ssh1_decrypt(CipherContext *cc, u_char *dest, const u_char *src, u_int len) -{ - des_ncbc_encrypt(src, dest, len, cc->u.des.key, &cc->u.des.iv, - DES_DECRYPT); -} - -/* 3DES */ -static void -des3_setkey(CipherContext *cc, const u_char *key, u_int keylen) -{ - des_set_key((void *) key, cc->u.des3.key1); - des_set_key((void *) (key+8), cc->u.des3.key2); - des_set_key((void *) (key+16), cc->u.des3.key3); -} -static void -des3_setiv(CipherContext *cc, const u_char *iv, u_int ivlen) -{ - memset(cc->u.des3.iv1, 0, sizeof(cc->u.des3.iv1)); - memset(cc->u.des3.iv2, 0, sizeof(cc->u.des3.iv2)); - memset(cc->u.des3.iv3, 0, sizeof(cc->u.des3.iv3)); - if (iv == NULL) - return; - memcpy(cc->u.des3.iv3, (char *)iv, 8); -} -static void -des3_cbc_encrypt(CipherContext *cc, u_char *dest, const u_char *src, u_int len) -{ - des_ede3_cbc_encrypt(src, dest, len, - cc->u.des3.key1, cc->u.des3.key2, cc->u.des3.key3, - &cc->u.des3.iv3, DES_ENCRYPT); -} -static void -des3_cbc_decrypt(CipherContext *cc, u_char *dest, const u_char *src, u_int len) -{ - des_ede3_cbc_encrypt(src, dest, len, - cc->u.des3.key1, cc->u.des3.key2, cc->u.des3.key3, - &cc->u.des3.iv3, DES_DECRYPT); -} - -/* - * This is used by SSH1: - * - * What kind of triple DES are these 2 routines? - * - * Why is there a redundant initialization vector? - * - * If only iv3 was used, then, this would till effect have been - * outer-cbc. However, there is also a private iv1 == iv2 which - * perhaps makes differential analysis easier. On the other hand, the - * private iv1 probably makes the CRC-32 attack ineffective. This is a - * result of that there is no longer any known iv1 to use when - * choosing the X block. - */ -static void -des3_ssh1_setkey(CipherContext *cc, const u_char *key, u_int keylen) -{ - des_set_key((void *) key, cc->u.des3.key1); - des_set_key((void *) (key+8), cc->u.des3.key2); - if (keylen <= 16) - des_set_key((void *) key, cc->u.des3.key3); - else - des_set_key((void *) (key+16), cc->u.des3.key3); -} -static void -des3_ssh1_encrypt(CipherContext *cc, u_char *dest, const u_char *src, - u_int len) -{ - des_ncbc_encrypt(src, dest, len, cc->u.des3.key1, &cc->u.des3.iv1, - DES_ENCRYPT); - des_ncbc_encrypt(dest, dest, len, cc->u.des3.key2, &cc->u.des3.iv2, - DES_DECRYPT); - des_ncbc_encrypt(dest, dest, len, cc->u.des3.key3, &cc->u.des3.iv3, - DES_ENCRYPT); -} -static void -des3_ssh1_decrypt(CipherContext *cc, u_char *dest, const u_char *src, - u_int len) -{ - des_ncbc_encrypt(src, dest, len, cc->u.des3.key3, &cc->u.des3.iv3, - DES_DECRYPT); - des_ncbc_encrypt(dest, dest, len, cc->u.des3.key2, &cc->u.des3.iv2, - DES_ENCRYPT); - des_ncbc_encrypt(dest, dest, len, cc->u.des3.key1, &cc->u.des3.iv1, - DES_DECRYPT); -} - -/* Blowfish */ -static void -blowfish_setkey(CipherContext *cc, const u_char *key, u_int keylen) -{ - BF_set_key(&cc->u.bf.key, keylen, (u_char *)key); -} -static void -blowfish_setiv(CipherContext *cc, const u_char *iv, u_int ivlen) -{ - if (iv == NULL) - memset(cc->u.bf.iv, 0, 8); - else - memcpy(cc->u.bf.iv, (char *)iv, 8); -} -static void -blowfish_cbc_encrypt(CipherContext *cc, u_char *dest, const u_char *src, - u_int len) -{ - BF_cbc_encrypt((void *)src, dest, len, &cc->u.bf.key, cc->u.bf.iv, - BF_ENCRYPT); -} -static void -blowfish_cbc_decrypt(CipherContext *cc, u_char *dest, const u_char *src, - u_int len) -{ - BF_cbc_encrypt((void *)src, dest, len, &cc->u.bf.key, cc->u.bf.iv, - BF_DECRYPT); -} - -/* - * SSH1 uses a variation on Blowfish, all bytes must be swapped before - * and after encryption/decryption. Thus the swap_bytes stuff (yuk). - */ -static void -swap_bytes(const u_char *src, u_char *dst, int n) -{ - char c[4]; - - /* Process 4 bytes every lap. */ - for (n = n / 4; n > 0; n--) { - c[3] = *src++; - c[2] = *src++; - c[1] = *src++; - c[0] = *src++; - - *dst++ = c[0]; - *dst++ = c[1]; - *dst++ = c[2]; - *dst++ = c[3]; - } -} - -static void -blowfish_ssh1_encrypt(CipherContext *cc, u_char *dest, const u_char *src, - u_int len) -{ - swap_bytes(src, dest, len); - BF_cbc_encrypt((void *)dest, dest, len, &cc->u.bf.key, cc->u.bf.iv, - BF_ENCRYPT); - swap_bytes(dest, dest, len); -} -static void -blowfish_ssh1_decrypt(CipherContext *cc, u_char *dest, const u_char *src, - u_int len) -{ - swap_bytes(src, dest, len); - BF_cbc_encrypt((void *)dest, dest, len, &cc->u.bf.key, cc->u.bf.iv, - BF_DECRYPT); - swap_bytes(dest, dest, len); -} +static EVP_CIPHER *evp_ssh1_3des(void); +static EVP_CIPHER *evp_ssh1_bf(void); +static EVP_CIPHER *evp_rijndael(void); + +struct Cipher { + char *name; + int number; /* for ssh1 only */ + u_int block_size; + u_int key_len; + EVP_CIPHER *(*evptype)(void); +} ciphers[] = { + { "none", SSH_CIPHER_NONE, 8, 0, EVP_enc_null }, + { "des", SSH_CIPHER_DES, 8, 8, EVP_des_cbc }, + { "3des", SSH_CIPHER_3DES, 8, 16, evp_ssh1_3des }, + { "blowfish", SSH_CIPHER_BLOWFISH, 8, 32, evp_ssh1_bf }, + + { "3des-cbc", SSH_CIPHER_SSH2, 8, 24, EVP_des_ede3_cbc }, + { "blowfish-cbc", SSH_CIPHER_SSH2, 8, 16, EVP_bf_cbc }, + { "cast128-cbc", SSH_CIPHER_SSH2, 8, 16, EVP_cast5_cbc }, + { "arcfour", SSH_CIPHER_SSH2, 8, 16, EVP_rc4 }, + { "aes128-cbc", SSH_CIPHER_SSH2, 16, 16, evp_rijndael }, + { "aes192-cbc", SSH_CIPHER_SSH2, 16, 24, evp_rijndael }, + { "aes256-cbc", SSH_CIPHER_SSH2, 16, 32, evp_rijndael }, -/* alleged rc4 */ -static void -arcfour_setkey(CipherContext *cc, const u_char *key, u_int keylen) -{ - RC4_set_key(&cc->u.rc4, keylen, (u_char *)key); -} -static void -arcfour_crypt(CipherContext *cc, u_char *dest, const u_char *src, u_int len) -{ - RC4(&cc->u.rc4, len, (u_char *)src, dest); -} - -/* CAST */ -static void -cast_setkey(CipherContext *cc, const u_char *key, u_int keylen) -{ - CAST_set_key(&cc->u.cast.key, keylen, (u_char *) key); -} -static void -cast_setiv(CipherContext *cc, const u_char *iv, u_int ivlen) -{ - if (iv == NULL) - fatal("no IV for %s.", cc->cipher->name); - memcpy(cc->u.cast.iv, (char *)iv, 8); -} -static void -cast_cbc_encrypt(CipherContext *cc, u_char *dest, const u_char *src, u_int len) -{ - CAST_cbc_encrypt(src, dest, len, &cc->u.cast.key, cc->u.cast.iv, - CAST_ENCRYPT); -} -static void -cast_cbc_decrypt(CipherContext *cc, u_char *dest, const u_char *src, u_int len) -{ - CAST_cbc_encrypt(src, dest, len, &cc->u.cast.key, cc->u.cast.iv, - CAST_DECRYPT); -} + { NULL, SSH_CIPHER_ILLEGAL, 0, 0, NULL } +}; -/* RIJNDAEL */ +/*--*/ -#define RIJNDAEL_BLOCKSIZE 16 -static void -rijndael_setkey(CipherContext *cc, const u_char *key, u_int keylen) +u_int +cipher_blocksize(Cipher *c) { - rijndael_set_key(&cc->u.rijndael.enc, (char *)key, 8*keylen, 1); - rijndael_set_key(&cc->u.rijndael.dec, (char *)key, 8*keylen, 0); + return (c->block_size); } -static void -rijndael_setiv(CipherContext *cc, const u_char *iv, u_int ivlen) -{ - if (iv == NULL || ivlen != RIJNDAEL_BLOCKSIZE) - fatal("bad/no IV for %s.", cc->cipher->name); - memcpy(cc->u.rijndael.iv, iv, RIJNDAEL_BLOCKSIZE); -} -static void -rijndael_cbc_encrypt(CipherContext *cc, u_char *dest, const u_char *src, - u_int len) +u_int +cipher_keylen(Cipher *c) { - rijndael_ctx *ctx = &cc->u.rijndael.enc; - u_char *iv = cc->u.rijndael.iv; - u_char in[RIJNDAEL_BLOCKSIZE]; - u_char *cprev, *cnow, *plain; - int i, j, blocks = len / RIJNDAEL_BLOCKSIZE; - - if (len == 0) - return; - if (len % RIJNDAEL_BLOCKSIZE) - fatal("rijndael_cbc_encrypt: bad len %d", len); - cnow = dest; - plain = (u_char *) src; - cprev = iv; - for (i = 0; i < blocks; i++, plain+=RIJNDAEL_BLOCKSIZE, - cnow+=RIJNDAEL_BLOCKSIZE) { - for (j = 0; j < RIJNDAEL_BLOCKSIZE; j++) - in[j] = plain[j] ^ cprev[j]; - rijndael_encrypt(ctx, in, cnow); - cprev = cnow; - } - memcpy(iv, cprev, RIJNDAEL_BLOCKSIZE); + return (c->key_len); } -static void -rijndael_cbc_decrypt(CipherContext *cc, u_char *dest, const u_char *src, - u_int len) -{ - rijndael_ctx *ctx = &cc->u.rijndael.dec; - u_char *iv = cc->u.rijndael.iv; - u_char ivsaved[RIJNDAEL_BLOCKSIZE]; - u_char *cnow = (u_char *) (src+len-RIJNDAEL_BLOCKSIZE); - u_char *plain = dest+len-RIJNDAEL_BLOCKSIZE; - u_char *ivp; - int i, j, blocks = len / RIJNDAEL_BLOCKSIZE; - - if (len == 0) - return; - if (len % RIJNDAEL_BLOCKSIZE) - fatal("rijndael_cbc_decrypt: bad len %d", len); - memcpy(ivsaved, cnow, RIJNDAEL_BLOCKSIZE); - for (i = blocks; i > 0; i--, cnow-=RIJNDAEL_BLOCKSIZE, - plain-=RIJNDAEL_BLOCKSIZE) { - rijndael_decrypt(ctx, cnow, plain); - ivp = (i == 1) ? iv : cnow-RIJNDAEL_BLOCKSIZE; - for (j = 0; j < RIJNDAEL_BLOCKSIZE; j++) - plain[j] ^= ivp[j]; - } - memcpy(iv, ivsaved, RIJNDAEL_BLOCKSIZE); -} - -Cipher ciphers[] = { - { "none", - SSH_CIPHER_NONE, 8, 0, - none_setkey, none_setiv, - none_crypt, none_crypt }, - { "des", - SSH_CIPHER_DES, 8, 8, - des_ssh1_setkey, des_ssh1_setiv, - des_ssh1_encrypt, des_ssh1_decrypt }, - { "3des", - SSH_CIPHER_3DES, 8, 16, - des3_ssh1_setkey, des3_setiv, - des3_ssh1_encrypt, des3_ssh1_decrypt }, - { "blowfish", - SSH_CIPHER_BLOWFISH, 8, 16, - blowfish_setkey, blowfish_setiv, - blowfish_ssh1_encrypt, blowfish_ssh1_decrypt }, - - { "3des-cbc", - SSH_CIPHER_SSH2, 8, 24, - des3_setkey, des3_setiv, - des3_cbc_encrypt, des3_cbc_decrypt }, - { "blowfish-cbc", - SSH_CIPHER_SSH2, 8, 16, - blowfish_setkey, blowfish_setiv, - blowfish_cbc_encrypt, blowfish_cbc_decrypt }, - { "cast128-cbc", - SSH_CIPHER_SSH2, 8, 16, - cast_setkey, cast_setiv, - cast_cbc_encrypt, cast_cbc_decrypt }, - { "arcfour", - SSH_CIPHER_SSH2, 8, 16, - arcfour_setkey, none_setiv, - arcfour_crypt, arcfour_crypt }, - { "aes128-cbc", - SSH_CIPHER_SSH2, 16, 16, - rijndael_setkey, rijndael_setiv, - rijndael_cbc_encrypt, rijndael_cbc_decrypt }, - { "aes192-cbc", - SSH_CIPHER_SSH2, 16, 24, - rijndael_setkey, rijndael_setiv, - rijndael_cbc_encrypt, rijndael_cbc_decrypt }, - { "aes256-cbc", - SSH_CIPHER_SSH2, 16, 32, - rijndael_setkey, rijndael_setiv, - rijndael_cbc_encrypt, rijndael_cbc_decrypt }, - { "rijndael128-cbc", - SSH_CIPHER_SSH2, 16, 16, - rijndael_setkey, rijndael_setiv, - rijndael_cbc_encrypt, rijndael_cbc_decrypt }, - { "rijndael192-cbc", - SSH_CIPHER_SSH2, 16, 24, - rijndael_setkey, rijndael_setiv, - rijndael_cbc_encrypt, rijndael_cbc_decrypt }, - { "rijndael256-cbc", - SSH_CIPHER_SSH2, 16, 32, - rijndael_setkey, rijndael_setiv, - rijndael_cbc_encrypt, rijndael_cbc_decrypt }, - { "rijndael-cbc@lysator.liu.se", - SSH_CIPHER_SSH2, 16, 32, - rijndael_setkey, rijndael_setiv, - rijndael_cbc_encrypt, rijndael_cbc_decrypt }, - { NULL, SSH_CIPHER_ILLEGAL, 0, 0, NULL, NULL, NULL, NULL } -}; - -/*--*/ u_int cipher_mask_ssh1(int client) { u_int mask = 0; - mask |= 1 << SSH_CIPHER_3DES; /* Mandatory */ + mask |= 1 << SSH_CIPHER_3DES; /* Mandatory */ mask |= 1 << SSH_CIPHER_BLOWFISH; if (client) { mask |= 1 << SSH_CIPHER_DES; @@ -457,7 +128,7 @@ return 0; ciphers = cp = xstrdup(names); for ((p = strsep(&cp, CIPHER_SEP)); p && *p != '\0'; - (p = strsep(&cp, CIPHER_SEP))) { + (p = strsep(&cp, CIPHER_SEP))) { c = cipher_by_name(p); if (c == NULL || c->number != SSH_CIPHER_SSH2) { debug("bad cipher %s [%s]", p, names); @@ -496,8 +167,24 @@ void cipher_init(CipherContext *cc, Cipher *cipher, - const u_char *key, u_int keylen, const u_char *iv, u_int ivlen) + const u_char *key, u_int keylen, const u_char *iv, u_int ivlen, + int encrypt) { + static int dowarn = 1; + const EVP_CIPHER *type; + int klen; + + if (cipher->number == SSH_CIPHER_DES) { + if (dowarn) { + error("Warning: use of DES is strongly discouraged " + "due to cryptographic weaknesses"); + dowarn = 0; + } + if (keylen > 8) + keylen = 8; + } + cc->plaintext = (cipher->number == SSH_CIPHER_NONE); + if (keylen < cipher->key_len) fatal("cipher_init: key length %d is insufficient for %s.", keylen, cipher->name); @@ -505,24 +192,40 @@ fatal("cipher_init: iv length %d is insufficient for %s.", ivlen, cipher->name); cc->cipher = cipher; - cipher->setkey(cc, key, keylen); - cipher->setiv(cc, iv, ivlen); + + type = (*cipher->evptype)(); + + EVP_CIPHER_CTX_init(&cc->evp); + if (EVP_CipherInit(&cc->evp, type, NULL, (u_char *)iv, + (encrypt == CIPHER_ENCRYPT)) == 0) + fatal("cipher_init: EVP_CipherInit failed for %s", + cipher->name); + klen = EVP_CIPHER_CTX_key_length(&cc->evp); + if (klen > 0 && keylen != klen) { + debug("cipher_init: set keylen (%d -> %d)", klen, keylen); + if (EVP_CIPHER_CTX_set_key_length(&cc->evp, keylen) == 0) + fatal("cipher_init: set keylen failed (%d -> %d)", + klen, keylen); + } + if (EVP_CipherInit(&cc->evp, NULL, (u_char *)key, NULL, -1) == 0) + fatal("cipher_init: EVP_CipherInit: set key failed for %s", + cipher->name); } void -cipher_encrypt(CipherContext *cc, u_char *dest, const u_char *src, u_int len) +cipher_crypt(CipherContext *cc, u_char *dest, const u_char *src, u_int len) { if (len % cc->cipher->block_size) fatal("cipher_encrypt: bad plaintext length %d", len); - cc->cipher->encrypt(cc, dest, src, len); + if (EVP_Cipher(&cc->evp, dest, (u_char *)src, len) == 0) + fatal("evp_crypt: EVP_Cipher failed"); } void -cipher_decrypt(CipherContext *cc, u_char *dest, const u_char *src, u_int len) +cipher_cleanup(CipherContext *cc) { - if (len % cc->cipher->block_size) - fatal("cipher_decrypt: bad ciphertext length %d", len); - cc->cipher->decrypt(cc, dest, src, len); + if (EVP_CIPHER_CTX_cleanup(&cc->evp) == 0) + error("cipher_cleanup: EVP_CIPHER_CTX_cleanup failed"); } /* @@ -532,7 +235,7 @@ void cipher_set_key_string(CipherContext *cc, Cipher *cipher, - const char *passphrase) + const char *passphrase, int encrypt) { MD5_CTX md; u_char digest[16]; @@ -541,8 +244,257 @@ MD5_Update(&md, (const u_char *)passphrase, strlen(passphrase)); MD5_Final(digest, &md); - cipher_init(cc, cipher, digest, 16, NULL, 0); + cipher_init(cc, cipher, digest, 16, NULL, 0, encrypt); memset(digest, 0, sizeof(digest)); memset(&md, 0, sizeof(md)); } + +/* Implementations for other non-EVP ciphers */ + +/* + * This is used by SSH1: + * + * What kind of triple DES are these 2 routines? + * + * Why is there a redundant initialization vector? + * + * If only iv3 was used, then, this would till effect have been + * outer-cbc. However, there is also a private iv1 == iv2 which + * perhaps makes differential analysis easier. On the other hand, the + * private iv1 probably makes the CRC-32 attack ineffective. This is a + * result of that there is no longer any known iv1 to use when + * choosing the X block. + */ +struct ssh1_3des_ctx +{ + EVP_CIPHER_CTX k1, k2, k3; +}; +static int +ssh1_3des_init(EVP_CIPHER_CTX *ctx, const u_char *key, const u_char *iv, + int enc) +{ + struct ssh1_3des_ctx *c; + u_char *k1, *k2, *k3; + + if ((c = EVP_CIPHER_CTX_get_app_data(ctx)) == NULL) { + c = xmalloc(sizeof(*c)); + EVP_CIPHER_CTX_set_app_data(ctx, c); + } + if (key == NULL) + return (1); + if (enc == -1) + enc = ctx->encrypt; + k1 = k2 = k3 = (u_char *) key; + k2 += 8; + if (EVP_CIPHER_CTX_key_length(ctx) >= 16+8) { + if (enc) + k3 += 16; + else + k1 += 16; + } + EVP_CIPHER_CTX_init(&c->k1); + EVP_CIPHER_CTX_init(&c->k2); + EVP_CIPHER_CTX_init(&c->k3); + if (EVP_CipherInit(&c->k1, EVP_des_cbc(), k1, NULL, enc) == 0 || + EVP_CipherInit(&c->k2, EVP_des_cbc(), k2, NULL, !enc) == 0 || + EVP_CipherInit(&c->k3, EVP_des_cbc(), k3, NULL, enc) == 0) { + memset(c, 0, sizeof(*c)); + xfree(c); + EVP_CIPHER_CTX_set_app_data(ctx, NULL); + return (0); + } + return (1); +} +static int +ssh1_3des_cbc(EVP_CIPHER_CTX *ctx, u_char *dest, const u_char *src, u_int len) +{ + struct ssh1_3des_ctx *c; + + if ((c = EVP_CIPHER_CTX_get_app_data(ctx)) == NULL) { + error("ssh1_3des_cbc: no context"); + return (0); + } + if (EVP_Cipher(&c->k1, dest, (u_char *)src, len) == 0 || + EVP_Cipher(&c->k2, dest, dest, len) == 0 || + EVP_Cipher(&c->k3, dest, dest, len) == 0) + return (0); + return (1); +} +static int +ssh1_3des_cleanup(EVP_CIPHER_CTX *ctx) +{ + struct ssh1_3des_ctx *c; + + if ((c = EVP_CIPHER_CTX_get_app_data(ctx)) != NULL) { + memset(c, 0, sizeof(*c)); + xfree(c); + EVP_CIPHER_CTX_set_app_data(ctx, NULL); + } + return (1); +} +static EVP_CIPHER * +evp_ssh1_3des(void) +{ + static EVP_CIPHER ssh1_3des; + + memset(&ssh1_3des, 0, sizeof(EVP_CIPHER)); + ssh1_3des.nid = NID_undef; + ssh1_3des.block_size = 8; + ssh1_3des.iv_len = 0; + ssh1_3des.key_len = 16; + ssh1_3des.init = ssh1_3des_init; + ssh1_3des.cleanup = ssh1_3des_cleanup; + ssh1_3des.do_cipher = ssh1_3des_cbc; + ssh1_3des.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH; + return (&ssh1_3des); +} + +/* + * SSH1 uses a variation on Blowfish, all bytes must be swapped before + * and after encryption/decryption. Thus the swap_bytes stuff (yuk). + */ +static void +swap_bytes(const u_char *src, u_char *dst, int n) +{ + u_char c[4]; + + /* Process 4 bytes every lap. */ + for (n = n / 4; n > 0; n--) { + c[3] = *src++; + c[2] = *src++; + c[1] = *src++; + c[0] = *src++; + + *dst++ = c[0]; + *dst++ = c[1]; + *dst++ = c[2]; + *dst++ = c[3]; + } +} +static int (*orig_bf)(EVP_CIPHER_CTX *, u_char *, const u_char *, u_int) = NULL; +static int +bf_ssh1_cipher(EVP_CIPHER_CTX *ctx, u_char *out, const u_char *in, u_int len) +{ + int ret; + + swap_bytes(in, out, len); + ret = (*orig_bf)(ctx, out, out, len); + swap_bytes(out, out, len); + return (ret); +} +static EVP_CIPHER * +evp_ssh1_bf(void) +{ + static EVP_CIPHER ssh1_bf; + + memcpy(&ssh1_bf, EVP_bf_cbc(), sizeof(EVP_CIPHER)); + orig_bf = ssh1_bf.do_cipher; + ssh1_bf.nid = NID_undef; + ssh1_bf.do_cipher = bf_ssh1_cipher; + ssh1_bf.key_len = 32; + return (&ssh1_bf); +} + +/* RIJNDAEL */ +#define RIJNDAEL_BLOCKSIZE 16 +struct ssh_rijndael_ctx +{ + rijndael_ctx r_ctx; + u_char r_iv[RIJNDAEL_BLOCKSIZE]; +}; + +static int +ssh_rijndael_init(EVP_CIPHER_CTX *ctx, const u_char *key, const u_char *iv, + int enc) +{ + struct ssh_rijndael_ctx *c; + + if ((c = EVP_CIPHER_CTX_get_app_data(ctx)) == NULL) { + c = xmalloc(sizeof(*c)); + EVP_CIPHER_CTX_set_app_data(ctx, c); + } + if (key != NULL) { + if (enc == -1) + enc = ctx->encrypt; + rijndael_set_key(&c->r_ctx, (u_char *)key, + 8*EVP_CIPHER_CTX_key_length(ctx), enc); + } + if (iv != NULL) + memcpy(c->r_iv, iv, RIJNDAEL_BLOCKSIZE); + return (1); +} +static int +ssh_rijndael_cbc(EVP_CIPHER_CTX *ctx, u_char *dest, const u_char *src, + u_int len) +{ + struct ssh_rijndael_ctx *c; + u_char buf[RIJNDAEL_BLOCKSIZE]; + u_char *cprev, *cnow, *plain, *ivp; + int i, j, blocks = len / RIJNDAEL_BLOCKSIZE; + + if (len == 0) + return (1); + if (len % RIJNDAEL_BLOCKSIZE) + fatal("ssh_rijndael_cbc: bad len %d", len); + if ((c = EVP_CIPHER_CTX_get_app_data(ctx)) == NULL) { + error("ssh_rijndael_cbc: no context"); + return (0); + } + if (ctx->encrypt) { + cnow = dest; + plain = (u_char *)src; + cprev = c->r_iv; + for (i = 0; i < blocks; i++, plain+=RIJNDAEL_BLOCKSIZE, + cnow+=RIJNDAEL_BLOCKSIZE) { + for (j = 0; j < RIJNDAEL_BLOCKSIZE; j++) + buf[j] = plain[j] ^ cprev[j]; + rijndael_encrypt(&c->r_ctx, buf, cnow); + cprev = cnow; + } + memcpy(c->r_iv, cprev, RIJNDAEL_BLOCKSIZE); + } else { + cnow = (u_char *) (src+len-RIJNDAEL_BLOCKSIZE); + plain = dest+len-RIJNDAEL_BLOCKSIZE; + + memcpy(buf, cnow, RIJNDAEL_BLOCKSIZE); + for (i = blocks; i > 0; i--, cnow-=RIJNDAEL_BLOCKSIZE, + plain-=RIJNDAEL_BLOCKSIZE) { + rijndael_decrypt(&c->r_ctx, cnow, plain); + ivp = (i == 1) ? c->r_iv : cnow-RIJNDAEL_BLOCKSIZE; + for (j = 0; j < RIJNDAEL_BLOCKSIZE; j++) + plain[j] ^= ivp[j]; + } + memcpy(c->r_iv, buf, RIJNDAEL_BLOCKSIZE); + } + return (1); +} +static int +ssh_rijndael_cleanup(EVP_CIPHER_CTX *ctx) +{ + struct ssh_rijndael_ctx *c; + + if ((c = EVP_CIPHER_CTX_get_app_data(ctx)) != NULL) { + memset(c, 0, sizeof(*c)); + xfree(c); + EVP_CIPHER_CTX_set_app_data(ctx, NULL); + } + return (1); +} +static EVP_CIPHER * +evp_rijndael(void) +{ + static EVP_CIPHER rijndal_cbc; + + memset(&rijndal_cbc, 0, sizeof(EVP_CIPHER)); + rijndal_cbc.nid = NID_undef; + rijndal_cbc.block_size = RIJNDAEL_BLOCKSIZE; + rijndal_cbc.iv_len = RIJNDAEL_BLOCKSIZE; + rijndal_cbc.key_len = 16; + rijndal_cbc.init = ssh_rijndael_init; + rijndal_cbc.cleanup = ssh_rijndael_cleanup; + rijndal_cbc.do_cipher = ssh_rijndael_cbc; + rijndal_cbc.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH | + EVP_CIPH_ALWAYS_CALL_INIT; + return (&rijndal_cbc); +} diff -ru openssh-3.0.2p1/cipher.h openssh-3.1p1/cipher.h --- openssh-3.0.2p1/cipher.h 2001-09-14 12:47:34.000000000 +1000 +++ openssh-3.1p1/cipher.h 2002-03-05 12:53:04.000000000 +1100 @@ -1,3 +1,5 @@ +/* $OpenBSD: cipher.h,v 1.32 2002/03/04 17:27:39 stevesk Exp $ */ + /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -32,16 +34,10 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* RCSID("$OpenBSD: cipher.h,v 1.29 2001/08/23 11:31:59 markus Exp $"); */ - #ifndef CIPHER_H #define CIPHER_H -#include -#include -#include -#include -#include "rijndael.h" +#include /* * Cipher types for SSH-1. New types can be added, but old types should not * be removed for compatibility. The maximum allowed value is 31. @@ -59,50 +55,18 @@ #define SSH_CIPHER_RESERVED 7 #define SSH_CIPHER_MAX 31 +#define CIPHER_ENCRYPT 1 +#define CIPHER_DECRYPT 0 + typedef struct Cipher Cipher; typedef struct CipherContext CipherContext; +struct Cipher; struct CipherContext { - union { - struct { - des_key_schedule key; - des_cblock iv; - } des; - struct { - des_key_schedule key1; - des_key_schedule key2; - des_key_schedule key3; - des_cblock iv1; - des_cblock iv2; - des_cblock iv3; - } des3; - struct { - struct bf_key_st key; - u_char iv[8]; - } bf; - struct { - CAST_KEY key; - u_char iv[8]; - } cast; - struct { - u_char iv[16]; - rijndael_ctx enc; - rijndael_ctx dec; - } rijndael; - RC4_KEY rc4; - } u; + int plaintext; + EVP_CIPHER_CTX evp; Cipher *cipher; }; -struct Cipher { - char *name; - int number; /* for ssh1 only */ - u_int block_size; - u_int key_len; - void (*setkey)(CipherContext *, const u_char *, u_int); - void (*setiv)(CipherContext *, const u_char *, u_int); - void (*encrypt)(CipherContext *, u_char *, const u_char *, u_int); - void (*decrypt)(CipherContext *, u_char *, const u_char *, u_int); -}; u_int cipher_mask_ssh1(int); Cipher *cipher_by_name(const char *); @@ -111,9 +75,10 @@ char *cipher_name(int); int ciphers_valid(const char *); void cipher_init(CipherContext *, Cipher *, const u_char *, u_int, - const u_char *, u_int); -void cipher_encrypt(CipherContext *, u_char *, const u_char *, u_int); -void cipher_decrypt(CipherContext *, u_char *, const u_char *, u_int); -void cipher_set_key_string(CipherContext *, Cipher *, const char *); - + const u_char *, u_int, int); +void cipher_crypt(CipherContext *, u_char *, const u_char *, u_int); +void cipher_cleanup(CipherContext *); +void cipher_set_key_string(CipherContext *, Cipher *, const char *, int); +u_int cipher_blocksize(Cipher *); +u_int cipher_keylen(Cipher *); #endif /* CIPHER_H */ diff -ru openssh-3.0.2p1/clientloop.c openssh-3.1p1/clientloop.c --- openssh-3.0.2p1/clientloop.c 2001-11-12 11:06:33.000000000 +1100 +++ openssh-3.1p1/clientloop.c 2002-02-08 22:07:17.000000000 +1100 @@ -59,7 +59,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: clientloop.c,v 1.87 2001/11/09 18:59:23 markus Exp $"); +RCSID("$OpenBSD: clientloop.c,v 1.96 2002/02/06 14:55:15 markus Exp $"); #include "ssh.h" #include "ssh1.h" @@ -101,8 +101,8 @@ * window size to be sent to the server a little later. This is volatile * because this is updated in a signal handler. */ -static volatile int received_window_change_signal = 0; -static volatile int received_signal = 0; +static volatile sig_atomic_t received_window_change_signal = 0; +static volatile sig_atomic_t received_signal = 0; /* Flag indicating whether the user\'s terminal is in non-blocking mode. */ static int in_non_blocking_mode = 0; @@ -254,7 +254,7 @@ /* Send buffered stdin data to the server. */ while (buffer_len(&stdin_buffer) > 0 && - packet_not_very_much_data_to_write()) { + packet_not_very_much_data_to_write()) { len = buffer_len(&stdin_buffer); /* Keep the packets at reasonable size. */ if (len > packet_get_maxsize()) @@ -417,9 +417,9 @@ /* Check if the window size has changed. */ if (ioctl(fileno(stdin), TIOCGWINSZ, &newws) >= 0 && (oldws.ws_row != newws.ws_row || - oldws.ws_col != newws.ws_col || - oldws.ws_xpixel != newws.ws_xpixel || - oldws.ws_ypixel != newws.ws_ypixel)) + oldws.ws_col != newws.ws_col || + oldws.ws_xpixel != newws.ws_xpixel || + oldws.ws_ypixel != newws.ws_ypixel)) received_window_change_signal = 1; /* OK, we have been continued by the user. Reinitialize buffers. */ @@ -949,7 +949,7 @@ if (received_signal) { if (in_non_blocking_mode) /* XXX */ leave_non_blocking(); - fatal("Killed by signal %d.", received_signal); + fatal("Killed by signal %d.", (int) received_signal); } /* @@ -994,11 +994,11 @@ /* Report bytes transferred, and transfer rates. */ total_time = get_current_time() - start_time; debug("Transferred: stdin %lu, stdout %lu, stderr %lu bytes in %.1f seconds", - stdin_bytes, stdout_bytes, stderr_bytes, total_time); + stdin_bytes, stdout_bytes, stderr_bytes, total_time); if (total_time > 0) debug("Bytes per second: stdin %.1f, stdout %.1f, stderr %.1f", - stdin_bytes / total_time, stdout_bytes / total_time, - stderr_bytes / total_time); + stdin_bytes / total_time, stdout_bytes / total_time, + stderr_bytes / total_time); /* Return the exit status of the program. */ debug("Exit status %d", exit_status); @@ -1008,30 +1008,30 @@ /*********/ static void -client_input_stdout_data(int type, int plen, void *ctxt) +client_input_stdout_data(int type, u_int32_t seq, void *ctxt) { u_int data_len; char *data = packet_get_string(&data_len); - packet_integrity_check(plen, 4 + data_len, type); + packet_check_eom(); buffer_append(&stdout_buffer, data, data_len); memset(data, 0, data_len); xfree(data); } static void -client_input_stderr_data(int type, int plen, void *ctxt) +client_input_stderr_data(int type, u_int32_t seq, void *ctxt) { u_int data_len; char *data = packet_get_string(&data_len); - packet_integrity_check(plen, 4 + data_len, type); + packet_check_eom(); buffer_append(&stderr_buffer, data, data_len); memset(data, 0, data_len); xfree(data); } static void -client_input_exit_status(int type, int plen, void *ctxt) +client_input_exit_status(int type, u_int32_t seq, void *ctxt) { - packet_integrity_check(plen, 4, type); exit_status = packet_get_int(); + packet_check_eom(); /* Acknowledge the exit. */ packet_start(SSH_CMSG_EXIT_CONFIRMATION); packet_send(); @@ -1057,7 +1057,7 @@ listen_port = packet_get_int(); originator_address = packet_get_string(NULL); originator_port = packet_get_int(); - packet_done(); + packet_check_eom(); debug("client_request_forwarded_tcpip: listen %s port %d, originator %s port %d", listen_address, listen_port, originator_address, originator_port); @@ -1072,10 +1072,6 @@ SSH_CHANNEL_CONNECTING, sock, sock, -1, CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0, xstrdup(originator_address), 1); - if (c == NULL) { - error("client_request_forwarded_tcpip: channel_new failed"); - close(sock); - } xfree(originator_address); xfree(listen_address); return c; @@ -1101,7 +1097,7 @@ } else { originator_port = packet_get_int(); } - packet_done(); + packet_check_eom(); /* XXX check permission */ debug("client_request_x11: request from %s %d", originator, originator_port); @@ -1113,10 +1109,6 @@ SSH_CHANNEL_X11_OPEN, sock, sock, -1, CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0, xstrdup("x11"), 1); - if (c == NULL) { - error("client_request_x11: channel_new failed"); - close(sock); - } c->force_drain = 1; return c; } @@ -1139,17 +1131,13 @@ SSH_CHANNEL_OPEN, sock, sock, -1, CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0, xstrdup("authentication agent connection"), 1); - if (c == NULL) { - error("client_request_agent: channel_new failed"); - close(sock); - } c->force_drain = 1; return c; } /* XXXX move to generic input handler */ static void -client_input_channel_open(int type, int plen, void *ctxt) +client_input_channel_open(int type, u_int32_t seq, void *ctxt) { Channel *c = NULL; char *ctype; @@ -1201,7 +1189,7 @@ xfree(ctype); } static void -client_input_channel_req(int type, int plen, void *ctxt) +client_input_channel_req(int type, u_int32_t seq, void *ctxt) { Channel *c = NULL; int id, reply, success = 0; @@ -1226,7 +1214,7 @@ } else if (strcmp(rtype, "exit-status") == 0) { success = 1; exit_status = packet_get_int(); - packet_done(); + packet_check_eom(); } if (reply) { packet_start(success ? @@ -1236,6 +1224,24 @@ } xfree(rtype); } +static void +client_input_global_request(int type, u_int32_t seq, void *ctxt) +{ + char *rtype; + int want_reply; + int success = 0; + + rtype = packet_get_string(NULL); + want_reply = packet_get_char(); + debug("client_input_global_request: rtype %s want_reply %d", rtype, want_reply); + if (want_reply) { + packet_start(success ? + SSH2_MSG_REQUEST_SUCCESS : SSH2_MSG_REQUEST_FAILURE); + packet_send(); + packet_write_wait(); + } + xfree(rtype); +} static void client_init_dispatch_20(void) @@ -1250,6 +1256,7 @@ dispatch_set(SSH2_MSG_CHANNEL_OPEN_FAILURE, &channel_input_open_failure); dispatch_set(SSH2_MSG_CHANNEL_REQUEST, &client_input_channel_req); dispatch_set(SSH2_MSG_CHANNEL_WINDOW_ADJUST, &channel_input_window_adjust); + dispatch_set(SSH2_MSG_GLOBAL_REQUEST, &client_input_global_request); /* rekeying */ dispatch_set(SSH2_MSG_KEXINIT, &kex_input_kexinit); diff -ru openssh-3.0.2p1/compat.c openssh-3.1p1/compat.c --- openssh-3.0.2p1/compat.c 2001-09-21 09:13:50.000000000 +1000 +++ openssh-3.1p1/compat.c 2002-03-07 12:59:04.000000000 +1100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2000, 2001 Markus Friedl. All rights reserved. + * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -23,22 +23,14 @@ */ #include "includes.h" -RCSID("$OpenBSD: compat.c,v 1.53 2001/09/20 13:50:40 markus Exp $"); - -#ifdef HAVE_LIBPCRE -# include -#else /* Use native regex libraries */ -# ifdef HAVE_REGEX_H -# include -# else -# include "openbsd-compat/fake-regex.h" -# endif -#endif /* HAVE_LIBPCRE */ +RCSID("$OpenBSD: compat.c,v 1.61 2002/03/06 00:24:39 markus Exp $"); +#include "buffer.h" #include "packet.h" #include "xmalloc.h" #include "compat.h" #include "log.h" +#include "match.h" int compat13 = 0; int compat20 = 0; @@ -60,86 +52,97 @@ void compat_datafellows(const char *version) { - int i, ret; - char ebuf[1024]; - regex_t reg; + int i; static struct { char *pat; int bugs; } check[] = { - { "^OpenSSH[-_]2\\.[012]", - SSH_OLD_SESSIONID|SSH_BUG_BANNER| + { "OpenSSH-2.0*," + "OpenSSH-2.1*," + "OpenSSH_2.1*," + "OpenSSH_2.2*", SSH_OLD_SESSIONID|SSH_BUG_BANNER| SSH_OLD_DHGEX|SSH_BUG_NOREKEY }, - { "^OpenSSH_2\\.3\\.0", SSH_BUG_BANNER|SSH_BUG_BIGENDIANAES| + { "OpenSSH_2.3.0*", SSH_BUG_BANNER|SSH_BUG_BIGENDIANAES| SSH_OLD_DHGEX|SSH_BUG_NOREKEY}, - { "^OpenSSH_2\\.3\\.", SSH_BUG_BIGENDIANAES|SSH_OLD_DHGEX| + { "OpenSSH_2.3.*", SSH_BUG_BIGENDIANAES|SSH_OLD_DHGEX| SSH_BUG_NOREKEY}, - { "^OpenSSH_2\\.5\\.[01]p1", + { "OpenSSH_2.5.0p1*," + "OpenSSH_2.5.1p1*", SSH_BUG_BIGENDIANAES|SSH_OLD_DHGEX| SSH_BUG_NOREKEY }, - { "^OpenSSH_2\\.5\\.[012]", - SSH_OLD_DHGEX|SSH_BUG_NOREKEY }, - { "^OpenSSH_2\\.5\\.3", - SSH_BUG_NOREKEY }, - { "^OpenSSH", 0 }, - { "MindTerm", 0 }, - { "^2\\.1\\.0", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| + { "OpenSSH_2.5.0*," + "OpenSSH_2.5.1*," + "OpenSSH_2.5.2*", SSH_OLD_DHGEX|SSH_BUG_NOREKEY }, + { "OpenSSH_2.5.3*", SSH_BUG_NOREKEY }, + { "Sun_SSH_1.0*", SSH_BUG_NOREKEY }, + { "OpenSSH*", 0 }, + { "*MindTerm*", 0 }, + { "2.1.0*", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| SSH_OLD_SESSIONID|SSH_BUG_DEBUG| SSH_BUG_RSASIGMD5|SSH_BUG_HBSERVICE }, - { "^2\\.1 ", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| + { "2.1 *", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| SSH_OLD_SESSIONID|SSH_BUG_DEBUG| SSH_BUG_RSASIGMD5|SSH_BUG_HBSERVICE }, - { "^2\\.0\\.1[3-9]", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| + { "2.0.13*," + "2.0.14*," + "2.0.15*," + "2.0.16*," + "2.0.17*," + "2.0.18*," + "2.0.19*", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| SSH_OLD_SESSIONID|SSH_BUG_DEBUG| SSH_BUG_PKSERVICE|SSH_BUG_X11FWD| SSH_BUG_PKOK|SSH_BUG_RSASIGMD5| SSH_BUG_HBSERVICE|SSH_BUG_OPENFAILURE| SSH_BUG_DUMMYCHAN }, - { "^2\\.0\\.1[1-2]", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| + { "2.0.11*," + "2.0.12*", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| SSH_OLD_SESSIONID|SSH_BUG_DEBUG| SSH_BUG_PKSERVICE|SSH_BUG_X11FWD| SSH_BUG_PKAUTH|SSH_BUG_PKOK| SSH_BUG_RSASIGMD5|SSH_BUG_OPENFAILURE| SSH_BUG_DUMMYCHAN }, - { "^2\\.0\\.", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| + { "2.0.*", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| SSH_OLD_SESSIONID|SSH_BUG_DEBUG| SSH_BUG_PKSERVICE|SSH_BUG_X11FWD| SSH_BUG_PKAUTH|SSH_BUG_PKOK| SSH_BUG_RSASIGMD5|SSH_BUG_OPENFAILURE| SSH_BUG_DERIVEKEY|SSH_BUG_DUMMYCHAN }, - { "^2\\.[23]\\.0", SSH_BUG_HMAC|SSH_BUG_DEBUG| + { "2.2.0*," + "2.3.0*", SSH_BUG_HMAC|SSH_BUG_DEBUG| SSH_BUG_RSASIGMD5 }, - { "^2\\.3\\.", SSH_BUG_DEBUG|SSH_BUG_RSASIGMD5 }, - { "^2\\.[2-9]\\.", SSH_BUG_DEBUG }, - { "^3\\.0\\.", SSH_BUG_DEBUG }, - { "^2\\.4$", SSH_OLD_SESSIONID }, /* Van Dyke */ - { "^3\\.0 SecureCRT", SSH_OLD_SESSIONID }, - { "^1\\.7 SecureFX", SSH_OLD_SESSIONID }, - { "^1\\.2\\.1[89]", SSH_BUG_IGNOREMSG }, - { "^1\\.2\\.2[012]", SSH_BUG_IGNOREMSG }, - { "^1\\.3\\.2", SSH_BUG_IGNOREMSG }, /* f-secure */ - { "^SSH Compatible Server", /* Netscreen */ + { "2.3.*", SSH_BUG_DEBUG|SSH_BUG_RSASIGMD5 }, + { "2.4", SSH_OLD_SESSIONID }, /* Van Dyke */ + { "2.*", SSH_BUG_DEBUG }, + { "3.0.*", SSH_BUG_DEBUG }, + { "3.0 SecureCRT*", SSH_OLD_SESSIONID }, + { "1.7 SecureFX*", SSH_OLD_SESSIONID }, + { "1.2.18*," + "1.2.19*," + "1.2.20*," + "1.2.21*," + "1.2.22*", SSH_BUG_IGNOREMSG }, + { "1.3.2*", SSH_BUG_IGNOREMSG }, /* f-secure */ + { "*SSH Compatible Server*", /* Netscreen */ SSH_BUG_PASSWORDPAD }, - { "^OSU_0", SSH_BUG_PASSWORDPAD }, - { "^OSU_1\\.[0-4]", SSH_BUG_PASSWORDPAD }, - { "^OSU_1\\.5alpha[1-3]", - SSH_BUG_PASSWORDPAD }, - { "^SSH_Version_Mapper", + { "*OSU_0*," + "OSU_1.0*," + "OSU_1.1*," + "OSU_1.2*," + "OSU_1.3*," + "OSU_1.4*," + "OSU_1.5alpha1*," + "OSU_1.5alpha2*," + "OSU_1.5alpha3*", SSH_BUG_PASSWORDPAD }, + { "*SSH_Version_Mapper*", SSH_BUG_SCANNER }, { NULL, 0 } }; + /* process table, return first match */ for (i = 0; check[i].pat; i++) { - ret = regcomp(®, check[i].pat, REG_EXTENDED|REG_NOSUB); - if (ret != 0) { - regerror(ret, ®, ebuf, sizeof(ebuf)); - ebuf[sizeof(ebuf)-1] = '\0'; - error("regerror: %s", ebuf); - continue; - } - ret = regexec(®, version, 0, NULL, 0); - regfree(®); - if (ret == 0) { + if (match_pattern_list(version, check[i].pat, + strlen(check[i].pat), 0) == 1) { debug("match: %s pat %s", version, check[i].pat); datafellows = check[i].bugs; return; @@ -159,7 +162,7 @@ return ret; q = s = xstrdup(spec); for ((p = strsep(&q, SEP)); p && *p != '\0'; (p = strsep(&q, SEP))) { - switch(atoi(p)) { + switch (atoi(p)) { case 1: if (ret == SSH_PROTO_UNKNOWN) ret |= SSH_PROTO_1_PREFERRED; @@ -180,24 +183,25 @@ char * compat_cipher_proposal(char *cipher_prop) { + Buffer b; char *orig_prop, *fix_ciphers; char *cp, *tmp; - size_t len; if (!(datafellows & SSH_BUG_BIGENDIANAES)) return(cipher_prop); - len = strlen(cipher_prop) + 1; - fix_ciphers = xmalloc(len); - *fix_ciphers = '\0'; + buffer_init(&b); tmp = orig_prop = xstrdup(cipher_prop); - while((cp = strsep(&tmp, ",")) != NULL) { - if (strncmp(cp, "aes", 3) && strncmp(cp, "rijndael", 8)) { - if (*fix_ciphers) - strlcat(fix_ciphers, ",", len); - strlcat(fix_ciphers, cp, len); + while ((cp = strsep(&tmp, ",")) != NULL) { + if (strncmp(cp, "aes", 3) != 0) { + if (buffer_len(&b) > 0) + buffer_append(&b, ",", 1); + buffer_append(&b, cp, strlen(cp)); } } + buffer_append(&b, "\0", 1); + fix_ciphers = xstrdup(buffer_ptr(&b)); + buffer_free(&b); xfree(orig_prop); debug2("Original cipher proposal: %s", cipher_prop); debug2("Compat cipher proposal: %s", fix_ciphers); diff -ru openssh-3.0.2p1/compat.h openssh-3.1p1/compat.h --- openssh-3.0.2p1/compat.h 2001-09-21 09:13:50.000000000 +1000 +++ openssh-3.1p1/compat.h 2002-03-05 12:53:04.000000000 +1100 @@ -1,3 +1,5 @@ +/* $OpenBSD: compat.h,v 1.30 2002/03/04 17:27:39 stevesk Exp $ */ + /* * Copyright (c) 1999, 2000, 2001 Markus Friedl. All rights reserved. * @@ -21,7 +23,6 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* RCSID("$OpenBSD: compat.h,v 1.29 2001/09/20 13:50:40 markus Exp $"); */ #ifndef COMPAT_H #define COMPAT_H diff -ru openssh-3.0.2p1/compress.c openssh-3.1p1/compress.c --- openssh-3.0.2p1/compress.c 2001-10-04 03:07:48.000000000 +1000 +++ openssh-3.1p1/compress.c 2002-01-22 23:18:16.000000000 +1100 @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: compress.c,v 1.15 2001/09/27 11:58:16 markus Exp $"); +RCSID("$OpenBSD: compress.c,v 1.17 2001/12/29 21:56:01 stevesk Exp $"); #include "log.h" #include "buffer.h" @@ -55,13 +55,13 @@ buffer_compress_uninit(void) { debug("compress outgoing: raw data %lu, compressed %lu, factor %.2f", - outgoing_stream.total_in, outgoing_stream.total_out, - outgoing_stream.total_in == 0 ? 0.0 : - (double) outgoing_stream.total_out / outgoing_stream.total_in); + outgoing_stream.total_in, outgoing_stream.total_out, + outgoing_stream.total_in == 0 ? 0.0 : + (double) outgoing_stream.total_out / outgoing_stream.total_in); debug("compress incoming: raw data %lu, compressed %lu, factor %.2f", - incoming_stream.total_out, incoming_stream.total_in, - incoming_stream.total_out == 0 ? 0.0 : - (double) incoming_stream.total_in / incoming_stream.total_out); + incoming_stream.total_out, incoming_stream.total_in, + incoming_stream.total_out == 0 ? 0.0 : + (double) incoming_stream.total_in / incoming_stream.total_out); if (compress_init_recv_called == 1) inflateEnd(&incoming_stream); if (compress_init_send_called == 1) @@ -80,7 +80,7 @@ void buffer_compress(Buffer * input_buffer, Buffer * output_buffer) { - char buf[4096]; + u_char buf[4096]; int status; /* This case is not handled below. */ @@ -88,13 +88,13 @@ return; /* Input is the contents of the input buffer. */ - outgoing_stream.next_in = (u_char *) buffer_ptr(input_buffer); + outgoing_stream.next_in = buffer_ptr(input_buffer); outgoing_stream.avail_in = buffer_len(input_buffer); /* Loop compressing until deflate() returns with avail_out != 0. */ do { /* Set up fixed-size output buffer. */ - outgoing_stream.next_out = (u_char *)buf; + outgoing_stream.next_out = buf; outgoing_stream.avail_out = sizeof(buf); /* Compress as much data into the buffer as possible. */ @@ -124,15 +124,15 @@ void buffer_uncompress(Buffer * input_buffer, Buffer * output_buffer) { - char buf[4096]; + u_char buf[4096]; int status; - incoming_stream.next_in = (u_char *) buffer_ptr(input_buffer); + incoming_stream.next_in = buffer_ptr(input_buffer); incoming_stream.avail_in = buffer_len(input_buffer); for (;;) { /* Set up fixed-size output buffer. */ - incoming_stream.next_out = (u_char *) buf; + incoming_stream.next_out = buf; incoming_stream.avail_out = sizeof(buf); status = inflate(&incoming_stream, Z_PARTIAL_FLUSH); diff -ru openssh-3.0.2p1/compress.h openssh-3.1p1/compress.h --- openssh-3.0.2p1/compress.h 2001-07-04 14:46:57.000000000 +1000 +++ openssh-3.1p1/compress.h 2002-03-05 12:53:04.000000000 +1100 @@ -1,3 +1,5 @@ +/* $OpenBSD: compress.h,v 1.11 2002/03/04 17:27:39 stevesk Exp $ */ + /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -11,8 +13,6 @@ * called by a name other than "ssh" or "Secure Shell". */ -/* RCSID("$OpenBSD: compress.h,v 1.10 2001/06/26 17:27:23 markus Exp $"); */ - #ifndef COMPRESS_H #define COMPRESS_H diff -ru openssh-3.0.2p1/config.guess openssh-3.1p1/config.guess --- openssh-3.0.2p1/config.guess 2001-05-06 10:54:15.000000000 +1000 +++ openssh-3.1p1/config.guess 2002-02-19 10:18:57.000000000 +1100 @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002 Free Software Foundation, Inc. -timestamp='2001-04-20' +timestamp='2002-01-30' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -24,8 +24,9 @@ # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. -# Written by Per Bothner . -# Please send patches to . +# Originally written by Per Bothner . +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and @@ -52,7 +53,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -95,25 +96,25 @@ # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int dummy(){}" > $dummy.c +set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int dummy(){}" > $dummy.c ; for c in cc gcc c89 ; do - ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 + ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; if test $? = 0 ; then - CC_FOR_BUILD="$c"; break - fi - done - rm -f $dummy.c $dummy.o $dummy.rel + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + rm -f $dummy.c $dummy.o $dummy.rel ; if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found + CC_FOR_BUILD=no_compiler_found ; fi ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac +esac' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 8/24/94.) +# (ghazi@noc.rutgers.edu 1994-08-24) if (test -f /.attbin/uname) >/dev/null 2>&1 ; then PATH=$PATH:/.attbin ; export PATH fi @@ -127,29 +128,29 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) - # Netbsd (nbsd) targets should (where applicable) match one or + # NetBSD (nbsd) targets should (where applicable) match one or # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward # compatibility and a consistent mechanism for selecting the # object file format. - # Determine the machine/vendor (is the vendor relevant). - case "${UNAME_MACHINE}" in - amiga) machine=m68k-unknown ;; - arm32) machine=arm-unknown ;; - atari*) machine=m68k-atari ;; - sun3*) machine=m68k-sun ;; - mac68k) machine=m68k-apple ;; - macppc) machine=powerpc-apple ;; - hp3[0-9][05]) machine=m68k-hp ;; - ibmrt|romp-ibm) machine=romp-ibm ;; - *) machine=${UNAME_MACHINE}-unknown ;; + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + UNAME_MACHINE_ARCH=`(uname -p) 2>/dev/null` || \ + UNAME_MACHINE_ARCH=unknown + case "${UNAME_MACHINE_ARCH}" in + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. - case "${UNAME_MACHINE}" in - i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) + case "${UNAME_MACHINE_ARCH}" in + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep __ELF__ >/dev/null then @@ -171,6 +172,45 @@ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit 0 ;; + amiga:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + arc:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + hp300:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mac68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + macppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvmeppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + pmax:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sgi:OpenBSD:*:*) + echo mipseb-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sun3:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + wgrisc:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + *:OpenBSD:*:*) + echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; alpha:OSF1:*:*) if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` @@ -204,6 +244,7 @@ jsr \$26,exit .end main EOF + eval $set_cc_for_build $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null if test "$?" = 0 ; then case `./$dummy` in @@ -225,6 +266,9 @@ 2-307) UNAME_MACHINE="alphaev67" ;; + 2-1307) + UNAME_MACHINE="alphaev68" + ;; esac fi rm -f $dummy.s $dummy @@ -242,29 +286,11 @@ Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit 0;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos exit 0 ;; - arc64:OpenBSD:*:*) - echo mips64el-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hkmips:OpenBSD:*:*) - echo mips-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mips-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos exit 0 ;; *:OS/390:*:*) echo i370-ibm-openedition @@ -328,9 +354,6 @@ aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} exit 0 ;; - atari*:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -357,18 +380,6 @@ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} exit 0 ;; - sun3*:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} exit 0 ;; @@ -385,6 +396,7 @@ echo clipper-intergraph-clix${UNAME_RELEASE} exit 0 ;; mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #ifdef __cplusplus #include /* for printf() prototype */ @@ -475,6 +487,7 @@ exit 0 ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #include @@ -536,10 +549,8 @@ 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - case "${HPUX_REV}" in - 11.[0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 @@ -548,12 +559,13 @@ case "${sc_kernel_bits}" in 32) HP_ARCH="hppa2.0n" ;; 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 esac ;; esac - fi ;; - esac - if [ "${HP_ARCH}" = "" ]; then - sed 's/^ //' << EOF >$dummy.c + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c #define _HPUX_SOURCE #include @@ -586,10 +598,10 @@ exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` - if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi - rm -f $dummy.c $dummy - fi ;; + (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy` + if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi + rm -f $dummy.c $dummy + fi ;; esac echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; @@ -598,6 +610,7 @@ echo ia64-hp-hpux${HPUX_REV} exit 0 ;; 3050*:HI-UX:*:*) + eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #include int @@ -633,7 +646,7 @@ 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd exit 0 ;; - *9??*:MPE/iX:*:*) + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit 0 ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) @@ -652,9 +665,6 @@ parisc*:Lites*:*:*) echo hppa1.1-hp-lites exit 0 ;; - hppa*:OpenBSD:*:*) - echo hppa-unknown-openbsd - exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd exit 0 ;; @@ -677,12 +687,13 @@ echo xmp-cray-unicos exit 0 ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' @@ -705,9 +716,6 @@ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; @@ -720,9 +728,6 @@ *:FreeBSD:*:*) echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; - *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit 0 ;; @@ -732,6 +737,9 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit 0 ;; + x86:Interix*:3*) + echo i386-pc-interix3 + exit 0 ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we @@ -763,97 +771,43 @@ echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; mips:Linux:*:*) - cat >$dummy.c < /* for printf() prototype */ -int main (int argc, char *argv[]) { -#else -int main (argc, argv) int argc; char *argv[]; { -#endif -#ifdef __MIPSEB__ - printf ("%s-unknown-linux-gnu\n", argv[1]); -#endif -#ifdef __MIPSEL__ - printf ("%sel-unknown-linux-gnu\n", argv[1]); -#endif - return 0; -} + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips + #undef mipsel + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mipsel + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips + #else + CPU= + #endif + #endif EOF - $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + rm -f $dummy.c + test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0 ;; ppc:Linux:*:*) - # Determine Lib Version - cat >$dummy.c < -#if defined(__GLIBC__) -extern char __libc_version[]; -extern char __libc_release[]; -#endif -main(argc, argv) - int argc; - char *argv[]; -{ -#if defined(__GLIBC__) - printf("%s %s\n", __libc_version, __libc_release); -#else - printf("unknown\n"); -#endif - return 0; -} -EOF - LIBC="" - $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null - if test "$?" = 0 ; then - ./$dummy | grep 1\.99 > /dev/null - if test "$?" = 0 ; then LIBC="libc1" ; fi - fi - rm -f $dummy.c $dummy - echo powerpc-unknown-linux-gnu${LIBC} + echo powerpc-unknown-linux-gnu + exit 0 ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu exit 0 ;; alpha:Linux:*:*) - cat <$dummy.s - .data - \$Lformat: - .byte 37,100,45,37,120,10,0 # "%d-%x\n" - .text - .globl main - .align 4 - .ent main - main: - .frame \$30,16,\$26,0 - ldgp \$29,0(\$27) - .prologue 1 - .long 0x47e03d80 # implver \$0 - lda \$2,-1 - .long 0x47e20c21 # amask \$2,\$1 - lda \$16,\$Lformat - mov \$0,\$17 - not \$1,\$18 - jsr \$26,printf - ldgp \$29,0(\$26) - mov 0,\$16 - jsr \$26,exit - .end main -EOF - LIBC="" - $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null - if test "$?" = 0 ; then - case `./$dummy` in - 0-0) UNAME_MACHINE="alpha" ;; - 1-0) UNAME_MACHINE="alphaev5" ;; - 1-1) UNAME_MACHINE="alphaev56" ;; - 1-101) UNAME_MACHINE="alphapca56" ;; - 2-303) UNAME_MACHINE="alphaev6" ;; - 2-307) UNAME_MACHINE="alphaev67" ;; - esac - objdump --private-headers $dummy | \ - grep ld.so.1 > /dev/null - if test "$?" = 0 ; then - LIBC="libc1" - fi - fi - rm -f $dummy.s $dummy + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit 0 ;; parisc:Linux:*:* | hppa:Linux:*:*) @@ -883,71 +837,61 @@ # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent # problems with other programs or directories called `ld' in the path. - ld_supported_emulations=`cd /; ld --help 2>&1 \ - | sed -ne '/supported emulations:/!d + # Export LANG=C to prevent ld from outputting information in other + # languages. + ld_supported_targets=`LANG=C; export LANG; cd /; ld --help 2>&1 \ + | sed -ne '/supported targets:/!d s/[ ][ ]*/ /g - s/.*supported emulations: *// + s/.*supported targets: *// s/ .*// p'` - case "$ld_supported_emulations" in - i*86linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 - ;; - elf_i*86) + case "$ld_supported_targets" in + elf32-i386) TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ;; - i*86coff) + a.out-i386-linux) + echo "${UNAME_MACHINE}-pc-linux-gnuaout" + exit 0 ;; + coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit 0 - ;; - esac - # Either a pre-BFD a.out linker (linux-gnuoldld) - # or one that does not give us useful --help. - # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout. - # If ld does not provide *any* "supported emulations:" - # that means it is gnuoldld. - test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0 - case "${UNAME_MACHINE}" in - i*86) - VENDOR=pc; - ;; - *) - VENDOR=unknown; - ;; + exit 0 ;; + "") + # Either a pre-BFD a.out linker (linux-gnuoldld) or + # one that does not give us useful --help. + echo "${UNAME_MACHINE}-pc-linux-gnuoldld" + exit 0 ;; esac # Determine whether the default compiler is a.out or elf - cat >$dummy.c < -#ifdef __cplusplus -#include /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif -#ifdef __ELF__ -# ifdef __GLIBC__ -# if __GLIBC__ >= 2 - printf ("%s-${VENDOR}-linux-gnu\n", argv[1]); -# else - printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]); -# endif -# else - printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]); -# endif -#else - printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]); -#endif - return 0; -} + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + #ifdef __ELF__ + # ifdef __GLIBC__ + # if __GLIBC__ >= 2 + LIBC=gnu + # else + LIBC=gnulibc1 + # endif + # else + LIBC=gnulibc1 + # endif + #else + #ifdef __INTEL_COMPILER + LIBC=gnu + #else + LIBC=gnuaout + #endif + #endif EOF - $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + rm -f $dummy.c + test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; -# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions -# are messed up and put the nodename in both sysname and nodename. i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. echo i386-sequent-sysv4 exit 0 ;; i*86:UNIX_SV:4.2MP:2.*) @@ -966,14 +910,13 @@ echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi exit 0 ;; - i*86:*:5:7*) - # Fixed at (any) Pentium or better - UNAME_MACHINE=i586 - if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then - echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION} - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} - fi + i*86:*:5:[78]*) + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} exit 0 ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then @@ -1021,7 +964,7 @@ exit 0 ;; M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) + 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` @@ -1067,8 +1010,8 @@ echo ns32k-sni-sysv fi exit 0 ;; - PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says echo i586-unisys-sysv4 exit 0 ;; *:UNIX_System_V:4*:FTX*) @@ -1080,6 +1023,10 @@ # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 exit 0 ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos + exit 0 ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} exit 0 ;; @@ -1120,13 +1067,15 @@ *:procnto*:*:* | *:QNX:[0123456789]*:*) if test "${UNAME_MACHINE}" = "x86pc"; then UNAME_MACHINE=pc + echo i386-${UNAME_MACHINE}-nto-qnx + else + echo `uname -p`-${UNAME_MACHINE}-nto-qnx fi - echo `uname -p`-${UNAME_MACHINE}-nto-qnx exit 0 ;; *:QNX:*:4*) echo i386-pc-qnx exit 0 ;; - NSR-[KW]:NONSTOP_KERNEL:*:*) + NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *:NonStop-UX:*:*) @@ -1172,11 +1121,18 @@ *:ITS:*:*) echo pdp10-unknown-its exit 0 ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit 0 ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 +eval $set_cc_for_build cat >$dummy.c < diff -ru openssh-3.0.2p1/config.h.in openssh-3.1p1/config.h.in --- openssh-3.0.2p1/config.h.in 2001-12-02 10:38:56.000000000 +1100 +++ openssh-3.1p1/config.h.in 2002-03-07 13:22:30.000000000 +1100 @@ -1,5 +1,5 @@ /* config.h.in. Generated from configure.ac by autoheader. */ -/* $Id: acconfig.h,v 1.119 2001/11/03 19:09:33 tim Exp $ */ +/* $Id: acconfig.h,v 1.122 2002/02/26 16:40:49 tim Exp $ */ #ifndef _CONFIG_H #define _CONFIG_H @@ -59,9 +59,6 @@ /* Define if you are on Cygwin */ #undef HAVE_CYGWIN -/* Define if you lack native POSIX regex and you are using PCRE */ -#undef HAVE_LIBPCRE - /* Define if you have a broken realpath. */ #undef BROKEN_REALPATH @@ -89,9 +86,6 @@ /* Define if you want IRIX kernel jobs */ #undef WITH_IRIX_JOBS -/* Location of random number pool */ -#undef RANDOM_POOL - /* Location of PRNGD/EGD random number socket */ #undef PRNGD_SOCKET @@ -263,9 +257,6 @@ #undef HAVE_SS_FAMILY_IN_SS #undef HAVE___SS_FAMILY_IN_SS -/* Define if you have a regcomp() function */ -#undef HAVE_REGCOMP - /* Define if you have /dev/ptmx */ #undef HAVE_DEV_PTMX @@ -329,6 +320,9 @@ /* Define if you want smartcard support */ #undef SMARTCARD +/* Define if you want to use OpenSSL's internally seeded PRNG only */ +#undef OPENSSL_PRNG_ONLY + /* Define if the `getpgrp' function takes no argument. */ #undef GETPGRP_VOID @@ -579,9 +573,6 @@ /* Define if you have the `realpath' function. */ #undef HAVE_REALPATH -/* Define if you have the header file. */ -#undef HAVE_REGEX_H - /* Define if you have the `rresvport_af' function. */ #undef HAVE_RRESVPORT_AF @@ -642,6 +633,9 @@ /* Define if you have the `sigvec' function. */ #undef HAVE_SIGVEC +/* Define if the system has the type `sig_atomic_t'. */ +#undef HAVE_SIG_ATOMIC_T + /* Define if you have the `snprintf' function. */ #undef HAVE_SNPRINTF diff -ru openssh-3.0.2p1/configure openssh-3.1p1/configure --- openssh-3.0.2p1/configure 2001-12-02 10:38:55.000000000 +1100 +++ openssh-3.1p1/configure 2002-03-07 13:22:29.000000000 +1100 @@ -691,8 +691,7 @@ --with-cppflags Specify additional flags to pass to preprocessor --with-ldflags Specify additional flags to pass to linker --with-libs Specify additional libraries to link with - --with-pcre[=PATH] Override built in regex library with pcre - (optionally in PATH) + --without-rpath Disable auto-added -R linker paths --with-zlib=PATH Use zlib in PATH --with-skey[=PATH] Enable S/Key support (optionally in PATH) @@ -700,14 +699,15 @@ (optionally in PATH) --with-pam Enable PAM support --with-ssl-dir=PATH Specify path to OpenSSL installation + --with-rand-helper Use subprocess to gather strong randomness + --with-prngd-port=PORT read entropy from PRNGD/EGD TCP localhost:PORT + --with-prngd-socket=FILE read entropy from PRNGD/EGD socket FILE (default=/var/run/egd-pool) + --with-entropy-timeout Specify entropy gathering command timeout (msec) --with-smartcard Enable smartcard support --with-kerberos4=PATH Enable Kerberos 4 support --with-afs=PATH Enable AFS support --with-rsh=PATH Specify path to remote shell program --with-xauth=PATH Specify path to xauth program - --with-random=FILE read entropy from FILE (default=/dev/urandom) - --with-prngd-port=PORT read entropy from PRNGD/EGD localhost:PORT - --with-prngd-socket=FILE read entropy from PRNGD/EGD socket FILE (default=/var/run/egd-pool) --with-mantype=man|cat|doc Set man page type --with-md5-passwords Enable use of MD5 passwords --without-shadow Disable shadow password support @@ -718,7 +718,6 @@ --with-bsd-auth Enable BSD auth support --with-pid-dir=PATH Specify location of ssh.pid file --with-lastlog=FILE|DIR specify lastlog location common locations - --with-entropy-timeout Specify entropy gathering command timeout (msec) Some influential environment variables: CC C compiler command @@ -930,7 +929,7 @@ fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:933: loading site script $ac_site_file" >&5 + { echo "$as_me:932: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" @@ -941,7 +940,7 @@ # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:944: loading cache $cache_file" >&5 + { echo "$as_me:943: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -949,7 +948,7 @@ esac fi else - { echo "$as_me:952: creating cache $cache_file" >&5 + { echo "$as_me:951: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -965,21 +964,21 @@ eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:968: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:967: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:972: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:971: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:978: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:977: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:980: former value: $ac_old_val" >&5 + { echo "$as_me:979: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:982: current value: $ac_new_val" >&5 + { echo "$as_me:981: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; @@ -998,9 +997,9 @@ fi done if $ac_cache_corrupted; then - { echo "$as_me:1001: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:1000: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:1003: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:1002: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -1020,10 +1019,10 @@ echo "#! $SHELL" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh -if { (echo "$as_me:1023: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:1022: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:1026: \$? = $ac_status" >&5 + echo "$as_me:1025: \$? = $ac_status" >&5 (exit $ac_status); }; then ac_path_separator=';' else @@ -1042,7 +1041,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1045: checking for $ac_word" >&5 +echo "$as_me:1044: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1057,7 +1056,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1060: found $ac_dir/$ac_word" >&5 +echo "$as_me:1059: found $ac_dir/$ac_word" >&5 break done @@ -1065,10 +1064,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1068: result: $CC" >&5 + echo "$as_me:1067: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1071: result: no" >&5 + echo "$as_me:1070: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1077,7 +1076,7 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1080: checking for $ac_word" >&5 +echo "$as_me:1079: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1092,7 +1091,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1095: found $ac_dir/$ac_word" >&5 +echo "$as_me:1094: found $ac_dir/$ac_word" >&5 break done @@ -1100,10 +1099,10 @@ fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1103: result: $ac_ct_CC" >&5 + echo "$as_me:1102: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1106: result: no" >&5 + echo "$as_me:1105: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1116,7 +1115,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1119: checking for $ac_word" >&5 +echo "$as_me:1118: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1131,7 +1130,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1134: found $ac_dir/$ac_word" >&5 +echo "$as_me:1133: found $ac_dir/$ac_word" >&5 break done @@ -1139,10 +1138,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1142: result: $CC" >&5 + echo "$as_me:1141: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1145: result: no" >&5 + echo "$as_me:1144: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1151,7 +1150,7 @@ ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1154: checking for $ac_word" >&5 +echo "$as_me:1153: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1166,7 +1165,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1169: found $ac_dir/$ac_word" >&5 +echo "$as_me:1168: found $ac_dir/$ac_word" >&5 break done @@ -1174,10 +1173,10 @@ fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1177: result: $ac_ct_CC" >&5 + echo "$as_me:1176: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1180: result: no" >&5 + echo "$as_me:1179: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1190,7 +1189,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1193: checking for $ac_word" >&5 +echo "$as_me:1192: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1210,7 +1209,7 @@ continue fi ac_cv_prog_CC="cc" -echo "$as_me:1213: found $ac_dir/$ac_word" >&5 +echo "$as_me:1212: found $ac_dir/$ac_word" >&5 break done @@ -1232,10 +1231,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1235: result: $CC" >&5 + echo "$as_me:1234: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1238: result: no" >&5 + echo "$as_me:1237: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1246,7 +1245,7 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1249: checking for $ac_word" >&5 +echo "$as_me:1248: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1261,7 +1260,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1264: found $ac_dir/$ac_word" >&5 +echo "$as_me:1263: found $ac_dir/$ac_word" >&5 break done @@ -1269,10 +1268,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1272: result: $CC" >&5 + echo "$as_me:1271: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1275: result: no" >&5 + echo "$as_me:1274: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1285,7 +1284,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1288: checking for $ac_word" >&5 +echo "$as_me:1287: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1300,7 +1299,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1303: found $ac_dir/$ac_word" >&5 +echo "$as_me:1302: found $ac_dir/$ac_word" >&5 break done @@ -1308,10 +1307,10 @@ fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1311: result: $ac_ct_CC" >&5 + echo "$as_me:1310: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1314: result: no" >&5 + echo "$as_me:1313: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1323,32 +1322,32 @@ fi -test -z "$CC" && { { echo "$as_me:1326: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1325: error: no acceptable cc found in \$PATH" >&5 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:1331:" \ +echo "$as_me:1330:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1334: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:1333: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1337: \$? = $ac_status" >&5 + echo "$as_me:1336: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1339: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:1338: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1342: \$? = $ac_status" >&5 + echo "$as_me:1341: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1344: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:1343: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1347: \$? = $ac_status" >&5 + echo "$as_me:1346: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line 1351 "configure" +#line 1350 "configure" #include "confdefs.h" #ifdef F77_DUMMY_MAIN @@ -1370,13 +1369,13 @@ # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1373: checking for C compiler default output" >&5 +echo "$as_me:1372: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:1376: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:1375: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1379: \$? = $ac_status" >&5 + echo "$as_me:1378: \$? = $ac_status" >&5 (exit $ac_status); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last @@ -1399,34 +1398,34 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1402: error: C compiler cannot create executables" >&5 +{ { echo "$as_me:1401: error: C compiler cannot create executables" >&5 echo "$as_me: error: C compiler cannot create executables" >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:1408: result: $ac_file" >&5 +echo "$as_me:1407: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1413: checking whether the C compiler works" >&5 +echo "$as_me:1412: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1419: \"$ac_try\"") >&5 + { (eval echo "$as_me:1418: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1422: \$? = $ac_status" >&5 + echo "$as_me:1421: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1429: error: cannot run C compiled programs. + { { echo "$as_me:1428: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&5 echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&2;} @@ -1434,24 +1433,24 @@ fi fi fi -echo "$as_me:1437: result: yes" >&5 +echo "$as_me:1436: result: yes" >&5 echo "${ECHO_T}yes" >&6 rm -f a.out a.exe conftest$ac_cv_exeext ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1444: checking whether we are cross compiling" >&5 +echo "$as_me:1443: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1446: result: $cross_compiling" >&5 +echo "$as_me:1445: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1449: checking for executable suffix" >&5 +echo "$as_me:1448: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1451: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1450: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1454: \$? = $ac_status" >&5 + echo "$as_me:1453: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will @@ -1467,25 +1466,25 @@ esac done else - { { echo "$as_me:1470: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:1469: error: cannot compute EXEEXT: cannot compile and link" >&5 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext -echo "$as_me:1476: result: $ac_cv_exeext" >&5 +echo "$as_me:1475: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1482: checking for object suffix" >&5 +echo "$as_me:1481: checking for object suffix" >&5 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1488 "configure" +#line 1487 "configure" #include "confdefs.h" #ifdef F77_DUMMY_MAIN @@ -1503,10 +1502,10 @@ } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1506: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1505: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1509: \$? = $ac_status" >&5 + echo "$as_me:1508: \$? = $ac_status" >&5 (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in @@ -1518,24 +1517,24 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1521: error: cannot compute OBJEXT: cannot compile" >&5 +{ { echo "$as_me:1520: error: cannot compute OBJEXT: cannot compile" >&5 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:1528: result: $ac_cv_objext" >&5 +echo "$as_me:1527: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1532: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:1531: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1538 "configure" +#line 1537 "configure" #include "confdefs.h" #ifdef F77_DUMMY_MAIN @@ -1556,16 +1555,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1559: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1558: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1562: \$? = $ac_status" >&5 + echo "$as_me:1561: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1565: \"$ac_try\"") >&5 + { (eval echo "$as_me:1564: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1568: \$? = $ac_status" >&5 + echo "$as_me:1567: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else @@ -1577,19 +1576,19 @@ ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1580: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:1579: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:1586: checking whether $CC accepts -g" >&5 +echo "$as_me:1585: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1592 "configure" +#line 1591 "configure" #include "confdefs.h" #ifdef F77_DUMMY_MAIN @@ -1607,16 +1606,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1610: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1609: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1613: \$? = $ac_status" >&5 + echo "$as_me:1612: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1616: \"$ac_try\"") >&5 + { (eval echo "$as_me:1615: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1619: \$? = $ac_status" >&5 + echo "$as_me:1618: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else @@ -1626,7 +1625,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:1629: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:1628: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -1653,16 +1652,16 @@ #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1656: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1655: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1659: \$? = $ac_status" >&5 + echo "$as_me:1658: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1662: \"$ac_try\"") >&5 + { (eval echo "$as_me:1661: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1665: \$? = $ac_status" >&5 + echo "$as_me:1664: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -1674,7 +1673,7 @@ 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 1677 "configure" +#line 1676 "configure" #include "confdefs.h" #include $ac_declaration @@ -1693,16 +1692,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1696: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1695: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1699: \$? = $ac_status" >&5 + echo "$as_me:1698: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1702: \"$ac_try\"") >&5 + { (eval echo "$as_me:1701: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1705: \$? = $ac_status" >&5 + echo "$as_me:1704: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -1712,7 +1711,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 1715 "configure" +#line 1714 "configure" #include "confdefs.h" $ac_declaration #ifdef F77_DUMMY_MAIN @@ -1730,16 +1729,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1733: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1732: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1736: \$? = $ac_status" >&5 + echo "$as_me:1735: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1739: \"$ac_try\"") >&5 + { (eval echo "$as_me:1738: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1742: \$? = $ac_status" >&5 + echo "$as_me:1741: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -1783,7 +1782,7 @@ fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1786: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:1785: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} { (exit 1); exit 1; }; } fi @@ -1793,11 +1792,11 @@ # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:1796: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:1795: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:1800: checking build system type" >&5 +echo "$as_me:1799: checking build system type" >&5 echo $ECHO_N "checking build system type... $ECHO_C" >&6 if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1806,23 +1805,23 @@ test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:1809: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:1808: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:1813: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + { { echo "$as_me:1812: error: $ac_config_sub $ac_cv_build_alias failed." >&5 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1818: result: $ac_cv_build" >&5 +echo "$as_me:1817: result: $ac_cv_build" >&5 echo "${ECHO_T}$ac_cv_build" >&6 build=$ac_cv_build build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$as_me:1825: checking host system type" >&5 +echo "$as_me:1824: checking host system type" >&5 echo $ECHO_N "checking host system type... $ECHO_C" >&6 if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1831,26 +1830,26 @@ test -z "$ac_cv_host_alias" && ac_cv_host_alias=$ac_cv_build_alias ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:1834: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { echo "$as_me:1833: error: $ac_config_sub $ac_cv_host_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1839: result: $ac_cv_host" >&5 +echo "$as_me:1838: result: $ac_cv_host" >&5 echo "${ECHO_T}$ac_cv_host" >&6 host=$ac_cv_host host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$as_me:1846: checking whether byte ordering is bigendian" >&5 +echo "$as_me:1845: checking whether byte ordering is bigendian" >&5 echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 if test "${ac_cv_c_bigendian+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else # See if sys/param.h defines the BYTE_ORDER macro. cat >conftest.$ac_ext <<_ACEOF -#line 1853 "configure" +#line 1852 "configure" #include "confdefs.h" #include #include @@ -1873,20 +1872,20 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1876: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1875: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1879: \$? = $ac_status" >&5 + echo "$as_me:1878: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1882: \"$ac_try\"") >&5 + { (eval echo "$as_me:1881: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1885: \$? = $ac_status" >&5 + echo "$as_me:1884: \$? = $ac_status" >&5 (exit $ac_status); }; }; then # It does; now see whether it defined to BIG_ENDIAN or not. cat >conftest.$ac_ext <<_ACEOF -#line 1889 "configure" +#line 1888 "configure" #include "confdefs.h" #include #include @@ -1909,16 +1908,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1912: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1911: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1915: \$? = $ac_status" >&5 + echo "$as_me:1914: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1918: \"$ac_try\"") >&5 + { (eval echo "$as_me:1917: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1921: \$? = $ac_status" >&5 + echo "$as_me:1920: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_bigendian=yes else @@ -1935,7 +1934,7 @@ # try to guess the endianess by grep'ing values into an object file ac_cv_c_bigendian=unknown cat >conftest.$ac_ext <<_ACEOF -#line 1938 "configure" +#line 1937 "configure" #include "confdefs.h" short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; @@ -1958,16 +1957,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1961: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1960: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1964: \$? = $ac_status" >&5 + echo "$as_me:1963: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1967: \"$ac_try\"") >&5 + { (eval echo "$as_me:1966: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1970: \$? = $ac_status" >&5 + echo "$as_me:1969: \$? = $ac_status" >&5 (exit $ac_status); }; }; then if fgrep BIGenDianSyS conftest.$ac_objext >/dev/null ; then ac_cv_c_bigendian=yes @@ -1987,7 +1986,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF -#line 1990 "configure" +#line 1989 "configure" #include "confdefs.h" int main () @@ -2003,15 +2002,15 @@ } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:2006: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2005: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2009: \$? = $ac_status" >&5 + echo "$as_me:2008: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:2011: \"$ac_try\"") >&5 + { (eval echo "$as_me:2010: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2014: \$? = $ac_status" >&5 + echo "$as_me:2013: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_bigendian=no else @@ -2025,7 +2024,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2028: result: $ac_cv_c_bigendian" >&5 +echo "$as_me:2027: result: $ac_cv_c_bigendian" >&5 echo "${ECHO_T}$ac_cv_c_bigendian" >&6 case $ac_cv_c_bigendian in yes) @@ -2037,7 +2036,7 @@ no) ;; *) - { { echo "$as_me:2040: error: unknown endianess + { { echo "$as_me:2039: error: unknown endianess presetting ac_cv_c_bigendian=no (or yes) will help" >&5 echo "$as_me: error: unknown endianess presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} @@ -2050,7 +2049,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:2053: checking how to run the C preprocessor" >&5 +echo "$as_me:2052: checking how to run the C preprocessor" >&5 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then @@ -2071,18 +2070,18 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line 2074 "configure" +#line 2073 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2079: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2078: \"$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:2085: \$? = $ac_status" >&5 + echo "$as_me:2084: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2105,17 +2104,17 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 2108 "configure" +#line 2107 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2112: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2111: \"$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:2118: \$? = $ac_status" >&5 + echo "$as_me:2117: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2152,7 +2151,7 @@ else ac_cv_prog_CPP=$CPP fi -echo "$as_me:2155: result: $CPP" >&5 +echo "$as_me:2154: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -2162,18 +2161,18 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line 2165 "configure" +#line 2164 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2170: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2169: \"$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:2176: \$? = $ac_status" >&5 + echo "$as_me:2175: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2196,17 +2195,17 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 2199 "configure" +#line 2198 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2203: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2202: \"$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:2209: \$? = $ac_status" >&5 + echo "$as_me:2208: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2234,7 +2233,7 @@ if $ac_preproc_ok; then : else - { { echo "$as_me:2237: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:2236: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -2248,7 +2247,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:2251: checking for $ac_word" >&5 +echo "$as_me:2250: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2263,7 +2262,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -echo "$as_me:2266: found $ac_dir/$ac_word" >&5 +echo "$as_me:2265: found $ac_dir/$ac_word" >&5 break done @@ -2271,10 +2270,10 @@ fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:2274: result: $RANLIB" >&5 + echo "$as_me:2273: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else - echo "$as_me:2277: result: no" >&5 + echo "$as_me:2276: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2283,7 +2282,7 @@ ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:2286: checking for $ac_word" >&5 +echo "$as_me:2285: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2298,7 +2297,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_RANLIB="ranlib" -echo "$as_me:2301: found $ac_dir/$ac_word" >&5 +echo "$as_me:2300: found $ac_dir/$ac_word" >&5 break done @@ -2307,10 +2306,10 @@ fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:2310: result: $ac_ct_RANLIB" >&5 + echo "$as_me:2309: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$as_me:2313: result: no" >&5 + echo "$as_me:2312: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2331,7 +2330,7 @@ # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:2334: checking for a BSD compatible install" >&5 +echo "$as_me:2333: checking for a BSD compatible install" >&5 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then @@ -2380,7 +2379,7 @@ INSTALL=$ac_install_sh fi fi -echo "$as_me:2383: result: $INSTALL" >&5 +echo "$as_me:2382: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2393,7 +2392,7 @@ # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo "$as_me:2396: checking for $ac_word" >&5 +echo "$as_me:2395: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2410,7 +2409,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_AR="$ac_dir/$ac_word" - echo "$as_me:2413: found $ac_dir/$ac_word" >&5 + echo "$as_me:2412: found $ac_dir/$ac_word" >&5 break fi done @@ -2421,10 +2420,10 @@ AR=$ac_cv_path_AR if test -n "$AR"; then - echo "$as_me:2424: result: $AR" >&5 + echo "$as_me:2423: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:2427: result: no" >&5 + echo "$as_me:2426: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2432,7 +2431,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2435: checking for $ac_word" >&5 +echo "$as_me:2434: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PERL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2449,7 +2448,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_PERL="$ac_dir/$ac_word" - echo "$as_me:2452: found $ac_dir/$ac_word" >&5 + echo "$as_me:2451: found $ac_dir/$ac_word" >&5 break fi done @@ -2460,10 +2459,10 @@ PERL=$ac_cv_path_PERL if test -n "$PERL"; then - echo "$as_me:2463: result: $PERL" >&5 + echo "$as_me:2462: result: $PERL" >&5 echo "${ECHO_T}$PERL" >&6 else - echo "$as_me:2466: result: no" >&5 + echo "$as_me:2465: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2472,7 +2471,7 @@ # Extract the first word of "ent", so it can be a program name with args. set dummy ent; ac_word=$2 -echo "$as_me:2475: checking for $ac_word" >&5 +echo "$as_me:2474: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_ENT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2489,7 +2488,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_ENT="$ac_dir/$ac_word" - echo "$as_me:2492: found $ac_dir/$ac_word" >&5 + echo "$as_me:2491: found $ac_dir/$ac_word" >&5 break fi done @@ -2500,10 +2499,10 @@ ENT=$ac_cv_path_ENT if test -n "$ENT"; then - echo "$as_me:2503: result: $ENT" >&5 + echo "$as_me:2502: result: $ENT" >&5 echo "${ECHO_T}$ENT" >&6 else - echo "$as_me:2506: result: no" >&5 + echo "$as_me:2505: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2511,7 +2510,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2514: checking for $ac_word" >&5 +echo "$as_me:2513: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_FILEPRIV+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2528,7 +2527,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_FILEPRIV="$ac_dir/$ac_word" - echo "$as_me:2531: found $ac_dir/$ac_word" >&5 + echo "$as_me:2530: found $ac_dir/$ac_word" >&5 break fi done @@ -2539,10 +2538,10 @@ FILEPRIV=$ac_cv_path_FILEPRIV if test -n "$FILEPRIV"; then - echo "$as_me:2542: result: $FILEPRIV" >&5 + echo "$as_me:2541: result: $FILEPRIV" >&5 echo "${ECHO_T}$FILEPRIV" >&6 else - echo "$as_me:2545: result: no" >&5 + echo "$as_me:2544: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2552,7 +2551,7 @@ # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 -echo "$as_me:2555: checking for $ac_word" >&5 +echo "$as_me:2554: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_TEST_MINUS_S_SH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2569,7 +2568,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_TEST_MINUS_S_SH="$ac_dir/$ac_word" - echo "$as_me:2572: found $ac_dir/$ac_word" >&5 + echo "$as_me:2571: found $ac_dir/$ac_word" >&5 break fi done @@ -2580,16 +2579,16 @@ TEST_MINUS_S_SH=$ac_cv_path_TEST_MINUS_S_SH if test -n "$TEST_MINUS_S_SH"; then - echo "$as_me:2583: result: $TEST_MINUS_S_SH" >&5 + echo "$as_me:2582: result: $TEST_MINUS_S_SH" >&5 echo "${ECHO_T}$TEST_MINUS_S_SH" >&6 else - echo "$as_me:2586: result: no" >&5 + echo "$as_me:2585: result: no" >&5 echo "${ECHO_T}no" >&6 fi # Extract the first word of "ksh", so it can be a program name with args. set dummy ksh; ac_word=$2 -echo "$as_me:2592: checking for $ac_word" >&5 +echo "$as_me:2591: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_TEST_MINUS_S_SH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2606,7 +2605,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_TEST_MINUS_S_SH="$ac_dir/$ac_word" - echo "$as_me:2609: found $ac_dir/$ac_word" >&5 + echo "$as_me:2608: found $ac_dir/$ac_word" >&5 break fi done @@ -2617,16 +2616,16 @@ TEST_MINUS_S_SH=$ac_cv_path_TEST_MINUS_S_SH if test -n "$TEST_MINUS_S_SH"; then - echo "$as_me:2620: result: $TEST_MINUS_S_SH" >&5 + echo "$as_me:2619: result: $TEST_MINUS_S_SH" >&5 echo "${ECHO_T}$TEST_MINUS_S_SH" >&6 else - echo "$as_me:2623: result: no" >&5 + echo "$as_me:2622: result: no" >&5 echo "${ECHO_T}no" >&6 fi # Extract the first word of "sh", so it can be a program name with args. set dummy sh; ac_word=$2 -echo "$as_me:2629: checking for $ac_word" >&5 +echo "$as_me:2628: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_TEST_MINUS_S_SH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2643,7 +2642,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_TEST_MINUS_S_SH="$ac_dir/$ac_word" - echo "$as_me:2646: found $ac_dir/$ac_word" >&5 + echo "$as_me:2645: found $ac_dir/$ac_word" >&5 break fi done @@ -2654,10 +2653,10 @@ TEST_MINUS_S_SH=$ac_cv_path_TEST_MINUS_S_SH if test -n "$TEST_MINUS_S_SH"; then - echo "$as_me:2657: result: $TEST_MINUS_S_SH" >&5 + echo "$as_me:2656: result: $TEST_MINUS_S_SH" >&5 echo "${ECHO_T}$TEST_MINUS_S_SH" >&6 else - echo "$as_me:2660: result: no" >&5 + echo "$as_me:2659: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2669,7 +2668,7 @@ fi; if test "$enable_largefile" != no; then - echo "$as_me:2672: checking for special C compiler options needed for large files" >&5 + echo "$as_me:2671: checking for special C compiler options needed for large files" >&5 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_largefile_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2681,7 +2680,7 @@ # IRIX 6.2 and later do not support large files by default, # so use the C compiler's -n32 option if that helps. cat >conftest.$ac_ext <<_ACEOF -#line 2684 "configure" +#line 2683 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -2707,16 +2706,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2710: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2709: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2713: \$? = $ac_status" >&5 + echo "$as_me:2712: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2716: \"$ac_try\"") >&5 + { (eval echo "$as_me:2715: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2719: \$? = $ac_status" >&5 + echo "$as_me:2718: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -2726,16 +2725,16 @@ rm -f conftest.$ac_objext CC="$CC -n32" rm -f conftest.$ac_objext -if { (eval echo "$as_me:2729: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2728: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2732: \$? = $ac_status" >&5 + echo "$as_me:2731: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2735: \"$ac_try\"") >&5 + { (eval echo "$as_me:2734: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2738: \$? = $ac_status" >&5 + echo "$as_me:2737: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_largefile_CC=' -n32'; break else @@ -2749,13 +2748,13 @@ rm -f conftest.$ac_ext fi fi -echo "$as_me:2752: result: $ac_cv_sys_largefile_CC" >&5 +echo "$as_me:2751: result: $ac_cv_sys_largefile_CC" >&5 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 if test "$ac_cv_sys_largefile_CC" != no; then CC=$CC$ac_cv_sys_largefile_CC fi - echo "$as_me:2758: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo "$as_me:2757: checking for _FILE_OFFSET_BITS value needed for large files" >&5 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_file_offset_bits+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2763,7 +2762,7 @@ while :; do ac_cv_sys_file_offset_bits=no cat >conftest.$ac_ext <<_ACEOF -#line 2766 "configure" +#line 2765 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -2789,16 +2788,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2792: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2791: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2795: \$? = $ac_status" >&5 + echo "$as_me:2794: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2798: \"$ac_try\"") >&5 + { (eval echo "$as_me:2797: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2801: \$? = $ac_status" >&5 + echo "$as_me:2800: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -2807,7 +2806,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 2810 "configure" +#line 2809 "configure" #include "confdefs.h" #define _FILE_OFFSET_BITS 64 #include @@ -2834,16 +2833,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2837: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2836: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2840: \$? = $ac_status" >&5 + echo "$as_me:2839: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2843: \"$ac_try\"") >&5 + { (eval echo "$as_me:2842: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2846: \$? = $ac_status" >&5 + echo "$as_me:2845: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_file_offset_bits=64; break else @@ -2854,7 +2853,7 @@ break done fi -echo "$as_me:2857: result: $ac_cv_sys_file_offset_bits" >&5 +echo "$as_me:2856: result: $ac_cv_sys_file_offset_bits" >&5 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 if test "$ac_cv_sys_file_offset_bits" != no; then @@ -2864,7 +2863,7 @@ fi rm -f conftest* - echo "$as_me:2867: checking for _LARGE_FILES value needed for large files" >&5 + echo "$as_me:2866: checking for _LARGE_FILES value needed for large files" >&5 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_large_files+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2872,7 +2871,7 @@ while :; do ac_cv_sys_large_files=no cat >conftest.$ac_ext <<_ACEOF -#line 2875 "configure" +#line 2874 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -2898,16 +2897,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2901: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2900: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2904: \$? = $ac_status" >&5 + echo "$as_me:2903: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2907: \"$ac_try\"") >&5 + { (eval echo "$as_me:2906: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2910: \$? = $ac_status" >&5 + echo "$as_me:2909: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -2916,7 +2915,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 2919 "configure" +#line 2918 "configure" #include "confdefs.h" #define _LARGE_FILES 1 #include @@ -2943,16 +2942,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2946: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2945: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2949: \$? = $ac_status" >&5 + echo "$as_me:2948: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2952: \"$ac_try\"") >&5 + { (eval echo "$as_me:2951: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2955: \$? = $ac_status" >&5 + echo "$as_me:2954: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_large_files=1; break else @@ -2963,7 +2962,7 @@ break done fi -echo "$as_me:2966: result: $ac_cv_sys_large_files" >&5 +echo "$as_me:2965: result: $ac_cv_sys_large_files" >&5 echo "${ECHO_T}$ac_cv_sys_large_files" >&6 if test "$ac_cv_sys_large_files" != no; then @@ -2976,7 +2975,7 @@ fi if test -z "$AR" ; then - { { echo "$as_me:2979: error: *** 'ar' missing, please install or fix your \$PATH ***" >&5 + { { echo "$as_me:2978: error: *** 'ar' missing, please install or fix your \$PATH ***" >&5 echo "$as_me: error: *** 'ar' missing, please install or fix your \$PATH ***" >&2;} { (exit 1); exit 1; }; } fi @@ -2991,7 +2990,7 @@ # Search for login # Extract the first word of "login", so it can be a program name with args. set dummy login; ac_word=$2 -echo "$as_me:2994: checking for $ac_word" >&5 +echo "$as_me:2993: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_LOGIN_PROGRAM_FALLBACK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3008,7 +3007,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_LOGIN_PROGRAM_FALLBACK="$ac_dir/$ac_word" - echo "$as_me:3011: found $ac_dir/$ac_word" >&5 + echo "$as_me:3010: found $ac_dir/$ac_word" >&5 break fi done @@ -3019,10 +3018,10 @@ LOGIN_PROGRAM_FALLBACK=$ac_cv_path_LOGIN_PROGRAM_FALLBACK if test -n "$LOGIN_PROGRAM_FALLBACK"; then - echo "$as_me:3022: result: $LOGIN_PROGRAM_FALLBACK" >&5 + echo "$as_me:3021: result: $LOGIN_PROGRAM_FALLBACK" >&5 echo "${ECHO_T}$LOGIN_PROGRAM_FALLBACK" >&6 else - echo "$as_me:3025: result: no" >&5 + echo "$as_me:3024: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3038,7 +3037,7 @@ LD=$CC fi -echo "$as_me:3041: checking for $CC option to accept ANSI C" >&5 +echo "$as_me:3040: checking for $CC option to accept ANSI C" >&5 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 if test "${ac_cv_prog_cc_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3046,7 +3045,7 @@ ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line 3049 "configure" +#line 3048 "configure" #include "confdefs.h" #include #include @@ -3101,16 +3100,16 @@ do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:3104: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3103: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3107: \$? = $ac_status" >&5 + echo "$as_me:3106: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3110: \"$ac_try\"") >&5 + { (eval echo "$as_me:3109: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3113: \$? = $ac_status" >&5 + echo "$as_me:3112: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -3127,15 +3126,15 @@ case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:3130: result: none needed" >&5 + echo "$as_me:3129: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:3133: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:3132: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac -echo "$as_me:3138: checking for inline" >&5 +echo "$as_me:3137: checking for inline" >&5 echo $ECHO_N "checking for inline... $ECHO_C" >&6 if test "${ac_cv_c_inline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3143,7 +3142,7 @@ ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat >conftest.$ac_ext <<_ACEOF -#line 3146 "configure" +#line 3145 "configure" #include "confdefs.h" #ifndef __cplusplus static $ac_kw int static_foo () {return 0; } @@ -3152,16 +3151,16 @@ _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3155: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3154: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3158: \$? = $ac_status" >&5 + echo "$as_me:3157: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3161: \"$ac_try\"") >&5 + { (eval echo "$as_me:3160: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3164: \$? = $ac_status" >&5 + echo "$as_me:3163: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_inline=$ac_kw; break else @@ -3172,7 +3171,7 @@ done fi -echo "$as_me:3175: result: $ac_cv_c_inline" >&5 +echo "$as_me:3174: result: $ac_cv_c_inline" >&5 echo "${ECHO_T}$ac_cv_c_inline" >&6 case $ac_cv_c_inline in inline | yes) ;; @@ -3200,13 +3199,13 @@ if (test "$LD" != "gcc" && test -z "$blibpath"); then blibpath="/usr/lib:/lib:/usr/local/lib" fi - echo "$as_me:3203: checking for authenticate" >&5 + echo "$as_me:3202: checking for authenticate" >&5 echo $ECHO_N "checking for authenticate... $ECHO_C" >&6 if test "${ac_cv_func_authenticate+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3209 "configure" +#line 3208 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char authenticate (); below. */ @@ -3243,16 +3242,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3246: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3245: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3249: \$? = $ac_status" >&5 + echo "$as_me:3248: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3252: \"$ac_try\"") >&5 + { (eval echo "$as_me:3251: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3255: \$? = $ac_status" >&5 + echo "$as_me:3254: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_authenticate=yes else @@ -3262,7 +3261,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:3265: result: $ac_cv_func_authenticate" >&5 +echo "$as_me:3264: result: $ac_cv_func_authenticate" >&5 echo "${ECHO_T}$ac_cv_func_authenticate" >&6 if test $ac_cv_func_authenticate = yes; then cat >>confdefs.h <<\_ACEOF @@ -3279,9 +3278,13 @@ #define DISABLE_LASTLOG 1 _ACEOF + cat >>confdefs.h <<\_ACEOF +#define HAVE_BOGUS_SYS_QUEUE_H 1 +_ACEOF + ;; *-*-cygwin*) - LIBS="$LIBS -lregex /usr/lib/textmode.o" + LIBS="$LIBS /usr/lib/textmode.o" cat >>confdefs.h <<\_ACEOF #define HAVE_CYGWIN 1 _ACEOF @@ -3393,13 +3396,13 @@ #define WITH_IRIX_AUDIT 1 _ACEOF - echo "$as_me:3396: checking for jlimit_startjob" >&5 + echo "$as_me:3399: 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 3402 "configure" +#line 3405 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char jlimit_startjob (); below. */ @@ -3436,16 +3439,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3439: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3442: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3442: \$? = $ac_status" >&5 + echo "$as_me:3445: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3445: \"$ac_try\"") >&5 + { (eval echo "$as_me:3448: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3448: \$? = $ac_status" >&5 + echo "$as_me:3451: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_jlimit_startjob=yes else @@ -3455,7 +3458,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:3458: result: $ac_cv_func_jlimit_startjob" >&5 +echo "$as_me:3461: 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 <<\_ACEOF @@ -3480,6 +3483,10 @@ #define PAM_TTY_KLUDGE 1 _ACEOF + cat >>confdefs.h <<\_ACEOF +#define HAVE_BOGUS_SYS_QUEUE_H 1 +_ACEOF + inet6_default_4in6=yes ;; mips-sony-bsd|mips-sony-newsos4) @@ -3488,7 +3495,7 @@ _ACEOF SONY=1 - echo "$as_me:3491: checking for xatexit in -liberty" >&5 + echo "$as_me:3498: checking for xatexit in -liberty" >&5 echo $ECHO_N "checking for xatexit in -liberty... $ECHO_C" >&6 if test "${ac_cv_lib_iberty_xatexit+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3496,7 +3503,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-liberty $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 3499 "configure" +#line 3506 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -3521,16 +3528,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3524: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3531: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3527: \$? = $ac_status" >&5 + echo "$as_me:3534: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3530: \"$ac_try\"") >&5 + { (eval echo "$as_me:3537: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3533: \$? = $ac_status" >&5 + echo "$as_me:3540: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_iberty_xatexit=yes else @@ -3541,7 +3548,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:3544: result: $ac_cv_lib_iberty_xatexit" >&5 +echo "$as_me:3551: result: $ac_cv_lib_iberty_xatexit" >&5 echo "${ECHO_T}$ac_cv_lib_iberty_xatexit" >&6 if test $ac_cv_lib_iberty_xatexit = yes; then cat >>confdefs.h <<\_ACEOF @@ -3549,7 +3556,7 @@ _ACEOF else - { { echo "$as_me:3552: error: *** libiberty missing - please install first or check config.log ***" >&5 + { { echo "$as_me:3559: error: *** libiberty missing - please install first or check config.log ***" >&5 echo "$as_me: error: *** libiberty missing - please install first or check config.log ***" >&2;} { (exit 1); exit 1; }; } @@ -3608,11 +3615,11 @@ # hardwire lastlog location (can't detect it on some versions) conf_lastlog_location="/var/adm/lastlog" - echo "$as_me:3611: checking for obsolete utmp and wtmp in solaris2.x" >&5 + echo "$as_me:3618: 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:3615: result: yes" >&5 + echo "$as_me:3622: result: yes" >&5 echo "${ECHO_T}yes" >&6 cat >>confdefs.h <<\_ACEOF #define DISABLE_UTMP 1 @@ -3623,7 +3630,7 @@ _ACEOF else - echo "$as_me:3626: result: no" >&5 + echo "$as_me:3633: result: no" >&5 echo "${ECHO_T}no" >&6 fi ;; @@ -3633,13 +3640,13 @@ for ac_func in getpwanam do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:3636: checking for $ac_func" >&5 +echo "$as_me:3643: 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 3642 "configure" +#line 3649 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -3676,16 +3683,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3679: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3686: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3682: \$? = $ac_status" >&5 + echo "$as_me:3689: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3685: \"$ac_try\"") >&5 + { (eval echo "$as_me:3692: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3688: \$? = $ac_status" >&5 + echo "$as_me:3695: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -3695,7 +3702,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:3698: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:3705: 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 <<_ACEOF @@ -3729,6 +3736,10 @@ #define HAVE_BOGUS_SYS_QUEUE_H 1 _ACEOF + cat >>confdefs.h <<\_ACEOF +#define USE_PIPES 1 +_ACEOF + ;; *-sni-sysv*) CPPFLAGS="$CPPFLAGS -I/usr/local/include" @@ -3807,13 +3818,13 @@ for ac_func in getluid setluid do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:3810: checking for $ac_func" >&5 +echo "$as_me:3821: 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 3816 "configure" +#line 3827 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -3850,16 +3861,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3853: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3864: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3856: \$? = $ac_status" >&5 + echo "$as_me:3867: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3859: \"$ac_try\"") >&5 + { (eval echo "$as_me:3870: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3862: \$? = $ac_status" >&5 + echo "$as_me:3873: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -3869,7 +3880,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:3872: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:3883: 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 <<_ACEOF @@ -3907,13 +3918,13 @@ for ac_func in getluid setluid do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:3910: checking for $ac_func" >&5 +echo "$as_me:3921: 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 3916 "configure" +#line 3927 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -3950,16 +3961,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3953: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3964: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3956: \$? = $ac_status" >&5 + echo "$as_me:3967: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3959: \"$ac_try\"") >&5 + { (eval echo "$as_me:3970: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3962: \$? = $ac_status" >&5 + echo "$as_me:3973: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -3969,7 +3980,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:3972: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:3983: 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 <<_ACEOF @@ -3992,7 +4003,7 @@ LIBS="$LIBS -lgen -lrsc" ;; *-dec-osf*) - echo "$as_me:3995: checking for Digital Unix SIA" >&5 + echo "$as_me:4006: checking for Digital Unix SIA" >&5 echo $ECHO_N "checking for Digital Unix SIA... $ECHO_C" >&6 no_osfsia="" @@ -4001,7 +4012,7 @@ withval="$with_osfsia" if test "x$withval" = "xno" ; then - echo "$as_me:4004: result: disabled" >&5 + echo "$as_me:4015: result: disabled" >&5 echo "${ECHO_T}disabled" >&6 no_osfsia=1 fi @@ -4009,7 +4020,7 @@ fi; if test -z "$no_osfsia" ; then if test -f /etc/sia/matrix.conf; then - echo "$as_me:4012: result: yes" >&5 + echo "$as_me:4023: result: yes" >&5 echo "${ECHO_T}yes" >&6 cat >>confdefs.h <<\_ACEOF #define HAVE_OSF_SIA 1 @@ -4021,7 +4032,7 @@ LIBS="$LIBS -lsecurity -ldb -lm -laud" else - echo "$as_me:4024: result: no" >&5 + echo "$as_me:4035: result: no" >&5 echo "${ECHO_T}no" >&6 fi fi @@ -4093,13 +4104,15 @@ fi; -echo "$as_me:4096: checking for ANSI C header files" >&5 +# Checks for header files. + +echo "$as_me:4109: 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 4102 "configure" +#line 4115 "configure" #include "confdefs.h" #include #include @@ -4107,13 +4120,13 @@ #include _ACEOF -if { (eval echo "$as_me:4110: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4123: \"$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:4116: \$? = $ac_status" >&5 + echo "$as_me:4129: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4135,7 +4148,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 4138 "configure" +#line 4151 "configure" #include "confdefs.h" #include @@ -4153,7 +4166,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 4156 "configure" +#line 4169 "configure" #include "confdefs.h" #include @@ -4174,7 +4187,7 @@ : else cat >conftest.$ac_ext <<_ACEOF -#line 4177 "configure" +#line 4190 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -4200,15 +4213,15 @@ } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:4203: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4216: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4206: \$? = $ac_status" >&5 + echo "$as_me:4219: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:4208: \"$ac_try\"") >&5 + { (eval echo "$as_me:4221: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4211: \$? = $ac_status" >&5 + echo "$as_me:4224: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -4221,7 +4234,7 @@ fi fi fi -echo "$as_me:4224: result: $ac_cv_header_stdc" >&5 +echo "$as_me:4237: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -4237,29 +4250,29 @@ inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:4240: checking for $ac_header" >&5 +echo "$as_me:4253: 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 4246 "configure" +#line 4259 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4253: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4266: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4256: \$? = $ac_status" >&5 + echo "$as_me:4269: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4259: \"$ac_try\"") >&5 + { (eval echo "$as_me:4272: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4262: \$? = $ac_status" >&5 + echo "$as_me:4275: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -4269,7 +4282,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4272: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:4285: 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 <<_ACEOF @@ -4280,63 +4293,47 @@ done -# Check whether --with-pcre or --without-pcre was given. -if test "${with_pcre+set}" = set; then - withval="$with_pcre" - - case "$withval" in - no) ;; - *) - if test "x$withval" != "xyes"; then - if test -d "$withval/lib"; then - if test -n "${need_dash_r}"; then - LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}" - else - LDFLAGS="-L${withval}/lib ${LDFLAGS}" - fi - else - if test -n "${need_dash_r}"; then - LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}" - else - LDFLAGS="-L${withval} ${LDFLAGS}" - fi - fi - if test -d "$withval/include"; then - CPPFLAGS="-I${withval}/include ${CPPFLAGS}" - else - CPPFLAGS="-I${withval} ${CPPFLAGS}" - fi - fi - - if test "${ac_cv_header_pcreposix_h+set}" = set; then - echo "$as_me:4312: checking for pcreposix.h" >&5 -echo $ECHO_N "checking for pcreposix.h... $ECHO_C" >&6 -if test "${ac_cv_header_pcreposix_h+set}" = set; then +for ac_header in bstring.h crypt.h endian.h floatingpoint.h \ + getopt.h glob.h lastlog.h limits.h login.h \ + login_cap.h maillock.h netdb.h netgroup.h \ + netinet/in_systm.h paths.h poll.h pty.h \ + security/pam_appl.h shadow.h stddef.h stdint.h \ + strings.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h \ + sys/poll.h sys/queue.h sys/select.h sys/stat.h \ + sys/stropts.h sys/sysmacros.h sys/time.h \ + sys/ttcompat.h sys/un.h time.h ttyent.h usersec.h \ + util.h utime.h utmp.h utmpx.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:4309: 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 fi -echo "$as_me:4317: result: $ac_cv_header_pcreposix_h" >&5 -echo "${ECHO_T}$ac_cv_header_pcreposix_h" >&6 +echo "$as_me:4314: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else # Is the header compilable? -echo "$as_me:4321: checking pcreposix.h usability" >&5 -echo $ECHO_N "checking pcreposix.h usability... $ECHO_C" >&6 +echo "$as_me:4318: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 4324 "configure" +#line 4321 "configure" #include "confdefs.h" $ac_includes_default -#include +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4330: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4327: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4333: \$? = $ac_status" >&5 + echo "$as_me:4330: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4336: \"$ac_try\"") >&5 + { (eval echo "$as_me:4333: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4339: \$? = $ac_status" >&5 + echo "$as_me:4336: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_header_compiler=yes else @@ -4345,24 +4342,24 @@ ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:4348: result: $ac_header_compiler" >&5 +echo "$as_me:4345: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -echo "$as_me:4352: checking pcreposix.h presence" >&5 -echo $ECHO_N "checking pcreposix.h presence... $ECHO_C" >&6 +echo "$as_me:4349: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 4355 "configure" +#line 4352 "configure" #include "confdefs.h" -#include +#include <$ac_header> _ACEOF -if { (eval echo "$as_me:4359: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4356: \"$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:4365: \$? = $ac_status" >&5 + echo "$as_me:4362: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4380,124 +4377,52 @@ ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -echo "$as_me:4383: result: $ac_header_preproc" >&5 +echo "$as_me:4380: result: $ac_header_preproc" >&5 echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? case $ac_header_compiler:$ac_header_preproc in yes:no ) - { echo "$as_me:4389: WARNING: pcreposix.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: pcreposix.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:4391: WARNING: pcreposix.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: pcreposix.h: proceeding with the preprocessor's result" >&2;};; + { echo "$as_me:4386: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:4388: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; no:yes ) - { echo "$as_me:4394: WARNING: pcreposix.h: present but cannot be compiled." >&5 -echo "$as_me: WARNING: pcreposix.h: present but cannot be compiled." >&2;} - { echo "$as_me:4396: WARNING: pcreposix.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: pcreposix.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:4398: WARNING: pcreposix.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: pcreposix.h: proceeding with the preprocessor's result" >&2;};; + { echo "$as_me:4391: WARNING: $ac_header: present but cannot be compiled." >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled." >&2;} + { echo "$as_me:4393: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:4395: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; esac -echo "$as_me:4401: checking for pcreposix.h" >&5 -echo $ECHO_N "checking for pcreposix.h... $ECHO_C" >&6 -if test "${ac_cv_header_pcreposix_h+set}" = set; then +echo "$as_me:4398: 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 - ac_cv_header_pcreposix_h=$ac_header_preproc -fi -echo "$as_me:4408: result: $ac_cv_header_pcreposix_h" >&5 -echo "${ECHO_T}$ac_cv_header_pcreposix_h" >&6 - + eval "$as_ac_Header=$ac_header_preproc" fi -if test $ac_cv_header_pcreposix_h = yes; then - echo "$as_me:4413: checking for pcre_info in -lpcre" >&5 -echo $ECHO_N "checking for pcre_info in -lpcre... $ECHO_C" >&6 -if test "${ac_cv_lib_pcre_pcre_info+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpcre $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 4421 "configure" -#include "confdefs.h" +echo "$as_me:4405: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -/* 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 pcre_info (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -pcre_info (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4446: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:4449: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4452: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4455: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_pcre_pcre_info=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_pcre_pcre_info=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4466: result: $ac_cv_lib_pcre_pcre_info" >&5 -echo "${ECHO_T}$ac_cv_lib_pcre_pcre_info" >&6 -if test $ac_cv_lib_pcre_pcre_info = yes; then - - cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBPCRE 1 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - LIBS="$LIBS -lpcreposix -lpcre" - no_comp_check=yes -else - { { echo "$as_me:4477: error: *** unable to locate pcre library ***" >&5 -echo "$as_me: error: *** unable to locate pcre library ***" >&2;} - { (exit 1); exit 1; }; } -fi - -else - { { echo "$as_me:4483: error: *** unable to locate pcreposix.h include file ***" >&5 -echo "$as_me: error: *** unable to locate pcreposix.h include file ***" >&2;} - { (exit 1); exit 1; }; } fi - ;; - esac - -fi; +done # Checks for libraries. -echo "$as_me:4494: checking for yp_match" >&5 +echo "$as_me:4419: 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 4500 "configure" +#line 4425 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char yp_match (); below. */ @@ -4534,16 +4459,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4537: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4462: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4540: \$? = $ac_status" >&5 + echo "$as_me:4465: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4543: \"$ac_try\"") >&5 + { (eval echo "$as_me:4468: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4546: \$? = $ac_status" >&5 + echo "$as_me:4471: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_yp_match=yes else @@ -4553,13 +4478,13 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:4556: result: $ac_cv_func_yp_match" >&5 +echo "$as_me:4481: 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:4562: checking for yp_match in -lnsl" >&5 +echo "$as_me:4487: 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 @@ -4567,7 +4492,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 4570 "configure" +#line 4495 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4592,16 +4517,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4595: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4520: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4598: \$? = $ac_status" >&5 + echo "$as_me:4523: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4601: \"$ac_try\"") >&5 + { (eval echo "$as_me:4526: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4604: \$? = $ac_status" >&5 + echo "$as_me:4529: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_nsl_yp_match=yes else @@ -4612,7 +4537,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4615: result: $ac_cv_lib_nsl_yp_match" >&5 +echo "$as_me:4540: 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 <<_ACEOF @@ -4625,13 +4550,13 @@ fi -echo "$as_me:4628: checking for setsockopt" >&5 +echo "$as_me:4553: 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 4634 "configure" +#line 4559 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char setsockopt (); below. */ @@ -4668,16 +4593,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4671: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4596: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4674: \$? = $ac_status" >&5 + echo "$as_me:4599: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4677: \"$ac_try\"") >&5 + { (eval echo "$as_me:4602: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4680: \$? = $ac_status" >&5 + echo "$as_me:4605: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_setsockopt=yes else @@ -4687,13 +4612,13 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:4690: result: $ac_cv_func_setsockopt" >&5 +echo "$as_me:4615: 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:4696: checking for setsockopt in -lsocket" >&5 +echo "$as_me:4621: 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 @@ -4701,7 +4626,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 4704 "configure" +#line 4629 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4726,16 +4651,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4729: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4654: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4732: \$? = $ac_status" >&5 + echo "$as_me:4657: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4735: \"$ac_try\"") >&5 + { (eval echo "$as_me:4660: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4738: \$? = $ac_status" >&5 + echo "$as_me:4663: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_socket_setsockopt=yes else @@ -4746,7 +4671,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4749: result: $ac_cv_lib_socket_setsockopt" >&5 +echo "$as_me:4674: 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 <<_ACEOF @@ -4761,7 +4686,7 @@ if test "x$with_tcp_wrappers" != "xno" ; then if test "x$do_sco3_extra_lib_check" = "xyes" ; then - echo "$as_me:4764: checking for innetgr in -lrpc" >&5 + echo "$as_me:4689: 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 @@ -4769,7 +4694,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lrpc -lyp -lrpc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 4772 "configure" +#line 4697 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4794,16 +4719,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4797: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4722: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4800: \$? = $ac_status" >&5 + echo "$as_me:4725: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4803: \"$ac_try\"") >&5 + { (eval echo "$as_me:4728: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4806: \$? = $ac_status" >&5 + echo "$as_me:4731: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_rpc_innetgr=yes else @@ -4814,7 +4739,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4817: result: $ac_cv_lib_rpc_innetgr" >&5 +echo "$as_me:4742: 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" @@ -4823,13 +4748,13 @@ fi fi -echo "$as_me:4826: checking for getspnam" >&5 +echo "$as_me:4751: 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 4832 "configure" +#line 4757 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getspnam (); below. */ @@ -4866,16 +4791,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4869: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4794: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4872: \$? = $ac_status" >&5 + echo "$as_me:4797: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4875: \"$ac_try\"") >&5 + { (eval echo "$as_me:4800: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4878: \$? = $ac_status" >&5 + echo "$as_me:4803: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_getspnam=yes else @@ -4885,12 +4810,12 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:4888: result: $ac_cv_func_getspnam" >&5 +echo "$as_me:4813: 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:4893: checking for getspnam in -lgen" >&5 + echo "$as_me:4818: 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 @@ -4898,7 +4823,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lgen $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 4901 "configure" +#line 4826 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4923,16 +4848,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4926: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4851: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4929: \$? = $ac_status" >&5 + echo "$as_me:4854: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4932: \"$ac_try\"") >&5 + { (eval echo "$as_me:4857: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4935: \$? = $ac_status" >&5 + echo "$as_me:4860: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gen_getspnam=yes else @@ -4943,7 +4868,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4946: result: $ac_cv_lib_gen_getspnam" >&5 +echo "$as_me:4871: 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" @@ -4951,10 +4876,28 @@ fi +# Check whether --with-rpath or --without-rpath was given. +if test "${with_rpath+set}" = set; then + withval="$with_rpath" + + if test "x$withval" = "xno" ; then + need_dash_r="" + fi + if test "x$withval" = "xyes" ; then + need_dash_r=1 + fi + +fi; + # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then withval="$with_zlib" + if test "x$withval" = "xno" ; then + { { echo "$as_me:4897: error: *** zlib is required ***" >&5 +echo "$as_me: error: *** zlib is required ***" >&2;} + { (exit 1); exit 1; }; } + fi if test -d "$withval/lib"; then if test -n "${need_dash_r}"; then LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}" @@ -4976,7 +4919,7 @@ fi; -echo "$as_me:4979: checking for deflate in -lz" >&5 +echo "$as_me:4922: 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 @@ -4984,7 +4927,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lz $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 4987 "configure" +#line 4930 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5009,16 +4952,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5012: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4955: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5015: \$? = $ac_status" >&5 + echo "$as_me:4958: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5018: \"$ac_try\"") >&5 + { (eval echo "$as_me:4961: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5021: \$? = $ac_status" >&5 + echo "$as_me:4964: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_z_deflate=yes else @@ -5029,7 +4972,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5032: result: $ac_cv_lib_z_deflate" >&5 +echo "$as_me:4975: 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 <<_ACEOF @@ -5039,166 +4982,18 @@ LIBS="-lz $LIBS" else - { { echo "$as_me:5042: error: *** zlib missing - please install first or check config.log ***" >&5 + { { echo "$as_me:4985: 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; }; } fi -# We don't want to check if we did an pcre override. -if test -z "$no_comp_check" ; then - echo "$as_me:5049: checking for regcomp" >&5 -echo $ECHO_N "checking for regcomp... $ECHO_C" >&6 -if test "${ac_cv_func_regcomp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 5055 "configure" -#include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char regcomp (); below. */ -#include -/* 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 regcomp (); -char (*f) (); - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_regcomp) || defined (__stub___regcomp) -choke me -#else -f = regcomp; -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5092: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:5095: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5098: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5101: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_regcomp=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_func_regcomp=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:5111: result: $ac_cv_func_regcomp" >&5 -echo "${ECHO_T}$ac_cv_func_regcomp" >&6 -if test $ac_cv_func_regcomp = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_REGCOMP 1 -_ACEOF - -else - - echo "$as_me:5120: checking for pcre_info in -lpcre" >&5 -echo $ECHO_N "checking for pcre_info in -lpcre... $ECHO_C" >&6 -if test "${ac_cv_lib_pcre_pcre_info+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpcre $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 5128 "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 pcre_info (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -pcre_info (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5153: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:5156: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5159: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5162: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_pcre_pcre_info=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_pcre_pcre_info=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:5173: result: $ac_cv_lib_pcre_pcre_info" >&5 -echo "${ECHO_T}$ac_cv_lib_pcre_pcre_info" >&6 -if test $ac_cv_lib_pcre_pcre_info = yes; then - - cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBPCRE 1 -_ACEOF - - LIBS="$LIBS -lpcreposix -lpcre" - -else - - { { echo "$as_me:5185: error: *** No regex library found." >&5 -echo "$as_me: error: *** No regex library found." >&2;} - { (exit 1); exit 1; }; } - -fi - -fi - -fi - -echo "$as_me:5195: checking for strcasecmp" >&5 +echo "$as_me:4990: 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 5201 "configure" +#line 4996 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strcasecmp (); below. */ @@ -5235,16 +5030,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5238: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5033: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5241: \$? = $ac_status" >&5 + echo "$as_me:5036: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5244: \"$ac_try\"") >&5 + { (eval echo "$as_me:5039: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5247: \$? = $ac_status" >&5 + echo "$as_me:5042: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_strcasecmp=yes else @@ -5254,12 +5049,12 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5257: result: $ac_cv_func_strcasecmp" >&5 +echo "$as_me:5052: 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:5262: checking for strcasecmp in -lresolv" >&5 + echo "$as_me:5057: 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 @@ -5267,7 +5062,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lresolv $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5270 "configure" +#line 5065 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5292,16 +5087,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5295: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5090: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5298: \$? = $ac_status" >&5 + echo "$as_me:5093: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5301: \"$ac_try\"") >&5 + { (eval echo "$as_me:5096: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5304: \$? = $ac_status" >&5 + echo "$as_me:5099: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_resolv_strcasecmp=yes else @@ -5312,7 +5107,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5315: result: $ac_cv_lib_resolv_strcasecmp" >&5 +echo "$as_me:5110: 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" @@ -5320,13 +5115,13 @@ fi -echo "$as_me:5323: checking for utimes" >&5 +echo "$as_me:5118: 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 5329 "configure" +#line 5124 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char utimes (); below. */ @@ -5363,16 +5158,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5366: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5161: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5369: \$? = $ac_status" >&5 + echo "$as_me:5164: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5372: \"$ac_try\"") >&5 + { (eval echo "$as_me:5167: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5375: \$? = $ac_status" >&5 + echo "$as_me:5170: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_utimes=yes else @@ -5382,12 +5177,12 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5385: result: $ac_cv_func_utimes" >&5 +echo "$as_me:5180: 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:5390: checking for utimes in -lc89" >&5 + echo "$as_me:5185: 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 @@ -5395,7 +5190,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lc89 $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5398 "configure" +#line 5193 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5420,16 +5215,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5423: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5218: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5426: \$? = $ac_status" >&5 + echo "$as_me:5221: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5429: \"$ac_try\"") >&5 + { (eval echo "$as_me:5224: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5432: \$? = $ac_status" >&5 + echo "$as_me:5227: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_c89_utimes=yes else @@ -5440,7 +5235,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5443: result: $ac_cv_lib_c89_utimes" >&5 +echo "$as_me:5238: 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 LIBS="$LIBS -lc89" @@ -5452,34 +5247,34 @@ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:5455: checking for $ac_header" >&5 + echo "$as_me:5250: 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 fi -echo "$as_me:5460: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:5255: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else # Is the header compilable? -echo "$as_me:5464: checking $ac_header usability" >&5 +echo "$as_me:5259: checking $ac_header usability" >&5 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 5467 "configure" +#line 5262 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5473: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5268: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5476: \$? = $ac_status" >&5 + echo "$as_me:5271: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5479: \"$ac_try\"") >&5 + { (eval echo "$as_me:5274: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5482: \$? = $ac_status" >&5 + echo "$as_me:5277: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_header_compiler=yes else @@ -5488,24 +5283,24 @@ ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:5491: result: $ac_header_compiler" >&5 +echo "$as_me:5286: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -echo "$as_me:5495: checking $ac_header presence" >&5 +echo "$as_me:5290: checking $ac_header presence" >&5 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 5498 "configure" +#line 5293 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:5502: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:5297: \"$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:5508: \$? = $ac_status" >&5 + echo "$as_me:5303: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5523,32 +5318,32 @@ ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -echo "$as_me:5526: result: $ac_header_preproc" >&5 +echo "$as_me:5321: result: $ac_header_preproc" >&5 echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? case $ac_header_compiler:$ac_header_preproc in yes:no ) - { echo "$as_me:5532: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 + { echo "$as_me:5327: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:5534: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 + { echo "$as_me:5329: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; no:yes ) - { echo "$as_me:5537: WARNING: $ac_header: present but cannot be compiled." >&5 + { echo "$as_me:5332: WARNING: $ac_header: present but cannot be compiled." >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled." >&2;} - { echo "$as_me:5539: WARNING: $ac_header: check for missing prerequisite headers?" >&5 + { echo "$as_me:5334: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:5541: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 + { echo "$as_me:5336: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; esac -echo "$as_me:5544: checking for $ac_header" >&5 +echo "$as_me:5339: 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 eval "$as_ac_Header=$ac_header_preproc" fi -echo "$as_me:5551: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:5346: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 fi @@ -5561,7 +5356,7 @@ done -echo "$as_me:5564: checking for library containing login" >&5 +echo "$as_me:5359: 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 @@ -5569,7 +5364,7 @@ ac_func_search_save_LIBS=$LIBS ac_cv_search_login=no cat >conftest.$ac_ext <<_ACEOF -#line 5572 "configure" +#line 5367 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5594,16 +5389,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5597: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5392: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5600: \$? = $ac_status" >&5 + echo "$as_me:5395: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5603: \"$ac_try\"") >&5 + { (eval echo "$as_me:5398: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5606: \$? = $ac_status" >&5 + echo "$as_me:5401: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_search_login="none required" else @@ -5615,7 +5410,7 @@ for ac_lib in util bsd; do LIBS="-l$ac_lib $ac_func_search_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5618 "configure" +#line 5413 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5640,16 +5435,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5643: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5438: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5646: \$? = $ac_status" >&5 + echo "$as_me:5441: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5649: \"$ac_try\"") >&5 + { (eval echo "$as_me:5444: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5652: \$? = $ac_status" >&5 + echo "$as_me:5447: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_search_login="-l$ac_lib" break @@ -5662,7 +5457,7 @@ fi LIBS=$ac_func_search_save_LIBS fi -echo "$as_me:5665: result: $ac_cv_search_login" >&5 +echo "$as_me:5460: 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" @@ -5675,13 +5470,13 @@ for ac_func in logout updwtmp logwtmp do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:5678: checking for $ac_func" >&5 +echo "$as_me:5473: 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 5684 "configure" +#line 5479 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -5718,16 +5513,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5721: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5516: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5724: \$? = $ac_status" >&5 + echo "$as_me:5519: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5727: \"$ac_try\"") >&5 + { (eval echo "$as_me:5522: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5730: \$? = $ac_status" >&5 + echo "$as_me:5525: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -5737,7 +5532,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5740: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:5535: 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 <<_ACEOF @@ -5750,13 +5545,13 @@ for ac_func in strftime do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:5753: checking for $ac_func" >&5 +echo "$as_me:5548: 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 5759 "configure" +#line 5554 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -5793,16 +5588,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5796: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5591: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5799: \$? = $ac_status" >&5 + echo "$as_me:5594: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5802: \"$ac_try\"") >&5 + { (eval echo "$as_me:5597: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5805: \$? = $ac_status" >&5 + echo "$as_me:5600: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -5812,7 +5607,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5815: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:5610: 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 <<_ACEOF @@ -5821,7 +5616,7 @@ else # strftime is in -lintl on SCO UNIX. -echo "$as_me:5824: checking for strftime in -lintl" >&5 +echo "$as_me:5619: 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 @@ -5829,7 +5624,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5832 "configure" +#line 5627 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5854,16 +5649,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5857: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5652: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5860: \$? = $ac_status" >&5 + echo "$as_me:5655: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5863: \"$ac_try\"") >&5 + { (eval echo "$as_me:5658: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5866: \$? = $ac_status" >&5 + echo "$as_me:5661: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_intl_strftime=yes else @@ -5874,7 +5669,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5877: result: $ac_cv_lib_intl_strftime" >&5 +echo "$as_me:5672: 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 <<\_ACEOF @@ -5887,136 +5682,12 @@ fi done -# Checks for header files. - -for ac_header in bstring.h crypt.h endian.h floatingpoint.h \ - getopt.h glob.h lastlog.h limits.h login.h \ - login_cap.h maillock.h netdb.h netgroup.h \ - netinet/in_systm.h paths.h poll.h pty.h regex.h \ - security/pam_appl.h shadow.h stddef.h stdint.h \ - strings.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h \ - sys/poll.h sys/queue.h sys/select.h sys/stat.h \ - sys/stropts.h sys/sysmacros.h sys/time.h \ - sys/ttcompat.h sys/un.h time.h ttyent.h usersec.h \ - util.h utime.h utmp.h utmpx.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:5905: 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 -fi -echo "$as_me:5910: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:5914: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 5917 "configure" -#include "confdefs.h" -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:5923: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:5926: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5929: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5932: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_header_compiler=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:5941: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:5945: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 5948 "configure" -#include "confdefs.h" -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:5952: \"$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:5958: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:5976: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:5982: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:5984: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; - no:yes ) - { echo "$as_me:5987: WARNING: $ac_header: present but cannot be compiled." >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled." >&2;} - { echo "$as_me:5989: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:5991: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -esac -echo "$as_me:5994: 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 - eval "$as_ac_Header=$ac_header_preproc" -fi -echo "$as_me:6001: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - -# Check for ALTDIRFUNC glob() extension -echo "$as_me:6015: checking for GLOB_ALTDIRFUNC support" >&5 -echo $ECHO_N "checking for GLOB_ALTDIRFUNC support... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 6018 "configure" -#include "confdefs.h" +# Check for ALTDIRFUNC glob() extension +echo "$as_me:5686: checking for GLOB_ALTDIRFUNC support" >&5 +echo $ECHO_N "checking for GLOB_ALTDIRFUNC support... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line 5689 "configure" +#include "confdefs.h" #include #ifdef GLOB_ALTDIRFUNC @@ -6031,22 +5702,22 @@ #define GLOB_HAS_ALTDIRFUNC 1 _ACEOF - echo "$as_me:6034: result: yes" >&5 + echo "$as_me:5705: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:6039: result: no" >&5 + echo "$as_me:5710: result: no" >&5 echo "${ECHO_T}no" >&6 fi rm -f conftest* # Check for g.gl_matchc glob() extension -echo "$as_me:6046: checking for gl_matchc field in glob_t" >&5 +echo "$as_me:5717: 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 6049 "configure" +#line 5720 "configure" #include "confdefs.h" #include @@ -6060,26 +5731,26 @@ #define GLOB_HAS_GL_MATCHC 1 _ACEOF - echo "$as_me:6063: result: yes" >&5 + echo "$as_me:5734: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:6068: result: no" >&5 + echo "$as_me:5739: result: no" >&5 echo "${ECHO_T}no" >&6 fi rm -f conftest* -echo "$as_me:6074: checking whether struct dirent allocates space for d_name" >&5 +echo "$as_me:5745: 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:6077: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:5748: 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 6082 "configure" +#line 5753 "configure" #include "confdefs.h" #include @@ -6088,24 +5759,24 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:6091: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5762: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6094: \$? = $ac_status" >&5 + echo "$as_me:5765: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:6096: \"$ac_try\"") >&5 + { (eval echo "$as_me:5767: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6099: \$? = $ac_status" >&5 + echo "$as_me:5770: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:6101: result: yes" >&5 + echo "$as_me:5772: 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:6108: result: no" >&5 + echo "$as_me:5779: result: no" >&5 echo "${ECHO_T}no" >&6 cat >>confdefs.h <<\_ACEOF #define BROKEN_ONE_BYTE_DIRENT_D_NAME 1 @@ -6136,80 +5807,49 @@ LIBS="-lskey $LIBS" SKEY_MSG="yes" - echo "$as_me:6139: checking for skey_keyinfo" >&5 -echo $ECHO_N "checking for skey_keyinfo... $ECHO_C" >&6 -if test "${ac_cv_func_skey_keyinfo+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + echo "$as_me:5810: 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:5813: 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 6145 "configure" +#line 5818 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char skey_keyinfo (); below. */ -#include -/* 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 skey_keyinfo (); -char (*f) (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_skey_keyinfo) || defined (__stub___skey_keyinfo) -choke me -#else -f = skey_keyinfo; -#endif +#include +#include +int main() { char *ff = skey_keyinfo(""); ff=""; return 0; } - ; - return 0; -} _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6182: \"$ac_link\"") >&5 +rm -f conftest$ac_exeext +if { (eval echo "$as_me:5827: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6185: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6188: \"$ac_try\"") >&5 + echo "$as_me:5830: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:5832: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6191: \$? = $ac_status" >&5 + echo "$as_me:5835: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_skey_keyinfo=yes + echo "$as_me:5837: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_func_skey_keyinfo=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:6201: result: $ac_cv_func_skey_keyinfo" >&5 -echo "${ECHO_T}$ac_cv_func_skey_keyinfo" >&6 -if test $ac_cv_func_skey_keyinfo = yes; then - : -else - { { echo "$as_me:6207: error: ** Incomplete or missing s/key libraries." >&5 + echo "$as_me:5844: result: no" >&5 +echo "${ECHO_T}no" >&6 + { { echo "$as_me:5846: 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 fi fi; @@ -6245,11 +5885,12 @@ CPPFLAGS="-I${withval} ${CPPFLAGS}" fi fi - LIBS="-lwrap $LIBS" - echo "$as_me:6249: checking for libwrap" >&5 + LIBWRAP="-lwrap" + LIBS="$LIBWRAP $LIBS" + echo "$as_me:5890: checking for libwrap" >&5 echo $ECHO_N "checking for libwrap... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 6252 "configure" +#line 5893 "configure" #include "confdefs.h" #include @@ -6270,19 +5911,19 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6273: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5914: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6276: \$? = $ac_status" >&5 + echo "$as_me:5917: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6279: \"$ac_try\"") >&5 + { (eval echo "$as_me:5920: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6282: \$? = $ac_status" >&5 + echo "$as_me:5923: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:6285: result: yes" >&5 + echo "$as_me:5926: result: yes" >&5 echo "${ECHO_T}yes" >&6 cat >>confdefs.h <<\_ACEOF #define LIBWRAP 1 @@ -6294,12 +5935,13 @@ echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - { { echo "$as_me:6297: error: *** libwrap missing" >&5 + { { echo "$as_me:5938: error: *** libwrap missing" >&5 echo "$as_me: error: *** libwrap missing" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS="$saved_LIBS" fi fi; @@ -6317,13 +5959,13 @@ vhangup vsnprintf waitpid __b64_ntop _getpty do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:6320: checking for $ac_func" >&5 +echo "$as_me:5962: 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 6326 "configure" +#line 5968 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -6360,16 +6002,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6363: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6005: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6366: \$? = $ac_status" >&5 + echo "$as_me:6008: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6369: \"$ac_try\"") >&5 + { (eval echo "$as_me:6011: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6372: \$? = $ac_status" >&5 + echo "$as_me:6014: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -6379,7 +6021,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6382: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:6024: 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 <<_ACEOF @@ -6392,13 +6034,13 @@ for ac_func in dirname do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:6395: checking for $ac_func" >&5 +echo "$as_me:6037: 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 6401 "configure" +#line 6043 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -6435,16 +6077,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6438: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6080: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6441: \$? = $ac_status" >&5 + echo "$as_me:6083: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6444: \"$ac_try\"") >&5 + { (eval echo "$as_me:6086: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6447: \$? = $ac_status" >&5 + echo "$as_me:6089: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -6454,7 +6096,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6457: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:6099: 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 <<_ACEOF @@ -6465,34 +6107,34 @@ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:6468: checking for $ac_header" >&5 + echo "$as_me:6110: 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 fi -echo "$as_me:6473: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:6115: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else # Is the header compilable? -echo "$as_me:6477: checking $ac_header usability" >&5 +echo "$as_me:6119: checking $ac_header usability" >&5 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 6480 "configure" +#line 6122 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6486: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6128: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6489: \$? = $ac_status" >&5 + echo "$as_me:6131: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6492: \"$ac_try\"") >&5 + { (eval echo "$as_me:6134: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6495: \$? = $ac_status" >&5 + echo "$as_me:6137: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_header_compiler=yes else @@ -6501,24 +6143,24 @@ ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:6504: result: $ac_header_compiler" >&5 +echo "$as_me:6146: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -echo "$as_me:6508: checking $ac_header presence" >&5 +echo "$as_me:6150: checking $ac_header presence" >&5 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 6511 "configure" +#line 6153 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:6515: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:6157: \"$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:6521: \$? = $ac_status" >&5 + echo "$as_me:6163: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6536,32 +6178,32 @@ ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -echo "$as_me:6539: result: $ac_header_preproc" >&5 +echo "$as_me:6181: result: $ac_header_preproc" >&5 echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? case $ac_header_compiler:$ac_header_preproc in yes:no ) - { echo "$as_me:6545: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 + { echo "$as_me:6187: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:6547: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 + { echo "$as_me:6189: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; no:yes ) - { echo "$as_me:6550: WARNING: $ac_header: present but cannot be compiled." >&5 + { echo "$as_me:6192: WARNING: $ac_header: present but cannot be compiled." >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled." >&2;} - { echo "$as_me:6552: WARNING: $ac_header: check for missing prerequisite headers?" >&5 + { echo "$as_me:6194: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:6554: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 + { echo "$as_me:6196: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; esac -echo "$as_me:6557: checking for $ac_header" >&5 +echo "$as_me:6199: 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 eval "$as_ac_Header=$ac_header_preproc" fi -echo "$as_me:6564: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:6206: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 fi @@ -6576,7 +6218,7 @@ else - echo "$as_me:6579: checking for dirname in -lgen" >&5 + echo "$as_me:6221: 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 @@ -6584,7 +6226,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lgen $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6587 "configure" +#line 6229 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6609,16 +6251,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6612: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6254: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6615: \$? = $ac_status" >&5 + echo "$as_me:6257: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6618: \"$ac_try\"") >&5 + { (eval echo "$as_me:6260: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6621: \$? = $ac_status" >&5 + echo "$as_me:6263: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gen_dirname=yes else @@ -6629,11 +6271,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6632: result: $ac_cv_lib_gen_dirname" >&5 +echo "$as_me:6274: 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:6636: checking for broken dirname" >&5 + echo "$as_me:6278: 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 @@ -6642,12 +6284,12 @@ save_LIBS="$LIBS" LIBS="$LIBS -lgen" if test "$cross_compiling" = yes; then - { { echo "$as_me:6645: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:6287: 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 6650 "configure" +#line 6292 "configure" #include "confdefs.h" #include @@ -6667,15 +6309,15 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:6670: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6312: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6673: \$? = $ac_status" >&5 + echo "$as_me:6315: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:6675: \"$ac_try\"") >&5 + { (eval echo "$as_me:6317: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6678: \$? = $ac_status" >&5 + echo "$as_me:6320: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_broken_dirname="no" else @@ -6690,7 +6332,7 @@ LIBS="$save_LIBS" fi -echo "$as_me:6693: result: $ac_cv_have_broken_dirname" >&5 +echo "$as_me:6335: 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" @@ -6702,34 +6344,34 @@ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:6705: checking for $ac_header" >&5 + echo "$as_me:6347: 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 fi -echo "$as_me:6710: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:6352: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else # Is the header compilable? -echo "$as_me:6714: checking $ac_header usability" >&5 +echo "$as_me:6356: checking $ac_header usability" >&5 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 6717 "configure" +#line 6359 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6723: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6365: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6726: \$? = $ac_status" >&5 + echo "$as_me:6368: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6729: \"$ac_try\"") >&5 + { (eval echo "$as_me:6371: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6732: \$? = $ac_status" >&5 + echo "$as_me:6374: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_header_compiler=yes else @@ -6738,24 +6380,24 @@ ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:6741: result: $ac_header_compiler" >&5 +echo "$as_me:6383: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -echo "$as_me:6745: checking $ac_header presence" >&5 +echo "$as_me:6387: checking $ac_header presence" >&5 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 6748 "configure" +#line 6390 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:6752: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:6394: \"$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:6758: \$? = $ac_status" >&5 + echo "$as_me:6400: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6773,32 +6415,32 @@ ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -echo "$as_me:6776: result: $ac_header_preproc" >&5 +echo "$as_me:6418: result: $ac_header_preproc" >&5 echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? case $ac_header_compiler:$ac_header_preproc in yes:no ) - { echo "$as_me:6782: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 + { echo "$as_me:6424: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:6784: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 + { echo "$as_me:6426: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; no:yes ) - { echo "$as_me:6787: WARNING: $ac_header: present but cannot be compiled." >&5 + { echo "$as_me:6429: WARNING: $ac_header: present but cannot be compiled." >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled." >&2;} - { echo "$as_me:6789: WARNING: $ac_header: check for missing prerequisite headers?" >&5 + { echo "$as_me:6431: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:6791: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 + { echo "$as_me:6433: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; esac -echo "$as_me:6794: checking for $ac_header" >&5 +echo "$as_me:6436: 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 eval "$as_ac_Header=$ac_header_preproc" fi -echo "$as_me:6801: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:6443: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 fi @@ -6821,13 +6463,13 @@ for ac_func in gettimeofday time do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:6824: checking for $ac_func" >&5 +echo "$as_me:6466: 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 6830 "configure" +#line 6472 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -6864,16 +6506,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6867: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6509: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6870: \$? = $ac_status" >&5 + echo "$as_me:6512: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6873: \"$ac_try\"") >&5 + { (eval echo "$as_me:6515: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6876: \$? = $ac_status" >&5 + echo "$as_me:6518: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -6883,7 +6525,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6886: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:6528: 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 <<_ACEOF @@ -6896,13 +6538,13 @@ for ac_func in endutent getutent getutid getutline pututline setutent do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:6899: checking for $ac_func" >&5 +echo "$as_me:6541: 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 6905 "configure" +#line 6547 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -6939,16 +6581,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6942: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6584: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6945: \$? = $ac_status" >&5 + echo "$as_me:6587: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6948: \"$ac_try\"") >&5 + { (eval echo "$as_me:6590: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6951: \$? = $ac_status" >&5 + echo "$as_me:6593: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -6958,7 +6600,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6961: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:6603: 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 <<_ACEOF @@ -6971,13 +6613,13 @@ for ac_func in utmpname do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:6974: checking for $ac_func" >&5 +echo "$as_me:6616: 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 6980 "configure" +#line 6622 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -7014,16 +6656,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7017: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6659: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7020: \$? = $ac_status" >&5 + echo "$as_me:6662: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7023: \"$ac_try\"") >&5 + { (eval echo "$as_me:6665: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7026: \$? = $ac_status" >&5 + echo "$as_me:6668: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -7033,7 +6675,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7036: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:6678: 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 <<_ACEOF @@ -7046,13 +6688,13 @@ for ac_func in endutxent getutxent getutxid getutxline pututxline do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:7049: checking for $ac_func" >&5 +echo "$as_me:6691: 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 7055 "configure" +#line 6697 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -7089,16 +6731,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7092: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6734: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7095: \$? = $ac_status" >&5 + echo "$as_me:6737: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7098: \"$ac_try\"") >&5 + { (eval echo "$as_me:6740: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7101: \$? = $ac_status" >&5 + echo "$as_me:6743: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -7108,7 +6750,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7111: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:6753: 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 <<_ACEOF @@ -7121,13 +6763,13 @@ for ac_func in setutxent utmpxname do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:7124: checking for $ac_func" >&5 +echo "$as_me:6766: 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 7130 "configure" +#line 6772 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -7164,16 +6806,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7167: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6809: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7170: \$? = $ac_status" >&5 + echo "$as_me:6812: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7173: \"$ac_try\"") >&5 + { (eval echo "$as_me:6815: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7176: \$? = $ac_status" >&5 + echo "$as_me:6818: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -7183,7 +6825,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7186: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:6828: 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 <<_ACEOF @@ -7193,13 +6835,13 @@ fi done -echo "$as_me:7196: checking for getuserattr" >&5 +echo "$as_me:6838: checking for getuserattr" >&5 echo $ECHO_N "checking for getuserattr... $ECHO_C" >&6 if test "${ac_cv_func_getuserattr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7202 "configure" +#line 6844 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getuserattr (); below. */ @@ -7236,16 +6878,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7239: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6881: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7242: \$? = $ac_status" >&5 + echo "$as_me:6884: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7245: \"$ac_try\"") >&5 + { (eval echo "$as_me:6887: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7248: \$? = $ac_status" >&5 + echo "$as_me:6890: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_getuserattr=yes else @@ -7255,7 +6897,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7258: result: $ac_cv_func_getuserattr" >&5 +echo "$as_me:6900: result: $ac_cv_func_getuserattr" >&5 echo "${ECHO_T}$ac_cv_func_getuserattr" >&6 if test $ac_cv_func_getuserattr = yes; then cat >>confdefs.h <<\_ACEOF @@ -7263,7 +6905,7 @@ _ACEOF else - echo "$as_me:7266: checking for getuserattr in -ls" >&5 + echo "$as_me:6908: checking for getuserattr in -ls" >&5 echo $ECHO_N "checking for getuserattr in -ls... $ECHO_C" >&6 if test "${ac_cv_lib_s_getuserattr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7271,7 +6913,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ls $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7274 "configure" +#line 6916 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7296,16 +6938,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7299: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6941: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7302: \$? = $ac_status" >&5 + echo "$as_me:6944: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7305: \"$ac_try\"") >&5 + { (eval echo "$as_me:6947: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7308: \$? = $ac_status" >&5 + echo "$as_me:6950: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_s_getuserattr=yes else @@ -7316,7 +6958,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7319: result: $ac_cv_lib_s_getuserattr" >&5 +echo "$as_me:6961: result: $ac_cv_lib_s_getuserattr" >&5 echo "${ECHO_T}$ac_cv_lib_s_getuserattr" >&6 if test $ac_cv_lib_s_getuserattr = yes; then LIBS="$LIBS -ls"; cat >>confdefs.h <<\_ACEOF @@ -7327,13 +6969,13 @@ fi -echo "$as_me:7330: checking for daemon" >&5 +echo "$as_me:6972: 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 7336 "configure" +#line 6978 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char daemon (); below. */ @@ -7370,16 +7012,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7373: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7015: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7376: \$? = $ac_status" >&5 + echo "$as_me:7018: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7379: \"$ac_try\"") >&5 + { (eval echo "$as_me:7021: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7382: \$? = $ac_status" >&5 + echo "$as_me:7024: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_daemon=yes else @@ -7389,7 +7031,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7392: result: $ac_cv_func_daemon" >&5 +echo "$as_me:7034: 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 <<\_ACEOF @@ -7397,7 +7039,7 @@ _ACEOF else - echo "$as_me:7400: checking for daemon in -lbsd" >&5 + echo "$as_me:7042: 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 @@ -7405,7 +7047,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7408 "configure" +#line 7050 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7430,16 +7072,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7433: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7075: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7436: \$? = $ac_status" >&5 + echo "$as_me:7078: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7439: \"$ac_try\"") >&5 + { (eval echo "$as_me:7081: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7442: \$? = $ac_status" >&5 + echo "$as_me:7084: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_bsd_daemon=yes else @@ -7450,7 +7092,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7453: result: $ac_cv_lib_bsd_daemon" >&5 +echo "$as_me:7095: 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 <<\_ACEOF @@ -7461,13 +7103,13 @@ fi -echo "$as_me:7464: checking for getpagesize" >&5 +echo "$as_me:7106: 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 7470 "configure" +#line 7112 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getpagesize (); below. */ @@ -7504,16 +7146,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7507: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7149: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7510: \$? = $ac_status" >&5 + echo "$as_me:7152: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7513: \"$ac_try\"") >&5 + { (eval echo "$as_me:7155: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7516: \$? = $ac_status" >&5 + echo "$as_me:7158: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_getpagesize=yes else @@ -7523,7 +7165,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7526: result: $ac_cv_func_getpagesize" >&5 +echo "$as_me:7168: 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 <<\_ACEOF @@ -7531,7 +7173,7 @@ _ACEOF else - echo "$as_me:7534: checking for getpagesize in -lucb" >&5 + echo "$as_me:7176: 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 @@ -7539,7 +7181,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lucb $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7542 "configure" +#line 7184 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7564,16 +7206,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7567: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7209: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7570: \$? = $ac_status" >&5 + echo "$as_me:7212: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7573: \"$ac_try\"") >&5 + { (eval echo "$as_me:7215: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7576: \$? = $ac_status" >&5 + echo "$as_me:7218: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_ucb_getpagesize=yes else @@ -7584,7 +7226,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7587: result: $ac_cv_lib_ucb_getpagesize" >&5 +echo "$as_me:7229: 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 <<\_ACEOF @@ -7597,15 +7239,15 @@ # Check for broken snprintf if test "x$ac_cv_func_snprintf" = "xyes" ; then - echo "$as_me:7600: checking whether snprintf correctly terminates long strings" >&5 + echo "$as_me:7242: 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:7603: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:7245: 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 7608 "configure" +#line 7250 "configure" #include "confdefs.h" #include @@ -7613,30 +7255,30 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:7616: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7258: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7619: \$? = $ac_status" >&5 + echo "$as_me:7261: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:7621: \"$ac_try\"") >&5 + { (eval echo "$as_me:7263: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7624: \$? = $ac_status" >&5 + echo "$as_me:7266: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:7626: result: yes" >&5 + echo "$as_me:7268: 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:7633: result: no" >&5 + echo "$as_me:7275: result: no" >&5 echo "${ECHO_T}no" >&6 cat >>confdefs.h <<\_ACEOF #define BROKEN_SNPRINTF 1 _ACEOF - { echo "$as_me:7639: WARNING: ****** Your snprintf() function is broken, complain to your vendor" >&5 + { echo "$as_me:7281: 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 @@ -7644,14 +7286,14 @@ fi fi -echo "$as_me:7647: checking whether getpgrp takes no argument" >&5 +echo "$as_me:7289: 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 7654 "configure" +#line 7296 "configure" #include "confdefs.h" $ac_includes_default #ifdef F77_DUMMY_MAIN @@ -7669,16 +7311,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7672: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7314: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7675: \$? = $ac_status" >&5 + echo "$as_me:7317: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7678: \"$ac_try\"") >&5 + { (eval echo "$as_me:7320: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7681: \$? = $ac_status" >&5 + echo "$as_me:7323: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_func_getpgrp_1=yes else @@ -7689,7 +7331,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext # Use it with no arg. cat >conftest.$ac_ext <<_ACEOF -#line 7692 "configure" +#line 7334 "configure" #include "confdefs.h" $ac_includes_default #ifdef F77_DUMMY_MAIN @@ -7707,16 +7349,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7710: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7352: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7713: \$? = $ac_status" >&5 + echo "$as_me:7355: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7716: \"$ac_try\"") >&5 + { (eval echo "$as_me:7358: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7719: \$? = $ac_status" >&5 + echo "$as_me:7361: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_func_getpgrp_0=yes else @@ -7730,12 +7372,12 @@ yes:no) ac_cv_func_getpgrp_void=yes;; no:yes) ac_cv_func_getpgrp_void=false;; *) if test "$cross_compiling" = yes; then - { { echo "$as_me:7733: error: cannot check getpgrp if cross compiling" >&5 + { { echo "$as_me:7375: 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 7738 "configure" +#line 7380 "configure" #include "confdefs.h" $ac_includes_default @@ -7789,15 +7431,15 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:7792: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7434: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7795: \$? = $ac_status" >&5 + echo "$as_me:7437: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:7797: \"$ac_try\"") >&5 + { (eval echo "$as_me:7439: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7800: \$? = $ac_status" >&5 + echo "$as_me:7442: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_getpgrp_void=yes else @@ -7811,7 +7453,7 @@ esac # $ac_func_getpgrp_0:$ac_func_getpgrp_1 fi -echo "$as_me:7814: result: $ac_cv_func_getpgrp_void" >&5 +echo "$as_me:7456: 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 @@ -7830,12 +7472,12 @@ if test "x$withval" != "xno" ; then if test "x$ac_cv_header_security_pam_appl_h" != "xyes" ; then - { { echo "$as_me:7833: error: PAM headers not found" >&5 + { { echo "$as_me:7475: error: PAM headers not found" >&5 echo "$as_me: error: PAM headers not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:7838: checking for dlopen in -ldl" >&5 +echo "$as_me:7480: 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 @@ -7843,7 +7485,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7846 "configure" +#line 7488 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7868,16 +7510,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7871: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7513: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7874: \$? = $ac_status" >&5 + echo "$as_me:7516: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7877: \"$ac_try\"") >&5 + { (eval echo "$as_me:7519: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7880: \$? = $ac_status" >&5 + echo "$as_me:7522: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dl_dlopen=yes else @@ -7888,7 +7530,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7891: result: $ac_cv_lib_dl_dlopen" >&5 +echo "$as_me:7533: 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 <<_ACEOF @@ -7899,7 +7541,7 @@ fi -echo "$as_me:7902: checking for pam_set_item in -lpam" >&5 +echo "$as_me:7544: 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 @@ -7907,7 +7549,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lpam $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7910 "configure" +#line 7552 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7932,16 +7574,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7935: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7577: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7938: \$? = $ac_status" >&5 + echo "$as_me:7580: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7941: \"$ac_try\"") >&5 + { (eval echo "$as_me:7583: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7944: \$? = $ac_status" >&5 + echo "$as_me:7586: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_pam_pam_set_item=yes else @@ -7952,7 +7594,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7955: result: $ac_cv_lib_pam_pam_set_item" >&5 +echo "$as_me:7597: 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 <<_ACEOF @@ -7962,7 +7604,7 @@ LIBS="-lpam $LIBS" else - { { echo "$as_me:7965: error: *** libpam missing" >&5 + { { echo "$as_me:7607: error: *** libpam missing" >&5 echo "$as_me: error: *** libpam missing" >&2;} { (exit 1); exit 1; }; } fi @@ -7970,13 +7612,13 @@ for ac_func in pam_getenvlist do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:7973: checking for $ac_func" >&5 +echo "$as_me:7615: 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 7979 "configure" +#line 7621 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -8013,16 +7655,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8016: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7658: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8019: \$? = $ac_status" >&5 + echo "$as_me:7661: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8022: \"$ac_try\"") >&5 + { (eval echo "$as_me:7664: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8025: \$? = $ac_status" >&5 + echo "$as_me:7667: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -8032,7 +7674,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8035: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:7677: 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 <<_ACEOF @@ -8049,6 +7691,12 @@ #define USE_PAM 1 _ACEOF + if test $ac_cv_lib_dl_dlopen = yes; then + LIBPAM="-lpam -ldl" + else + LIBPAM="-lpam" + fi + fi fi; @@ -8056,10 +7704,10 @@ # Check for older PAM if test "x$PAM_MSG" = "xyes" ; then # Check PAM strerror arguments (old PAM) - echo "$as_me:8059: checking whether pam_strerror takes only one argument" >&5 + echo "$as_me:7707: 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 8062 "configure" +#line 7710 "configure" #include "confdefs.h" #include @@ -8080,18 +7728,18 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8083: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7731: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8086: \$? = $ac_status" >&5 + echo "$as_me:7734: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8089: \"$ac_try\"") >&5 + { (eval echo "$as_me:7737: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8092: \$? = $ac_status" >&5 + echo "$as_me:7740: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:8094: result: no" >&5 + echo "$as_me:7742: result: no" >&5 echo "${ECHO_T}no" >&6 else echo "$as_me: failed program was:" >&5 @@ -8101,7 +7749,7 @@ #define HAVE_OLD_PAM 1 _ACEOF - echo "$as_me:8104: result: yes" >&5 + echo "$as_me:7752: result: yes" >&5 echo "${ECHO_T}yes" >&6 PAM_MSG="yes (old library)" @@ -8127,7 +7775,7 @@ if test "x$prefix" != "xNONE" ; then tryssldir="$tryssldir $prefix" fi -echo "$as_me:8130: checking for OpenSSL directory" >&5 +echo "$as_me:7778: checking for OpenSSL directory" >&5 echo $ECHO_N "checking for OpenSSL directory... $ECHO_C" >&6 if test "${ac_cv_openssldir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8168,12 +7816,12 @@ # Basic test to check for compatible version and correct linking # *does not* test for RSA - that comes later. if test "$cross_compiling" = yes; then - { { echo "$as_me:8171: 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 8176 "configure" +#line 7824 "configure" #include "confdefs.h" #include @@ -8188,15 +7836,15 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:8191: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7839: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8194: \$? = $ac_status" >&5 + echo "$as_me:7842: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:8196: \"$ac_try\"") >&5 + { (eval echo "$as_me:7844: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8199: \$? = $ac_status" >&5 + echo "$as_me:7847: \$? = $ac_status" >&5 (exit $ac_status); }; }; then found_crypto=1 @@ -8217,7 +7865,7 @@ done if test -z "$found_crypto" ; then - { { echo "$as_me:8220: error: Could not find working OpenSSL library, please install or check config.log" >&5 + { { echo "$as_me:7868: error: Could not find working OpenSSL library, please install or check config.log" >&5 echo "$as_me: error: Could not find working OpenSSL library, please install or check config.log" >&2;} { (exit 1); exit 1; }; } fi @@ -8228,7 +7876,7 @@ ac_cv_openssldir=$ssldir fi -echo "$as_me:8231: result: $ac_cv_openssldir" >&5 +echo "$as_me:7879: result: $ac_cv_openssldir" >&5 echo "${ECHO_T}$ac_cv_openssldir" >&6 if (test ! -z "$ac_cv_openssldir" && test "x$ac_cv_openssldir" != "x(system)") ; then @@ -8264,7 +7912,7 @@ # Now test RSA support saved_LIBS="$LIBS" -echo "$as_me:8267: checking for RSA support" >&5 +echo "$as_me:7915: checking for RSA support" >&5 echo $ECHO_N "checking for RSA support... $ECHO_C" >&6 for WANTS_RSAREF in "" 1 ; do if test -z "$WANTS_RSAREF" ; then @@ -8273,12 +7921,12 @@ LIBS="$saved_LIBS -lRSAglue -lrsaref" fi if test "$cross_compiling" = yes; then - { { echo "$as_me:8276: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:7924: 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 8281 "configure" +#line 7929 "configure" #include "confdefs.h" #include @@ -8298,15 +7946,15 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:8301: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7949: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8304: \$? = $ac_status" >&5 + echo "$as_me:7952: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:8306: \"$ac_try\"") >&5 + { (eval echo "$as_me:7954: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8309: \$? = $ac_status" >&5 + echo "$as_me:7957: \$? = $ac_status" >&5 (exit $ac_status); }; }; then rsa_works=1 @@ -8323,32 +7971,79 @@ LIBS="$saved_LIBS" if test ! -z "$no_rsa" ; then - echo "$as_me:8326: result: disabled" >&5 + echo "$as_me:7974: result: disabled" >&5 echo "${ECHO_T}disabled" >&6 RSA_MSG="disabled" else if test -z "$rsa_works" ; then - { echo "$as_me:8331: WARNING: *** No RSA support found *** " >&5 + { echo "$as_me:7979: WARNING: *** No RSA support found *** " >&5 echo "$as_me: WARNING: *** No RSA support found *** " >&2;} RSA_MSG="no" else if test -z "$WANTS_RSAREF" ; then - echo "$as_me:8336: result: yes" >&5 + echo "$as_me:7984: result: yes" >&5 echo "${ECHO_T}yes" >&6 RSA_MSG="yes" else RSA_MSG="yes (using RSAref)" - echo "$as_me:8341: result: using RSAref" >&5 + echo "$as_me:7989: result: using RSAref" >&5 echo "${ECHO_T}using RSAref" >&6 LIBS="$LIBS -lcrypto -lRSAglue -lrsaref" fi fi fi +# Sanity check OpenSSL headers +echo "$as_me:7997: 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:8000: 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 8005 "configure" +#include "confdefs.h" + +#include +#include +int main(void) { return(SSLeay() == OPENSSL_VERSION_NUMBER ? 0 : 1); } + +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:8014: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8017: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:8019: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8022: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + echo "$as_me:8025: 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:8033: result: no" >&5 +echo "${ECHO_T}no" >&6 + { { echo "$as_me:8035: error: Your OpenSSL headers do not match your library" >&5 +echo "$as_me: error: Your OpenSSL headers do not match your library" >&2;} + { (exit 1); exit 1; }; } + +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + # Some Linux systems (Slackware) need crypt() from libcrypt, *not* the # version in OpenSSL. Skip this for PAM if test "x$PAM_MSG" = "xno" -a "x$check_for_libcrypt_later" = "x1"; then - echo "$as_me:8351: checking for crypt in -lcrypt" >&5 + echo "$as_me:8046: 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 @@ -8356,7 +8051,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lcrypt $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8359 "configure" +#line 8054 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8381,16 +8076,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8384: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8079: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8387: \$? = $ac_status" >&5 + echo "$as_me:8082: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8390: \"$ac_try\"") >&5 + { (eval echo "$as_me:8085: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8393: \$? = $ac_status" >&5 + echo "$as_me:8088: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_crypt_crypt=yes else @@ -8401,7 +8096,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8404: result: $ac_cv_lib_crypt_crypt" >&5 +echo "$as_me:8099: 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" @@ -8409,77 +8104,949 @@ fi -# Cheap hack to ensure NEWS-OS libraries are arranged right. -if test ! -z "$SONY" ; then - LIBS="$LIBS -liberty"; -fi +### Configure cryptographic random number support -# Checks for data types -echo "$as_me:8418: 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 +# Check wheter OpenSSL seeds itself +echo "$as_me:8110: 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:8113: 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 8424 "configure" +#line 8118 "configure" #include "confdefs.h" -$ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -if ((char *) 0) - return 0; -if (sizeof (char)) - return 0; - ; - return 0; -} + +#include +#include +int main(void) { return(RAND_status() == 1 ? 0 : 1); } + _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:8445: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest$ac_exeext +if { (eval echo "$as_me:8127: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8448: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8451: \"$ac_try\"") >&5 + echo "$as_me:8130: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:8132: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8454: \$? = $ac_status" >&5 + echo "$as_me:8135: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_char=yes + + OPENSSL_SEEDS_ITSELF=yes + echo "$as_me:8139: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_type_char=no + + echo "$as_me:8147: result: no" >&5 +echo "${ECHO_T}no" >&6 + # Default to use of the rand helper if OpenSSL doesn't + # seed itself + USE_RAND_HELPER=yes + fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8464: result: $ac_cv_type_char" >&5 -echo "${ECHO_T}$ac_cv_type_char" >&6 -echo "$as_me:8467: 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 -else - if test "$ac_cv_type_char" = yes; then - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -#line 8476 "configure" -#include "confdefs.h" -$ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif +# Do we want to force the use of the rand helper? + +# Check whether --with-rand-helper or --without-rand-helper was given. +if test "${with_rand_helper+set}" = set; then + withval="$with_rand_helper" + + if test "x$withval" = "xno" ; 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:8167: 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="" + fi + else + USE_RAND_HELPER=yes + fi + +fi; + +# Which randomness source do we use? +if test ! -z "$OPENSSL_SEEDS_ITSELF" -a -z "$USE_RAND_HELPER" ; then + # OpenSSL only + cat >>confdefs.h <<\_ACEOF +#define OPENSSL_PRNG_ONLY 1 +_ACEOF + + RAND_MSG="OpenSSL internal ONLY" + INSTALL_SSH_RAND_HELPER="" +elif test ! -z "$USE_RAND_HELPER" ; then + # install rand helper + RAND_MSG="ssh-rand-helper" + INSTALL_SSH_RAND_HELPER="yes" +fi + +### Configuration of ssh-rand-helper + +# PRNGD TCP socket + +# Check whether --with-prngd-port or --without-prngd-port was given. +if test "${with_prngd_port+set}" = set; then + withval="$with_prngd_port" + + case "$withval" in + no) + withval="" + ;; + [0-9]*) + ;; + *) + { { echo "$as_me:8208: 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; }; } + ;; + esac + if test ! -z "$withval" ; then + PRNGD_PORT="$withval" + cat >>confdefs.h <<_ACEOF +#define PRNGD_PORT $PRNGD_PORT +_ACEOF + + fi + +fi; + +# PRNGD Unix domain socket + +# Check whether --with-prngd-socket or --without-prngd-socket was given. +if test "${with_prngd_socket+set}" = set; then + withval="$with_prngd_socket" + + case "$withval" in + yes) + withval="/var/run/egd-pool" + ;; + no) + withval="" + ;; + /*) + ;; + *) + { { echo "$as_me:8239: 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; }; } + ;; + esac + + if test ! -z "$withval" ; then + if test ! -z "$PRNGD_PORT" ; then + { { echo "$as_me:8247: 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:8252: WARNING: Entropy socket is not readable" >&5 +echo "$as_me: WARNING: Entropy socket is not readable" >&2;} + fi + PRNGD_SOCKET="$withval" + cat >>confdefs.h <<_ACEOF +#define PRNGD_SOCKET "$PRNGD_SOCKET" +_ACEOF + + fi + +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:8266: 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 + if test -r $sock && $TEST_MINUS_S_SH -c "test -S $sock -o -p $sock" ; then + PRNGD_SOCKET="$sock" + cat >>confdefs.h <<_ACEOF +#define PRNGD_SOCKET "$PRNGD_SOCKET" +_ACEOF + + break; + fi + done + if test ! -z "$PRNGD_SOCKET" ; then + echo "$as_me:8280: result: $PRNGD_SOCKET" >&5 +echo "${ECHO_T}$PRNGD_SOCKET" >&6 + else + echo "$as_me:8283: result: not found" >&5 +echo "${ECHO_T}not found" >&6 + fi + fi + +fi; + +# Change default command timeout for hashing entropy source +entropy_timeout=200 + +# Check whether --with-entropy-timeout or --without-entropy-timeout was given. +if test "${with_entropy_timeout+set}" = set; then + withval="$with_entropy_timeout" + + if test "x$withval" != "xno" ; then + entropy_timeout=$withval + fi + +fi; + +cat >>confdefs.h <<_ACEOF +#define ENTROPY_TIMEOUT_MSEC $entropy_timeout +_ACEOF + +# These programs are used by the command hashing source to gather entropy + + # Extract the first word of "ls", so it can be a program name with args. +set dummy ls; ac_word=$2 +echo "$as_me:8311: 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 +else + case $PROG_LS in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROG_LS="$PROG_LS" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + 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:8328: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PROG_LS=$ac_cv_path_PROG_LS + +if test -n "$PROG_LS"; then + echo "$as_me:8339: result: $PROG_LS" >&5 +echo "${ECHO_T}$PROG_LS" >&6 +else + echo "$as_me:8342: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$PROG_LS" ; then + PROG_LS="undef" + 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:8352: 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 +else + case $PROG_NETSTAT in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROG_NETSTAT="$PROG_NETSTAT" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + 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:8369: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PROG_NETSTAT=$ac_cv_path_PROG_NETSTAT + +if test -n "$PROG_NETSTAT"; then + echo "$as_me:8380: result: $PROG_NETSTAT" >&5 +echo "${ECHO_T}$PROG_NETSTAT" >&6 +else + echo "$as_me:8383: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$PROG_NETSTAT" ; then + PROG_NETSTAT="undef" + 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:8393: 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 +else + case $PROG_ARP in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROG_ARP="$PROG_ARP" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + 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:8410: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PROG_ARP=$ac_cv_path_PROG_ARP + +if test -n "$PROG_ARP"; then + echo "$as_me:8421: result: $PROG_ARP" >&5 +echo "${ECHO_T}$PROG_ARP" >&6 +else + echo "$as_me:8424: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$PROG_ARP" ; then + PROG_ARP="undef" + 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:8434: 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 +else + case $PROG_IFCONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROG_IFCONFIG="$PROG_IFCONFIG" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + 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:8451: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PROG_IFCONFIG=$ac_cv_path_PROG_IFCONFIG + +if test -n "$PROG_IFCONFIG"; then + echo "$as_me:8462: result: $PROG_IFCONFIG" >&5 +echo "${ECHO_T}$PROG_IFCONFIG" >&6 +else + echo "$as_me:8465: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$PROG_IFCONFIG" ; then + PROG_IFCONFIG="undef" + 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:8475: 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 +else + case $PROG_JSTAT in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROG_JSTAT="$PROG_JSTAT" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + 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:8492: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PROG_JSTAT=$ac_cv_path_PROG_JSTAT + +if test -n "$PROG_JSTAT"; then + echo "$as_me:8503: result: $PROG_JSTAT" >&5 +echo "${ECHO_T}$PROG_JSTAT" >&6 +else + echo "$as_me:8506: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$PROG_JSTAT" ; then + PROG_JSTAT="undef" + 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:8516: 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 +else + case $PROG_PS in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROG_PS="$PROG_PS" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + 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:8533: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PROG_PS=$ac_cv_path_PROG_PS + +if test -n "$PROG_PS"; then + echo "$as_me:8544: result: $PROG_PS" >&5 +echo "${ECHO_T}$PROG_PS" >&6 +else + echo "$as_me:8547: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$PROG_PS" ; then + PROG_PS="undef" + 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:8557: 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 +else + case $PROG_SAR in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROG_SAR="$PROG_SAR" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + 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:8574: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PROG_SAR=$ac_cv_path_PROG_SAR + +if test -n "$PROG_SAR"; then + echo "$as_me:8585: result: $PROG_SAR" >&5 +echo "${ECHO_T}$PROG_SAR" >&6 +else + echo "$as_me:8588: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$PROG_SAR" ; then + PROG_SAR="undef" + 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:8598: 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 +else + case $PROG_W in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROG_W="$PROG_W" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + 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:8615: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PROG_W=$ac_cv_path_PROG_W + +if test -n "$PROG_W"; then + echo "$as_me:8626: result: $PROG_W" >&5 +echo "${ECHO_T}$PROG_W" >&6 +else + echo "$as_me:8629: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$PROG_W" ; then + PROG_W="undef" + 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:8639: 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 +else + case $PROG_WHO in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROG_WHO="$PROG_WHO" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + 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:8656: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PROG_WHO=$ac_cv_path_PROG_WHO + +if test -n "$PROG_WHO"; then + echo "$as_me:8667: result: $PROG_WHO" >&5 +echo "${ECHO_T}$PROG_WHO" >&6 +else + echo "$as_me:8670: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$PROG_WHO" ; then + PROG_WHO="undef" + 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:8680: 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 +else + case $PROG_LAST in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROG_LAST="$PROG_LAST" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + 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:8697: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PROG_LAST=$ac_cv_path_PROG_LAST + +if test -n "$PROG_LAST"; then + echo "$as_me:8708: result: $PROG_LAST" >&5 +echo "${ECHO_T}$PROG_LAST" >&6 +else + echo "$as_me:8711: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$PROG_LAST" ; then + PROG_LAST="undef" + 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:8721: 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 +else + case $PROG_LASTLOG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROG_LASTLOG="$PROG_LASTLOG" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + 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:8738: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PROG_LASTLOG=$ac_cv_path_PROG_LASTLOG + +if test -n "$PROG_LASTLOG"; then + echo "$as_me:8749: result: $PROG_LASTLOG" >&5 +echo "${ECHO_T}$PROG_LASTLOG" >&6 +else + echo "$as_me:8752: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$PROG_LASTLOG" ; then + PROG_LASTLOG="undef" + 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:8762: 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 +else + case $PROG_DF in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROG_DF="$PROG_DF" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + 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:8779: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PROG_DF=$ac_cv_path_PROG_DF + +if test -n "$PROG_DF"; then + echo "$as_me:8790: result: $PROG_DF" >&5 +echo "${ECHO_T}$PROG_DF" >&6 +else + echo "$as_me:8793: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$PROG_DF" ; then + PROG_DF="undef" + 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:8803: 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 +else + case $PROG_VMSTAT in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROG_VMSTAT="$PROG_VMSTAT" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + 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:8820: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PROG_VMSTAT=$ac_cv_path_PROG_VMSTAT + +if test -n "$PROG_VMSTAT"; then + echo "$as_me:8831: result: $PROG_VMSTAT" >&5 +echo "${ECHO_T}$PROG_VMSTAT" >&6 +else + echo "$as_me:8834: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$PROG_VMSTAT" ; then + PROG_VMSTAT="undef" + 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:8844: 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 +else + case $PROG_UPTIME in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROG_UPTIME="$PROG_UPTIME" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + 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:8861: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PROG_UPTIME=$ac_cv_path_PROG_UPTIME + +if test -n "$PROG_UPTIME"; then + echo "$as_me:8872: result: $PROG_UPTIME" >&5 +echo "${ECHO_T}$PROG_UPTIME" >&6 +else + echo "$as_me:8875: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$PROG_UPTIME" ; then + PROG_UPTIME="undef" + 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:8885: 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 +else + case $PROG_IPCS in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROG_IPCS="$PROG_IPCS" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + 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:8902: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PROG_IPCS=$ac_cv_path_PROG_IPCS + +if test -n "$PROG_IPCS"; then + echo "$as_me:8913: result: $PROG_IPCS" >&5 +echo "${ECHO_T}$PROG_IPCS" >&6 +else + echo "$as_me:8916: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$PROG_IPCS" ; then + PROG_IPCS="undef" + 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:8926: 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 +else + case $PROG_TAIL in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROG_TAIL="$PROG_TAIL" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + 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:8943: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PROG_TAIL=$ac_cv_path_PROG_TAIL + +if test -n "$PROG_TAIL"; then + echo "$as_me:8954: result: $PROG_TAIL" >&5 +echo "${ECHO_T}$PROG_TAIL" >&6 +else + echo "$as_me:8957: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$PROG_TAIL" ; then + PROG_TAIL="undef" + fi + +# Where does ssh-rand-helper get its randomness from? +INSTALL_SSH_PRNG_CMDS="" +if test ! -z "$INSTALL_SSH_RAND_HELPER" ; then + if test ! -z "$PRNGD_PORT" ; then + RAND_HELPER_MSG="TCP localhost:$PRNGD_PORT" + elif test ! -z "$PRNGD_SOCKET" ; then + RAND_HELPER_MSG="Unix domain socket \"$PRNGD_SOCKET\"" + else + RAND_HELPER_MSG="Command hashing (timeout $entropy_timeout)" + RAND_HELPER_CMDHASH=yes + INSTALL_SSH_PRNG_CMDS="yes" + fi +fi + +# Cheap hack to ensure NEWS-OS libraries are arranged right. +if test ! -z "$SONY" ; then + LIBS="$LIBS -liberty"; +fi + +# Checks for data types +echo "$as_me:8985: 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 8991 "configure" +#include "confdefs.h" +$ac_includes_default +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +if ((char *) 0) + return 0; +if (sizeof (char)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:9012: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9015: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:9018: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9021: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_char=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_char=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:9031: result: $ac_cv_type_char" >&5 +echo "${ECHO_T}$ac_cv_type_char" >&6 + +echo "$as_me:9034: 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 +else + if test "$ac_cv_type_char" = yes; then + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +#line 9043 "configure" +#include "confdefs.h" +$ac_includes_default +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif int F77_DUMMY_MAIN() { return 1; } #endif int @@ -8491,21 +9058,21 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8494: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9061: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8497: \$? = $ac_status" >&5 + echo "$as_me:9064: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8500: \"$ac_try\"") >&5 + { (eval echo "$as_me:9067: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8503: \$? = $ac_status" >&5 + echo "$as_me:9070: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 8508 "configure" +#line 9075 "configure" #include "confdefs.h" $ac_includes_default #ifdef F77_DUMMY_MAIN @@ -8523,16 +9090,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8526: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9093: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8529: \$? = $ac_status" >&5 + echo "$as_me:9096: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8532: \"$ac_try\"") >&5 + { (eval echo "$as_me:9099: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8535: \$? = $ac_status" >&5 + echo "$as_me:9102: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid; break else @@ -8548,7 +9115,7 @@ ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 8551 "configure" +#line 9118 "configure" #include "confdefs.h" $ac_includes_default #ifdef F77_DUMMY_MAIN @@ -8566,16 +9133,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8569: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9136: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8572: \$? = $ac_status" >&5 + echo "$as_me:9139: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8575: \"$ac_try\"") >&5 + { (eval echo "$as_me:9142: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8578: \$? = $ac_status" >&5 + echo "$as_me:9145: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=$ac_mid; break else @@ -8591,7 +9158,7 @@ while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF -#line 8594 "configure" +#line 9161 "configure" #include "confdefs.h" $ac_includes_default #ifdef F77_DUMMY_MAIN @@ -8609,16 +9176,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8612: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9179: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8615: \$? = $ac_status" >&5 + echo "$as_me:9182: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8618: \"$ac_try\"") >&5 + { (eval echo "$as_me:9185: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8621: \$? = $ac_status" >&5 + echo "$as_me:9188: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid else @@ -8631,12 +9198,12 @@ ac_cv_sizeof_char=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:8634: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:9201: 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 8639 "configure" +#line 9206 "configure" #include "confdefs.h" $ac_includes_default #ifdef F77_DUMMY_MAIN @@ -8658,15 +9225,15 @@ } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:8661: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9228: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8664: \$? = $ac_status" >&5 + echo "$as_me:9231: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:8666: \"$ac_try\"") >&5 + { (eval echo "$as_me:9233: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8669: \$? = $ac_status" >&5 + echo "$as_me:9236: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_char=`cat conftest.val` else @@ -8682,19 +9249,19 @@ ac_cv_sizeof_char=0 fi fi -echo "$as_me:8685: result: $ac_cv_sizeof_char" >&5 +echo "$as_me:9252: result: $ac_cv_sizeof_char" >&5 echo "${ECHO_T}$ac_cv_sizeof_char" >&6 cat >>confdefs.h <<_ACEOF #define SIZEOF_CHAR $ac_cv_sizeof_char _ACEOF -echo "$as_me:8691: checking for short int" >&5 +echo "$as_me:9258: 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 8697 "configure" +#line 9264 "configure" #include "confdefs.h" $ac_includes_default #ifdef F77_DUMMY_MAIN @@ -8715,16 +9282,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8718: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9285: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8721: \$? = $ac_status" >&5 + echo "$as_me:9288: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8724: \"$ac_try\"") >&5 + { (eval echo "$as_me:9291: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8727: \$? = $ac_status" >&5 + echo "$as_me:9294: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_short_int=yes else @@ -8734,10 +9301,10 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8737: result: $ac_cv_type_short_int" >&5 +echo "$as_me:9304: result: $ac_cv_type_short_int" >&5 echo "${ECHO_T}$ac_cv_type_short_int" >&6 -echo "$as_me:8740: checking size of short int" >&5 +echo "$as_me:9307: 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 @@ -8746,7 +9313,7 @@ if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line 8749 "configure" +#line 9316 "configure" #include "confdefs.h" $ac_includes_default #ifdef F77_DUMMY_MAIN @@ -8764,21 +9331,21 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8767: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9334: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8770: \$? = $ac_status" >&5 + echo "$as_me:9337: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8773: \"$ac_try\"") >&5 + { (eval echo "$as_me:9340: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8776: \$? = $ac_status" >&5 + echo "$as_me:9343: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 8781 "configure" +#line 9348 "configure" #include "confdefs.h" $ac_includes_default #ifdef F77_DUMMY_MAIN @@ -8796,16 +9363,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8799: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9366: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8802: \$? = $ac_status" >&5 + echo "$as_me:9369: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8805: \"$ac_try\"") >&5 + { (eval echo "$as_me:9372: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8808: \$? = $ac_status" >&5 + echo "$as_me:9375: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid; break else @@ -8821,7 +9388,7 @@ ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 8824 "configure" +#line 9391 "configure" #include "confdefs.h" $ac_includes_default #ifdef F77_DUMMY_MAIN @@ -8839,16 +9406,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8842: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9409: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8845: \$? = $ac_status" >&5 + echo "$as_me:9412: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8848: \"$ac_try\"") >&5 + { (eval echo "$as_me:9415: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8851: \$? = $ac_status" >&5 + echo "$as_me:9418: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=$ac_mid; break else @@ -8864,7 +9431,7 @@ while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF -#line 8867 "configure" +#line 9434 "configure" #include "confdefs.h" $ac_includes_default #ifdef F77_DUMMY_MAIN @@ -8882,16 +9449,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8885: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9452: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8888: \$? = $ac_status" >&5 + echo "$as_me:9455: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8891: \"$ac_try\"") >&5 + { (eval echo "$as_me:9458: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8894: \$? = $ac_status" >&5 + echo "$as_me:9461: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid else @@ -8904,12 +9471,12 @@ ac_cv_sizeof_short_int=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:8907: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:9474: 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 8912 "configure" +#line 9479 "configure" #include "confdefs.h" $ac_includes_default #ifdef F77_DUMMY_MAIN @@ -8931,15 +9498,15 @@ } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:8934: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9501: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8937: \$? = $ac_status" >&5 + echo "$as_me:9504: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:8939: \"$ac_try\"") >&5 + { (eval echo "$as_me:9506: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8942: \$? = $ac_status" >&5 + echo "$as_me:9509: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_short_int=`cat conftest.val` else @@ -8955,19 +9522,19 @@ ac_cv_sizeof_short_int=0 fi fi -echo "$as_me:8958: result: $ac_cv_sizeof_short_int" >&5 +echo "$as_me:9525: result: $ac_cv_sizeof_short_int" >&5 echo "${ECHO_T}$ac_cv_sizeof_short_int" >&6 cat >>confdefs.h <<_ACEOF #define SIZEOF_SHORT_INT $ac_cv_sizeof_short_int _ACEOF -echo "$as_me:8964: checking for int" >&5 +echo "$as_me:9531: 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 8970 "configure" +#line 9537 "configure" #include "confdefs.h" $ac_includes_default #ifdef F77_DUMMY_MAIN @@ -8988,16 +9555,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8991: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9558: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8994: \$? = $ac_status" >&5 + echo "$as_me:9561: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8997: \"$ac_try\"") >&5 + { (eval echo "$as_me:9564: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9000: \$? = $ac_status" >&5 + echo "$as_me:9567: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_int=yes else @@ -9007,10 +9574,10 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:9010: result: $ac_cv_type_int" >&5 +echo "$as_me:9577: result: $ac_cv_type_int" >&5 echo "${ECHO_T}$ac_cv_type_int" >&6 -echo "$as_me:9013: checking size of int" >&5 +echo "$as_me:9580: 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 @@ -9019,7 +9586,7 @@ if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line 9022 "configure" +#line 9589 "configure" #include "confdefs.h" $ac_includes_default #ifdef F77_DUMMY_MAIN @@ -9037,21 +9604,21 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9040: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9607: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9043: \$? = $ac_status" >&5 + echo "$as_me:9610: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9046: \"$ac_try\"") >&5 + { (eval echo "$as_me:9613: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9049: \$? = $ac_status" >&5 + echo "$as_me:9616: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 9054 "configure" +#line 9621 "configure" #include "confdefs.h" $ac_includes_default #ifdef F77_DUMMY_MAIN @@ -9069,16 +9636,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9072: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9639: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9075: \$? = $ac_status" >&5 + echo "$as_me:9642: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9078: \"$ac_try\"") >&5 + { (eval echo "$as_me:9645: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9081: \$? = $ac_status" >&5 + echo "$as_me:9648: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid; break else @@ -9094,7 +9661,7 @@ ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 9097 "configure" +#line 9664 "configure" #include "confdefs.h" $ac_includes_default #ifdef F77_DUMMY_MAIN @@ -9112,16 +9679,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9115: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9682: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9118: \$? = $ac_status" >&5 + echo "$as_me:9685: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9121: \"$ac_try\"") >&5 + { (eval echo "$as_me:9688: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9124: \$? = $ac_status" >&5 + echo "$as_me:9691: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=$ac_mid; break else @@ -9137,7 +9704,7 @@ while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF -#line 9140 "configure" +#line 9707 "configure" #include "confdefs.h" $ac_includes_default #ifdef F77_DUMMY_MAIN @@ -9155,16 +9722,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9158: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9725: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9161: \$? = $ac_status" >&5 + echo "$as_me:9728: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9164: \"$ac_try\"") >&5 + { (eval echo "$as_me:9731: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9167: \$? = $ac_status" >&5 + echo "$as_me:9734: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid else @@ -9177,12 +9744,12 @@ ac_cv_sizeof_int=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:9180: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:9747: 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 9185 "configure" +#line 9752 "configure" #include "confdefs.h" $ac_includes_default #ifdef F77_DUMMY_MAIN @@ -9204,15 +9771,15 @@ } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:9207: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9774: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9210: \$? = $ac_status" >&5 + echo "$as_me:9777: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:9212: \"$ac_try\"") >&5 + { (eval echo "$as_me:9779: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9215: \$? = $ac_status" >&5 + echo "$as_me:9782: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_int=`cat conftest.val` else @@ -9228,19 +9795,19 @@ ac_cv_sizeof_int=0 fi fi -echo "$as_me:9231: result: $ac_cv_sizeof_int" >&5 +echo "$as_me:9798: result: $ac_cv_sizeof_int" >&5 echo "${ECHO_T}$ac_cv_sizeof_int" >&6 cat >>confdefs.h <<_ACEOF #define SIZEOF_INT $ac_cv_sizeof_int _ACEOF -echo "$as_me:9237: checking for long int" >&5 +echo "$as_me:9804: 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 9243 "configure" +#line 9810 "configure" #include "confdefs.h" $ac_includes_default #ifdef F77_DUMMY_MAIN @@ -9261,16 +9828,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9264: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9831: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9267: \$? = $ac_status" >&5 + echo "$as_me:9834: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9270: \"$ac_try\"") >&5 + { (eval echo "$as_me:9837: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9273: \$? = $ac_status" >&5 + echo "$as_me:9840: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_long_int=yes else @@ -9280,10 +9847,10 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:9283: result: $ac_cv_type_long_int" >&5 +echo "$as_me:9850: result: $ac_cv_type_long_int" >&5 echo "${ECHO_T}$ac_cv_type_long_int" >&6 -echo "$as_me:9286: checking size of long int" >&5 +echo "$as_me:9853: 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 @@ -9292,7 +9859,7 @@ if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line 9295 "configure" +#line 9862 "configure" #include "confdefs.h" $ac_includes_default #ifdef F77_DUMMY_MAIN @@ -9310,21 +9877,21 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9313: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9880: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9316: \$? = $ac_status" >&5 + echo "$as_me:9883: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9319: \"$ac_try\"") >&5 + { (eval echo "$as_me:9886: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9322: \$? = $ac_status" >&5 + echo "$as_me:9889: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 9327 "configure" +#line 9894 "configure" #include "confdefs.h" $ac_includes_default #ifdef F77_DUMMY_MAIN @@ -9342,16 +9909,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9345: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9912: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9348: \$? = $ac_status" >&5 + echo "$as_me:9915: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9351: \"$ac_try\"") >&5 + { (eval echo "$as_me:9918: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9354: \$? = $ac_status" >&5 + echo "$as_me:9921: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid; break else @@ -9367,7 +9934,7 @@ ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 9370 "configure" +#line 9937 "configure" #include "confdefs.h" $ac_includes_default #ifdef F77_DUMMY_MAIN @@ -9385,16 +9952,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9388: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9955: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9391: \$? = $ac_status" >&5 + echo "$as_me:9958: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9394: \"$ac_try\"") >&5 + { (eval echo "$as_me:9961: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9397: \$? = $ac_status" >&5 + echo "$as_me:9964: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=$ac_mid; break else @@ -9410,7 +9977,7 @@ while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF -#line 9413 "configure" +#line 9980 "configure" #include "confdefs.h" $ac_includes_default #ifdef F77_DUMMY_MAIN @@ -9428,16 +9995,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9431: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9998: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9434: \$? = $ac_status" >&5 + echo "$as_me:10001: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9437: \"$ac_try\"") >&5 + { (eval echo "$as_me:10004: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9440: \$? = $ac_status" >&5 + echo "$as_me:10007: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid else @@ -9450,12 +10017,12 @@ ac_cv_sizeof_long_int=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:9453: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:10020: 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 9458 "configure" +#line 10025 "configure" #include "confdefs.h" $ac_includes_default #ifdef F77_DUMMY_MAIN @@ -9477,15 +10044,15 @@ } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:9480: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10047: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9483: \$? = $ac_status" >&5 + echo "$as_me:10050: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:9485: \"$ac_try\"") >&5 + { (eval echo "$as_me:10052: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9488: \$? = $ac_status" >&5 + echo "$as_me:10055: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_long_int=`cat conftest.val` else @@ -9501,19 +10068,19 @@ ac_cv_sizeof_long_int=0 fi fi -echo "$as_me:9504: result: $ac_cv_sizeof_long_int" >&5 +echo "$as_me:10071: result: $ac_cv_sizeof_long_int" >&5 echo "${ECHO_T}$ac_cv_sizeof_long_int" >&6 cat >>confdefs.h <<_ACEOF #define SIZEOF_LONG_INT $ac_cv_sizeof_long_int _ACEOF -echo "$as_me:9510: checking for long long int" >&5 +echo "$as_me:10077: 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 9516 "configure" +#line 10083 "configure" #include "confdefs.h" $ac_includes_default #ifdef F77_DUMMY_MAIN @@ -9534,16 +10101,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9537: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10104: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9540: \$? = $ac_status" >&5 + echo "$as_me:10107: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9543: \"$ac_try\"") >&5 + { (eval echo "$as_me:10110: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9546: \$? = $ac_status" >&5 + echo "$as_me:10113: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_long_long_int=yes else @@ -9553,10 +10120,10 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:9556: result: $ac_cv_type_long_long_int" >&5 +echo "$as_me:10123: result: $ac_cv_type_long_long_int" >&5 echo "${ECHO_T}$ac_cv_type_long_long_int" >&6 -echo "$as_me:9559: checking size of long long int" >&5 +echo "$as_me:10126: 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 @@ -9565,7 +10132,7 @@ if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line 9568 "configure" +#line 10135 "configure" #include "confdefs.h" $ac_includes_default #ifdef F77_DUMMY_MAIN @@ -9583,21 +10150,21 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9586: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10153: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9589: \$? = $ac_status" >&5 + echo "$as_me:10156: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9592: \"$ac_try\"") >&5 + { (eval echo "$as_me:10159: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9595: \$? = $ac_status" >&5 + echo "$as_me:10162: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 9600 "configure" +#line 10167 "configure" #include "confdefs.h" $ac_includes_default #ifdef F77_DUMMY_MAIN @@ -9615,16 +10182,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9618: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10185: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9621: \$? = $ac_status" >&5 + echo "$as_me:10188: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9624: \"$ac_try\"") >&5 + { (eval echo "$as_me:10191: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9627: \$? = $ac_status" >&5 + echo "$as_me:10194: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid; break else @@ -9640,7 +10207,7 @@ ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 9643 "configure" +#line 10210 "configure" #include "confdefs.h" $ac_includes_default #ifdef F77_DUMMY_MAIN @@ -9658,16 +10225,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9661: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10228: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9664: \$? = $ac_status" >&5 + echo "$as_me:10231: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9667: \"$ac_try\"") >&5 + { (eval echo "$as_me:10234: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9670: \$? = $ac_status" >&5 + echo "$as_me:10237: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=$ac_mid; break else @@ -9683,7 +10250,7 @@ while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF -#line 9686 "configure" +#line 10253 "configure" #include "confdefs.h" $ac_includes_default #ifdef F77_DUMMY_MAIN @@ -9701,16 +10268,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9704: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10271: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9707: \$? = $ac_status" >&5 + echo "$as_me:10274: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9710: \"$ac_try\"") >&5 + { (eval echo "$as_me:10277: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9713: \$? = $ac_status" >&5 + echo "$as_me:10280: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid else @@ -9723,12 +10290,12 @@ ac_cv_sizeof_long_long_int=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:9726: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:10293: 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 9731 "configure" +#line 10298 "configure" #include "confdefs.h" $ac_includes_default #ifdef F77_DUMMY_MAIN @@ -9750,15 +10317,15 @@ } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:9753: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10320: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9756: \$? = $ac_status" >&5 + echo "$as_me:10323: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:9758: \"$ac_try\"") >&5 + { (eval echo "$as_me:10325: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9761: \$? = $ac_status" >&5 + echo "$as_me:10328: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_long_long_int=`cat conftest.val` else @@ -9774,21 +10341,21 @@ ac_cv_sizeof_long_long_int=0 fi fi -echo "$as_me:9777: result: $ac_cv_sizeof_long_long_int" >&5 +echo "$as_me:10344: result: $ac_cv_sizeof_long_long_int" >&5 echo "${ECHO_T}$ac_cv_sizeof_long_long_int" >&6 cat >>confdefs.h <<_ACEOF #define SIZEOF_LONG_LONG_INT $ac_cv_sizeof_long_long_int _ACEOF # More checks for data types -echo "$as_me:9784: checking for u_int type" >&5 +echo "$as_me:10351: 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 9791 "configure" +#line 10358 "configure" #include "confdefs.h" #include #ifdef F77_DUMMY_MAIN @@ -9806,16 +10373,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9809: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10376: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9812: \$? = $ac_status" >&5 + echo "$as_me:10379: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9815: \"$ac_try\"") >&5 + { (eval echo "$as_me:10382: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9818: \$? = $ac_status" >&5 + echo "$as_me:10385: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_u_int="yes" else @@ -9827,7 +10394,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:9830: result: $ac_cv_have_u_int" >&5 +echo "$as_me:10397: 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 <<\_ACEOF @@ -9837,14 +10404,14 @@ have_u_int=1 fi -echo "$as_me:9840: checking for intXX_t types" >&5 +echo "$as_me:10407: 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 9847 "configure" +#line 10414 "configure" #include "confdefs.h" #include #ifdef F77_DUMMY_MAIN @@ -9862,16 +10429,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9865: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10432: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9868: \$? = $ac_status" >&5 + echo "$as_me:10435: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9871: \"$ac_try\"") >&5 + { (eval echo "$as_me:10438: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9874: \$? = $ac_status" >&5 + echo "$as_me:10441: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_intxx_t="yes" else @@ -9883,7 +10450,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:9886: result: $ac_cv_have_intxx_t" >&5 +echo "$as_me:10453: 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 <<\_ACEOF @@ -9896,10 +10463,10 @@ if (test -z "$have_intxx_t" && \ test "x$ac_cv_header_stdint_h" = "xyes") then - echo "$as_me:9899: checking for intXX_t types in stdint.h" >&5 + echo "$as_me:10466: 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 9902 "configure" +#line 10469 "configure" #include "confdefs.h" #include #ifdef F77_DUMMY_MAIN @@ -9917,43 +10484,43 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9920: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10487: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9923: \$? = $ac_status" >&5 + echo "$as_me:10490: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9926: \"$ac_try\"") >&5 + { (eval echo "$as_me:10493: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9929: \$? = $ac_status" >&5 + echo "$as_me:10496: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cat >>confdefs.h <<\_ACEOF #define HAVE_INTXX_T 1 _ACEOF - echo "$as_me:9936: result: yes" >&5 + echo "$as_me:10503: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:9942: result: no" >&5 + echo "$as_me:10509: result: no" >&5 echo "${ECHO_T}no" >&6 fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:9949: checking for int64_t type" >&5 +echo "$as_me:10516: 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 9956 "configure" +#line 10523 "configure" #include "confdefs.h" #include #ifdef F77_DUMMY_MAIN @@ -9971,16 +10538,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9974: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10541: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9977: \$? = $ac_status" >&5 + echo "$as_me:10544: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9980: \"$ac_try\"") >&5 + { (eval echo "$as_me:10547: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9983: \$? = $ac_status" >&5 + echo "$as_me:10550: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_int64_t="yes" else @@ -9992,7 +10559,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:9995: result: $ac_cv_have_int64_t" >&5 +echo "$as_me:10562: 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 <<\_ACEOF @@ -10003,10 +10570,10 @@ fi if test -z "$have_int64_t" ; then - echo "$as_me:10006: checking for int64_t type in sys/socket.h" >&5 + echo "$as_me:10573: checking for int64_t type in sys/socket.h" >&5 echo $ECHO_N "checking for int64_t type in sys/socket.h... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 10009 "configure" +#line 10576 "configure" #include "confdefs.h" #include #ifdef F77_DUMMY_MAIN @@ -10024,43 +10591,94 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10027: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10594: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:10597: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:10600: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10603: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cat >>confdefs.h <<\_ACEOF +#define HAVE_INT64_T 1 +_ACEOF + + echo "$as_me:10610: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + echo "$as_me:10616: result: no" >&5 +echo "${ECHO_T}no" >&6 + +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi + +if test -z "$have_int64_t" ; then + echo "$as_me:10624: checking for int64_t type in sys/bitypes.h" >&5 +echo $ECHO_N "checking for int64_t type in sys/bitypes.h... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line 10627 "configure" +#include "confdefs.h" + #include +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ + int64_t a; a = 1 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:10645: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10030: \$? = $ac_status" >&5 + echo "$as_me:10648: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10033: \"$ac_try\"") >&5 + { (eval echo "$as_me:10651: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10036: \$? = $ac_status" >&5 + echo "$as_me:10654: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cat >>confdefs.h <<\_ACEOF #define HAVE_INT64_T 1 _ACEOF - echo "$as_me:10043: result: yes" >&5 + echo "$as_me:10661: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:10049: result: no" >&5 + echo "$as_me:10667: result: no" >&5 echo "${ECHO_T}no" >&6 fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10056: checking for u_intXX_t types" >&5 +echo "$as_me:10674: 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 10063 "configure" +#line 10681 "configure" #include "confdefs.h" #include #ifdef F77_DUMMY_MAIN @@ -10078,16 +10696,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10081: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10699: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10084: \$? = $ac_status" >&5 + echo "$as_me:10702: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10087: \"$ac_try\"") >&5 + { (eval echo "$as_me:10705: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10090: \$? = $ac_status" >&5 + echo "$as_me:10708: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_u_intxx_t="yes" else @@ -10099,7 +10717,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10102: result: $ac_cv_have_u_intxx_t" >&5 +echo "$as_me:10720: 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 <<\_ACEOF @@ -10110,10 +10728,10 @@ fi if test -z "$have_u_intxx_t" ; then - echo "$as_me:10113: checking for u_intXX_t types in sys/socket.h" >&5 + echo "$as_me:10731: 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 10116 "configure" +#line 10734 "configure" #include "confdefs.h" #include #ifdef F77_DUMMY_MAIN @@ -10131,43 +10749,43 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10134: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10752: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10137: \$? = $ac_status" >&5 + echo "$as_me:10755: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10140: \"$ac_try\"") >&5 + { (eval echo "$as_me:10758: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10143: \$? = $ac_status" >&5 + echo "$as_me:10761: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cat >>confdefs.h <<\_ACEOF #define HAVE_U_INTXX_T 1 _ACEOF - echo "$as_me:10150: result: yes" >&5 + echo "$as_me:10768: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:10156: result: no" >&5 + echo "$as_me:10774: result: no" >&5 echo "${ECHO_T}no" >&6 fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10163: checking for u_int64_t types" >&5 +echo "$as_me:10781: 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 10170 "configure" +#line 10788 "configure" #include "confdefs.h" #include #ifdef F77_DUMMY_MAIN @@ -10185,16 +10803,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10188: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10806: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10191: \$? = $ac_status" >&5 + echo "$as_me:10809: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10194: \"$ac_try\"") >&5 + { (eval echo "$as_me:10812: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10197: \$? = $ac_status" >&5 + echo "$as_me:10815: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_u_int64_t="yes" else @@ -10206,7 +10824,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10209: result: $ac_cv_have_u_int64_t" >&5 +echo "$as_me:10827: 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 <<\_ACEOF @@ -10216,15 +10834,66 @@ have_u_int64_t=1 fi +if test -z "$have_u_int64_t" ; then + echo "$as_me:10838: 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 10841 "configure" +#include "confdefs.h" + #include +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ + u_int64_t a; a = 1 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:10859: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:10862: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:10865: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10868: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cat >>confdefs.h <<\_ACEOF +#define HAVE_U_INT64_T 1 +_ACEOF + + echo "$as_me:10875: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + echo "$as_me:10881: result: no" >&5 +echo "${ECHO_T}no" >&6 + +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi + if test -z "$have_u_intxx_t" ; then - echo "$as_me:10220: checking for uintXX_t types" >&5 + echo "$as_me:10889: 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 10227 "configure" +#line 10896 "configure" #include "confdefs.h" #include @@ -10244,16 +10913,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10247: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10916: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10250: \$? = $ac_status" >&5 + echo "$as_me:10919: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10253: \"$ac_try\"") >&5 + { (eval echo "$as_me:10922: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10256: \$? = $ac_status" >&5 + echo "$as_me:10925: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_uintxx_t="yes" else @@ -10265,7 +10934,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10268: result: $ac_cv_have_uintxx_t" >&5 +echo "$as_me:10937: 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 <<\_ACEOF @@ -10276,10 +10945,10 @@ fi if test -z "$have_uintxx_t" ; then - echo "$as_me:10279: checking for uintXX_t types in stdint.h" >&5 + echo "$as_me:10948: 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 10282 "configure" +#line 10951 "configure" #include "confdefs.h" #include #ifdef F77_DUMMY_MAIN @@ -10297,29 +10966,29 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10300: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10969: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10303: \$? = $ac_status" >&5 + echo "$as_me:10972: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10306: \"$ac_try\"") >&5 + { (eval echo "$as_me:10975: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10309: \$? = $ac_status" >&5 + echo "$as_me:10978: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cat >>confdefs.h <<\_ACEOF #define HAVE_UINTXX_T 1 _ACEOF - echo "$as_me:10316: result: yes" >&5 + echo "$as_me:10985: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:10322: result: no" >&5 + echo "$as_me:10991: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -10329,10 +10998,10 @@ if (test -z "$have_u_intxx_t" || test -z "$have_intxx_t" && \ test "x$ac_cv_header_sys_bitypes_h" = "xyes") then - echo "$as_me:10332: checking for intXX_t and u_intXX_t types in sys/bitypes.h" >&5 + echo "$as_me:11001: 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 10335 "configure" +#line 11004 "configure" #include "confdefs.h" #include @@ -10356,16 +11025,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10359: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11028: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10362: \$? = $ac_status" >&5 + echo "$as_me:11031: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10365: \"$ac_try\"") >&5 + { (eval echo "$as_me:11034: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10368: \$? = $ac_status" >&5 + echo "$as_me:11037: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cat >>confdefs.h <<\_ACEOF @@ -10376,27 +11045,27 @@ #define HAVE_INTXX_T 1 _ACEOF - echo "$as_me:10379: result: yes" >&5 + echo "$as_me:11048: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:10385: result: no" >&5 +echo "$as_me:11054: result: no" >&5 echo "${ECHO_T}no" >&6 fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10392: checking for u_char" >&5 +echo "$as_me:11061: 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 10399 "configure" +#line 11068 "configure" #include "confdefs.h" #include @@ -10416,16 +11085,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10419: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11088: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10422: \$? = $ac_status" >&5 + echo "$as_me:11091: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10425: \"$ac_try\"") >&5 + { (eval echo "$as_me:11094: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10428: \$? = $ac_status" >&5 + echo "$as_me:11097: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_u_char="yes" else @@ -10437,7 +11106,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10440: result: $ac_cv_have_u_char" >&5 +echo "$as_me:11109: 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 <<\_ACEOF @@ -10446,13 +11115,13 @@ fi - echo "$as_me:10449: checking for socklen_t" >&5 + echo "$as_me:11118: 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 10455 "configure" +#line 11124 "configure" #include "confdefs.h" #include #include @@ -10475,16 +11144,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10478: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11147: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10481: \$? = $ac_status" >&5 + echo "$as_me:11150: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10484: \"$ac_try\"") >&5 + { (eval echo "$as_me:11153: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10487: \$? = $ac_status" >&5 + echo "$as_me:11156: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_socklen_t=yes else @@ -10494,13 +11163,13 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10497: result: $ac_cv_type_socklen_t" >&5 +echo "$as_me:11166: 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:10503: checking for socklen_t equivalent" >&5 + echo "$as_me:11172: 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 @@ -10512,7 +11181,7 @@ for arg2 in "struct sockaddr" void; do for t in int size_t unsigned long "unsigned long"; do cat >conftest.$ac_ext <<_ACEOF -#line 10515 "configure" +#line 11184 "configure" #include "confdefs.h" #include @@ -10538,16 +11207,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10541: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11210: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10544: \$? = $ac_status" >&5 + echo "$as_me:11213: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10547: \"$ac_try\"") >&5 + { (eval echo "$as_me:11216: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10550: \$? = $ac_status" >&5 + echo "$as_me:11219: \$? = $ac_status" >&5 (exit $ac_status); }; }; then curl_cv_socklen_t_equiv="$t" @@ -10562,30 +11231,87 @@ done if test "x$curl_cv_socklen_t_equiv" = x; then - { { echo "$as_me:10565: error: Cannot find a type to use in place of socklen_t" >&5 + { { echo "$as_me:11234: 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:10572: result: $curl_cv_socklen_t_equiv" >&5 -echo "${ECHO_T}$curl_cv_socklen_t_equiv" >&6 + + echo "$as_me:11241: result: $curl_cv_socklen_t_equiv" >&5 +echo "${ECHO_T}$curl_cv_socklen_t_equiv" >&6 + +cat >>confdefs.h <<_ACEOF +#define socklen_t $curl_cv_socklen_t_equiv +_ACEOF + +fi + +echo "$as_me:11250: 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 11256 "configure" +#include "confdefs.h" +#include + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +if ((sig_atomic_t *) 0) + return 0; +if (sizeof (sig_atomic_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11278: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11281: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11284: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11287: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_sig_atomic_t=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_sig_atomic_t=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:11297: 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 cat >>confdefs.h <<_ACEOF -#define socklen_t $curl_cv_socklen_t_equiv +#define HAVE_SIG_ATOMIC_T 1 _ACEOF fi -echo "$as_me:10581: checking for size_t" >&5 +echo "$as_me:11307: 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 10588 "configure" +#line 11314 "configure" #include "confdefs.h" #include @@ -10605,16 +11331,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10608: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11334: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10611: \$? = $ac_status" >&5 + echo "$as_me:11337: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10614: \"$ac_try\"") >&5 + { (eval echo "$as_me:11340: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10617: \$? = $ac_status" >&5 + echo "$as_me:11343: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_size_t="yes" else @@ -10626,7 +11352,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10629: result: $ac_cv_have_size_t" >&5 +echo "$as_me:11355: 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 <<\_ACEOF @@ -10635,14 +11361,14 @@ fi -echo "$as_me:10638: checking for ssize_t" >&5 +echo "$as_me:11364: 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 10645 "configure" +#line 11371 "configure" #include "confdefs.h" #include @@ -10662,16 +11388,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10665: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11391: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10668: \$? = $ac_status" >&5 + echo "$as_me:11394: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10671: \"$ac_try\"") >&5 + { (eval echo "$as_me:11397: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10674: \$? = $ac_status" >&5 + echo "$as_me:11400: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_ssize_t="yes" else @@ -10683,7 +11409,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10686: result: $ac_cv_have_ssize_t" >&5 +echo "$as_me:11412: 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 <<\_ACEOF @@ -10692,14 +11418,14 @@ fi -echo "$as_me:10695: checking for clock_t" >&5 +echo "$as_me:11421: 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 10702 "configure" +#line 11428 "configure" #include "confdefs.h" #include @@ -10719,16 +11445,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10722: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11448: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10725: \$? = $ac_status" >&5 + echo "$as_me:11451: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10728: \"$ac_try\"") >&5 + { (eval echo "$as_me:11454: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10731: \$? = $ac_status" >&5 + echo "$as_me:11457: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_clock_t="yes" else @@ -10740,7 +11466,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10743: result: $ac_cv_have_clock_t" >&5 +echo "$as_me:11469: 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 <<\_ACEOF @@ -10749,14 +11475,14 @@ fi -echo "$as_me:10752: checking for sa_family_t" >&5 +echo "$as_me:11478: 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 10759 "configure" +#line 11485 "configure" #include "confdefs.h" #include @@ -10777,23 +11503,23 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10780: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11506: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10783: \$? = $ac_status" >&5 + echo "$as_me:11509: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10786: \"$ac_try\"") >&5 + { (eval echo "$as_me:11512: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10789: \$? = $ac_status" >&5 + echo "$as_me:11515: \$? = $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 10796 "configure" +#line 11522 "configure" #include "confdefs.h" #include @@ -10815,16 +11541,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10818: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11544: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10821: \$? = $ac_status" >&5 + echo "$as_me:11547: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10824: \"$ac_try\"") >&5 + { (eval echo "$as_me:11550: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10827: \$? = $ac_status" >&5 + echo "$as_me:11553: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_sa_family_t="yes" else @@ -10839,7 +11565,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10842: result: $ac_cv_have_sa_family_t" >&5 +echo "$as_me:11568: 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 <<\_ACEOF @@ -10848,14 +11574,14 @@ fi -echo "$as_me:10851: checking for pid_t" >&5 +echo "$as_me:11577: 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 10858 "configure" +#line 11584 "configure" #include "confdefs.h" #include @@ -10875,16 +11601,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10878: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11604: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10881: \$? = $ac_status" >&5 + echo "$as_me:11607: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10884: \"$ac_try\"") >&5 + { (eval echo "$as_me:11610: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10887: \$? = $ac_status" >&5 + echo "$as_me:11613: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_pid_t="yes" else @@ -10896,7 +11622,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10899: result: $ac_cv_have_pid_t" >&5 +echo "$as_me:11625: 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 <<\_ACEOF @@ -10905,14 +11631,14 @@ fi -echo "$as_me:10908: checking for mode_t" >&5 +echo "$as_me:11634: 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 10915 "configure" +#line 11641 "configure" #include "confdefs.h" #include @@ -10932,16 +11658,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10935: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11661: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10938: \$? = $ac_status" >&5 + echo "$as_me:11664: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10941: \"$ac_try\"") >&5 + { (eval echo "$as_me:11667: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10944: \$? = $ac_status" >&5 + echo "$as_me:11670: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_mode_t="yes" else @@ -10953,7 +11679,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10956: result: $ac_cv_have_mode_t" >&5 +echo "$as_me:11682: 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 <<\_ACEOF @@ -10962,14 +11688,14 @@ fi -echo "$as_me:10965: checking for struct sockaddr_storage" >&5 +echo "$as_me:11691: 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 10972 "configure" +#line 11698 "configure" #include "confdefs.h" #include @@ -10990,16 +11716,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10993: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11719: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10996: \$? = $ac_status" >&5 + echo "$as_me:11722: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10999: \"$ac_try\"") >&5 + { (eval echo "$as_me:11725: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11002: \$? = $ac_status" >&5 + echo "$as_me:11728: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_struct_sockaddr_storage="yes" else @@ -11011,7 +11737,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:11014: result: $ac_cv_have_struct_sockaddr_storage" >&5 +echo "$as_me:11740: 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 <<\_ACEOF @@ -11020,14 +11746,14 @@ fi -echo "$as_me:11023: checking for struct sockaddr_in6" >&5 +echo "$as_me:11749: 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 11030 "configure" +#line 11756 "configure" #include "confdefs.h" #include @@ -11048,16 +11774,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11051: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11777: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11054: \$? = $ac_status" >&5 + echo "$as_me:11780: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11057: \"$ac_try\"") >&5 + { (eval echo "$as_me:11783: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11060: \$? = $ac_status" >&5 + echo "$as_me:11786: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_struct_sockaddr_in6="yes" else @@ -11069,7 +11795,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:11072: result: $ac_cv_have_struct_sockaddr_in6" >&5 +echo "$as_me:11798: 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 <<\_ACEOF @@ -11078,14 +11804,14 @@ fi -echo "$as_me:11081: checking for struct in6_addr" >&5 +echo "$as_me:11807: 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 11088 "configure" +#line 11814 "configure" #include "confdefs.h" #include @@ -11106,16 +11832,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11109: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11835: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11112: \$? = $ac_status" >&5 + echo "$as_me:11838: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11115: \"$ac_try\"") >&5 + { (eval echo "$as_me:11841: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11118: \$? = $ac_status" >&5 + echo "$as_me:11844: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_struct_in6_addr="yes" else @@ -11127,7 +11853,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:11130: result: $ac_cv_have_struct_in6_addr" >&5 +echo "$as_me:11856: 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 <<\_ACEOF @@ -11136,14 +11862,14 @@ fi -echo "$as_me:11139: checking for struct addrinfo" >&5 +echo "$as_me:11865: 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 11146 "configure" +#line 11872 "configure" #include "confdefs.h" #include @@ -11165,16 +11891,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11168: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11894: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11171: \$? = $ac_status" >&5 + echo "$as_me:11897: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11174: \"$ac_try\"") >&5 + { (eval echo "$as_me:11900: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11177: \$? = $ac_status" >&5 + echo "$as_me:11903: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_struct_addrinfo="yes" else @@ -11186,7 +11912,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:11189: result: $ac_cv_have_struct_addrinfo" >&5 +echo "$as_me:11915: 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 <<\_ACEOF @@ -11195,14 +11921,14 @@ fi -echo "$as_me:11198: checking for struct timeval" >&5 +echo "$as_me:11924: 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 11205 "configure" +#line 11931 "configure" #include "confdefs.h" #include #ifdef F77_DUMMY_MAIN @@ -11220,16 +11946,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11223: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11949: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11226: \$? = $ac_status" >&5 + echo "$as_me:11952: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11229: \"$ac_try\"") >&5 + { (eval echo "$as_me:11955: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11232: \$? = $ac_status" >&5 + echo "$as_me:11958: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_struct_timeval="yes" else @@ -11241,7 +11967,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:11244: result: $ac_cv_have_struct_timeval" >&5 +echo "$as_me:11970: 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 <<\_ACEOF @@ -11259,12 +11985,12 @@ NO_SFTP='#' else if test "$cross_compiling" = yes; then - { { echo "$as_me:11262: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:11988: 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 11267 "configure" +#line 11993 "configure" #include "confdefs.h" #include @@ -11292,15 +12018,15 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:11295: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12021: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11298: \$? = $ac_status" >&5 + echo "$as_me:12024: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:11300: \"$ac_try\"") >&5 + { (eval echo "$as_me:12026: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11303: \$? = $ac_status" >&5 + echo "$as_me:12029: \$? = $ac_status" >&5 (exit $ac_status); }; }; then true else @@ -11319,14 +12045,14 @@ # look for field 'ut_host' in header 'utmp.h' ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` ossh_varname="ossh_cv_$ossh_safe""_has_"ut_host - echo "$as_me:11322: checking for ut_host field in utmp.h" >&5 + echo "$as_me:12048: 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 11329 "configure" +#line 12055 "configure" #include "confdefs.h" #include @@ -11343,7 +12069,7 @@ ossh_result=`eval 'echo $'"$ossh_varname"` if test -n "`echo $ossh_varname`"; then - echo "$as_me:11346: result: $ossh_result" >&5 + echo "$as_me:12072: result: $ossh_result" >&5 echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then cat >>confdefs.h <<\_ACEOF @@ -11352,21 +12078,21 @@ fi else - echo "$as_me:11355: result: no" >&5 + echo "$as_me:12081: 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:11362: checking for ut_host field in utmpx.h" >&5 + echo "$as_me:12088: 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 11369 "configure" +#line 12095 "configure" #include "confdefs.h" #include @@ -11383,7 +12109,7 @@ ossh_result=`eval 'echo $'"$ossh_varname"` if test -n "`echo $ossh_varname`"; then - echo "$as_me:11386: result: $ossh_result" >&5 + echo "$as_me:12112: result: $ossh_result" >&5 echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then cat >>confdefs.h <<\_ACEOF @@ -11392,21 +12118,21 @@ fi else - echo "$as_me:11395: result: no" >&5 + echo "$as_me:12121: 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:11402: checking for syslen field in utmpx.h" >&5 + echo "$as_me:12128: 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 11409 "configure" +#line 12135 "configure" #include "confdefs.h" #include @@ -11423,7 +12149,7 @@ ossh_result=`eval 'echo $'"$ossh_varname"` if test -n "`echo $ossh_varname`"; then - echo "$as_me:11426: result: $ossh_result" >&5 + echo "$as_me:12152: result: $ossh_result" >&5 echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then cat >>confdefs.h <<\_ACEOF @@ -11432,21 +12158,21 @@ fi else - echo "$as_me:11435: result: no" >&5 + echo "$as_me:12161: 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:11442: checking for ut_pid field in utmp.h" >&5 + echo "$as_me:12168: 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 11449 "configure" +#line 12175 "configure" #include "confdefs.h" #include @@ -11463,7 +12189,7 @@ ossh_result=`eval 'echo $'"$ossh_varname"` if test -n "`echo $ossh_varname`"; then - echo "$as_me:11466: result: $ossh_result" >&5 + echo "$as_me:12192: result: $ossh_result" >&5 echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then cat >>confdefs.h <<\_ACEOF @@ -11472,21 +12198,21 @@ fi else - echo "$as_me:11475: result: no" >&5 + echo "$as_me:12201: 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:11482: checking for ut_type field in utmp.h" >&5 + echo "$as_me:12208: 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 11489 "configure" +#line 12215 "configure" #include "confdefs.h" #include @@ -11503,7 +12229,7 @@ ossh_result=`eval 'echo $'"$ossh_varname"` if test -n "`echo $ossh_varname`"; then - echo "$as_me:11506: result: $ossh_result" >&5 + echo "$as_me:12232: result: $ossh_result" >&5 echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then cat >>confdefs.h <<\_ACEOF @@ -11512,21 +12238,21 @@ fi else - echo "$as_me:11515: result: no" >&5 + echo "$as_me:12241: 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:11522: checking for ut_type field in utmpx.h" >&5 + echo "$as_me:12248: 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 11529 "configure" +#line 12255 "configure" #include "confdefs.h" #include @@ -11543,7 +12269,7 @@ ossh_result=`eval 'echo $'"$ossh_varname"` if test -n "`echo $ossh_varname`"; then - echo "$as_me:11546: result: $ossh_result" >&5 + echo "$as_me:12272: result: $ossh_result" >&5 echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then cat >>confdefs.h <<\_ACEOF @@ -11552,21 +12278,21 @@ fi else - echo "$as_me:11555: result: no" >&5 + echo "$as_me:12281: 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:11562: checking for ut_tv field in utmp.h" >&5 + echo "$as_me:12288: 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 11569 "configure" +#line 12295 "configure" #include "confdefs.h" #include @@ -11583,7 +12309,7 @@ ossh_result=`eval 'echo $'"$ossh_varname"` if test -n "`echo $ossh_varname`"; then - echo "$as_me:11586: result: $ossh_result" >&5 + echo "$as_me:12312: result: $ossh_result" >&5 echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then cat >>confdefs.h <<\_ACEOF @@ -11592,21 +12318,21 @@ fi else - echo "$as_me:11595: result: no" >&5 + echo "$as_me:12321: 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:11602: checking for ut_id field in utmp.h" >&5 + echo "$as_me:12328: 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 11609 "configure" +#line 12335 "configure" #include "confdefs.h" #include @@ -11623,7 +12349,7 @@ ossh_result=`eval 'echo $'"$ossh_varname"` if test -n "`echo $ossh_varname`"; then - echo "$as_me:11626: result: $ossh_result" >&5 + echo "$as_me:12352: result: $ossh_result" >&5 echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then cat >>confdefs.h <<\_ACEOF @@ -11632,307 +12358,27 @@ fi else - echo "$as_me:11635: result: no" >&5 + echo "$as_me:12361: 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:11642: checking for ut_id field in utmpx.h" >&5 + echo "$as_me:12368: 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 11649 "configure" -#include "confdefs.h" -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "ut_id" >/dev/null 2>&1; then - eval "$ossh_varname=yes" -else - eval "$ossh_varname=no" -fi -rm -f conftest* - -fi - - ossh_result=`eval 'echo $'"$ossh_varname"` - if test -n "`echo $ossh_varname`"; then - echo "$as_me:11666: result: $ossh_result" >&5 -echo "${ECHO_T}$ossh_result" >&6 - if test "x$ossh_result" = "xyes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_ID_IN_UTMPX 1 -_ACEOF - - fi - else - echo "$as_me:11675: 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:11682: 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 11689 "configure" -#include "confdefs.h" -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "ut_addr" >/dev/null 2>&1; then - eval "$ossh_varname=yes" -else - eval "$ossh_varname=no" -fi -rm -f conftest* - -fi - - ossh_result=`eval 'echo $'"$ossh_varname"` - if test -n "`echo $ossh_varname`"; then - echo "$as_me:11706: result: $ossh_result" >&5 -echo "${ECHO_T}$ossh_result" >&6 - if test "x$ossh_result" = "xyes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_ADDR_IN_UTMP 1 -_ACEOF - - fi - else - echo "$as_me:11715: 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:11722: 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 11729 "configure" -#include "confdefs.h" -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "ut_addr" >/dev/null 2>&1; then - eval "$ossh_varname=yes" -else - eval "$ossh_varname=no" -fi -rm -f conftest* - -fi - - ossh_result=`eval 'echo $'"$ossh_varname"` - if test -n "`echo $ossh_varname`"; then - echo "$as_me:11746: result: $ossh_result" >&5 -echo "${ECHO_T}$ossh_result" >&6 - if test "x$ossh_result" = "xyes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_ADDR_IN_UTMPX 1 -_ACEOF - - fi - else - echo "$as_me:11755: 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:11762: 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 11769 "configure" -#include "confdefs.h" -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "ut_addr_v6" >/dev/null 2>&1; then - eval "$ossh_varname=yes" -else - eval "$ossh_varname=no" -fi -rm -f conftest* - -fi - - ossh_result=`eval 'echo $'"$ossh_varname"` - if test -n "`echo $ossh_varname`"; then - echo "$as_me:11786: result: $ossh_result" >&5 -echo "${ECHO_T}$ossh_result" >&6 - if test "x$ossh_result" = "xyes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_ADDR_V6_IN_UTMP 1 -_ACEOF - - fi - else - echo "$as_me:11795: 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:11802: 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 11809 "configure" -#include "confdefs.h" -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "ut_addr_v6" >/dev/null 2>&1; then - eval "$ossh_varname=yes" -else - eval "$ossh_varname=no" -fi -rm -f conftest* - -fi - - ossh_result=`eval 'echo $'"$ossh_varname"` - if test -n "`echo $ossh_varname`"; then - echo "$as_me:11826: result: $ossh_result" >&5 -echo "${ECHO_T}$ossh_result" >&6 - if test "x$ossh_result" = "xyes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_ADDR_V6_IN_UTMPX 1 -_ACEOF - - fi - else - echo "$as_me:11835: 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:11842: 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 11849 "configure" -#include "confdefs.h" -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "ut_exit" >/dev/null 2>&1; then - eval "$ossh_varname=yes" -else - eval "$ossh_varname=no" -fi -rm -f conftest* - -fi - - ossh_result=`eval 'echo $'"$ossh_varname"` - if test -n "`echo $ossh_varname`"; then - echo "$as_me:11866: result: $ossh_result" >&5 -echo "${ECHO_T}$ossh_result" >&6 - if test "x$ossh_result" = "xyes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_EXIT_IN_UTMP 1 -_ACEOF - - fi - else - echo "$as_me:11875: 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:11882: 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 11889 "configure" -#include "confdefs.h" -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "ut_time" >/dev/null 2>&1; then - eval "$ossh_varname=yes" -else - eval "$ossh_varname=no" -fi -rm -f conftest* - -fi - - ossh_result=`eval 'echo $'"$ossh_varname"` - if test -n "`echo $ossh_varname`"; then - echo "$as_me:11906: result: $ossh_result" >&5 -echo "${ECHO_T}$ossh_result" >&6 - if test "x$ossh_result" = "xyes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_TIME_IN_UTMP 1 -_ACEOF - - fi - else - echo "$as_me:11915: 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:11922: 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 11929 "configure" +#line 12375 "configure" #include "confdefs.h" #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "ut_time" >/dev/null 2>&1; then + egrep "ut_id" >/dev/null 2>&1; then eval "$ossh_varname=yes" else eval "$ossh_varname=no" @@ -11943,36 +12389,36 @@ ossh_result=`eval 'echo $'"$ossh_varname"` if test -n "`echo $ossh_varname`"; then - echo "$as_me:11946: result: $ossh_result" >&5 + echo "$as_me:12392: result: $ossh_result" >&5 echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then cat >>confdefs.h <<\_ACEOF -#define HAVE_TIME_IN_UTMPX 1 +#define HAVE_ID_IN_UTMPX 1 _ACEOF fi else - echo "$as_me:11955: result: no" >&5 + echo "$as_me:12401: 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:11962: checking for ut_tv field in utmpx.h" >&5 -echo $ECHO_N "checking for ut_tv field in utmpx.h... $ECHO_C" >&6 +# 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:12408: 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 11969 "configure" +#line 12415 "configure" #include "confdefs.h" -#include +#include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "ut_tv" >/dev/null 2>&1; then + egrep "ut_addr" >/dev/null 2>&1; then eval "$ossh_varname=yes" else eval "$ossh_varname=no" @@ -11983,738 +12429,308 @@ ossh_result=`eval 'echo $'"$ossh_varname"` if test -n "`echo $ossh_varname`"; then - echo "$as_me:11986: result: $ossh_result" >&5 + echo "$as_me:12432: result: $ossh_result" >&5 echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then cat >>confdefs.h <<\_ACEOF -#define HAVE_TV_IN_UTMPX 1 +#define HAVE_ADDR_IN_UTMP 1 _ACEOF fi else - echo "$as_me:11995: result: no" >&5 + echo "$as_me:12441: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:11999: 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 12005 "configure" -#include "confdefs.h" -$ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -static struct stat ac_aggr; -if (ac_aggr.st_blksize) -return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12025: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:12028: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12031: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:12034: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_member_struct_stat_st_blksize=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_member_struct_stat_st_blksize=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:12044: 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 - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_STAT_ST_BLKSIZE 1 -_ACEOF - -fi - -echo "$as_me:12054: 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 12061 "configure" -#include "confdefs.h" - -#include -#include - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ - struct sockaddr_storage s; s.ss_family = 1; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12082: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:12085: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12088: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:12091: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_have_ss_family_in_struct_ss="yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - ac_cv_have_ss_family_in_struct_ss="no" -fi -rm -f conftest.$ac_objext conftest.$ac_ext - -fi -echo "$as_me:12102: 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 <<\_ACEOF -#define HAVE_SS_FAMILY_IN_SS 1 -_ACEOF - -fi - -echo "$as_me:12111: 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 12118 "configure" -#include "confdefs.h" - -#include -#include - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ - struct sockaddr_storage s; s.__ss_family = 1; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12139: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:12142: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12145: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:12148: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_have___ss_family_in_struct_ss="yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - ac_cv_have___ss_family_in_struct_ss="no" - -fi -rm -f conftest.$ac_objext conftest.$ac_ext - -fi -echo "$as_me:12160: 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 <<\_ACEOF -#define HAVE___SS_FAMILY_IN_SS 1 -_ACEOF - -fi - -echo "$as_me:12169: 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 12176 "configure" -#include "confdefs.h" - -#include - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ - struct passwd p; p.pw_class = 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12196: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:12199: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12202: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:12205: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_have_pw_class_in_struct_passwd="yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - ac_cv_have_pw_class_in_struct_passwd="no" - -fi -rm -f conftest.$ac_objext conftest.$ac_ext - -fi -echo "$as_me:12217: 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 <<\_ACEOF -#define HAVE_PW_CLASS_IN_PASSWD 1 -_ACEOF - -fi - -echo "$as_me:12226: 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 +# 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:12448: 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 12233 "configure" -#include "confdefs.h" - -#include - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ - struct passwd p; p.pw_expire = 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12253: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:12256: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12259: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:12262: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_have_pw_expire_in_struct_passwd="yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - ac_cv_have_pw_expire_in_struct_passwd="no" + cat >conftest.$ac_ext <<_ACEOF +#line 12455 "configure" +#include "confdefs.h" +#include +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "ut_addr" >/dev/null 2>&1; then + eval "$ossh_varname=yes" +else + eval "$ossh_varname=no" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:12274: 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 <<\_ACEOF -#define HAVE_PW_EXPIRE_IN_PASSWD 1 + + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + echo "$as_me:12472: result: $ossh_result" >&5 +echo "${ECHO_T}$ossh_result" >&6 + if test "x$ossh_result" = "xyes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_ADDR_IN_UTMPX 1 _ACEOF -fi + fi + else + echo "$as_me:12481: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi -echo "$as_me:12283: 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 +# 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:12488: 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 12290 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 12495 "configure" #include "confdefs.h" +#include -#include - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ - struct passwd p; p.pw_change = 0; - ; - return 0; -} _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12310: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:12313: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12316: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:12319: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_have_pw_change_in_struct_passwd="yes" +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "ut_addr_v6" >/dev/null 2>&1; then + eval "$ossh_varname=yes" else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - ac_cv_have_pw_change_in_struct_passwd="no" - + eval "$ossh_varname=no" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:12331: 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 <<\_ACEOF -#define HAVE_PW_CHANGE_IN_PASSWD 1 + + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + echo "$as_me:12512: result: $ossh_result" >&5 +echo "${ECHO_T}$ossh_result" >&6 + if test "x$ossh_result" = "xyes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_ADDR_V6_IN_UTMP 1 _ACEOF -fi + fi + else + echo "$as_me:12521: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi -echo "$as_me:12340: 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 +# 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:12528: 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 12347 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 12535 "configure" #include "confdefs.h" +#include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ - extern char *__progname; printf("%s", __progname); - ; - return 0; -} _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12365: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:12368: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12371: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:12374: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_libc_defines___progname="yes" +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "ut_addr_v6" >/dev/null 2>&1; then + eval "$ossh_varname=yes" else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - ac_cv_libc_defines___progname="no" - + eval "$ossh_varname=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:12386: 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 <<\_ACEOF -#define HAVE___PROGNAME 1 + + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + echo "$as_me:12552: result: $ossh_result" >&5 +echo "${ECHO_T}$ossh_result" >&6 + if test "x$ossh_result" = "xyes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_ADDR_V6_IN_UTMPX 1 _ACEOF -fi + fi + else + echo "$as_me:12561: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi -echo "$as_me:12395: 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 +# 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:12568: 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 12402 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 12575 "configure" #include "confdefs.h" +#include -#include - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ - extern int optreset; optreset = 0; - ; - return 0; -} _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12422: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:12425: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12428: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:12431: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_have_getopt_optreset="yes" +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "ut_exit" >/dev/null 2>&1; then + eval "$ossh_varname=yes" else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - ac_cv_have_getopt_optreset="no" - + eval "$ossh_varname=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:12443: 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 <<\_ACEOF -#define HAVE_GETOPT_OPTRESET 1 + + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + echo "$as_me:12592: result: $ossh_result" >&5 +echo "${ECHO_T}$ossh_result" >&6 + if test "x$ossh_result" = "xyes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_EXIT_IN_UTMP 1 _ACEOF -fi + fi + else + echo "$as_me:12601: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi -echo "$as_me:12452: 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 +# 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:12608: 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 12459 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 12615 "configure" #include "confdefs.h" +#include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ - extern const char *const sys_errlist[]; printf("%s", sys_errlist[0]); - ; - return 0; -} _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12477: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:12480: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12483: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:12486: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_libc_defines_sys_errlist="yes" +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "ut_time" >/dev/null 2>&1; then + eval "$ossh_varname=yes" else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - ac_cv_libc_defines_sys_errlist="no" - + eval "$ossh_varname=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:12498: 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 <<\_ACEOF -#define HAVE_SYS_ERRLIST 1 + + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + echo "$as_me:12632: result: $ossh_result" >&5 +echo "${ECHO_T}$ossh_result" >&6 + if test "x$ossh_result" = "xyes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_TIME_IN_UTMP 1 _ACEOF -fi + fi + else + echo "$as_me:12641: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi -echo "$as_me:12507: 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 +# 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:12648: 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 12514 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 12655 "configure" #include "confdefs.h" +#include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ - extern int sys_nerr; printf("%i", sys_nerr); - ; - return 0; -} _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12532: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:12535: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12538: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:12541: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_libc_defines_sys_nerr="yes" +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "ut_time" >/dev/null 2>&1; then + eval "$ossh_varname=yes" else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - ac_cv_libc_defines_sys_nerr="no" - -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - + eval "$ossh_varname=no" fi -echo "$as_me:12553: 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 <<\_ACEOF -#define HAVE_SYS_NERR 1 -_ACEOF +rm -f conftest* fi -# Check whether user wants Kerberos support -SCARD_MSG="no" - -# Check whether --with-smartcard or --without-smartcard was given. -if test "${with_smartcard+set}" = set; then - withval="$with_smartcard" + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + echo "$as_me:12672: result: $ossh_result" >&5 +echo "${ECHO_T}$ossh_result" >&6 + if test "x$ossh_result" = "xyes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_TIME_IN_UTMPX 1 +_ACEOF - if test "x$withval" != "xno" ; then - if test "x$withval" != "xyes" ; then - CPPFLAGS="$CPPFLAGS -I${withval}" - LDFLAGS="$LDFLAGS -L${withval}" - if test ! -z "$need_dash_r" ; then - LDFLAGS="$LDFLAGS -R${withval}" - fi - if test ! -z "$blibpath" ; then - blibpath="$blibpath:${withval}" - fi - fi + fi + else + echo "$as_me:12681: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi -for ac_header in sectok.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:12585: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +# 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:12688: 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 -fi -echo "$as_me:12590: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - # Is the header compilable? -echo "$as_me:12594: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 12597 "configure" -#include "confdefs.h" -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12603: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:12606: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12609: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:12612: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_header_compiler=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:12621: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 -# Is the header present? -echo "$as_me:12625: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 12628 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 12695 "configure" #include "confdefs.h" -#include <$ac_header> +#include + _ACEOF -if { (eval echo "$as_me:12632: \"$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:12638: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "ut_tv" >/dev/null 2>&1; then + eval "$ossh_varname=yes" else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_header_preproc=no + eval "$ossh_varname=no" fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:12656: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +rm -f conftest* -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:12662: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:12664: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; - no:yes ) - { echo "$as_me:12667: WARNING: $ac_header: present but cannot be compiled." >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled." >&2;} - { echo "$as_me:12669: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:12671: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -esac -echo "$as_me:12674: 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 - eval "$as_ac_Header=$ac_header_preproc" fi -echo "$as_me:12681: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + ossh_result=`eval 'echo $'"$ossh_varname"` + if test -n "`echo $ossh_varname`"; then + echo "$as_me:12712: result: $ossh_result" >&5 +echo "${ECHO_T}$ossh_result" >&6 + if test "x$ossh_result" = "xyes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_TV_IN_UTMPX 1 _ACEOF -fi - -done - - if test "$ac_cv_header_sectok_h" != yes; then - { { echo "$as_me:12695: error: Can't find sectok.h" >&5 -echo "$as_me: error: Can't find sectok.h" >&2;} - { (exit 1); exit 1; }; } - fi + fi + else + echo "$as_me:12721: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi -echo "$as_me:12700: 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 "$as_me:12725: 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 - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsectok $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 12708 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 12731 "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 sectok_open (); +$ac_includes_default #ifdef F77_DUMMY_MAIN # ifdef __cplusplus extern "C" @@ -12724,209 +12740,170 @@ int main () { -sectok_open (); +static struct stat ac_aggr; +if (ac_aggr.st_blksize) +return 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12733: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:12751: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12736: \$? = $ac_status" >&5 + echo "$as_me:12754: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12739: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:12757: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12742: \$? = $ac_status" >&5 + echo "$as_me:12760: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_sectok_sectok_open=yes + ac_cv_member_struct_stat_st_blksize=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_sectok_sectok_open=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +ac_cv_member_struct_stat_st_blksize=no fi -echo "$as_me:12753: 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 <<_ACEOF -#define HAVE_LIBSECTOK 1 -_ACEOF - - LIBS="-lsectok $LIBS" - +rm -f conftest.$ac_objext conftest.$ac_ext fi +echo "$as_me:12770: 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 - if test "$ac_cv_lib_sectok_sectok_open" != yes; then - { { echo "$as_me:12765: error: Can't find libsectok" >&5 -echo "$as_me: error: Can't find libsectok" >&2;} - { (exit 1); exit 1; }; } - fi - cat >>confdefs.h <<\_ACEOF -#define SMARTCARD 1 -_ACEOF - - SCARD_MSG="yes" - fi - -fi; - -# Check whether user wants Kerberos support -KRB4_MSG="no" - -# Check whether --with-kerberos4 or --without-kerberos4 was given. -if test "${with_kerberos4+set}" = set; then - withval="$with_kerberos4" +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STAT_ST_BLKSIZE 1 +_ACEOF - if test "x$withval" != "xno" ; then - if test "x$withval" != "xyes" ; then - CPPFLAGS="$CPPFLAGS -I${withval}/include" - LDFLAGS="$LDFLAGS -L${withval}/lib" - if test ! -z "$need_dash_r" ; then - LDFLAGS="$LDFLAGS -R${withval}/lib" - fi - if test ! -z "$blibpath" ; then - blibpath="$blibpath:${withval}/lib" - fi - else - if test -d /usr/include/kerberosIV ; then - CPPFLAGS="$CPPFLAGS -I/usr/include/kerberosIV" - fi - fi +fi -for ac_header in krb.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:12805: 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 "$as_me:12780: 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 -fi -echo "$as_me:12810: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - # Is the header compilable? -echo "$as_me:12814: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 12817 "configure" + + cat >conftest.$ac_ext <<_ACEOF +#line 12787 "configure" #include "confdefs.h" -$ac_includes_default -#include <$ac_header> + +#include +#include + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ + struct sockaddr_storage s; s.ss_family = 1; + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12823: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12808: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12826: \$? = $ac_status" >&5 + echo "$as_me:12811: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12829: \"$ac_try\"") >&5 + { (eval echo "$as_me:12814: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12832: \$? = $ac_status" >&5 + echo "$as_me:12817: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + ac_cv_have_ss_family_in_struct_ss="yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_header_compiler=no + ac_cv_have_ss_family_in_struct_ss="no" fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:12841: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 -# Is the header present? -echo "$as_me:12845: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 12848 "configure" +fi +echo "$as_me:12828: 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 <<\_ACEOF +#define HAVE_SS_FAMILY_IN_SS 1 +_ACEOF + +fi + +echo "$as_me:12837: 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 12844 "configure" #include "confdefs.h" -#include <$ac_header> + +#include +#include + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ + struct sockaddr_storage s; s.__ss_family = 1; + ; + return 0; +} _ACEOF -if { (eval echo "$as_me:12852: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:12865: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:12858: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes + echo "$as_me:12868: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:12871: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:12874: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_have___ss_family_in_struct_ss="yes" else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:12876: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +cat conftest.$ac_ext >&5 + ac_cv_have___ss_family_in_struct_ss="no" -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:12882: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:12884: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; - no:yes ) - { echo "$as_me:12887: WARNING: $ac_header: present but cannot be compiled." >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled." >&2;} - { echo "$as_me:12889: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:12891: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -esac -echo "$as_me:12894: 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 - eval "$as_ac_Header=$ac_header_preproc" fi -echo "$as_me:12901: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +rm -f conftest.$ac_objext conftest.$ac_ext fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +echo "$as_me:12886: 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 <<\_ACEOF +#define HAVE___SS_FAMILY_IN_SS 1 _ACEOF fi -done - - if test "$ac_cv_header_krb_h" != yes; then - { echo "$as_me:12915: WARNING: Cannot find krb.h, build may fail" >&5 -echo "$as_me: WARNING: Cannot find krb.h, build may fail" >&2;} - fi - -echo "$as_me:12919: checking for main in -lkrb" >&5 -echo $ECHO_N "checking for main in -lkrb... $ECHO_C" >&6 -if test "${ac_cv_lib_krb_main+set}" = set; then +echo "$as_me:12895: 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 - ac_check_lib_save_LIBS=$LIBS -LIBS="-lkrb $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 12927 "configure" + + cat >conftest.$ac_ext <<_ACEOF +#line 12902 "configure" #include "confdefs.h" +#include + #ifdef F77_DUMMY_MAIN # ifdef __cplusplus extern "C" @@ -12936,56 +12913,54 @@ int main () { -main (); + struct passwd p; p.pw_class = 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12945: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:12922: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12948: \$? = $ac_status" >&5 + echo "$as_me:12925: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12951: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:12928: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12954: \$? = $ac_status" >&5 + echo "$as_me:12931: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_krb_main=yes + ac_cv_have_pw_class_in_struct_passwd="yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_krb_main=no + ac_cv_have_pw_class_in_struct_passwd="no" + fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f conftest.$ac_objext conftest.$ac_ext + fi -echo "$as_me:12965: result: $ac_cv_lib_krb_main" >&5 -echo "${ECHO_T}$ac_cv_lib_krb_main" >&6 -if test $ac_cv_lib_krb_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBKRB 1 +echo "$as_me:12943: 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 <<\_ACEOF +#define HAVE_PW_CLASS_IN_PASSWD 1 _ACEOF - LIBS="-lkrb $LIBS" - fi - if test "$ac_cv_lib_krb_main" != yes; then - -echo "$as_me:12978: checking for main in -lkrb4" >&5 -echo $ECHO_N "checking for main in -lkrb4... $ECHO_C" >&6 -if test "${ac_cv_lib_krb4_main+set}" = set; then +echo "$as_me:12952: 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 - ac_check_lib_save_LIBS=$LIBS -LIBS="-lkrb4 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 12986 "configure" + + cat >conftest.$ac_ext <<_ACEOF +#line 12959 "configure" #include "confdefs.h" +#include + #ifdef F77_DUMMY_MAIN # ifdef __cplusplus extern "C" @@ -12995,71 +12970,54 @@ int main () { -main (); + struct passwd p; p.pw_expire = 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13004: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:12979: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13007: \$? = $ac_status" >&5 + echo "$as_me:12982: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13010: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:12985: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13013: \$? = $ac_status" >&5 + echo "$as_me:12988: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_krb4_main=yes + ac_cv_have_pw_expire_in_struct_passwd="yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_krb4_main=no + ac_cv_have_pw_expire_in_struct_passwd="no" + fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f conftest.$ac_objext conftest.$ac_ext + fi -echo "$as_me:13024: result: $ac_cv_lib_krb4_main" >&5 -echo "${ECHO_T}$ac_cv_lib_krb4_main" >&6 -if test $ac_cv_lib_krb4_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBKRB4 1 +echo "$as_me:13000: 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 <<\_ACEOF +#define HAVE_PW_EXPIRE_IN_PASSWD 1 _ACEOF - LIBS="-lkrb4 $LIBS" - fi - if test "$ac_cv_lib_krb4_main" != yes; then - { echo "$as_me:13036: WARNING: Cannot find libkrb nor libkrb4, build may fail" >&5 -echo "$as_me: WARNING: Cannot find libkrb nor libkrb4, build may fail" >&2;} - else - KLIBS="-lkrb4" - fi - else - KLIBS="-lkrb" - fi - -echo "$as_me:13045: checking for des_cbc_encrypt in -ldes" >&5 -echo $ECHO_N "checking for des_cbc_encrypt in -ldes... $ECHO_C" >&6 -if test "${ac_cv_lib_des_des_cbc_encrypt+set}" = set; then +echo "$as_me:13009: 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 - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldes $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 13053 "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 des_cbc_encrypt (); + cat >conftest.$ac_ext <<_ACEOF +#line 13016 "configure" +#include "confdefs.h" + +#include + #ifdef F77_DUMMY_MAIN # ifdef __cplusplus extern "C" @@ -13069,63 +13027,52 @@ int main () { -des_cbc_encrypt (); + struct passwd p; p.pw_change = 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13078: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:13036: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13081: \$? = $ac_status" >&5 + echo "$as_me:13039: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13084: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:13042: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13087: \$? = $ac_status" >&5 + echo "$as_me:13045: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_des_des_cbc_encrypt=yes + ac_cv_have_pw_change_in_struct_passwd="yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_des_des_cbc_encrypt=no + ac_cv_have_pw_change_in_struct_passwd="no" + fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f conftest.$ac_objext conftest.$ac_ext + fi -echo "$as_me:13098: result: $ac_cv_lib_des_des_cbc_encrypt" >&5 -echo "${ECHO_T}$ac_cv_lib_des_des_cbc_encrypt" >&6 -if test $ac_cv_lib_des_des_cbc_encrypt = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBDES 1 +echo "$as_me:13057: 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 <<\_ACEOF +#define HAVE_PW_CHANGE_IN_PASSWD 1 _ACEOF - LIBS="-ldes $LIBS" - fi - if test "$ac_cv_lib_des_des_cbc_encrypt" != yes; then - -echo "$as_me:13111: checking for des_cbc_encrypt in -ldes425" >&5 -echo $ECHO_N "checking for des_cbc_encrypt in -ldes425... $ECHO_C" >&6 -if test "${ac_cv_lib_des425_des_cbc_encrypt+set}" = set; then +echo "$as_me:13066: 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 - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldes425 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 13119 "configure" + + cat >conftest.$ac_ext <<_ACEOF +#line 13073 "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 des_cbc_encrypt (); #ifdef F77_DUMMY_MAIN # ifdef __cplusplus extern "C" @@ -13135,71 +13082,54 @@ int main () { -des_cbc_encrypt (); + extern char *__progname; printf("%s", __progname); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13144: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13091: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13147: \$? = $ac_status" >&5 + echo "$as_me:13094: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13150: \"$ac_try\"") >&5 + { (eval echo "$as_me:13097: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13153: \$? = $ac_status" >&5 + echo "$as_me:13100: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_des425_des_cbc_encrypt=yes + ac_cv_libc_defines___progname="yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_des425_des_cbc_encrypt=no + ac_cv_libc_defines___progname="no" + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + fi -echo "$as_me:13164: result: $ac_cv_lib_des425_des_cbc_encrypt" >&5 -echo "${ECHO_T}$ac_cv_lib_des425_des_cbc_encrypt" >&6 -if test $ac_cv_lib_des425_des_cbc_encrypt = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBDES425 1 +echo "$as_me:13112: 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 <<\_ACEOF +#define HAVE___PROGNAME 1 _ACEOF - LIBS="-ldes425 $LIBS" - fi - if test "$ac_cv_lib_des425_des_cbc_encrypt" != yes; then - { echo "$as_me:13176: WARNING: Cannot find libdes nor libdes425, build may fail" >&5 -echo "$as_me: WARNING: Cannot find libdes nor libdes425, build may fail" >&2;} - else - KLIBS="-ldes425" - fi - else - KLIBS="-ldes" - fi - -echo "$as_me:13185: checking for dn_expand in -lresolv" >&5 -echo $ECHO_N "checking for dn_expand in -lresolv... $ECHO_C" >&6 -if test "${ac_cv_lib_resolv_dn_expand+set}" = set; then +echo "$as_me:13121: 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 - ac_check_lib_save_LIBS=$LIBS -LIBS="-lresolv $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 13193 "configure" + + cat >conftest.$ac_ext <<_ACEOF +#line 13128 "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 dn_expand (); +#include + #ifdef F77_DUMMY_MAIN # ifdef __cplusplus extern "C" @@ -13209,846 +13139,904 @@ int main () { -dn_expand (); + extern int optreset; optreset = 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13218: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13148: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13221: \$? = $ac_status" >&5 + echo "$as_me:13151: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13224: \"$ac_try\"") >&5 + { (eval echo "$as_me:13154: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13227: \$? = $ac_status" >&5 + echo "$as_me:13157: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_resolv_dn_expand=yes + ac_cv_have_getopt_optreset="yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_resolv_dn_expand=no + ac_cv_have_getopt_optreset="no" + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:13238: result: $ac_cv_lib_resolv_dn_expand" >&5 -echo "${ECHO_T}$ac_cv_lib_resolv_dn_expand" >&6 -if test $ac_cv_lib_resolv_dn_expand = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBRESOLV 1 -_ACEOF - - LIBS="-lresolv $LIBS" fi - - KRB4=yes - KRB4_MSG="yes" - cat >>confdefs.h <<\_ACEOF -#define KRB4 1 -_ACEOF - - fi - -fi; - -# Check whether user wants AFS support -AFS_MSG="no" - -# Check whether --with-afs or --without-afs was given. -if test "${with_afs+set}" = set; then - withval="$with_afs" - - if test "x$withval" != "xno" ; then - - if test "x$withval" != "xyes" ; then - CPPFLAGS="$CPPFLAGS -I${withval}/include" - LDFLAGS="$LDFLAGS -L${withval}/lib" - fi - - if test -z "$KRB4" ; then - { echo "$as_me:13274: WARNING: AFS requires Kerberos IV support, build may fail" >&5 -echo "$as_me: WARNING: AFS requires Kerberos IV support, build may fail" >&2;} - fi - - LIBS="-lkafs $LIBS" - if test ! -z "$AFS_LIBS" ; then - LIBS="$LIBS $AFS_LIBS" - fi - cat >>confdefs.h <<\_ACEOF -#define AFS 1 +echo "$as_me:13169: 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 <<\_ACEOF +#define HAVE_GETOPT_OPTRESET 1 _ACEOF - AFS_MSG="yes" - fi - -fi; -LIBS="$LIBS $KLIBS" - -# Looking for programs, paths and files - -# Check whether --with-rsh or --without-rsh was given. -if test "${with_rsh+set}" = set; then - withval="$with_rsh" - - if test "x$withval" != "$no" ; then - rsh_path=$withval - fi - -else - - # Extract the first word of "rsh", so it can be a program name with args. -set dummy rsh; ac_word=$2 -echo "$as_me:13306: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_rsh_path+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $rsh_path in - [\\/]* | ?:[\\/]*) - ac_cv_path_rsh_path="$rsh_path" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_rsh_path="$ac_dir/$ac_word" - echo "$as_me:13323: found $ac_dir/$ac_word" >&5 - break -fi -done - - ;; -esac fi -rsh_path=$ac_cv_path_rsh_path -if test -n "$rsh_path"; then - echo "$as_me:13334: result: $rsh_path" >&5 -echo "${ECHO_T}$rsh_path" >&6 +echo "$as_me:13178: 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 - echo "$as_me:13337: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi; - -# Check whether --with-xauth or --without-xauth was given. -if test "${with_xauth+set}" = set; then - withval="$with_xauth" - - if test "x$withval" != "xno" ; then - xauth_path=$withval - fi -else + cat >conftest.$ac_ext <<_ACEOF +#line 13185 "configure" +#include "confdefs.h" - # Extract the first word of "xauth", so it can be a program name with args. -set dummy xauth; ac_word=$2 -echo "$as_me:13355: 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 -else - case $xauth_path in - [\\/]* | ?:[\\/]*) - ac_cv_path_xauth_path="$xauth_path" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH:/usr/X/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/openwin/bin" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - 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:13372: found $ac_dir/$ac_word" >&5 - break -fi -done +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ + extern const char *const sys_errlist[]; printf("%s", sys_errlist[0]); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:13203: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:13206: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:13209: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:13212: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_libc_defines_sys_errlist="yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + ac_cv_libc_defines_sys_errlist="no" - ;; -esac fi -xauth_path=$ac_cv_path_xauth_path +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -if test -n "$xauth_path"; then - echo "$as_me:13383: result: $xauth_path" >&5 -echo "${ECHO_T}$xauth_path" >&6 -else - echo "$as_me:13386: result: no" >&5 -echo "${ECHO_T}no" >&6 fi +echo "$as_me:13224: 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 <<\_ACEOF +#define HAVE_SYS_ERRLIST 1 +_ACEOF - if (test ! -z "$xauth_path" && test -x "/usr/openwin/bin/xauth") ; then - xauth_path="/usr/openwin/bin/xauth" - fi +fi -fi; +echo "$as_me:13233: 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 -if test -z "$xauth_path" ; then - XAUTH_PATH="undefined" + cat >conftest.$ac_ext <<_ACEOF +#line 13240 "configure" +#include "confdefs.h" -else - cat >>confdefs.h <<_ACEOF -#define XAUTH_PATH "$xauth_path" +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ + extern int sys_nerr; printf("%i", sys_nerr); + ; + return 0; +} _ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:13258: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:13261: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:13264: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:13267: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_libc_defines_sys_nerr="yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + ac_cv_libc_defines_sys_nerr="no" - XAUTH_PATH=$xauth_path +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -if test ! -z "$rsh_path" ; then - cat >>confdefs.h <<_ACEOF -#define RSH_PATH "$rsh_path" +echo "$as_me:13279: 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 <<\_ACEOF +#define HAVE_SYS_NERR 1 _ACEOF fi -# Check for mail directory (last resort if we cannot get it from headers) -if test ! -z "$MAIL" ; then - maildir=`dirname $MAIL` - cat >>confdefs.h <<_ACEOF -#define MAIL_DIRECTORY "$maildir" -_ACEOF +# Check whether user wants Kerberos support +SCARD_MSG="no" -fi +# Check whether --with-smartcard or --without-smartcard was given. +if test "${with_smartcard+set}" = set; then + withval="$with_smartcard" -if test -z "$no_dev_ptmx" ; then - echo "$as_me:13424: 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 + if test "x$withval" != "xno" ; then + if test "x$withval" != "xyes" ; then + CPPFLAGS="$CPPFLAGS -I${withval}" + LDFLAGS="$LDFLAGS -L${withval}" + if test ! -z "$need_dash_r" ; then + LDFLAGS="$LDFLAGS -R${withval}" + fi + if test ! -z "$blibpath" ; then + blibpath="$blibpath:${withval}" + fi + fi + +for ac_header in sectok.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:13311: 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 +fi +echo "$as_me:13316: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - test "$cross_compiling" = yes && - { { echo "$as_me:13430: 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 - ac_cv_file___dev_ptmx_=yes + # Is the header compilable? +echo "$as_me:13320: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line 13323 "configure" +#include "confdefs.h" +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:13329: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:13332: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:13335: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:13338: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes else - ac_cv_file___dev_ptmx_=no -fi + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no fi -echo "$as_me:13439: 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 +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:13347: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 - cat >>confdefs.h <<_ACEOF -#define HAVE_DEV_PTMX 1 +# Is the header present? +echo "$as_me:13351: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line 13354 "configure" +#include "confdefs.h" +#include <$ac_header> _ACEOF - - have_dev_ptmx=1 - +if { (eval echo "$as_me:13358: \"$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:13364: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes fi - +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_header_preproc=no fi -echo "$as_me:13452: 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 +rm -f conftest.err conftest.$ac_ext +echo "$as_me:13382: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:13388: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:13390: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:13393: WARNING: $ac_header: present but cannot be compiled." >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled." >&2;} + { echo "$as_me:13395: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:13397: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:13400: 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 - test "$cross_compiling" = yes && - { { echo "$as_me:13458: 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 - ac_cv_file___dev_ptc_=yes -else - ac_cv_file___dev_ptc_=no -fi + eval "$as_ac_Header=$ac_header_preproc" fi -echo "$as_me:13467: 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 +echo "$as_me:13407: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - cat >>confdefs.h <<_ACEOF -#define HAVE_DEV_PTS_AND_PTC 1 +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - have_dev_ptc=1 - fi -# Options from here on. Some of these are preset by platform above - -# Check for user-specified random device, otherwise check /dev/urandom - -# Check whether --with-random or --without-random was given. -if test "${with_random+set}" = set; then - withval="$with_random" - - if test "x$withval" != "xno" ; then - RANDOM_POOL="$withval"; - cat >>confdefs.h <<_ACEOF -#define RANDOM_POOL "$RANDOM_POOL" -_ACEOF - - fi +done -else + if test "$ac_cv_header_sectok_h" != yes; then + { { echo "$as_me:13421: error: Can't find sectok.h" >&5 +echo "$as_me: error: Can't find sectok.h" >&2;} + { (exit 1); exit 1; }; } + fi - # Check for random device - echo "$as_me:13498: checking for \"/dev/urandom\"" >&5 -echo $ECHO_N "checking for \"/dev/urandom\"... $ECHO_C" >&6 -if test "${ac_cv_file___dev_urandom_+set}" = set; then +echo "$as_me:13426: 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 else - test "$cross_compiling" = yes && - { { echo "$as_me:13504: 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/urandom""; then - ac_cv_file___dev_urandom_=yes + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsectok $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 13434 "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 sectok_open (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +sectok_open (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:13459: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:13462: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:13465: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:13468: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_sectok_sectok_open=yes else - ac_cv_file___dev_urandom_=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_sectok_sectok_open=no fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13513: result: $ac_cv_file___dev_urandom_" >&5 -echo "${ECHO_T}$ac_cv_file___dev_urandom_" >&6 -if test $ac_cv_file___dev_urandom_ = yes; then - - RANDOM_POOL="/dev/urandom"; - - cat >>confdefs.h <<_ACEOF -#define RANDOM_POOL "$RANDOM_POOL" +echo "$as_me:13479: 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 <<_ACEOF +#define HAVE_LIBSECTOK 1 _ACEOF -fi - -fi; - -# Check for PRNGD/EGD pool file + LIBS="-lsectok $LIBS" -# Check whether --with-prngd-port or --without-prngd-port was given. -if test "${with_prngd_port+set}" = set; then - withval="$with_prngd_port" +fi - if test ! -z "$withval" -a "x$withval" != "xno" ; then - PRNGD_PORT="$withval" - cat >>confdefs.h <<_ACEOF -#define PRNGD_PORT $PRNGD_PORT + if test "$ac_cv_lib_sectok_sectok_open" != yes; then + { { echo "$as_me:13491: error: Can't find libsectok" >&5 +echo "$as_me: error: Can't find libsectok" >&2;} + { (exit 1); exit 1; }; } + fi + cat >>confdefs.h <<\_ACEOF +#define SMARTCARD 1 _ACEOF + SCARD_MSG="yes" fi fi; -# Check for PRNGD/EGD pool file +# Check whether user wants Kerberos support +KRB4_MSG="no" -# Check whether --with-prngd-socket or --without-prngd-socket was given. -if test "${with_prngd_socket+set}" = set; then - withval="$with_prngd_socket" +# Check whether --with-kerberos4 or --without-kerberos4 was given. +if test "${with_kerberos4+set}" = set; then + withval="$with_kerberos4" if test "x$withval" != "xno" ; then - PRNGD_SOCKET="$withval" - cat >>confdefs.h <<_ACEOF -#define PRNGD_SOCKET "$PRNGD_SOCKET" -_ACEOF - - fi - -else - - # Check for existing socket only if we don't have a random device already - if test -z "$RANDOM_POOL" ; then - echo "$as_me:13561: 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 - if test -r $sock && $TEST_MINUS_S_SH -c "test -S $sock -o -p $sock" ; then - PRNGD_SOCKET="$sock" - cat >>confdefs.h <<_ACEOF -#define PRNGD_SOCKET "$PRNGD_SOCKET" -_ACEOF - - break; + if test "x$withval" != "xyes" ; then + CPPFLAGS="$CPPFLAGS -I${withval}/include" + LDFLAGS="$LDFLAGS -L${withval}/lib" + if test ! -z "$need_dash_r" ; then + LDFLAGS="$LDFLAGS -R${withval}/lib" + fi + if test ! -z "$blibpath" ; then + blibpath="$blibpath:${withval}/lib" fi - done - if test ! -z "$PRNGD_SOCKET" ; then - echo "$as_me:13575: result: $PRNGD_SOCKET" >&5 -echo "${ECHO_T}$PRNGD_SOCKET" >&6 else - echo "$as_me:13578: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + if test -d /usr/include/kerberosIV ; then + CPPFLAGS="$CPPFLAGS -I/usr/include/kerberosIV" + fi fi - fi - -fi; -# detect pathnames for entropy gathering commands, if we need them -INSTALL_SSH_PRNG_CMDS="" -rm -f prng_commands -if (test -z "$RANDOM_POOL" && test -z "$PRNGD") ; then - # Use these commands to collect entropy - - # Extract the first word of "ls", so it can be a program name with args. -set dummy ls; ac_word=$2 -echo "$as_me:13593: 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 +for ac_header in krb.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:13531: 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 +fi +echo "$as_me:13536: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - case $PROG_LS in - [\\/]* | ?:[\\/]*) - ac_cv_path_PROG_LS="$PROG_LS" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - 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:13610: found $ac_dir/$ac_word" >&5 - break + # Is the header compilable? +echo "$as_me:13540: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line 13543 "configure" +#include "confdefs.h" +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:13549: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:13552: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:13555: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:13558: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_header_compiler=no fi -done +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:13567: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 - ;; -esac +# Is the header present? +echo "$as_me:13571: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line 13574 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:13578: \"$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:13584: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes fi -PROG_LS=$ac_cv_path_PROG_LS - -if test -n "$PROG_LS"; then - echo "$as_me:13621: result: $PROG_LS" >&5 -echo "${ECHO_T}$PROG_LS" >&6 +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes else - echo "$as_me:13624: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_header_preproc=no fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:13602: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 - if test -z "$PROG_LS" ; then - PROG_LS="undef" - 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:13634: 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 +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:13608: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:13610: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:13613: WARNING: $ac_header: present but cannot be compiled." >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled." >&2;} + { echo "$as_me:13615: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:13617: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; +esac +echo "$as_me:13620: 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 - case $PROG_NETSTAT in - [\\/]* | ?:[\\/]*) - ac_cv_path_PROG_NETSTAT="$PROG_NETSTAT" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - 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:13651: found $ac_dir/$ac_word" >&5 - break + eval "$as_ac_Header=$ac_header_preproc" fi -done +echo "$as_me:13627: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - ;; -esac fi -PROG_NETSTAT=$ac_cv_path_PROG_NETSTAT +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF -if test -n "$PROG_NETSTAT"; then - echo "$as_me:13662: result: $PROG_NETSTAT" >&5 -echo "${ECHO_T}$PROG_NETSTAT" >&6 -else - echo "$as_me:13665: result: no" >&5 -echo "${ECHO_T}no" >&6 fi - if test -z "$PROG_NETSTAT" ; then - PROG_NETSTAT="undef" - fi +done - # Extract the first word of "arp", so it can be a program name with args. -set dummy arp; ac_word=$2 -echo "$as_me:13675: 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 + if test "$ac_cv_header_krb_h" != yes; then + { echo "$as_me:13641: WARNING: Cannot find krb.h, build may fail" >&5 +echo "$as_me: WARNING: Cannot find krb.h, build may fail" >&2;} + fi + +echo "$as_me:13645: checking for main in -lkrb" >&5 +echo $ECHO_N "checking for main in -lkrb... $ECHO_C" >&6 +if test "${ac_cv_lib_krb_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $PROG_ARP in - [\\/]* | ?:[\\/]*) - ac_cv_path_PROG_ARP="$PROG_ARP" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - 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:13692: found $ac_dir/$ac_word" >&5 - break + ac_check_lib_save_LIBS=$LIBS +LIBS="-lkrb $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 13653 "configure" +#include "confdefs.h" + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +main (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:13671: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:13674: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:13677: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:13680: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_krb_main=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_krb_main=no fi -done - - ;; -esac +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -PROG_ARP=$ac_cv_path_PROG_ARP +echo "$as_me:13691: result: $ac_cv_lib_krb_main" >&5 +echo "${ECHO_T}$ac_cv_lib_krb_main" >&6 +if test $ac_cv_lib_krb_main = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBKRB 1 +_ACEOF + + LIBS="-lkrb $LIBS" -if test -n "$PROG_ARP"; then - echo "$as_me:13703: result: $PROG_ARP" >&5 -echo "${ECHO_T}$PROG_ARP" >&6 -else - echo "$as_me:13706: result: no" >&5 -echo "${ECHO_T}no" >&6 fi - if test -z "$PROG_ARP" ; then - PROG_ARP="undef" - fi + if test "$ac_cv_lib_krb_main" != yes; then - # Extract the first word of "ifconfig", so it can be a program name with args. -set dummy ifconfig; ac_word=$2 -echo "$as_me:13716: 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 "$as_me:13704: checking for main in -lkrb4" >&5 +echo $ECHO_N "checking for main in -lkrb4... $ECHO_C" >&6 +if test "${ac_cv_lib_krb4_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $PROG_IFCONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PROG_IFCONFIG="$PROG_IFCONFIG" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - 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:13733: found $ac_dir/$ac_word" >&5 - break -fi -done + ac_check_lib_save_LIBS=$LIBS +LIBS="-lkrb4 $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 13712 "configure" +#include "confdefs.h" - ;; -esac +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +main (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:13730: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:13733: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:13736: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:13739: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_krb4_main=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_krb4_main=no fi -PROG_IFCONFIG=$ac_cv_path_PROG_IFCONFIG +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:13750: result: $ac_cv_lib_krb4_main" >&5 +echo "${ECHO_T}$ac_cv_lib_krb4_main" >&6 +if test $ac_cv_lib_krb4_main = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBKRB4 1 +_ACEOF + + LIBS="-lkrb4 $LIBS" -if test -n "$PROG_IFCONFIG"; then - echo "$as_me:13744: result: $PROG_IFCONFIG" >&5 -echo "${ECHO_T}$PROG_IFCONFIG" >&6 -else - echo "$as_me:13747: result: no" >&5 -echo "${ECHO_T}no" >&6 fi - if test -z "$PROG_IFCONFIG" ; then - PROG_IFCONFIG="undef" - fi + if test "$ac_cv_lib_krb4_main" != yes; then + { echo "$as_me:13762: WARNING: Cannot find libkrb nor libkrb4, build may fail" >&5 +echo "$as_me: WARNING: Cannot find libkrb nor libkrb4, build may fail" >&2;} + else + KLIBS="-lkrb4" + fi + else + KLIBS="-lkrb" + 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:13757: 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 "$as_me:13771: checking for des_cbc_encrypt in -ldes" >&5 +echo $ECHO_N "checking for des_cbc_encrypt in -ldes... $ECHO_C" >&6 +if test "${ac_cv_lib_des_des_cbc_encrypt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $PROG_JSTAT in - [\\/]* | ?:[\\/]*) - ac_cv_path_PROG_JSTAT="$PROG_JSTAT" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - 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:13774: found $ac_dir/$ac_word" >&5 - break -fi -done + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldes $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 13779 "configure" +#include "confdefs.h" - ;; -esac +/* 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 des_cbc_encrypt (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +des_cbc_encrypt (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:13804: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:13807: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:13810: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:13813: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_des_des_cbc_encrypt=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_des_des_cbc_encrypt=no fi -PROG_JSTAT=$ac_cv_path_PROG_JSTAT +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:13824: result: $ac_cv_lib_des_des_cbc_encrypt" >&5 +echo "${ECHO_T}$ac_cv_lib_des_des_cbc_encrypt" >&6 +if test $ac_cv_lib_des_des_cbc_encrypt = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBDES 1 +_ACEOF + + LIBS="-ldes $LIBS" -if test -n "$PROG_JSTAT"; then - echo "$as_me:13785: result: $PROG_JSTAT" >&5 -echo "${ECHO_T}$PROG_JSTAT" >&6 -else - echo "$as_me:13788: result: no" >&5 -echo "${ECHO_T}no" >&6 fi - if test -z "$PROG_JSTAT" ; then - PROG_JSTAT="undef" - fi + if test "$ac_cv_lib_des_des_cbc_encrypt" != yes; then - # Extract the first word of "ps", so it can be a program name with args. -set dummy ps; ac_word=$2 -echo "$as_me:13798: 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 "$as_me:13837: checking for des_cbc_encrypt in -ldes425" >&5 +echo $ECHO_N "checking for des_cbc_encrypt in -ldes425... $ECHO_C" >&6 +if test "${ac_cv_lib_des425_des_cbc_encrypt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $PROG_PS in - [\\/]* | ?:[\\/]*) - ac_cv_path_PROG_PS="$PROG_PS" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - 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:13815: found $ac_dir/$ac_word" >&5 - break + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldes425 $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 13845 "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 des_cbc_encrypt (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +des_cbc_encrypt (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:13870: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:13873: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:13876: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:13879: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_des425_des_cbc_encrypt=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_des425_des_cbc_encrypt=no fi -done +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:13890: result: $ac_cv_lib_des425_des_cbc_encrypt" >&5 +echo "${ECHO_T}$ac_cv_lib_des425_des_cbc_encrypt" >&6 +if test $ac_cv_lib_des425_des_cbc_encrypt = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBDES425 1 +_ACEOF - ;; -esac -fi -PROG_PS=$ac_cv_path_PROG_PS + LIBS="-ldes425 $LIBS" -if test -n "$PROG_PS"; then - echo "$as_me:13826: result: $PROG_PS" >&5 -echo "${ECHO_T}$PROG_PS" >&6 -else - echo "$as_me:13829: result: no" >&5 -echo "${ECHO_T}no" >&6 fi - if test -z "$PROG_PS" ; then - PROG_PS="undef" - fi + if test "$ac_cv_lib_des425_des_cbc_encrypt" != yes; then + { echo "$as_me:13902: WARNING: Cannot find libdes nor libdes425, build may fail" >&5 +echo "$as_me: WARNING: Cannot find libdes nor libdes425, build may fail" >&2;} + else + KLIBS="-ldes425" + fi + else + KLIBS="-ldes" + 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:13839: 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 "$as_me:13911: checking for dn_expand in -lresolv" >&5 +echo $ECHO_N "checking for dn_expand in -lresolv... $ECHO_C" >&6 +if test "${ac_cv_lib_resolv_dn_expand+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $PROG_SAR in - [\\/]* | ?:[\\/]*) - ac_cv_path_PROG_SAR="$PROG_SAR" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - 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:13856: found $ac_dir/$ac_word" >&5 - break -fi -done - - ;; -esac -fi -PROG_SAR=$ac_cv_path_PROG_SAR + ac_check_lib_save_LIBS=$LIBS +LIBS="-lresolv $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 13919 "configure" +#include "confdefs.h" -if test -n "$PROG_SAR"; then - echo "$as_me:13867: result: $PROG_SAR" >&5 -echo "${ECHO_T}$PROG_SAR" >&6 +/* 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 dn_expand (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +dn_expand (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:13944: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:13947: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:13950: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:13953: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_resolv_dn_expand=yes else - echo "$as_me:13870: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_resolv_dn_expand=no fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:13964: result: $ac_cv_lib_resolv_dn_expand" >&5 +echo "${ECHO_T}$ac_cv_lib_resolv_dn_expand" >&6 +if test $ac_cv_lib_resolv_dn_expand = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBRESOLV 1 +_ACEOF - if test -z "$PROG_SAR" ; then - PROG_SAR="undef" - fi + LIBS="-lresolv $LIBS" - # Extract the first word of "w", so it can be a program name with args. -set dummy w; ac_word=$2 -echo "$as_me:13880: 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 -else - case $PROG_W in - [\\/]* | ?:[\\/]*) - ac_cv_path_PROG_W="$PROG_W" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - 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:13897: found $ac_dir/$ac_word" >&5 - break fi -done - ;; -esac -fi -PROG_W=$ac_cv_path_PROG_W + KRB4=yes + KRB4_MSG="yes" + cat >>confdefs.h <<\_ACEOF +#define KRB4 1 +_ACEOF -if test -n "$PROG_W"; then - echo "$as_me:13908: result: $PROG_W" >&5 -echo "${ECHO_T}$PROG_W" >&6 -else - echo "$as_me:13911: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi + fi - if test -z "$PROG_W" ; then - PROG_W="undef" - fi +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:13921: 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 -else - case $PROG_WHO in - [\\/]* | ?:[\\/]*) - ac_cv_path_PROG_WHO="$PROG_WHO" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - 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:13938: found $ac_dir/$ac_word" >&5 - break -fi -done +# Check whether user wants AFS support +AFS_MSG="no" - ;; -esac -fi -PROG_WHO=$ac_cv_path_PROG_WHO +# Check whether --with-afs or --without-afs was given. +if test "${with_afs+set}" = set; then + withval="$with_afs" -if test -n "$PROG_WHO"; then - echo "$as_me:13949: result: $PROG_WHO" >&5 -echo "${ECHO_T}$PROG_WHO" >&6 -else - echo "$as_me:13952: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi + if test "x$withval" != "xno" ; then - if test -z "$PROG_WHO" ; then - PROG_WHO="undef" - fi + if test "x$withval" != "xyes" ; then + CPPFLAGS="$CPPFLAGS -I${withval}/include" + LDFLAGS="$LDFLAGS -L${withval}/lib" + 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:13962: 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 -else - case $PROG_LAST in - [\\/]* | ?:[\\/]*) - ac_cv_path_PROG_LAST="$PROG_LAST" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - 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:13979: found $ac_dir/$ac_word" >&5 - break -fi -done + if test -z "$KRB4" ; then + { echo "$as_me:14000: WARNING: AFS requires Kerberos IV support, build may fail" >&5 +echo "$as_me: WARNING: AFS requires Kerberos IV support, build may fail" >&2;} + fi - ;; -esac -fi -PROG_LAST=$ac_cv_path_PROG_LAST + LIBS="-lkafs $LIBS" + if test ! -z "$AFS_LIBS" ; then + LIBS="$LIBS $AFS_LIBS" + fi + cat >>confdefs.h <<\_ACEOF +#define AFS 1 +_ACEOF -if test -n "$PROG_LAST"; then - echo "$as_me:13990: result: $PROG_LAST" >&5 -echo "${ECHO_T}$PROG_LAST" >&6 -else - echo "$as_me:13993: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi + AFS_MSG="yes" + fi - if test -z "$PROG_LAST" ; then - PROG_LAST="undef" - fi +fi; +LIBS="$LIBS $KLIBS" - # Extract the first word of "lastlog", so it can be a program name with args. -set dummy lastlog; ac_word=$2 -echo "$as_me:14003: 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 -else - case $PROG_LASTLOG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PROG_LASTLOG="$PROG_LASTLOG" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - 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:14020: found $ac_dir/$ac_word" >&5 - break -fi -done +# Looking for programs, paths and files - ;; -esac -fi -PROG_LASTLOG=$ac_cv_path_PROG_LASTLOG +# Check whether --with-rsh or --without-rsh was given. +if test "${with_rsh+set}" = set; then + withval="$with_rsh" -if test -n "$PROG_LASTLOG"; then - echo "$as_me:14031: result: $PROG_LASTLOG" >&5 -echo "${ECHO_T}$PROG_LASTLOG" >&6 -else - echo "$as_me:14034: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi + if test "x$withval" != "$no" ; then + rsh_path=$withval + fi - if test -z "$PROG_LASTLOG" ; then - PROG_LASTLOG="undef" - fi +else - # Extract the first word of "df", so it can be a program name with args. -set dummy df; ac_word=$2 -echo "$as_me:14044: checking for $ac_word" >&5 + # Extract the first word of "rsh", so it can be a program name with args. +set dummy rsh; ac_word=$2 +echo "$as_me:14032: 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 +if test "${ac_cv_path_rsh_path+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $PROG_DF in + case $rsh_path in [\\/]* | ?:[\\/]*) - ac_cv_path_PROG_DF="$PROG_DF" # Let the user override the test with a path. + ac_cv_path_rsh_path="$rsh_path" # Let the user override the test with a path. ;; *) ac_save_IFS=$IFS; IFS=$ac_path_separator @@ -14057,8 +14045,8 @@ IFS=$ac_save_IFS 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:14061: found $ac_dir/$ac_word" >&5 + ac_cv_path_rsh_path="$ac_dir/$ac_word" + echo "$as_me:14049: found $ac_dir/$ac_word" >&5 break fi done @@ -14066,81 +14054,48 @@ ;; esac fi -PROG_DF=$ac_cv_path_PROG_DF +rsh_path=$ac_cv_path_rsh_path -if test -n "$PROG_DF"; then - echo "$as_me:14072: result: $PROG_DF" >&5 -echo "${ECHO_T}$PROG_DF" >&6 +if test -n "$rsh_path"; then + echo "$as_me:14060: result: $rsh_path" >&5 +echo "${ECHO_T}$rsh_path" >&6 else - echo "$as_me:14075: result: no" >&5 + echo "$as_me:14063: result: no" >&5 echo "${ECHO_T}no" >&6 fi - if test -z "$PROG_DF" ; then - PROG_DF="undef" - fi +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:14085: 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 -else - case $PROG_VMSTAT in - [\\/]* | ?:[\\/]*) - ac_cv_path_PROG_VMSTAT="$PROG_VMSTAT" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - 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:14102: found $ac_dir/$ac_word" >&5 - break -fi -done +# Check whether --with-xauth or --without-xauth was given. +if test "${with_xauth+set}" = set; then + withval="$with_xauth" - ;; -esac -fi -PROG_VMSTAT=$ac_cv_path_PROG_VMSTAT + if test "x$withval" != "xno" ; then + xauth_path=$withval + fi -if test -n "$PROG_VMSTAT"; then - echo "$as_me:14113: result: $PROG_VMSTAT" >&5 -echo "${ECHO_T}$PROG_VMSTAT" >&6 else - echo "$as_me:14116: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - if test -z "$PROG_VMSTAT" ; then - PROG_VMSTAT="undef" - 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:14126: checking for $ac_word" >&5 + # Extract the first word of "xauth", so it can be a program name with args. +set dummy xauth; ac_word=$2 +echo "$as_me:14081: 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 +if test "${ac_cv_path_xauth_path+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $PROG_UPTIME in + case $xauth_path in [\\/]* | ?:[\\/]*) - ac_cv_path_PROG_UPTIME="$PROG_UPTIME" # Let the user override the test with a path. + ac_cv_path_xauth_path="$xauth_path" # Let the user override the test with a path. ;; *) ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" +ac_dummy="$PATH:/usr/X/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/openwin/bin" for ac_dir in $ac_dummy; do IFS=$ac_save_IFS 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:14143: found $ac_dir/$ac_word" >&5 + ac_cv_path_xauth_path="$ac_dir/$ac_word" + echo "$as_me:14098: found $ac_dir/$ac_word" >&5 break fi done @@ -14148,105 +14103,107 @@ ;; esac fi -PROG_UPTIME=$ac_cv_path_PROG_UPTIME +xauth_path=$ac_cv_path_xauth_path -if test -n "$PROG_UPTIME"; then - echo "$as_me:14154: result: $PROG_UPTIME" >&5 -echo "${ECHO_T}$PROG_UPTIME" >&6 +if test -n "$xauth_path"; then + echo "$as_me:14109: result: $xauth_path" >&5 +echo "${ECHO_T}$xauth_path" >&6 else - echo "$as_me:14157: result: no" >&5 + echo "$as_me:14112: result: no" >&5 echo "${ECHO_T}no" >&6 fi - if test -z "$PROG_UPTIME" ; then - PROG_UPTIME="undef" - fi + if (test ! -z "$xauth_path" && test -x "/usr/openwin/bin/xauth") ; then + xauth_path="/usr/openwin/bin/xauth" + fi + +fi; + +if test -z "$xauth_path" ; then + XAUTH_PATH="undefined" - # Extract the first word of "ipcs", so it can be a program name with args. -set dummy ipcs; ac_word=$2 -echo "$as_me:14167: 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 else - case $PROG_IPCS in - [\\/]* | ?:[\\/]*) - ac_cv_path_PROG_IPCS="$PROG_IPCS" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - 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:14184: found $ac_dir/$ac_word" >&5 - break -fi -done + cat >>confdefs.h <<_ACEOF +#define XAUTH_PATH "$xauth_path" +_ACEOF + + XAUTH_PATH=$xauth_path - ;; -esac fi -PROG_IPCS=$ac_cv_path_PROG_IPCS +if test ! -z "$rsh_path" ; then + cat >>confdefs.h <<_ACEOF +#define RSH_PATH "$rsh_path" +_ACEOF -if test -n "$PROG_IPCS"; then - echo "$as_me:14195: result: $PROG_IPCS" >&5 -echo "${ECHO_T}$PROG_IPCS" >&6 -else - echo "$as_me:14198: result: no" >&5 -echo "${ECHO_T}no" >&6 fi - if test -z "$PROG_IPCS" ; then - PROG_IPCS="undef" - fi +# Check for mail directory (last resort if we cannot get it from headers) +if test ! -z "$MAIL" ; then + maildir=`dirname $MAIL` + cat >>confdefs.h <<_ACEOF +#define MAIL_DIRECTORY "$maildir" +_ACEOF - # Extract the first word of "tail", so it can be a program name with args. -set dummy tail; ac_word=$2 -echo "$as_me:14208: 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 +fi + +if test -z "$no_dev_ptmx" ; then + echo "$as_me:14150: 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 - case $PROG_TAIL in - [\\/]* | ?:[\\/]*) - ac_cv_path_PROG_TAIL="$PROG_TAIL" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - 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:14225: found $ac_dir/$ac_word" >&5 - break + test "$cross_compiling" = yes && + { { echo "$as_me:14156: 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 + ac_cv_file___dev_ptmx_=yes +else + ac_cv_file___dev_ptmx_=no fi -done +fi +echo "$as_me:14165: 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 + + cat >>confdefs.h <<_ACEOF +#define HAVE_DEV_PTMX 1 +_ACEOF + + have_dev_ptmx=1 - ;; -esac fi -PROG_TAIL=$ac_cv_path_PROG_TAIL -if test -n "$PROG_TAIL"; then - echo "$as_me:14236: result: $PROG_TAIL" >&5 -echo "${ECHO_T}$PROG_TAIL" >&6 +fi +echo "$as_me:14178: 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 - echo "$as_me:14239: result: no" >&5 -echo "${ECHO_T}no" >&6 + test "$cross_compiling" = yes && + { { echo "$as_me:14184: 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 + ac_cv_file___dev_ptc_=yes +else + ac_cv_file___dev_ptc_=no +fi fi +echo "$as_me:14193: 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 - if test -z "$PROG_TAIL" ; then - PROG_TAIL="undef" - fi + cat >>confdefs.h <<_ACEOF +#define HAVE_DEV_PTS_AND_PTC 1 +_ACEOF + + have_dev_ptc=1 - INSTALL_SSH_PRNG_CMDS="yes" fi +# Options from here on. Some of these are preset by platform above + # Check whether --with-mantype or --without-mantype was given. if test "${with_mantype+set}" = set; then withval="$with_mantype" @@ -14256,7 +14213,7 @@ MANTYPE=$withval ;; *) - { { echo "$as_me:14259: error: invalid man type: $withval" >&5 + { { echo "$as_me:14216: error: invalid man type: $withval" >&5 echo "$as_me: error: invalid man type: $withval" >&2;} { (exit 1); exit 1; }; } ;; @@ -14268,7 +14225,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:14271: checking for $ac_word" >&5 +echo "$as_me:14228: 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 @@ -14285,7 +14242,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_NROFF="$ac_dir/$ac_word" - echo "$as_me:14288: found $ac_dir/$ac_word" >&5 + echo "$as_me:14245: found $ac_dir/$ac_word" >&5 break fi done @@ -14296,10 +14253,10 @@ NROFF=$ac_cv_path_NROFF if test -n "$NROFF"; then - echo "$as_me:14299: result: $NROFF" >&5 + echo "$as_me:14256: result: $NROFF" >&5 echo "${ECHO_T}$NROFF" >&6 else - echo "$as_me:14302: result: no" >&5 + echo "$as_me:14259: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -14356,10 +14313,10 @@ fi; if test -z "$disable_shadow" ; then - echo "$as_me:14359: checking if the systems has expire shadow information" >&5 + echo "$as_me:14316: 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 14362 "configure" +#line 14319 "configure" #include "confdefs.h" #include @@ -14381,16 +14338,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14384: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14341: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14387: \$? = $ac_status" >&5 + echo "$as_me:14344: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14390: \"$ac_try\"") >&5 + { (eval echo "$as_me:14347: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14393: \$? = $ac_status" >&5 + echo "$as_me:14350: \$? = $ac_status" >&5 (exit $ac_status); }; }; then sp_expire_available=yes else @@ -14401,14 +14358,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "x$sp_expire_available" = "xyes" ; then - echo "$as_me:14404: result: yes" >&5 + echo "$as_me:14361: result: yes" >&5 echo "${ECHO_T}yes" >&6 cat >>confdefs.h <<\_ACEOF #define HAS_SHADOW_EXPIRE 1 _ACEOF else - echo "$as_me:14411: result: no" >&5 + echo "$as_me:14368: result: no" >&5 echo "${ECHO_T}no" >&6 fi fi @@ -14457,7 +14414,7 @@ else cat >conftest.$ac_ext <<_ACEOF -#line 14460 "configure" +#line 14417 "configure" #include "confdefs.h" /* find out what STDPATH is */ @@ -14490,15 +14447,15 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:14493: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14450: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14496: \$? = $ac_status" >&5 + echo "$as_me:14453: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:14498: \"$ac_try\"") >&5 + { (eval echo "$as_me:14455: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14501: \$? = $ac_status" >&5 + echo "$as_me:14458: \$? = $ac_status" >&5 (exit $ac_status); }; }; then user_path=`cat conftest.stdpath` else @@ -14522,7 +14479,7 @@ echo $user_path | grep "^$t_bindir" > /dev/null 2>&1 if test $? -ne 0 ; then user_path=$user_path:$t_bindir - echo "$as_me:14525: result: Adding $t_bindir to USER_PATH so scp will work" >&5 + echo "$as_me:14482: 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 @@ -14549,7 +14506,7 @@ fi; -echo "$as_me:14552: checking if we need to convert IPv4 in IPv6-mapped addresses" >&5 +echo "$as_me:14509: 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" @@ -14558,7 +14515,7 @@ withval="$with_4in6" if test "x$withval" != "xno" ; then - echo "$as_me:14561: result: yes" >&5 + echo "$as_me:14518: result: yes" >&5 echo "${ECHO_T}yes" >&6 cat >>confdefs.h <<\_ACEOF #define IPV4_IN_IPV6 1 @@ -14566,14 +14523,14 @@ IPV4_IN6_HACK_MSG="yes" else - echo "$as_me:14569: result: no" >&5 + echo "$as_me:14526: result: no" >&5 echo "${ECHO_T}no" >&6 fi else if test "x$inet6_default_4in6" = "xyes"; then - echo "$as_me:14576: result: yes (default)" >&5 + echo "$as_me:14533: result: yes (default)" >&5 echo "${ECHO_T}yes (default)" >&6 cat >>confdefs.h <<\_ACEOF #define IPV4_IN_IPV6 1 @@ -14581,13 +14538,14 @@ IPV4_IN6_HACK_MSG="yes" else - echo "$as_me:14584: result: no (default)" >&5 + echo "$as_me:14541: result: no (default)" >&5 echo "${ECHO_T}no (default)" >&6 fi fi; # Whether to enable BSD auth support +BSD_AUTH_MSG=no # Check whether --with-bsd-auth or --without-bsd-auth was given. if test "${with_bsd_auth+set}" = set; then @@ -14598,29 +14556,29 @@ #define BSD_AUTH 1 _ACEOF - bsd_auth=yes + BSD_AUTH_MSG=yes fi fi; -echo "$as_me:14606: checking whether to install ssh as suid root" >&5 +echo "$as_me:14564: checking whether to install ssh as suid root" >&5 echo $ECHO_N "checking whether to install ssh as suid root... $ECHO_C" >&6 # Check whether --enable-suid-ssh or --disable-suid-ssh was given. if test "${enable_suid_ssh+set}" = set; then enableval="$enable_suid_ssh" case "$enableval" in no) - echo "$as_me:14613: result: no" >&5 + echo "$as_me:14571: result: no" >&5 echo "${ECHO_T}no" >&6 SSHMODE=0711 ;; - *) echo "$as_me:14617: result: yes" >&5 + *) echo "$as_me:14575: result: yes" >&5 echo "${ECHO_T}yes" >&6 SSHMODE=4711 ;; esac else - echo "$as_me:14623: result: yes" >&5 + echo "$as_me:14581: result: yes" >&5 echo "${ECHO_T}yes" >&6 SSHMODE=4711 @@ -14731,10 +14689,10 @@ fi; -echo "$as_me:14734: checking if your system defines LASTLOG_FILE" >&5 +echo "$as_me:14692: 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 14737 "configure" +#line 14695 "configure" #include "confdefs.h" #include @@ -14764,29 +14722,29 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14767: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14725: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14770: \$? = $ac_status" >&5 + echo "$as_me:14728: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14773: \"$ac_try\"") >&5 + { (eval echo "$as_me:14731: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14776: \$? = $ac_status" >&5 + echo "$as_me:14734: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:14778: result: yes" >&5 + echo "$as_me:14736: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:14784: result: no" >&5 + echo "$as_me:14742: result: no" >&5 echo "${ECHO_T}no" >&6 - echo "$as_me:14786: checking if your system defines _PATH_LASTLOG" >&5 + echo "$as_me:14744: 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 14789 "configure" +#line 14747 "configure" #include "confdefs.h" #include @@ -14813,24 +14771,24 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14816: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14774: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14819: \$? = $ac_status" >&5 + echo "$as_me:14777: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14822: \"$ac_try\"") >&5 + { (eval echo "$as_me:14780: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14825: \$? = $ac_status" >&5 + echo "$as_me:14783: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:14827: result: yes" >&5 + echo "$as_me:14785: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:14833: result: no" >&5 + echo "$as_me:14791: result: no" >&5 echo "${ECHO_T}no" >&6 system_lastlog_path=no @@ -14848,7 +14806,7 @@ fi done if test -z "$conf_lastlog_location"; then - { echo "$as_me:14851: WARNING: ** Cannot find lastlog **" >&5 + { echo "$as_me:14809: WARNING: ** Cannot find lastlog **" >&5 echo "$as_me: WARNING: ** Cannot find lastlog **" >&2;} fi fi @@ -14861,10 +14819,10 @@ fi -echo "$as_me:14864: checking if your system defines UTMP_FILE" >&5 +echo "$as_me:14822: 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 14867 "configure" +#line 14825 "configure" #include "confdefs.h" #include @@ -14888,23 +14846,23 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14891: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14849: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14894: \$? = $ac_status" >&5 + echo "$as_me:14852: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14897: \"$ac_try\"") >&5 + { (eval echo "$as_me:14855: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14900: \$? = $ac_status" >&5 + echo "$as_me:14858: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:14902: result: yes" >&5 + echo "$as_me:14860: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:14907: result: no" >&5 + echo "$as_me:14865: result: no" >&5 echo "${ECHO_T}no" >&6 system_utmp_path=no @@ -14932,10 +14890,10 @@ fi -echo "$as_me:14935: checking if your system defines WTMP_FILE" >&5 +echo "$as_me:14893: 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 14938 "configure" +#line 14896 "configure" #include "confdefs.h" #include @@ -14959,23 +14917,23 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14962: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14920: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14965: \$? = $ac_status" >&5 + echo "$as_me:14923: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14968: \"$ac_try\"") >&5 + { (eval echo "$as_me:14926: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14971: \$? = $ac_status" >&5 + echo "$as_me:14929: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:14973: result: yes" >&5 + echo "$as_me:14931: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:14978: result: no" >&5 + echo "$as_me:14936: result: no" >&5 echo "${ECHO_T}no" >&6 system_wtmp_path=no @@ -15003,10 +14961,10 @@ fi -echo "$as_me:15006: checking if your system defines UTMPX_FILE" >&5 +echo "$as_me:14964: 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 15009 "configure" +#line 14967 "configure" #include "confdefs.h" #include @@ -15033,23 +14991,23 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15036: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14994: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15039: \$? = $ac_status" >&5 + echo "$as_me:14997: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15042: \"$ac_try\"") >&5 + { (eval echo "$as_me:15000: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15045: \$? = $ac_status" >&5 + echo "$as_me:15003: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:15047: result: yes" >&5 + echo "$as_me:15005: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:15052: result: no" >&5 + echo "$as_me:15010: result: no" >&5 echo "${ECHO_T}no" >&6 system_utmpx_path=no @@ -15069,10 +15027,10 @@ fi -echo "$as_me:15072: checking if your system defines WTMPX_FILE" >&5 +echo "$as_me:15030: 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 15075 "configure" +#line 15033 "configure" #include "confdefs.h" #include @@ -15099,23 +15057,23 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15102: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15060: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15105: \$? = $ac_status" >&5 + echo "$as_me:15063: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15108: \"$ac_try\"") >&5 + { (eval echo "$as_me:15066: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15111: \$? = $ac_status" >&5 + echo "$as_me:15069: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:15113: result: yes" >&5 + echo "$as_me:15071: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:15118: result: no" >&5 + echo "$as_me:15076: result: no" >&5 echo "${ECHO_T}no" >&6 system_wtmpx_path=no @@ -15135,28 +15093,19 @@ fi -# Change default command timeout for builtin PRNG -entropy_timeout=200 - -# Check whether --with-entropy-timeout or --without-entropy-timeout was given. -if test "${with_entropy_timeout+set}" = set; then - withval="$with_entropy_timeout" - - if test "x$withval" != "xno" ; then - entropy_timeout=$withval - fi - -fi; -cat >>confdefs.h <<_ACEOF -#define ENTROPY_TIMEOUT_MSEC $entropy_timeout -_ACEOF - if test ! -z "$blibpath" ; then LDFLAGS="$LDFLAGS -blibpath:$blibpath" - { echo "$as_me:15156: WARNING: Please check and edit -blibpath in LDFLAGS in Makefile" >&5 + { echo "$as_me:15098: 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 +if test "$PAM_MSG" = yes ; then + LIBS=`echo $LIBS | sed 's/-lpam //'` +fi +if test "$ac_cv_lib_pam_pam_set_item" = yes ; then + LIBS=`echo $LIBS | sed 's/-ldl //'` +fi + ac_config_files="$ac_config_files Makefile openbsd-compat/Makefile scard/Makefile ssh_prng_cmds" cat >confcache <<\_ACEOF @@ -15238,7 +15187,7 @@ : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:15241: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:15190: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -15438,7 +15387,7 @@ echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:15441: error: ambiguous option: $1 + { { echo "$as_me:15390: 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;} @@ -15457,7 +15406,7 @@ ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:15460: error: unrecognized option: $1 + -*) { { echo "$as_me:15409: 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;} @@ -15481,7 +15430,7 @@ "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:15484: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:15433: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -15590,11 +15539,9 @@ s,@TEST_MINUS_S_SH@,$TEST_MINUS_S_SH,;t t s,@LOGIN_PROGRAM_FALLBACK@,$LOGIN_PROGRAM_FALLBACK,;t t s,@LD@,$LD,;t t -s,@NO_SFTP@,$NO_SFTP,;t t -s,@rsh_path@,$rsh_path,;t t -s,@xauth_path@,$xauth_path,;t t -s,@XAUTH_PATH@,$XAUTH_PATH,;t t -s,@RANDOM_POOL@,$RANDOM_POOL,;t t +s,@LIBWRAP@,$LIBWRAP,;t t +s,@LIBPAM@,$LIBPAM,;t t +s,@INSTALL_SSH_RAND_HELPER@,$INSTALL_SSH_RAND_HELPER,;t t s,@PROG_LS@,$PROG_LS,;t t s,@PROG_NETSTAT@,$PROG_NETSTAT,;t t s,@PROG_ARP@,$PROG_ARP,;t t @@ -15612,6 +15559,10 @@ s,@PROG_IPCS@,$PROG_IPCS,;t t s,@PROG_TAIL@,$PROG_TAIL,;t t s,@INSTALL_SSH_PRNG_CMDS@,$INSTALL_SSH_PRNG_CMDS,;t t +s,@NO_SFTP@,$NO_SFTP,;t t +s,@rsh_path@,$rsh_path,;t t +s,@xauth_path@,$xauth_path,;t t +s,@XAUTH_PATH@,$XAUTH_PATH,;t t s,@NROFF@,$NROFF,;t t s,@MANTYPE@,$MANTYPE,;t t s,@mansubdir@,$mansubdir,;t t @@ -15700,7 +15651,7 @@ as_incr_dir=$as_incr_dir/$as_mkdir_dir test -d "$as_incr_dir" || mkdir "$as_incr_dir" || - { { echo "$as_me:15703: error: cannot create \"$ac_dir\"" >&5 + { { echo "$as_me:15654: error: cannot create \"$ac_dir\"" >&5 echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -15737,7 +15688,7 @@ esac if test x"$ac_file" != x-; then - { echo "$as_me:15740: creating $ac_file" >&5 + { echo "$as_me:15691: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -15755,7 +15706,7 @@ -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:15758: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:15709: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -15768,7 +15719,7 @@ echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:15771: error: cannot find input file: $f" >&5 + { { echo "$as_me:15722: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -15829,7 +15780,7 @@ * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:15832: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:15783: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -15840,7 +15791,7 @@ -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:15843: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:15794: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -15853,7 +15804,7 @@ echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:15856: error: cannot find input file: $f" >&5 + { { echo "$as_me:15807: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -15970,7 +15921,7 @@ rm -f $tmp/in if test x"$ac_file" != x-; then if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:15973: $ac_file is unchanged" >&5 + { echo "$as_me:15924: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -15997,7 +15948,7 @@ as_incr_dir=$as_incr_dir/$as_mkdir_dir test -d "$as_incr_dir" || mkdir "$as_incr_dir" || - { { echo "$as_me:16000: error: cannot create \"$ac_dir\"" >&5 + { { echo "$as_me:15951: error: cannot create \"$ac_dir\"" >&5 echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -16041,19 +15992,6 @@ # Print summary of options -if test ! -z "$RANDOM_POOL" ; then - RAND_MSG="Device ($RANDOM_POOL)" -else - if test ! -z "$PRNGD_PORT" ; then - RAND_MSG="PRNGD/EGD (port localhost:$PRNGD_PORT)" - elif test ! -z "$PRNGD_SOCKET" ; then - RAND_MSG="PRNGD/EGD (socket $PRNGD_SOCKET)" - else - RAND_MSG="Builtin (timeout $entropy_timeout)" - BUILTIN_RNG=1 - fi -fi - # Someone please show me a better way :) A=`eval echo ${prefix}` ; A=`eval echo ${A}` B=`eval echo ${bindir}` ; B=`eval echo ${B}` @@ -16073,7 +16011,6 @@ echo " Manual pages: $F" echo " PID file: $G" echo " sshd default user PATH: $H" -echo " Random number collection: $RAND_MSG" echo " Manpage format: $MANTYPE" echo " PAM support: ${PAM_MSG}" echo " KerberosIV support: $KRB4_MSG" @@ -16085,9 +16022,10 @@ echo " IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG" echo " Use IPv4 by default hack: $IPV4_HACK_MSG" echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG" - -if test ! -z "$bsd_auth"; then - echo " BSD Auth support: yes" +echo " BSD Auth support: $BSD_AUTH_MSG" +echo " Random number source: $RAND_MSG" +if test ! -z "$USE_RAND_HELPER" ; then + echo " ssh-rand-helper collects from: $RAND_HELPER_MSG" fi echo "" @@ -16097,26 +16035,28 @@ echo " Compiler flags: ${CFLAGS}" echo "Preprocessor flags: ${CPPFLAGS}" echo " Linker flags: ${LDFLAGS}" -echo " Libraries: ${LIBS}" +echo " Libraries: ${LIBWRAP} ${LIBPAM} ${LIBS}" echo "" if test "x$PAM_MSG" = "xyes" ; then - echo "PAM is enabled. You may need to install a PAM control file for sshd," - echo "otherwise password authentication may fail. Example PAM control files" - echo "can be found in the contrib/ subdirectory" + echo "PAM is enabled. You may need to install a PAM control file " + echo "for sshd, otherwise password authentication may fail. " + echo "Example PAM control files can be found in the contrib/ " + echo "subdirectory" echo "" fi -if test ! -z "$BUILTIN_RNG" ; then - echo "WARNING: you are using the builtin random number collection service." - echo "Please read WARNING.RNG and request that your OS vendor includes" - echo "/dev/random in future versions of their OS." +if test ! -z "$NO_SFTP"; then + echo "sftp-server will be disabled. Your compiler does not " + echo "support 64bit integers." echo "" fi -if test ! -z "$NO_SFTP"; then - echo "sftp-server will be disabled. Your compiler does not support" - echo "64bit integers." +if test ! -z "$RAND_HELPER_CMDHASH" ; then + echo "WARNING: you are using the builtin random number collection " + echo "service. Please read WARNING.RNG and request that your OS " + echo "vendor includes kernel-based random number collection in " + echo "future versions of your OS." echo "" fi diff -ru openssh-3.0.2p1/configure.ac openssh-3.1p1/configure.ac --- openssh-3.0.2p1/configure.ac 2001-11-04 06:09:33.000000000 +1100 +++ openssh-3.1p1/configure.ac 2002-02-27 17:12:35.000000000 +1100 @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.4 2001/11/03 19:09:33 tim Exp $ +# $Id: configure.ac,v 1.23 2002/02/27 06:12:35 tim Exp $ AC_INIT AC_CONFIG_SRCDIR([ssh.c]) @@ -63,9 +63,10 @@ AC_DEFINE(BROKEN_GETADDRINFO) dnl AIX handles lastlog as part of its login message AC_DEFINE(DISABLE_LASTLOG) + AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H) ;; *-*-cygwin*) - LIBS="$LIBS -lregex /usr/lib/textmode.o" + LIBS="$LIBS /usr/lib/textmode.o" AC_DEFINE(HAVE_CYGWIN) AC_DEFINE(USE_PIPES) AC_DEFINE(DISABLE_SHADOW) @@ -122,6 +123,7 @@ check_for_libcrypt_later=1 AC_DEFINE(DONT_TRY_OTHER_AF) AC_DEFINE(PAM_TTY_KLUDGE) + AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H) inet6_default_4in6=yes ;; mips-sony-bsd|mips-sony-newsos4) @@ -184,6 +186,7 @@ LDFLAGS="$LDFLAGS -L/usr/local/lib" LIBS="$LIBS -lc89" AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H) + AC_DEFINE(USE_PIPES) ;; *-sni-sysv*) CPPFLAGS="$CPPFLAGS -I/usr/local/include" @@ -317,45 +320,17 @@ ] ) -AC_ARG_WITH(pcre, - [ --with-pcre[[=PATH]] Override built in regex library with pcre - (optionally in PATH)], - [ - case "$withval" in - no) ;; - *) - if test "x$withval" != "xyes"; then - if test -d "$withval/lib"; then - if test -n "${need_dash_r}"; then - LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}" - else - LDFLAGS="-L${withval}/lib ${LDFLAGS}" - fi - else - if test -n "${need_dash_r}"; then - LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}" - else - LDFLAGS="-L${withval} ${LDFLAGS}" - fi - fi - if test -d "$withval/include"; then - CPPFLAGS="-I${withval}/include ${CPPFLAGS}" - else - CPPFLAGS="-I${withval} ${CPPFLAGS}" - fi - fi - - AC_CHECK_HEADER(pcreposix.h, - AC_CHECK_LIB(pcre, pcre_info,[ - AC_DEFINE(HAVE_LIBPCRE) - LIBS="$LIBS -lpcreposix -lpcre" - no_comp_check=yes], - AC_MSG_ERROR([*** unable to locate pcre library ***])), - AC_MSG_ERROR([*** unable to locate pcreposix.h include file ***])) - ;; - esac - ] -) +# Checks for header files. +AC_CHECK_HEADERS(bstring.h crypt.h endian.h floatingpoint.h \ + getopt.h glob.h lastlog.h limits.h login.h \ + login_cap.h maillock.h netdb.h netgroup.h \ + netinet/in_systm.h paths.h poll.h pty.h \ + security/pam_appl.h shadow.h stddef.h stdint.h \ + strings.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h \ + sys/poll.h sys/queue.h sys/select.h sys/stat.h \ + sys/stropts.h sys/sysmacros.h sys/time.h \ + sys/ttcompat.h sys/un.h time.h ttyent.h usersec.h \ + util.h utime.h utmp.h utmpx.h) # Checks for libraries. AC_CHECK_FUNC(yp_match, , AC_CHECK_LIB(nsl, yp_match)) @@ -371,10 +346,25 @@ AC_CHECK_FUNC(getspnam, , AC_CHECK_LIB(gen, getspnam, LIBS="$LIBS -lgen")) +AC_ARG_WITH(rpath, + [ --without-rpath Disable auto-added -R linker paths], + [ + if test "x$withval" = "xno" ; then + need_dash_r="" + fi + if test "x$withval" = "xyes" ; then + need_dash_r=1 + fi + ] +) + dnl zlib is required AC_ARG_WITH(zlib, [ --with-zlib=PATH Use zlib in PATH], [ + if test "x$withval" = "xno" ; then + AC_MSG_ERROR([*** zlib is required ***]) + fi if test -d "$withval/lib"; then if test -n "${need_dash_r}"; then LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}" @@ -398,23 +388,6 @@ AC_CHECK_LIB(z, deflate, ,AC_MSG_ERROR([*** zlib missing - please install first or check config.log ***])) -# We don't want to check if we did an pcre override. -if test -z "$no_comp_check" ; then - AC_CHECK_FUNC(regcomp, - [ AC_DEFINE(HAVE_REGCOMP)], - [ - AC_CHECK_LIB(pcre, pcre_info, - [ - AC_DEFINE(HAVE_LIBPCRE) - LIBS="$LIBS -lpcreposix -lpcre" - ], - [ - AC_MSG_ERROR([*** No regex library found.]) - ]) - ] - ) -fi - dnl UnixWare 2.x AC_CHECK_FUNC(strcasecmp, [], [ AC_CHECK_LIB(resolv, strcasecmp, LIBS="$LIBS -lresolv") ] @@ -430,18 +403,6 @@ AC_FUNC_STRFTIME -# Checks for header files. -AC_CHECK_HEADERS(bstring.h crypt.h endian.h floatingpoint.h \ - getopt.h glob.h lastlog.h limits.h login.h \ - login_cap.h maillock.h netdb.h netgroup.h \ - netinet/in_systm.h paths.h poll.h pty.h regex.h \ - security/pam_appl.h shadow.h stddef.h stdint.h \ - strings.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h \ - sys/poll.h sys/queue.h sys/select.h sys/stat.h \ - sys/stropts.h sys/sysmacros.h sys/time.h \ - sys/ttcompat.h sys/un.h time.h ttyent.h usersec.h \ - util.h utime.h utmp.h utmpx.h) - # Check for ALTDIRFUNC glob() extension AC_MSG_CHECKING(for GLOB_ALTDIRFUNC support) AC_EGREP_CPP(FOUNDIT, @@ -507,9 +468,16 @@ LIBS="-lskey $LIBS" SKEY_MSG="yes" - AC_CHECK_FUNC(skey_keyinfo, - [], + AC_MSG_CHECKING([for s/key support]) + AC_TRY_RUN( [ +#include +#include +int main() { char *ff = skey_keyinfo(""); ff=""; return 0; } + ], + [AC_MSG_RESULT(yes)], + [ + AC_MSG_RESULT(no) AC_MSG_ERROR([** Incomplete or missing s/key libraries.]) ]) fi @@ -546,7 +514,8 @@ CPPFLAGS="-I${withval} ${CPPFLAGS}" fi fi - LIBS="-lwrap $LIBS" + LIBWRAP="-lwrap" + LIBS="$LIBWRAP $LIBS" AC_MSG_CHECKING(for libwrap) AC_TRY_LINK( [ @@ -557,12 +526,14 @@ [ AC_MSG_RESULT(yes) AC_DEFINE(LIBWRAP) + AC_SUBST(LIBWRAP) TCPW_MSG="yes" ], [ AC_MSG_ERROR([*** libwrap missing]) ] ) + LIBS="$saved_LIBS" fi ] ) @@ -678,6 +649,12 @@ PAM_MSG="yes" AC_DEFINE(USE_PAM) + if test $ac_cv_lib_dl_dlopen = yes; then + LIBPAM="-lpam -ldl" + else + LIBPAM="-lpam" + fi + AC_SUBST(LIBPAM) fi ] ) @@ -865,12 +842,204 @@ fi fi +# Sanity check OpenSSL headers +AC_MSG_CHECKING([whether OpenSSL's headers match the library]) +AC_TRY_RUN( + [ +#include +#include +int main(void) { return(SSLeay() == OPENSSL_VERSION_NUMBER ? 0 : 1); } + ], + [ + AC_MSG_RESULT(yes) + ], + [ + AC_MSG_RESULT(no) + AC_MSG_ERROR(Your OpenSSL headers do not match your library) + ] +) + # Some Linux systems (Slackware) need crypt() from libcrypt, *not* the # version in OpenSSL. Skip this for PAM if test "x$PAM_MSG" = "xno" -a "x$check_for_libcrypt_later" = "x1"; then AC_CHECK_LIB(crypt, crypt, LIBS="$LIBS -lcrypt") fi + +### Configure cryptographic random number support + +# Check wheter OpenSSL seeds itself +AC_MSG_CHECKING([whether OpenSSL's PRNG is internally seeded]) +AC_TRY_RUN( + [ +#include +#include +int main(void) { return(RAND_status() == 1 ? 0 : 1); } + ], + [ + OPENSSL_SEEDS_ITSELF=yes + AC_MSG_RESULT(yes) + ], + [ + AC_MSG_RESULT(no) + # Default to use of the rand helper if OpenSSL doesn't + # seed itself + USE_RAND_HELPER=yes + ] +) + + +# Do we want to force the use of the rand helper? +AC_ARG_WITH(rand-helper, + [ --with-rand-helper Use subprocess to gather strong randomness ], + [ + if test "x$withval" = "xno" ; 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 + AC_MSG_WARN([*** Forcing use of OpenSSL's non-self-seeding PRNG]) + OPENSSL_SEEDS_ITSELF=yes + USE_RAND_HELPER="" + fi + else + USE_RAND_HELPER=yes + fi + ], +) + +# Which randomness source do we use? +if test ! -z "$OPENSSL_SEEDS_ITSELF" -a -z "$USE_RAND_HELPER" ; then + # OpenSSL only + AC_DEFINE(OPENSSL_PRNG_ONLY) + RAND_MSG="OpenSSL internal ONLY" + INSTALL_SSH_RAND_HELPER="" +elif test ! -z "$USE_RAND_HELPER" ; then + # install rand helper + RAND_MSG="ssh-rand-helper" + INSTALL_SSH_RAND_HELPER="yes" +fi +AC_SUBST(INSTALL_SSH_RAND_HELPER) + +### Configuration of ssh-rand-helper + +# PRNGD TCP socket +AC_ARG_WITH(prngd-port, + [ --with-prngd-port=PORT read entropy from PRNGD/EGD TCP localhost:PORT], + [ + case "$withval" in + no) + withval="" + ;; + [[0-9]]*) + ;; + *) + AC_MSG_ERROR(You must specify a numeric port number for --with-prngd-port) + ;; + esac + if test ! -z "$withval" ; then + PRNGD_PORT="$withval" + AC_DEFINE_UNQUOTED(PRNGD_PORT, $PRNGD_PORT) + fi + ] +) + +# PRNGD Unix domain socket +AC_ARG_WITH(prngd-socket, + [ --with-prngd-socket=FILE read entropy from PRNGD/EGD socket FILE (default=/var/run/egd-pool)], + [ + case "$withval" in + yes) + withval="/var/run/egd-pool" + ;; + no) + withval="" + ;; + /*) + ;; + *) + AC_MSG_ERROR(You must specify an absolute path to the entropy socket) + ;; + esac + + if test ! -z "$withval" ; then + if test ! -z "$PRNGD_PORT" ; then + AC_MSG_ERROR(You may not specify both a PRNGD/EGD port and socket) + fi + if test ! -r "$withval" ; then + AC_MSG_WARN(Entropy socket is not readable) + fi + PRNGD_SOCKET="$withval" + AC_DEFINE_UNQUOTED(PRNGD_SOCKET, "$PRNGD_SOCKET") + fi + ], + [ + # Check for existing socket only if we don't have a random device already + if test "$USE_RAND_HELPER" = yes ; then + AC_MSG_CHECKING(for PRNGD/EGD socket) + # Insert other locations here + for sock in /var/run/egd-pool /dev/egd-pool /etc/entropy; do + if test -r $sock && $TEST_MINUS_S_SH -c "test -S $sock -o -p $sock" ; then + PRNGD_SOCKET="$sock" + AC_DEFINE_UNQUOTED(PRNGD_SOCKET, "$PRNGD_SOCKET") + break; + fi + done + if test ! -z "$PRNGD_SOCKET" ; then + AC_MSG_RESULT($PRNGD_SOCKET) + else + AC_MSG_RESULT(not found) + fi + fi + ] +) + +# Change default command timeout for hashing entropy source +entropy_timeout=200 +AC_ARG_WITH(entropy-timeout, + [ --with-entropy-timeout Specify entropy gathering command timeout (msec)], + [ + if test "x$withval" != "xno" ; then + entropy_timeout=$withval + fi + ] +) + +AC_DEFINE_UNQUOTED(ENTROPY_TIMEOUT_MSEC, $entropy_timeout) + +# These programs are used by the command hashing source to gather entropy +OSSH_PATH_ENTROPY_PROG(PROG_LS, ls) +OSSH_PATH_ENTROPY_PROG(PROG_NETSTAT, netstat) +OSSH_PATH_ENTROPY_PROG(PROG_ARP, arp) +OSSH_PATH_ENTROPY_PROG(PROG_IFCONFIG, ifconfig) +OSSH_PATH_ENTROPY_PROG(PROG_JSTAT, jstat) +OSSH_PATH_ENTROPY_PROG(PROG_PS, ps) +OSSH_PATH_ENTROPY_PROG(PROG_SAR, sar) +OSSH_PATH_ENTROPY_PROG(PROG_W, w) +OSSH_PATH_ENTROPY_PROG(PROG_WHO, who) +OSSH_PATH_ENTROPY_PROG(PROG_LAST, last) +OSSH_PATH_ENTROPY_PROG(PROG_LASTLOG, lastlog) +OSSH_PATH_ENTROPY_PROG(PROG_DF, df) +OSSH_PATH_ENTROPY_PROG(PROG_VMSTAT, vmstat) +OSSH_PATH_ENTROPY_PROG(PROG_UPTIME, uptime) +OSSH_PATH_ENTROPY_PROG(PROG_IPCS, ipcs) +OSSH_PATH_ENTROPY_PROG(PROG_TAIL, tail) + +# Where does ssh-rand-helper get its randomness from? +INSTALL_SSH_PRNG_CMDS="" +if test ! -z "$INSTALL_SSH_RAND_HELPER" ; then + if test ! -z "$PRNGD_PORT" ; then + RAND_HELPER_MSG="TCP localhost:$PRNGD_PORT" + elif test ! -z "$PRNGD_SOCKET" ; then + RAND_HELPER_MSG="Unix domain socket \"$PRNGD_SOCKET\"" + else + RAND_HELPER_MSG="Command hashing (timeout $entropy_timeout)" + RAND_HELPER_CMDHASH=yes + INSTALL_SSH_PRNG_CMDS="yes" + fi +fi +AC_SUBST(INSTALL_SSH_PRNG_CMDS) + + # Cheap hack to ensure NEWS-OS libraries are arranged right. if test ! -z "$SONY" ; then LIBS="$LIBS -liberty"; @@ -951,6 +1120,19 @@ ) fi +if test -z "$have_int64_t" ; then + AC_MSG_CHECKING([for int64_t type in sys/bitypes.h]) + AC_TRY_COMPILE( + [ #include ], + [ int64_t a; a = 1], + [ + AC_DEFINE(HAVE_INT64_T) + AC_MSG_RESULT(yes) + ], + [ AC_MSG_RESULT(no) ] + ) +fi + AC_CACHE_CHECK([for u_intXX_t types], ac_cv_have_u_intxx_t, [ AC_TRY_COMPILE( [ #include ], @@ -990,6 +1172,19 @@ have_u_int64_t=1 fi +if test -z "$have_u_int64_t" ; then + AC_MSG_CHECKING([for u_int64_t type in sys/bitypes.h]) + AC_TRY_COMPILE( + [ #include ], + [ u_int64_t a; a = 1], + [ + AC_DEFINE(HAVE_U_INT64_T) + AC_MSG_RESULT(yes) + ], + [ AC_MSG_RESULT(no) ] + ) +fi + if test -z "$have_u_intxx_t" ; then AC_CACHE_CHECK([for uintXX_t types], ac_cv_have_uintxx_t, [ AC_TRY_COMPILE( @@ -1058,6 +1253,8 @@ TYPE_SOCKLEN_T +AC_CHECK_TYPES(sig_atomic_t,,,[#include ]) + AC_CACHE_CHECK([for size_t], ac_cv_have_size_t, [ AC_TRY_COMPILE( [ @@ -1587,97 +1784,6 @@ ) # Options from here on. Some of these are preset by platform above - -# Check for user-specified random device, otherwise check /dev/urandom -AC_ARG_WITH(random, - [ --with-random=FILE read entropy from FILE (default=/dev/urandom)], - [ - if test "x$withval" != "xno" ; then - RANDOM_POOL="$withval"; - AC_DEFINE_UNQUOTED(RANDOM_POOL, "$RANDOM_POOL") - fi - ], - [ - # Check for random device - AC_CHECK_FILE("/dev/urandom", - [ - RANDOM_POOL="/dev/urandom"; - AC_SUBST(RANDOM_POOL) - AC_DEFINE_UNQUOTED(RANDOM_POOL, "$RANDOM_POOL") - ] - ) - ] -) - -# Check for PRNGD/EGD pool file -AC_ARG_WITH(prngd-port, - [ --with-prngd-port=PORT read entropy from PRNGD/EGD localhost:PORT], - [ - if test ! -z "$withval" -a "x$withval" != "xno" ; then - PRNGD_PORT="$withval" - AC_DEFINE_UNQUOTED(PRNGD_PORT, $PRNGD_PORT) - fi - ] -) - -# Check for PRNGD/EGD pool file -AC_ARG_WITH(prngd-socket, - [ --with-prngd-socket=FILE read entropy from PRNGD/EGD socket FILE (default=/var/run/egd-pool)], - [ - if test "x$withval" != "xno" ; then - PRNGD_SOCKET="$withval" - AC_DEFINE_UNQUOTED(PRNGD_SOCKET, "$PRNGD_SOCKET") - fi - ], - [ - # Check for existing socket only if we don't have a random device already - if test -z "$RANDOM_POOL" ; then - AC_MSG_CHECKING(for PRNGD/EGD socket) - # Insert other locations here - for sock in /var/run/egd-pool /dev/egd-pool /etc/entropy; do - if test -r $sock && $TEST_MINUS_S_SH -c "test -S $sock -o -p $sock" ; then - PRNGD_SOCKET="$sock" - AC_DEFINE_UNQUOTED(PRNGD_SOCKET, "$PRNGD_SOCKET") - break; - fi - done - if test ! -z "$PRNGD_SOCKET" ; then - AC_MSG_RESULT($PRNGD_SOCKET) - else - AC_MSG_RESULT(not found) - fi - fi - ] -) - - -# detect pathnames for entropy gathering commands, if we need them -INSTALL_SSH_PRNG_CMDS="" -rm -f prng_commands -if (test -z "$RANDOM_POOL" && test -z "$PRNGD") ; then - # Use these commands to collect entropy - OSSH_PATH_ENTROPY_PROG(PROG_LS, ls) - OSSH_PATH_ENTROPY_PROG(PROG_NETSTAT, netstat) - OSSH_PATH_ENTROPY_PROG(PROG_ARP, arp) - OSSH_PATH_ENTROPY_PROG(PROG_IFCONFIG, ifconfig) - OSSH_PATH_ENTROPY_PROG(PROG_JSTAT, jstat) - OSSH_PATH_ENTROPY_PROG(PROG_PS, ps) - OSSH_PATH_ENTROPY_PROG(PROG_SAR, sar) - OSSH_PATH_ENTROPY_PROG(PROG_W, w) - OSSH_PATH_ENTROPY_PROG(PROG_WHO, who) - OSSH_PATH_ENTROPY_PROG(PROG_LAST, last) - OSSH_PATH_ENTROPY_PROG(PROG_LASTLOG, lastlog) - OSSH_PATH_ENTROPY_PROG(PROG_DF, df) - OSSH_PATH_ENTROPY_PROG(PROG_VMSTAT, vmstat) - OSSH_PATH_ENTROPY_PROG(PROG_UPTIME, uptime) - OSSH_PATH_ENTROPY_PROG(PROG_IPCS, ipcs) - OSSH_PATH_ENTROPY_PROG(PROG_TAIL, tail) - - INSTALL_SSH_PRNG_CMDS="yes" -fi -AC_SUBST(INSTALL_SSH_PRNG_CMDS) - - AC_ARG_WITH(mantype, [ --with-mantype=man|cat|doc Set man page type], [ @@ -1869,12 +1975,13 @@ ) # Whether to enable BSD auth support +BSD_AUTH_MSG=no AC_ARG_WITH(bsd-auth, [ --with-bsd-auth Enable BSD auth support], [ if test "x$withval" != "xno" ; then AC_DEFINE(BSD_AUTH) - bsd_auth=yes + BSD_AUTH_MSG=yes fi ] ) @@ -2141,44 +2248,25 @@ fi -# Change default command timeout for builtin PRNG -entropy_timeout=200 -AC_ARG_WITH(entropy-timeout, - [ --with-entropy-timeout Specify entropy gathering command timeout (msec)], - [ - if test "x$withval" != "xno" ; then - entropy_timeout=$withval - fi - ] -) -AC_DEFINE_UNQUOTED(ENTROPY_TIMEOUT_MSEC, $entropy_timeout) - - if test ! -z "$blibpath" ; then LDFLAGS="$LDFLAGS -blibpath:$blibpath" AC_MSG_WARN([Please check and edit -blibpath in LDFLAGS in Makefile]) fi -AC_EXEEXT +dnl remove pam and dl because they are in $LIBPAM +if test "$PAM_MSG" = yes ; then + LIBS=`echo $LIBS | sed 's/-lpam //'` +fi +if test "$ac_cv_lib_pam_pam_set_item" = yes ; then + LIBS=`echo $LIBS | sed 's/-ldl //'` +fi +AC_EXEEXT AC_CONFIG_FILES([Makefile openbsd-compat/Makefile scard/Makefile ssh_prng_cmds]) AC_OUTPUT # Print summary of options -if test ! -z "$RANDOM_POOL" ; then - RAND_MSG="Device ($RANDOM_POOL)" -else - if test ! -z "$PRNGD_PORT" ; then - RAND_MSG="PRNGD/EGD (port localhost:$PRNGD_PORT)" - elif test ! -z "$PRNGD_SOCKET" ; then - RAND_MSG="PRNGD/EGD (socket $PRNGD_SOCKET)" - else - RAND_MSG="Builtin (timeout $entropy_timeout)" - BUILTIN_RNG=1 - fi -fi - # Someone please show me a better way :) A=`eval echo ${prefix}` ; A=`eval echo ${A}` B=`eval echo ${bindir}` ; B=`eval echo ${B}` @@ -2198,7 +2286,6 @@ echo " Manual pages: $F" echo " PID file: $G" echo " sshd default user PATH: $H" -echo " Random number collection: $RAND_MSG" echo " Manpage format: $MANTYPE" echo " PAM support: ${PAM_MSG}" echo " KerberosIV support: $KRB4_MSG" @@ -2210,9 +2297,10 @@ echo " IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG" echo " Use IPv4 by default hack: $IPV4_HACK_MSG" echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG" - -if test ! -z "$bsd_auth"; then - echo " BSD Auth support: yes" +echo " BSD Auth support: $BSD_AUTH_MSG" +echo " Random number source: $RAND_MSG" +if test ! -z "$USE_RAND_HELPER" ; then + echo " ssh-rand-helper collects from: $RAND_HELPER_MSG" fi echo "" @@ -2222,27 +2310,29 @@ echo " Compiler flags: ${CFLAGS}" echo "Preprocessor flags: ${CPPFLAGS}" echo " Linker flags: ${LDFLAGS}" -echo " Libraries: ${LIBS}" +echo " Libraries: ${LIBWRAP} ${LIBPAM} ${LIBS}" echo "" if test "x$PAM_MSG" = "xyes" ; then - echo "PAM is enabled. You may need to install a PAM control file for sshd," - echo "otherwise password authentication may fail. Example PAM control files" - echo "can be found in the contrib/ subdirectory" + echo "PAM is enabled. You may need to install a PAM control file " + echo "for sshd, otherwise password authentication may fail. " + echo "Example PAM control files can be found in the contrib/ " + echo "subdirectory" echo "" fi -if test ! -z "$BUILTIN_RNG" ; then - echo "WARNING: you are using the builtin random number collection service." - echo "Please read WARNING.RNG and request that your OS vendor includes" - echo "/dev/random in future versions of their OS." +if test ! -z "$NO_SFTP"; then + echo "sftp-server will be disabled. Your compiler does not " + echo "support 64bit integers." echo "" fi -if test ! -z "$NO_SFTP"; then - echo "sftp-server will be disabled. Your compiler does not support" - echo "64bit integers." +if test ! -z "$RAND_HELPER_CMDHASH" ; then + echo "WARNING: you are using the builtin random number collection " + echo "service. Please read WARNING.RNG and request that your OS " + echo "vendor includes kernel-based random number collection in " + echo "future versions of your OS." echo "" fi diff -ru openssh-3.0.2p1/contrib/README openssh-3.1p1/contrib/README --- openssh-3.0.2p1/contrib/README 2001-03-04 08:43:19.000000000 +1100 +++ openssh-3.1p1/contrib/README 2001-12-24 13:59:20.000000000 +1100 @@ -11,11 +11,10 @@ In this directory ----------------- -chroot.diff: +chroot.diff: -Ricardo Cerqueira's patch to enable chrooting using the -wu-ftpd style magic home directories (containing '/./'). More details in -the head of the patch itself. +Due to the fact the patch is never in sync with the rest of the tree. It was +removed. ssh-copy-id: Only in openssh-3.1p1/contrib: aix diff -ru openssh-3.0.2p1/contrib/caldera/openssh.spec openssh-3.1p1/contrib/caldera/openssh.spec --- openssh-3.0.2p1/contrib/caldera/openssh.spec 2001-12-02 10:37:19.000000000 +1100 +++ openssh-3.1p1/contrib/caldera/openssh.spec 2002-03-07 13:04:38.000000000 +1100 @@ -1,6 +1,6 @@ %define use-stable 1 %if %{use-stable} - %define version 3.0.2p1 + %define version 3.1p1 %define cvs %{nil} %define release 1 %else @@ -224,4 +224,4 @@ %ChangeLog * Mon Jan 01 1998 ... -$Id: openssh.spec,v 1.25.4.1 2001/12/01 23:37:19 djm Exp $ +$Id: openssh.spec,v 1.27 2002/03/07 02:04:38 djm Exp $ Only in openssh-3.0.2p1/contrib: chroot.diff diff -ru openssh-3.0.2p1/contrib/cygwin/README openssh-3.1p1/contrib/cygwin/README --- openssh-3.0.2p1/contrib/cygwin/README 2001-07-19 02:25:42.000000000 +1000 +++ openssh-3.1p1/contrib/cygwin/README 2001-12-29 14:10:10.000000000 +1100 @@ -1,6 +1,14 @@ This package is the actual port of OpenSSH to Cygwin 1.3. =========================================================================== +Important change since 3.0.1p1-2: + +This version introduces the ability to register sshd as service on +Windows 9x/Me systems. This is done only when the options -D and/or +-d are not given. +=========================================================================== + +=========================================================================== Important change since 2.9p2: Since Cygwin is able to switch user context without password beginning @@ -75,12 +83,12 @@ If starting via inetd, copy sshd to eg. /usr/sbin/in.sshd and add the following line to your inetd.conf file: -sshd stream tcp nowait root /usr/sbin/in.sshd sshd -i +ssh stream tcp nowait root /usr/sbin/in.sshd sshd -i Moreover you'll have to add the following line to your ${SYSTEMROOT}/system32/drivers/etc/services file: - sshd 22/tcp #SSH daemon + ssh 22/tcp #SSH daemon =========================================================================== The following restrictions only apply to Cygwin versions up to 1.3.1 @@ -162,12 +170,10 @@ --prefix=/usr \ --sysconfdir=/etc \ - --libexecdir='${exec_prefix}/sbin \ - --with-pcre + --libexecdir='${exec_prefix}/sbin' You must have installed the zlib, openssl and regex packages to -be able to build OpenSSH! The `--with-pcre' option requires -the installation of the pcre package. +be able to build OpenSSH! Please send requests, error reports etc. to cygwin@cygwin.com. diff -ru openssh-3.0.2p1/contrib/gnome-ssh-askpass.c openssh-3.1p1/contrib/gnome-ssh-askpass.c --- openssh-3.0.2p1/contrib/gnome-ssh-askpass.c 2001-02-16 11:18:59.000000000 +1100 +++ openssh-3.1p1/contrib/gnome-ssh-askpass.c 2002-01-25 00:59:26.000000000 +1100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000 Damien Miller. All rights reserved. + * Copyright (c) 2000-2002 Damien Miller. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -23,6 +23,18 @@ */ /* + * This is a simple GNOME SSH passphrase grabber. To use it, set the + * environment variable SSH_ASKPASS to point to the location of + * gnome-ssh-askpass before calling "ssh-add < /dev/null". + * + * There is only two run-time options: if you set the environment variable + * "GNOME_SSH_ASKPASS_GRAB_SERVER=true" then gnome-ssh-askpass will grab + * the X server. If you set "GNOME_SSH_ASKPASS_GRAB_POINTER=true", then the + * pointer will be grabbed too. These may have some benefit to security if + * you don't trust your X server. We grab the keyboard always. + */ + +/* * Compile with: * * cc `gnome-config --cflags gnome gnomeui` \ @@ -57,10 +69,12 @@ { char *passphrase; char **messages; - int result, i; - + int result, i, grab_server, grab_pointer; GtkWidget *dialog, *entry, *label; + grab_server = (getenv("GNOME_SSH_ASKPASS_GRAB_SERVER") != NULL); + grab_pointer = (getenv("GNOME_SSH_ASKPASS_GRAB_POINTER") != NULL); + dialog = gnome_dialog_new("OpenSSH", GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL, NULL); @@ -89,9 +103,10 @@ gtk_widget_show_all(dialog); /* Grab focus */ - XGrabServer(GDK_DISPLAY()); - if (gdk_pointer_grab(dialog->window, TRUE, 0, NULL, NULL, - GDK_CURRENT_TIME)) + if (grab_server) + XGrabServer(GDK_DISPLAY()); + if (grab_pointer && gdk_pointer_grab(dialog->window, TRUE, 0, + NULL, NULL, GDK_CURRENT_TIME)) goto nograb; if (gdk_keyboard_grab(dialog->window, FALSE, GDK_CURRENT_TIME)) goto nograbkb; @@ -103,8 +118,10 @@ result = gnome_dialog_run(GNOME_DIALOG(dialog)); /* Ungrab */ - XUngrabServer(GDK_DISPLAY()); - gdk_pointer_ungrab(GDK_CURRENT_TIME); + if (grab_server) + XUngrabServer(GDK_DISPLAY()); + if (grab_pointer) + gdk_pointer_ungrab(GDK_CURRENT_TIME); gdk_keyboard_ungrab(GDK_CURRENT_TIME); gdk_flush(); @@ -126,7 +143,8 @@ nograbkb: gdk_pointer_ungrab(GDK_CURRENT_TIME); nograb: - XUngrabServer(GDK_DISPLAY()); + if (grab_server) + XUngrabServer(GDK_DISPLAY()); gnome_dialog_close(GNOME_DIALOG(dialog)); report_failed_grab(); diff -ru openssh-3.0.2p1/contrib/redhat/openssh.spec openssh-3.1p1/contrib/redhat/openssh.spec --- openssh-3.0.2p1/contrib/redhat/openssh.spec 2001-12-02 10:37:19.000000000 +1100 +++ openssh-3.1p1/contrib/redhat/openssh.spec 2002-03-07 13:04:38.000000000 +1100 @@ -1,5 +1,5 @@ # Version of OpenSSH -%define oversion 3.0.2p1 +%define oversion 3.1p1 # Version of ssh-askpass %define aversion 1.2.4.1 diff -ru openssh-3.0.2p1/contrib/suse/openssh.spec openssh-3.1p1/contrib/suse/openssh.spec --- openssh-3.0.2p1/contrib/suse/openssh.spec 2001-12-02 10:37:19.000000000 +1100 +++ openssh-3.1p1/contrib/suse/openssh.spec 2002-03-07 13:04:38.000000000 +1100 @@ -1,6 +1,6 @@ Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation Name: openssh -Version: 3.0.2p1 +Version: 3.1p1 URL: http://www.openssh.com/ Release: 1 Source0: openssh-%{version}.tar.gz diff -ru openssh-3.0.2p1/crc32.h openssh-3.1p1/crc32.h --- openssh-3.0.2p1/crc32.h 2001-07-04 14:46:57.000000000 +1000 +++ openssh-3.1p1/crc32.h 2002-03-05 12:53:05.000000000 +1100 @@ -1,3 +1,5 @@ +/* $OpenBSD: crc32.h,v 1.13 2002/03/04 17:27:39 stevesk Exp $ */ + /* * Author: Tatu Ylonen * Copyright (c) 1992 Tatu Ylonen , Espoo, Finland @@ -11,8 +13,6 @@ * called by a name other than "ssh" or "Secure Shell". */ -/* RCSID("$OpenBSD: crc32.h,v 1.12 2001/06/26 17:27:23 markus Exp $"); */ - #ifndef CRC32_H #define CRC32_H diff -ru openssh-3.0.2p1/deattack.c openssh-3.1p1/deattack.c --- openssh-3.0.2p1/deattack.c 2001-06-25 15:01:25.000000000 +1000 +++ openssh-3.1p1/deattack.c 2002-03-05 12:53:05.000000000 +1100 @@ -1,5 +1,3 @@ -/* $OpenBSD: deattack.c,v 1.14 2001/06/23 15:12:18 itojun Exp $ */ - /* * Cryptographic attack detector for ssh - source code * @@ -20,11 +18,14 @@ */ #include "includes.h" +RCSID("$OpenBSD: deattack.c,v 1.18 2002/03/04 17:27:39 stevesk Exp $"); + #include "deattack.h" #include "log.h" #include "crc32.h" #include "getput.h" #include "xmalloc.h" +#include "deattack.h" /* SSH Constants */ #define SSH_MAXBLOCKS (32 * 1024) @@ -36,7 +37,7 @@ #define HASH_FACTOR(x) ((x)*3/2) #define HASH_UNUSEDCHAR (0xff) #define HASH_UNUSED (0xffff) -#define HASH_IV (0xfffe) +#define HASH_IV (0xfffe) #define HASH_MINBLOCKS (7*SSH_BLOCKSIZE) @@ -85,9 +86,9 @@ { static u_int16_t *h = (u_int16_t *) NULL; static u_int32_t n = HASH_MINSIZE / HASH_ENTRYSIZE; - register u_int32_t i, j; + u_int32_t i, j; u_int32_t l; - register u_char *c; + u_char *c; u_char *d; if (len > (SSH_MAXBLOCKS * SSH_BLOCKSIZE) || @@ -134,7 +135,7 @@ for (c = buf, j = 0; c < (buf + len); c += SSH_BLOCKSIZE, j++) { for (i = HASH(c) & (n - 1); h[i] != HASH_UNUSED; - i = (i + 1) & (n - 1)) { + i = (i + 1) & (n - 1)) { if (h[i] == HASH_IV) { if (!CMP(c, IV)) { if (check_crc(c, buf, len, IV)) diff -ru openssh-3.0.2p1/defines.h openssh-3.1p1/defines.h --- openssh-3.0.2p1/defines.h 2001-11-01 09:32:34.000000000 +1100 +++ openssh-3.1p1/defines.h 2002-02-27 03:40:49.000000000 +1100 @@ -1,7 +1,7 @@ #ifndef _DEFINES_H #define _DEFINES_H -/* $Id: defines.h,v 1.75 2001/10/31 22:32:34 djm Exp $ */ +/* $Id: defines.h,v 1.80 2002/02/26 16:40:49 tim Exp $ */ /* Necessary headers */ @@ -141,6 +141,14 @@ # define NFDBITS (8 * sizeof(unsigned long)) #endif +/* +SCO Open Server 3 has INADDR_LOOPBACK defined in rpc/rpc.h but +including rpc/rpc.h breaks Solaris 6 +*/ +#ifndef INADDR_LOOPBACK +#define INADDR_LOOPBACK ((ulong)0x7f000001) +#endif + /* Types */ /* If sys/types.h does not supply intXX_t, supply them ourselves */ @@ -161,7 +169,11 @@ typedef short int int16_t; # else # ifdef _CRAY +# if (SIZEOF_SHORT_INT == 4) +typedef short int16_t; +# else typedef long int16_t; +# endif # else # error "16 bit int type not found." # endif /* _CRAY */ @@ -194,7 +206,11 @@ typedef unsigned short int u_int16_t; # else # ifdef _CRAY +# if (SIZEOF_SHORT_INT == 4) +typedef unsigned short u_int16_t; +# else typedef unsigned long u_int16_t; +# endif # else # error "16 bit int type not found." # endif @@ -269,6 +285,11 @@ # define HAVE_PID_T #endif /* HAVE_PID_T */ +#ifndef HAVE_SIG_ATOMIC_T +typedef int sig_atomic_t; +# define HAVE_SIG_ATOMIC_T +#endif /* HAVE_SIG_ATOMIC_T */ + #ifndef HAVE_MODE_T typedef int mode_t; # define HAVE_MODE_T @@ -356,6 +377,16 @@ #define _PATH_XAUTH XAUTH_PATH #endif /* XAUTH_PATH */ +/* derived from XF4/xc/lib/dps/Xlibnet.h */ +#ifndef X_UNIX_PATH +# ifdef __hpux +# define X_UNIX_PATH "/var/spool/sockets/X11/%u" +# else +# define X_UNIX_PATH "/tmp/.X11-unix/X%u" +# endif +#endif /* X_UNIX_PATH */ +#define _PATH_UNIX_X X_UNIX_PATH + #ifndef _PATH_TTY # define _PATH_TTY "/dev/tty" #endif @@ -436,7 +467,7 @@ #endif /* !defined(HAVE_MEMMOVE) && defined(HAVE_BCOPY) */ #if !defined(HAVE_ATEXIT) && defined(HAVE_ON_EXIT) -# define atexit(a, NULL) on_exit(a, NULL) +# define atexit(a) on_exit(a, NULL) #else # if defined(HAVE_XATEXIT) # define atexit(a) xatexit(a) diff -ru openssh-3.0.2p1/dh.c openssh-3.1p1/dh.c --- openssh-3.0.2p1/dh.c 2001-06-25 15:01:25.000000000 +1000 +++ openssh-3.1p1/dh.c 2002-03-07 12:58:43.000000000 +1100 @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: dh.c,v 1.17 2001/06/23 15:12:18 itojun Exp $"); +RCSID("$OpenBSD: dh.c,v 1.21 2002/03/06 00:23:27 markus Exp $"); #include "xmalloc.h" @@ -78,8 +78,10 @@ if (cp != NULL || *prime == '\0') goto fail; - dhg->g = BN_new(); - dhg->p = BN_new(); + if ((dhg->g = BN_new()) == NULL) + fatal("parse_prime: BN_new failed"); + if ((dhg->p = BN_new()) == NULL) + fatal("parse_prime: BN_new failed"); if (BN_hex2bn(&dhg->g, gen) == 0) goto failclean; @@ -92,8 +94,8 @@ return (1); failclean: - BN_free(dhg->g); - BN_free(dhg->p); + BN_clear_free(dhg->g); + BN_clear_free(dhg->p); fail: error("Bad prime description in line %d", linenum); return (0); @@ -120,8 +122,8 @@ linenum++; if (!parse_prime(linenum, line, &dhg)) continue; - BN_free(dhg.g); - BN_free(dhg.p); + BN_clear_free(dhg.g); + BN_clear_free(dhg.p); if (dhg.size > max || dhg.size < min) continue; @@ -150,8 +152,8 @@ if ((dhg.size > max || dhg.size < min) || dhg.size != best || linenum++ != which) { - BN_free(dhg.g); - BN_free(dhg.p); + BN_clear_free(dhg.g); + BN_clear_free(dhg.p); continue; } break; @@ -201,9 +203,8 @@ BN_num_bits(dh->p), 2*need); do { if (dh->priv_key != NULL) - BN_free(dh->priv_key); - dh->priv_key = BN_new(); - if (dh->priv_key == NULL) + BN_clear_free(dh->priv_key); + if ((dh->priv_key = BN_new()) == NULL) fatal("dh_gen_key: BN_new failed"); /* generate a 2*need bits random private exponent */ if (!BN_rand(dh->priv_key, 2*need, 0, 0)) @@ -225,9 +226,8 @@ { DH *dh; - dh = DH_new(); - if (dh == NULL) - fatal("DH_new"); + if ((dh = DH_new()) == NULL) + fatal("dh_new_group_asc: DH_new"); if (BN_hex2bn(&dh->p, modulus) == 0) fatal("BN_hex2bn p"); @@ -247,9 +247,8 @@ { DH *dh; - dh = DH_new(); - if (dh == NULL) - fatal("DH_new"); + if ((dh = DH_new()) == NULL) + fatal("dh_new_group: DH_new"); dh->p = modulus; dh->g = gen; diff -ru openssh-3.0.2p1/dispatch.c openssh-3.1p1/dispatch.c --- openssh-3.0.2p1/dispatch.c 2001-06-12 10:12:57.000000000 +1000 +++ openssh-3.1p1/dispatch.c 2002-01-22 23:24:15.000000000 +1100 @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "includes.h" -RCSID("$OpenBSD: dispatch.c,v 1.11 2001/06/10 11:29:20 markus Exp $"); +RCSID("$OpenBSD: dispatch.c,v 1.15 2002/01/11 13:39:36 markus Exp $"); #include "ssh1.h" #include "ssh2.h" @@ -37,18 +37,40 @@ dispatch_fn *dispatch[DISPATCH_MAX]; void -dispatch_protocol_error(int type, int plen, void *ctxt) +dispatch_protocol_error(int type, u_int32_t seq, void *ctxt) { - fatal("dispatch_protocol_error: type %d plen %d", type, plen); + log("dispatch_protocol_error: type %d seq %u", type, seq); + if (!compat20) + fatal("protocol error"); + packet_start(SSH2_MSG_UNIMPLEMENTED); + packet_put_int(seq); + packet_send(); + packet_write_wait(); +} +void +dispatch_protocol_ignore(int type, u_int32_t seq, void *ctxt) +{ + log("dispatch_protocol_ignore: type %d seq %u", type, seq); } void dispatch_init(dispatch