diff options
author | Colin Watson <cjwatson@debian.org> | 2005-01-04 13:07:27 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-01-04 13:07:27 +0000 |
commit | fd0f611b70a83d80fe8793af785542ee5541b7cd (patch) | |
tree | bededd22bb7eeec52e20083237ab7e4113445a16 | |
parent | c44fe9a5b9d3db96a7249b04d915f17e4a3a3b04 (diff) | |
parent | ebd2ce335af5861020c79fddb1ae35c03bf036cf (diff) |
Merge 3.9p1 to the trunk.
-rw-r--r-- | CREDITS | 7 | ||||
-rw-r--r-- | ChangeLog | 675 | ||||
-rw-r--r-- | INSTALL | 4 | ||||
-rw-r--r-- | Makefile.in | 28 | ||||
-rw-r--r-- | OVERVIEW | 1 | ||||
-rw-r--r-- | README | 20 | ||||
-rw-r--r-- | README.platform | 10 | ||||
-rw-r--r-- | README.privsep | 8 | ||||
-rw-r--r-- | acconfig.h | 14 | ||||
-rw-r--r-- | auth-krb5.c | 6 | ||||
-rw-r--r-- | auth-pam.c | 194 | ||||
-rw-r--r-- | auth-pam.h | 3 | ||||
-rw-r--r-- | auth-passwd.c | 6 | ||||
-rw-r--r-- | auth-rsa.c | 11 | ||||
-rw-r--r-- | auth.c | 42 | ||||
-rw-r--r-- | auth.h | 4 | ||||
-rw-r--r-- | auth1.c | 26 | ||||
-rw-r--r-- | auth2-chall.c | 3 | ||||
-rw-r--r-- | auth2-gss.c | 12 | ||||
-rw-r--r-- | auth2-none.c | 11 | ||||
-rw-r--r-- | auth2-pubkey.c | 8 | ||||
-rw-r--r-- | auth2.c | 8 | ||||
-rw-r--r-- | authfd.c | 19 | ||||
-rw-r--r-- | authfile.c | 24 | ||||
-rw-r--r--[-rwxr-xr-x] | buildpkg.sh.in (renamed from contrib/solaris/buildpkg.sh) | 308 | ||||
-rw-r--r-- | canohost.c | 38 | ||||
-rw-r--r-- | channels.c | 198 | ||||
-rw-r--r-- | channels.h | 11 | ||||
-rw-r--r-- | cipher.c | 52 | ||||
-rw-r--r-- | cipher.h | 4 | ||||
-rw-r--r-- | clientloop.c | 478 | ||||
-rw-r--r-- | clientloop.h | 4 | ||||
-rw-r--r-- | compat.h | 4 | ||||
-rw-r--r-- | config.h.in | 444 | ||||
-rwxr-xr-x | configure | 17160 | ||||
-rw-r--r-- | configure.ac | 103 | ||||
-rw-r--r-- | contrib/README | 28 | ||||
-rw-r--r-- | contrib/caldera/openssh.spec | 10 | ||||
-rw-r--r-- | contrib/cygwin/README | 4 | ||||
-rw-r--r-- | contrib/redhat/openssh.spec | 4 | ||||
-rw-r--r-- | contrib/redhat/sshd.pam | 2 | ||||
-rwxr-xr-x | contrib/solaris/README | 10 | ||||
-rw-r--r-- | contrib/suse/openssh.spec | 2 | ||||
-rw-r--r-- | debian/changelog | 3 | ||||
-rw-r--r-- | defines.h | 9 | ||||
-rw-r--r-- | dh.c | 30 | ||||
-rw-r--r-- | dh.h | 3 | ||||
-rw-r--r-- | dns.c | 8 | ||||
-rw-r--r-- | envpass.sh | 44 | ||||
-rw-r--r-- | gss-serv-krb5.c | 10 | ||||
-rw-r--r-- | includes.h | 13 | ||||
-rw-r--r-- | kex.c | 45 | ||||
-rw-r--r-- | kex.h | 7 | ||||
-rw-r--r-- | kexdhc.c | 13 | ||||
-rw-r--r-- | kexdhs.c | 13 | ||||
-rw-r--r-- | key.c | 6 | ||||
-rw-r--r-- | log.c | 6 | ||||
-rw-r--r-- | log.h | 6 | ||||
-rw-r--r-- | loginrec.c | 36 | ||||
-rw-r--r-- | logintest.c | 6 | ||||
-rw-r--r-- | mdoc2man.awk | 10 | ||||
-rw-r--r-- | misc.c | 36 | ||||
-rw-r--r-- | misc.h | 25 | ||||
-rw-r--r-- | moduli.c | 86 | ||||
-rw-r--r-- | moduli.h | 23 | ||||
-rw-r--r-- | monitor.c | 156 | ||||
-rw-r--r-- | monitor_fdpass.c | 12 | ||||
-rw-r--r-- | monitor_mm.c | 2 | ||||
-rw-r--r-- | monitor_wrap.c | 41 | ||||
-rw-r--r-- | monitor_wrap.h | 8 | ||||
-rw-r--r-- | myproposal.h | 6 | ||||
-rw-r--r-- | nchan.c | 20 | ||||
-rw-r--r-- | openbsd-compat/Makefile.in | 4 | ||||
-rw-r--r-- | openbsd-compat/bsd-arc4random.c | 12 | ||||
-rw-r--r-- | openbsd-compat/bsd-closefrom.c | 100 | ||||
-rw-r--r-- | openbsd-compat/bsd-misc.c | 7 | ||||
-rw-r--r-- | openbsd-compat/bsd-misc.h | 2 | ||||
-rw-r--r-- | openbsd-compat/getrrsetbyname.c | 4 | ||||
-rw-r--r-- | openbsd-compat/openbsd-compat.h | 6 | ||||
-rw-r--r-- | openbsd-compat/port-aix.c | 88 | ||||
-rw-r--r-- | openbsd-compat/port-aix.h | 6 | ||||
-rw-r--r-- | openbsd-compat/sys-queue.h | 19 | ||||
-rw-r--r-- | openbsd-compat/xmmap.c | 11 | ||||
-rwxr-xr-x | opensshd.init.in (renamed from contrib/solaris/opensshd.in) | 16 | ||||
-rw-r--r-- | packet.c | 53 | ||||
-rw-r--r-- | packet.h | 4 | ||||
-rw-r--r-- | pathnames.h | 4 | ||||
-rw-r--r-- | progressmeter.c | 24 | ||||
-rw-r--r-- | readconf.c | 48 | ||||
-rw-r--r-- | readconf.h | 14 | ||||
-rw-r--r-- | readpass.c | 11 | ||||
-rw-r--r-- | readpass.h | 19 | ||||
-rw-r--r-- | regress/Makefile | 12 | ||||
-rw-r--r-- | regress/README.regress | 31 | ||||
-rw-r--r-- | regress/dynamic-forward.sh | 4 | ||||
-rw-r--r-- | regress/envpass.sh | 51 | ||||
-rw-r--r-- | regress/login-timeout.sh | 4 | ||||
-rw-r--r-- | regress/multiplex.sh | 74 | ||||
-rw-r--r-- | regress/reexec.sh | 87 | ||||
-rw-r--r-- | regress/scp-ssh-wrapper.sh | 54 | ||||
-rw-r--r-- | regress/scp.sh | 82 | ||||
-rw-r--r-- | regress/test-exec.sh | 35 | ||||
-rw-r--r-- | regress/try-ciphers.sh | 4 | ||||
-rw-r--r-- | rijndael.c | 6 | ||||
-rw-r--r-- | scard-opensc.c | 2 | ||||
-rw-r--r-- | scard.c | 4 | ||||
-rw-r--r-- | scp.0 | 7 | ||||
-rw-r--r-- | scp.1 | 7 | ||||
-rw-r--r-- | scp.c | 41 | ||||
-rw-r--r-- | servconf.c | 77 | ||||
-rw-r--r-- | servconf.h | 14 | ||||
-rw-r--r-- | serverloop.c | 18 | ||||
-rw-r--r-- | session.c | 118 | ||||
-rw-r--r-- | session.h | 10 | ||||
-rw-r--r-- | sftp-client.c | 39 | ||||
-rw-r--r-- | sftp-server.0 | 2 | ||||
-rw-r--r-- | sftp-server.c | 48 | ||||
-rw-r--r-- | sftp.0 | 17 | ||||
-rw-r--r-- | sftp.1 | 25 | ||||
-rw-r--r-- | sftp.c | 188 | ||||
-rw-r--r-- | ssh-add.0 | 2 | ||||
-rw-r--r-- | ssh-add.c | 9 | ||||
-rw-r--r-- | ssh-agent.0 | 18 | ||||
-rw-r--r-- | ssh-agent.1 | 22 | ||||
-rw-r--r-- | ssh-agent.c | 15 | ||||
-rw-r--r-- | ssh-gss.h | 40 | ||||
-rw-r--r-- | ssh-keygen.0 | 8 | ||||
-rw-r--r-- | ssh-keygen.1 | 11 | ||||
-rw-r--r-- | ssh-keygen.c | 32 | ||||
-rw-r--r-- | ssh-keyscan.0 | 10 | ||||
-rw-r--r-- | ssh-keyscan.1 | 4 | ||||
-rw-r--r-- | ssh-keyscan.c | 15 | ||||
-rw-r--r-- | ssh-keysign.0 | 2 | ||||
-rw-r--r-- | ssh-keysign.c | 20 | ||||
-rw-r--r-- | ssh-rand-helper.0 | 2 | ||||
-rw-r--r-- | ssh-rand-helper.c | 10 | ||||
-rw-r--r-- | ssh.0 | 75 | ||||
-rw-r--r-- | ssh.1 | 103 | ||||
-rw-r--r-- | ssh.c | 315 | ||||
-rw-r--r-- | ssh1.h | 8 | ||||
-rw-r--r-- | ssh_config.0 | 45 | ||||
-rw-r--r-- | ssh_config.5 | 75 | ||||
-rw-r--r-- | sshconnect.c | 13 | ||||
-rw-r--r-- | sshconnect1.c | 18 | ||||
-rw-r--r-- | sshconnect2.c | 7 | ||||
-rw-r--r-- | sshd.0 | 6 | ||||
-rw-r--r-- | sshd.8 | 4 | ||||
-rw-r--r-- | sshd.c | 279 | ||||
-rw-r--r-- | sshd_config | 14 | ||||
-rw-r--r-- | sshd_config.0 | 40 | ||||
-rw-r--r-- | sshd_config.5 | 73 | ||||
-rw-r--r-- | sshlogin.c | 51 | ||||
-rw-r--r-- | sshpty.c | 40 | ||||
-rw-r--r-- | sshpty.h | 6 | ||||
-rw-r--r-- | sshtty.c | 4 | ||||
-rw-r--r-- | sshtty.h | 47 | ||||
-rw-r--r-- | stamp-h.in | 0 | ||||
-rw-r--r-- | tildexpand.c | 4 | ||||
-rw-r--r-- | tildexpand.h | 15 | ||||
-rw-r--r-- | ttymodes.h | 18 | ||||
-rw-r--r-- | version.h | 4 |
161 files changed, 16972 insertions, 6716 deletions
@@ -31,6 +31,7 @@ David Agraz <dagraz@jahoopa.com> - Build fixes | |||
31 | David Del Piero <David.DelPiero@qed.qld.gov.au> - bug fixes | 31 | David Del Piero <David.DelPiero@qed.qld.gov.au> - bug fixes |
32 | David Hesprich <darkgrue@gue-tech.org> - Configure fixes | 32 | David Hesprich <darkgrue@gue-tech.org> - Configure fixes |
33 | David Rankin <drankin@bohemians.lexington.ky.us> - libwrap, AIX, NetBSD fixes | 33 | David Rankin <drankin@bohemians.lexington.ky.us> - libwrap, AIX, NetBSD fixes |
34 | Dag-Erling Smørgrav <des at freebsd.org> - Challenge-Response PAM code. | ||
34 | Ed Eden <ede370@stl.rural.usda.gov> - configure fixes | 35 | Ed Eden <ede370@stl.rural.usda.gov> - configure fixes |
35 | Garrick James <garrick@james.net> - configure fixes | 36 | Garrick James <garrick@james.net> - configure fixes |
36 | Gary E. Miller <gem@rellim.com> - SCO support | 37 | Gary E. Miller <gem@rellim.com> - SCO support |
@@ -43,7 +44,7 @@ Holger Trapp <Holger.Trapp@Informatik.TU-Chemnitz.DE> - KRB4/AFS config patch | |||
43 | IWAMURO Motonori <iwa@mmp.fujitsu.co.jp> - bugfixes | 44 | IWAMURO Motonori <iwa@mmp.fujitsu.co.jp> - bugfixes |
44 | Jani Hakala <jahakala@cc.jyu.fi> - Patches | 45 | Jani Hakala <jahakala@cc.jyu.fi> - Patches |
45 | Jarno Huuskonen <jhuuskon@hytti.uku.fi> - Bugfixes | 46 | Jarno Huuskonen <jhuuskon@hytti.uku.fi> - Bugfixes |
46 | Jim Knoble <jmknoble@jmknoble.cx> - Many patches | 47 | Jim Knoble <jmknoble@pobox.com> - Many patches |
47 | Jonchen (email unknown) - the original author of PAM support of SSH | 48 | Jonchen (email unknown) - the original author of PAM support of SSH |
48 | Juergen Keil <jk@tools.de> - scp bugfixing | 49 | Juergen Keil <jk@tools.de> - scp bugfixing |
49 | KAMAHARA Junzo <kamahara@cc.kshosen.ac.jp> - Configure fixes | 50 | KAMAHARA Junzo <kamahara@cc.kshosen.ac.jp> - Configure fixes |
@@ -61,6 +62,7 @@ Martin Johansson <fatbob@acc.umu.se> - Linux fixes | |||
61 | Mark D. Roth <roth+openssh@feep.net> - Features, bug fixes | 62 | Mark D. Roth <roth+openssh@feep.net> - Features, bug fixes |
62 | Mark Miller <markm@swoon.net> - Bugfixes | 63 | Mark Miller <markm@swoon.net> - Bugfixes |
63 | Matt Richards <v2matt@btv.ibm.com> - AIX patches | 64 | Matt Richards <v2matt@btv.ibm.com> - AIX patches |
65 | Michael Steffens <michael_steffens at hp.com> - HP-UX fixes | ||
64 | Michael Stone <mstone@cs.loyola.edu> - Irix enhancements | 66 | Michael Stone <mstone@cs.loyola.edu> - Irix enhancements |
65 | Nakaji Hiroyuki <nakaji@tutrp.tut.ac.jp> - Sony News-OS patch | 67 | Nakaji Hiroyuki <nakaji@tutrp.tut.ac.jp> - Sony News-OS patch |
66 | Nalin Dahyabhai <nalin.dahyabhai@pobox.com> - PAM environment patch | 68 | Nalin Dahyabhai <nalin.dahyabhai@pobox.com> - PAM environment patch |
@@ -76,6 +78,7 @@ Phil Karn <karn@ka9q.ampr.org> - Autoconf fixes | |||
76 | Philippe WILLEM <Philippe.WILLEM@urssaf.fr> - Bugfixes | 78 | Philippe WILLEM <Philippe.WILLEM@urssaf.fr> - Bugfixes |
77 | Phill Camp <P.S.S.Camp@ukc.ac.uk> - login code fix | 79 | Phill Camp <P.S.S.Camp@ukc.ac.uk> - login code fix |
78 | Rip Loomis <loomisg@cist.saic.com> - Solaris package support, fixes | 80 | Rip Loomis <loomisg@cist.saic.com> - Solaris package support, fixes |
81 | Robert Dahlem <Robert.Dahlem at siemens.com> - Reliant Unix fixes | ||
79 | Roumen Petrov <openssh@roumenpetrov.info> - Compile & configure fixes | 82 | Roumen Petrov <openssh@roumenpetrov.info> - Compile & configure fixes |
80 | SAKAI Kiyotaka <ksakai@kso.netwk.ntt-at.co.jp> - Multiple bugfixes | 83 | SAKAI Kiyotaka <ksakai@kso.netwk.ntt-at.co.jp> - Multiple bugfixes |
81 | Simon Wilkinson <sxw@dcs.ed.ac.uk> - PAM fixes, Compat with MIT KrbV | 84 | Simon Wilkinson <sxw@dcs.ed.ac.uk> - PAM fixes, Compat with MIT KrbV |
@@ -95,5 +98,5 @@ Apologies to anyone I have missed. | |||
95 | 98 | ||
96 | Damien Miller <djm@mindrot.org> | 99 | Damien Miller <djm@mindrot.org> |
97 | 100 | ||
98 | $Id: CREDITS,v 1.77 2004/01/30 04:00:50 dtucker Exp $ | 101 | $Id: CREDITS,v 1.79 2004/05/26 23:59:31 dtucker Exp $ |
99 | 102 | ||
@@ -1,10 +1,681 @@ | |||
1 | 20040817 | ||
2 | - (dtucker) [regress/README.regress] Note compatibility issues with GNU head. | ||
3 | - (djm) OpenBSD CVS Sync | ||
4 | - markus@cvs.openbsd.org 2004/08/16 08:17:01 | ||
5 | [version.h] | ||
6 | 3.9 | ||
7 | - (djm) Crank RPM spec version numbers | ||
8 | - (djm) Release 3.9p1 | ||
9 | |||
10 | 20040816 | ||
11 | - (dtucker) [acconfig.h auth-pam.c configure.ac] Set real uid to non-root | ||
12 | to convince Solaris PAM to honour password complexity rules. ok djm@ | ||
13 | |||
14 | 20040815 | ||
15 | - (dtucker) [Makefile.in ssh-keysign.c ssh.c] Use permanently_set_uid() since | ||
16 | it does the right thing on all platforms. ok djm@ | ||
17 | - (djm) [acconfig.h configure.ac openbsd-compat/Makefile.in | ||
18 | openbsd-compat/bsd-closefrom.c openbsd-compat/bsd-misc.c | ||
19 | openbsd-compat/bsd-misc.h openbsd-compat/openbsd-compat.h] Use smarter | ||
20 | closefrom() replacement from sudo; ok dtucker@ | ||
21 | - (djm) [loginrec.c] Check that seek succeeded here too; ok dtucker | ||
22 | - (dtucker) [Makefile.in] Fix typo. | ||
23 | |||
24 | 20040814 | ||
25 | - (dtucker) [auth-krb5.c gss-serv-krb5.c openbsd-compat/xmmap.c] | ||
26 | Explicitly set umask for mkstemp; ok djm@ | ||
27 | - (dtucker) [includes.h] Undef _INCLUDE__STDC__ on HP-UX, otherwise | ||
28 | prot.h and shadow.h provide conflicting declarations of getspnam. ok djm@ | ||
29 | - (dtucker) [loginrec.c openbsd-compat/port-aix.c openbsd-compat/port-aix.h] | ||
30 | Plug AIX login recording into login_write so logins will be recorded for | ||
31 | all auth types. | ||
32 | |||
33 | 20040813 | ||
34 | - (dtucker) [openbsd-compat/bsd-misc.c] Typo in #ifdef; from vinschen at | ||
35 | redhat.com | ||
36 | - (dtucker) OpenBSD CVS Sync | ||
37 | - avsm@cvs.openbsd.org 2004/08/11 21:43:05 | ||
38 | [channels.c channels.h clientloop.c misc.c misc.h serverloop.c ssh-agent.c] | ||
39 | some signed/unsigned int comparison cleanups; markus@ ok | ||
40 | - avsm@cvs.openbsd.org 2004/08/11 21:44:32 | ||
41 | [authfd.c scp.c ssh-keyscan.c] | ||
42 | use atomicio instead of homegrown equivalents or read/write. | ||
43 | markus@ ok | ||
44 | - djm@cvs.openbsd.org 2004/08/12 09:18:24 | ||
45 | [sshlogin.c] | ||
46 | typo in error message, spotted by moritz AT jodeit.org (Id sync only) | ||
47 | - jakob@cvs.openbsd.org 2004/08/12 21:41:13 | ||
48 | [ssh-keygen.1 ssh.1] | ||
49 | improve SSHFP documentation; ok deraadt@ | ||
50 | - jmc@cvs.openbsd.org 2004/08/13 00:01:43 | ||
51 | [ssh-keygen.1] | ||
52 | kill whitespace at eol; | ||
53 | - djm@cvs.openbsd.org 2004/08/13 02:51:48 | ||
54 | [monitor_fdpass.c] | ||
55 | extra check for no message case; ok markus, deraadt, hshoexer, henning | ||
56 | - dtucker@cvs.openbsd.org 2004/08/13 11:09:24 | ||
57 | [servconf.c] | ||
58 | Fix line numbers off-by-one in error messages, from tortay at cc.in2p3.fr | ||
59 | ok markus@, djm@ | ||
60 | |||
61 | 20040812 | ||
62 | - (dtucker) [sshd.c] Remove duplicate variable imported during sync. | ||
63 | - (dtucker) OpenBSD CVS Sync | ||
64 | - markus@cvs.openbsd.org 2004/07/28 08:56:22 | ||
65 | [sshd.c] | ||
66 | call setsid() _before_ re-exec | ||
67 | - markus@cvs.openbsd.org 2004/07/28 09:40:29 | ||
68 | [auth.c auth1.c auth2.c cipher.c cipher.h key.c session.c ssh.c | ||
69 | sshconnect1.c] | ||
70 | more s/illegal/invalid/ | ||
71 | - djm@cvs.openbsd.org 2004/08/04 10:37:52 | ||
72 | [dh.c] | ||
73 | return group14 when no primes found - fixes hang on empty /etc/moduli; | ||
74 | ok markus@ | ||
75 | - dtucker@cvs.openbsd.org 2004/08/11 11:09:54 | ||
76 | [servconf.c] | ||
77 | Fix minor leak; "looks right" deraadt@ | ||
78 | - dtucker@cvs.openbsd.org 2004/08/11 11:50:09 | ||
79 | [sshd.c] | ||
80 | Don't try to close startup_pipe if it's not open; ok djm@ | ||
81 | - djm@cvs.openbsd.org 2004/08/11 11:59:22 | ||
82 | [sshlogin.c] | ||
83 | check that lseek went were we told it to; ok markus@ | ||
84 | (Id sync only, but similar changes are needed in loginrec.c) | ||
85 | - djm@cvs.openbsd.org 2004/08/11 12:01:16 | ||
86 | [sshlogin.c] | ||
87 | make store_lastlog_message() static to appease -Wall; ok markus | ||
88 | - (dtucker) [sshd.c] Clear loginmsg in postauth monitor, prevents doubling | ||
89 | messages generated before the postauth privsep split. | ||
90 | |||
91 | 20040720 | ||
92 | - (djm) OpenBSD CVS Sync | ||
93 | - markus@cvs.openbsd.org 2004/07/21 08:56:12 | ||
94 | [auth.c] | ||
95 | s/Illegal user/Invalid user/; many requests; ok djm, millert, niklas, | ||
96 | miod, ... | ||
97 | - djm@cvs.openbsd.org 2004/07/21 10:33:31 | ||
98 | [auth1.c auth2.c] | ||
99 | bz#899: Don't display invalid usernames in setproctitle | ||
100 | from peak AT argo.troja.mff.cuni.cz; ok markus@ | ||
101 | - djm@cvs.openbsd.org 2004/07/21 10:36:23 | ||
102 | [gss-serv-krb5.c] | ||
103 | fix function declaration | ||
104 | - djm@cvs.openbsd.org 2004/07/21 11:51:29 | ||
105 | [canohost.c] | ||
106 | bz#902: cache remote port so we don't fatal() in auth_log when remote | ||
107 | connection goes away quickly. from peak AT argo.troja.mff.cuni.cz; | ||
108 | ok markus@ | ||
109 | - (djm) [auth-pam.c] Portable parts of bz#899: Don't display invalid | ||
110 | usernames in setproctitle from peak AT argo.troja.mff.cuni.cz; | ||
111 | |||
112 | 20040720 | ||
113 | - (djm) [log.c] bz #111: Escape more control characters when sending data | ||
114 | to syslog; from peak AT argo.troja.mff.cuni.cz | ||
115 | - (djm) [contrib/redhat/sshd.pam] bz #903: Remove redundant entries; from | ||
116 | peak AT argo.troja.mff.cuni.cz | ||
117 | - (djm) [regress/README.regress] Remove caveat regarding TCP wrappers, now | ||
118 | that sshd is fixed to behave better; suggested by tim | ||
119 | |||
120 | 20040719 | ||
121 | - (djm) [openbsd-compat/bsd-arc4random.c] Discard early keystream, like OpenBSD | ||
122 | ok dtucker@ | ||
123 | - (djm) [auth-pam.c] Avoid use of xstrdup and friends in conversation function, | ||
124 | instead return PAM_CONV_ERR, avoiding another path to fatal(); ok dtucker@ | ||
125 | - (tim) [configure.ac] updwtmpx() on OpenServer seems to add duplicate entry. | ||
126 | Report by rac AT tenzing.org | ||
127 | |||
128 | 20040717 | ||
129 | - (dtucker) [logintest.c scp.c sftp-server.c sftp.c ssh-add.c ssh-agent.c | ||
130 | ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rand-helper.c ssh.c sshd.c | ||
131 | openbsd-compat/bsd-misc.c] Move "char *__progname" to bsd-misc.c. Reduces | ||
132 | diff vs OpenBSD; ok mouring@, tested by tim@ too. | ||
133 | - (dtucker) OpenBSD CVS Sync | ||
134 | - deraadt@cvs.openbsd.org 2004/07/11 17:48:47 | ||
135 | [channels.c cipher.c clientloop.c clientloop.h compat.h moduli.c | ||
136 | readconf.c nchan.c pathnames.h progressmeter.c readconf.h servconf.c | ||
137 | session.c sftp-client.c sftp.c ssh-agent.1 ssh-keygen.c ssh.c ssh1.h | ||
138 | sshd.c ttymodes.h] | ||
139 | spaces | ||
140 | - brad@cvs.openbsd.org 2004/07/12 23:34:25 | ||
141 | [ssh-keyscan.1] | ||
142 | Fix incorrect macro, .I -> .Em | ||
143 | From: Eric S. Raymond <esr at thyrsus dot com> | ||
144 | ok jmc@ | ||
145 | - dtucker@cvs.openbsd.org 2004/07/17 05:31:41 | ||
146 | [monitor.c monitor_wrap.c session.c session.h sshd.c sshlogin.c] | ||
147 | Move "Last logged in at.." message generation to the monitor, right | ||
148 | before recording the new login. Fixes missing lastlog message when | ||
149 | /var/log/lastlog is not world-readable and incorrect datestamp when | ||
150 | multiple sessions are used (bz #463); much assistance & ok markus@ | ||
151 | |||
152 | 20040711 | ||
153 | - (dtucker) [auth-pam.c] Check for zero from waitpid() too, which allows | ||
154 | the monitor to properly clean up the PAM thread (Debian bug #252676). | ||
155 | |||
156 | 20040709 | ||
157 | - (tim) [contrib/cygwin/README] add minires-devel requirement. Patch from | ||
158 | vinschen AT redhat.com | ||
159 | |||
160 | 20040708 | ||
161 | - (dtucker) OpenBSD CVS Sync | ||
162 | - dtucker@cvs.openbsd.org 2004/07/03 05:11:33 | ||
163 | [sshlogin.c] (RCSID sync only, the corresponding code is not in Portable) | ||
164 | Use '\0' not 0 for string; ok djm@, deraadt@ | ||
165 | - dtucker@cvs.openbsd.org 2004/07/03 11:02:25 | ||
166 | [monitor_wrap.c] | ||
167 | Put s/key functions inside #ifdef SKEY same as monitor.c, | ||
168 | from des@freebsd via bz #330, ok markus@ | ||
169 | - dtucker@cvs.openbsd.org 2004/07/08 12:47:21 | ||
170 | [scp.c] | ||
171 | Prevent scp from skipping the file following a double-error. | ||
172 | bz #863, ok markus@ | ||
173 | |||
174 | 20040702 | ||
175 | - (dtucker) [mdoc2man.awk] Teach it to ignore .Bk -words, reported by | ||
176 | strube at physik3.gwdg.de a long time ago. | ||
177 | |||
178 | 20040701 | ||
179 | - (dtucker) [session.c] Call display_loginmsg again after do_pam_session. | ||
180 | Ensures messages from PAM modules are displayed when privsep=no. | ||
181 | - (dtucker) [auth-pam.c] Bug #705: Make arguments match PAM specs, fixes | ||
182 | warnings on compliant platforms. From paul.a.bolton at bt.com. ok djm@ | ||
183 | - (dtucker) [auth-pam.c] Bug #559 (last piece): Pass DISALLOW_NULL_AUTHTOK | ||
184 | to pam_authenticate for challenge-response auth too. Originally from | ||
185 | fcusack at fcusack.com, ok djm@ | ||
186 | - (tim) [buildpkg.sh.in] Add $REV to bump the package revision within | ||
187 | the same version. Handle the case where someone uses --with-privsep-user= | ||
188 | and the user name does not match the group name. ok dtucker@ | ||
189 | |||
190 | 20040630 | ||
191 | - (dtucker) [auth-pam.c] Check for buggy PAM modules that return a NULL | ||
192 | appdata_ptr to the conversation function. ok djm@ | ||
193 | - (djm) OpenBSD CVS Sync | ||
194 | - jmc@cvs.openbsd.org 2004/06/26 09:03:21 | ||
195 | [ssh.1] | ||
196 | - remove double word | ||
197 | - rearrange .Bk to keep SYNOPSIS nice | ||
198 | - -M before -m in options description | ||
199 | - jmc@cvs.openbsd.org 2004/06/26 09:11:14 | ||
200 | [ssh_config.5] | ||
201 | punctuation and grammar fixes. also, keep the options in order. | ||
202 | - jmc@cvs.openbsd.org 2004/06/26 09:14:40 | ||
203 | [sshd_config.5] | ||
204 | new sentence, new line; | ||
205 | - avsm@cvs.openbsd.org 2004/06/26 20:07:16 | ||
206 | [sshd.c] | ||
207 | initialise some fd variables to -1, djm@ ok | ||
208 | - djm@cvs.openbsd.org 2004/06/30 08:36:59 | ||
209 | [session.c] | ||
210 | unbreak TTY break, diagnosed by darren AT dazwin.com; ok markus@ | ||
211 | |||
212 | 20040627 | ||
213 | - (tim) update README files. | ||
214 | - (dtucker) [mdoc2man.awk] Bug #883: correctly recognise .Pa and .Ev macros. | ||
215 | - (dtucker) [regress/README.regress] Document new variables. | ||
216 | - (dtucker) [acconfig.h configure.ac sftp-server.c] Bug #823: add sftp | ||
217 | rename handling for Linux which returns EPERM for link() on (at least some) | ||
218 | filesystems that do not support hard links. sftp-server will fall back to | ||
219 | stat+rename() in such cases. | ||
220 | - (dtucker) [openbsd-compat/port-aix.c] Missing __func__. | ||
221 | |||
222 | 20040626 | ||
223 | - (djm) OpenBSD CVS Sync | ||
224 | - djm@cvs.openbsd.org 2004/06/25 18:43:36 | ||
225 | [sshd.c] | ||
226 | fix broken fd handling in the re-exec fallback path, particularly when | ||
227 | /dev/crypto is in use; ok deraadt@ markus@ | ||
228 | - djm@cvs.openbsd.org 2004/06/25 23:21:38 | ||
229 | [sftp.c] | ||
230 | bz #875: fix bad escape char error message; reported by f_mohr AT yahoo.de | ||
231 | |||
232 | 20040625 | ||
233 | - (dtucker) OpenBSD CVS Sync | ||
234 | - djm@cvs.openbsd.org 2004/06/24 19:30:54 | ||
235 | [servconf.c servconf.h sshd.c] | ||
236 | re-exec sshd on accept(); initial work, final debugging and ok markus@ | ||
237 | - djm@cvs.openbsd.org 2004/06/25 01:16:09 | ||
238 | [sshd.c] | ||
239 | only perform tcp wrappers checks when the incoming connection is on a | ||
240 | socket. silences useless warnings from regress tests that use | ||
241 | proxycommand="sshd -i". prompted by david@ ok markus@ | ||
242 | - djm@cvs.openbsd.org 2004/06/24 19:32:00 | ||
243 | [regress/Makefile regress/test-exec.sh, added regress/reexec.sh] | ||
244 | regress test for re-exec corner cases | ||
245 | - djm@cvs.openbsd.org 2004/06/25 01:25:12 | ||
246 | [regress/test-exec.sh] | ||
247 | clean reexec-specific junk out of text-exec.sh and simplify; idea markus@ | ||
248 | - dtucker@cvs.openbsd.org 2004/06/25 05:38:48 | ||
249 | [sftp-server.c] | ||
250 | Fall back to stat+rename if filesystem doesn't doesn't support hard | ||
251 | links. bz#823, ok djm@ | ||
252 | - (dtucker) [configure.ac openbsd-compat/misc.c [openbsd-compat/misc.h] | ||
253 | Add closefrom() for platforms that don't have it. | ||
254 | - (dtucker) [sshd.c] add line missing from reexec sync. | ||
255 | |||
256 | 20040623 | ||
257 | - (dtucker) [auth1.c] Ensure do_pam_account is called for Protocol 1 | ||
258 | connections with empty passwords. Patch from davidwu at nbttech.com, | ||
259 | ok djm@ | ||
260 | - (dtucker) OpenBSD CVS Sync | ||
261 | - dtucker@cvs.openbsd.org 2004/06/22 22:42:02 | ||
262 | [regress/envpass.sh] | ||
263 | Add quoting for test -z; ok markus@ | ||
264 | - dtucker@cvs.openbsd.org 2004/06/22 22:45:52 | ||
265 | [regress/test-exec.sh] | ||
266 | Add TEST_SSH_SSHD_CONFOPTS and TEST_SSH_SSH_CONFOPTS to allow adding | ||
267 | arbitary options to sshd_config and ssh_config during tests. ok markus@ | ||
268 | - dtucker@cvs.openbsd.org 2004/06/22 22:55:56 | ||
269 | [regress/dynamic-forward.sh regress/test-exec.sh] | ||
270 | Allow setting of port for regress from TEST_SSH_PORT variable; ok markus@ | ||
271 | - mouring@cvs.openbsd.org 2004/06/23 00:39:38 | ||
272 | [rijndael.c] | ||
273 | -Wshadow fix up s/encrypt/do_encrypt/. OK djm@, markus@ | ||
274 | - dtucker@cvs.openbsd.org 2004/06/23 14:31:01 | ||
275 | [ssh.c] | ||
276 | Fix counting in master/slave when passing environment variables; ok djm@ | ||
277 | - (dtucker) [cipher.c] encrypt->do_encrypt inside SSH_OLD_EVP to match | ||
278 | -Wshadow change. | ||
279 | - (bal) [Makefile.in] Remove opensshd.init on 'make distclean' | ||
280 | - (dtucker) [auth.c openbsd-compat/port-aix.c openbsd-compat/port-aix.h] | ||
281 | Move loginrestrictions test to port-aix.c, replace with a generic hook. | ||
282 | - (tim) [regress/try-ciphers.sh] "if ! some_command" is not portable. | ||
283 | - (bal) [contrib/README] Removed "mdoc2man.pl" reference and added | ||
284 | reference to "findssl.sh" | ||
285 | |||
286 | 20040622 | ||
287 | - (dtucker) OpenBSD CVS Sync | ||
288 | - djm@cvs.openbsd.org 2004/06/20 17:36:59 | ||
289 | [ssh.c] | ||
290 | filter passed env vars at slave in connection sharing case; ok markus@ | ||
291 | - djm@cvs.openbsd.org 2004/06/20 18:53:39 | ||
292 | [sftp.c] | ||
293 | make "ls -l" listings print user/group names, add "ls -n" to show uid/gid | ||
294 | (like /bin/ls); idea & ok markus@ | ||
295 | - djm@cvs.openbsd.org 2004/06/20 19:28:12 | ||
296 | [sftp.1] | ||
297 | mention new -n flag | ||
298 | - avsm@cvs.openbsd.org 2004/06/21 17:36:31 | ||
299 | [auth-rsa.c auth2-gss.c auth2-pubkey.c authfile.c canohost.c channels.c | ||
300 | cipher.c dns.c kex.c monitor.c monitor_fdpass.c monitor_wrap.c | ||
301 | monitor_wrap.h nchan.c packet.c progressmeter.c scp.c sftp-server.c sftp.c | ||
302 | ssh-gss.h ssh-keygen.c ssh.c sshconnect.c sshconnect1.c sshlogin.c | ||
303 | sshpty.c] | ||
304 | make ssh -Wshadow clean, no functional changes | ||
305 | markus@ ok | ||
306 | - djm@cvs.openbsd.org 2004/06/21 17:53:03 | ||
307 | [session.c] | ||
308 | fix fd leak for multiple subsystem connections; with markus@ | ||
309 | - djm@cvs.openbsd.org 2004/06/21 22:02:58 | ||
310 | [log.h] | ||
311 | mark fatal and cleanup exit as __dead; ok markus@ | ||
312 | - djm@cvs.openbsd.org 2004/06/21 22:04:50 | ||
313 | [sftp.c] | ||
314 | introduce sorting for ls, same options as /bin/ls; ok markus@ | ||
315 | - djm@cvs.openbsd.org 2004/06/21 22:30:45 | ||
316 | [sftp.c] | ||
317 | prefix ls option flags with LS_ | ||
318 | - djm@cvs.openbsd.org 2004/06/21 22:41:31 | ||
319 | [sftp.1] | ||
320 | document sort options | ||
321 | - djm@cvs.openbsd.org 2004/06/22 01:16:39 | ||
322 | [sftp.c] | ||
323 | don't show .files by default in ls, add -a option to turn them back on; | ||
324 | ok markus | ||
325 | - markus@cvs.openbsd.org 2004/06/22 03:12:13 | ||
326 | [regress/envpass.sh regress/multiplex.sh] | ||
327 | more portable env passing tests | ||
328 | - dtucker@cvs.openbsd.org 2004/06/22 05:05:45 | ||
329 | [monitor.c monitor_wrap.c] | ||
330 | Change login->username, will prevent -Wshadow errors in Portable; | ||
331 | ok markus@ | ||
332 | - (dtucker) [monitor.c] Fix Portable-specific -Wshadow warnings on "socket". | ||
333 | - (dtucker) [defines.h] Define __dead if not already defined. | ||
334 | - (bal) [auth-passwd.c auth1.c] Clean up unused variables. | ||
335 | |||
336 | 20040620 | ||
337 | - (tim) [configure.ac Makefile.in] Only change TEST_SHELL on broken platforms. | ||
338 | |||
339 | 20040619 | ||
340 | - (dtucker) [auth-pam.c] Don't use PAM namespace for | ||
341 | pam_password_change_required either. | ||
342 | - (tim) [configure.ac buildpkg.sh.in contrib/solaris/README] move opensshd | ||
343 | init script to top level directory. Add opensshd.init.in. | ||
344 | Remove contrib/solaris/buildpkg.sh, contrib/solaris/opensshd.in | ||
345 | |||
346 | 20040618 | ||
347 | - (djm) OpenBSD CVS Sync | ||
348 | - djm@cvs.openbsd.org 2004/06/17 14:52:48 | ||
349 | [clientloop.c clientloop.h ssh.c] | ||
350 | support environment passing over shared connections; ok markus@ | ||
351 | - djm@cvs.openbsd.org 2004/06/17 15:10:14 | ||
352 | [clientloop.c misc.h readconf.c readpass.c ssh.c ssh_config.5] | ||
353 | Add option for confirmation (ControlMaster=ask) via ssh-askpass before | ||
354 | opening shared connections; ok markus@ | ||
355 | - djm@cvs.openbsd.org 2004/06/17 14:53:27 | ||
356 | [regress/multiplex.sh] | ||
357 | shared connection env passing regress test | ||
358 | - (dtucker) [regress/README.regress] Add detail on how to run a single | ||
359 | test from the top-level Makefile. | ||
360 | - (dtucker) OpenBSD CVS Sync | ||
361 | - djm@cvs.openbsd.org 2004/06/17 23:56:57 | ||
362 | [ssh.1 ssh.c] | ||
363 | sync usage() and SYNPOSIS with connection sharing changes | ||
364 | - dtucker@cvs.openbsd.org 2004/06/18 06:13:25 | ||
365 | [sftp.c] | ||
366 | Use execvp instead of execv so sftp -S ssh works. "makes sense" markus@ | ||
367 | - dtucker@cvs.openbsd.org 2004/06/18 06:15:51 | ||
368 | [multiplex.sh] | ||
369 | Use -S for scp/sftp to force the use of the ssh being tested. | ||
370 | ok djm@,markus@ | ||
371 | - (djm) OpenBSD CVS Sync | ||
372 | - djm@cvs.openbsd.org 2004/06/18 10:40:19 | ||
373 | [ssh.c] | ||
374 | delay signal handler setup until we have finished talking to the master. | ||
375 | allow interrupting of setup (e.g. if master is stuck); ok markus@ | ||
376 | - markus@cvs.openbsd.org 2004/06/18 10:55:43 | ||
377 | [ssh.1 ssh.c] | ||
378 | trim synopsis for -S, allow -S and -oControlMaster, -MM means 'ask'; | ||
379 | ok djm | ||
380 | - djm@cvs.openbsd.org 2004/06/18 11:11:54 | ||
381 | [channels.c clientloop.c] | ||
382 | Don't explode in clientloop when we receive a bogus channel id, but | ||
383 | also don't generate them to begin with; ok markus@ | ||
384 | |||
385 | 20040617 | ||
386 | - (dtucker) [regress/scp.sh] diff -N is not portable (but needed for some | ||
387 | platforms), so test if diff understands it. Pointed out by tim@, ok djm@ | ||
388 | - (dtucker) OpenBSD CVS Sync regress/ | ||
389 | - dtucker@cvs.openbsd.org 2004/06/17 05:51:59 | ||
390 | [regress/multiplex.sh] | ||
391 | Remove datafile between and after tests, kill sshd rather than wait; | ||
392 | ok djm@ | ||
393 | - dtucker@cvs.openbsd.org 2004/06/17 06:00:05 | ||
394 | [regress/multiplex.sh] | ||
395 | Use DATA and COPY for test data rather than hard-coded paths; ok djm@ | ||
396 | - dtucker@cvs.openbsd.org 2004/06/17 06:19:06 | ||
397 | [regress/multiplex.sh] | ||
398 | Add small description of failing test to failure message; ok djm@ | ||
399 | - (dtucker) [regress/multiplex.sh] add EXEEXT for those platforms that need | ||
400 | it. | ||
401 | - (dtucker) [regress/multiplex.sh] Increase sleep time to 120 sec (60 is not | ||
402 | enough for slow systems, especially if they don't have a kernel RNG). | ||
403 | |||
404 | 20040616 | ||
405 | - (dtucker) [openbsd-compat/port-aix.c] Expand whitespace -> tabs. No | ||
406 | code changes. | ||
407 | - (dtucker) OpenBSD CVS Sync regress/ | ||
408 | - djm@cvs.openbsd.org 2004/04/27 09:47:30 | ||
409 | [regress/Makefile regress/test-exec.sh, added regress/envpass.sh] | ||
410 | regress test for environment passing, SendEnv & AcceptEnv options; | ||
411 | ok markus@ | ||
412 | - dtucker@cvs.openbsd.org 2004/06/13 13:51:02 | ||
413 | [regress/Makefile regress/test-exec.sh, added regress/scp-ssh-wrapper.sh | ||
414 | regress/scp.sh] | ||
415 | Add scp regression test; with & ok markus@ | ||
416 | - djm@cvs.openbsd.org 2004/06/13 15:04:08 | ||
417 | [regress/Makefile regress/test-exec.sh, added regress/envpass.sh] | ||
418 | regress test for client multiplexing; ok markus@ | ||
419 | - djm@cvs.openbsd.org 2004/06/13 15:16:54 | ||
420 | [regress/test-exec.sh] | ||
421 | remove duplicate setting of $SCP; spotted by markus@ | ||
422 | - dtucker@cvs.openbsd.org 2004/06/16 13:15:09 | ||
423 | [regress/scp.sh] | ||
424 | Make scp -r tests use diff -rN not cmp (which won't do dirs. ok markus@ | ||
425 | - dtucker@cvs.openbsd.org 2004/06/16 13:16:40 | ||
426 | [regress/multiplex.sh] | ||
427 | Silence multiplex sftp and scp tests. ok markus@ | ||
428 | - (dtucker) [regress/test-exec.sh] | ||
429 | Move Portable-only StrictModes to top of list to make syncs easier. | ||
430 | - (dtucker) [regress/README.regress] | ||
431 | Add $TEST_SHELL to readme. | ||
432 | |||
433 | 20040615 | ||
434 | - (djm) OpenBSD CVS Sync | ||
435 | - djm@cvs.openbsd.org 2004/05/26 08:59:57 | ||
436 | [sftp.c] | ||
437 | exit -> _exit in forked child on error; from andrushock AT korovino.net | ||
438 | - markus@cvs.openbsd.org 2004/05/26 23:02:39 | ||
439 | [channels.c] | ||
440 | missing freeaddrinfo; Andrey Matveev | ||
441 | - dtucker@cvs.openbsd.org 2004/05/27 00:50:13 | ||
442 | [readconf.c] | ||
443 | Kill dead code after fatal(); ok djm@ | ||
444 | - dtucker@cvs.openbsd.org 2004/06/01 14:20:45 | ||
445 | [auth2-chall.c] | ||
446 | Remove redundant #include; ok markus@ | ||
447 | - pedro@cvs.openbsd.org 2004/06/03 12:22:20 | ||
448 | [sftp-client.c sftp.c] | ||
449 | initialize pointers, ok markus@ | ||
450 | - djm@cvs.openbsd.org 2004/06/13 12:53:24 | ||
451 | [dh.c dh.h kex.c kex.h kexdhc.c kexdhs.c monitor.c myproposal.h] | ||
452 | [ssh-keyscan.c sshconnect2.c sshd.c] | ||
453 | implement diffie-hellman-group14-sha1 kex method (trivial extension to | ||
454 | existing diffie-hellman-group1-sha1); ok markus@ | ||
455 | - dtucker@cvs.openbsd.org 2004/06/13 14:01:42 | ||
456 | [ssh.1 ssh_config.5 sshd_config.5] | ||
457 | List supported ciphers in man pages, tidy up ssh -c; | ||
458 | "looks fine" jmc@, ok markus@ | ||
459 | - djm@cvs.openbsd.org 2004/06/13 15:03:02 | ||
460 | [channels.c channels.h clientloop.c clientloop.h includes.h readconf.c] | ||
461 | [readconf.h scp.1 sftp.1 ssh.1 ssh.c ssh_config.5] | ||
462 | implement session multiplexing in the client (the server has supported | ||
463 | this since 2.0); ok markus@ | ||
464 | - djm@cvs.openbsd.org 2004/06/14 01:44:39 | ||
465 | [channels.c clientloop.c misc.c misc.h packet.c ssh-agent.c ssh-keyscan.c] | ||
466 | [sshd.c] | ||
467 | set_nonblock() instead of fnctl(...,O_NONBLOCK); "looks sane" deraadt@ | ||
468 | - djm@cvs.openbsd.org 2004/06/15 05:45:04 | ||
469 | [clientloop.c] | ||
470 | missed one unset_nonblock; spotted by Tim Rice | ||
471 | - (djm) Fix Makefile.in for connection sharing changes | ||
472 | - (djm) [ssh.c] Use separate var for address length | ||
473 | |||
474 | 20040603 | ||
475 | - (dtucker) [auth-pam.c] Don't use pam_* namespace for sshd's PAM functions. | ||
476 | ok djm@ | ||
477 | |||
478 | 20040601 | ||
479 | - (djm) [auth-pam.c] Add copyright for local changes | ||
480 | |||
481 | 20040530 | ||
482 | - (dtucker) [auth-pam.c auth-pam.h auth-passwd.c] Bug #874: Re-add PAM | ||
483 | support for PasswordAuthentication=yes. ok djm@ | ||
484 | - (dtucker) [auth-pam.c] Use an invalid password for root if | ||
485 | PermitRootLogin != yes or the login is invalid, to prevent leaking | ||
486 | information. Based on Openwall's owl-always-auth patch. ok djm@ | ||
487 | - (tim) [configure.ac Makefile.in] Add support for "make package" ok djm@ | ||
488 | - (tim) [buildpkg.sh.in] New file. A more flexible version of | ||
489 | contrib/solaris/buildpkg.sh used for "make package". | ||
490 | - (tim) [buildpkg.sh.in] Last minute fix didn't make it in the .in file. | ||
491 | |||
492 | 20040527 | ||
493 | - (dtucker) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec | ||
494 | contrib/README CREDITS INSTALL] Bug #873: Correct URLs for x11-ssh-askpass | ||
495 | and Jim Knoble's email address , from Jim himself. | ||
496 | |||
497 | 20040524 | ||
498 | - (dtucker) OpenBSD CVS Sync | ||
499 | - djm@cvs.openbsd.org 2004/05/19 12:17:33 | ||
500 | [sftp-client.c sftp.c] | ||
501 | gracefully abort transfers on receipt of SIGINT, also ignore SIGINT while | ||
502 | waiting for a command; ok markus@ | ||
503 | - dtucker@cvs.openbsd.org 2004/05/20 10:58:05 | ||
504 | [clientloop.c] | ||
505 | Trivial type fix 0 -> '\0'; ok markus@ | ||
506 | - markus@cvs.openbsd.org 2004/05/21 08:43:03 | ||
507 | [kex.h moduli.c tildexpand.c] | ||
508 | add prototypes for -Wall; ok djm | ||
509 | - djm@cvs.openbsd.org 2004/05/21 11:33:11 | ||
510 | [channels.c channels.h clientloop.c serverloop.c ssh.1] | ||
511 | bz #756: add support for the cancel-tcpip-forward request for the server | ||
512 | and the client (through the ~C commandline). reported by z3p AT | ||
513 | twistedmatrix.com; ok markus@ | ||
514 | - djm@cvs.openbsd.org 2004/05/22 06:32:12 | ||
515 | [clientloop.c ssh.1] | ||
516 | use '-h' for help in ~C commandline instead of '-?'; inspired by jmc@ | ||
517 | - jmc@cvs.openbsd.org 2004/05/22 16:01:05 | ||
518 | [ssh.1] | ||
519 | kill whitespace at eol; | ||
520 | - dtucker@cvs.openbsd.org 2004/05/23 23:59:53 | ||
521 | [auth.c auth.h auth1.c auth2.c servconf.c servconf.h sshd_config | ||
522 | sshd_config.5] | ||
523 | Add MaxAuthTries sshd config option; ok markus@ | ||
524 | - (dtucker) [auth-pam.c] Bug #839: Ensure that pam authentication "thread" | ||
525 | is terminated if the privsep slave exits during keyboard-interactive | ||
526 | authentication. ok djm@ | ||
527 | - (dtucker) [sshd.c] Fix typo in comment. | ||
528 | |||
529 | 20040523 | ||
530 | - (djm) [sshd_config] Explain consequences of UsePAM=yes a little better in | ||
531 | sshd_config; ok dtucker@ | ||
532 | - (djm) [configure.ac] Warn if the system has no known way of figuring out | ||
533 | which user is on the other end of a Unix domain socket; ok dtucker@ | ||
534 | - (bal) [openbsd-compat/sys-queue.h] Reintroduce machinary to handle | ||
535 | old/broken/incomplete <sys/queue.h>. | ||
536 | |||
537 | 20040513 | ||
538 | - (dtucker) [configure.ac] Bug #867: Additional tests for res_query in | ||
539 | libresolv, fixes problems detecting it on some platforms | ||
540 | (eg Linux/x86-64). From Kurt Roeckx via Debian, ok mouring@ | ||
541 | - (dtucker) OpenBSD CVS Sync | ||
542 | - jmc@cvs.openbsd.org 2004/05/04 18:36:07 | ||
543 | [scp.1] | ||
544 | SendEnv here too; | ||
545 | - jmc@cvs.openbsd.org 2004/05/06 11:24:23 | ||
546 | [ssh_config.5] | ||
547 | typo from John Cosimano (PR 3770); | ||
548 | - deraadt@cvs.openbsd.org 2004/05/08 00:01:37 | ||
549 | [auth.c clientloop.c misc.h servconf.c ssh.c sshpty.h sshtty.c | ||
550 | tildexpand.c], removed: sshtty.h tildexpand.h | ||
551 | make two tiny header files go away; djm ok | ||
552 | - djm@cvs.openbsd.org 2004/05/08 00:21:31 | ||
553 | [clientloop.c misc.h readpass.c scard.c ssh-add.c ssh-agent.c ssh-keygen.c | ||
554 | sshconnect.c sshconnect1.c sshconnect2.c] removed: readpass.h | ||
555 | kill a tiny header; ok deraadt@ | ||
556 | - djm@cvs.openbsd.org 2004/05/09 00:06:47 | ||
557 | [moduli.c ssh-keygen.c] removed: moduli.h | ||
558 | zap another tiny header; ok deraadt@ | ||
559 | - djm@cvs.openbsd.org 2004/05/09 01:19:28 | ||
560 | [OVERVIEW auth-rsa.c auth1.c kex.c monitor.c session.c sshconnect1.c | ||
561 | sshd.c] removed: mpaux.c mpaux.h | ||
562 | kill some more tiny files; ok deraadt@ | ||
563 | - djm@cvs.openbsd.org 2004/05/09 01:26:48 | ||
564 | [kex.c] | ||
565 | don't overwrite what we are trying to compute | ||
566 | - deraadt@cvs.openbsd.org 2004/05/11 19:01:43 | ||
567 | [auth.c auth2-none.c authfile.c channels.c monitor.c monitor_mm.c | ||
568 | packet.c packet.h progressmeter.c session.c openbsd-compat/xmmap.c] | ||
569 | improve some code lint did not like; djm millert ok | ||
570 | - dtucker@cvs.openbsd.org 2004/05/13 02:47:50 | ||
571 | [ssh-agent.1] | ||
572 | Add examples to ssh-agent.1, bz#481 from Ralf Hauser; ok deraadt@ | ||
573 | - (dtucker) [sshd.8] Bug #843: Add warning about PasswordAuthentication to | ||
574 | UsePAM section. Parts from djm@ and jmc@. | ||
575 | - (dtucker) [auth-pam.c scard-opensc.c] Tinderbox says auth-pam.c uses | ||
576 | readpass.h, grep says scard-opensc.c does too. Replace with misc.h. | ||
577 | - (dtucker) [openbsd-compat/getrrsetbyname.c] Check that HAVE_DECL_H_ERROR | ||
578 | is defined before using. | ||
579 | - (dtucker) [openbsd-compat/getrrsetbyname.c] Fix typo too: HAVE_DECL_H_ERROR | ||
580 | -> HAVE_DECL_H_ERRNO. | ||
581 | |||
582 | 20040502 | ||
583 | - (dtucker) OpenBSD CVS Sync | ||
584 | - djm@cvs.openbsd.org 2004/04/22 11:56:57 | ||
585 | [moduli.c] | ||
586 | Bugzilla #850: Sophie Germain is the correct name of the French | ||
587 | mathematician, "Sophie Germaine" isn't; from Luc.Maisonobe@c-s.fr | ||
588 | - djm@cvs.openbsd.org 2004/04/27 09:46:37 | ||
589 | [readconf.c readconf.h servconf.c servconf.h session.c session.h ssh.c | ||
590 | ssh_config.5 sshd_config.5] | ||
591 | bz #815: implement ability to pass specified environment variables from | ||
592 | the client to the server; ok markus@ | ||
593 | - djm@cvs.openbsd.org 2004/04/28 05:17:10 | ||
594 | [ssh_config.5 sshd_config.5] | ||
595 | manpage fixes in envpass stuff from Brian Poole (raj AT cerias.purdue.edu) | ||
596 | - jmc@cvs.openbsd.org 2004/04/28 07:02:56 | ||
597 | [sshd_config.5] | ||
598 | remove unnecessary .Pp; | ||
599 | - jmc@cvs.openbsd.org 2004/04/28 07:13:42 | ||
600 | [sftp.1 ssh.1] | ||
601 | add SendEnv to -o list; | ||
602 | - dtucker@cvs.openbsd.org 2004/05/02 11:54:31 | ||
603 | [sshd.8] | ||
604 | Man page grammar fix (bz #858), from damerell at chiark.greenend.org.uk | ||
605 | via Debian; ok djm@ | ||
606 | - dtucker@cvs.openbsd.org 2004/05/02 11:57:52 | ||
607 | [ssh.1] | ||
608 | ConnectionTimeout -> ConnectTimeout, from m.a.ellis at ncl.ac.uk via | ||
609 | Debian. ok djm@ | ||
610 | - dtucker@cvs.openbsd.org 2004/05/02 23:02:17 | ||
611 | [sftp.1] | ||
612 | ConnectionTimeout -> ConnectTimeout here too, pointed out by jmc@ | ||
613 | - dtucker@cvs.openbsd.org 2004/05/02 23:17:51 | ||
614 | [scp.1] | ||
615 | ConnectionTimeout -> ConnectTimeout for scp.1 too. | ||
616 | |||
617 | 20040423 | ||
618 | - (dtucker) [configure.ac openbsd-compat/getrrsetbyname.c] Declare h_errno | ||
619 | as extern int if not already declared. Fixes compile errors on old SCO | ||
620 | platforms. ok tim@ | ||
621 | - (dtucker) [README.platform] List prereqs for building on Cygwin. | ||
622 | |||
623 | 20040421 | ||
624 | - (djm) Update config.guess and config.sub to autoconf-2.59 versions; ok tim@ | ||
625 | |||
626 | 20040420 | ||
627 | - (djm) OpenBSD CVS Sync | ||
628 | - henning@cvs.openbsd.org 2004/04/08 16:08:21 | ||
629 | [sshconnect2.c] | ||
630 | swap the last two parameters to TAILQ_FOREACH_REVERSE. matches what | ||
631 | FreeBSD and NetBSD do. | ||
632 | ok millert@ mcbride@ markus@ ho@, checked to not affect ports by naddy@ | ||
633 | - djm@cvs.openbsd.org 2004/04/18 23:10:26 | ||
634 | [readconf.c readconf.h ssh-keysign.c ssh.c] | ||
635 | perform strict ownership and modes checks for ~/.ssh/config files, | ||
636 | as these can be used to execute arbitrary programs; ok markus@ | ||
637 | NB. ssh will now exit when it detects a config with poor permissions | ||
638 | - djm@cvs.openbsd.org 2004/04/19 13:02:40 | ||
639 | [ssh.1 ssh_config.5] | ||
640 | document strict permission checks on ~/.ssh/config; prompted by, | ||
641 | with & ok jmc@ | ||
642 | - jmc@cvs.openbsd.org 2004/04/19 16:12:14 | ||
643 | [ssh_config.5] | ||
644 | kill whitespace at eol; | ||
645 | - djm@cvs.openbsd.org 2004/04/19 21:51:49 | ||
646 | [ssh.c] | ||
647 | fix idiot typo that i introduced in my last commit; | ||
648 | spotted by cschneid AT cschneid.com | ||
649 | - (djm) [openbsd-compat/sys-queue.h] Sync with OpenBSD, needed for | ||
650 | above change | ||
651 | - (djm) [configure.ac] Check whether libroken is required when building | ||
652 | with Heimdal | ||
653 | |||
654 | 20040419 | ||
655 | - (dtucker) OpenBSD CVS Sync | ||
656 | - dtucker@cvs.openbsd.org 2004/02/29 22:04:45 | ||
657 | [regress/login-timeout.sh] | ||
658 | Use sudo when restarting daemon during test. ok markus@ | ||
659 | - dtucker@cvs.openbsd.org 2004/03/08 10:17:12 | ||
660 | [regress/login-timeout.sh] | ||
661 | Missing OBJ, from tim@. ok markus@ (Already fixed, ID sync only) | ||
662 | - djm@cvs.openbsd.org 2004/03/30 12:41:56 | ||
663 | [sftp-client.c] | ||
664 | sync comment with reality | ||
665 | - djm@cvs.openbsd.org 2004/03/31 21:58:47 | ||
666 | [canohost.c] | ||
667 | don't skip ip options check when UseDNS=no; ok markus@ (ID sync only) | ||
668 | - markus@cvs.openbsd.org 2004/04/01 12:19:57 | ||
669 | [scp.c] | ||
670 | limit trust between local and remote rcp/scp process, | ||
671 | noticed by lcamtuf; ok deraadt@, djm@ | ||
672 | |||
1 | 20040418 | 673 | 20040418 |
2 | - (dtucker) [auth-pam.c] Log username and source host for failed PAM | 674 | - (dtucker) [auth-pam.c] Log username and source host for failed PAM |
3 | authentication attempts. With & ok djm@ | 675 | authentication attempts. With & ok djm@ |
4 | - (djm) [openbsd-compat/bsd-cygwin_util.c] Recent versions of Cygwin allow | 676 | - (djm) [openbsd-compat/bsd-cygwin_util.c] Recent versions of Cygwin allow |
5 | change of user context without a password, so relax auth method | 677 | change of user context without a password, so relax auth method |
6 | restrictions; from vinschen AT redhat.com; ok dtucker@ | 678 | restrictions; from vinschen AT redhat.com; ok dtucker@ |
7 | - Release 3.8.1p1 | ||
8 | 679 | ||
9 | 20040416 | 680 | 20040416 |
10 | - (dtucker) [regress/sftp-cmds.sh] Skip quoting test on Cygwin, since | 681 | - (dtucker) [regress/sftp-cmds.sh] Skip quoting test on Cygwin, since |
@@ -983,4 +1654,4 @@ | |||
983 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1654 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
984 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1655 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
985 | 1656 | ||
986 | $Id: ChangeLog,v 1.3316.2.1 2004/04/18 12:51:12 djm Exp $ | 1657 | $Id: ChangeLog,v 1.3517 2004/08/17 12:50:40 djm Exp $ |
@@ -30,7 +30,7 @@ libraries and headers. | |||
30 | GNOME: | 30 | GNOME: |
31 | http://www.gnome.org/ | 31 | http://www.gnome.org/ |
32 | 32 | ||
33 | Alternatively, Jim Knoble <jmknoble@jmknoble.cx> has written an excellent X11 | 33 | Alternatively, Jim Knoble <jmknoble@pobox.com> has written an excellent X11 |
34 | passphrase requester. This is maintained separately at: | 34 | passphrase requester. This is maintained separately at: |
35 | 35 | ||
36 | http://www.jmknoble.net/software/x11-ssh-askpass/ | 36 | http://www.jmknoble.net/software/x11-ssh-askpass/ |
@@ -200,4 +200,4 @@ Please refer to the "reporting bugs" section of the webpage at | |||
200 | http://www.openssh.com/ | 200 | http://www.openssh.com/ |
201 | 201 | ||
202 | 202 | ||
203 | $Id: INSTALL,v 1.63 2003/11/21 12:48:55 djm Exp $ | 203 | $Id: INSTALL,v 1.64 2004/05/26 23:59:31 dtucker Exp $ |
diff --git a/Makefile.in b/Makefile.in index 8bff3cb2d..ea0f9c3ef 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.257 2004/02/18 03:35:11 djm Exp $ | 1 | # $Id: Makefile.in,v 1.263 2004/08/15 11:01:37 dtucker Exp $ |
2 | 2 | ||
3 | # uncomment if you run a non bourne compatable shell. Ie. csh | 3 | # uncomment if you run a non bourne compatable shell. Ie. csh |
4 | #SHELL = @SH@ | 4 | #SHELL = @SH@ |
@@ -67,22 +67,21 @@ LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o buffer.o \ | |||
67 | compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \ | 67 | compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \ |
68 | log.o match.o moduli.o mpaux.o nchan.o packet.o \ | 68 | log.o match.o moduli.o mpaux.o nchan.o packet.o \ |
69 | readpass.o rsa.o tildexpand.o ttymodes.o xmalloc.o \ | 69 | readpass.o rsa.o tildexpand.o ttymodes.o xmalloc.o \ |
70 | atomicio.o key.o dispatch.o kex.o mac.o uuencode.o misc.o \ | 70 | atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ |
71 | rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o kexgex.o \ | 71 | monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \ |
72 | kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \ | 72 | kexgex.o kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \ |
73 | entropy.o scard-opensc.o gss-genr.o | 73 | entropy.o scard-opensc.o gss-genr.o |
74 | 74 | ||
75 | SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ | 75 | SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ |
76 | sshconnect.o sshconnect1.o sshconnect2.o | 76 | sshconnect.o sshconnect1.o sshconnect2.o |
77 | 77 | ||
78 | SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ | 78 | SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ |
79 | sshpty.o sshlogin.o servconf.o serverloop.o uidswap.o \ | 79 | sshpty.o sshlogin.o servconf.o serverloop.o \ |
80 | auth.o auth1.o auth2.o auth-options.o session.o \ | 80 | auth.o auth1.o auth2.o auth-options.o session.o \ |
81 | auth-chall.o auth2-chall.o groupaccess.o \ | 81 | auth-chall.o auth2-chall.o groupaccess.o \ |
82 | auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \ | 82 | auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \ |
83 | auth2-none.o auth2-passwd.o auth2-pubkey.o \ | 83 | auth2-none.o auth2-passwd.o auth2-pubkey.o \ |
84 | monitor_mm.o monitor.o monitor_wrap.o monitor_fdpass.o \ | 84 | monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o \ |
85 | kexdhs.o kexgexs.o \ | ||
86 | auth-krb5.o \ | 85 | auth-krb5.o \ |
87 | auth2-gss.o gss-serv.o gss-serv-krb5.o \ | 86 | auth2-gss.o gss-serv.o gss-serv-krb5.o \ |
88 | loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o | 87 | loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o |
@@ -200,11 +199,14 @@ clean: regressclean | |||
200 | 199 | ||
201 | distclean: regressclean | 200 | distclean: regressclean |
202 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log | 201 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log |
203 | rm -f *.out core | 202 | rm -f *.out core opensshd.init |
204 | rm -f Makefile config.h config.status ssh_prng_cmds *~ | 203 | rm -f Makefile buildpkg.sh config.h config.status ssh_prng_cmds *~ |
205 | rm -rf autom4te.cache | 204 | rm -rf autom4te.cache |
206 | (cd openbsd-compat && $(MAKE) distclean) | 205 | (cd openbsd-compat && $(MAKE) distclean) |
207 | (cd scard && $(MAKE) distclean) | 206 | (cd scard && $(MAKE) distclean) |
207 | if test -d pkg ; then \ | ||
208 | rm -fr pkg ; \ | ||
209 | fi | ||
208 | 210 | ||
209 | veryclean: distclean | 211 | veryclean: distclean |
210 | rm -f configure config.h.in *.0 | 212 | rm -f configure config.h.in *.0 |
@@ -375,7 +377,7 @@ tests: $(TARGETS) | |||
375 | [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \ | 377 | [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \ |
376 | [ -f `pwd`/regress/Makefile ] || \ | 378 | [ -f `pwd`/regress/Makefile ] || \ |
377 | ln -s $(srcdir)/regress/Makefile `pwd`/regress/Makefile ; \ | 379 | ln -s $(srcdir)/regress/Makefile `pwd`/regress/Makefile ; \ |
378 | TEST_SHELL="@TEST_MINUS_S_SH@"; \ | 380 | TEST_SHELL="@TEST_SHELL@"; \ |
379 | TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ | 381 | TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ |
380 | TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \ | 382 | TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \ |
381 | TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \ | 383 | TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \ |
@@ -407,3 +409,9 @@ regressclean: | |||
407 | if [ -f regress/Makefile ] && [ -r regress/Makefile ]; then \ | 409 | if [ -f regress/Makefile ] && [ -r regress/Makefile ]; then \ |
408 | (cd regress && $(MAKE) clean) \ | 410 | (cd regress && $(MAKE) clean) \ |
409 | fi | 411 | fi |
412 | |||
413 | package: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) | ||
414 | if [ "@MAKE_PACKAGE_SUPPORTED@" = yes ]; then \ | ||
415 | sh buildpkg.sh; \ | ||
416 | fi | ||
417 | |||
@@ -40,7 +40,6 @@ these programs. | |||
40 | Multiple Precision Integer Library | 40 | Multiple Precision Integer Library |
41 | 41 | ||
42 | - Uses the SSLeay BIGNUM sublibrary. | 42 | - Uses the SSLeay BIGNUM sublibrary. |
43 | - Some auxiliary functions for mp-int manipulation are in mpaux.c. | ||
44 | 43 | ||
45 | Random Numbers | 44 | Random Numbers |
46 | 45 | ||
@@ -15,10 +15,11 @@ Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, Theo de Raadt, | |||
15 | and Dug Song. It has a homepage at http://www.openssh.com/ | 15 | and Dug Song. It has a homepage at http://www.openssh.com/ |
16 | 16 | ||
17 | This port consists of the re-introduction of autoconf support, PAM | 17 | This port consists of the re-introduction of autoconf support, PAM |
18 | support (for Linux and Solaris), EGD[1]/PRNGD[2] support and replacements | 18 | support, EGD[1]/PRNGD[2] support and replacements for OpenBSD library |
19 | for OpenBSD library functions that are (regrettably) absent from other | 19 | functions that are (regrettably) absent from other unices. This port |
20 | unices. This port has been best tested on Linux, Solaris, HP-UX, NetBSD, | 20 | has been best tested on AIX, Cygwin, HP-UX, Linux, MacOS/X, |
21 | Irix and AIX. Support for SCO, NeXT and other Unices is underway. | 21 | NetBSD, OpenBSD, OpenServer, Solaris, Unicos, and UnixWare. |
22 | |||
22 | This version actively tracks changes in the OpenBSD CVS repository. | 23 | This version actively tracks changes in the OpenBSD CVS repository. |
23 | 24 | ||
24 | The PAM support is now more functional than the popular packages of | 25 | The PAM support is now more functional than the popular packages of |
@@ -32,13 +33,8 @@ refer to http://www.openssh.com/list.html for details on how to join. | |||
32 | 33 | ||
33 | Please send bug reports and patches to the mailing list | 34 | Please send bug reports and patches to the mailing list |
34 | openssh-unix-dev@mindrot.org. The list is open to posting by | 35 | openssh-unix-dev@mindrot.org. The list is open to posting by |
35 | unsubscribed users. | 36 | unsubscribed users.Code contribution are welcomed, but please follow the |
36 | 37 | OpenBSD style guidelines[6]. | |
37 | If you are a citizen of an USA-embargoed country to which export of | ||
38 | cryptographic products is restricted, then please refrain from sending | ||
39 | crypto-related code or patches to the list. We cannot accept them. | ||
40 | Other code contribution are accepted, but please follow the OpenBSD | ||
41 | style guidelines[6]. | ||
42 | 38 | ||
43 | Please refer to the INSTALL document for information on how to install | 39 | Please refer to the INSTALL document for information on how to install |
44 | OpenSSH on your system. There are a number of differences between this | 40 | OpenSSH on your system. There are a number of differences between this |
@@ -65,4 +61,4 @@ References - | |||
65 | [6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9 | 61 | [6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9 |
66 | [7] http://www.openssh.com/faq.html | 62 | [7] http://www.openssh.com/faq.html |
67 | 63 | ||
68 | $Id: README,v 1.54 2004/04/18 10:32:56 djm Exp $ | 64 | $Id: README,v 1.56 2004/08/14 00:26:30 djm Exp $ |
diff --git a/README.platform b/README.platform index c4d0c74f8..880b83c63 100644 --- a/README.platform +++ b/README.platform | |||
@@ -13,10 +13,18 @@ Accounts in this state must have their passwords reset manually by the | |||
13 | administrator. As a precaution, it is recommended that the administrative | 13 | administrator. As a precaution, it is recommended that the administrative |
14 | passwords be reset before upgrading from OpenSSH <3.8. | 14 | passwords be reset before upgrading from OpenSSH <3.8. |
15 | 15 | ||
16 | |||
17 | Cygwin | ||
18 | ------ | ||
19 | To build on Cygwin, OpenSSH requires the following packages: | ||
20 | gcc, gcc-mingw-core, mingw-runtime, binutils, make, openssl, | ||
21 | openssl-devel, zlib, minres, minires-devel. | ||
22 | |||
23 | |||
16 | Solaris | 24 | Solaris |
17 | ------- | 25 | ------- |
18 | Currently, sshd does not support BSM auditting. This can show up as errors | 26 | Currently, sshd does not support BSM auditting. This can show up as errors |
19 | when editting cron entries via crontab. See. | 27 | when editting cron entries via crontab. See. |
20 | http://bugzilla.mindrot.org/show_bug.cgi?id=125 | 28 | http://bugzilla.mindrot.org/show_bug.cgi?id=125 |
21 | 29 | ||
22 | $Id: README.platform,v 1.1 2004/02/24 05:14:41 dtucker Exp $ | 30 | $Id: README.platform,v 1.2 2004/04/23 08:57:13 dtucker Exp $ |
diff --git a/README.privsep b/README.privsep index 9d48bbcf9..32403770d 100644 --- a/README.privsep +++ b/README.privsep | |||
@@ -42,9 +42,9 @@ PAM-enabled OpenSSH is known to function with privsep on Linux. | |||
42 | It does not function on HP-UX with a trusted system | 42 | It does not function on HP-UX with a trusted system |
43 | configuration. | 43 | configuration. |
44 | 44 | ||
45 | On Compaq Tru64 Unix, only the pre-authentication part of privsep is | 45 | On Cygwin, Tru64 Unix, OpenServer, and Unicos only the pre-authentication |
46 | supported. Post-authentication privsep is disabled automatically (so | 46 | part of privsep is supported. Post-authentication privsep is disabled |
47 | you won't see the additional process mentioned below). | 47 | automatically (so you won't see the additional process mentioned below). |
48 | 48 | ||
49 | Note that for a normal interactive login with a shell, enabling privsep | 49 | Note that for a normal interactive login with a shell, enabling privsep |
50 | will require 1 additional process per login session. | 50 | will require 1 additional process per login session. |
@@ -61,4 +61,4 @@ process 1005 is the sshd process listening for new connections. | |||
61 | process 6917 is the privileged monitor process, 6919 is the user owned | 61 | process 6917 is the privileged monitor process, 6919 is the user owned |
62 | sshd process and 6921 is the shell process. | 62 | sshd process and 6921 is the shell process. |
63 | 63 | ||
64 | $Id: README.privsep,v 1.13 2003/11/21 12:48:55 djm Exp $ | 64 | $Id: README.privsep,v 1.14 2004/06/28 03:50:36 tim Exp $ |
diff --git a/acconfig.h b/acconfig.h index f14353519..014413505 100644 --- a/acconfig.h +++ b/acconfig.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: acconfig.h,v 1.177 2004/04/15 23:22:40 dtucker Exp $ */ | 1 | /* $Id: acconfig.h,v 1.180 2004/08/16 13:12:06 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. | 4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. |
@@ -104,6 +104,9 @@ | |||
104 | /* Work around problematic Linux PAM modules handling of PAM_TTY */ | 104 | /* Work around problematic Linux PAM modules handling of PAM_TTY */ |
105 | #undef PAM_TTY_KLUDGE | 105 | #undef PAM_TTY_KLUDGE |
106 | 106 | ||
107 | /* Define if pam_chauthtok wants real uid set to the unpriv'ed user */ | ||
108 | #undef SSHPAM_CHAUTHTOK_NEEDS_RUID | ||
109 | |||
107 | /* Use PIPES instead of a socketpair() */ | 110 | /* Use PIPES instead of a socketpair() */ |
108 | #undef USE_PIPES | 111 | #undef USE_PIPES |
109 | 112 | ||
@@ -434,6 +437,12 @@ | |||
434 | /* Define if cmsg_type is not passed correctly */ | 437 | /* Define if cmsg_type is not passed correctly */ |
435 | #undef BROKEN_CMSG_TYPE | 438 | #undef BROKEN_CMSG_TYPE |
436 | 439 | ||
440 | /* | ||
441 | * Define to whatever link() returns for "not supported" if it doesn't | ||
442 | * return EOPNOTSUPP. | ||
443 | */ | ||
444 | #undef LINK_OPNOTSUPP_ERRNO | ||
445 | |||
437 | /* Strings used in /etc/passwd to denote locked account */ | 446 | /* Strings used in /etc/passwd to denote locked account */ |
438 | #undef LOCKED_PASSWD_STRING | 447 | #undef LOCKED_PASSWD_STRING |
439 | #undef LOCKED_PASSWD_PREFIX | 448 | #undef LOCKED_PASSWD_PREFIX |
@@ -448,6 +457,9 @@ | |||
448 | /* Define if your resolver libs need this for getrrsetbyname */ | 457 | /* Define if your resolver libs need this for getrrsetbyname */ |
449 | #undef BIND_8_COMPAT | 458 | #undef BIND_8_COMPAT |
450 | 459 | ||
460 | /* Define if you have /proc/$pid/fd */ | ||
461 | #undef HAVE_PROC_PID | ||
462 | |||
451 | @BOTTOM@ | 463 | @BOTTOM@ |
452 | 464 | ||
453 | /* ******************* Shouldn't need to edit below this line ************** */ | 465 | /* ******************* Shouldn't need to edit below this line ************** */ |
diff --git a/auth-krb5.c b/auth-krb5.c index a728ebac1..a324ff15c 100644 --- a/auth-krb5.c +++ b/auth-krb5.c | |||
@@ -69,6 +69,7 @@ auth_krb5_password(Authctxt *authctxt, const char *password) | |||
69 | krb5_principal server; | 69 | krb5_principal server; |
70 | char ccname[40]; | 70 | char ccname[40]; |
71 | int tmpfd; | 71 | int tmpfd; |
72 | mode_t old_umask; | ||
72 | #endif | 73 | #endif |
73 | krb5_error_code problem; | 74 | krb5_error_code problem; |
74 | krb5_ccache ccache = NULL; | 75 | krb5_ccache ccache = NULL; |
@@ -147,7 +148,10 @@ auth_krb5_password(Authctxt *authctxt, const char *password) | |||
147 | 148 | ||
148 | snprintf(ccname,sizeof(ccname),"FILE:/tmp/krb5cc_%d_XXXXXX",geteuid()); | 149 | snprintf(ccname,sizeof(ccname),"FILE:/tmp/krb5cc_%d_XXXXXX",geteuid()); |
149 | 150 | ||
150 | if ((tmpfd = mkstemp(ccname+strlen("FILE:")))==-1) { | 151 | old_umask = umask(0177); |
152 | tmpfd = mkstemp(ccname + strlen("FILE:")); | ||
153 | umask(old_umask); | ||
154 | if (tmpfd == -1) { | ||
151 | logit("mkstemp(): %.100s", strerror(errno)); | 155 | logit("mkstemp(): %.100s", strerror(errno)); |
152 | problem = errno; | 156 | problem = errno; |
153 | goto out; | 157 | goto out; |
diff --git a/auth-pam.c b/auth-pam.c index 9be57dacd..147f4f8bb 100644 --- a/auth-pam.c +++ b/auth-pam.c | |||
@@ -28,10 +28,26 @@ | |||
28 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 28 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
29 | * SUCH DAMAGE. | 29 | * SUCH DAMAGE. |
30 | */ | 30 | */ |
31 | /* | ||
32 | * Copyright (c) 2003,2004 Damien Miller <djm@mindrot.org> | ||
33 | * Copyright (c) 2003,2004 Darren Tucker <dtucker@zip.com.au> | ||
34 | * | ||
35 | * Permission to use, copy, modify, and distribute this software for any | ||
36 | * purpose with or without fee is hereby granted, provided that the above | ||
37 | * copyright notice and this permission notice appear in all copies. | ||
38 | * | ||
39 | * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
40 | * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
41 | * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
42 | * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
43 | * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
44 | * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
45 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
46 | */ | ||
31 | 47 | ||
32 | /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ | 48 | /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ |
33 | #include "includes.h" | 49 | #include "includes.h" |
34 | RCSID("$Id: auth-pam.c,v 1.100 2004/04/18 01:00:26 dtucker Exp $"); | 50 | RCSID("$Id: auth-pam.c,v 1.114 2004/08/16 13:12:06 dtucker Exp $"); |
35 | 51 | ||
36 | #ifdef USE_PAM | 52 | #ifdef USE_PAM |
37 | #if defined(HAVE_SECURITY_PAM_APPL_H) | 53 | #if defined(HAVE_SECURITY_PAM_APPL_H) |
@@ -49,7 +65,7 @@ RCSID("$Id: auth-pam.c,v 1.100 2004/04/18 01:00:26 dtucker Exp $"); | |||
49 | #include "monitor_wrap.h" | 65 | #include "monitor_wrap.h" |
50 | #include "msg.h" | 66 | #include "msg.h" |
51 | #include "packet.h" | 67 | #include "packet.h" |
52 | #include "readpass.h" | 68 | #include "misc.h" |
53 | #include "servconf.h" | 69 | #include "servconf.h" |
54 | #include "ssh2.h" | 70 | #include "ssh2.h" |
55 | #include "xmalloc.h" | 71 | #include "xmalloc.h" |
@@ -170,6 +186,7 @@ static int sshpam_account_status = -1; | |||
170 | static char **sshpam_env = NULL; | 186 | static char **sshpam_env = NULL; |
171 | static Authctxt *sshpam_authctxt = NULL; | 187 | static Authctxt *sshpam_authctxt = NULL; |
172 | static char badpw[] = "\b\n\r\177INCORRECT"; | 188 | static char badpw[] = "\b\n\r\177INCORRECT"; |
189 | static const char *sshpam_password = NULL; | ||
173 | 190 | ||
174 | /* Some PAM implementations don't implement this */ | 191 | /* Some PAM implementations don't implement this */ |
175 | #ifndef HAVE_PAM_GETENVLIST | 192 | #ifndef HAVE_PAM_GETENVLIST |
@@ -185,8 +202,33 @@ pam_getenvlist(pam_handle_t *pamh) | |||
185 | } | 202 | } |
186 | #endif | 203 | #endif |
187 | 204 | ||
205 | /* | ||
206 | * Some platforms, notably Solaris, do not enforce password complexity | ||
207 | * rules during pam_chauthtok() if the real uid of the calling process | ||
208 | * is 0, on the assumption that it's being called by "passwd" run by root. | ||
209 | * This wraps pam_chauthtok and sets/restore the real uid so PAM will do | ||
210 | * the right thing. | ||
211 | */ | ||
212 | #ifdef SSHPAM_CHAUTHTOK_NEEDS_RUID | ||
213 | static int | ||
214 | sshpam_chauthtok_ruid(pam_handle_t *pamh, int flags) | ||
215 | { | ||
216 | int result; | ||
217 | |||
218 | if (sshpam_authctxt == NULL) | ||
219 | fatal("PAM: sshpam_authctxt not initialized"); | ||
220 | if (setreuid(sshpam_authctxt->pw->pw_uid, -1) == -1) | ||
221 | fatal("%s: setreuid failed: %s", __func__, strerror(errno)); | ||
222 | result = pam_chauthtok(pamh, flags); | ||
223 | if (setreuid(0, -1) == -1) | ||
224 | fatal("%s: setreuid failed: %s", __func__, strerror(errno)); | ||
225 | return result; | ||
226 | } | ||
227 | # define pam_chauthtok(a,b) (sshpam_chauthtok_ruid((a), (b))) | ||
228 | #endif | ||
229 | |||
188 | void | 230 | void |
189 | pam_password_change_required(int reqd) | 231 | sshpam_password_change_required(int reqd) |
190 | { | 232 | { |
191 | debug3("%s %d", __func__, reqd); | 233 | debug3("%s %d", __func__, reqd); |
192 | if (sshpam_authctxt == NULL) | 234 | if (sshpam_authctxt == NULL) |
@@ -216,7 +258,7 @@ import_environments(Buffer *b) | |||
216 | #ifndef USE_POSIX_THREADS | 258 | #ifndef USE_POSIX_THREADS |
217 | /* Import variables set by do_pam_account */ | 259 | /* Import variables set by do_pam_account */ |
218 | sshpam_account_status = buffer_get_int(b); | 260 | sshpam_account_status = buffer_get_int(b); |
219 | pam_password_change_required(buffer_get_int(b)); | 261 | sshpam_password_change_required(buffer_get_int(b)); |
220 | 262 | ||
221 | /* Import environment from subprocess */ | 263 | /* Import environment from subprocess */ |
222 | num_env = buffer_get_int(b); | 264 | num_env = buffer_get_int(b); |
@@ -248,7 +290,7 @@ import_environments(Buffer *b) | |||
248 | * Conversation function for authentication thread. | 290 | * Conversation function for authentication thread. |
249 | */ | 291 | */ |
250 | static int | 292 | static int |
251 | sshpam_thread_conv(int n, const struct pam_message **msg, | 293 | sshpam_thread_conv(int n, struct pam_message **msg, |
252 | struct pam_response **resp, void *data) | 294 | struct pam_response **resp, void *data) |
253 | { | 295 | { |
254 | Buffer buffer; | 296 | Buffer buffer; |
@@ -259,6 +301,10 @@ sshpam_thread_conv(int n, const struct pam_message **msg, | |||
259 | debug3("PAM: %s entering, %d messages", __func__, n); | 301 | debug3("PAM: %s entering, %d messages", __func__, n); |
260 | *resp = NULL; | 302 | *resp = NULL; |
261 | 303 | ||
304 | if (data == NULL) { | ||
305 | error("PAM: conversation function passed a null context"); | ||
306 | return (PAM_CONV_ERR); | ||
307 | } | ||
262 | ctxt = data; | 308 | ctxt = data; |
263 | if (n <= 0 || n > PAM_MAX_NUM_MSG) | 309 | if (n <= 0 || n > PAM_MAX_NUM_MSG) |
264 | return (PAM_CONV_ERR); | 310 | return (PAM_CONV_ERR); |
@@ -336,15 +382,21 @@ sshpam_thread(void *ctxtp) | |||
336 | struct pam_ctxt *ctxt = ctxtp; | 382 | struct pam_ctxt *ctxt = ctxtp; |
337 | Buffer buffer; | 383 | Buffer buffer; |
338 | struct pam_conv sshpam_conv; | 384 | struct pam_conv sshpam_conv; |
385 | int flags = (options.permit_empty_passwd == 0 ? | ||
386 | PAM_DISALLOW_NULL_AUTHTOK : 0); | ||
339 | #ifndef USE_POSIX_THREADS | 387 | #ifndef USE_POSIX_THREADS |
340 | extern char **environ; | 388 | extern char **environ; |
341 | char **env_from_pam; | 389 | char **env_from_pam; |
342 | u_int i; | 390 | u_int i; |
343 | const char *pam_user; | 391 | const char *pam_user; |
344 | 392 | ||
345 | pam_get_item(sshpam_handle, PAM_USER, (const void **)&pam_user); | 393 | pam_get_item(sshpam_handle, PAM_USER, (void **)&pam_user); |
346 | setproctitle("%s [pam]", pam_user); | ||
347 | environ[0] = NULL; | 394 | environ[0] = NULL; |
395 | |||
396 | if (sshpam_authctxt != NULL) { | ||
397 | setproctitle("%s [pam]", | ||
398 | sshpam_authctxt->valid ? pam_user : "unknown"); | ||
399 | } | ||
348 | #endif | 400 | #endif |
349 | 401 | ||
350 | sshpam_conv.conv = sshpam_thread_conv; | 402 | sshpam_conv.conv = sshpam_thread_conv; |
@@ -358,7 +410,7 @@ sshpam_thread(void *ctxtp) | |||
358 | (const void *)&sshpam_conv); | 410 | (const void *)&sshpam_conv); |
359 | if (sshpam_err != PAM_SUCCESS) | 411 | if (sshpam_err != PAM_SUCCESS) |
360 | goto auth_fail; | 412 | goto auth_fail; |
361 | sshpam_err = pam_authenticate(sshpam_handle, 0); | 413 | sshpam_err = pam_authenticate(sshpam_handle, flags); |
362 | if (sshpam_err != PAM_SUCCESS) | 414 | if (sshpam_err != PAM_SUCCESS) |
363 | goto auth_fail; | 415 | goto auth_fail; |
364 | 416 | ||
@@ -370,7 +422,7 @@ sshpam_thread(void *ctxtp) | |||
370 | PAM_CHANGE_EXPIRED_AUTHTOK); | 422 | PAM_CHANGE_EXPIRED_AUTHTOK); |
371 | if (sshpam_err != PAM_SUCCESS) | 423 | if (sshpam_err != PAM_SUCCESS) |
372 | goto auth_fail; | 424 | goto auth_fail; |
373 | pam_password_change_required(0); | 425 | sshpam_password_change_required(0); |
374 | } | 426 | } |
375 | } | 427 | } |
376 | 428 | ||
@@ -430,7 +482,7 @@ sshpam_thread_cleanup(void) | |||
430 | } | 482 | } |
431 | 483 | ||
432 | static int | 484 | static int |
433 | sshpam_null_conv(int n, const struct pam_message **msg, | 485 | sshpam_null_conv(int n, struct pam_message **msg, |
434 | struct pam_response **resp, void *data) | 486 | struct pam_response **resp, void *data) |
435 | { | 487 | { |
436 | debug3("PAM: %s entering, %d messages", __func__, n); | 488 | debug3("PAM: %s entering, %d messages", __func__, n); |
@@ -468,7 +520,7 @@ sshpam_init(Authctxt *authctxt) | |||
468 | if (sshpam_handle != NULL) { | 520 | if (sshpam_handle != NULL) { |
469 | /* We already have a PAM context; check if the user matches */ | 521 | /* We already have a PAM context; check if the user matches */ |
470 | sshpam_err = pam_get_item(sshpam_handle, | 522 | sshpam_err = pam_get_item(sshpam_handle, |
471 | PAM_USER, (const void **)&pam_user); | 523 | PAM_USER, (void **)&pam_user); |
472 | if (sshpam_err == PAM_SUCCESS && strcmp(user, pam_user) == 0) | 524 | if (sshpam_err == PAM_SUCCESS && strcmp(user, pam_user) == 0) |
473 | return (0); | 525 | return (0); |
474 | pam_end(sshpam_handle, sshpam_err); | 526 | pam_end(sshpam_handle, sshpam_err); |
@@ -725,7 +777,7 @@ do_pam_account(void) | |||
725 | } | 777 | } |
726 | 778 | ||
727 | if (sshpam_err == PAM_NEW_AUTHTOK_REQD) | 779 | if (sshpam_err == PAM_NEW_AUTHTOK_REQD) |
728 | pam_password_change_required(1); | 780 | sshpam_password_change_required(1); |
729 | 781 | ||
730 | sshpam_account_status = 1; | 782 | sshpam_account_status = 1; |
731 | return (sshpam_account_status); | 783 | return (sshpam_account_status); |
@@ -771,7 +823,7 @@ do_pam_setcred(int init) | |||
771 | } | 823 | } |
772 | 824 | ||
773 | static int | 825 | static int |
774 | pam_tty_conv(int n, const struct pam_message **msg, | 826 | sshpam_tty_conv(int n, struct pam_message **msg, |
775 | struct pam_response **resp, void *data) | 827 | struct pam_response **resp, void *data) |
776 | { | 828 | { |
777 | char input[PAM_MAX_MSG_SIZE]; | 829 | char input[PAM_MAX_MSG_SIZE]; |
@@ -800,7 +852,8 @@ pam_tty_conv(int n, const struct pam_message **msg, | |||
800 | case PAM_PROMPT_ECHO_ON: | 852 | case PAM_PROMPT_ECHO_ON: |
801 | fprintf(stderr, "%s\n", PAM_MSG_MEMBER(msg, i, msg)); | 853 | fprintf(stderr, "%s\n", PAM_MSG_MEMBER(msg, i, msg)); |
802 | fgets(input, sizeof input, stdin); | 854 | fgets(input, sizeof input, stdin); |
803 | reply[i].resp = xstrdup(input); | 855 | if ((reply[i].resp = strdup(input)) == NULL) |
856 | goto fail; | ||
804 | reply[i].resp_retcode = PAM_SUCCESS; | 857 | reply[i].resp_retcode = PAM_SUCCESS; |
805 | break; | 858 | break; |
806 | case PAM_ERROR_MSG: | 859 | case PAM_ERROR_MSG: |
@@ -824,7 +877,7 @@ pam_tty_conv(int n, const struct pam_message **msg, | |||
824 | return (PAM_CONV_ERR); | 877 | return (PAM_CONV_ERR); |
825 | } | 878 | } |
826 | 879 | ||
827 | static struct pam_conv tty_conv = { pam_tty_conv, NULL }; | 880 | static struct pam_conv tty_conv = { sshpam_tty_conv, NULL }; |
828 | 881 | ||
829 | /* | 882 | /* |
830 | * XXX this should be done in the authentication phase, but ssh1 doesn't | 883 | * XXX this should be done in the authentication phase, but ssh1 doesn't |
@@ -848,7 +901,7 @@ do_pam_chauthtok(void) | |||
848 | } | 901 | } |
849 | 902 | ||
850 | static int | 903 | static int |
851 | pam_store_conv(int n, const struct pam_message **msg, | 904 | sshpam_store_conv(int n, struct pam_message **msg, |
852 | struct pam_response **resp, void *data) | 905 | struct pam_response **resp, void *data) |
853 | { | 906 | { |
854 | struct pam_response *reply; | 907 | struct pam_response *reply; |
@@ -890,7 +943,7 @@ pam_store_conv(int n, const struct pam_message **msg, | |||
890 | return (PAM_CONV_ERR); | 943 | return (PAM_CONV_ERR); |
891 | } | 944 | } |
892 | 945 | ||
893 | static struct pam_conv store_conv = { pam_store_conv, NULL }; | 946 | static struct pam_conv store_conv = { sshpam_store_conv, NULL }; |
894 | 947 | ||
895 | void | 948 | void |
896 | do_pam_session(void) | 949 | do_pam_session(void) |
@@ -957,4 +1010,111 @@ free_pam_environment(char **env) | |||
957 | xfree(env); | 1010 | xfree(env); |
958 | } | 1011 | } |
959 | 1012 | ||
1013 | /* | ||
1014 | * "Blind" conversation function for password authentication. Assumes that | ||
1015 | * echo-off prompts are for the password and stores messages for later | ||
1016 | * display. | ||
1017 | */ | ||
1018 | static int | ||
1019 | sshpam_passwd_conv(int n, struct pam_message **msg, | ||
1020 | struct pam_response **resp, void *data) | ||
1021 | { | ||
1022 | struct pam_response *reply; | ||
1023 | int i; | ||
1024 | size_t len; | ||
1025 | |||
1026 | debug3("PAM: %s called with %d messages", __func__, n); | ||
1027 | |||
1028 | *resp = NULL; | ||
1029 | |||
1030 | if (n <= 0 || n > PAM_MAX_NUM_MSG) | ||
1031 | return (PAM_CONV_ERR); | ||
1032 | |||
1033 | if ((reply = malloc(n * sizeof(*reply))) == NULL) | ||
1034 | return (PAM_CONV_ERR); | ||
1035 | memset(reply, 0, n * sizeof(*reply)); | ||
1036 | |||
1037 | for (i = 0; i < n; ++i) { | ||
1038 | switch (PAM_MSG_MEMBER(msg, i, msg_style)) { | ||
1039 | case PAM_PROMPT_ECHO_OFF: | ||
1040 | if (sshpam_password == NULL) | ||
1041 | goto fail; | ||
1042 | if ((reply[i].resp = strdup(sshpam_password)) == NULL) | ||
1043 | goto fail; | ||
1044 | reply[i].resp_retcode = PAM_SUCCESS; | ||
1045 | break; | ||
1046 | case PAM_ERROR_MSG: | ||
1047 | case PAM_TEXT_INFO: | ||
1048 | len = strlen(PAM_MSG_MEMBER(msg, i, msg)); | ||
1049 | if (len > 0) { | ||
1050 | buffer_append(&loginmsg, | ||
1051 | PAM_MSG_MEMBER(msg, i, msg), len); | ||
1052 | buffer_append(&loginmsg, "\n", 1); | ||
1053 | } | ||
1054 | if ((reply[i].resp = strdup("")) == NULL) | ||
1055 | goto fail; | ||
1056 | reply[i].resp_retcode = PAM_SUCCESS; | ||
1057 | break; | ||
1058 | default: | ||
1059 | goto fail; | ||
1060 | } | ||
1061 | } | ||
1062 | *resp = reply; | ||
1063 | return (PAM_SUCCESS); | ||
1064 | |||
1065 | fail: | ||
1066 | for(i = 0; i < n; i++) { | ||
1067 | if (reply[i].resp != NULL) | ||
1068 | xfree(reply[i].resp); | ||
1069 | } | ||
1070 | xfree(reply); | ||
1071 | return (PAM_CONV_ERR); | ||
1072 | } | ||
1073 | |||
1074 | static struct pam_conv passwd_conv = { sshpam_passwd_conv, NULL }; | ||
1075 | |||
1076 | /* | ||
1077 | * Attempt password authentication via PAM | ||
1078 | */ | ||
1079 | int | ||
1080 | sshpam_auth_passwd(Authctxt *authctxt, const char *password) | ||
1081 | { | ||
1082 | int flags = (options.permit_empty_passwd == 0 ? | ||
1083 | PAM_DISALLOW_NULL_AUTHTOK : 0); | ||
1084 | |||
1085 | if (!options.use_pam || sshpam_handle == NULL) | ||
1086 | fatal("PAM: %s called when PAM disabled or failed to " | ||
1087 | "initialise.", __func__); | ||
1088 | |||
1089 | sshpam_password = password; | ||
1090 | sshpam_authctxt = authctxt; | ||
1091 | |||
1092 | /* | ||
1093 | * If the user logging in is invalid, or is root but is not permitted | ||
1094 | * by PermitRootLogin, use an invalid password to prevent leaking | ||
1095 | * information via timing (eg if the PAM config has a delay on fail). | ||
1096 | */ | ||
1097 | if (!authctxt->valid || (authctxt->pw->pw_uid == 0 && | ||
1098 | options.permit_root_login != PERMIT_YES)) | ||
1099 | sshpam_password = badpw; | ||
1100 | |||
1101 | sshpam_err = pam_set_item(sshpam_handle, PAM_CONV, | ||
1102 | (const void *)&passwd_conv); | ||
1103 | if (sshpam_err != PAM_SUCCESS) | ||
1104 | fatal("PAM: %s: failed to set PAM_CONV: %s", __func__, | ||
1105 | pam_strerror(sshpam_handle, sshpam_err)); | ||
1106 | |||
1107 | sshpam_err = pam_authenticate(sshpam_handle, flags); | ||
1108 | sshpam_password = NULL; | ||
1109 | if (sshpam_err == PAM_SUCCESS && authctxt->valid) { | ||
1110 | debug("PAM: password authentication accepted for %.100s", | ||
1111 | authctxt->user); | ||
1112 | return 1; | ||
1113 | } else { | ||
1114 | debug("PAM: password authentication failed for %.100s: %s", | ||
1115 | authctxt->valid ? authctxt->user : "an illegal user", | ||
1116 | pam_strerror(sshpam_handle, sshpam_err)); | ||
1117 | return 0; | ||
1118 | } | ||
1119 | } | ||
960 | #endif /* USE_PAM */ | 1120 | #endif /* USE_PAM */ |
diff --git a/auth-pam.h b/auth-pam.h index 1b3706e07..f479413d7 100644 --- a/auth-pam.h +++ b/auth-pam.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: auth-pam.h,v 1.25 2004/03/08 12:04:07 dtucker Exp $ */ | 1 | /* $Id: auth-pam.h,v 1.26 2004/05/30 10:43:59 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2000 Damien Miller. All rights reserved. |
@@ -44,5 +44,6 @@ char ** fetch_pam_child_environment(void); | |||
44 | void free_pam_environment(char **); | 44 | void free_pam_environment(char **); |
45 | void sshpam_thread_cleanup(void); | 45 | void sshpam_thread_cleanup(void); |
46 | void sshpam_cleanup(void); | 46 | void sshpam_cleanup(void); |
47 | int sshpam_auth_passwd(Authctxt *, const char *); | ||
47 | 48 | ||
48 | #endif /* USE_PAM */ | 49 | #endif /* USE_PAM */ |
diff --git a/auth-passwd.c b/auth-passwd.c index beaf0fa6c..7a68e0562 100644 --- a/auth-passwd.c +++ b/auth-passwd.c | |||
@@ -64,7 +64,9 @@ auth_password(Authctxt *authctxt, const char *password) | |||
64 | { | 64 | { |
65 | struct passwd * pw = authctxt->pw; | 65 | struct passwd * pw = authctxt->pw; |
66 | int ok = authctxt->valid; | 66 | int ok = authctxt->valid; |
67 | #if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE) | ||
67 | static int expire_checked = 0; | 68 | static int expire_checked = 0; |
69 | #endif | ||
68 | 70 | ||
69 | #ifndef HAVE_CYGWIN | 71 | #ifndef HAVE_CYGWIN |
70 | if (pw->pw_uid == 0 && options.permit_root_login != PERMIT_YES) | 72 | if (pw->pw_uid == 0 && options.permit_root_login != PERMIT_YES) |
@@ -91,6 +93,10 @@ auth_password(Authctxt *authctxt, const char *password) | |||
91 | return ok; | 93 | return ok; |
92 | } | 94 | } |
93 | #endif | 95 | #endif |
96 | #ifdef USE_PAM | ||
97 | if (options.use_pam) | ||
98 | return (sshpam_auth_passwd(authctxt, password) && ok); | ||
99 | #endif | ||
94 | #if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE) | 100 | #if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE) |
95 | if (!expire_checked) { | 101 | if (!expire_checked) { |
96 | expire_checked = 1; | 102 | expire_checked = 1; |
diff --git a/auth-rsa.c b/auth-rsa.c index 2f0746b30..16369d47c 100644 --- a/auth-rsa.c +++ b/auth-rsa.c | |||
@@ -14,7 +14,7 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include "includes.h" | 16 | #include "includes.h" |
17 | RCSID("$OpenBSD: auth-rsa.c,v 1.58 2003/11/04 08:54:09 djm Exp $"); | 17 | RCSID("$OpenBSD: auth-rsa.c,v 1.60 2004/06/21 17:36:31 avsm Exp $"); |
18 | 18 | ||
19 | #include <openssl/rsa.h> | 19 | #include <openssl/rsa.h> |
20 | #include <openssl/md5.h> | 20 | #include <openssl/md5.h> |
@@ -23,7 +23,6 @@ RCSID("$OpenBSD: auth-rsa.c,v 1.58 2003/11/04 08:54:09 djm Exp $"); | |||
23 | #include "packet.h" | 23 | #include "packet.h" |
24 | #include "xmalloc.h" | 24 | #include "xmalloc.h" |
25 | #include "ssh1.h" | 25 | #include "ssh1.h" |
26 | #include "mpaux.h" | ||
27 | #include "uidswap.h" | 26 | #include "uidswap.h" |
28 | #include "match.h" | 27 | #include "match.h" |
29 | #include "auth-options.h" | 28 | #include "auth-options.h" |
@@ -204,7 +203,7 @@ auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey) | |||
204 | */ | 203 | */ |
205 | while (fgets(line, sizeof(line), f)) { | 204 | while (fgets(line, sizeof(line), f)) { |
206 | char *cp; | 205 | char *cp; |
207 | char *options; | 206 | char *key_options; |
208 | 207 | ||
209 | linenum++; | 208 | linenum++; |
210 | 209 | ||
@@ -222,7 +221,7 @@ auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey) | |||
222 | */ | 221 | */ |
223 | if (*cp < '0' || *cp > '9') { | 222 | if (*cp < '0' || *cp > '9') { |
224 | int quoted = 0; | 223 | int quoted = 0; |
225 | options = cp; | 224 | key_options = cp; |
226 | for (; *cp && (quoted || (*cp != ' ' && *cp != '\t')); cp++) { | 225 | for (; *cp && (quoted || (*cp != ' ' && *cp != '\t')); cp++) { |
227 | if (*cp == '\\' && cp[1] == '"') | 226 | if (*cp == '\\' && cp[1] == '"') |
228 | cp++; /* Skip both */ | 227 | cp++; /* Skip both */ |
@@ -230,7 +229,7 @@ auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey) | |||
230 | quoted = !quoted; | 229 | quoted = !quoted; |
231 | } | 230 | } |
232 | } else | 231 | } else |
233 | options = NULL; | 232 | key_options = NULL; |
234 | 233 | ||
235 | /* Parse the key from the line. */ | 234 | /* Parse the key from the line. */ |
236 | if (hostfile_read_key(&cp, &bits, key) == 0) { | 235 | if (hostfile_read_key(&cp, &bits, key) == 0) { |
@@ -255,7 +254,7 @@ auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey) | |||
255 | * If our options do not allow this key to be used, | 254 | * If our options do not allow this key to be used, |
256 | * do not send challenge. | 255 | * do not send challenge. |
257 | */ | 256 | */ |
258 | if (!auth_parse_options(pw, options, file, linenum)) | 257 | if (!auth_parse_options(pw, key_options, file, linenum)) |
259 | continue; | 258 | continue; |
260 | 259 | ||
261 | /* break out, this key is allowed */ | 260 | /* break out, this key is allowed */ |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: auth.c,v 1.51 2003/11/21 11:57:02 djm Exp $"); | 26 | RCSID("$OpenBSD: auth.c,v 1.56 2004/07/28 09:40:29 markus Exp $"); |
27 | 27 | ||
28 | #ifdef HAVE_LOGIN_H | 28 | #ifdef HAVE_LOGIN_H |
29 | #include <login.h> | 29 | #include <login.h> |
@@ -47,7 +47,6 @@ RCSID("$OpenBSD: auth.c,v 1.51 2003/11/21 11:57:02 djm Exp $"); | |||
47 | #include "buffer.h" | 47 | #include "buffer.h" |
48 | #include "bufaux.h" | 48 | #include "bufaux.h" |
49 | #include "uidswap.h" | 49 | #include "uidswap.h" |
50 | #include "tildexpand.h" | ||
51 | #include "misc.h" | 50 | #include "misc.h" |
52 | #include "bufaux.h" | 51 | #include "bufaux.h" |
53 | #include "packet.h" | 52 | #include "packet.h" |
@@ -204,31 +203,10 @@ allowed_user(struct passwd * pw) | |||
204 | ga_free(); | 203 | ga_free(); |
205 | } | 204 | } |
206 | 205 | ||
207 | #ifdef WITH_AIXAUTHENTICATE | 206 | #ifdef CUSTOM_SYS_AUTH_ALLOWED_USER |
208 | /* | 207 | if (!sys_auth_allowed_user(pw)) |
209 | * Don't check loginrestrictions() for root account (use | 208 | return 0; |
210 | * PermitRootLogin to control logins via ssh), or if running as | 209 | #endif |
211 | * non-root user (since loginrestrictions will always fail). | ||
212 | */ | ||
213 | if ((pw->pw_uid != 0) && (geteuid() == 0)) { | ||
214 | char *msg; | ||
215 | |||
216 | if (loginrestrictions(pw->pw_name, S_RLOGIN, NULL, &msg) != 0) { | ||
217 | int loginrestrict_errno = errno; | ||
218 | |||
219 | if (msg && *msg) { | ||
220 | buffer_append(&loginmsg, msg, strlen(msg)); | ||
221 | aix_remove_embedded_newlines(msg); | ||
222 | logit("Login restricted for %s: %.100s", | ||
223 | pw->pw_name, msg); | ||
224 | } | ||
225 | /* Don't fail if /etc/nologin set */ | ||
226 | if (!(loginrestrict_errno == EPERM && | ||
227 | stat(_PATH_NOLOGIN, &st) == 0)) | ||
228 | return 0; | ||
229 | } | ||
230 | } | ||
231 | #endif /* WITH_AIXAUTHENTICATE */ | ||
232 | 210 | ||
233 | /* We found no reason not to let this user try to log on... */ | 211 | /* We found no reason not to let this user try to log on... */ |
234 | return 1; | 212 | return 1; |
@@ -243,7 +221,7 @@ auth_log(Authctxt *authctxt, int authenticated, char *method, char *info) | |||
243 | /* Raise logging level */ | 221 | /* Raise logging level */ |
244 | if (authenticated == 1 || | 222 | if (authenticated == 1 || |
245 | !authctxt->valid || | 223 | !authctxt->valid || |
246 | authctxt->failures >= AUTH_FAIL_LOG || | 224 | authctxt->failures >= options.max_authtries / 2 || |
247 | strcmp(method, "password") == 0) | 225 | strcmp(method, "password") == 0) |
248 | authlog = logit; | 226 | authlog = logit; |
249 | 227 | ||
@@ -255,7 +233,7 @@ auth_log(Authctxt *authctxt, int authenticated, char *method, char *info) | |||
255 | authlog("%s %s for %s%.100s from %.200s port %d%s", | 233 | authlog("%s %s for %s%.100s from %.200s port %d%s", |
256 | authmsg, | 234 | authmsg, |
257 | method, | 235 | method, |
258 | authctxt->valid ? "" : "illegal user ", | 236 | authctxt->valid ? "" : "invalid user ", |
259 | authctxt->user, | 237 | authctxt->user, |
260 | get_remote_ipaddr(), | 238 | get_remote_ipaddr(), |
261 | get_remote_port(), | 239 | get_remote_port(), |
@@ -484,7 +462,7 @@ getpwnamallow(const char *user) | |||
484 | 462 | ||
485 | pw = getpwnam(user); | 463 | pw = getpwnam(user); |
486 | if (pw == NULL) { | 464 | if (pw == NULL) { |
487 | logit("Illegal user %.100s from %.100s", | 465 | logit("Invalid user %.100s from %.100s", |
488 | user, get_remote_ipaddr()); | 466 | user, get_remote_ipaddr()); |
489 | #ifdef CUSTOM_FAILED_LOGIN | 467 | #ifdef CUSTOM_FAILED_LOGIN |
490 | record_failed_login(user, "ssh"); | 468 | record_failed_login(user, "ssh"); |
@@ -563,8 +541,8 @@ fakepw(void) | |||
563 | fake.pw_passwd = | 541 | fake.pw_passwd = |
564 | "$2a$06$r3.juUaHZDlIbQaO2dS9FuYxL1W9M81R1Tc92PoSNmzvpEqLkLGrK"; | 542 | "$2a$06$r3.juUaHZDlIbQaO2dS9FuYxL1W9M81R1Tc92PoSNmzvpEqLkLGrK"; |
565 | fake.pw_gecos = "NOUSER"; | 543 | fake.pw_gecos = "NOUSER"; |
566 | fake.pw_uid = -1; | 544 | fake.pw_uid = (uid_t)-1; |
567 | fake.pw_gid = -1; | 545 | fake.pw_gid = (gid_t)-1; |
568 | #ifdef HAVE_PW_CLASS_IN_PASSWD | 546 | #ifdef HAVE_PW_CLASS_IN_PASSWD |
569 | fake.pw_class = ""; | 547 | fake.pw_class = ""; |
570 | #endif | 548 | #endif |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth.h,v 1.49 2004/01/30 09:48:57 markus Exp $ */ | 1 | /* $OpenBSD: auth.h,v 1.50 2004/05/23 23:59:53 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -181,8 +181,6 @@ void auth_debug_reset(void); | |||
181 | 181 | ||
182 | struct passwd *fakepw(void); | 182 | struct passwd *fakepw(void); |
183 | 183 | ||
184 | #define AUTH_FAIL_MAX 6 | ||
185 | #define AUTH_FAIL_LOG (AUTH_FAIL_MAX/2) | ||
186 | #define AUTH_FAIL_MSG "Too many authentication failures for %.100s" | 184 | #define AUTH_FAIL_MSG "Too many authentication failures for %.100s" |
187 | 185 | ||
188 | #define SKEY_PROMPT "\nS/Key Password: " | 186 | #define SKEY_PROMPT "\nS/Key Password: " |
@@ -10,14 +10,13 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "includes.h" | 12 | #include "includes.h" |
13 | RCSID("$OpenBSD: auth1.c,v 1.55 2003/11/08 16:02:40 jakob Exp $"); | 13 | RCSID("$OpenBSD: auth1.c,v 1.59 2004/07/28 09:40:29 markus Exp $"); |
14 | 14 | ||
15 | #include "xmalloc.h" | 15 | #include "xmalloc.h" |
16 | #include "rsa.h" | 16 | #include "rsa.h" |
17 | #include "ssh1.h" | 17 | #include "ssh1.h" |
18 | #include "packet.h" | 18 | #include "packet.h" |
19 | #include "buffer.h" | 19 | #include "buffer.h" |
20 | #include "mpaux.h" | ||
21 | #include "log.h" | 20 | #include "log.h" |
22 | #include "servconf.h" | 21 | #include "servconf.h" |
23 | #include "compat.h" | 22 | #include "compat.h" |
@@ -70,10 +69,9 @@ do_authloop(Authctxt *authctxt) | |||
70 | u_int dlen; | 69 | u_int dlen; |
71 | u_int ulen; | 70 | u_int ulen; |
72 | int prev, type = 0; | 71 | int prev, type = 0; |
73 | struct passwd *pw = authctxt->pw; | ||
74 | 72 | ||
75 | debug("Attempting authentication for %s%.100s.", | 73 | debug("Attempting authentication for %s%.100s.", |
76 | authctxt->valid ? "" : "illegal user ", authctxt->user); | 74 | authctxt->valid ? "" : "invalid user ", authctxt->user); |
77 | 75 | ||
78 | /* If the user has no password, accept authentication immediately. */ | 76 | /* If the user has no password, accept authentication immediately. */ |
79 | if (options.password_authentication && | 77 | if (options.password_authentication && |
@@ -81,8 +79,13 @@ do_authloop(Authctxt *authctxt) | |||
81 | (!options.kerberos_authentication || options.kerberos_or_local_passwd) && | 79 | (!options.kerberos_authentication || options.kerberos_or_local_passwd) && |
82 | #endif | 80 | #endif |
83 | PRIVSEP(auth_password(authctxt, ""))) { | 81 | PRIVSEP(auth_password(authctxt, ""))) { |
84 | auth_log(authctxt, 1, "without authentication", ""); | 82 | #ifdef USE_PAM |
85 | return; | 83 | if (options.use_pam && (PRIVSEP(do_pam_account()))) |
84 | #endif | ||
85 | { | ||
86 | auth_log(authctxt, 1, "without authentication", ""); | ||
87 | return; | ||
88 | } | ||
86 | } | 89 | } |
87 | 90 | ||
88 | /* Indicate that authentication is needed. */ | 91 | /* Indicate that authentication is needed. */ |
@@ -233,9 +236,10 @@ do_authloop(Authctxt *authctxt) | |||
233 | 236 | ||
234 | #ifdef HAVE_CYGWIN | 237 | #ifdef HAVE_CYGWIN |
235 | if (authenticated && | 238 | if (authenticated && |
236 | !check_nt_auth(type == SSH_CMSG_AUTH_PASSWORD, pw)) { | 239 | !check_nt_auth(type == SSH_CMSG_AUTH_PASSWORD, |
240 | authctxt->pw)) { | ||
237 | packet_disconnect("Authentication rejected for uid %d.", | 241 | packet_disconnect("Authentication rejected for uid %d.", |
238 | pw == NULL ? -1 : pw->pw_uid); | 242 | authctxt->pw == NULL ? -1 : authctxt->pw->pw_uid); |
239 | authenticated = 0; | 243 | authenticated = 0; |
240 | } | 244 | } |
241 | #else | 245 | #else |
@@ -262,7 +266,7 @@ do_authloop(Authctxt *authctxt) | |||
262 | if (authenticated) | 266 | if (authenticated) |
263 | return; | 267 | return; |
264 | 268 | ||
265 | if (authctxt->failures++ > AUTH_FAIL_MAX) | 269 | if (authctxt->failures++ > options.max_authtries) |
266 | packet_disconnect(AUTH_FAIL_MSG, authctxt->user); | 270 | packet_disconnect(AUTH_FAIL_MSG, authctxt->user); |
267 | 271 | ||
268 | packet_start(SSH_SMSG_FAILURE); | 272 | packet_start(SSH_SMSG_FAILURE); |
@@ -298,11 +302,11 @@ do_authentication(Authctxt *authctxt) | |||
298 | if ((authctxt->pw = PRIVSEP(getpwnamallow(user))) != NULL) | 302 | if ((authctxt->pw = PRIVSEP(getpwnamallow(user))) != NULL) |
299 | authctxt->valid = 1; | 303 | authctxt->valid = 1; |
300 | else { | 304 | else { |
301 | debug("do_authentication: illegal user %s", user); | 305 | debug("do_authentication: invalid user %s", user); |
302 | authctxt->pw = fakepw(); | 306 | authctxt->pw = fakepw(); |
303 | } | 307 | } |
304 | 308 | ||
305 | setproctitle("%s%s", authctxt->pw ? user : "unknown", | 309 | setproctitle("%s%s", authctxt->valid ? user : "unknown", |
306 | use_privsep ? " [net]" : ""); | 310 | use_privsep ? " [net]" : ""); |
307 | 311 | ||
308 | #ifdef USE_PAM | 312 | #ifdef USE_PAM |
diff --git a/auth2-chall.c b/auth2-chall.c index 0f08b05c6..f5f2f1477 100644 --- a/auth2-chall.c +++ b/auth2-chall.c | |||
@@ -23,7 +23,7 @@ | |||
23 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 | */ | 24 | */ |
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: auth2-chall.c,v 1.20 2002/06/30 21:59:45 deraadt Exp $"); | 26 | RCSID("$OpenBSD: auth2-chall.c,v 1.21 2004/06/01 14:20:45 dtucker Exp $"); |
27 | 27 | ||
28 | #include "ssh2.h" | 28 | #include "ssh2.h" |
29 | #include "auth.h" | 29 | #include "auth.h" |
@@ -31,7 +31,6 @@ RCSID("$OpenBSD: auth2-chall.c,v 1.20 2002/06/30 21:59:45 deraadt Exp $"); | |||
31 | #include "packet.h" | 31 | #include "packet.h" |
32 | #include "xmalloc.h" | 32 | #include "xmalloc.h" |
33 | #include "dispatch.h" | 33 | #include "dispatch.h" |
34 | #include "auth.h" | ||
35 | #include "log.h" | 34 | #include "log.h" |
36 | 35 | ||
37 | static int auth2_challenge_start(Authctxt *); | 36 | static int auth2_challenge_start(Authctxt *); |
diff --git a/auth2-gss.c b/auth2-gss.c index 9249988d3..3289ba18e 100644 --- a/auth2-gss.c +++ b/auth2-gss.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth2-gss.c,v 1.7 2003/11/21 11:57:03 djm Exp $ */ | 1 | /* $OpenBSD: auth2-gss.c,v 1.8 2004/06/21 17:36:31 avsm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. | 4 | * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. |
@@ -54,7 +54,7 @@ static void input_gssapi_errtok(int, u_int32_t, void *); | |||
54 | static int | 54 | static int |
55 | userauth_gssapi(Authctxt *authctxt) | 55 | userauth_gssapi(Authctxt *authctxt) |
56 | { | 56 | { |
57 | gss_OID_desc oid = {0, NULL}; | 57 | gss_OID_desc goid = {0, NULL}; |
58 | Gssctxt *ctxt = NULL; | 58 | Gssctxt *ctxt = NULL; |
59 | int mechs; | 59 | int mechs; |
60 | gss_OID_set supported; | 60 | gss_OID_set supported; |
@@ -85,9 +85,9 @@ userauth_gssapi(Authctxt *authctxt) | |||
85 | if (len > 2 && | 85 | if (len > 2 && |
86 | doid[0] == SSH_GSS_OIDTYPE && | 86 | doid[0] == SSH_GSS_OIDTYPE && |
87 | doid[1] == len - 2) { | 87 | doid[1] == len - 2) { |
88 | oid.elements = doid + 2; | 88 | goid.elements = doid + 2; |
89 | oid.length = len - 2; | 89 | goid.length = len - 2; |
90 | gss_test_oid_set_member(&ms, &oid, supported, | 90 | gss_test_oid_set_member(&ms, &goid, supported, |
91 | &present); | 91 | &present); |
92 | } else { | 92 | } else { |
93 | logit("Badly formed OID received"); | 93 | logit("Badly formed OID received"); |
@@ -101,7 +101,7 @@ userauth_gssapi(Authctxt *authctxt) | |||
101 | return (0); | 101 | return (0); |
102 | } | 102 | } |
103 | 103 | ||
104 | if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, &oid)))) { | 104 | if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, &goid)))) { |
105 | xfree(doid); | 105 | xfree(doid); |
106 | return (0); | 106 | return (0); |
107 | } | 107 | } |
diff --git a/auth2-none.c b/auth2-none.c index c342addec..2bf5b5c80 100644 --- a/auth2-none.c +++ b/auth2-none.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: auth2-none.c,v 1.6 2003/08/26 09:58:43 markus Exp $"); | 26 | RCSID("$OpenBSD: auth2-none.c,v 1.7 2004/05/11 19:01:43 deraadt Exp $"); |
27 | 27 | ||
28 | #include "auth.h" | 28 | #include "auth.h" |
29 | #include "xmalloc.h" | 29 | #include "xmalloc.h" |
@@ -46,7 +46,7 @@ auth2_read_banner(void) | |||
46 | { | 46 | { |
47 | struct stat st; | 47 | struct stat st; |
48 | char *banner = NULL; | 48 | char *banner = NULL; |
49 | off_t len, n; | 49 | size_t len, n; |
50 | int fd; | 50 | int fd; |
51 | 51 | ||
52 | if ((fd = open(options.banner, O_RDONLY)) == -1) | 52 | if ((fd = open(options.banner, O_RDONLY)) == -1) |
@@ -55,7 +55,12 @@ auth2_read_banner(void) | |||
55 | close(fd); | 55 | close(fd); |
56 | return (NULL); | 56 | return (NULL); |
57 | } | 57 | } |
58 | len = st.st_size; | 58 | if (st.st_size > 1*1024*1024) { |
59 | close(fd); | ||
60 | return (NULL); | ||
61 | } | ||
62 | |||
63 | len = (size_t)st.st_size; /* truncate */ | ||
59 | banner = xmalloc(len + 1); | 64 | banner = xmalloc(len + 1); |
60 | n = atomicio(read, fd, banner, len); | 65 | n = atomicio(read, fd, banner, len); |
61 | close(fd); | 66 | close(fd); |
diff --git a/auth2-pubkey.c b/auth2-pubkey.c index 3063eecc3..9898d4a63 100644 --- a/auth2-pubkey.c +++ b/auth2-pubkey.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: auth2-pubkey.c,v 1.6 2004/01/19 21:25:15 markus Exp $"); | 26 | RCSID("$OpenBSD: auth2-pubkey.c,v 1.7 2004/06/21 17:36:31 avsm Exp $"); |
27 | 27 | ||
28 | #include "ssh2.h" | 28 | #include "ssh2.h" |
29 | #include "xmalloc.h" | 29 | #include "xmalloc.h" |
@@ -205,7 +205,7 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file) | |||
205 | found = key_new(key->type); | 205 | found = key_new(key->type); |
206 | 206 | ||
207 | while (fgets(line, sizeof(line), f)) { | 207 | while (fgets(line, sizeof(line), f)) { |
208 | char *cp, *options = NULL; | 208 | char *cp, *key_options = NULL; |
209 | linenum++; | 209 | linenum++; |
210 | /* Skip leading whitespace, empty and comment lines. */ | 210 | /* Skip leading whitespace, empty and comment lines. */ |
211 | for (cp = line; *cp == ' ' || *cp == '\t'; cp++) | 211 | for (cp = line; *cp == ' ' || *cp == '\t'; cp++) |
@@ -217,7 +217,7 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file) | |||
217 | /* no key? check if there are options for this key */ | 217 | /* no key? check if there are options for this key */ |
218 | int quoted = 0; | 218 | int quoted = 0; |
219 | debug2("user_key_allowed: check options: '%s'", cp); | 219 | debug2("user_key_allowed: check options: '%s'", cp); |
220 | options = cp; | 220 | key_options = cp; |
221 | for (; *cp && (quoted || (*cp != ' ' && *cp != '\t')); cp++) { | 221 | for (; *cp && (quoted || (*cp != ' ' && *cp != '\t')); cp++) { |
222 | if (*cp == '\\' && cp[1] == '"') | 222 | if (*cp == '\\' && cp[1] == '"') |
223 | cp++; /* Skip both */ | 223 | cp++; /* Skip both */ |
@@ -234,7 +234,7 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file) | |||
234 | } | 234 | } |
235 | } | 235 | } |
236 | if (key_equal(found, key) && | 236 | if (key_equal(found, key) && |
237 | auth_parse_options(pw, options, file, linenum) == 1) { | 237 | auth_parse_options(pw, key_options, file, linenum) == 1) { |
238 | found_key = 1; | 238 | found_key = 1; |
239 | debug("matching key found: file %s, line %lu", | 239 | debug("matching key found: file %s, line %lu", |
240 | file, linenum); | 240 | file, linenum); |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: auth2.c,v 1.104 2003/11/04 08:54:09 djm Exp $"); | 26 | RCSID("$OpenBSD: auth2.c,v 1.107 2004/07/28 09:40:29 markus Exp $"); |
27 | 27 | ||
28 | #include "ssh2.h" | 28 | #include "ssh2.h" |
29 | #include "xmalloc.h" | 29 | #include "xmalloc.h" |
@@ -159,14 +159,14 @@ input_userauth_request(int type, u_int32_t seq, void *ctxt) | |||
159 | PRIVSEP(start_pam(authctxt)); | 159 | PRIVSEP(start_pam(authctxt)); |
160 | #endif | 160 | #endif |
161 | } else { | 161 | } else { |
162 | logit("input_userauth_request: illegal user %s", user); | 162 | logit("input_userauth_request: invalid user %s", user); |
163 | authctxt->pw = fakepw(); | 163 | authctxt->pw = fakepw(); |
164 | #ifdef USE_PAM | 164 | #ifdef USE_PAM |
165 | if (options.use_pam) | 165 | if (options.use_pam) |
166 | PRIVSEP(start_pam(authctxt)); | 166 | PRIVSEP(start_pam(authctxt)); |
167 | #endif | 167 | #endif |
168 | } | 168 | } |
169 | setproctitle("%s%s", authctxt->pw ? user : "unknown", | 169 | setproctitle("%s%s", authctxt->valid ? user : "unknown", |
170 | use_privsep ? " [net]" : ""); | 170 | use_privsep ? " [net]" : ""); |
171 | authctxt->service = xstrdup(service); | 171 | authctxt->service = xstrdup(service); |
172 | authctxt->style = style ? xstrdup(style) : NULL; | 172 | authctxt->style = style ? xstrdup(style) : NULL; |
@@ -243,7 +243,7 @@ userauth_finish(Authctxt *authctxt, int authenticated, char *method) | |||
243 | /* now we can break out */ | 243 | /* now we can break out */ |
244 | authctxt->success = 1; | 244 | authctxt->success = 1; |
245 | } else { | 245 | } else { |
246 | if (authctxt->failures++ > AUTH_FAIL_MAX) | 246 | if (authctxt->failures++ > options.max_authtries) |
247 | packet_disconnect(AUTH_FAIL_MSG, authctxt->user); | 247 | packet_disconnect(AUTH_FAIL_MSG, authctxt->user); |
248 | methods = authmethods_get(); | 248 | methods = authmethods_get(); |
249 | packet_start(SSH2_MSG_USERAUTH_FAILURE); | 249 | packet_start(SSH2_MSG_USERAUTH_FAILURE); |
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: authfd.c,v 1.63 2003/11/21 11:57:03 djm Exp $"); | 38 | RCSID("$OpenBSD: authfd.c,v 1.64 2004/08/11 21:44:31 avsm Exp $"); |
39 | 39 | ||
40 | #include <openssl/evp.h> | 40 | #include <openssl/evp.h> |
41 | 41 | ||
@@ -133,16 +133,9 @@ ssh_request_reply(AuthenticationConnection *auth, Buffer *request, Buffer *reply | |||
133 | * Wait for response from the agent. First read the length of the | 133 | * Wait for response from the agent. First read the length of the |
134 | * response packet. | 134 | * response packet. |
135 | */ | 135 | */ |
136 | len = 4; | 136 | if (atomicio(read, auth->fd, buf, 4) != 4) { |
137 | while (len > 0) { | 137 | error("Error reading response length from authentication socket."); |
138 | l = read(auth->fd, buf + 4 - len, len); | 138 | return 0; |
139 | if (l == -1 && (errno == EAGAIN || errno == EINTR)) | ||
140 | continue; | ||
141 | if (l <= 0) { | ||
142 | error("Error reading response length from authentication socket."); | ||
143 | return 0; | ||
144 | } | ||
145 | len -= l; | ||
146 | } | 139 | } |
147 | 140 | ||
148 | /* Extract the length, and check it for sanity. */ | 141 | /* Extract the length, and check it for sanity. */ |
@@ -156,9 +149,7 @@ ssh_request_reply(AuthenticationConnection *auth, Buffer *request, Buffer *reply | |||
156 | l = len; | 149 | l = len; |
157 | if (l > sizeof(buf)) | 150 | if (l > sizeof(buf)) |
158 | l = sizeof(buf); | 151 | l = sizeof(buf); |
159 | l = read(auth->fd, buf, l); | 152 | l = atomicio(read, auth->fd, buf, l); |
160 | if (l == -1 && (errno == EAGAIN || errno == EINTR)) | ||
161 | continue; | ||
162 | if (l <= 0) { | 153 | if (l <= 0) { |
163 | error("Error reading response from authentication socket."); | 154 | error("Error reading response from authentication socket."); |
164 | return 0; | 155 | return 0; |
diff --git a/authfile.c b/authfile.c index 83ddd635f..76a60d020 100644 --- a/authfile.c +++ b/authfile.c | |||
@@ -36,7 +36,7 @@ | |||
36 | */ | 36 | */ |
37 | 37 | ||
38 | #include "includes.h" | 38 | #include "includes.h" |
39 | RCSID("$OpenBSD: authfile.c,v 1.55 2003/09/18 07:56:05 markus Exp $"); | 39 | RCSID("$OpenBSD: authfile.c,v 1.57 2004/06/21 17:36:31 avsm Exp $"); |
40 | 40 | ||
41 | #include <openssl/err.h> | 41 | #include <openssl/err.h> |
42 | #include <openssl/evp.h> | 42 | #include <openssl/evp.h> |
@@ -72,7 +72,7 @@ key_save_private_rsa1(Key *key, const char *filename, const char *passphrase, | |||
72 | int fd, i, cipher_num; | 72 | int fd, i, cipher_num; |
73 | CipherContext ciphercontext; | 73 | CipherContext ciphercontext; |
74 | Cipher *cipher; | 74 | Cipher *cipher; |
75 | u_int32_t rand; | 75 | u_int32_t rnd; |
76 | 76 | ||
77 | /* | 77 | /* |
78 | * If the passphrase is empty, use SSH_CIPHER_NONE to ease converting | 78 | * If the passphrase is empty, use SSH_CIPHER_NONE to ease converting |
@@ -87,9 +87,9 @@ key_save_private_rsa1(Key *key, const char *filename, const char *passphrase, | |||
87 | buffer_init(&buffer); | 87 | buffer_init(&buffer); |
88 | 88 | ||
89 | /* Put checkbytes for checking passphrase validity. */ | 89 | /* Put checkbytes for checking passphrase validity. */ |
90 | rand = arc4random(); | 90 | rnd = arc4random(); |
91 | buf[0] = rand & 0xff; | 91 | buf[0] = rnd & 0xff; |
92 | buf[1] = (rand >> 8) & 0xff; | 92 | buf[1] = (rnd >> 8) & 0xff; |
93 | buf[2] = buf[0]; | 93 | buf[2] = buf[0]; |
94 | buf[3] = buf[1]; | 94 | buf[3] = buf[1]; |
95 | buffer_append(&buffer, buf, 4); | 95 | buffer_append(&buffer, buf, 4); |
@@ -236,14 +236,16 @@ key_load_public_rsa1(int fd, const char *filename, char **commentp) | |||
236 | struct stat st; | 236 | struct stat st; |
237 | char *cp; | 237 | char *cp; |
238 | int i; | 238 | int i; |
239 | off_t len; | 239 | size_t len; |
240 | 240 | ||
241 | if (fstat(fd, &st) < 0) { | 241 | if (fstat(fd, &st) < 0) { |
242 | error("fstat for key file %.200s failed: %.100s", | 242 | error("fstat for key file %.200s failed: %.100s", |
243 | filename, strerror(errno)); | 243 | filename, strerror(errno)); |
244 | return NULL; | 244 | return NULL; |
245 | } | 245 | } |
246 | len = st.st_size; | 246 | if (st.st_size > 1*1024*1024) |
247 | close(fd); | ||
248 | len = (size_t)st.st_size; /* truncated */ | ||
247 | 249 | ||
248 | buffer_init(&buffer); | 250 | buffer_init(&buffer); |
249 | cp = buffer_append_space(&buffer, len); | 251 | cp = buffer_append_space(&buffer, len); |
@@ -318,7 +320,7 @@ key_load_private_rsa1(int fd, const char *filename, const char *passphrase, | |||
318 | char **commentp) | 320 | char **commentp) |
319 | { | 321 | { |
320 | int i, check1, check2, cipher_type; | 322 | int i, check1, check2, cipher_type; |
321 | off_t len; | 323 | size_t len; |
322 | Buffer buffer, decrypted; | 324 | Buffer buffer, decrypted; |
323 | u_char *cp; | 325 | u_char *cp; |
324 | CipherContext ciphercontext; | 326 | CipherContext ciphercontext; |
@@ -332,7 +334,11 @@ key_load_private_rsa1(int fd, const char *filename, const char *passphrase, | |||
332 | close(fd); | 334 | close(fd); |
333 | return NULL; | 335 | return NULL; |
334 | } | 336 | } |
335 | len = st.st_size; | 337 | if (st.st_size > 1*1024*1024) { |
338 | close(fd); | ||
339 | return (NULL); | ||
340 | } | ||
341 | len = (size_t)st.st_size; /* truncated */ | ||
336 | 342 | ||
337 | buffer_init(&buffer); | 343 | buffer_init(&buffer); |
338 | cp = buffer_append_space(&buffer, len); | 344 | cp = buffer_append_space(&buffer, len); |
diff --git a/contrib/solaris/buildpkg.sh b/buildpkg.sh.in index 29d096306..f243e90bf 100755..100644 --- a/contrib/solaris/buildpkg.sh +++ b/buildpkg.sh.in | |||
@@ -9,7 +9,9 @@ | |||
9 | umask 022 | 9 | umask 022 |
10 | # | 10 | # |
11 | # Options for building the package | 11 | # Options for building the package |
12 | # You can create a config.local with your customized options | 12 | # You can create a openssh-config.local with your customized options |
13 | # | ||
14 | REMOVE_FAKE_ROOT_WHEN_DONE=yes | ||
13 | # | 15 | # |
14 | # uncommenting TEST_DIR and using | 16 | # uncommenting TEST_DIR and using |
15 | # configure --prefix=/var/tmp --with-privsep-path=/var/tmp/empty | 17 | # configure --prefix=/var/tmp --with-privsep-path=/var/tmp/empty |
@@ -19,6 +21,8 @@ umask 022 | |||
19 | # that support the -R option to pkgadd. | 21 | # that support the -R option to pkgadd. |
20 | #TEST_DIR=/var/tmp # leave commented out for production build | 22 | #TEST_DIR=/var/tmp # leave commented out for production build |
21 | PKGNAME=OpenSSH | 23 | PKGNAME=OpenSSH |
24 | # revisions within the same version (REV=a) | ||
25 | #REV= | ||
22 | SYSVINIT_NAME=opensshd | 26 | SYSVINIT_NAME=opensshd |
23 | MAKE=${MAKE:="make"} | 27 | MAKE=${MAKE:="make"} |
24 | SSHDUID=67 # Default privsep uid | 28 | SSHDUID=67 # Default privsep uid |
@@ -27,6 +31,26 @@ SSHDGID=67 # Default privsep gid | |||
27 | #PERMIT_ROOT_LOGIN=no | 31 | #PERMIT_ROOT_LOGIN=no |
28 | #X11_FORWARDING=yes | 32 | #X11_FORWARDING=yes |
29 | #USR_LOCAL_IS_SYMLINK=yes | 33 | #USR_LOCAL_IS_SYMLINK=yes |
34 | # System V init run levels | ||
35 | SYSVINITSTART=S98 | ||
36 | SYSVINITSTOPT=K30 | ||
37 | # We will source these if they exist | ||
38 | POST_MAKE_INSTALL_FIXES=./pkg_post_make_install_fixes.sh | ||
39 | POST_PROTOTYPE_EDITS=./pkg-post-prototype-edit.sh | ||
40 | # We'll be one level deeper looking for these | ||
41 | PKG_PREINSTALL_LOCAL=../pkg-preinstall.local | ||
42 | PKG_POSTINSTALL_LOCAL=../pkg-postinstall.local | ||
43 | PKG_PREREMOVE_LOCAL=../pkg-preremove.local | ||
44 | PKG_POSTREMOVE_LOCAL=../pkg-postremove.local | ||
45 | PKG_REQUEST_LOCAL=../pkg-request.local | ||
46 | # end of sourced files | ||
47 | # | ||
48 | OPENSSHD=opensshd.init | ||
49 | |||
50 | PATH_GROUPADD_PROG=@PATH_GROUPADD_PROG@ | ||
51 | PATH_USERADD_PROG=@PATH_USERADD_PROG@ | ||
52 | PATH_PASSWD_PROG=@PATH_PASSWD_PROG@ | ||
53 | # | ||
30 | # list of system directories we do NOT want to change owner/group/perms | 54 | # list of system directories we do NOT want to change owner/group/perms |
31 | # when installing our package | 55 | # when installing our package |
32 | SYSTEM_DIR="/etc \ | 56 | SYSTEM_DIR="/etc \ |
@@ -63,6 +87,10 @@ SYSTEM_DIR="/etc \ | |||
63 | 87 | ||
64 | # We may need to build as root so we make sure PATH is set up | 88 | # We may need to build as root so we make sure PATH is set up |
65 | # only set the path if it's not set already | 89 | # only set the path if it's not set already |
90 | [ -d /opt/bin ] && { | ||
91 | echo $PATH | grep ":/opt/bin" > /dev/null 2>&1 | ||
92 | [ $? -ne 0 ] && PATH=$PATH:/opt/bin | ||
93 | } | ||
66 | [ -d /usr/local/bin ] && { | 94 | [ -d /usr/local/bin ] && { |
67 | echo $PATH | grep ":/usr/local/bin" > /dev/null 2>&1 | 95 | echo $PATH | grep ":/usr/local/bin" > /dev/null 2>&1 |
68 | [ $? -ne 0 ] && PATH=$PATH:/usr/local/bin | 96 | [ $? -ne 0 ] && PATH=$PATH:/usr/local/bin |
@@ -79,25 +107,14 @@ export PATH | |||
79 | exit 1 | 107 | exit 1 |
80 | } | 108 | } |
81 | 109 | ||
82 | # we will look for config.local to override the above options | 110 | # we will look for openssh-config.local to override the above options |
83 | [ -s ./config.local ] && . ./config.local | 111 | [ -s ./openssh-config.local ] && . ./openssh-config.local |
84 | 112 | ||
85 | ## Start by faking root install | ||
86 | echo "Faking root install..." | ||
87 | START=`pwd` | 113 | START=`pwd` |
88 | OPENSSHD_IN=`dirname $0`/opensshd.in | 114 | FAKE_ROOT=$START/pkg |
89 | FAKE_ROOT=$START/package | ||
90 | [ -d $FAKE_ROOT ] && rm -fr $FAKE_ROOT | ||
91 | mkdir $FAKE_ROOT | ||
92 | ${MAKE} install-nokeys DESTDIR=$FAKE_ROOT | ||
93 | if [ $? -gt 0 ] | ||
94 | then | ||
95 | echo "Fake root install failed, stopping." | ||
96 | exit 1 | ||
97 | fi | ||
98 | 115 | ||
99 | ## Fill in some details, like prefix and sysconfdir | 116 | ## Fill in some details, like prefix and sysconfdir |
100 | for confvar in prefix exec_prefix bindir sbindir libexecdir datadir mandir sysconfdir piddir | 117 | for confvar in prefix exec_prefix bindir sbindir libexecdir datadir mandir sysconfdir piddir srcdir |
101 | do | 118 | do |
102 | eval $confvar=`grep "^$confvar=" Makefile | cut -d = -f 2` | 119 | eval $confvar=`grep "^$confvar=" Makefile | cut -d = -f 2` |
103 | done | 120 | done |
@@ -118,6 +135,10 @@ fi | |||
118 | ## Extract common info requires for the 'info' part of the package. | 135 | ## Extract common info requires for the 'info' part of the package. |
119 | VERSION=`./ssh -V 2>&1 | sed -e 's/,.*//'` | 136 | VERSION=`./ssh -V 2>&1 | sed -e 's/,.*//'` |
120 | 137 | ||
138 | ARCH=`uname -m` | ||
139 | DEF_MSG="\n" | ||
140 | OS_VER=`uname -v` | ||
141 | SCRIPT_SHELL=/sbin/sh | ||
121 | UNAME_S=`uname -s` | 142 | UNAME_S=`uname -s` |
122 | case ${UNAME_S} in | 143 | case ${UNAME_S} in |
123 | SunOS) UNAME_S=Solaris | 144 | SunOS) UNAME_S=Solaris |
@@ -125,18 +146,31 @@ case ${UNAME_S} in | |||
125 | RCS_D=yes | 146 | RCS_D=yes |
126 | DEF_MSG="(default: n)" | 147 | DEF_MSG="(default: n)" |
127 | ;; | 148 | ;; |
128 | *) ARCH=`uname -m` | 149 | SCO_SV) UNAME_S=OpenServer |
129 | DEF_MSG="\n" ;; | 150 | OS_VER=`uname -X | grep Release | sed -e 's/^Rel.*3.2v//'` |
151 | SCRIPT_SHELL=/bin/sh | ||
152 | RC1_D=no | ||
153 | DEF_MSG="(default: n)" | ||
154 | ;; | ||
130 | esac | 155 | esac |
131 | 156 | ||
157 | case `basename $0` in | ||
158 | buildpkg.sh) | ||
159 | ## Start by faking root install | ||
160 | echo "Faking root install..." | ||
161 | [ -d $FAKE_ROOT ] && rm -fr $FAKE_ROOT | ||
162 | mkdir $FAKE_ROOT | ||
163 | ${MAKE} install-nokeys DESTDIR=$FAKE_ROOT | ||
164 | if [ $? -gt 0 ] | ||
165 | then | ||
166 | echo "Fake root install failed, stopping." | ||
167 | exit 1 | ||
168 | fi | ||
169 | |||
132 | ## Setup our run level stuff while we are at it. | 170 | ## Setup our run level stuff while we are at it. |
133 | mkdir -p $FAKE_ROOT${TEST_DIR}/etc/init.d | 171 | mkdir -p $FAKE_ROOT${TEST_DIR}/etc/init.d |
134 | 172 | ||
135 | ## setup our initscript correctly | 173 | cp ${OPENSSHD} $FAKE_ROOT${TEST_DIR}/etc/init.d/${SYSVINIT_NAME} |
136 | sed -e "s#%%configDir%%#${sysconfdir}#g" \ | ||
137 | -e "s#%%openSSHDir%%#$prefix#g" \ | ||
138 | -e "s#%%pidDir%%#${piddir}#g" \ | ||
139 | ${OPENSSHD_IN} > $FAKE_ROOT${TEST_DIR}/etc/init.d/${SYSVINIT_NAME} | ||
140 | chmod 744 $FAKE_ROOT${TEST_DIR}/etc/init.d/${SYSVINIT_NAME} | 174 | chmod 744 $FAKE_ROOT${TEST_DIR}/etc/init.d/${SYSVINIT_NAME} |
141 | 175 | ||
142 | [ "${PERMIT_ROOT_LOGIN}" = no ] && \ | 176 | [ "${PERMIT_ROOT_LOGIN}" = no ] && \ |
@@ -155,6 +189,9 @@ mv $FAKE_ROOT/${sysconfdir}/sshd_config $FAKE_ROOT/${sysconfdir}/sshd_config.def | |||
155 | [ -f $FAKE_ROOT/${sysconfdir}/ssh_prng_cmds ] && \ | 189 | [ -f $FAKE_ROOT/${sysconfdir}/ssh_prng_cmds ] && \ |
156 | mv $FAKE_ROOT/${sysconfdir}/ssh_prng_cmds $FAKE_ROOT/${sysconfdir}/ssh_prng_cmds.default | 190 | mv $FAKE_ROOT/${sysconfdir}/ssh_prng_cmds $FAKE_ROOT/${sysconfdir}/ssh_prng_cmds.default |
157 | 191 | ||
192 | # local tweeks here | ||
193 | [ -s "${POST_MAKE_INSTALL_FIXES}" ] && . ${POST_MAKE_INSTALL_FIXES} | ||
194 | |||
158 | cd $FAKE_ROOT | 195 | cd $FAKE_ROOT |
159 | 196 | ||
160 | ## Ok, this is outright wrong, but it will work. I'm tired of pkgmk | 197 | ## Ok, this is outright wrong, but it will work. I'm tired of pkgmk |
@@ -171,16 +208,40 @@ NAME="OpenSSH Portable for ${UNAME_S}" | |||
171 | DESC="Secure Shell remote access utility; replaces telnet and rlogin/rsh." | 208 | DESC="Secure Shell remote access utility; replaces telnet and rlogin/rsh." |
172 | VENDOR="OpenSSH Portable Team - http://www.openssh.com/portable.html" | 209 | VENDOR="OpenSSH Portable Team - http://www.openssh.com/portable.html" |
173 | ARCH=$ARCH | 210 | ARCH=$ARCH |
174 | VERSION=$VERSION | 211 | VERSION=$VERSION$REV |
175 | CATEGORY="Security,application" | 212 | CATEGORY="Security,application" |
176 | BASEDIR=/ | 213 | BASEDIR=/ |
177 | CLASSES="none" | 214 | CLASSES="none" |
215 | PSTAMP="${UNAME_S} ${OS_VER} ${ARCH} `date '+%d%b%Y %H:%M'`" | ||
178 | _EOF | 216 | _EOF |
179 | 217 | ||
218 | ## Build empty depend file that may get updated by $POST_PROTOTYPE_EDITS | ||
219 | echo "Building depend file..." | ||
220 | touch depend | ||
221 | |||
222 | ## Build space file | ||
223 | echo "Building space file..." | ||
224 | cat > space << _EOF | ||
225 | # extra space required by start/stop links added by installf in postinstall | ||
226 | $TEST_DIR/etc/rc0.d/${SYSVINITSTOPT}${SYSVINIT_NAME} 0 1 | ||
227 | $TEST_DIR/etc/rc2.d/${SYSVINITSTART}${SYSVINIT_NAME} 0 1 | ||
228 | _EOF | ||
229 | [ "$RC1_D" = no ] || \ | ||
230 | echo "$TEST_DIR/etc/rc1.d/${SYSVINITSTOPT}${SYSVINIT_NAME} 0 1" >> space | ||
231 | [ "$RCS_D" = yes ] && \ | ||
232 | echo "$TEST_DIR/etc/rcS.d/${SYSVINITSTOPT}${SYSVINIT_NAME} 0 1" >> space | ||
233 | |||
180 | ## Build preinstall file | 234 | ## Build preinstall file |
181 | echo "Building preinstall file..." | 235 | echo "Building preinstall file..." |
182 | cat > preinstall << _EOF | 236 | cat > preinstall << _EOF |
183 | #! /sbin/sh | 237 | #! ${SCRIPT_SHELL} |
238 | # | ||
239 | _EOF | ||
240 | |||
241 | # local preinstall changes here | ||
242 | [ -s "${PKG_PREINSTALL_LOCAL}" ] && . ${PKG_PREINSTALL_LOCAL} | ||
243 | |||
244 | cat >> preinstall << _EOF | ||
184 | # | 245 | # |
185 | [ "\${PRE_INS_STOP}" = "yes" ] && ${TEST_DIR}/etc/init.d/${SYSVINIT_NAME} stop | 246 | [ "\${PRE_INS_STOP}" = "yes" ] && ${TEST_DIR}/etc/init.d/${SYSVINIT_NAME} stop |
186 | exit 0 | 247 | exit 0 |
@@ -189,7 +250,7 @@ _EOF | |||
189 | ## Build postinstall file | 250 | ## Build postinstall file |
190 | echo "Building postinstall file..." | 251 | echo "Building postinstall file..." |
191 | cat > postinstall << _EOF | 252 | cat > postinstall << _EOF |
192 | #! /sbin/sh | 253 | #! ${SCRIPT_SHELL} |
193 | # | 254 | # |
194 | [ -f \${PKG_INSTALL_ROOT}${sysconfdir}/ssh_config ] || \\ | 255 | [ -f \${PKG_INSTALL_ROOT}${sysconfdir}/ssh_config ] || \\ |
195 | cp -p \${PKG_INSTALL_ROOT}${sysconfdir}/ssh_config.default \\ | 256 | cp -p \${PKG_INSTALL_ROOT}${sysconfdir}/ssh_config.default \\ |
@@ -207,28 +268,36 @@ cat > postinstall << _EOF | |||
207 | [ -n "${TEST_DIR}" ] && { | 268 | [ -n "${TEST_DIR}" ] && { |
208 | [ "$RCS_D" = yes ] && mkdir -p ${TEST_DIR}/etc/rcS.d | 269 | [ "$RCS_D" = yes ] && mkdir -p ${TEST_DIR}/etc/rcS.d |
209 | mkdir -p ${TEST_DIR}/etc/rc0.d | 270 | mkdir -p ${TEST_DIR}/etc/rc0.d |
210 | mkdir -p ${TEST_DIR}/etc/rc1.d | 271 | [ "$RC1_D" = no ] || mkdir -p ${TEST_DIR}/etc/rc1.d |
211 | mkdir -p ${TEST_DIR}/etc/rc2.d | 272 | mkdir -p ${TEST_DIR}/etc/rc2.d |
212 | } | 273 | } |
213 | 274 | ||
214 | if [ "\${USE_SYM_LINKS}" = yes ] | 275 | if [ "\${USE_SYM_LINKS}" = yes ] |
215 | then | 276 | then |
216 | [ "$RCS_D" = yes ] && \ | 277 | [ "$RCS_D" = yes ] && \ |
217 | installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rcS.d/K30${SYSVINIT_NAME}=../init.d/${SYSVINIT_NAME} s | 278 | installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rcS.d/${SYSVINITSTOPT}${SYSVINIT_NAME}=../init.d/${SYSVINIT_NAME} s |
218 | installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc0.d/K30${SYSVINIT_NAME}=../init.d/${SYSVINIT_NAME} s | 279 | installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc0.d/${SYSVINITSTOPT}${SYSVINIT_NAME}=../init.d/${SYSVINIT_NAME} s |
219 | installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc1.d/K30${SYSVINIT_NAME}=../init.d/${SYSVINIT_NAME} s | 280 | [ "$RC1_D" = no ] || \ |
220 | installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc2.d/S98${SYSVINIT_NAME}=../init.d/${SYSVINIT_NAME} s | 281 | installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc1.d/${SYSVINITSTOPT}${SYSVINIT_NAME}=../init.d/${SYSVINIT_NAME} s |
282 | installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc2.d/${SYSVINITSTART}${SYSVINIT_NAME}=../init.d/${SYSVINIT_NAME} s | ||
221 | else | 283 | else |
222 | [ "$RCS_D" = yes ] && \ | 284 | [ "$RCS_D" = yes ] && \ |
223 | installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rcS.d/K30${SYSVINIT_NAME}=$TEST_DIR/etc/init.d/${SYSVINIT_NAME} l | 285 | installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rcS.d/${SYSVINITSTOPT}${SYSVINIT_NAME}=$TEST_DIR/etc/init.d/${SYSVINIT_NAME} l |
224 | installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc0.d/K30${SYSVINIT_NAME}=$TEST_DIR/etc/init.d/${SYSVINIT_NAME} l | 286 | installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc0.d/${SYSVINITSTOPT}${SYSVINIT_NAME}=$TEST_DIR/etc/init.d/${SYSVINIT_NAME} l |
225 | installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc1.d/K30${SYSVINIT_NAME}=$TEST_DIR/etc/init.d/${SYSVINIT_NAME} l | 287 | [ "$RC1_D" = no ] || \ |
226 | installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc2.d/S98${SYSVINIT_NAME}=$TEST_DIR/etc/init.d/${SYSVINIT_NAME} l | 288 | installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc1.d/${SYSVINITSTOPT}${SYSVINIT_NAME}=$TEST_DIR/etc/init.d/${SYSVINIT_NAME} l |
289 | installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc2.d/${SYSVINITSTART}${SYSVINIT_NAME}=$TEST_DIR/etc/init.d/${SYSVINIT_NAME} l | ||
227 | fi | 290 | fi |
228 | 291 | ||
229 | # If piddir doesn't exist we add it. (Ie. --with-pid-dir=/var/opt/ssh) | 292 | # If piddir doesn't exist we add it. (Ie. --with-pid-dir=/var/opt/ssh) |
230 | [ -d $piddir ] || installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR$piddir d 755 root sys | 293 | [ -d $piddir ] || installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR$piddir d 0755 root sys |
294 | |||
295 | _EOF | ||
296 | |||
297 | # local postinstall changes here | ||
298 | [ -s "${PKG_POSTINSTALL_LOCAL}" ] && . ${PKG_POSTINSTALL_LOCAL} | ||
231 | 299 | ||
300 | cat >> postinstall << _EOF | ||
232 | installf -f ${PKGNAME} | 301 | installf -f ${PKGNAME} |
233 | 302 | ||
234 | # Use chroot to handle PKG_INSTALL_ROOT | 303 | # Use chroot to handle PKG_INSTALL_ROOT |
@@ -249,11 +318,27 @@ then | |||
249 | else | 318 | else |
250 | echo "UsePrivilegeSeparation enabled in config (or defaulting to on)." | 319 | echo "UsePrivilegeSeparation enabled in config (or defaulting to on)." |
251 | 320 | ||
252 | # create group if required | 321 | # user required? |
253 | if cut -f1 -d: \${PKG_INSTALL_ROOT}/etc/group | egrep '^'$SSH_PRIVSEP_USER'\$' >/dev/null | 322 | if cut -f1 -d: \${PKG_INSTALL_ROOT}/etc/passwd | egrep '^'$SSH_PRIVSEP_USER'\$' >/dev/null |
254 | then | 323 | then |
255 | echo "PrivSep group $SSH_PRIVSEP_USER already exists." | 324 | echo "PrivSep user $SSH_PRIVSEP_USER already exists." |
325 | SSH_PRIVSEP_GROUP=\`grep "^$SSH_PRIVSEP_USER:" \${PKG_INSTALL_ROOT}/etc/passwd | awk -F: '{print \$4}'\` | ||
326 | SSH_PRIVSEP_GROUP=\`grep ":\$SSH_PRIVSEP_GROUP:" \${PKG_INSTALL_ROOT}/etc/group | awk -F: '{print \$1}'\` | ||
256 | else | 327 | else |
328 | DO_PASSWD=yes | ||
329 | fi | ||
330 | [ -z "\$SSH_PRIVSEP_GROUP" ] && SSH_PRIVSEP_GROUP=$SSH_PRIVSEP_USER | ||
331 | |||
332 | # group required? | ||
333 | if cut -f1 -d: \${PKG_INSTALL_ROOT}/etc/group | egrep '^'\$SSH_PRIVSEP_GROUP'\$' >/dev/null | ||
334 | then | ||
335 | echo "PrivSep group \$SSH_PRIVSEP_GROUP already exists." | ||
336 | else | ||
337 | DO_GROUP=yes | ||
338 | fi | ||
339 | |||
340 | # create group if required | ||
341 | [ "\$DO_GROUP" = yes ] && { | ||
257 | # Use gid of 67 if possible | 342 | # Use gid of 67 if possible |
258 | if cut -f3 -d: \${PKG_INSTALL_ROOT}/etc/group | egrep '^'$SSHDGID'\$' >/dev/null | 343 | if cut -f3 -d: \${PKG_INSTALL_ROOT}/etc/group | egrep '^'$SSHDGID'\$' >/dev/null |
259 | then | 344 | then |
@@ -261,15 +346,12 @@ else | |||
261 | else | 346 | else |
262 | sshdgid="-g $SSHDGID" | 347 | sshdgid="-g $SSHDGID" |
263 | fi | 348 | fi |
264 | echo "Creating PrivSep group $SSH_PRIVSEP_USER." | 349 | echo "Creating PrivSep group \$SSH_PRIVSEP_GROUP." |
265 | \$chroot /usr/sbin/groupadd \$sshdgid $SSH_PRIVSEP_USER | 350 | \$chroot ${PATH_GROUPADD_PROG} \$sshdgid \$SSH_PRIVSEP_GROUP |
266 | fi | 351 | } |
267 | 352 | ||
268 | # Create user if required | 353 | # Create user if required |
269 | if cut -f1 -d: \${PKG_INSTALL_ROOT}/etc/passwd | egrep '^'$SSH_PRIVSEP_USER'\$' >/dev/null | 354 | [ "\$DO_PASSWD" = yes ] && { |
270 | then | ||
271 | echo "PrivSep user $SSH_PRIVSEP_USER already exists." | ||
272 | else | ||
273 | # Use uid of 67 if possible | 355 | # Use uid of 67 if possible |
274 | if cut -f3 -d: \${PKG_INSTALL_ROOT}/etc/passwd | egrep '^'$SSHDGID'\$' >/dev/null | 356 | if cut -f3 -d: \${PKG_INSTALL_ROOT}/etc/passwd | egrep '^'$SSHDGID'\$' >/dev/null |
275 | then | 357 | then |
@@ -278,9 +360,9 @@ else | |||
278 | sshduid="-u $SSHDUID" | 360 | sshduid="-u $SSHDUID" |
279 | fi | 361 | fi |
280 | echo "Creating PrivSep user $SSH_PRIVSEP_USER." | 362 | echo "Creating PrivSep user $SSH_PRIVSEP_USER." |
281 | \$chroot /usr/sbin/useradd -c 'SSHD PrivSep User' -s /bin/false -g $SSH_PRIVSEP_USER \$sshduid $SSH_PRIVSEP_USER | 363 | \$chroot ${PATH_USERADD_PROG} -c 'SSHD PrivSep User' -s /bin/false -g $SSH_PRIVSEP_USER \$sshduid $SSH_PRIVSEP_USER |
282 | \$chroot /usr/bin/passwd -l $SSH_PRIVSEP_USER | 364 | \$chroot ${PATH_PASSWD_PROG} -l $SSH_PRIVSEP_USER |
283 | fi | 365 | } |
284 | fi | 366 | fi |
285 | 367 | ||
286 | [ "\${POST_INS_START}" = "yes" ] && ${TEST_DIR}/etc/init.d/${SYSVINIT_NAME} start | 368 | [ "\${POST_INS_START}" = "yes" ] && ${TEST_DIR}/etc/init.d/${SYSVINIT_NAME} start |
@@ -290,9 +372,29 @@ _EOF | |||
290 | ## Build preremove file | 372 | ## Build preremove file |
291 | echo "Building preremove file..." | 373 | echo "Building preremove file..." |
292 | cat > preremove << _EOF | 374 | cat > preremove << _EOF |
293 | #! /sbin/sh | 375 | #! ${SCRIPT_SHELL} |
294 | # | 376 | # |
295 | ${TEST_DIR}/etc/init.d/${SYSVINIT_NAME} stop | 377 | ${TEST_DIR}/etc/init.d/${SYSVINIT_NAME} stop |
378 | _EOF | ||
379 | |||
380 | # local preremove changes here | ||
381 | [ -s "${PKG_PREREMOVE_LOCAL}" ] && . ${PKG_PREREMOVE_LOCAL} | ||
382 | |||
383 | cat >> preremove << _EOF | ||
384 | exit 0 | ||
385 | _EOF | ||
386 | |||
387 | ## Build postremove file | ||
388 | echo "Building postremove file..." | ||
389 | cat > postremove << _EOF | ||
390 | #! ${SCRIPT_SHELL} | ||
391 | # | ||
392 | _EOF | ||
393 | |||
394 | # local postremove changes here | ||
395 | [ -s "${PKG_POSTREMOVE_LOCAL}" ] && . ${PKG_POSTREMOVE_LOCAL} | ||
396 | |||
397 | cat >> postremove << _EOF | ||
296 | exit 0 | 398 | exit 0 |
297 | _EOF | 399 | _EOF |
298 | 400 | ||
@@ -300,6 +402,59 @@ _EOF | |||
300 | echo "Building request file..." | 402 | echo "Building request file..." |
301 | cat > request << _EOF | 403 | cat > request << _EOF |
302 | trap 'exit 3' 15 | 404 | trap 'exit 3' 15 |
405 | |||
406 | _EOF | ||
407 | |||
408 | [ -x /usr/bin/ckyorn ] || cat >> request << _EOF | ||
409 | |||
410 | ckyorn() { | ||
411 | # for some strange reason OpenServer has no ckyorn | ||
412 | # We build a striped down version here | ||
413 | |||
414 | DEFAULT=n | ||
415 | PROMPT="Yes or No [yes,no,?,quit]" | ||
416 | HELP_PROMPT=" Enter y or yes if your answer is yes; n or no if your answer is no." | ||
417 | USAGE="usage: ckyorn [options] | ||
418 | where options may include: | ||
419 | -d default | ||
420 | -h help | ||
421 | -p prompt | ||
422 | " | ||
423 | |||
424 | if [ \$# != 0 ] | ||
425 | then | ||
426 | while getopts d:p:h: c | ||
427 | do | ||
428 | case \$c in | ||
429 | h) HELP_PROMPT="\$OPTARG" ;; | ||
430 | d) DEFAULT=\$OPTARG ;; | ||
431 | p) PROMPT=\$OPTARG ;; | ||
432 | \\?) echo "\$USAGE" 1>&2 | ||
433 | exit 1 ;; | ||
434 | esac | ||
435 | done | ||
436 | shift \`expr \$OPTIND - 1\` | ||
437 | fi | ||
438 | |||
439 | while true | ||
440 | do | ||
441 | echo "\${PROMPT}\\c " 1>&2 | ||
442 | read key | ||
443 | [ -z "\$key" ] && key=\$DEFAULT | ||
444 | case \$key in | ||
445 | [n,N]|[n,N][o,O]|[y,Y]|[y,Y][e,E][s,S]) echo "\${key}\\c" | ||
446 | exit 0 ;; | ||
447 | \\?) echo \$HELP_PROMPT 1>&2 ;; | ||
448 | q|quit) echo "q\\c" 1>&2 | ||
449 | exit 3 ;; | ||
450 | esac | ||
451 | done | ||
452 | |||
453 | } | ||
454 | |||
455 | _EOF | ||
456 | |||
457 | cat >> request << _EOF | ||
303 | USE_SYM_LINKS=no | 458 | USE_SYM_LINKS=no |
304 | PRE_INS_STOP=no | 459 | PRE_INS_STOP=no |
305 | POST_INS_START=no | 460 | POST_INS_START=no |
@@ -338,36 +493,38 @@ USE_SYM_LINKS='\$USE_SYM_LINKS' | |||
338 | PRE_INS_STOP='\$PRE_INS_STOP' | 493 | PRE_INS_STOP='\$PRE_INS_STOP' |
339 | POST_INS_START='\$POST_INS_START' | 494 | POST_INS_START='\$POST_INS_START' |
340 | ! | 495 | ! |
341 | exit 0 | ||
342 | 496 | ||
343 | _EOF | 497 | _EOF |
344 | 498 | ||
345 | ## Build space file | 499 | # local request changes here |
346 | echo "Building space file..." | 500 | [ -s "${PKG_REQUEST_LOCAL}" ] && . ${PKG_REQUEST_LOCAL} |
347 | cat > space << _EOF | 501 | |
348 | # extra space required by start/stop links added by installf in postinstall | 502 | cat >> request << _EOF |
349 | $TEST_DIR/etc/rc0.d/K30${SYSVINIT_NAME} 0 1 | 503 | exit 0 |
350 | $TEST_DIR/etc/rc1.d/K30${SYSVINIT_NAME} 0 1 | 504 | |
351 | $TEST_DIR/etc/rc2.d/S98${SYSVINIT_NAME} 0 1 | ||
352 | _EOF | 505 | _EOF |
353 | [ "$RCS_D" = yes ] && \ | ||
354 | echo "$TEST_DIR/etc/rcS.d/K30${SYSVINIT_NAME} 0 1" >> space | ||
355 | 506 | ||
356 | ## Next Build our prototype | 507 | ## Next Build our prototype |
357 | echo "Building prototype file..." | 508 | echo "Building prototype file..." |
358 | cat >mk-proto.awk << _EOF | 509 | cat >mk-proto.awk << _EOF |
359 | BEGIN { print "i pkginfo"; print "i preinstall"; \\ | 510 | BEGIN { print "i pkginfo"; print "i depend"; \\ |
360 | print "i postinstall"; print "i preremove"; \\ | 511 | print "i preinstall"; print "i postinstall"; \\ |
512 | print "i preremove"; print "i postremove"; \\ | ||
361 | print "i request"; print "i space"; \\ | 513 | print "i request"; print "i space"; \\ |
362 | split("$SYSTEM_DIR",sys_files); } | 514 | split("$SYSTEM_DIR",sys_files); } |
363 | { | 515 | { |
364 | for (dir in sys_files) { if ( \$3 != sys_files[dir] ) | 516 | for (dir in sys_files) { if ( \$3 != sys_files[dir] ) |
365 | { \$5="root"; \$6="sys"; } | 517 | { if ( \$1 == "s" ) |
518 | { \$5=""; \$6=""; } | ||
519 | else | ||
520 | { \$5="root"; \$6="sys"; } | ||
521 | } | ||
366 | else | 522 | else |
367 | { \$4="?"; \$5="?"; \$6="?"; break;} | 523 | { \$4="?"; \$5="?"; \$6="?"; break;} |
368 | } } | 524 | } } |
369 | { print; } | 525 | { print; } |
370 | _EOF | 526 | _EOF |
527 | |||
371 | find . | egrep -v "prototype|pkginfo|mk-proto.awk" | sort | \ | 528 | find . | egrep -v "prototype|pkginfo|mk-proto.awk" | sort | \ |
372 | pkgproto $PROTO_ARGS | nawk -f mk-proto.awk > prototype | 529 | pkgproto $PROTO_ARGS | nawk -f mk-proto.awk > prototype |
373 | 530 | ||
@@ -378,9 +535,28 @@ find . | egrep -v "prototype|pkginfo|mk-proto.awk" | sort | \ | |||
378 | } | 535 | } |
379 | 536 | ||
380 | ## Step back a directory and now build the package. | 537 | ## Step back a directory and now build the package. |
381 | echo "Building package.." | ||
382 | cd .. | 538 | cd .. |
539 | # local prototype tweeks here | ||
540 | [ -s "${POST_PROTOTYPE_EDITS}" ] && . ${POST_PROTOTYPE_EDITS} | ||
541 | |||
542 | echo "Building package.." | ||
383 | pkgmk -d ${FAKE_ROOT} -f $FAKE_ROOT/prototype -o | 543 | pkgmk -d ${FAKE_ROOT} -f $FAKE_ROOT/prototype -o |
384 | echo | pkgtrans -os ${FAKE_ROOT} ${START}/$PKGNAME-$UNAME_S-$ARCH-$VERSION.pkg | 544 | echo | pkgtrans -os ${FAKE_ROOT} ${START}/$PKGNAME-$VERSION$REV-$UNAME_S-$ARCH.pkg |
385 | rm -rf $FAKE_ROOT | 545 | ;; |
546 | |||
547 | justpkg.sh) | ||
548 | rm -fr ${FAKE_ROOT}/${PKGNAME} | ||
549 | grep -v "^PSTAMP=" $FAKE_ROOT/pkginfo > $$tmp | ||
550 | mv $$tmp $FAKE_ROOT/pkginfo | ||
551 | cat >> $FAKE_ROOT/pkginfo << _EOF | ||
552 | PSTAMP="${UNAME_S} ${OS_VER} ${ARCH} `date '+%d%b%Y %H:%M'`" | ||
553 | _EOF | ||
554 | pkgmk -d ${FAKE_ROOT} -f $FAKE_ROOT/prototype -o | ||
555 | echo | pkgtrans -os ${FAKE_ROOT} ${START}/$PKGNAME-$VERSION$REV-$UNAME_S-$ARCH.pkg | ||
556 | ;; | ||
557 | |||
558 | esac | ||
559 | |||
560 | [ "${REMOVE_FAKE_ROOT_WHEN_DONE}" = yes ] && rm -rf $FAKE_ROOT | ||
561 | exit 0 | ||
386 | 562 | ||
diff --git a/canohost.c b/canohost.c index a0067afc1..8ad684d6c 100644 --- a/canohost.c +++ b/canohost.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: canohost.c,v 1.38 2003/09/23 20:17:11 markus Exp $"); | 15 | RCSID("$OpenBSD: canohost.c,v 1.41 2004/07/21 11:51:29 djm Exp $"); |
16 | 16 | ||
17 | #include "packet.h" | 17 | #include "packet.h" |
18 | #include "xmalloc.h" | 18 | #include "xmalloc.h" |
@@ -28,7 +28,7 @@ static void ipv64_normalise_mapped(struct sockaddr_storage *, socklen_t *); | |||
28 | */ | 28 | */ |
29 | 29 | ||
30 | static char * | 30 | static char * |
31 | get_remote_hostname(int socket, int use_dns) | 31 | get_remote_hostname(int sock, int use_dns) |
32 | { | 32 | { |
33 | struct sockaddr_storage from; | 33 | struct sockaddr_storage from; |
34 | int i; | 34 | int i; |
@@ -39,13 +39,13 @@ get_remote_hostname(int socket, int use_dns) | |||
39 | /* Get IP address of client. */ | 39 | /* Get IP address of client. */ |
40 | fromlen = sizeof(from); | 40 | fromlen = sizeof(from); |
41 | memset(&from, 0, sizeof(from)); | 41 | memset(&from, 0, sizeof(from)); |
42 | if (getpeername(socket, (struct sockaddr *)&from, &fromlen) < 0) { | 42 | if (getpeername(sock, (struct sockaddr *)&from, &fromlen) < 0) { |
43 | debug("getpeername failed: %.100s", strerror(errno)); | 43 | debug("getpeername failed: %.100s", strerror(errno)); |
44 | cleanup_exit(255); | 44 | cleanup_exit(255); |
45 | } | 45 | } |
46 | 46 | ||
47 | if (from.ss_family == AF_INET) | 47 | if (from.ss_family == AF_INET) |
48 | check_ip_options(socket, ntop); | 48 | check_ip_options(sock, ntop); |
49 | 49 | ||
50 | ipv64_normalise_mapped(&from, &fromlen); | 50 | ipv64_normalise_mapped(&from, &fromlen); |
51 | 51 | ||
@@ -138,7 +138,7 @@ get_remote_hostname(int socket, int use_dns) | |||
138 | */ | 138 | */ |
139 | /* IPv4 only */ | 139 | /* IPv4 only */ |
140 | static void | 140 | static void |
141 | check_ip_options(int socket, char *ipaddr) | 141 | check_ip_options(int sock, char *ipaddr) |
142 | { | 142 | { |
143 | #ifdef IP_OPTIONS | 143 | #ifdef IP_OPTIONS |
144 | u_char options[200]; | 144 | u_char options[200]; |
@@ -152,7 +152,7 @@ check_ip_options(int socket, char *ipaddr) | |||
152 | else | 152 | else |
153 | ipproto = IPPROTO_IP; | 153 | ipproto = IPPROTO_IP; |
154 | option_size = sizeof(options); | 154 | option_size = sizeof(options); |
155 | if (getsockopt(socket, ipproto, IP_OPTIONS, options, | 155 | if (getsockopt(sock, ipproto, IP_OPTIONS, options, |
156 | &option_size) >= 0 && option_size != 0) { | 156 | &option_size) >= 0 && option_size != 0) { |
157 | text[0] = '\0'; | 157 | text[0] = '\0'; |
158 | for (i = 0; i < option_size; i++) | 158 | for (i = 0; i < option_size; i++) |
@@ -227,7 +227,7 @@ get_canonical_hostname(int use_dns) | |||
227 | * The returned string must be freed. | 227 | * The returned string must be freed. |
228 | */ | 228 | */ |
229 | static char * | 229 | static char * |
230 | get_socket_address(int socket, int remote, int flags) | 230 | get_socket_address(int sock, int remote, int flags) |
231 | { | 231 | { |
232 | struct sockaddr_storage addr; | 232 | struct sockaddr_storage addr; |
233 | socklen_t addrlen; | 233 | socklen_t addrlen; |
@@ -238,11 +238,11 @@ get_socket_address(int socket, int remote, int flags) | |||
238 | memset(&addr, 0, sizeof(addr)); | 238 | memset(&addr, 0, sizeof(addr)); |
239 | 239 | ||
240 | if (remote) { | 240 | if (remote) { |
241 | if (getpeername(socket, (struct sockaddr *)&addr, &addrlen) | 241 | if (getpeername(sock, (struct sockaddr *)&addr, &addrlen) |
242 | < 0) | 242 | < 0) |
243 | return NULL; | 243 | return NULL; |
244 | } else { | 244 | } else { |
245 | if (getsockname(socket, (struct sockaddr *)&addr, &addrlen) | 245 | if (getsockname(sock, (struct sockaddr *)&addr, &addrlen) |
246 | < 0) | 246 | < 0) |
247 | return NULL; | 247 | return NULL; |
248 | } | 248 | } |
@@ -261,29 +261,29 @@ get_socket_address(int socket, int remote, int flags) | |||
261 | } | 261 | } |
262 | 262 | ||
263 | char * | 263 | char * |
264 | get_peer_ipaddr(int socket) | 264 | get_peer_ipaddr(int sock) |
265 | { | 265 | { |
266 | char *p; | 266 | char *p; |
267 | 267 | ||
268 | if ((p = get_socket_address(socket, 1, NI_NUMERICHOST)) != NULL) | 268 | if ((p = get_socket_address(sock, 1, NI_NUMERICHOST)) != NULL) |
269 | return p; | 269 | return p; |
270 | return xstrdup("UNKNOWN"); | 270 | return xstrdup("UNKNOWN"); |
271 | } | 271 | } |
272 | 272 | ||
273 | char * | 273 | char * |
274 | get_local_ipaddr(int socket) | 274 | get_local_ipaddr(int sock) |
275 | { | 275 | { |
276 | char *p; | 276 | char *p; |
277 | 277 | ||
278 | if ((p = get_socket_address(socket, 0, NI_NUMERICHOST)) != NULL) | 278 | if ((p = get_socket_address(sock, 0, NI_NUMERICHOST)) != NULL) |
279 | return p; | 279 | return p; |
280 | return xstrdup("UNKNOWN"); | 280 | return xstrdup("UNKNOWN"); |
281 | } | 281 | } |
282 | 282 | ||
283 | char * | 283 | char * |
284 | get_local_name(int socket) | 284 | get_local_name(int sock) |
285 | { | 285 | { |
286 | return get_socket_address(socket, 0, NI_NAMEREQD); | 286 | return get_socket_address(sock, 0, NI_NAMEREQD); |
287 | } | 287 | } |
288 | 288 | ||
289 | /* | 289 | /* |
@@ -382,7 +382,13 @@ get_peer_port(int sock) | |||
382 | int | 382 | int |
383 | get_remote_port(void) | 383 | get_remote_port(void) |
384 | { | 384 | { |
385 | return get_port(0); | 385 | static int port = -1; |
386 | |||
387 | /* Cache to avoid getpeername() on a dead connection */ | ||
388 | if (port == -1) | ||
389 | port = get_port(0); | ||
390 | |||
391 | return port; | ||
386 | } | 392 | } |
387 | 393 | ||
388 | int | 394 | int |
diff --git a/channels.c b/channels.c index e663c2159..1f6984aa7 100644 --- a/channels.c +++ b/channels.c | |||
@@ -39,7 +39,7 @@ | |||
39 | */ | 39 | */ |
40 | 40 | ||
41 | #include "includes.h" | 41 | #include "includes.h" |
42 | RCSID("$OpenBSD: channels.c,v 1.200 2004/01/19 09:24:21 markus Exp $"); | 42 | RCSID("$OpenBSD: channels.c,v 1.209 2004/08/11 21:43:04 avsm Exp $"); |
43 | 43 | ||
44 | #include "ssh.h" | 44 | #include "ssh.h" |
45 | #include "ssh1.h" | 45 | #include "ssh1.h" |
@@ -68,7 +68,7 @@ static Channel **channels = NULL; | |||
68 | * Size of the channel array. All slots of the array must always be | 68 | * Size of the channel array. All slots of the array must always be |
69 | * initialized (at least the type field); unused slots set to NULL | 69 | * initialized (at least the type field); unused slots set to NULL |
70 | */ | 70 | */ |
71 | static int channels_alloc = 0; | 71 | static u_int channels_alloc = 0; |
72 | 72 | ||
73 | /* | 73 | /* |
74 | * Maximum file descriptor value used in any of the channels. This is | 74 | * Maximum file descriptor value used in any of the channels. This is |
@@ -141,7 +141,7 @@ channel_lookup(int id) | |||
141 | { | 141 | { |
142 | Channel *c; | 142 | Channel *c; |
143 | 143 | ||
144 | if (id < 0 || id >= channels_alloc) { | 144 | if (id < 0 || (u_int)id >= channels_alloc) { |
145 | logit("channel_lookup: %d: bad id", id); | 145 | logit("channel_lookup: %d: bad id", id); |
146 | return NULL; | 146 | return NULL; |
147 | } | 147 | } |
@@ -172,6 +172,7 @@ channel_register_fds(Channel *c, int rfd, int wfd, int efd, | |||
172 | c->rfd = rfd; | 172 | c->rfd = rfd; |
173 | c->wfd = wfd; | 173 | c->wfd = wfd; |
174 | c->sock = (rfd == wfd) ? rfd : -1; | 174 | c->sock = (rfd == wfd) ? rfd : -1; |
175 | c->ctl_fd = -1; /* XXX: set elsewhere */ | ||
175 | c->efd = efd; | 176 | c->efd = efd; |
176 | c->extended_usage = extusage; | 177 | c->extended_usage = extusage; |
177 | 178 | ||
@@ -208,7 +209,8 @@ Channel * | |||
208 | channel_new(char *ctype, int type, int rfd, int wfd, int efd, | 209 | channel_new(char *ctype, int type, int rfd, int wfd, int efd, |
209 | u_int window, u_int maxpack, int extusage, char *remote_name, int nonblock) | 210 | u_int window, u_int maxpack, int extusage, char *remote_name, int nonblock) |
210 | { | 211 | { |
211 | int i, found; | 212 | int found; |
213 | u_int i; | ||
212 | Channel *c; | 214 | Channel *c; |
213 | 215 | ||
214 | /* Do initial allocation if this is the first call. */ | 216 | /* Do initial allocation if this is the first call. */ |
@@ -222,10 +224,10 @@ channel_new(char *ctype, int type, int rfd, int wfd, int efd, | |||
222 | for (found = -1, i = 0; i < channels_alloc; i++) | 224 | for (found = -1, i = 0; i < channels_alloc; i++) |
223 | if (channels[i] == NULL) { | 225 | if (channels[i] == NULL) { |
224 | /* Found a free slot. */ | 226 | /* Found a free slot. */ |
225 | found = i; | 227 | found = (int)i; |
226 | break; | 228 | break; |
227 | } | 229 | } |
228 | if (found == -1) { | 230 | if (found < 0) { |
229 | /* There are no free slots. Take last+1 slot and expand the array. */ | 231 | /* There are no free slots. Take last+1 slot and expand the array. */ |
230 | found = channels_alloc; | 232 | found = channels_alloc; |
231 | if (channels_alloc > 10000) | 233 | if (channels_alloc > 10000) |
@@ -263,6 +265,7 @@ channel_new(char *ctype, int type, int rfd, int wfd, int efd, | |||
263 | c->single_connection = 0; | 265 | c->single_connection = 0; |
264 | c->detach_user = NULL; | 266 | c->detach_user = NULL; |
265 | c->confirm = NULL; | 267 | c->confirm = NULL; |
268 | c->confirm_ctx = NULL; | ||
266 | c->input_filter = NULL; | 269 | c->input_filter = NULL; |
267 | debug("channel %d: new [%s]", found, remote_name); | 270 | debug("channel %d: new [%s]", found, remote_name); |
268 | return c; | 271 | return c; |
@@ -271,7 +274,8 @@ channel_new(char *ctype, int type, int rfd, int wfd, int efd, | |||
271 | static int | 274 | static int |
272 | channel_find_maxfd(void) | 275 | channel_find_maxfd(void) |
273 | { | 276 | { |
274 | int i, max = 0; | 277 | u_int i; |
278 | int max = 0; | ||
275 | Channel *c; | 279 | Channel *c; |
276 | 280 | ||
277 | for (i = 0; i < channels_alloc; i++) { | 281 | for (i = 0; i < channels_alloc; i++) { |
@@ -304,10 +308,11 @@ channel_close_fd(int *fdp) | |||
304 | static void | 308 | static void |
305 | channel_close_fds(Channel *c) | 309 | channel_close_fds(Channel *c) |
306 | { | 310 | { |
307 | debug3("channel %d: close_fds r %d w %d e %d", | 311 | debug3("channel %d: close_fds r %d w %d e %d c %d", |
308 | c->self, c->rfd, c->wfd, c->efd); | 312 | c->self, c->rfd, c->wfd, c->efd, c->ctl_fd); |
309 | 313 | ||
310 | channel_close_fd(&c->sock); | 314 | channel_close_fd(&c->sock); |
315 | channel_close_fd(&c->ctl_fd); | ||
311 | channel_close_fd(&c->rfd); | 316 | channel_close_fd(&c->rfd); |
312 | channel_close_fd(&c->wfd); | 317 | channel_close_fd(&c->wfd); |
313 | channel_close_fd(&c->efd); | 318 | channel_close_fd(&c->efd); |
@@ -319,12 +324,12 @@ void | |||
319 | channel_free(Channel *c) | 324 | channel_free(Channel *c) |
320 | { | 325 | { |
321 | char *s; | 326 | char *s; |
322 | int i, n; | 327 | u_int i, n; |
323 | 328 | ||
324 | for (n = 0, i = 0; i < channels_alloc; i++) | 329 | for (n = 0, i = 0; i < channels_alloc; i++) |
325 | if (channels[i]) | 330 | if (channels[i]) |
326 | n++; | 331 | n++; |
327 | debug("channel %d: free: %s, nchannels %d", c->self, | 332 | debug("channel %d: free: %s, nchannels %u", c->self, |
328 | c->remote_name ? c->remote_name : "???", n); | 333 | c->remote_name ? c->remote_name : "???", n); |
329 | 334 | ||
330 | s = channel_open_message(); | 335 | s = channel_open_message(); |
@@ -333,6 +338,8 @@ channel_free(Channel *c) | |||
333 | 338 | ||
334 | if (c->sock != -1) | 339 | if (c->sock != -1) |
335 | shutdown(c->sock, SHUT_RDWR); | 340 | shutdown(c->sock, SHUT_RDWR); |
341 | if (c->ctl_fd != -1) | ||
342 | shutdown(c->ctl_fd, SHUT_RDWR); | ||
336 | channel_close_fds(c); | 343 | channel_close_fds(c); |
337 | buffer_free(&c->input); | 344 | buffer_free(&c->input); |
338 | buffer_free(&c->output); | 345 | buffer_free(&c->output); |
@@ -348,7 +355,7 @@ channel_free(Channel *c) | |||
348 | void | 355 | void |
349 | channel_free_all(void) | 356 | channel_free_all(void) |
350 | { | 357 | { |
351 | int i; | 358 | u_int i; |
352 | 359 | ||
353 | for (i = 0; i < channels_alloc; i++) | 360 | for (i = 0; i < channels_alloc; i++) |
354 | if (channels[i] != NULL) | 361 | if (channels[i] != NULL) |
@@ -363,7 +370,7 @@ channel_free_all(void) | |||
363 | void | 370 | void |
364 | channel_close_all(void) | 371 | channel_close_all(void) |
365 | { | 372 | { |
366 | int i; | 373 | u_int i; |
367 | 374 | ||
368 | for (i = 0; i < channels_alloc; i++) | 375 | for (i = 0; i < channels_alloc; i++) |
369 | if (channels[i] != NULL) | 376 | if (channels[i] != NULL) |
@@ -377,7 +384,7 @@ channel_close_all(void) | |||
377 | void | 384 | void |
378 | channel_stop_listening(void) | 385 | channel_stop_listening(void) |
379 | { | 386 | { |
380 | int i; | 387 | u_int i; |
381 | Channel *c; | 388 | Channel *c; |
382 | 389 | ||
383 | for (i = 0; i < channels_alloc; i++) { | 390 | for (i = 0; i < channels_alloc; i++) { |
@@ -434,7 +441,7 @@ channel_not_very_much_buffered_data(void) | |||
434 | int | 441 | int |
435 | channel_still_open(void) | 442 | channel_still_open(void) |
436 | { | 443 | { |
437 | int i; | 444 | u_int i; |
438 | Channel *c; | 445 | Channel *c; |
439 | 446 | ||
440 | for (i = 0; i < channels_alloc; i++) { | 447 | for (i = 0; i < channels_alloc; i++) { |
@@ -477,12 +484,12 @@ channel_still_open(void) | |||
477 | int | 484 | int |
478 | channel_find_open(void) | 485 | channel_find_open(void) |
479 | { | 486 | { |
480 | int i; | 487 | u_int i; |
481 | Channel *c; | 488 | Channel *c; |
482 | 489 | ||
483 | for (i = 0; i < channels_alloc; i++) { | 490 | for (i = 0; i < channels_alloc; i++) { |
484 | c = channels[i]; | 491 | c = channels[i]; |
485 | if (c == NULL) | 492 | if (c == NULL || c->remote_id < 0) |
486 | continue; | 493 | continue; |
487 | switch (c->type) { | 494 | switch (c->type) { |
488 | case SSH_CHANNEL_CLOSED: | 495 | case SSH_CHANNEL_CLOSED: |
@@ -525,7 +532,7 @@ channel_open_message(void) | |||
525 | Buffer buffer; | 532 | Buffer buffer; |
526 | Channel *c; | 533 | Channel *c; |
527 | char buf[1024], *cp; | 534 | char buf[1024], *cp; |
528 | int i; | 535 | u_int i; |
529 | 536 | ||
530 | buffer_init(&buffer); | 537 | buffer_init(&buffer); |
531 | snprintf(buf, sizeof buf, "The following connections are open:\r\n"); | 538 | snprintf(buf, sizeof buf, "The following connections are open:\r\n"); |
@@ -550,12 +557,13 @@ channel_open_message(void) | |||
550 | case SSH_CHANNEL_X11_OPEN: | 557 | case SSH_CHANNEL_X11_OPEN: |
551 | case SSH_CHANNEL_INPUT_DRAINING: | 558 | case SSH_CHANNEL_INPUT_DRAINING: |
552 | case SSH_CHANNEL_OUTPUT_DRAINING: | 559 | case SSH_CHANNEL_OUTPUT_DRAINING: |
553 | snprintf(buf, sizeof buf, " #%d %.300s (t%d r%d i%d/%d o%d/%d fd %d/%d)\r\n", | 560 | snprintf(buf, sizeof buf, |
561 | " #%d %.300s (t%d r%d i%d/%d o%d/%d fd %d/%d cfd %d)\r\n", | ||
554 | c->self, c->remote_name, | 562 | c->self, c->remote_name, |
555 | c->type, c->remote_id, | 563 | c->type, c->remote_id, |
556 | c->istate, buffer_len(&c->input), | 564 | c->istate, buffer_len(&c->input), |
557 | c->ostate, buffer_len(&c->output), | 565 | c->ostate, buffer_len(&c->output), |
558 | c->rfd, c->wfd); | 566 | c->rfd, c->wfd, c->ctl_fd); |
559 | buffer_append(&buffer, buf, strlen(buf)); | 567 | buffer_append(&buffer, buf, strlen(buf)); |
560 | continue; | 568 | continue; |
561 | default: | 569 | default: |
@@ -596,14 +604,14 @@ channel_request_start(int id, char *service, int wantconfirm) | |||
596 | logit("channel_request_start: %d: unknown channel id", id); | 604 | logit("channel_request_start: %d: unknown channel id", id); |
597 | return; | 605 | return; |
598 | } | 606 | } |
599 | debug2("channel %d: request %s", id, service) ; | 607 | debug2("channel %d: request %s confirm %d", id, service, wantconfirm); |
600 | packet_start(SSH2_MSG_CHANNEL_REQUEST); | 608 | packet_start(SSH2_MSG_CHANNEL_REQUEST); |
601 | packet_put_int(c->remote_id); | 609 | packet_put_int(c->remote_id); |
602 | packet_put_cstring(service); | 610 | packet_put_cstring(service); |
603 | packet_put_char(wantconfirm); | 611 | packet_put_char(wantconfirm); |
604 | } | 612 | } |
605 | void | 613 | void |
606 | channel_register_confirm(int id, channel_callback_fn *fn) | 614 | channel_register_confirm(int id, channel_callback_fn *fn, void *ctx) |
607 | { | 615 | { |
608 | Channel *c = channel_lookup(id); | 616 | Channel *c = channel_lookup(id); |
609 | 617 | ||
@@ -612,6 +620,7 @@ channel_register_confirm(int id, channel_callback_fn *fn) | |||
612 | return; | 620 | return; |
613 | } | 621 | } |
614 | c->confirm = fn; | 622 | c->confirm = fn; |
623 | c->confirm_ctx = ctx; | ||
615 | } | 624 | } |
616 | void | 625 | void |
617 | channel_register_cleanup(int id, channel_callback_fn *fn) | 626 | channel_register_cleanup(int id, channel_callback_fn *fn) |
@@ -729,6 +738,10 @@ channel_pre_open(Channel *c, fd_set * readset, fd_set * writeset) | |||
729 | buffer_len(&c->extended) < c->remote_window) | 738 | buffer_len(&c->extended) < c->remote_window) |
730 | FD_SET(c->efd, readset); | 739 | FD_SET(c->efd, readset); |
731 | } | 740 | } |
741 | /* XXX: What about efd? races? */ | ||
742 | if (compat20 && c->ctl_fd != -1 && | ||
743 | c->istate == CHAN_INPUT_OPEN && c->ostate == CHAN_OUTPUT_OPEN) | ||
744 | FD_SET(c->ctl_fd, readset); | ||
732 | } | 745 | } |
733 | 746 | ||
734 | static void | 747 | static void |
@@ -1031,7 +1044,7 @@ channel_decode_socks5(Channel *c, fd_set * readset, fd_set * writeset) | |||
1031 | buffer_get(&c->input, (char *)&dest_port, 2); | 1044 | buffer_get(&c->input, (char *)&dest_port, 2); |
1032 | dest_addr[addrlen] = '\0'; | 1045 | dest_addr[addrlen] = '\0'; |
1033 | if (s5_req.atyp == SSH_SOCKS5_DOMAIN) | 1046 | if (s5_req.atyp == SSH_SOCKS5_DOMAIN) |
1034 | strlcpy(c->path, dest_addr, sizeof(c->path)); | 1047 | strlcpy(c->path, (char *)dest_addr, sizeof(c->path)); |
1035 | else if (inet_ntop(af, dest_addr, c->path, sizeof(c->path)) == NULL) | 1048 | else if (inet_ntop(af, dest_addr, c->path, sizeof(c->path)) == NULL) |
1036 | return -1; | 1049 | return -1; |
1037 | c->host_port = ntohs(dest_port); | 1050 | c->host_port = ntohs(dest_port); |
@@ -1482,6 +1495,33 @@ channel_handle_efd(Channel *c, fd_set * readset, fd_set * writeset) | |||
1482 | return 1; | 1495 | return 1; |
1483 | } | 1496 | } |
1484 | static int | 1497 | static int |
1498 | channel_handle_ctl(Channel *c, fd_set * readset, fd_set * writeset) | ||
1499 | { | ||
1500 | char buf[16]; | ||
1501 | int len; | ||
1502 | |||
1503 | /* Monitor control fd to detect if the slave client exits */ | ||
1504 | if (c->ctl_fd != -1 && FD_ISSET(c->ctl_fd, readset)) { | ||
1505 | len = read(c->ctl_fd, buf, sizeof(buf)); | ||
1506 | if (len < 0 && (errno == EINTR || errno == EAGAIN)) | ||
1507 | return 1; | ||
1508 | if (len <= 0) { | ||
1509 | debug2("channel %d: ctl read<=0", c->self); | ||
1510 | if (c->type != SSH_CHANNEL_OPEN) { | ||
1511 | debug2("channel %d: not open", c->self); | ||
1512 | chan_mark_dead(c); | ||
1513 | return -1; | ||
1514 | } else { | ||
1515 | chan_read_failed(c); | ||
1516 | chan_write_failed(c); | ||
1517 | } | ||
1518 | return -1; | ||
1519 | } else | ||
1520 | fatal("%s: unexpected data on ctl fd", __func__); | ||
1521 | } | ||
1522 | return 1; | ||
1523 | } | ||
1524 | static int | ||
1485 | channel_check_window(Channel *c) | 1525 | channel_check_window(Channel *c) |
1486 | { | 1526 | { |
1487 | if (c->type == SSH_CHANNEL_OPEN && | 1527 | if (c->type == SSH_CHANNEL_OPEN && |
@@ -1511,6 +1551,7 @@ channel_post_open(Channel *c, fd_set * readset, fd_set * writeset) | |||
1511 | if (!compat20) | 1551 | if (!compat20) |
1512 | return; | 1552 | return; |
1513 | channel_handle_efd(c, readset, writeset); | 1553 | channel_handle_efd(c, readset, writeset); |
1554 | channel_handle_ctl(c, readset, writeset); | ||
1514 | channel_check_window(c); | 1555 | channel_check_window(c); |
1515 | } | 1556 | } |
1516 | 1557 | ||
@@ -1635,7 +1676,7 @@ static void | |||
1635 | channel_handler(chan_fn *ftab[], fd_set * readset, fd_set * writeset) | 1676 | channel_handler(chan_fn *ftab[], fd_set * readset, fd_set * writeset) |
1636 | { | 1677 | { |
1637 | static int did_init = 0; | 1678 | static int did_init = 0; |
1638 | int i; | 1679 | u_int i; |
1639 | Channel *c; | 1680 | Channel *c; |
1640 | 1681 | ||
1641 | if (!did_init) { | 1682 | if (!did_init) { |
@@ -1658,10 +1699,9 @@ channel_handler(chan_fn *ftab[], fd_set * readset, fd_set * writeset) | |||
1658 | */ | 1699 | */ |
1659 | void | 1700 | void |
1660 | channel_prepare_select(fd_set **readsetp, fd_set **writesetp, int *maxfdp, | 1701 | channel_prepare_select(fd_set **readsetp, fd_set **writesetp, int *maxfdp, |
1661 | int *nallocp, int rekeying) | 1702 | u_int *nallocp, int rekeying) |
1662 | { | 1703 | { |
1663 | int n; | 1704 | u_int n, sz; |
1664 | u_int sz; | ||
1665 | 1705 | ||
1666 | n = MAX(*maxfdp, channel_max_fd); | 1706 | n = MAX(*maxfdp, channel_max_fd); |
1667 | 1707 | ||
@@ -1697,8 +1737,7 @@ void | |||
1697 | channel_output_poll(void) | 1737 | channel_output_poll(void) |
1698 | { | 1738 | { |
1699 | Channel *c; | 1739 | Channel *c; |
1700 | int i; | 1740 | u_int i, len; |
1701 | u_int len; | ||
1702 | 1741 | ||
1703 | for (i = 0; i < channels_alloc; i++) { | 1742 | for (i = 0; i < channels_alloc; i++) { |
1704 | c = channels[i]; | 1743 | c = channels[i]; |
@@ -2011,7 +2050,7 @@ channel_input_open_confirmation(int type, u_int32_t seq, void *ctxt) | |||
2011 | c->remote_maxpacket = packet_get_int(); | 2050 | c->remote_maxpacket = packet_get_int(); |
2012 | if (c->confirm) { | 2051 | if (c->confirm) { |
2013 | debug2("callback start"); | 2052 | debug2("callback start"); |
2014 | c->confirm(c->self, NULL); | 2053 | c->confirm(c->self, c->confirm_ctx); |
2015 | debug2("callback done"); | 2054 | debug2("callback done"); |
2016 | } | 2055 | } |
2017 | debug2("channel %d: open confirm rwindow %u rmax %u", c->self, | 2056 | debug2("channel %d: open confirm rwindow %u rmax %u", c->self, |
@@ -2228,6 +2267,27 @@ channel_setup_fwd_listener(int type, const char *listen_addr, u_short listen_por | |||
2228 | return success; | 2267 | return success; |
2229 | } | 2268 | } |
2230 | 2269 | ||
2270 | int | ||
2271 | channel_cancel_rport_listener(const char *host, u_short port) | ||
2272 | { | ||
2273 | u_int i; | ||
2274 | int found = 0; | ||
2275 | |||
2276 | for(i = 0; i < channels_alloc; i++) { | ||
2277 | Channel *c = channels[i]; | ||
2278 | |||
2279 | if (c != NULL && c->type == SSH_CHANNEL_RPORT_LISTENER && | ||
2280 | strncmp(c->path, host, sizeof(c->path)) == 0 && | ||
2281 | c->listening_port == port) { | ||
2282 | debug2("%s: close clannel %d", __func__, i); | ||
2283 | channel_free(c); | ||
2284 | found = 1; | ||
2285 | } | ||
2286 | } | ||
2287 | |||
2288 | return (found); | ||
2289 | } | ||
2290 | |||
2231 | /* protocol local port fwd, used by ssh (and sshd in v1) */ | 2291 | /* protocol local port fwd, used by ssh (and sshd in v1) */ |
2232 | int | 2292 | int |
2233 | channel_setup_local_fwd_listener(u_short listen_port, | 2293 | channel_setup_local_fwd_listener(u_short listen_port, |
@@ -2305,6 +2365,41 @@ channel_request_remote_forwarding(u_short listen_port, | |||
2305 | } | 2365 | } |
2306 | 2366 | ||
2307 | /* | 2367 | /* |
2368 | * Request cancellation of remote forwarding of connection host:port from | ||
2369 | * local side. | ||
2370 | */ | ||
2371 | void | ||
2372 | channel_request_rforward_cancel(u_short port) | ||
2373 | { | ||
2374 | int i; | ||
2375 | const char *address_to_bind = "0.0.0.0"; | ||
2376 | |||
2377 | if (!compat20) | ||
2378 | return; | ||
2379 | |||
2380 | for (i = 0; i < num_permitted_opens; i++) { | ||
2381 | if (permitted_opens[i].host_to_connect != NULL && | ||
2382 | permitted_opens[i].listen_port == port) | ||
2383 | break; | ||
2384 | } | ||
2385 | if (i >= num_permitted_opens) { | ||
2386 | debug("%s: requested forward not found", __func__); | ||
2387 | return; | ||
2388 | } | ||
2389 | packet_start(SSH2_MSG_GLOBAL_REQUEST); | ||
2390 | packet_put_cstring("cancel-tcpip-forward"); | ||
2391 | packet_put_char(0); | ||
2392 | packet_put_cstring(address_to_bind); | ||
2393 | packet_put_int(port); | ||
2394 | packet_send(); | ||
2395 | |||
2396 | permitted_opens[i].listen_port = 0; | ||
2397 | permitted_opens[i].port_to_connect = 0; | ||
2398 | free(permitted_opens[i].host_to_connect); | ||
2399 | permitted_opens[i].host_to_connect = NULL; | ||
2400 | } | ||
2401 | |||
2402 | /* | ||
2308 | * This is called after receiving CHANNEL_FORWARDING_REQUEST. This initates | 2403 | * This is called after receiving CHANNEL_FORWARDING_REQUEST. This initates |
2309 | * listening for the port, and sends back a success reply (or disconnect | 2404 | * listening for the port, and sends back a success reply (or disconnect |
2310 | * message if there was an error). This never returns if there was an error. | 2405 | * message if there was an error). This never returns if there was an error. |
@@ -2373,7 +2468,8 @@ channel_clear_permitted_opens(void) | |||
2373 | int i; | 2468 | int i; |
2374 | 2469 | ||
2375 | for (i = 0; i < num_permitted_opens; i++) | 2470 | for (i = 0; i < num_permitted_opens; i++) |
2376 | xfree(permitted_opens[i].host_to_connect); | 2471 | if (permitted_opens[i].host_to_connect != NULL) |
2472 | xfree(permitted_opens[i].host_to_connect); | ||
2377 | num_permitted_opens = 0; | 2473 | num_permitted_opens = 0; |
2378 | 2474 | ||
2379 | } | 2475 | } |
@@ -2413,8 +2509,8 @@ connect_to(const char *host, u_short port) | |||
2413 | verbose("socket: %.100s", strerror(errno)); | 2509 | verbose("socket: %.100s", strerror(errno)); |
2414 | continue; | 2510 | continue; |
2415 | } | 2511 | } |
2416 | if (fcntl(sock, F_SETFL, O_NONBLOCK) < 0) | 2512 | if (set_nonblock(sock) == -1) |
2417 | fatal("connect_to: F_SETFL: %s", strerror(errno)); | 2513 | fatal("%s: set_nonblock(%d)", __func__, sock); |
2418 | if (connect(sock, ai->ai_addr, ai->ai_addrlen) < 0 && | 2514 | if (connect(sock, ai->ai_addr, ai->ai_addrlen) < 0 && |
2419 | errno != EINPROGRESS) { | 2515 | errno != EINPROGRESS) { |
2420 | error("connect_to %.100s port %s: %.100s", ntop, strport, | 2516 | error("connect_to %.100s port %s: %.100s", ntop, strport, |
@@ -2441,7 +2537,8 @@ channel_connect_by_listen_address(u_short listen_port) | |||
2441 | int i; | 2537 | int i; |
2442 | 2538 | ||
2443 | for (i = 0; i < num_permitted_opens; i++) | 2539 | for (i = 0; i < num_permitted_opens; i++) |
2444 | if (permitted_opens[i].listen_port == listen_port) | 2540 | if (permitted_opens[i].host_to_connect != NULL && |
2541 | permitted_opens[i].listen_port == listen_port) | ||
2445 | return connect_to( | 2542 | return connect_to( |
2446 | permitted_opens[i].host_to_connect, | 2543 | permitted_opens[i].host_to_connect, |
2447 | permitted_opens[i].port_to_connect); | 2544 | permitted_opens[i].port_to_connect); |
@@ -2459,7 +2556,8 @@ channel_connect_to(const char *host, u_short port) | |||
2459 | permit = all_opens_permitted; | 2556 | permit = all_opens_permitted; |
2460 | if (!permit) { | 2557 | if (!permit) { |
2461 | for (i = 0; i < num_permitted_opens; i++) | 2558 | for (i = 0; i < num_permitted_opens; i++) |
2462 | if (permitted_opens[i].port_to_connect == port && | 2559 | if (permitted_opens[i].host_to_connect != NULL && |
2560 | permitted_opens[i].port_to_connect == port && | ||
2463 | strcmp(permitted_opens[i].host_to_connect, host) == 0) | 2561 | strcmp(permitted_opens[i].host_to_connect, host) == 0) |
2464 | permit = 1; | 2562 | permit = 1; |
2465 | 2563 | ||
@@ -2472,6 +2570,27 @@ channel_connect_to(const char *host, u_short port) | |||
2472 | return connect_to(host, port); | 2570 | return connect_to(host, port); |
2473 | } | 2571 | } |
2474 | 2572 | ||
2573 | void | ||
2574 | channel_send_window_changes(void) | ||
2575 | { | ||
2576 | u_int i; | ||
2577 | struct winsize ws; | ||
2578 | |||
2579 | for (i = 0; i < channels_alloc; i++) { | ||
2580 | if (channels[i] == NULL || | ||
2581 | channels[i]->type != SSH_CHANNEL_OPEN) | ||
2582 | continue; | ||
2583 | if (ioctl(channels[i]->rfd, TIOCGWINSZ, &ws) < 0) | ||
2584 | continue; | ||
2585 | channel_request_start(i, "window-change", 0); | ||
2586 | packet_put_int(ws.ws_col); | ||
2587 | packet_put_int(ws.ws_row); | ||
2588 | packet_put_int(ws.ws_xpixel); | ||
2589 | packet_put_int(ws.ws_ypixel); | ||
2590 | packet_send(); | ||
2591 | } | ||
2592 | } | ||
2593 | |||
2475 | /* -- X11 forwarding */ | 2594 | /* -- X11 forwarding */ |
2476 | 2595 | ||
2477 | /* | 2596 | /* |
@@ -2511,6 +2630,7 @@ x11_create_display_inet(int x11_display_offset, int x11_use_localhost, | |||
2511 | if (sock < 0) { | 2630 | if (sock < 0) { |
2512 | if ((errno != EINVAL) && (errno != EAFNOSUPPORT)) { | 2631 | if ((errno != EINVAL) && (errno != EAFNOSUPPORT)) { |
2513 | error("socket: %.100s", strerror(errno)); | 2632 | error("socket: %.100s", strerror(errno)); |
2633 | freeaddrinfo(aitop); | ||
2514 | return -1; | 2634 | return -1; |
2515 | } else { | 2635 | } else { |
2516 | debug("x11_create_display_inet: Socket family %d not supported", | 2636 | debug("x11_create_display_inet: Socket family %d not supported", |
@@ -2783,7 +2903,7 @@ x11_request_forwarding_with_spoofing(int client_session_id, | |||
2783 | char *new_data; | 2903 | char *new_data; |
2784 | int screen_number; | 2904 | int screen_number; |
2785 | const char *cp; | 2905 | const char *cp; |
2786 | u_int32_t rand = 0; | 2906 | u_int32_t rnd = 0; |
2787 | 2907 | ||
2788 | cp = getenv("DISPLAY"); | 2908 | cp = getenv("DISPLAY"); |
2789 | if (cp) | 2909 | if (cp) |
@@ -2808,10 +2928,10 @@ x11_request_forwarding_with_spoofing(int client_session_id, | |||
2808 | if (sscanf(data + 2 * i, "%2x", &value) != 1) | 2928 | if (sscanf(data + 2 * i, "%2x", &value) != 1) |
2809 | fatal("x11_request_forwarding: bad authentication data: %.100s", data); | 2929 | fatal("x11_request_forwarding: bad authentication data: %.100s", data); |
2810 | if (i % 4 == 0) | 2930 | if (i % 4 == 0) |
2811 | rand = arc4random(); | 2931 | rnd = arc4random(); |
2812 | x11_saved_data[i] = value; | 2932 | x11_saved_data[i] = value; |
2813 | x11_fake_data[i] = rand & 0xff; | 2933 | x11_fake_data[i] = rnd & 0xff; |
2814 | rand >>= 8; | 2934 | rnd >>= 8; |
2815 | } | 2935 | } |
2816 | x11_saved_data_len = data_len; | 2936 | x11_saved_data_len = data_len; |
2817 | x11_fake_data_len = data_len; | 2937 | x11_fake_data_len = data_len; |
diff --git a/channels.h b/channels.h index 7d981479b..f8dc8249c 100644 --- a/channels.h +++ b/channels.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.h,v 1.71 2003/09/23 20:41:11 markus Exp $ */ | 1 | /* $OpenBSD: channels.h,v 1.74 2004/08/11 21:43:04 avsm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -76,6 +76,7 @@ struct Channel { | |||
76 | int wfd; /* write fd */ | 76 | int wfd; /* write fd */ |
77 | int efd; /* extended fd */ | 77 | int efd; /* extended fd */ |
78 | int sock; /* sock fd */ | 78 | int sock; /* sock fd */ |
79 | int ctl_fd; /* control fd (client sharing) */ | ||
79 | int isatty; /* rfd is a tty */ | 80 | int isatty; /* rfd is a tty */ |
80 | int wfd_isatty; /* wfd is a tty */ | 81 | int wfd_isatty; /* wfd is a tty */ |
81 | int force_drain; /* force close on iEOF */ | 82 | int force_drain; /* force close on iEOF */ |
@@ -105,6 +106,7 @@ struct Channel { | |||
105 | /* callback */ | 106 | /* callback */ |
106 | channel_callback_fn *confirm; | 107 | channel_callback_fn *confirm; |
107 | channel_callback_fn *detach_user; | 108 | channel_callback_fn *detach_user; |
109 | void *confirm_ctx; | ||
108 | 110 | ||
109 | /* filter */ | 111 | /* filter */ |
110 | channel_filter_fn *input_filter; | 112 | channel_filter_fn *input_filter; |
@@ -161,10 +163,11 @@ void channel_stop_listening(void); | |||
161 | void channel_send_open(int); | 163 | void channel_send_open(int); |
162 | void channel_request_start(int, char *, int); | 164 | void channel_request_start(int, char *, int); |
163 | void channel_register_cleanup(int, channel_callback_fn *); | 165 | void channel_register_cleanup(int, channel_callback_fn *); |
164 | void channel_register_confirm(int, channel_callback_fn *); | 166 | void channel_register_confirm(int, channel_callback_fn *, void *); |
165 | void channel_register_filter(int, channel_filter_fn *); | 167 | void channel_register_filter(int, channel_filter_fn *); |
166 | void channel_cancel_cleanup(int); | 168 | void channel_cancel_cleanup(int); |
167 | int channel_close_fd(int *); | 169 | int channel_close_fd(int *); |
170 | void channel_send_window_changes(void); | ||
168 | 171 | ||
169 | /* protocol handler */ | 172 | /* protocol handler */ |
170 | 173 | ||
@@ -181,7 +184,7 @@ void channel_input_window_adjust(int, u_int32_t, void *); | |||
181 | 184 | ||
182 | /* file descriptor handling (read/write) */ | 185 | /* file descriptor handling (read/write) */ |
183 | 186 | ||
184 | void channel_prepare_select(fd_set **, fd_set **, int *, int*, int); | 187 | void channel_prepare_select(fd_set **, fd_set **, int *, u_int*, int); |
185 | void channel_after_select(fd_set *, fd_set *); | 188 | void channel_after_select(fd_set *, fd_set *); |
186 | void channel_output_poll(void); | 189 | void channel_output_poll(void); |
187 | 190 | ||
@@ -200,8 +203,10 @@ void channel_input_port_forward_request(int, int); | |||
200 | int channel_connect_to(const char *, u_short); | 203 | int channel_connect_to(const char *, u_short); |
201 | int channel_connect_by_listen_address(u_short); | 204 | int channel_connect_by_listen_address(u_short); |
202 | void channel_request_remote_forwarding(u_short, const char *, u_short); | 205 | void channel_request_remote_forwarding(u_short, const char *, u_short); |
206 | void channel_request_rforward_cancel(u_short port); | ||
203 | int channel_setup_local_fwd_listener(u_short, const char *, u_short, int); | 207 | int channel_setup_local_fwd_listener(u_short, const char *, u_short, int); |
204 | int channel_setup_remote_fwd_listener(const char *, u_short, int); | 208 | int channel_setup_remote_fwd_listener(const char *, u_short, int); |
209 | int channel_cancel_rport_listener(const char *, u_short); | ||
205 | 210 | ||
206 | /* x11 forwarding */ | 211 | /* x11 forwarding */ |
207 | 212 | ||
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: cipher.c,v 1.68 2004/01/23 19:26:33 hshoexer Exp $"); | 38 | RCSID("$OpenBSD: cipher.c,v 1.71 2004/07/28 09:40:29 markus Exp $"); |
39 | 39 | ||
40 | #include "xmalloc.h" | 40 | #include "xmalloc.h" |
41 | #include "log.h" | 41 | #include "log.h" |
@@ -76,19 +76,19 @@ struct Cipher { | |||
76 | u_int key_len; | 76 | u_int key_len; |
77 | const EVP_CIPHER *(*evptype)(void); | 77 | const EVP_CIPHER *(*evptype)(void); |
78 | } ciphers[] = { | 78 | } ciphers[] = { |
79 | { "none", SSH_CIPHER_NONE, 8, 0, EVP_enc_null }, | 79 | { "none", SSH_CIPHER_NONE, 8, 0, EVP_enc_null }, |
80 | { "des", SSH_CIPHER_DES, 8, 8, EVP_des_cbc }, | 80 | { "des", SSH_CIPHER_DES, 8, 8, EVP_des_cbc }, |
81 | { "3des", SSH_CIPHER_3DES, 8, 16, evp_ssh1_3des }, | 81 | { "3des", SSH_CIPHER_3DES, 8, 16, evp_ssh1_3des }, |
82 | { "blowfish", SSH_CIPHER_BLOWFISH, 8, 32, evp_ssh1_bf }, | 82 | { "blowfish", SSH_CIPHER_BLOWFISH, 8, 32, evp_ssh1_bf }, |
83 | 83 | ||
84 | { "3des-cbc", SSH_CIPHER_SSH2, 8, 24, EVP_des_ede3_cbc }, | 84 | { "3des-cbc", SSH_CIPHER_SSH2, 8, 24, EVP_des_ede3_cbc }, |
85 | { "blowfish-cbc", SSH_CIPHER_SSH2, 8, 16, EVP_bf_cbc }, | 85 | { "blowfish-cbc", SSH_CIPHER_SSH2, 8, 16, EVP_bf_cbc }, |
86 | { "cast128-cbc", SSH_CIPHER_SSH2, 8, 16, EVP_cast5_cbc }, | 86 | { "cast128-cbc", SSH_CIPHER_SSH2, 8, 16, EVP_cast5_cbc }, |
87 | { "arcfour", SSH_CIPHER_SSH2, 8, 16, EVP_rc4 }, | 87 | { "arcfour", SSH_CIPHER_SSH2, 8, 16, EVP_rc4 }, |
88 | #if OPENSSL_VERSION_NUMBER < 0x00907000L | 88 | #if OPENSSL_VERSION_NUMBER < 0x00907000L |
89 | { "aes128-cbc", SSH_CIPHER_SSH2, 16, 16, evp_rijndael }, | 89 | { "aes128-cbc", SSH_CIPHER_SSH2, 16, 16, evp_rijndael }, |
90 | { "aes192-cbc", SSH_CIPHER_SSH2, 16, 24, evp_rijndael }, | 90 | { "aes192-cbc", SSH_CIPHER_SSH2, 16, 24, evp_rijndael }, |
91 | { "aes256-cbc", SSH_CIPHER_SSH2, 16, 32, evp_rijndael }, | 91 | { "aes256-cbc", SSH_CIPHER_SSH2, 16, 32, evp_rijndael }, |
92 | { "rijndael-cbc@lysator.liu.se", | 92 | { "rijndael-cbc@lysator.liu.se", |
93 | SSH_CIPHER_SSH2, 16, 32, evp_rijndael }, | 93 | SSH_CIPHER_SSH2, 16, 32, evp_rijndael }, |
94 | #else | 94 | #else |
@@ -99,14 +99,14 @@ struct Cipher { | |||
99 | SSH_CIPHER_SSH2, 16, 32, EVP_aes_256_cbc }, | 99 | SSH_CIPHER_SSH2, 16, 32, EVP_aes_256_cbc }, |
100 | #endif | 100 | #endif |
101 | #if OPENSSL_VERSION_NUMBER >= 0x00905000L | 101 | #if OPENSSL_VERSION_NUMBER >= 0x00905000L |
102 | { "aes128-ctr", SSH_CIPHER_SSH2, 16, 16, evp_aes_128_ctr }, | 102 | { "aes128-ctr", SSH_CIPHER_SSH2, 16, 16, evp_aes_128_ctr }, |
103 | { "aes192-ctr", SSH_CIPHER_SSH2, 16, 24, evp_aes_128_ctr }, | 103 | { "aes192-ctr", SSH_CIPHER_SSH2, 16, 24, evp_aes_128_ctr }, |
104 | { "aes256-ctr", SSH_CIPHER_SSH2, 16, 32, evp_aes_128_ctr }, | 104 | { "aes256-ctr", SSH_CIPHER_SSH2, 16, 32, evp_aes_128_ctr }, |
105 | #endif | 105 | #endif |
106 | #if defined(EVP_CTRL_SET_ACSS_MODE) | 106 | #if defined(EVP_CTRL_SET_ACSS_MODE) |
107 | { "acss@openssh.org", SSH_CIPHER_SSH2, 16, 5, EVP_acss }, | 107 | { "acss@openssh.org", SSH_CIPHER_SSH2, 16, 5, EVP_acss }, |
108 | #endif | 108 | #endif |
109 | { NULL, SSH_CIPHER_ILLEGAL, 0, 0, NULL } | 109 | { NULL, SSH_CIPHER_INVALID, 0, 0, NULL } |
110 | }; | 110 | }; |
111 | 111 | ||
112 | /*--*/ | 112 | /*--*/ |
@@ -166,25 +166,25 @@ int | |||
166 | ciphers_valid(const char *names) | 166 | ciphers_valid(const char *names) |
167 | { | 167 | { |
168 | Cipher *c; | 168 | Cipher *c; |
169 | char *ciphers, *cp; | 169 | char *cipher_list, *cp; |
170 | char *p; | 170 | char *p; |
171 | 171 | ||
172 | if (names == NULL || strcmp(names, "") == 0) | 172 | if (names == NULL || strcmp(names, "") == 0) |
173 | return 0; | 173 | return 0; |
174 | ciphers = cp = xstrdup(names); | 174 | cipher_list = cp = xstrdup(names); |
175 | for ((p = strsep(&cp, CIPHER_SEP)); p && *p != '\0'; | 175 | for ((p = strsep(&cp, CIPHER_SEP)); p && *p != '\0'; |
176 | (p = strsep(&cp, CIPHER_SEP))) { | 176 | (p = strsep(&cp, CIPHER_SEP))) { |
177 | c = cipher_by_name(p); | 177 | c = cipher_by_name(p); |
178 | if (c == NULL || c->number != SSH_CIPHER_SSH2) { | 178 | if (c == NULL || c->number != SSH_CIPHER_SSH2) { |
179 | debug("bad cipher %s [%s]", p, names); | 179 | debug("bad cipher %s [%s]", p, names); |
180 | xfree(ciphers); | 180 | xfree(cipher_list); |
181 | return 0; | 181 | return 0; |
182 | } else { | 182 | } else { |
183 | debug3("cipher ok: %s [%s]", p, names); | 183 | debug3("cipher ok: %s [%s]", p, names); |
184 | } | 184 | } |
185 | } | 185 | } |
186 | debug3("ciphers ok: [%s]", names); | 186 | debug3("ciphers ok: [%s]", names); |
187 | xfree(ciphers); | 187 | xfree(cipher_list); |
188 | return 1; | 188 | return 1; |
189 | } | 189 | } |
190 | 190 | ||
@@ -213,7 +213,7 @@ cipher_name(int id) | |||
213 | void | 213 | void |
214 | cipher_init(CipherContext *cc, Cipher *cipher, | 214 | cipher_init(CipherContext *cc, Cipher *cipher, |
215 | const u_char *key, u_int keylen, const u_char *iv, u_int ivlen, | 215 | const u_char *key, u_int keylen, const u_char *iv, u_int ivlen, |
216 | int encrypt) | 216 | int do_encrypt) |
217 | { | 217 | { |
218 | static int dowarn = 1; | 218 | static int dowarn = 1; |
219 | #ifdef SSH_OLD_EVP | 219 | #ifdef SSH_OLD_EVP |
@@ -252,10 +252,10 @@ cipher_init(CipherContext *cc, Cipher *cipher, | |||
252 | type->key_len = keylen; | 252 | type->key_len = keylen; |
253 | } | 253 | } |
254 | EVP_CipherInit(&cc->evp, type, (u_char *)key, (u_char *)iv, | 254 | EVP_CipherInit(&cc->evp, type, (u_char *)key, (u_char *)iv, |
255 | (encrypt == CIPHER_ENCRYPT)); | 255 | (do_encrypt == CIPHER_ENCRYPT)); |
256 | #else | 256 | #else |
257 | if (EVP_CipherInit(&cc->evp, type, NULL, (u_char *)iv, | 257 | if (EVP_CipherInit(&cc->evp, type, NULL, (u_char *)iv, |
258 | (encrypt == CIPHER_ENCRYPT)) == 0) | 258 | (do_encrypt == CIPHER_ENCRYPT)) == 0) |
259 | fatal("cipher_init: EVP_CipherInit failed for %s", | 259 | fatal("cipher_init: EVP_CipherInit failed for %s", |
260 | cipher->name); | 260 | cipher->name); |
261 | klen = EVP_CIPHER_CTX_key_length(&cc->evp); | 261 | klen = EVP_CIPHER_CTX_key_length(&cc->evp); |
@@ -302,7 +302,7 @@ cipher_cleanup(CipherContext *cc) | |||
302 | 302 | ||
303 | void | 303 | void |
304 | cipher_set_key_string(CipherContext *cc, Cipher *cipher, | 304 | cipher_set_key_string(CipherContext *cc, Cipher *cipher, |
305 | const char *passphrase, int encrypt) | 305 | const char *passphrase, int do_encrypt) |
306 | { | 306 | { |
307 | MD5_CTX md; | 307 | MD5_CTX md; |
308 | u_char digest[16]; | 308 | u_char digest[16]; |
@@ -311,7 +311,7 @@ cipher_set_key_string(CipherContext *cc, Cipher *cipher, | |||
311 | MD5_Update(&md, (const u_char *)passphrase, strlen(passphrase)); | 311 | MD5_Update(&md, (const u_char *)passphrase, strlen(passphrase)); |
312 | MD5_Final(digest, &md); | 312 | MD5_Final(digest, &md); |
313 | 313 | ||
314 | cipher_init(cc, cipher, digest, 16, NULL, 0, encrypt); | 314 | cipher_init(cc, cipher, digest, 16, NULL, 0, do_encrypt); |
315 | 315 | ||
316 | memset(digest, 0, sizeof(digest)); | 316 | memset(digest, 0, sizeof(digest)); |
317 | memset(&md, 0, sizeof(md)); | 317 | memset(&md, 0, sizeof(md)); |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cipher.h,v 1.34 2003/11/10 16:23:41 jakob Exp $ */ | 1 | /* $OpenBSD: cipher.h,v 1.35 2004/07/28 09:40:29 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -43,7 +43,7 @@ | |||
43 | * be removed for compatibility. The maximum allowed value is 31. | 43 | * be removed for compatibility. The maximum allowed value is 31. |
44 | */ | 44 | */ |
45 | #define SSH_CIPHER_SSH2 -3 | 45 | #define SSH_CIPHER_SSH2 -3 |
46 | #define SSH_CIPHER_ILLEGAL -2 /* No valid cipher selected. */ | 46 | #define SSH_CIPHER_INVALID -2 /* No valid cipher selected. */ |
47 | #define SSH_CIPHER_NOT_SET -1 /* None selected (invalid number). */ | 47 | #define SSH_CIPHER_NOT_SET -1 /* None selected (invalid number). */ |
48 | #define SSH_CIPHER_NONE 0 /* no encryption */ | 48 | #define SSH_CIPHER_NONE 0 /* no encryption */ |
49 | #define SSH_CIPHER_IDEA 1 /* IDEA CFB */ | 49 | #define SSH_CIPHER_IDEA 1 /* IDEA CFB */ |
diff --git a/clientloop.c b/clientloop.c index a13d06ddf..1bcf4392f 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -59,7 +59,7 @@ | |||
59 | */ | 59 | */ |
60 | 60 | ||
61 | #include "includes.h" | 61 | #include "includes.h" |
62 | RCSID("$OpenBSD: clientloop.c,v 1.117 2003/12/16 15:49:51 markus Exp $"); | 62 | RCSID("$OpenBSD: clientloop.c,v 1.130 2004/08/11 21:43:04 avsm Exp $"); |
63 | 63 | ||
64 | #include "ssh.h" | 64 | #include "ssh.h" |
65 | #include "ssh1.h" | 65 | #include "ssh1.h" |
@@ -79,9 +79,11 @@ RCSID("$OpenBSD: clientloop.c,v 1.117 2003/12/16 15:49:51 markus Exp $"); | |||
79 | #include "clientloop.h" | 79 | #include "clientloop.h" |
80 | #include "authfd.h" | 80 | #include "authfd.h" |
81 | #include "atomicio.h" | 81 | #include "atomicio.h" |
82 | #include "sshtty.h" | 82 | #include "sshpty.h" |
83 | #include "misc.h" | 83 | #include "misc.h" |
84 | #include "readpass.h" | 84 | #include "monitor_fdpass.h" |
85 | #include "match.h" | ||
86 | #include "msg.h" | ||
85 | 87 | ||
86 | /* import options */ | 88 | /* import options */ |
87 | extern Options options; | 89 | extern Options options; |
@@ -92,6 +94,9 @@ extern int stdin_null_flag; | |||
92 | /* Flag indicating that no shell has been requested */ | 94 | /* Flag indicating that no shell has been requested */ |
93 | extern int no_shell_flag; | 95 | extern int no_shell_flag; |
94 | 96 | ||
97 | /* Control socket */ | ||
98 | extern int control_fd; | ||
99 | |||
95 | /* | 100 | /* |
96 | * Name of the host we are connecting to. This is the name given on the | 101 | * Name of the host we are connecting to. This is the name given on the |
97 | * command line, or the HostName specified for the user-supplied name in a | 102 | * command line, or the HostName specified for the user-supplied name in a |
@@ -132,16 +137,27 @@ static int server_alive_timeouts = 0; | |||
132 | static void client_init_dispatch(void); | 137 | static void client_init_dispatch(void); |
133 | int session_ident = -1; | 138 | int session_ident = -1; |
134 | 139 | ||
140 | struct confirm_ctx { | ||
141 | int want_tty; | ||
142 | int want_subsys; | ||
143 | Buffer cmd; | ||
144 | char *term; | ||
145 | struct termios tio; | ||
146 | char **env; | ||
147 | }; | ||
148 | |||
135 | /*XXX*/ | 149 | /*XXX*/ |
136 | extern Kex *xxx_kex; | 150 | extern Kex *xxx_kex; |
137 | 151 | ||
152 | void ssh_process_session2_setup(int, int, int, Buffer *); | ||
153 | |||
138 | /* Restores stdin to blocking mode. */ | 154 | /* Restores stdin to blocking mode. */ |
139 | 155 | ||
140 | static void | 156 | static void |
141 | leave_non_blocking(void) | 157 | leave_non_blocking(void) |
142 | { | 158 | { |
143 | if (in_non_blocking_mode) { | 159 | if (in_non_blocking_mode) { |
144 | (void) fcntl(fileno(stdin), F_SETFL, 0); | 160 | unset_nonblock(fileno(stdin)); |
145 | in_non_blocking_mode = 0; | 161 | in_non_blocking_mode = 0; |
146 | } | 162 | } |
147 | } | 163 | } |
@@ -152,7 +168,7 @@ static void | |||
152 | enter_non_blocking(void) | 168 | enter_non_blocking(void) |
153 | { | 169 | { |
154 | in_non_blocking_mode = 1; | 170 | in_non_blocking_mode = 1; |
155 | (void) fcntl(fileno(stdin), F_SETFL, O_NONBLOCK); | 171 | set_nonblock(fileno(stdin)); |
156 | } | 172 | } |
157 | 173 | ||
158 | /* | 174 | /* |
@@ -292,19 +308,13 @@ client_check_window_change(void) | |||
292 | /** XXX race */ | 308 | /** XXX race */ |
293 | received_window_change_signal = 0; | 309 | received_window_change_signal = 0; |
294 | 310 | ||
295 | if (ioctl(fileno(stdin), TIOCGWINSZ, &ws) < 0) | ||
296 | return; | ||
297 | |||
298 | debug2("client_check_window_change: changed"); | 311 | debug2("client_check_window_change: changed"); |
299 | 312 | ||
300 | if (compat20) { | 313 | if (compat20) { |
301 | channel_request_start(session_ident, "window-change", 0); | 314 | channel_send_window_changes(); |
302 | packet_put_int(ws.ws_col); | ||
303 | packet_put_int(ws.ws_row); | ||
304 | packet_put_int(ws.ws_xpixel); | ||
305 | packet_put_int(ws.ws_ypixel); | ||
306 | packet_send(); | ||
307 | } else { | 315 | } else { |
316 | if (ioctl(fileno(stdin), TIOCGWINSZ, &ws) < 0) | ||
317 | return; | ||
308 | packet_start(SSH_CMSG_WINDOW_SIZE); | 318 | packet_start(SSH_CMSG_WINDOW_SIZE); |
309 | packet_put_int(ws.ws_row); | 319 | packet_put_int(ws.ws_row); |
310 | packet_put_int(ws.ws_col); | 320 | packet_put_int(ws.ws_col); |
@@ -341,10 +351,9 @@ server_alive_check(void) | |||
341 | * Waits until the client can do something (some data becomes available on | 351 | * Waits until the client can do something (some data becomes available on |
342 | * one of the file descriptors). | 352 | * one of the file descriptors). |
343 | */ | 353 | */ |
344 | |||
345 | static void | 354 | static void |
346 | client_wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, | 355 | client_wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, |
347 | int *maxfdp, int *nallocp, int rekeying) | 356 | int *maxfdp, u_int *nallocp, int rekeying) |
348 | { | 357 | { |
349 | struct timeval tv, *tvp; | 358 | struct timeval tv, *tvp; |
350 | int ret; | 359 | int ret; |
@@ -387,6 +396,9 @@ client_wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, | |||
387 | if (packet_have_data_to_write()) | 396 | if (packet_have_data_to_write()) |
388 | FD_SET(connection_out, *writesetp); | 397 | FD_SET(connection_out, *writesetp); |
389 | 398 | ||
399 | if (control_fd != -1) | ||
400 | FD_SET(control_fd, *readsetp); | ||
401 | |||
390 | /* | 402 | /* |
391 | * Wait for something to happen. This will suspend the process until | 403 | * Wait for something to happen. This will suspend the process until |
392 | * some selected descriptor can be read, written, or has some other | 404 | * some selected descriptor can be read, written, or has some other |
@@ -395,7 +407,7 @@ client_wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, | |||
395 | 407 | ||
396 | if (options.server_alive_interval == 0) | 408 | if (options.server_alive_interval == 0) |
397 | tvp = NULL; | 409 | tvp = NULL; |
398 | else { | 410 | else { |
399 | tv.tv_sec = options.server_alive_interval; | 411 | tv.tv_sec = options.server_alive_interval; |
400 | tv.tv_usec = 0; | 412 | tv.tv_usec = 0; |
401 | tvp = &tv; | 413 | tvp = &tv; |
@@ -506,12 +518,229 @@ client_process_net_input(fd_set * readset) | |||
506 | } | 518 | } |
507 | 519 | ||
508 | static void | 520 | static void |
521 | client_subsystem_reply(int type, u_int32_t seq, void *ctxt) | ||
522 | { | ||
523 | int id; | ||
524 | Channel *c; | ||
525 | |||
526 | id = packet_get_int(); | ||
527 | packet_check_eom(); | ||
528 | |||
529 | if ((c = channel_lookup(id)) == NULL) { | ||
530 | error("%s: no channel for id %d", __func__, id); | ||
531 | return; | ||
532 | } | ||
533 | |||
534 | if (type == SSH2_MSG_CHANNEL_SUCCESS) | ||
535 | debug2("Request suceeded on channel %d", id); | ||
536 | else if (type == SSH2_MSG_CHANNEL_FAILURE) { | ||
537 | error("Request failed on channel %d", id); | ||
538 | channel_free(c); | ||
539 | } | ||
540 | } | ||
541 | |||
542 | static void | ||
543 | client_extra_session2_setup(int id, void *arg) | ||
544 | { | ||
545 | struct confirm_ctx *cctx = arg; | ||
546 | Channel *c; | ||
547 | int i; | ||
548 | |||
549 | if (cctx == NULL) | ||
550 | fatal("%s: cctx == NULL", __func__); | ||
551 | if ((c = channel_lookup(id)) == NULL) | ||
552 | fatal("%s: no channel for id %d", __func__, id); | ||
553 | |||
554 | client_session2_setup(id, cctx->want_tty, cctx->want_subsys, | ||
555 | cctx->term, &cctx->tio, c->rfd, &cctx->cmd, cctx->env, | ||
556 | client_subsystem_reply); | ||
557 | |||
558 | c->confirm_ctx = NULL; | ||
559 | buffer_free(&cctx->cmd); | ||
560 | xfree(cctx->term); | ||
561 | if (cctx->env != NULL) { | ||
562 | for (i = 0; cctx->env[i] != NULL; i++) | ||
563 | xfree(cctx->env[i]); | ||
564 | xfree(cctx->env); | ||
565 | } | ||
566 | xfree(cctx); | ||
567 | } | ||
568 | |||
569 | static void | ||
570 | client_process_control(fd_set * readset) | ||
571 | { | ||
572 | Buffer m; | ||
573 | Channel *c; | ||
574 | int client_fd, new_fd[3], ver, i, allowed; | ||
575 | socklen_t addrlen; | ||
576 | struct sockaddr_storage addr; | ||
577 | struct confirm_ctx *cctx; | ||
578 | char *cmd; | ||
579 | u_int len, env_len; | ||
580 | uid_t euid; | ||
581 | gid_t egid; | ||
582 | |||
583 | /* | ||
584 | * Accept connection on control socket | ||
585 | */ | ||
586 | if (control_fd == -1 || !FD_ISSET(control_fd, readset)) | ||
587 | return; | ||
588 | |||
589 | memset(&addr, 0, sizeof(addr)); | ||
590 | addrlen = sizeof(addr); | ||
591 | if ((client_fd = accept(control_fd, | ||
592 | (struct sockaddr*)&addr, &addrlen)) == -1) { | ||
593 | error("%s accept: %s", __func__, strerror(errno)); | ||
594 | return; | ||
595 | } | ||
596 | |||
597 | if (getpeereid(client_fd, &euid, &egid) < 0) { | ||
598 | error("%s getpeereid failed: %s", __func__, strerror(errno)); | ||
599 | close(client_fd); | ||
600 | return; | ||
601 | } | ||
602 | if ((euid != 0) && (getuid() != euid)) { | ||
603 | error("control mode uid mismatch: peer euid %u != uid %u", | ||
604 | (u_int) euid, (u_int) getuid()); | ||
605 | close(client_fd); | ||
606 | return; | ||
607 | } | ||
608 | |||
609 | allowed = 1; | ||
610 | if (options.control_master == 2) { | ||
611 | char *p, prompt[1024]; | ||
612 | |||
613 | allowed = 0; | ||
614 | snprintf(prompt, sizeof(prompt), | ||
615 | "Allow shared connection to %s? ", host); | ||
616 | p = read_passphrase(prompt, RP_USE_ASKPASS|RP_ALLOW_EOF); | ||
617 | if (p != NULL) { | ||
618 | /* | ||
619 | * Accept empty responses and responses consisting | ||
620 | * of the word "yes" as affirmative. | ||
621 | */ | ||
622 | if (*p == '\0' || *p == '\n' || | ||
623 | strcasecmp(p, "yes") == 0) | ||
624 | allowed = 1; | ||
625 | xfree(p); | ||
626 | } | ||
627 | } | ||
628 | |||
629 | unset_nonblock(client_fd); | ||
630 | |||
631 | buffer_init(&m); | ||
632 | |||
633 | buffer_put_int(&m, allowed); | ||
634 | buffer_put_int(&m, getpid()); | ||
635 | if (ssh_msg_send(client_fd, /* version */0, &m) == -1) { | ||
636 | error("%s: client msg_send failed", __func__); | ||
637 | close(client_fd); | ||
638 | buffer_free(&m); | ||
639 | return; | ||
640 | } | ||
641 | buffer_clear(&m); | ||
642 | |||
643 | if (!allowed) { | ||
644 | error("Refused control connection"); | ||
645 | close(client_fd); | ||
646 | buffer_free(&m); | ||
647 | return; | ||
648 | } | ||
649 | |||
650 | if (ssh_msg_recv(client_fd, &m) == -1) { | ||
651 | error("%s: client msg_recv failed", __func__); | ||
652 | close(client_fd); | ||
653 | buffer_free(&m); | ||
654 | return; | ||
655 | } | ||
656 | |||
657 | if ((ver = buffer_get_char(&m)) != 0) { | ||
658 | error("%s: wrong client version %d", __func__, ver); | ||
659 | buffer_free(&m); | ||
660 | close(client_fd); | ||
661 | return; | ||
662 | } | ||
663 | |||
664 | cctx = xmalloc(sizeof(*cctx)); | ||
665 | memset(cctx, 0, sizeof(*cctx)); | ||
666 | |||
667 | cctx->want_tty = buffer_get_int(&m); | ||
668 | cctx->want_subsys = buffer_get_int(&m); | ||
669 | cctx->term = buffer_get_string(&m, &len); | ||
670 | |||
671 | cmd = buffer_get_string(&m, &len); | ||
672 | buffer_init(&cctx->cmd); | ||
673 | buffer_append(&cctx->cmd, cmd, strlen(cmd)); | ||
674 | |||
675 | env_len = buffer_get_int(&m); | ||
676 | env_len = MIN(env_len, 4096); | ||
677 | debug3("%s: receiving %d env vars", __func__, env_len); | ||
678 | if (env_len != 0) { | ||
679 | cctx->env = xmalloc(sizeof(*cctx->env) * (env_len + 1)); | ||
680 | for (i = 0; i < env_len; i++) | ||
681 | cctx->env[i] = buffer_get_string(&m, &len); | ||
682 | cctx->env[i] = NULL; | ||
683 | } | ||
684 | |||
685 | debug2("%s: accepted tty %d, subsys %d, cmd %s", __func__, | ||
686 | cctx->want_tty, cctx->want_subsys, cmd); | ||
687 | |||
688 | /* Gather fds from client */ | ||
689 | new_fd[0] = mm_receive_fd(client_fd); | ||
690 | new_fd[1] = mm_receive_fd(client_fd); | ||
691 | new_fd[2] = mm_receive_fd(client_fd); | ||
692 | |||
693 | debug2("%s: got fds stdin %d, stdout %d, stderr %d", __func__, | ||
694 | new_fd[0], new_fd[1], new_fd[2]); | ||
695 | |||
696 | /* Try to pick up ttymodes from client before it goes raw */ | ||
697 | if (cctx->want_tty && tcgetattr(new_fd[0], &cctx->tio) == -1) | ||
698 | error("%s: tcgetattr: %s", __func__, strerror(errno)); | ||
699 | |||
700 | buffer_clear(&m); | ||
701 | if (ssh_msg_send(client_fd, /* version */0, &m) == -1) { | ||
702 | error("%s: client msg_send failed", __func__); | ||
703 | close(client_fd); | ||
704 | close(new_fd[0]); | ||
705 | close(new_fd[1]); | ||
706 | close(new_fd[2]); | ||
707 | buffer_free(&m); | ||
708 | return; | ||
709 | } | ||
710 | buffer_free(&m); | ||
711 | |||
712 | /* enable nonblocking unless tty */ | ||
713 | if (!isatty(new_fd[0])) | ||
714 | set_nonblock(new_fd[0]); | ||
715 | if (!isatty(new_fd[1])) | ||
716 | set_nonblock(new_fd[1]); | ||
717 | if (!isatty(new_fd[2])) | ||
718 | set_nonblock(new_fd[2]); | ||
719 | |||
720 | set_nonblock(client_fd); | ||
721 | |||
722 | c = channel_new("session", SSH_CHANNEL_OPENING, | ||
723 | new_fd[0], new_fd[1], new_fd[2], | ||
724 | CHAN_SES_WINDOW_DEFAULT, CHAN_SES_PACKET_DEFAULT, | ||
725 | CHAN_EXTENDED_WRITE, "client-session", /*nonblock*/0); | ||
726 | |||
727 | /* XXX */ | ||
728 | c->ctl_fd = client_fd; | ||
729 | |||
730 | debug3("%s: channel_new: %d", __func__, c->self); | ||
731 | |||
732 | channel_send_open(c->self); | ||
733 | channel_register_confirm(c->self, client_extra_session2_setup, cctx); | ||
734 | } | ||
735 | |||
736 | static void | ||
509 | process_cmdline(void) | 737 | process_cmdline(void) |
510 | { | 738 | { |
511 | void (*handler)(int); | 739 | void (*handler)(int); |
512 | char *s, *cmd; | 740 | char *s, *cmd; |
513 | u_short fwd_port, fwd_host_port; | 741 | u_short fwd_port, fwd_host_port; |
514 | char buf[1024], sfwd_port[6], sfwd_host_port[6]; | 742 | char buf[1024], sfwd_port[6], sfwd_host_port[6]; |
743 | int delete = 0; | ||
515 | int local = 0; | 744 | int local = 0; |
516 | 745 | ||
517 | leave_raw_mode(); | 746 | leave_raw_mode(); |
@@ -521,44 +750,77 @@ process_cmdline(void) | |||
521 | goto out; | 750 | goto out; |
522 | while (*s && isspace(*s)) | 751 | while (*s && isspace(*s)) |
523 | s++; | 752 | s++; |
524 | if (*s == 0) | 753 | if (*s == '-') |
754 | s++; /* Skip cmdline '-', if any */ | ||
755 | if (*s == '\0') | ||
756 | goto out; | ||
757 | |||
758 | if (*s == 'h' || *s == 'H' || *s == '?') { | ||
759 | logit("Commands:"); | ||
760 | logit(" -Lport:host:hostport Request local forward"); | ||
761 | logit(" -Rport:host:hostport Request remote forward"); | ||
762 | logit(" -KRhostport Cancel remote forward"); | ||
525 | goto out; | 763 | goto out; |
526 | if (strlen(s) < 2 || s[0] != '-' || !(s[1] == 'L' || s[1] == 'R')) { | 764 | } |
765 | |||
766 | if (*s == 'K') { | ||
767 | delete = 1; | ||
768 | s++; | ||
769 | } | ||
770 | if (*s != 'L' && *s != 'R') { | ||
527 | logit("Invalid command."); | 771 | logit("Invalid command."); |
528 | goto out; | 772 | goto out; |
529 | } | 773 | } |
530 | if (s[1] == 'L') | 774 | if (*s == 'L') |
531 | local = 1; | 775 | local = 1; |
532 | if (!local && !compat20) { | 776 | if (local && delete) { |
777 | logit("Not supported."); | ||
778 | goto out; | ||
779 | } | ||
780 | if ((!local || delete) && !compat20) { | ||
533 | logit("Not supported for SSH protocol version 1."); | 781 | logit("Not supported for SSH protocol version 1."); |
534 | goto out; | 782 | goto out; |
535 | } | 783 | } |
536 | s += 2; | 784 | |
785 | s++; | ||
537 | while (*s && isspace(*s)) | 786 | while (*s && isspace(*s)) |
538 | s++; | 787 | s++; |
539 | 788 | ||
540 | if (sscanf(s, "%5[0-9]:%255[^:]:%5[0-9]", | 789 | if (delete) { |
541 | sfwd_port, buf, sfwd_host_port) != 3 && | 790 | if (sscanf(s, "%5[0-9]", sfwd_host_port) != 1) { |
542 | sscanf(s, "%5[0-9]/%255[^/]/%5[0-9]", | 791 | logit("Bad forwarding specification."); |
543 | sfwd_port, buf, sfwd_host_port) != 3) { | 792 | goto out; |
544 | logit("Bad forwarding specification."); | 793 | } |
545 | goto out; | 794 | if ((fwd_host_port = a2port(sfwd_host_port)) == 0) { |
546 | } | 795 | logit("Bad forwarding port(s)."); |
547 | if ((fwd_port = a2port(sfwd_port)) == 0 || | 796 | goto out; |
548 | (fwd_host_port = a2port(sfwd_host_port)) == 0) { | 797 | } |
549 | logit("Bad forwarding port(s)."); | 798 | channel_request_rforward_cancel(fwd_host_port); |
550 | goto out; | 799 | } else { |
551 | } | 800 | if (sscanf(s, "%5[0-9]:%255[^:]:%5[0-9]", |
552 | if (local) { | 801 | sfwd_port, buf, sfwd_host_port) != 3 && |
553 | if (channel_setup_local_fwd_listener(fwd_port, buf, | 802 | sscanf(s, "%5[0-9]/%255[^/]/%5[0-9]", |
554 | fwd_host_port, options.gateway_ports) < 0) { | 803 | sfwd_port, buf, sfwd_host_port) != 3) { |
555 | logit("Port forwarding failed."); | 804 | logit("Bad forwarding specification."); |
805 | goto out; | ||
806 | } | ||
807 | if ((fwd_port = a2port(sfwd_port)) == 0 || | ||
808 | (fwd_host_port = a2port(sfwd_host_port)) == 0) { | ||
809 | logit("Bad forwarding port(s)."); | ||
556 | goto out; | 810 | goto out; |
557 | } | 811 | } |
558 | } else | 812 | if (local) { |
559 | channel_request_remote_forwarding(fwd_port, buf, | 813 | if (channel_setup_local_fwd_listener(fwd_port, buf, |
560 | fwd_host_port); | 814 | fwd_host_port, options.gateway_ports) < 0) { |
561 | logit("Forwarding port."); | 815 | logit("Port forwarding failed."); |
816 | goto out; | ||
817 | } | ||
818 | } else | ||
819 | channel_request_remote_forwarding(fwd_port, buf, | ||
820 | fwd_host_port); | ||
821 | logit("Forwarding port."); | ||
822 | } | ||
823 | |||
562 | out: | 824 | out: |
563 | signal(SIGINT, handler); | 825 | signal(SIGINT, handler); |
564 | enter_raw_mode(); | 826 | enter_raw_mode(); |
@@ -873,9 +1135,6 @@ simple_escape_filter(Channel *c, char *buf, int len) | |||
873 | static void | 1135 | static void |
874 | client_channel_closed(int id, void *arg) | 1136 | client_channel_closed(int id, void *arg) |
875 | { | 1137 | { |
876 | if (id != session_ident) | ||
877 | error("client_channel_closed: id %d != session_ident %d", | ||
878 | id, session_ident); | ||
879 | channel_cancel_cleanup(id); | 1138 | channel_cancel_cleanup(id); |
880 | session_closed = 1; | 1139 | session_closed = 1; |
881 | leave_raw_mode(); | 1140 | leave_raw_mode(); |
@@ -893,7 +1152,8 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id) | |||
893 | { | 1152 | { |
894 | fd_set *readset = NULL, *writeset = NULL; | 1153 | fd_set *readset = NULL, *writeset = NULL; |
895 | double start_time, total_time; | 1154 | double start_time, total_time; |
896 | int max_fd = 0, max_fd2 = 0, len, rekeying = 0, nalloc = 0; | 1155 | int max_fd = 0, max_fd2 = 0, len, rekeying = 0; |
1156 | u_int nalloc = 0; | ||
897 | char buf[100]; | 1157 | char buf[100]; |
898 | 1158 | ||
899 | debug("Entering interactive session."); | 1159 | debug("Entering interactive session."); |
@@ -909,6 +1169,8 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id) | |||
909 | connection_in = packet_get_connection_in(); | 1169 | connection_in = packet_get_connection_in(); |
910 | connection_out = packet_get_connection_out(); | 1170 | connection_out = packet_get_connection_out(); |
911 | max_fd = MAX(connection_in, connection_out); | 1171 | max_fd = MAX(connection_in, connection_out); |
1172 | if (control_fd != -1) | ||
1173 | max_fd = MAX(max_fd, control_fd); | ||
912 | 1174 | ||
913 | if (!compat20) { | 1175 | if (!compat20) { |
914 | /* enable nonblocking unless tty */ | 1176 | /* enable nonblocking unless tty */ |
@@ -1026,6 +1288,9 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id) | |||
1026 | /* Buffer input from the connection. */ | 1288 | /* Buffer input from the connection. */ |
1027 | client_process_net_input(readset); | 1289 | client_process_net_input(readset); |
1028 | 1290 | ||
1291 | /* Accept control connections. */ | ||
1292 | client_process_control(readset); | ||
1293 | |||
1029 | if (quit_pending) | 1294 | if (quit_pending) |
1030 | break; | 1295 | break; |
1031 | 1296 | ||
@@ -1357,7 +1622,7 @@ static void | |||
1357 | client_input_channel_req(int type, u_int32_t seq, void *ctxt) | 1622 | client_input_channel_req(int type, u_int32_t seq, void *ctxt) |
1358 | { | 1623 | { |
1359 | Channel *c = NULL; | 1624 | Channel *c = NULL; |
1360 | int id, reply, success = 0; | 1625 | int exitval, id, reply, success = 0; |
1361 | char *rtype; | 1626 | char *rtype; |
1362 | 1627 | ||
1363 | id = packet_get_int(); | 1628 | id = packet_get_int(); |
@@ -1367,24 +1632,28 @@ client_input_channel_req(int type, u_int32_t seq, void *ctxt) | |||
1367 | debug("client_input_channel_req: channel %d rtype %s reply %d", | 1632 | debug("client_input_channel_req: channel %d rtype %s reply %d", |
1368 | id, rtype, reply); | 1633 | id, rtype, reply); |
1369 | 1634 | ||
1370 | if (session_ident == -1) { | 1635 | if (id == -1) { |
1371 | error("client_input_channel_req: no channel %d", session_ident); | 1636 | error("client_input_channel_req: request for channel -1"); |
1372 | } else if (id != session_ident) { | 1637 | } else if ((c = channel_lookup(id)) == NULL) { |
1373 | error("client_input_channel_req: channel %d: wrong channel: %d", | ||
1374 | session_ident, id); | ||
1375 | } | ||
1376 | c = channel_lookup(id); | ||
1377 | if (c == NULL) { | ||
1378 | error("client_input_channel_req: channel %d: unknown channel", id); | 1638 | error("client_input_channel_req: channel %d: unknown channel", id); |
1379 | } else if (strcmp(rtype, "exit-status") == 0) { | 1639 | } else if (strcmp(rtype, "exit-status") == 0) { |
1380 | success = 1; | 1640 | exitval = packet_get_int(); |
1381 | exit_status = packet_get_int(); | 1641 | if (id == session_ident) { |
1642 | success = 1; | ||
1643 | exit_status = exitval; | ||
1644 | } else if (c->ctl_fd == -1) { | ||
1645 | error("client_input_channel_req: unexpected channel %d", | ||
1646 | session_ident); | ||
1647 | } else { | ||
1648 | atomicio(vwrite, c->ctl_fd, &exitval, sizeof(exitval)); | ||
1649 | success = 1; | ||
1650 | } | ||
1382 | packet_check_eom(); | 1651 | packet_check_eom(); |
1383 | } | 1652 | } |
1384 | if (reply) { | 1653 | if (reply) { |
1385 | packet_start(success ? | 1654 | packet_start(success ? |
1386 | SSH2_MSG_CHANNEL_SUCCESS : SSH2_MSG_CHANNEL_FAILURE); | 1655 | SSH2_MSG_CHANNEL_SUCCESS : SSH2_MSG_CHANNEL_FAILURE); |
1387 | packet_put_int(c->remote_id); | 1656 | packet_put_int(id); |
1388 | packet_send(); | 1657 | packet_send(); |
1389 | } | 1658 | } |
1390 | xfree(rtype); | 1659 | xfree(rtype); |
@@ -1409,6 +1678,97 @@ client_input_global_request(int type, u_int32_t seq, void *ctxt) | |||
1409 | xfree(rtype); | 1678 | xfree(rtype); |
1410 | } | 1679 | } |
1411 | 1680 | ||
1681 | void | ||
1682 | client_session2_setup(int id, int want_tty, int want_subsystem, | ||
1683 | const char *term, struct termios *tiop, int in_fd, Buffer *cmd, char **env, | ||
1684 | dispatch_fn *subsys_repl) | ||
1685 | { | ||
1686 | int len; | ||
1687 | |||
1688 | debug2("%s: id %d", __func__, id); | ||
1689 | |||
1690 | if (want_tty) { | ||
1691 | struct winsize ws; | ||
1692 | struct termios tio; | ||
1693 | |||
1694 | /* Store window size in the packet. */ | ||
1695 | if (ioctl(in_fd, TIOCGWINSZ, &ws) < 0) | ||
1696 | memset(&ws, 0, sizeof(ws)); | ||
1697 | |||
1698 | channel_request_start(id, "pty-req", 0); | ||
1699 | packet_put_cstring(term != NULL ? term : ""); | ||
1700 | packet_put_int(ws.ws_col); | ||
1701 | packet_put_int(ws.ws_row); | ||
1702 | packet_put_int(ws.ws_xpixel); | ||
1703 | packet_put_int(ws.ws_ypixel); | ||
1704 | tio = get_saved_tio(); | ||
1705 | tty_make_modes(-1, tiop != NULL ? tiop : &tio); | ||
1706 | packet_send(); | ||
1707 | /* XXX wait for reply */ | ||
1708 | } | ||
1709 | |||
1710 | /* Transfer any environment variables from client to server */ | ||
1711 | if (options.num_send_env != 0 && env != NULL) { | ||
1712 | int i, j, matched; | ||
1713 | char *name, *val; | ||
1714 | |||
1715 | debug("Sending environment."); | ||
1716 | for (i = 0; env[i] != NULL; i++) { | ||
1717 | /* Split */ | ||
1718 | name = xstrdup(env[i]); | ||
1719 | if ((val = strchr(name, '=')) == NULL) { | ||
1720 | free(name); | ||
1721 | continue; | ||
1722 | } | ||
1723 | *val++ = '\0'; | ||
1724 | |||
1725 | matched = 0; | ||
1726 | for (j = 0; j < options.num_send_env; j++) { | ||
1727 | if (match_pattern(name, options.send_env[j])) { | ||
1728 | matched = 1; | ||
1729 | break; | ||
1730 | } | ||
1731 | } | ||
1732 | if (!matched) { | ||
1733 | debug3("Ignored env %s", name); | ||
1734 | free(name); | ||
1735 | continue; | ||
1736 | } | ||
1737 | |||
1738 | debug("Sending env %s = %s", name, val); | ||
1739 | channel_request_start(id, "env", 0); | ||
1740 | packet_put_cstring(name); | ||
1741 | packet_put_cstring(val); | ||
1742 | packet_send(); | ||
1743 | free(name); | ||
1744 | } | ||
1745 | } | ||
1746 | |||
1747 | len = buffer_len(cmd); | ||
1748 | if (len > 0) { | ||
1749 | if (len > 900) | ||
1750 | len = 900; | ||
1751 | if (want_subsystem) { | ||
1752 | debug("Sending subsystem: %.*s", len, (u_char*)buffer_ptr(cmd)); | ||
1753 | channel_request_start(id, "subsystem", subsys_repl != NULL); | ||
1754 | if (subsys_repl != NULL) { | ||
1755 | /* register callback for reply */ | ||
1756 | /* XXX we assume that client_loop has already been called */ | ||
1757 | dispatch_set(SSH2_MSG_CHANNEL_FAILURE, subsys_repl); | ||
1758 | dispatch_set(SSH2_MSG_CHANNEL_SUCCESS, subsys_repl); | ||
1759 | } | ||
1760 | } else { | ||
1761 | debug("Sending command: %.*s", len, (u_char*)buffer_ptr(cmd)); | ||
1762 | channel_request_start(id, "exec", 0); | ||
1763 | } | ||
1764 | packet_put_string(buffer_ptr(cmd), buffer_len(cmd)); | ||
1765 | packet_send(); | ||
1766 | } else { | ||
1767 | channel_request_start(id, "shell", 0); | ||
1768 | packet_send(); | ||
1769 | } | ||
1770 | } | ||
1771 | |||
1412 | static void | 1772 | static void |
1413 | client_init_dispatch_20(void) | 1773 | client_init_dispatch_20(void) |
1414 | { | 1774 | { |
@@ -1475,5 +1835,7 @@ cleanup_exit(int i) | |||
1475 | { | 1835 | { |
1476 | leave_raw_mode(); | 1836 | leave_raw_mode(); |
1477 | leave_non_blocking(); | 1837 | leave_non_blocking(); |
1838 | if (options.control_path != NULL && control_fd != -1) | ||
1839 | unlink(options.control_path); | ||
1478 | _exit(i); | 1840 | _exit(i); |
1479 | } | 1841 | } |
diff --git a/clientloop.h b/clientloop.h index 56af06bc1..9992d5938 100644 --- a/clientloop.h +++ b/clientloop.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: clientloop.h,v 1.8 2003/12/16 15:49:51 markus Exp $ */ | 1 | /* $OpenBSD: clientloop.h,v 1.11 2004/07/11 17:48:47 deraadt Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -38,3 +38,5 @@ | |||
38 | /* Client side main loop for the interactive session. */ | 38 | /* Client side main loop for the interactive session. */ |
39 | int client_loop(int, int, int); | 39 | int client_loop(int, int, int); |
40 | void client_global_request_reply_fwd(int, u_int32_t, void *); | 40 | void client_global_request_reply_fwd(int, u_int32_t, void *); |
41 | void client_session2_setup(int, int, int, const char *, struct termios *, | ||
42 | int, Buffer *, char **, dispatch_fn *); | ||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: compat.h,v 1.37 2003/11/02 11:01:03 markus Exp $ */ | 1 | /* $OpenBSD: compat.h,v 1.38 2004/07/11 17:48:47 deraadt Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1999, 2000, 2001 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 1999, 2000, 2001 Markus Friedl. All rights reserved. |
@@ -27,7 +27,7 @@ | |||
27 | #ifndef COMPAT_H | 27 | #ifndef COMPAT_H |
28 | #define COMPAT_H | 28 | #define COMPAT_H |
29 | 29 | ||
30 | #define SSH_PROTO_UNKNOWN 0x00 | 30 | #define SSH_PROTO_UNKNOWN 0x00 |
31 | #define SSH_PROTO_1 0x01 | 31 | #define SSH_PROTO_1 0x01 |
32 | #define SSH_PROTO_1_PREFERRED 0x02 | 32 | #define SSH_PROTO_1_PREFERRED 0x02 |
33 | #define SSH_PROTO_2 0x04 | 33 | #define SSH_PROTO_2 0x04 |
diff --git a/config.h.in b/config.h.in index 06471531e..803aac4de 100644 --- a/config.h.in +++ b/config.h.in | |||
@@ -1,5 +1,5 @@ | |||
1 | /* config.h.in. Generated automatically from configure.ac by autoheader. */ | 1 | /* config.h.in. Generated from configure.ac by autoheader. */ |
2 | /* $Id: acconfig.h,v 1.177 2004/04/15 23:22:40 dtucker Exp $ */ | 2 | /* $Id: acconfig.h,v 1.180 2004/08/16 13:12:06 dtucker Exp $ */ |
3 | 3 | ||
4 | /* | 4 | /* |
5 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. | 5 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. |
@@ -32,7 +32,6 @@ | |||
32 | /* Please make your changes there */ | 32 | /* Please make your changes there */ |
33 | 33 | ||
34 | 34 | ||
35 | |||
36 | /* Define if your platform breaks doing a seteuid before a setuid */ | 35 | /* Define if your platform breaks doing a seteuid before a setuid */ |
37 | #undef SETEUID_BREAKS_SETUID | 36 | #undef SETEUID_BREAKS_SETUID |
38 | 37 | ||
@@ -105,6 +104,9 @@ | |||
105 | /* Work around problematic Linux PAM modules handling of PAM_TTY */ | 104 | /* Work around problematic Linux PAM modules handling of PAM_TTY */ |
106 | #undef PAM_TTY_KLUDGE | 105 | #undef PAM_TTY_KLUDGE |
107 | 106 | ||
107 | /* Define if pam_chauthtok wants real uid set to the unpriv'ed user */ | ||
108 | #undef SSHPAM_CHAUTHTOK_NEEDS_RUID | ||
109 | |||
108 | /* Use PIPES instead of a socketpair() */ | 110 | /* Use PIPES instead of a socketpair() */ |
109 | #undef USE_PIPES | 111 | #undef USE_PIPES |
110 | 112 | ||
@@ -435,6 +437,12 @@ | |||
435 | /* Define if cmsg_type is not passed correctly */ | 437 | /* Define if cmsg_type is not passed correctly */ |
436 | #undef BROKEN_CMSG_TYPE | 438 | #undef BROKEN_CMSG_TYPE |
437 | 439 | ||
440 | /* | ||
441 | * Define to whatever link() returns for "not supported" if it doesn't | ||
442 | * return EOPNOTSUPP. | ||
443 | */ | ||
444 | #undef LINK_OPNOTSUPP_ERRNO | ||
445 | |||
438 | /* Strings used in /etc/passwd to denote locked account */ | 446 | /* Strings used in /etc/passwd to denote locked account */ |
439 | #undef LOCKED_PASSWD_STRING | 447 | #undef LOCKED_PASSWD_STRING |
440 | #undef LOCKED_PASSWD_PREFIX | 448 | #undef LOCKED_PASSWD_PREFIX |
@@ -449,577 +457,617 @@ | |||
449 | /* Define if your resolver libs need this for getrrsetbyname */ | 457 | /* Define if your resolver libs need this for getrrsetbyname */ |
450 | #undef BIND_8_COMPAT | 458 | #undef BIND_8_COMPAT |
451 | 459 | ||
460 | /* Define if you have /proc/$pid/fd */ | ||
461 | #undef HAVE_PROC_PID | ||
452 | 462 | ||
453 | /* Define if the `getpgrp' function takes no argument. */ | 463 | |
464 | /* Define to 1 if the `getpgrp' function requires zero arguments. */ | ||
454 | #undef GETPGRP_VOID | 465 | #undef GETPGRP_VOID |
455 | 466 | ||
456 | /* Define if you have the `arc4random' function. */ | 467 | /* Define to 1 if you have the `arc4random' function. */ |
457 | #undef HAVE_ARC4RANDOM | 468 | #undef HAVE_ARC4RANDOM |
458 | 469 | ||
459 | /* Define if you have the `b64_ntop' function. */ | 470 | /* Define to 1 if you have the `b64_ntop' function. */ |
460 | #undef HAVE_B64_NTOP | 471 | #undef HAVE_B64_NTOP |
461 | 472 | ||
462 | /* Define if you have the `b64_pton' function. */ | 473 | /* Define to 1 if you have the `b64_pton' function. */ |
463 | #undef HAVE_B64_PTON | 474 | #undef HAVE_B64_PTON |
464 | 475 | ||
465 | /* Define if you have the `bcopy' function. */ | 476 | /* Define to 1 if you have the `bcopy' function. */ |
466 | #undef HAVE_BCOPY | 477 | #undef HAVE_BCOPY |
467 | 478 | ||
468 | /* Define if you have the `bindresvport_sa' function. */ | 479 | /* Define to 1 if you have the `bindresvport_sa' function. */ |
469 | #undef HAVE_BINDRESVPORT_SA | 480 | #undef HAVE_BINDRESVPORT_SA |
470 | 481 | ||
471 | /* Define if you have the <bstring.h> header file. */ | 482 | /* Define to 1 if you have the <bstring.h> header file. */ |
472 | #undef HAVE_BSTRING_H | 483 | #undef HAVE_BSTRING_H |
473 | 484 | ||
474 | /* Define if you have the `clock' function. */ | 485 | /* Define to 1 if you have the `clock' function. */ |
475 | #undef HAVE_CLOCK | 486 | #undef HAVE_CLOCK |
476 | 487 | ||
488 | /* Define to 1 if you have the `closefrom' function. */ | ||
489 | #undef HAVE_CLOSEFROM | ||
490 | |||
477 | /* Define if gai_strerror() returns const char * */ | 491 | /* Define if gai_strerror() returns const char * */ |
478 | #undef HAVE_CONST_GAI_STRERROR_PROTO | 492 | #undef HAVE_CONST_GAI_STRERROR_PROTO |
479 | 493 | ||
480 | /* Define if you have the <crypt.h> header file. */ | 494 | /* Define to 1 if you have the <crypt.h> header file. */ |
481 | #undef HAVE_CRYPT_H | 495 | #undef HAVE_CRYPT_H |
482 | 496 | ||
483 | /* Define if you have the `dirname' function. */ | 497 | /* Define to 1 if you have the declaration of `h_errno', and to 0 if you |
498 | don't. */ | ||
499 | #undef HAVE_DECL_H_ERRNO | ||
500 | |||
501 | /* Define to 1 if you have the <dirent.h> header file. */ | ||
502 | #undef HAVE_DIRENT_H | ||
503 | |||
504 | /* Define to 1 if you have the `dirfd' function. */ | ||
505 | #undef HAVE_DIRFD | ||
506 | |||
507 | /* Define to 1 if you have the `dirname' function. */ | ||
484 | #undef HAVE_DIRNAME | 508 | #undef HAVE_DIRNAME |
485 | 509 | ||
486 | /* Define if you have the <endian.h> header file. */ | 510 | /* Define to 1 if you have the <endian.h> header file. */ |
487 | #undef HAVE_ENDIAN_H | 511 | #undef HAVE_ENDIAN_H |
488 | 512 | ||
489 | /* Define if you have the `endutent' function. */ | 513 | /* Define to 1 if you have the `endutent' function. */ |
490 | #undef HAVE_ENDUTENT | 514 | #undef HAVE_ENDUTENT |
491 | 515 | ||
492 | /* Define if you have the `endutxent' function. */ | 516 | /* Define to 1 if you have the `endutxent' function. */ |
493 | #undef HAVE_ENDUTXENT | 517 | #undef HAVE_ENDUTXENT |
494 | 518 | ||
495 | /* Define if you have the `fchmod' function. */ | 519 | /* Define to 1 if you have the `fchmod' function. */ |
496 | #undef HAVE_FCHMOD | 520 | #undef HAVE_FCHMOD |
497 | 521 | ||
498 | /* Define if you have the `fchown' function. */ | 522 | /* Define to 1 if you have the `fchown' function. */ |
499 | #undef HAVE_FCHOWN | 523 | #undef HAVE_FCHOWN |
500 | 524 | ||
501 | /* Define if you have the <features.h> header file. */ | 525 | /* Define to 1 if you have the <features.h> header file. */ |
502 | #undef HAVE_FEATURES_H | 526 | #undef HAVE_FEATURES_H |
503 | 527 | ||
504 | /* Define if you have the <floatingpoint.h> header file. */ | 528 | /* Define to 1 if you have the <floatingpoint.h> header file. */ |
505 | #undef HAVE_FLOATINGPOINT_H | 529 | #undef HAVE_FLOATINGPOINT_H |
506 | 530 | ||
507 | /* Define if you have the `freeaddrinfo' function. */ | 531 | /* Define to 1 if you have the `freeaddrinfo' function. */ |
508 | #undef HAVE_FREEADDRINFO | 532 | #undef HAVE_FREEADDRINFO |
509 | 533 | ||
510 | /* Define if you have the `futimes' function. */ | 534 | /* Define to 1 if you have the `futimes' function. */ |
511 | #undef HAVE_FUTIMES | 535 | #undef HAVE_FUTIMES |
512 | 536 | ||
513 | /* Define if you have the `gai_strerror' function. */ | 537 | /* Define to 1 if you have the `gai_strerror' function. */ |
514 | #undef HAVE_GAI_STRERROR | 538 | #undef HAVE_GAI_STRERROR |
515 | 539 | ||
516 | /* Define if you have the `getaddrinfo' function. */ | 540 | /* Define to 1 if you have the `getaddrinfo' function. */ |
517 | #undef HAVE_GETADDRINFO | 541 | #undef HAVE_GETADDRINFO |
518 | 542 | ||
519 | /* Define if you have the `getcwd' function. */ | 543 | /* Define to 1 if you have the `getcwd' function. */ |
520 | #undef HAVE_GETCWD | 544 | #undef HAVE_GETCWD |
521 | 545 | ||
522 | /* Define if you have the `getgrouplist' function. */ | 546 | /* Define to 1 if you have the `getgrouplist' function. */ |
523 | #undef HAVE_GETGROUPLIST | 547 | #undef HAVE_GETGROUPLIST |
524 | 548 | ||
525 | /* Define if you have the `getluid' function. */ | 549 | /* Define to 1 if you have the `getluid' function. */ |
526 | #undef HAVE_GETLUID | 550 | #undef HAVE_GETLUID |
527 | 551 | ||
528 | /* Define if you have the `getnameinfo' function. */ | 552 | /* Define to 1 if you have the `getnameinfo' function. */ |
529 | #undef HAVE_GETNAMEINFO | 553 | #undef HAVE_GETNAMEINFO |
530 | 554 | ||
531 | /* Define if you have the `getopt' function. */ | 555 | /* Define to 1 if you have the `getopt' function. */ |
532 | #undef HAVE_GETOPT | 556 | #undef HAVE_GETOPT |
533 | 557 | ||
534 | /* Define if you have the <getopt.h> header file. */ | 558 | /* Define to 1 if you have the <getopt.h> header file. */ |
535 | #undef HAVE_GETOPT_H | 559 | #undef HAVE_GETOPT_H |
536 | 560 | ||
537 | /* Define if you have the `getpeereid' function. */ | 561 | /* Define to 1 if you have the `getpeereid' function. */ |
538 | #undef HAVE_GETPEEREID | 562 | #undef HAVE_GETPEEREID |
539 | 563 | ||
540 | /* Define if you have the `getpwanam' function. */ | 564 | /* Define to 1 if you have the `getpwanam' function. */ |
541 | #undef HAVE_GETPWANAM | 565 | #undef HAVE_GETPWANAM |
542 | 566 | ||
543 | /* Define if you have the `getrlimit' function. */ | 567 | /* Define to 1 if you have the `getrlimit' function. */ |
544 | #undef HAVE_GETRLIMIT | 568 | #undef HAVE_GETRLIMIT |
545 | 569 | ||
546 | /* Define if you have the `getrusage' function. */ | 570 | /* Define to 1 if you have the `getrusage' function. */ |
547 | #undef HAVE_GETRUSAGE | 571 | #undef HAVE_GETRUSAGE |
548 | 572 | ||
549 | /* Define if you have the `gettimeofday' function. */ | 573 | /* Define to 1 if you have the `gettimeofday' function. */ |
550 | #undef HAVE_GETTIMEOFDAY | 574 | #undef HAVE_GETTIMEOFDAY |
551 | 575 | ||
552 | /* Define if you have the `getttyent' function. */ | 576 | /* Define to 1 if you have the `getttyent' function. */ |
553 | #undef HAVE_GETTTYENT | 577 | #undef HAVE_GETTTYENT |
554 | 578 | ||
555 | /* Define if you have the `getutent' function. */ | 579 | /* Define to 1 if you have the `getutent' function. */ |
556 | #undef HAVE_GETUTENT | 580 | #undef HAVE_GETUTENT |
557 | 581 | ||
558 | /* Define if you have the `getutid' function. */ | 582 | /* Define to 1 if you have the `getutid' function. */ |
559 | #undef HAVE_GETUTID | 583 | #undef HAVE_GETUTID |
560 | 584 | ||
561 | /* Define if you have the `getutline' function. */ | 585 | /* Define to 1 if you have the `getutline' function. */ |
562 | #undef HAVE_GETUTLINE | 586 | #undef HAVE_GETUTLINE |
563 | 587 | ||
564 | /* Define if you have the `getutxent' function. */ | 588 | /* Define to 1 if you have the `getutxent' function. */ |
565 | #undef HAVE_GETUTXENT | 589 | #undef HAVE_GETUTXENT |
566 | 590 | ||
567 | /* Define if you have the `getutxid' function. */ | 591 | /* Define to 1 if you have the `getutxid' function. */ |
568 | #undef HAVE_GETUTXID | 592 | #undef HAVE_GETUTXID |
569 | 593 | ||
570 | /* Define if you have the `getutxline' function. */ | 594 | /* Define to 1 if you have the `getutxline' function. */ |
571 | #undef HAVE_GETUTXLINE | 595 | #undef HAVE_GETUTXLINE |
572 | 596 | ||
573 | /* Define if you have the `glob' function. */ | 597 | /* Define to 1 if you have the `glob' function. */ |
574 | #undef HAVE_GLOB | 598 | #undef HAVE_GLOB |
575 | 599 | ||
576 | /* Define if you have the <glob.h> header file. */ | 600 | /* Define to 1 if you have the <glob.h> header file. */ |
577 | #undef HAVE_GLOB_H | 601 | #undef HAVE_GLOB_H |
578 | 602 | ||
579 | /* Define if you have the <gssapi_generic.h> header file. */ | 603 | /* Define to 1 if you have the <gssapi_generic.h> header file. */ |
580 | #undef HAVE_GSSAPI_GENERIC_H | 604 | #undef HAVE_GSSAPI_GENERIC_H |
581 | 605 | ||
582 | /* Define if you have the <gssapi/gssapi_generic.h> header file. */ | 606 | /* Define to 1 if you have the <gssapi/gssapi_generic.h> header file. */ |
583 | #undef HAVE_GSSAPI_GSSAPI_GENERIC_H | 607 | #undef HAVE_GSSAPI_GSSAPI_GENERIC_H |
584 | 608 | ||
585 | /* Define if you have the <gssapi/gssapi.h> header file. */ | 609 | /* Define to 1 if you have the <gssapi/gssapi.h> header file. */ |
586 | #undef HAVE_GSSAPI_GSSAPI_H | 610 | #undef HAVE_GSSAPI_GSSAPI_H |
587 | 611 | ||
588 | /* Define if you have the <gssapi/gssapi_krb5.h> header file. */ | 612 | /* Define to 1 if you have the <gssapi/gssapi_krb5.h> header file. */ |
589 | #undef HAVE_GSSAPI_GSSAPI_KRB5_H | 613 | #undef HAVE_GSSAPI_GSSAPI_KRB5_H |
590 | 614 | ||
591 | /* Define if you have the <gssapi.h> header file. */ | 615 | /* Define to 1 if you have the <gssapi.h> header file. */ |
592 | #undef HAVE_GSSAPI_H | 616 | #undef HAVE_GSSAPI_H |
593 | 617 | ||
594 | /* Define if you have the <gssapi_krb5.h> header file. */ | 618 | /* Define to 1 if you have the <gssapi_krb5.h> header file. */ |
595 | #undef HAVE_GSSAPI_KRB5_H | 619 | #undef HAVE_GSSAPI_KRB5_H |
596 | 620 | ||
597 | /* Define if you have the <ia.h> header file. */ | 621 | /* Define to 1 if you have the <ia.h> header file. */ |
598 | #undef HAVE_IA_H | 622 | #undef HAVE_IA_H |
599 | 623 | ||
600 | /* Define if you have the `inet_aton' function. */ | 624 | /* Define to 1 if you have the `inet_aton' function. */ |
601 | #undef HAVE_INET_ATON | 625 | #undef HAVE_INET_ATON |
602 | 626 | ||
603 | /* Define if you have the `inet_ntoa' function. */ | 627 | /* Define to 1 if you have the `inet_ntoa' function. */ |
604 | #undef HAVE_INET_NTOA | 628 | #undef HAVE_INET_NTOA |
605 | 629 | ||
606 | /* Define if you have the `inet_ntop' function. */ | 630 | /* Define to 1 if you have the `inet_ntop' function. */ |
607 | #undef HAVE_INET_NTOP | 631 | #undef HAVE_INET_NTOP |
608 | 632 | ||
609 | /* Define if you have the `innetgr' function. */ | 633 | /* Define to 1 if you have the `innetgr' function. */ |
610 | #undef HAVE_INNETGR | 634 | #undef HAVE_INNETGR |
611 | 635 | ||
612 | /* Define if you have the <inttypes.h> header file. */ | 636 | /* Define to 1 if you have the <inttypes.h> header file. */ |
613 | #undef HAVE_INTTYPES_H | 637 | #undef HAVE_INTTYPES_H |
614 | 638 | ||
615 | /* Define if you have the <lastlog.h> header file. */ | 639 | /* Define to 1 if you have the <lastlog.h> header file. */ |
616 | #undef HAVE_LASTLOG_H | 640 | #undef HAVE_LASTLOG_H |
617 | 641 | ||
618 | /* Define if you have the `crypt' library (-lcrypt). */ | 642 | /* Define to 1 if you have the `crypt' library (-lcrypt). */ |
619 | #undef HAVE_LIBCRYPT | 643 | #undef HAVE_LIBCRYPT |
620 | 644 | ||
621 | /* Define if you have the `dl' library (-ldl). */ | 645 | /* Define to 1 if you have the `dl' library (-ldl). */ |
622 | #undef HAVE_LIBDL | 646 | #undef HAVE_LIBDL |
623 | 647 | ||
624 | /* Define if you have the <libgen.h> header file. */ | 648 | /* Define to 1 if you have the <libgen.h> header file. */ |
625 | #undef HAVE_LIBGEN_H | 649 | #undef HAVE_LIBGEN_H |
626 | 650 | ||
627 | /* Define if you have the `nsl' library (-lnsl). */ | 651 | /* Define to 1 if you have the `nsl' library (-lnsl). */ |
628 | #undef HAVE_LIBNSL | 652 | #undef HAVE_LIBNSL |
629 | 653 | ||
630 | /* Define if you have the `pam' library (-lpam). */ | 654 | /* Define to 1 if you have the `pam' library (-lpam). */ |
631 | #undef HAVE_LIBPAM | 655 | #undef HAVE_LIBPAM |
632 | 656 | ||
633 | /* Define if you have the `sectok' library (-lsectok). */ | 657 | /* Define to 1 if you have the `sectok' library (-lsectok). */ |
634 | #undef HAVE_LIBSECTOK | 658 | #undef HAVE_LIBSECTOK |
635 | 659 | ||
636 | /* Define if you have the `socket' library (-lsocket). */ | 660 | /* Define to 1 if you have the `socket' library (-lsocket). */ |
637 | #undef HAVE_LIBSOCKET | 661 | #undef HAVE_LIBSOCKET |
638 | 662 | ||
639 | /* Define if you have the <libutil.h> header file. */ | 663 | /* Define to 1 if you have the <libutil.h> header file. */ |
640 | #undef HAVE_LIBUTIL_H | 664 | #undef HAVE_LIBUTIL_H |
641 | 665 | ||
642 | /* Define if you have the `xnet' library (-lxnet). */ | 666 | /* Define to 1 if you have the `xnet' library (-lxnet). */ |
643 | #undef HAVE_LIBXNET | 667 | #undef HAVE_LIBXNET |
644 | 668 | ||
645 | /* Define if you have the `z' library (-lz). */ | 669 | /* Define to 1 if you have the `z' library (-lz). */ |
646 | #undef HAVE_LIBZ | 670 | #undef HAVE_LIBZ |
647 | 671 | ||
648 | /* Define if you have the <limits.h> header file. */ | 672 | /* Define to 1 if you have the <limits.h> header file. */ |
649 | #undef HAVE_LIMITS_H | 673 | #undef HAVE_LIMITS_H |
650 | 674 | ||
651 | /* Define if you have the <login_cap.h> header file. */ | 675 | /* Define to 1 if you have the <login_cap.h> header file. */ |
652 | #undef HAVE_LOGIN_CAP_H | 676 | #undef HAVE_LOGIN_CAP_H |
653 | 677 | ||
654 | /* Define if you have the `login_getcapbool' function. */ | 678 | /* Define to 1 if you have the `login_getcapbool' function. */ |
655 | #undef HAVE_LOGIN_GETCAPBOOL | 679 | #undef HAVE_LOGIN_GETCAPBOOL |
656 | 680 | ||
657 | /* Define if you have the <login.h> header file. */ | 681 | /* Define to 1 if you have the <login.h> header file. */ |
658 | #undef HAVE_LOGIN_H | 682 | #undef HAVE_LOGIN_H |
659 | 683 | ||
660 | /* Define if you have the `logout' function. */ | 684 | /* Define to 1 if you have the `logout' function. */ |
661 | #undef HAVE_LOGOUT | 685 | #undef HAVE_LOGOUT |
662 | 686 | ||
663 | /* Define if you have the `logwtmp' function. */ | 687 | /* Define to 1 if you have the `logwtmp' function. */ |
664 | #undef HAVE_LOGWTMP | 688 | #undef HAVE_LOGWTMP |
665 | 689 | ||
666 | /* Define if you have the <maillock.h> header file. */ | 690 | /* Define to 1 if you have the <maillock.h> header file. */ |
667 | #undef HAVE_MAILLOCK_H | 691 | #undef HAVE_MAILLOCK_H |
668 | 692 | ||
669 | /* Define if you have the `md5_crypt' function. */ | 693 | /* Define to 1 if you have the `md5_crypt' function. */ |
670 | #undef HAVE_MD5_CRYPT | 694 | #undef HAVE_MD5_CRYPT |
671 | 695 | ||
672 | /* Define if you have the `memmove' function. */ | 696 | /* Define to 1 if you have the `memmove' function. */ |
673 | #undef HAVE_MEMMOVE | 697 | #undef HAVE_MEMMOVE |
674 | 698 | ||
675 | /* Define if you have the <memory.h> header file. */ | 699 | /* Define to 1 if you have the <memory.h> header file. */ |
676 | #undef HAVE_MEMORY_H | 700 | #undef HAVE_MEMORY_H |
677 | 701 | ||
678 | /* Define if you have the `mkdtemp' function. */ | 702 | /* Define to 1 if you have the `mkdtemp' function. */ |
679 | #undef HAVE_MKDTEMP | 703 | #undef HAVE_MKDTEMP |
680 | 704 | ||
681 | /* Define if you have the `mmap' function. */ | 705 | /* Define to 1 if you have the `mmap' function. */ |
682 | #undef HAVE_MMAP | 706 | #undef HAVE_MMAP |
683 | 707 | ||
684 | /* Define if you have the <netdb.h> header file. */ | 708 | /* Define to 1 if you have the <ndir.h> header file. */ |
709 | #undef HAVE_NDIR_H | ||
710 | |||
711 | /* Define to 1 if you have the <netdb.h> header file. */ | ||
685 | #undef HAVE_NETDB_H | 712 | #undef HAVE_NETDB_H |
686 | 713 | ||
687 | /* Define if you have the <netgroup.h> header file. */ | 714 | /* Define to 1 if you have the <netgroup.h> header file. */ |
688 | #undef HAVE_NETGROUP_H | 715 | #undef HAVE_NETGROUP_H |
689 | 716 | ||
690 | /* Define if you have the <netinet/in_systm.h> header file. */ | 717 | /* Define to 1 if you have the <netinet/in_systm.h> header file. */ |
691 | #undef HAVE_NETINET_IN_SYSTM_H | 718 | #undef HAVE_NETINET_IN_SYSTM_H |
692 | 719 | ||
693 | /* Define if you have the `ngetaddrinfo' function. */ | 720 | /* Define to 1 if you have the `ngetaddrinfo' function. */ |
694 | #undef HAVE_NGETADDRINFO | 721 | #undef HAVE_NGETADDRINFO |
695 | 722 | ||
696 | /* Define if you have the `nsleep' function. */ | 723 | /* Define to 1 if you have the `nsleep' function. */ |
697 | #undef HAVE_NSLEEP | 724 | #undef HAVE_NSLEEP |
698 | 725 | ||
699 | /* Define if you have the `ogetaddrinfo' function. */ | 726 | /* Define to 1 if you have the `ogetaddrinfo' function. */ |
700 | #undef HAVE_OGETADDRINFO | 727 | #undef HAVE_OGETADDRINFO |
701 | 728 | ||
702 | /* Define if you have the `openlog_r' function. */ | 729 | /* Define to 1 if you have the `openlog_r' function. */ |
703 | #undef HAVE_OPENLOG_R | 730 | #undef HAVE_OPENLOG_R |
704 | 731 | ||
705 | /* Define if you have the `openpty' function. */ | 732 | /* Define to 1 if you have the `openpty' function. */ |
706 | #undef HAVE_OPENPTY | 733 | #undef HAVE_OPENPTY |
707 | 734 | ||
708 | /* Define if you have the `pam_getenvlist' function. */ | 735 | /* Define to 1 if you have the `pam_getenvlist' function. */ |
709 | #undef HAVE_PAM_GETENVLIST | 736 | #undef HAVE_PAM_GETENVLIST |
710 | 737 | ||
711 | /* Define if you have the <pam/pam_appl.h> header file. */ | 738 | /* Define to 1 if you have the <pam/pam_appl.h> header file. */ |
712 | #undef HAVE_PAM_PAM_APPL_H | 739 | #undef HAVE_PAM_PAM_APPL_H |
713 | 740 | ||
714 | /* Define if you have the `pam_putenv' function. */ | 741 | /* Define to 1 if you have the `pam_putenv' function. */ |
715 | #undef HAVE_PAM_PUTENV | 742 | #undef HAVE_PAM_PUTENV |
716 | 743 | ||
717 | /* Define if you have the <paths.h> header file. */ | 744 | /* Define to 1 if you have the <paths.h> header file. */ |
718 | #undef HAVE_PATHS_H | 745 | #undef HAVE_PATHS_H |
719 | 746 | ||
720 | /* Define if you have the `prctl' function. */ | 747 | /* Define to 1 if you have the `prctl' function. */ |
721 | #undef HAVE_PRCTL | 748 | #undef HAVE_PRCTL |
722 | 749 | ||
723 | /* Define if you have the `pstat' function. */ | 750 | /* Define to 1 if you have the `pstat' function. */ |
724 | #undef HAVE_PSTAT | 751 | #undef HAVE_PSTAT |
725 | 752 | ||
726 | /* Define if you have the <pty.h> header file. */ | 753 | /* Define to 1 if you have the <pty.h> header file. */ |
727 | #undef HAVE_PTY_H | 754 | #undef HAVE_PTY_H |
728 | 755 | ||
729 | /* Define if you have the `pututline' function. */ | 756 | /* Define to 1 if you have the `pututline' function. */ |
730 | #undef HAVE_PUTUTLINE | 757 | #undef HAVE_PUTUTLINE |
731 | 758 | ||
732 | /* Define if you have the `pututxline' function. */ | 759 | /* Define to 1 if you have the `pututxline' function. */ |
733 | #undef HAVE_PUTUTXLINE | 760 | #undef HAVE_PUTUTXLINE |
734 | 761 | ||
735 | /* Define if you have the `readpassphrase' function. */ | 762 | /* Define to 1 if you have the `readpassphrase' function. */ |
736 | #undef HAVE_READPASSPHRASE | 763 | #undef HAVE_READPASSPHRASE |
737 | 764 | ||
738 | /* Define if you have the <readpassphrase.h> header file. */ | 765 | /* Define to 1 if you have the <readpassphrase.h> header file. */ |
739 | #undef HAVE_READPASSPHRASE_H | 766 | #undef HAVE_READPASSPHRASE_H |
740 | 767 | ||
741 | /* Define if you have the `realpath' function. */ | 768 | /* Define to 1 if you have the `realpath' function. */ |
742 | #undef HAVE_REALPATH | 769 | #undef HAVE_REALPATH |
743 | 770 | ||
744 | /* Define if you have the `recvmsg' function. */ | 771 | /* Define to 1 if you have the `recvmsg' function. */ |
745 | #undef HAVE_RECVMSG | 772 | #undef HAVE_RECVMSG |
746 | 773 | ||
747 | /* Define if you have the <rpc/types.h> header file. */ | 774 | /* Define to 1 if you have the <rpc/types.h> header file. */ |
748 | #undef HAVE_RPC_TYPES_H | 775 | #undef HAVE_RPC_TYPES_H |
749 | 776 | ||
750 | /* Define if you have the `rresvport_af' function. */ | 777 | /* Define to 1 if you have the `rresvport_af' function. */ |
751 | #undef HAVE_RRESVPORT_AF | 778 | #undef HAVE_RRESVPORT_AF |
752 | 779 | ||
753 | /* Define if you have the <sectok.h> header file. */ | 780 | /* Define to 1 if you have the <sectok.h> header file. */ |
754 | #undef HAVE_SECTOK_H | 781 | #undef HAVE_SECTOK_H |
755 | 782 | ||
756 | /* Define if you have the <security/pam_appl.h> header file. */ | 783 | /* Define to 1 if you have the <security/pam_appl.h> header file. */ |
757 | #undef HAVE_SECURITY_PAM_APPL_H | 784 | #undef HAVE_SECURITY_PAM_APPL_H |
758 | 785 | ||
759 | /* Define if you have the `sendmsg' function. */ | 786 | /* Define to 1 if you have the `sendmsg' function. */ |
760 | #undef HAVE_SENDMSG | 787 | #undef HAVE_SENDMSG |
761 | 788 | ||
762 | /* Define if you have the `setauthdb' function. */ | 789 | /* Define to 1 if you have the `setauthdb' function. */ |
763 | #undef HAVE_SETAUTHDB | 790 | #undef HAVE_SETAUTHDB |
764 | 791 | ||
765 | /* Define if you have the `setdtablesize' function. */ | 792 | /* Define to 1 if you have the `setdtablesize' function. */ |
766 | #undef HAVE_SETDTABLESIZE | 793 | #undef HAVE_SETDTABLESIZE |
767 | 794 | ||
768 | /* Define if you have the `setegid' function. */ | 795 | /* Define to 1 if you have the `setegid' function. */ |
769 | #undef HAVE_SETEGID | 796 | #undef HAVE_SETEGID |
770 | 797 | ||
771 | /* Define if you have the `setenv' function. */ | 798 | /* Define to 1 if you have the `setenv' function. */ |
772 | #undef HAVE_SETENV | 799 | #undef HAVE_SETENV |
773 | 800 | ||
774 | /* Define if you have the `seteuid' function. */ | 801 | /* Define to 1 if you have the `seteuid' function. */ |
775 | #undef HAVE_SETEUID | 802 | #undef HAVE_SETEUID |
776 | 803 | ||
777 | /* Define if you have the `setgroups' function. */ | 804 | /* Define to 1 if you have the `setgroups' function. */ |
778 | #undef HAVE_SETGROUPS | 805 | #undef HAVE_SETGROUPS |
779 | 806 | ||
780 | /* Define if you have the `setlogin' function. */ | 807 | /* Define to 1 if you have the `setlogin' function. */ |
781 | #undef HAVE_SETLOGIN | 808 | #undef HAVE_SETLOGIN |
782 | 809 | ||
783 | /* Define if you have the `setluid' function. */ | 810 | /* Define to 1 if you have the `setluid' function. */ |
784 | #undef HAVE_SETLUID | 811 | #undef HAVE_SETLUID |
785 | 812 | ||
786 | /* Define if you have the `setpcred' function. */ | 813 | /* Define to 1 if you have the `setpcred' function. */ |
787 | #undef HAVE_SETPCRED | 814 | #undef HAVE_SETPCRED |
788 | 815 | ||
789 | /* Define if you have the `setproctitle' function. */ | 816 | /* Define to 1 if you have the `setproctitle' function. */ |
790 | #undef HAVE_SETPROCTITLE | 817 | #undef HAVE_SETPROCTITLE |
791 | 818 | ||
792 | /* Define if you have the `setregid' function. */ | 819 | /* Define to 1 if you have the `setregid' function. */ |
793 | #undef HAVE_SETREGID | 820 | #undef HAVE_SETREGID |
794 | 821 | ||
795 | /* Define if you have the `setresgid' function. */ | 822 | /* Define to 1 if you have the `setresgid' function. */ |
796 | #undef HAVE_SETRESGID | 823 | #undef HAVE_SETRESGID |
797 | 824 | ||
798 | /* Define if you have the `setresuid' function. */ | 825 | /* Define to 1 if you have the `setresuid' function. */ |
799 | #undef HAVE_SETRESUID | 826 | #undef HAVE_SETRESUID |
800 | 827 | ||
801 | /* Define if you have the `setreuid' function. */ | 828 | /* Define to 1 if you have the `setreuid' function. */ |
802 | #undef HAVE_SETREUID | 829 | #undef HAVE_SETREUID |
803 | 830 | ||
804 | /* Define if you have the `setrlimit' function. */ | 831 | /* Define to 1 if you have the `setrlimit' function. */ |
805 | #undef HAVE_SETRLIMIT | 832 | #undef HAVE_SETRLIMIT |
806 | 833 | ||
807 | /* Define if you have the `setsid' function. */ | 834 | /* Define to 1 if you have the `setsid' function. */ |
808 | #undef HAVE_SETSID | 835 | #undef HAVE_SETSID |
809 | 836 | ||
810 | /* Define if you have the `setutent' function. */ | 837 | /* Define to 1 if you have the `setutent' function. */ |
811 | #undef HAVE_SETUTENT | 838 | #undef HAVE_SETUTENT |
812 | 839 | ||
813 | /* Define if you have the `setutxent' function. */ | 840 | /* Define to 1 if you have the `setutxent' function. */ |
814 | #undef HAVE_SETUTXENT | 841 | #undef HAVE_SETUTXENT |
815 | 842 | ||
816 | /* Define if you have the `setvbuf' function. */ | 843 | /* Define to 1 if you have the `setvbuf' function. */ |
817 | #undef HAVE_SETVBUF | 844 | #undef HAVE_SETVBUF |
818 | 845 | ||
819 | /* Define if you have the <shadow.h> header file. */ | 846 | /* Define to 1 if you have the <shadow.h> header file. */ |
820 | #undef HAVE_SHADOW_H | 847 | #undef HAVE_SHADOW_H |
821 | 848 | ||
822 | /* Define if you have the `sigaction' function. */ | 849 | /* Define to 1 if you have the `sigaction' function. */ |
823 | #undef HAVE_SIGACTION | 850 | #undef HAVE_SIGACTION |
824 | 851 | ||
825 | /* Define if you have the `sigvec' function. */ | 852 | /* Define to 1 if you have the `sigvec' function. */ |
826 | #undef HAVE_SIGVEC | 853 | #undef HAVE_SIGVEC |
827 | 854 | ||
828 | /* Define if the system has the type `sig_atomic_t'. */ | 855 | /* Define to 1 if the system has the type `sig_atomic_t'. */ |
829 | #undef HAVE_SIG_ATOMIC_T | 856 | #undef HAVE_SIG_ATOMIC_T |
830 | 857 | ||
831 | /* Define if you have the `snprintf' function. */ | 858 | /* Define to 1 if you have the `snprintf' function. */ |
832 | #undef HAVE_SNPRINTF | 859 | #undef HAVE_SNPRINTF |
833 | 860 | ||
834 | /* Define if you have the `socketpair' function. */ | 861 | /* Define to 1 if you have the `socketpair' function. */ |
835 | #undef HAVE_SOCKETPAIR | 862 | #undef HAVE_SOCKETPAIR |
836 | 863 | ||
837 | /* Define if you have the <stddef.h> header file. */ | 864 | /* Define to 1 if you have the <stddef.h> header file. */ |
838 | #undef HAVE_STDDEF_H | 865 | #undef HAVE_STDDEF_H |
839 | 866 | ||
840 | /* Define if you have the <stdint.h> header file. */ | 867 | /* Define to 1 if you have the <stdint.h> header file. */ |
841 | #undef HAVE_STDINT_H | 868 | #undef HAVE_STDINT_H |
842 | 869 | ||
843 | /* Define if you have the <stdlib.h> header file. */ | 870 | /* Define to 1 if you have the <stdlib.h> header file. */ |
844 | #undef HAVE_STDLIB_H | 871 | #undef HAVE_STDLIB_H |
845 | 872 | ||
846 | /* Define if you have the `strerror' function. */ | 873 | /* Define to 1 if you have the `strerror' function. */ |
847 | #undef HAVE_STRERROR | 874 | #undef HAVE_STRERROR |
848 | 875 | ||
849 | /* Define if you have the `strftime' function. */ | 876 | /* Define to 1 if you have the `strftime' function. */ |
850 | #undef HAVE_STRFTIME | 877 | #undef HAVE_STRFTIME |
851 | 878 | ||
852 | /* Define if you have the <strings.h> header file. */ | 879 | /* Define to 1 if you have the <strings.h> header file. */ |
853 | #undef HAVE_STRINGS_H | 880 | #undef HAVE_STRINGS_H |
854 | 881 | ||
855 | /* Define if you have the <string.h> header file. */ | 882 | /* Define to 1 if you have the <string.h> header file. */ |
856 | #undef HAVE_STRING_H | 883 | #undef HAVE_STRING_H |
857 | 884 | ||
858 | /* Define if you have the `strlcat' function. */ | 885 | /* Define to 1 if you have the `strlcat' function. */ |
859 | #undef HAVE_STRLCAT | 886 | #undef HAVE_STRLCAT |
860 | 887 | ||
861 | /* Define if you have the `strlcpy' function. */ | 888 | /* Define to 1 if you have the `strlcpy' function. */ |
862 | #undef HAVE_STRLCPY | 889 | #undef HAVE_STRLCPY |
863 | 890 | ||
864 | /* Define if you have the `strmode' function. */ | 891 | /* Define to 1 if you have the `strmode' function. */ |
865 | #undef HAVE_STRMODE | 892 | #undef HAVE_STRMODE |
866 | 893 | ||
867 | /* Define if you have the `strnvis' function. */ | 894 | /* Define to 1 if you have the `strnvis' function. */ |
868 | #undef HAVE_STRNVIS | 895 | #undef HAVE_STRNVIS |
869 | 896 | ||
870 | /* Define if you have the `strsep' function. */ | 897 | /* Define to 1 if you have the `strsep' function. */ |
871 | #undef HAVE_STRSEP | 898 | #undef HAVE_STRSEP |
872 | 899 | ||
873 | /* Define if you have the `strtoul' function. */ | 900 | /* Define to 1 if you have the `strtoul' function. */ |
874 | #undef HAVE_STRTOUL | 901 | #undef HAVE_STRTOUL |
875 | 902 | ||
876 | /* Define if `st_blksize' is member of `struct stat'. */ | 903 | /* Define to 1 if `st_blksize' is member of `struct stat'. */ |
877 | #undef HAVE_STRUCT_STAT_ST_BLKSIZE | 904 | #undef HAVE_STRUCT_STAT_ST_BLKSIZE |
878 | 905 | ||
879 | /* Define if the system has the type `struct timespec'. */ | 906 | /* Define to 1 if the system has the type `struct timespec'. */ |
880 | #undef HAVE_STRUCT_TIMESPEC | 907 | #undef HAVE_STRUCT_TIMESPEC |
881 | 908 | ||
882 | /* Define if you have the `sysconf' function. */ | 909 | /* Define to 1 if you have the `sysconf' function. */ |
883 | #undef HAVE_SYSCONF | 910 | #undef HAVE_SYSCONF |
884 | 911 | ||
885 | /* Define if you have the <sys/audit.h> header file. */ | 912 | /* Define to 1 if you have the <sys/audit.h> header file. */ |
886 | #undef HAVE_SYS_AUDIT_H | 913 | #undef HAVE_SYS_AUDIT_H |
887 | 914 | ||
888 | /* Define if you have the <sys/bitypes.h> header file. */ | 915 | /* Define to 1 if you have the <sys/bitypes.h> header file. */ |
889 | #undef HAVE_SYS_BITYPES_H | 916 | #undef HAVE_SYS_BITYPES_H |
890 | 917 | ||
891 | /* Define if you have the <sys/bsdtty.h> header file. */ | 918 | /* Define to 1 if you have the <sys/bsdtty.h> header file. */ |
892 | #undef HAVE_SYS_BSDTTY_H | 919 | #undef HAVE_SYS_BSDTTY_H |
893 | 920 | ||
894 | /* Define if you have the <sys/cdefs.h> header file. */ | 921 | /* Define to 1 if you have the <sys/cdefs.h> header file. */ |
895 | #undef HAVE_SYS_CDEFS_H | 922 | #undef HAVE_SYS_CDEFS_H |
896 | 923 | ||
897 | /* Define if you have the <sys/mman.h> header file. */ | 924 | /* Define to 1 if you have the <sys/dir.h> header file. */ |
925 | #undef HAVE_SYS_DIR_H | ||
926 | |||
927 | /* Define to 1 if you have the <sys/mman.h> header file. */ | ||
898 | #undef HAVE_SYS_MMAN_H | 928 | #undef HAVE_SYS_MMAN_H |
899 | 929 | ||
900 | /* Define if you have the <sys/prctl.h> header file. */ | 930 | /* Define to 1 if you have the <sys/ndir.h> header file. */ |
931 | #undef HAVE_SYS_NDIR_H | ||
932 | |||
933 | /* Define to 1 if you have the <sys/prctl.h> header file. */ | ||
901 | #undef HAVE_SYS_PRCTL_H | 934 | #undef HAVE_SYS_PRCTL_H |
902 | 935 | ||
903 | /* Define if you have the <sys/pstat.h> header file. */ | 936 | /* Define to 1 if you have the <sys/pstat.h> header file. */ |
904 | #undef HAVE_SYS_PSTAT_H | 937 | #undef HAVE_SYS_PSTAT_H |
905 | 938 | ||
906 | /* Define if you have the <sys/ptms.h> header file. */ | 939 | /* Define to 1 if you have the <sys/ptms.h> header file. */ |
907 | #undef HAVE_SYS_PTMS_H | 940 | #undef HAVE_SYS_PTMS_H |
908 | 941 | ||
909 | /* Define if you have the <sys/select.h> header file. */ | 942 | /* Define to 1 if you have the <sys/select.h> header file. */ |
910 | #undef HAVE_SYS_SELECT_H | 943 | #undef HAVE_SYS_SELECT_H |
911 | 944 | ||
912 | /* Define if you have the <sys/stat.h> header file. */ | 945 | /* Define to 1 if you have the <sys/stat.h> header file. */ |
913 | #undef HAVE_SYS_STAT_H | 946 | #undef HAVE_SYS_STAT_H |
914 | 947 | ||
915 | /* Define if you have the <sys/stream.h> header file. */ | 948 | /* Define to 1 if you have the <sys/stream.h> header file. */ |
916 | #undef HAVE_SYS_STREAM_H | 949 | #undef HAVE_SYS_STREAM_H |
917 | 950 | ||
918 | /* Define if you have the <sys/stropts.h> header file. */ | 951 | /* Define to 1 if you have the <sys/stropts.h> header file. */ |
919 | #undef HAVE_SYS_STROPTS_H | 952 | #undef HAVE_SYS_STROPTS_H |
920 | 953 | ||
921 | /* Define if you have the <sys/strtio.h> header file. */ | 954 | /* Define to 1 if you have the <sys/strtio.h> header file. */ |
922 | #undef HAVE_SYS_STRTIO_H | 955 | #undef HAVE_SYS_STRTIO_H |
923 | 956 | ||
924 | /* Define if you have the <sys/sysmacros.h> header file. */ | 957 | /* Define to 1 if you have the <sys/sysmacros.h> header file. */ |
925 | #undef HAVE_SYS_SYSMACROS_H | 958 | #undef HAVE_SYS_SYSMACROS_H |
926 | 959 | ||
927 | /* Define if you have the <sys/timers.h> header file. */ | 960 | /* Define to 1 if you have the <sys/timers.h> header file. */ |
928 | #undef HAVE_SYS_TIMERS_H | 961 | #undef HAVE_SYS_TIMERS_H |
929 | 962 | ||
930 | /* Define if you have the <sys/time.h> header file. */ | 963 | /* Define to 1 if you have the <sys/time.h> header file. */ |
931 | #undef HAVE_SYS_TIME_H | 964 | #undef HAVE_SYS_TIME_H |
932 | 965 | ||
933 | /* Define if you have the <sys/types.h> header file. */ | 966 | /* Define to 1 if you have the <sys/types.h> header file. */ |
934 | #undef HAVE_SYS_TYPES_H | 967 | #undef HAVE_SYS_TYPES_H |
935 | 968 | ||
936 | /* Define if you have the <sys/un.h> header file. */ | 969 | /* Define to 1 if you have the <sys/un.h> header file. */ |
937 | #undef HAVE_SYS_UN_H | 970 | #undef HAVE_SYS_UN_H |
938 | 971 | ||
939 | /* Define if you have the `tcgetpgrp' function. */ | 972 | /* Define to 1 if you have the `tcgetpgrp' function. */ |
940 | #undef HAVE_TCGETPGRP | 973 | #undef HAVE_TCGETPGRP |
941 | 974 | ||
942 | /* Define if you have the `tcsendbreak' function. */ | 975 | /* Define to 1 if you have the `tcsendbreak' function. */ |
943 | #undef HAVE_TCSENDBREAK | 976 | #undef HAVE_TCSENDBREAK |
944 | 977 | ||
945 | /* Define if you have the `time' function. */ | 978 | /* Define to 1 if you have the `time' function. */ |
946 | #undef HAVE_TIME | 979 | #undef HAVE_TIME |
947 | 980 | ||
948 | /* Define if you have the <time.h> header file. */ | 981 | /* Define to 1 if you have the <time.h> header file. */ |
949 | #undef HAVE_TIME_H | 982 | #undef HAVE_TIME_H |
950 | 983 | ||
951 | /* Define if you have the <tmpdir.h> header file. */ | 984 | /* Define to 1 if you have the <tmpdir.h> header file. */ |
952 | #undef HAVE_TMPDIR_H | 985 | #undef HAVE_TMPDIR_H |
953 | 986 | ||
954 | /* Define if you have the `truncate' function. */ | 987 | /* Define to 1 if you have the `truncate' function. */ |
955 | #undef HAVE_TRUNCATE | 988 | #undef HAVE_TRUNCATE |
956 | 989 | ||
957 | /* Define if you have the <ttyent.h> header file. */ | 990 | /* Define to 1 if you have the <ttyent.h> header file. */ |
958 | #undef HAVE_TTYENT_H | 991 | #undef HAVE_TTYENT_H |
959 | 992 | ||
960 | /* Define if you have the <unistd.h> header file. */ | 993 | /* Define to 1 if you have the <unistd.h> header file. */ |
961 | #undef HAVE_UNISTD_H | 994 | #undef HAVE_UNISTD_H |
962 | 995 | ||
963 | /* Define if you have the `unsetenv' function. */ | 996 | /* Define to 1 if you have the `unsetenv' function. */ |
964 | #undef HAVE_UNSETENV | 997 | #undef HAVE_UNSETENV |
965 | 998 | ||
966 | /* Define if you have the `updwtmp' function. */ | 999 | /* Define to 1 if you have the `updwtmp' function. */ |
967 | #undef HAVE_UPDWTMP | 1000 | #undef HAVE_UPDWTMP |
968 | 1001 | ||
969 | /* Define if you have the `updwtmpx' function. */ | 1002 | /* Define to 1 if you have the `updwtmpx' function. */ |
970 | #undef HAVE_UPDWTMPX | 1003 | #undef HAVE_UPDWTMPX |
971 | 1004 | ||
972 | /* Define if you have the <usersec.h> header file. */ | 1005 | /* Define to 1 if you have the <usersec.h> header file. */ |
973 | #undef HAVE_USERSEC_H | 1006 | #undef HAVE_USERSEC_H |
974 | 1007 | ||
975 | /* Define if you have the <util.h> header file. */ | 1008 | /* Define to 1 if you have the <util.h> header file. */ |
976 | #undef HAVE_UTIL_H | 1009 | #undef HAVE_UTIL_H |
977 | 1010 | ||
978 | /* Define if you have the `utimes' function. */ | 1011 | /* Define to 1 if you have the `utimes' function. */ |
979 | #undef HAVE_UTIMES | 1012 | #undef HAVE_UTIMES |
980 | 1013 | ||
981 | /* Define if you have the <utime.h> header file. */ | 1014 | /* Define to 1 if you have the <utime.h> header file. */ |
982 | #undef HAVE_UTIME_H | 1015 | #undef HAVE_UTIME_H |
983 | 1016 | ||
984 | /* Define if you have the `utmpname' function. */ | 1017 | /* Define to 1 if you have the `utmpname' function. */ |
985 | #undef HAVE_UTMPNAME | 1018 | #undef HAVE_UTMPNAME |
986 | 1019 | ||
987 | /* Define if you have the `utmpxname' function. */ | 1020 | /* Define to 1 if you have the `utmpxname' function. */ |
988 | #undef HAVE_UTMPXNAME | 1021 | #undef HAVE_UTMPXNAME |
989 | 1022 | ||
990 | /* Define if you have the <utmpx.h> header file. */ | 1023 | /* Define to 1 if you have the <utmpx.h> header file. */ |
991 | #undef HAVE_UTMPX_H | 1024 | #undef HAVE_UTMPX_H |
992 | 1025 | ||
993 | /* Define if you have the <utmp.h> header file. */ | 1026 | /* Define to 1 if you have the <utmp.h> header file. */ |
994 | #undef HAVE_UTMP_H | 1027 | #undef HAVE_UTMP_H |
995 | 1028 | ||
996 | /* Define if you have the `vhangup' function. */ | 1029 | /* Define to 1 if you have the `vhangup' function. */ |
997 | #undef HAVE_VHANGUP | 1030 | #undef HAVE_VHANGUP |
998 | 1031 | ||
999 | /* Define if you have the <vis.h> header file. */ | 1032 | /* Define to 1 if you have the <vis.h> header file. */ |
1000 | #undef HAVE_VIS_H | 1033 | #undef HAVE_VIS_H |
1001 | 1034 | ||
1002 | /* Define if you have the `vsnprintf' function. */ | 1035 | /* Define to 1 if you have the `vsnprintf' function. */ |
1003 | #undef HAVE_VSNPRINTF | 1036 | #undef HAVE_VSNPRINTF |
1004 | 1037 | ||
1005 | /* Define if you have the `waitpid' function. */ | 1038 | /* Define to 1 if you have the `waitpid' function. */ |
1006 | #undef HAVE_WAITPID | 1039 | #undef HAVE_WAITPID |
1007 | 1040 | ||
1008 | /* Define if you have the `_getlong' function. */ | 1041 | /* Define to 1 if you have the `_getlong' function. */ |
1009 | #undef HAVE__GETLONG | 1042 | #undef HAVE__GETLONG |
1010 | 1043 | ||
1011 | /* Define if you have the `_getpty' function. */ | 1044 | /* Define to 1 if you have the `_getpty' function. */ |
1012 | #undef HAVE__GETPTY | 1045 | #undef HAVE__GETPTY |
1013 | 1046 | ||
1014 | /* Define if you have the `_getshort' function. */ | 1047 | /* Define to 1 if you have the `_getshort' function. */ |
1015 | #undef HAVE__GETSHORT | 1048 | #undef HAVE__GETSHORT |
1016 | 1049 | ||
1017 | /* Define if you have the `__b64_ntop' function. */ | 1050 | /* Define to 1 if you have the `__b64_ntop' function. */ |
1018 | #undef HAVE___B64_NTOP | 1051 | #undef HAVE___B64_NTOP |
1019 | 1052 | ||
1020 | /* Define if you have the `__b64_pton' function. */ | 1053 | /* Define to 1 if you have the `__b64_pton' function. */ |
1021 | #undef HAVE___B64_PTON | 1054 | #undef HAVE___B64_PTON |
1022 | 1055 | ||
1056 | /* Define to the address where bug reports for this package should be sent. */ | ||
1057 | #undef PACKAGE_BUGREPORT | ||
1058 | |||
1059 | /* Define to the full name of this package. */ | ||
1060 | #undef PACKAGE_NAME | ||
1061 | |||
1062 | /* Define to the full name and version of this package. */ | ||
1063 | #undef PACKAGE_STRING | ||
1064 | |||
1065 | /* Define to the one symbol short name of this package. */ | ||
1066 | #undef PACKAGE_TARNAME | ||
1067 | |||
1068 | /* Define to the version of this package. */ | ||
1069 | #undef PACKAGE_VERSION | ||
1070 | |||
1023 | /* The size of a `char', as computed by sizeof. */ | 1071 | /* The size of a `char', as computed by sizeof. */ |
1024 | #undef SIZEOF_CHAR | 1072 | #undef SIZEOF_CHAR |
1025 | 1073 | ||
@@ -1035,11 +1083,11 @@ | |||
1035 | /* The size of a `short int', as computed by sizeof. */ | 1083 | /* The size of a `short int', as computed by sizeof. */ |
1036 | #undef SIZEOF_SHORT_INT | 1084 | #undef SIZEOF_SHORT_INT |
1037 | 1085 | ||
1038 | /* Define if you have the ANSI C header files. */ | 1086 | /* Define to 1 if you have the ANSI C header files. */ |
1039 | #undef STDC_HEADERS | 1087 | #undef STDC_HEADERS |
1040 | 1088 | ||
1041 | /* Define if your processor stores words with the most significant byte first | 1089 | /* Define to 1 if your processor stores words with the most significant byte |
1042 | (like Motorola and SPARC, unlike Intel and VAX). */ | 1090 | first (like Motorola and SPARC, unlike Intel and VAX). */ |
1043 | #undef WORDS_BIGENDIAN | 1091 | #undef WORDS_BIGENDIAN |
1044 | 1092 | ||
1045 | /* Number of bits in a file offset, on hosts where this is settable. */ | 1093 | /* Number of bits in a file offset, on hosts where this is settable. */ |
@@ -1048,9 +1096,11 @@ | |||
1048 | /* Define for large files, on AIX-style hosts. */ | 1096 | /* Define for large files, on AIX-style hosts. */ |
1049 | #undef _LARGE_FILES | 1097 | #undef _LARGE_FILES |
1050 | 1098 | ||
1051 | /* Define as `__inline' if that's what the C compiler calls it, or to nothing | 1099 | /* Define to `__inline__' or `__inline' if that's what the C compiler |
1052 | if it is not supported. */ | 1100 | calls it, or to nothing if 'inline' is not supported under any name. */ |
1101 | #ifndef __cplusplus | ||
1053 | #undef inline | 1102 | #undef inline |
1103 | #endif | ||
1054 | 1104 | ||
1055 | /* type to use in place of socklen_t if not defined */ | 1105 | /* type to use in place of socklen_t if not defined */ |
1056 | #undef socklen_t | 1106 | #undef socklen_t |
@@ -1,12 +1,81 @@ | |||
1 | #! /bin/sh | 1 | #! /bin/sh |
2 | # Guess values for system-dependent variables and create Makefiles. | 2 | # Guess values for system-dependent variables and create Makefiles. |
3 | # Generated by Autoconf 2.52. | 3 | # Generated by GNU Autoconf 2.59. |
4 | # | 4 | # |
5 | # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 | 5 | # Copyright (C) 2003 Free Software Foundation, Inc. |
6 | # Free Software Foundation, Inc. | ||
7 | # This configure script is free software; the Free Software Foundation | 6 | # This configure script is free software; the Free Software Foundation |
8 | # gives unlimited permission to copy, distribute and modify it. | 7 | # gives unlimited permission to copy, distribute and modify it. |
8 | ## --------------------- ## | ||
9 | ## M4sh Initialization. ## | ||
10 | ## --------------------- ## | ||
9 | 11 | ||
12 | # Be Bourne compatible | ||
13 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | ||
14 | emulate sh | ||
15 | NULLCMD=: | ||
16 | # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which | ||
17 | # is contrary to our usage. Disable this feature. | ||
18 | alias -g '${1+"$@"}'='"$@"' | ||
19 | elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then | ||
20 | set -o posix | ||
21 | fi | ||
22 | DUALCASE=1; export DUALCASE # for MKS sh | ||
23 | |||
24 | # Support unset when possible. | ||
25 | if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then | ||
26 | as_unset=unset | ||
27 | else | ||
28 | as_unset=false | ||
29 | fi | ||
30 | |||
31 | |||
32 | # Work around bugs in pre-3.0 UWIN ksh. | ||
33 | $as_unset ENV MAIL MAILPATH | ||
34 | PS1='$ ' | ||
35 | PS2='> ' | ||
36 | PS4='+ ' | ||
37 | |||
38 | # NLS nuisances. | ||
39 | for as_var in \ | ||
40 | LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ | ||
41 | LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ | ||
42 | LC_TELEPHONE LC_TIME | ||
43 | do | ||
44 | if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then | ||
45 | eval $as_var=C; export $as_var | ||
46 | else | ||
47 | $as_unset $as_var | ||
48 | fi | ||
49 | done | ||
50 | |||
51 | # Required to use basename. | ||
52 | if expr a : '\(a\)' >/dev/null 2>&1; then | ||
53 | as_expr=expr | ||
54 | else | ||
55 | as_expr=false | ||
56 | fi | ||
57 | |||
58 | if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then | ||
59 | as_basename=basename | ||
60 | else | ||
61 | as_basename=false | ||
62 | fi | ||
63 | |||
64 | |||
65 | # Name of the executable. | ||
66 | as_me=`$as_basename "$0" || | ||
67 | $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ | ||
68 | X"$0" : 'X\(//\)$' \| \ | ||
69 | X"$0" : 'X\(/\)$' \| \ | ||
70 | . : '\(.\)' 2>/dev/null || | ||
71 | echo X/"$0" | | ||
72 | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } | ||
73 | /^X\/\(\/\/\)$/{ s//\1/; q; } | ||
74 | /^X\/\(\/\).*/{ s//\1/; q; } | ||
75 | s/.*/./; q'` | ||
76 | |||
77 | |||
78 | # PATH needs CR, and LINENO needs CR and PATH. | ||
10 | # Avoid depending upon Character Ranges. | 79 | # Avoid depending upon Character Ranges. |
11 | as_cr_letters='abcdefghijklmnopqrstuvwxyz' | 80 | as_cr_letters='abcdefghijklmnopqrstuvwxyz' |
12 | as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' | 81 | as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' |
@@ -14,22 +83,113 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS | |||
14 | as_cr_digits='0123456789' | 83 | as_cr_digits='0123456789' |
15 | as_cr_alnum=$as_cr_Letters$as_cr_digits | 84 | as_cr_alnum=$as_cr_Letters$as_cr_digits |
16 | 85 | ||
17 | # Sed expression to map a string onto a valid variable name. | 86 | # The user is always right. |
18 | as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" | 87 | if test "${PATH_SEPARATOR+set}" != set; then |
88 | echo "#! /bin/sh" >conf$$.sh | ||
89 | echo "exit 0" >>conf$$.sh | ||
90 | chmod +x conf$$.sh | ||
91 | if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then | ||
92 | PATH_SEPARATOR=';' | ||
93 | else | ||
94 | PATH_SEPARATOR=: | ||
95 | fi | ||
96 | rm -f conf$$.sh | ||
97 | fi | ||
19 | 98 | ||
20 | # Sed expression to map a string onto a valid CPP name. | ||
21 | as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" | ||
22 | 99 | ||
23 | # Be Bourne compatible | 100 | as_lineno_1=$LINENO |
24 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | 101 | as_lineno_2=$LINENO |
25 | emulate sh | 102 | as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` |
26 | NULLCMD=: | 103 | test "x$as_lineno_1" != "x$as_lineno_2" && |
27 | elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then | 104 | test "x$as_lineno_3" = "x$as_lineno_2" || { |
28 | set -o posix | 105 | # Find who we are. Look in the path if we contain no path at all |
29 | fi | 106 | # relative or not. |
107 | case $0 in | ||
108 | *[\\/]* ) as_myself=$0 ;; | ||
109 | *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
110 | for as_dir in $PATH | ||
111 | do | ||
112 | IFS=$as_save_IFS | ||
113 | test -z "$as_dir" && as_dir=. | ||
114 | test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break | ||
115 | done | ||
116 | |||
117 | ;; | ||
118 | esac | ||
119 | # We did not find ourselves, most probably we were run as `sh COMMAND' | ||
120 | # in which case we are not to be found in the path. | ||
121 | if test "x$as_myself" = x; then | ||
122 | as_myself=$0 | ||
123 | fi | ||
124 | if test ! -f "$as_myself"; then | ||
125 | { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 | ||
126 | { (exit 1); exit 1; }; } | ||
127 | fi | ||
128 | case $CONFIG_SHELL in | ||
129 | '') | ||
130 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
131 | for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH | ||
132 | do | ||
133 | IFS=$as_save_IFS | ||
134 | test -z "$as_dir" && as_dir=. | ||
135 | for as_base in sh bash ksh sh5; do | ||
136 | case $as_dir in | ||
137 | /*) | ||
138 | if ("$as_dir/$as_base" -c ' | ||
139 | as_lineno_1=$LINENO | ||
140 | as_lineno_2=$LINENO | ||
141 | as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` | ||
142 | test "x$as_lineno_1" != "x$as_lineno_2" && | ||
143 | test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then | ||
144 | $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } | ||
145 | $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } | ||
146 | CONFIG_SHELL=$as_dir/$as_base | ||
147 | export CONFIG_SHELL | ||
148 | exec "$CONFIG_SHELL" "$0" ${1+"$@"} | ||
149 | fi;; | ||
150 | esac | ||
151 | done | ||
152 | done | ||
153 | ;; | ||
154 | esac | ||
155 | |||
156 | # Create $as_me.lineno as a copy of $as_myself, but with $LINENO | ||
157 | # uniformly replaced by the line number. The first 'sed' inserts a | ||
158 | # line-number line before each line; the second 'sed' does the real | ||
159 | # work. The second script uses 'N' to pair each line-number line | ||
160 | # with the numbered line, and appends trailing '-' during | ||
161 | # substitution so that $LINENO is not a special case at line end. | ||
162 | # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the | ||
163 | # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) | ||
164 | sed '=' <$as_myself | | ||
165 | sed ' | ||
166 | N | ||
167 | s,$,-, | ||
168 | : loop | ||
169 | s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, | ||
170 | t loop | ||
171 | s,-$,, | ||
172 | s,^['$as_cr_digits']*\n,, | ||
173 | ' >$as_me.lineno && | ||
174 | chmod +x $as_me.lineno || | ||
175 | { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 | ||
176 | { (exit 1); exit 1; }; } | ||
177 | |||
178 | # Don't try to exec as it changes $[0], causing all sort of problems | ||
179 | # (the dirname of $[0] is not the place where we might find the | ||
180 | # original and so on. Autoconf is especially sensible to this). | ||
181 | . ./$as_me.lineno | ||
182 | # Exit status is that of the last command. | ||
183 | exit | ||
184 | } | ||
30 | 185 | ||
31 | # Name of the executable. | 186 | |
32 | as_me=`echo "$0" |sed 's,.*[\\/],,'` | 187 | case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in |
188 | *c*,-n*) ECHO_N= ECHO_C=' | ||
189 | ' ECHO_T=' ' ;; | ||
190 | *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; | ||
191 | *) ECHO_N= ECHO_C='\c' ECHO_T= ;; | ||
192 | esac | ||
33 | 193 | ||
34 | if expr a : '\(a\)' >/dev/null 2>&1; then | 194 | if expr a : '\(a\)' >/dev/null 2>&1; then |
35 | as_expr=expr | 195 | as_expr=expr |
@@ -55,24 +215,21 @@ else | |||
55 | fi | 215 | fi |
56 | rm -f conf$$ conf$$.exe conf$$.file | 216 | rm -f conf$$ conf$$.exe conf$$.file |
57 | 217 | ||
58 | as_executable_p="test -f" | 218 | if mkdir -p . 2>/dev/null; then |
59 | 219 | as_mkdir_p=: | |
60 | # Support unset when possible. | ||
61 | if (FOO=FOO; unset FOO) >/dev/null 2>&1; then | ||
62 | as_unset=unset | ||
63 | else | 220 | else |
64 | as_unset=false | 221 | test -d ./-p && rmdir ./-p |
222 | as_mkdir_p=false | ||
65 | fi | 223 | fi |
66 | 224 | ||
67 | # NLS nuisances. | 225 | as_executable_p="test -f" |
68 | $as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } | 226 | |
69 | $as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } | 227 | # Sed expression to map a string onto a valid CPP name. |
70 | $as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } | 228 | as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" |
71 | $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } | 229 | |
72 | $as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } | 230 | # Sed expression to map a string onto a valid variable name. |
73 | $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } | 231 | as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" |
74 | $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } | 232 | |
75 | $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } | ||
76 | 233 | ||
77 | # IFS | 234 | # IFS |
78 | # We need space, tab and new line, in precisely that order. | 235 | # We need space, tab and new line, in precisely that order. |
@@ -81,7 +238,8 @@ as_nl=' | |||
81 | IFS=" $as_nl" | 238 | IFS=" $as_nl" |
82 | 239 | ||
83 | # CDPATH. | 240 | # CDPATH. |
84 | $as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } | 241 | $as_unset CDPATH |
242 | |||
85 | 243 | ||
86 | # Name of the host. | 244 | # Name of the host. |
87 | # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, | 245 | # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, |
@@ -94,9 +252,11 @@ exec 6>&1 | |||
94 | # Initializations. | 252 | # Initializations. |
95 | # | 253 | # |
96 | ac_default_prefix=/usr/local | 254 | ac_default_prefix=/usr/local |
255 | ac_config_libobj_dir=. | ||
97 | cross_compiling=no | 256 | cross_compiling=no |
98 | subdirs= | 257 | subdirs= |
99 | MFLAGS= MAKEFLAGS= | 258 | MFLAGS= |
259 | MAKEFLAGS= | ||
100 | SHELL=${CONFIG_SHELL-/bin/sh} | 260 | SHELL=${CONFIG_SHELL-/bin/sh} |
101 | 261 | ||
102 | # Maximum number of lines to put in a shell here document. | 262 | # Maximum number of lines to put in a shell here document. |
@@ -104,6 +264,13 @@ SHELL=${CONFIG_SHELL-/bin/sh} | |||
104 | # only ac_max_sed_lines should be used. | 264 | # only ac_max_sed_lines should be used. |
105 | : ${ac_max_here_lines=38} | 265 | : ${ac_max_here_lines=38} |
106 | 266 | ||
267 | # Identity of this package. | ||
268 | PACKAGE_NAME= | ||
269 | PACKAGE_TARNAME= | ||
270 | PACKAGE_VERSION= | ||
271 | PACKAGE_STRING= | ||
272 | PACKAGE_BUGREPORT= | ||
273 | |||
107 | ac_unique_file="ssh.c" | 274 | ac_unique_file="ssh.c" |
108 | # Factoring default headers for most tests. | 275 | # Factoring default headers for most tests. |
109 | ac_includes_default="\ | 276 | ac_includes_default="\ |
@@ -142,6 +309,9 @@ ac_includes_default="\ | |||
142 | # include <unistd.h> | 309 | # include <unistd.h> |
143 | #endif" | 310 | #endif" |
144 | 311 | ||
312 | ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os AWK CPP RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AR CAT KILL PERL SED ENT TEST_MINUS_S_SH SH TEST_SHELL PATH_GROUPADD_PROG PATH_USERADD_PROG MAKE_PACKAGE_SUPPORTED LOGIN_PROGRAM_FALLBACK PATH_PASSWD_PROG LD EGREP LIBWRAP LIBPAM INSTALL_SSH_RAND_HELPER SSH_PRIVSEP_USER PROG_LS PROG_NETSTAT PROG_ARP PROG_IFCONFIG PROG_JSTAT PROG_PS PROG_SAR PROG_W PROG_WHO PROG_LAST PROG_LASTLOG PROG_DF PROG_VMSTAT PROG_UPTIME PROG_IPCS PROG_TAIL INSTALL_SSH_PRNG_CMDS OPENSC_CONFIG PRIVSEP_PATH xauth_path STRIP_OPT XAUTH_PATH NROFF MANTYPE mansubdir user_path piddir LIBOBJS LTLIBOBJS' | ||
313 | ac_subst_files='' | ||
314 | |||
145 | # Initialize some variables set by options. | 315 | # Initialize some variables set by options. |
146 | ac_init_help= | 316 | ac_init_help= |
147 | ac_init_version=false | 317 | ac_init_version=false |
@@ -180,13 +350,6 @@ oldincludedir='/usr/include' | |||
180 | infodir='${prefix}/info' | 350 | infodir='${prefix}/info' |
181 | mandir='${prefix}/man' | 351 | mandir='${prefix}/man' |
182 | 352 | ||
183 | # Identity of this package. | ||
184 | PACKAGE_NAME= | ||
185 | PACKAGE_TARNAME= | ||
186 | PACKAGE_VERSION= | ||
187 | PACKAGE_STRING= | ||
188 | PACKAGE_BUGREPORT= | ||
189 | |||
190 | ac_prev= | 353 | ac_prev= |
191 | for ac_option | 354 | for ac_option |
192 | do | 355 | do |
@@ -319,7 +482,7 @@ do | |||
319 | with_fp=no ;; | 482 | with_fp=no ;; |
320 | 483 | ||
321 | -no-create | --no-create | --no-creat | --no-crea | --no-cre \ | 484 | -no-create | --no-create | --no-creat | --no-crea | --no-cre \ |
322 | | --no-cr | --no-c) | 485 | | --no-cr | --no-c | -n) |
323 | no_create=yes ;; | 486 | no_create=yes ;; |
324 | 487 | ||
325 | -no-recursion | --no-recursion | --no-recursio | --no-recursi \ | 488 | -no-recursion | --no-recursion | --no-recursio | --no-recursi \ |
@@ -498,30 +661,31 @@ do | |||
498 | eval ac_val=$`echo $ac_var` | 661 | eval ac_val=$`echo $ac_var` |
499 | case $ac_val in | 662 | case $ac_val in |
500 | [\\/$]* | ?:[\\/]* | NONE | '' ) ;; | 663 | [\\/$]* | ?:[\\/]* | NONE | '' ) ;; |
501 | *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 | 664 | *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 |
502 | { (exit 1); exit 1; }; };; | 665 | { (exit 1); exit 1; }; };; |
503 | esac | 666 | esac |
504 | done | 667 | done |
505 | 668 | ||
506 | # Be sure to have absolute paths. | 669 | # Be sure to have absolute paths. |
507 | for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ | 670 | for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ |
508 | localstatedir libdir includedir oldincludedir infodir mandir | 671 | localstatedir libdir includedir oldincludedir infodir mandir |
509 | do | 672 | do |
510 | eval ac_val=$`echo $ac_var` | 673 | eval ac_val=$`echo $ac_var` |
511 | case $ac_val in | 674 | case $ac_val in |
512 | [\\/$]* | ?:[\\/]* ) ;; | 675 | [\\/$]* | ?:[\\/]* ) ;; |
513 | *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 | 676 | *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 |
514 | { (exit 1); exit 1; }; };; | 677 | { (exit 1); exit 1; }; };; |
515 | esac | 678 | esac |
516 | done | 679 | done |
517 | 680 | ||
518 | # There might be people who depend on the old broken behavior: `$host' | 681 | # There might be people who depend on the old broken behavior: `$host' |
519 | # used to hold the argument of --host etc. | 682 | # used to hold the argument of --host etc. |
683 | # FIXME: To remove some day. | ||
520 | build=$build_alias | 684 | build=$build_alias |
521 | host=$host_alias | 685 | host=$host_alias |
522 | target=$target_alias | 686 | target=$target_alias |
523 | 687 | ||
524 | # FIXME: should be removed in autoconf 3.0. | 688 | # FIXME: To remove some day. |
525 | if test "x$host_alias" != x; then | 689 | if test "x$host_alias" != x; then |
526 | if test "x$build_alias" = x; then | 690 | if test "x$build_alias" = x; then |
527 | cross_compiling=maybe | 691 | cross_compiling=maybe |
@@ -537,13 +701,23 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias- | |||
537 | 701 | ||
538 | test "$silent" = yes && exec 6>/dev/null | 702 | test "$silent" = yes && exec 6>/dev/null |
539 | 703 | ||
704 | |||
540 | # Find the source files, if location was not specified. | 705 | # Find the source files, if location was not specified. |
541 | if test -z "$srcdir"; then | 706 | if test -z "$srcdir"; then |
542 | ac_srcdir_defaulted=yes | 707 | ac_srcdir_defaulted=yes |
543 | # Try the directory containing this script, then its parent. | 708 | # Try the directory containing this script, then its parent. |
544 | ac_prog=$0 | 709 | ac_confdir=`(dirname "$0") 2>/dev/null || |
545 | ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'` | 710 | $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
546 | test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. | 711 | X"$0" : 'X\(//\)[^/]' \| \ |
712 | X"$0" : 'X\(//\)$' \| \ | ||
713 | X"$0" : 'X\(/\)' \| \ | ||
714 | . : '\(.\)' 2>/dev/null || | ||
715 | echo X"$0" | | ||
716 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
717 | /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
718 | /^X\(\/\/\)$/{ s//\1/; q; } | ||
719 | /^X\(\/\).*/{ s//\1/; q; } | ||
720 | s/.*/./; q'` | ||
547 | srcdir=$ac_confdir | 721 | srcdir=$ac_confdir |
548 | if test ! -r $srcdir/$ac_unique_file; then | 722 | if test ! -r $srcdir/$ac_unique_file; then |
549 | srcdir=.. | 723 | srcdir=.. |
@@ -553,13 +727,16 @@ else | |||
553 | fi | 727 | fi |
554 | if test ! -r $srcdir/$ac_unique_file; then | 728 | if test ! -r $srcdir/$ac_unique_file; then |
555 | if test "$ac_srcdir_defaulted" = yes; then | 729 | if test "$ac_srcdir_defaulted" = yes; then |
556 | { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2 | 730 | { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 |
557 | { (exit 1); exit 1; }; } | 731 | { (exit 1); exit 1; }; } |
558 | else | 732 | else |
559 | { echo "$as_me: error: cannot find sources in $srcdir" >&2 | 733 | { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 |
560 | { (exit 1); exit 1; }; } | 734 | { (exit 1); exit 1; }; } |
561 | fi | 735 | fi |
562 | fi | 736 | fi |
737 | (cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || | ||
738 | { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 | ||
739 | { (exit 1); exit 1; }; } | ||
563 | srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` | 740 | srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` |
564 | ac_env_build_alias_set=${build_alias+set} | 741 | ac_env_build_alias_set=${build_alias+set} |
565 | ac_env_build_alias_value=$build_alias | 742 | ac_env_build_alias_value=$build_alias |
@@ -600,7 +777,7 @@ ac_cv_env_CPP_value=$CPP | |||
600 | if test "$ac_init_help" = "long"; then | 777 | if test "$ac_init_help" = "long"; then |
601 | # Omit some internal or obsolete options to make the list less imposing. | 778 | # Omit some internal or obsolete options to make the list less imposing. |
602 | # This message is too long to be a string in the A/UX 3.1 sh. | 779 | # This message is too long to be a string in the A/UX 3.1 sh. |
603 | cat <<EOF | 780 | cat <<_ACEOF |
604 | \`configure' configures this package to adapt to many kinds of systems. | 781 | \`configure' configures this package to adapt to many kinds of systems. |
605 | 782 | ||
606 | Usage: $0 [OPTION]... [VAR=VALUE]... | 783 | Usage: $0 [OPTION]... [VAR=VALUE]... |
@@ -621,14 +798,14 @@ Configuration: | |||
621 | -n, --no-create do not create output files | 798 | -n, --no-create do not create output files |
622 | --srcdir=DIR find the sources in DIR [configure dir or \`..'] | 799 | --srcdir=DIR find the sources in DIR [configure dir or \`..'] |
623 | 800 | ||
624 | EOF | 801 | _ACEOF |
625 | 802 | ||
626 | cat <<EOF | 803 | cat <<_ACEOF |
627 | Installation directories: | 804 | Installation directories: |
628 | --prefix=PREFIX install architecture-independent files in PREFIX | 805 | --prefix=PREFIX install architecture-independent files in PREFIX |
629 | [$ac_default_prefix] | 806 | [$ac_default_prefix] |
630 | --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX | 807 | --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX |
631 | [PREFIX] | 808 | [PREFIX] |
632 | 809 | ||
633 | By default, \`make install' will install all the files in | 810 | By default, \`make install' will install all the files in |
634 | \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify | 811 | \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify |
@@ -650,19 +827,19 @@ Fine tuning of the installation directories: | |||
650 | --oldincludedir=DIR C header files for non-gcc [/usr/include] | 827 | --oldincludedir=DIR C header files for non-gcc [/usr/include] |
651 | --infodir=DIR info documentation [PREFIX/info] | 828 | --infodir=DIR info documentation [PREFIX/info] |
652 | --mandir=DIR man documentation [PREFIX/man] | 829 | --mandir=DIR man documentation [PREFIX/man] |
653 | EOF | 830 | _ACEOF |
654 | 831 | ||
655 | cat <<\EOF | 832 | cat <<\_ACEOF |
656 | 833 | ||
657 | System types: | 834 | System types: |
658 | --build=BUILD configure for building on BUILD [guessed] | 835 | --build=BUILD configure for building on BUILD [guessed] |
659 | --host=HOST build programs to run on HOST [BUILD] | 836 | --host=HOST cross-compile to build programs to run on HOST [BUILD] |
660 | EOF | 837 | _ACEOF |
661 | fi | 838 | fi |
662 | 839 | ||
663 | if test -n "$ac_init_help"; then | 840 | if test -n "$ac_init_help"; then |
664 | 841 | ||
665 | cat <<\EOF | 842 | cat <<\_ACEOF |
666 | 843 | ||
667 | Optional Features: | 844 | Optional Features: |
668 | --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) | 845 | --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) |
@@ -729,40 +906,93 @@ Some influential environment variables: | |||
729 | Use these variables to override the choices made by `configure' or to help | 906 | Use these variables to override the choices made by `configure' or to help |
730 | it to find libraries and programs with nonstandard names/locations. | 907 | it to find libraries and programs with nonstandard names/locations. |
731 | 908 | ||
732 | EOF | 909 | _ACEOF |
733 | fi | 910 | fi |
734 | 911 | ||
735 | if test "$ac_init_help" = "recursive"; then | 912 | if test "$ac_init_help" = "recursive"; then |
736 | # If there are subdirs, report their specific --help. | 913 | # If there are subdirs, report their specific --help. |
737 | ac_popdir=`pwd` | 914 | ac_popdir=`pwd` |
738 | for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue | 915 | for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue |
739 | cd $ac_subdir | 916 | test -d $ac_dir || continue |
740 | # A "../" for each directory in /$ac_subdir. | 917 | ac_builddir=. |
741 | ac_dots=`echo $ac_subdir | | ||
742 | sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'` | ||
743 | |||
744 | case $srcdir in | ||
745 | .) # No --srcdir option. We are building in place. | ||
746 | ac_sub_srcdir=$srcdir ;; | ||
747 | [\\/]* | ?:[\\/]* ) # Absolute path. | ||
748 | ac_sub_srcdir=$srcdir/$ac_subdir ;; | ||
749 | *) # Relative path. | ||
750 | ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;; | ||
751 | esac | ||
752 | 918 | ||
919 | if test "$ac_dir" != .; then | ||
920 | ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` | ||
921 | # A "../" for each directory in $ac_dir_suffix. | ||
922 | ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` | ||
923 | else | ||
924 | ac_dir_suffix= ac_top_builddir= | ||
925 | fi | ||
926 | |||
927 | case $srcdir in | ||
928 | .) # No --srcdir option. We are building in place. | ||
929 | ac_srcdir=. | ||
930 | if test -z "$ac_top_builddir"; then | ||
931 | ac_top_srcdir=. | ||
932 | else | ||
933 | ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` | ||
934 | fi ;; | ||
935 | [\\/]* | ?:[\\/]* ) # Absolute path. | ||
936 | ac_srcdir=$srcdir$ac_dir_suffix; | ||
937 | ac_top_srcdir=$srcdir ;; | ||
938 | *) # Relative path. | ||
939 | ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix | ||
940 | ac_top_srcdir=$ac_top_builddir$srcdir ;; | ||
941 | esac | ||
942 | |||
943 | # Do not use `cd foo && pwd` to compute absolute paths, because | ||
944 | # the directories may not exist. | ||
945 | case `pwd` in | ||
946 | .) ac_abs_builddir="$ac_dir";; | ||
947 | *) | ||
948 | case "$ac_dir" in | ||
949 | .) ac_abs_builddir=`pwd`;; | ||
950 | [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; | ||
951 | *) ac_abs_builddir=`pwd`/"$ac_dir";; | ||
952 | esac;; | ||
953 | esac | ||
954 | case $ac_abs_builddir in | ||
955 | .) ac_abs_top_builddir=${ac_top_builddir}.;; | ||
956 | *) | ||
957 | case ${ac_top_builddir}. in | ||
958 | .) ac_abs_top_builddir=$ac_abs_builddir;; | ||
959 | [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; | ||
960 | *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; | ||
961 | esac;; | ||
962 | esac | ||
963 | case $ac_abs_builddir in | ||
964 | .) ac_abs_srcdir=$ac_srcdir;; | ||
965 | *) | ||
966 | case $ac_srcdir in | ||
967 | .) ac_abs_srcdir=$ac_abs_builddir;; | ||
968 | [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; | ||
969 | *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; | ||
970 | esac;; | ||
971 | esac | ||
972 | case $ac_abs_builddir in | ||
973 | .) ac_abs_top_srcdir=$ac_top_srcdir;; | ||
974 | *) | ||
975 | case $ac_top_srcdir in | ||
976 | .) ac_abs_top_srcdir=$ac_abs_builddir;; | ||
977 | [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; | ||
978 | *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; | ||
979 | esac;; | ||
980 | esac | ||
981 | |||
982 | cd $ac_dir | ||
753 | # Check for guested configure; otherwise get Cygnus style configure. | 983 | # Check for guested configure; otherwise get Cygnus style configure. |
754 | if test -f $ac_sub_srcdir/configure.gnu; then | 984 | if test -f $ac_srcdir/configure.gnu; then |
755 | echo | 985 | echo |
756 | $SHELL $ac_sub_srcdir/configure.gnu --help=recursive | 986 | $SHELL $ac_srcdir/configure.gnu --help=recursive |
757 | elif test -f $ac_sub_srcdir/configure; then | 987 | elif test -f $ac_srcdir/configure; then |
758 | echo | 988 | echo |
759 | $SHELL $ac_sub_srcdir/configure --help=recursive | 989 | $SHELL $ac_srcdir/configure --help=recursive |
760 | elif test -f $ac_sub_srcdir/configure.ac || | 990 | elif test -f $ac_srcdir/configure.ac || |
761 | test -f $ac_sub_srcdir/configure.in; then | 991 | test -f $ac_srcdir/configure.in; then |
762 | echo | 992 | echo |
763 | $ac_configure --help | 993 | $ac_configure --help |
764 | else | 994 | else |
765 | echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2 | 995 | echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 |
766 | fi | 996 | fi |
767 | cd $ac_popdir | 997 | cd $ac_popdir |
768 | done | 998 | done |
@@ -770,31 +1000,30 @@ fi | |||
770 | 1000 | ||
771 | test -n "$ac_init_help" && exit 0 | 1001 | test -n "$ac_init_help" && exit 0 |
772 | if $ac_init_version; then | 1002 | if $ac_init_version; then |
773 | cat <<\EOF | 1003 | cat <<\_ACEOF |
774 | 1004 | ||
775 | Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 | 1005 | Copyright (C) 2003 Free Software Foundation, Inc. |
776 | Free Software Foundation, Inc. | ||
777 | This configure script is free software; the Free Software Foundation | 1006 | This configure script is free software; the Free Software Foundation |
778 | gives unlimited permission to copy, distribute and modify it. | 1007 | gives unlimited permission to copy, distribute and modify it. |
779 | EOF | 1008 | _ACEOF |
780 | exit 0 | 1009 | exit 0 |
781 | fi | 1010 | fi |
782 | exec 5>config.log | 1011 | exec 5>config.log |
783 | cat >&5 <<EOF | 1012 | cat >&5 <<_ACEOF |
784 | This file contains any messages produced by compilers while | 1013 | This file contains any messages produced by compilers while |
785 | running configure, to aid debugging if configure makes a mistake. | 1014 | running configure, to aid debugging if configure makes a mistake. |
786 | 1015 | ||
787 | It was created by $as_me, which was | 1016 | It was created by $as_me, which was |
788 | generated by GNU Autoconf 2.52. Invocation command line was | 1017 | generated by GNU Autoconf 2.59. Invocation command line was |
789 | 1018 | ||
790 | $ $0 $@ | 1019 | $ $0 $@ |
791 | 1020 | ||
792 | EOF | 1021 | _ACEOF |
793 | { | 1022 | { |
794 | cat <<_ASUNAME | 1023 | cat <<_ASUNAME |
795 | ## ---------- ## | 1024 | ## --------- ## |
796 | ## Platform. ## | 1025 | ## Platform. ## |
797 | ## ---------- ## | 1026 | ## --------- ## |
798 | 1027 | ||
799 | hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` | 1028 | hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` |
800 | uname -m = `(uname -m) 2>/dev/null || echo unknown` | 1029 | uname -m = `(uname -m) 2>/dev/null || echo unknown` |
@@ -813,79 +1042,156 @@ hostinfo = `(hostinfo) 2>/dev/null || echo unknown` | |||
813 | /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` | 1042 | /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` |
814 | /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` | 1043 | /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` |
815 | 1044 | ||
816 | PATH = $PATH | ||
817 | |||
818 | _ASUNAME | 1045 | _ASUNAME |
1046 | |||
1047 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
1048 | for as_dir in $PATH | ||
1049 | do | ||
1050 | IFS=$as_save_IFS | ||
1051 | test -z "$as_dir" && as_dir=. | ||
1052 | echo "PATH: $as_dir" | ||
1053 | done | ||
1054 | |||
819 | } >&5 | 1055 | } >&5 |
820 | 1056 | ||
821 | cat >&5 <<EOF | 1057 | cat >&5 <<_ACEOF |
822 | ## ------------ ## | 1058 | |
823 | ## Core tests. ## | 1059 | |
824 | ## ------------ ## | 1060 | ## ----------- ## |
1061 | ## Core tests. ## | ||
1062 | ## ----------- ## | ||
1063 | |||
1064 | _ACEOF | ||
825 | 1065 | ||
826 | EOF | ||
827 | 1066 | ||
828 | # Keep a trace of the command line. | 1067 | # Keep a trace of the command line. |
829 | # Strip out --no-create and --no-recursion so they do not pile up. | 1068 | # Strip out --no-create and --no-recursion so they do not pile up. |
1069 | # Strip out --silent because we don't want to record it for future runs. | ||
830 | # Also quote any args containing shell meta-characters. | 1070 | # Also quote any args containing shell meta-characters. |
1071 | # Make two passes to allow for proper duplicate-argument suppression. | ||
831 | ac_configure_args= | 1072 | ac_configure_args= |
1073 | ac_configure_args0= | ||
1074 | ac_configure_args1= | ||
832 | ac_sep= | 1075 | ac_sep= |
833 | for ac_arg | 1076 | ac_must_keep_next=false |
1077 | for ac_pass in 1 2 | ||
834 | do | 1078 | do |
835 | case $ac_arg in | 1079 | for ac_arg |
836 | -no-create | --no-create | --no-creat | --no-crea | --no-cre \ | 1080 | do |
837 | | --no-cr | --no-c) ;; | 1081 | case $ac_arg in |
838 | -no-recursion | --no-recursion | --no-recursio | --no-recursi \ | 1082 | -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; |
839 | | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; | 1083 | -q | -quiet | --quiet | --quie | --qui | --qu | --q \ |
840 | *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) | 1084 | | -silent | --silent | --silen | --sile | --sil) |
841 | ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` | 1085 | continue ;; |
842 | ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" | 1086 | *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) |
843 | ac_sep=" " ;; | 1087 | ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; |
844 | *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg" | 1088 | esac |
845 | ac_sep=" " ;; | 1089 | case $ac_pass in |
846 | esac | 1090 | 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; |
847 | # Get rid of the leading space. | 1091 | 2) |
1092 | ac_configure_args1="$ac_configure_args1 '$ac_arg'" | ||
1093 | if test $ac_must_keep_next = true; then | ||
1094 | ac_must_keep_next=false # Got value, back to normal. | ||
1095 | else | ||
1096 | case $ac_arg in | ||
1097 | *=* | --config-cache | -C | -disable-* | --disable-* \ | ||
1098 | | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ | ||
1099 | | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ | ||
1100 | | -with-* | --with-* | -without-* | --without-* | --x) | ||
1101 | case "$ac_configure_args0 " in | ||
1102 | "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; | ||
1103 | esac | ||
1104 | ;; | ||
1105 | -* ) ac_must_keep_next=true ;; | ||
1106 | esac | ||
1107 | fi | ||
1108 | ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" | ||
1109 | # Get rid of the leading space. | ||
1110 | ac_sep=" " | ||
1111 | ;; | ||
1112 | esac | ||
1113 | done | ||
848 | done | 1114 | done |
1115 | $as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } | ||
1116 | $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } | ||
849 | 1117 | ||
850 | # When interrupted or exit'd, cleanup temporary files, and complete | 1118 | # When interrupted or exit'd, cleanup temporary files, and complete |
851 | # config.log. We remove comments because anyway the quotes in there | 1119 | # config.log. We remove comments because anyway the quotes in there |
852 | # would cause problems or look ugly. | 1120 | # would cause problems or look ugly. |
1121 | # WARNING: Be sure not to use single quotes in there, as some shells, | ||
1122 | # such as our DU 5.0 friend, will then `close' the trap. | ||
853 | trap 'exit_status=$? | 1123 | trap 'exit_status=$? |
854 | # Save into config.log some information that might help in debugging. | 1124 | # Save into config.log some information that might help in debugging. |
855 | echo >&5 | 1125 | { |
856 | echo "## ----------------- ##" >&5 | 1126 | echo |
857 | echo "## Cache variables. ##" >&5 | 1127 | |
858 | echo "## ----------------- ##" >&5 | 1128 | cat <<\_ASBOX |
859 | echo >&5 | 1129 | ## ---------------- ## |
860 | # The following way of writing the cache mishandles newlines in values, | 1130 | ## Cache variables. ## |
1131 | ## ---------------- ## | ||
1132 | _ASBOX | ||
1133 | echo | ||
1134 | # The following way of writing the cache mishandles newlines in values, | ||
861 | { | 1135 | { |
862 | (set) 2>&1 | | 1136 | (set) 2>&1 | |
863 | case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in | 1137 | case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in |
864 | *ac_space=\ *) | 1138 | *ac_space=\ *) |
865 | sed -n \ | 1139 | sed -n \ |
866 | "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; | 1140 | "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; |
867 | s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" | 1141 | s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" |
868 | ;; | 1142 | ;; |
869 | *) | 1143 | *) |
870 | sed -n \ | 1144 | sed -n \ |
871 | "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" | 1145 | "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" |
872 | ;; | 1146 | ;; |
873 | esac; | 1147 | esac; |
874 | } >&5 | 1148 | } |
875 | sed "/^$/d" confdefs.h >conftest.log | 1149 | echo |
876 | if test -s conftest.log; then | 1150 | |
877 | echo >&5 | 1151 | cat <<\_ASBOX |
878 | echo "## ------------ ##" >&5 | 1152 | ## ----------------- ## |
879 | echo "## confdefs.h. ##" >&5 | 1153 | ## Output variables. ## |
880 | echo "## ------------ ##" >&5 | 1154 | ## ----------------- ## |
881 | echo >&5 | 1155 | _ASBOX |
882 | cat conftest.log >&5 | 1156 | echo |
883 | fi | 1157 | for ac_var in $ac_subst_vars |
884 | (echo; echo) >&5 | 1158 | do |
885 | test "$ac_signal" != 0 && | 1159 | eval ac_val=$`echo $ac_var` |
886 | echo "$as_me: caught signal $ac_signal" >&5 | 1160 | echo "$ac_var='"'"'$ac_val'"'"'" |
887 | echo "$as_me: exit $exit_status" >&5 | 1161 | done | sort |
888 | rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files && | 1162 | echo |
1163 | |||
1164 | if test -n "$ac_subst_files"; then | ||
1165 | cat <<\_ASBOX | ||
1166 | ## ------------- ## | ||
1167 | ## Output files. ## | ||
1168 | ## ------------- ## | ||
1169 | _ASBOX | ||
1170 | echo | ||
1171 | for ac_var in $ac_subst_files | ||
1172 | do | ||
1173 | eval ac_val=$`echo $ac_var` | ||
1174 | echo "$ac_var='"'"'$ac_val'"'"'" | ||
1175 | done | sort | ||
1176 | echo | ||
1177 | fi | ||
1178 | |||
1179 | if test -s confdefs.h; then | ||
1180 | cat <<\_ASBOX | ||
1181 | ## ----------- ## | ||
1182 | ## confdefs.h. ## | ||
1183 | ## ----------- ## | ||
1184 | _ASBOX | ||
1185 | echo | ||
1186 | sed "/^$/d" confdefs.h | sort | ||
1187 | echo | ||
1188 | fi | ||
1189 | test "$ac_signal" != 0 && | ||
1190 | echo "$as_me: caught signal $ac_signal" | ||
1191 | echo "$as_me: exit $exit_status" | ||
1192 | } >&5 | ||
1193 | rm -f core *.core && | ||
1194 | rm -rf conftest* confdefs* conf$$* $ac_clean_files && | ||
889 | exit $exit_status | 1195 | exit $exit_status |
890 | ' 0 | 1196 | ' 0 |
891 | for ac_signal in 1 2 13 15; do | 1197 | for ac_signal in 1 2 13 15; do |
@@ -898,6 +1204,33 @@ rm -rf conftest* confdefs.h | |||
898 | # AIX cpp loses on an empty file, so make sure it contains at least a newline. | 1204 | # AIX cpp loses on an empty file, so make sure it contains at least a newline. |
899 | echo >confdefs.h | 1205 | echo >confdefs.h |
900 | 1206 | ||
1207 | # Predefined preprocessor variables. | ||
1208 | |||
1209 | cat >>confdefs.h <<_ACEOF | ||
1210 | #define PACKAGE_NAME "$PACKAGE_NAME" | ||
1211 | _ACEOF | ||
1212 | |||
1213 | |||
1214 | cat >>confdefs.h <<_ACEOF | ||
1215 | #define PACKAGE_TARNAME "$PACKAGE_TARNAME" | ||
1216 | _ACEOF | ||
1217 | |||
1218 | |||
1219 | cat >>confdefs.h <<_ACEOF | ||
1220 | #define PACKAGE_VERSION "$PACKAGE_VERSION" | ||
1221 | _ACEOF | ||
1222 | |||
1223 | |||
1224 | cat >>confdefs.h <<_ACEOF | ||
1225 | #define PACKAGE_STRING "$PACKAGE_STRING" | ||
1226 | _ACEOF | ||
1227 | |||
1228 | |||
1229 | cat >>confdefs.h <<_ACEOF | ||
1230 | #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" | ||
1231 | _ACEOF | ||
1232 | |||
1233 | |||
901 | # Let the site file select an alternate cache file if it wants to. | 1234 | # Let the site file select an alternate cache file if it wants to. |
902 | # Prefer explicitly selected file to automatically selected ones. | 1235 | # Prefer explicitly selected file to automatically selected ones. |
903 | if test -z "$CONFIG_SITE"; then | 1236 | if test -z "$CONFIG_SITE"; then |
@@ -909,9 +1242,9 @@ if test -z "$CONFIG_SITE"; then | |||
909 | fi | 1242 | fi |
910 | for ac_site_file in $CONFIG_SITE; do | 1243 | for ac_site_file in $CONFIG_SITE; do |
911 | if test -r "$ac_site_file"; then | 1244 | if test -r "$ac_site_file"; then |
912 | { echo "$as_me:912: loading site script $ac_site_file" >&5 | 1245 | { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 |
913 | echo "$as_me: loading site script $ac_site_file" >&6;} | 1246 | echo "$as_me: loading site script $ac_site_file" >&6;} |
914 | cat "$ac_site_file" >&5 | 1247 | sed 's/^/| /' "$ac_site_file" >&5 |
915 | . "$ac_site_file" | 1248 | . "$ac_site_file" |
916 | fi | 1249 | fi |
917 | done | 1250 | done |
@@ -920,7 +1253,7 @@ if test -r "$cache_file"; then | |||
920 | # Some versions of bash will fail to source /dev/null (special | 1253 | # Some versions of bash will fail to source /dev/null (special |
921 | # files actually), so we avoid doing that. | 1254 | # files actually), so we avoid doing that. |
922 | if test -f "$cache_file"; then | 1255 | if test -f "$cache_file"; then |
923 | { echo "$as_me:923: loading cache $cache_file" >&5 | 1256 | { echo "$as_me:$LINENO: loading cache $cache_file" >&5 |
924 | echo "$as_me: loading cache $cache_file" >&6;} | 1257 | echo "$as_me: loading cache $cache_file" >&6;} |
925 | case $cache_file in | 1258 | case $cache_file in |
926 | [\\/]* | ?:[\\/]* ) . $cache_file;; | 1259 | [\\/]* | ?:[\\/]* ) . $cache_file;; |
@@ -928,7 +1261,7 @@ echo "$as_me: loading cache $cache_file" >&6;} | |||
928 | esac | 1261 | esac |
929 | fi | 1262 | fi |
930 | else | 1263 | else |
931 | { echo "$as_me:931: creating cache $cache_file" >&5 | 1264 | { echo "$as_me:$LINENO: creating cache $cache_file" >&5 |
932 | echo "$as_me: creating cache $cache_file" >&6;} | 1265 | echo "$as_me: creating cache $cache_file" >&6;} |
933 | >$cache_file | 1266 | >$cache_file |
934 | fi | 1267 | fi |
@@ -937,49 +1270,49 @@ fi | |||
937 | # value. | 1270 | # value. |
938 | ac_cache_corrupted=false | 1271 | ac_cache_corrupted=false |
939 | for ac_var in `(set) 2>&1 | | 1272 | for ac_var in `(set) 2>&1 | |
940 | sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do | 1273 | sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do |
941 | eval ac_old_set=\$ac_cv_env_${ac_var}_set | 1274 | eval ac_old_set=\$ac_cv_env_${ac_var}_set |
942 | eval ac_new_set=\$ac_env_${ac_var}_set | 1275 | eval ac_new_set=\$ac_env_${ac_var}_set |
943 | eval ac_old_val="\$ac_cv_env_${ac_var}_value" | 1276 | eval ac_old_val="\$ac_cv_env_${ac_var}_value" |
944 | eval ac_new_val="\$ac_env_${ac_var}_value" | 1277 | eval ac_new_val="\$ac_env_${ac_var}_value" |
945 | case $ac_old_set,$ac_new_set in | 1278 | case $ac_old_set,$ac_new_set in |
946 | set,) | 1279 | set,) |
947 | { echo "$as_me:947: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 | 1280 | { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 |
948 | echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} | 1281 | echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} |
949 | ac_cache_corrupted=: ;; | 1282 | ac_cache_corrupted=: ;; |
950 | ,set) | 1283 | ,set) |
951 | { echo "$as_me:951: error: \`$ac_var' was not set in the previous run" >&5 | 1284 | { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 |
952 | echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} | 1285 | echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} |
953 | ac_cache_corrupted=: ;; | 1286 | ac_cache_corrupted=: ;; |
954 | ,);; | 1287 | ,);; |
955 | *) | 1288 | *) |
956 | if test "x$ac_old_val" != "x$ac_new_val"; then | 1289 | if test "x$ac_old_val" != "x$ac_new_val"; then |
957 | { echo "$as_me:957: error: \`$ac_var' has changed since the previous run:" >&5 | 1290 | { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 |
958 | echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} | 1291 | echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} |
959 | { echo "$as_me:959: former value: $ac_old_val" >&5 | 1292 | { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 |
960 | echo "$as_me: former value: $ac_old_val" >&2;} | 1293 | echo "$as_me: former value: $ac_old_val" >&2;} |
961 | { echo "$as_me:961: current value: $ac_new_val" >&5 | 1294 | { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 |
962 | echo "$as_me: current value: $ac_new_val" >&2;} | 1295 | echo "$as_me: current value: $ac_new_val" >&2;} |
963 | ac_cache_corrupted=: | 1296 | ac_cache_corrupted=: |
964 | fi;; | 1297 | fi;; |
965 | esac | 1298 | esac |
966 | # Pass precious variables to config.status. It doesn't matter if | 1299 | # Pass precious variables to config.status. |
967 | # we pass some twice (in addition to the command line arguments). | ||
968 | if test "$ac_new_set" = set; then | 1300 | if test "$ac_new_set" = set; then |
969 | case $ac_new_val in | 1301 | case $ac_new_val in |
970 | *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) | 1302 | *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) |
971 | ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` | 1303 | ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; |
972 | ac_configure_args="$ac_configure_args '$ac_arg'" | 1304 | *) ac_arg=$ac_var=$ac_new_val ;; |
973 | ;; | 1305 | esac |
974 | *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val" | 1306 | case " $ac_configure_args " in |
975 | ;; | 1307 | *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. |
1308 | *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; | ||
976 | esac | 1309 | esac |
977 | fi | 1310 | fi |
978 | done | 1311 | done |
979 | if $ac_cache_corrupted; then | 1312 | if $ac_cache_corrupted; then |
980 | { echo "$as_me:980: error: changes in the environment can compromise the build" >&5 | 1313 | { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 |
981 | echo "$as_me: error: changes in the environment can compromise the build" >&2;} | 1314 | echo "$as_me: error: changes in the environment can compromise the build" >&2;} |
982 | { { echo "$as_me:982: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 | 1315 | { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 |
983 | echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} | 1316 | echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} |
984 | { (exit 1); exit 1; }; } | 1317 | { (exit 1); exit 1; }; } |
985 | fi | 1318 | fi |
@@ -990,28 +1323,27 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | |||
990 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | 1323 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
991 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | 1324 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
992 | 1325 | ||
993 | case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in | ||
994 | *c*,-n*) ECHO_N= ECHO_C=' | ||
995 | ' ECHO_T=' ' ;; | ||
996 | *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; | ||
997 | *) ECHO_N= ECHO_C='\c' ECHO_T= ;; | ||
998 | esac | ||
999 | echo "#! $SHELL" >conftest.sh | ||
1000 | echo "exit 0" >>conftest.sh | ||
1001 | chmod +x conftest.sh | ||
1002 | if { (echo "$as_me:1002: PATH=\".;.\"; conftest.sh") >&5 | ||
1003 | (PATH=".;."; conftest.sh) 2>&5 | ||
1004 | ac_status=$? | ||
1005 | echo "$as_me:1005: \$? = $ac_status" >&5 | ||
1006 | (exit $ac_status); }; then | ||
1007 | ac_path_separator=';' | ||
1008 | else | ||
1009 | ac_path_separator=: | ||
1010 | fi | ||
1011 | PATH_SEPARATOR="$ac_path_separator" | ||
1012 | rm -f conftest.sh | ||
1013 | 1326 | ||
1014 | ac_config_headers="$ac_config_headers config.h" | 1327 | |
1328 | |||
1329 | |||
1330 | |||
1331 | |||
1332 | |||
1333 | |||
1334 | |||
1335 | |||
1336 | |||
1337 | |||
1338 | |||
1339 | |||
1340 | |||
1341 | |||
1342 | |||
1343 | |||
1344 | |||
1345 | |||
1346 | ac_config_headers="$ac_config_headers config.h" | ||
1015 | 1347 | ||
1016 | ac_ext=c | 1348 | ac_ext=c |
1017 | ac_cpp='$CPP $CPPFLAGS' | 1349 | ac_cpp='$CPP $CPPFLAGS' |
@@ -1021,7 +1353,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu | |||
1021 | if test -n "$ac_tool_prefix"; then | 1353 | if test -n "$ac_tool_prefix"; then |
1022 | # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. | 1354 | # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. |
1023 | set dummy ${ac_tool_prefix}gcc; ac_word=$2 | 1355 | set dummy ${ac_tool_prefix}gcc; ac_word=$2 |
1024 | echo "$as_me:1024: checking for $ac_word" >&5 | 1356 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
1025 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 1357 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
1026 | if test "${ac_cv_prog_CC+set}" = set; then | 1358 | if test "${ac_cv_prog_CC+set}" = set; then |
1027 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 1359 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -1029,25 +1361,28 @@ else | |||
1029 | if test -n "$CC"; then | 1361 | if test -n "$CC"; then |
1030 | ac_cv_prog_CC="$CC" # Let the user override the test. | 1362 | ac_cv_prog_CC="$CC" # Let the user override the test. |
1031 | else | 1363 | else |
1032 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 1364 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1033 | ac_dummy="$PATH" | 1365 | for as_dir in $PATH |
1034 | for ac_dir in $ac_dummy; do | 1366 | do |
1035 | IFS=$ac_save_IFS | 1367 | IFS=$as_save_IFS |
1036 | test -z "$ac_dir" && ac_dir=. | 1368 | test -z "$as_dir" && as_dir=. |
1037 | $as_executable_p "$ac_dir/$ac_word" || continue | 1369 | for ac_exec_ext in '' $ac_executable_extensions; do |
1038 | ac_cv_prog_CC="${ac_tool_prefix}gcc" | 1370 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1039 | echo "$as_me:1039: found $ac_dir/$ac_word" >&5 | 1371 | ac_cv_prog_CC="${ac_tool_prefix}gcc" |
1040 | break | 1372 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1373 | break 2 | ||
1374 | fi | ||
1375 | done | ||
1041 | done | 1376 | done |
1042 | 1377 | ||
1043 | fi | 1378 | fi |
1044 | fi | 1379 | fi |
1045 | CC=$ac_cv_prog_CC | 1380 | CC=$ac_cv_prog_CC |
1046 | if test -n "$CC"; then | 1381 | if test -n "$CC"; then |
1047 | echo "$as_me:1047: result: $CC" >&5 | 1382 | echo "$as_me:$LINENO: result: $CC" >&5 |
1048 | echo "${ECHO_T}$CC" >&6 | 1383 | echo "${ECHO_T}$CC" >&6 |
1049 | else | 1384 | else |
1050 | echo "$as_me:1050: result: no" >&5 | 1385 | echo "$as_me:$LINENO: result: no" >&5 |
1051 | echo "${ECHO_T}no" >&6 | 1386 | echo "${ECHO_T}no" >&6 |
1052 | fi | 1387 | fi |
1053 | 1388 | ||
@@ -1056,7 +1391,7 @@ if test -z "$ac_cv_prog_CC"; then | |||
1056 | ac_ct_CC=$CC | 1391 | ac_ct_CC=$CC |
1057 | # Extract the first word of "gcc", so it can be a program name with args. | 1392 | # Extract the first word of "gcc", so it can be a program name with args. |
1058 | set dummy gcc; ac_word=$2 | 1393 | set dummy gcc; ac_word=$2 |
1059 | echo "$as_me:1059: checking for $ac_word" >&5 | 1394 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
1060 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 1395 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
1061 | if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | 1396 | if test "${ac_cv_prog_ac_ct_CC+set}" = set; then |
1062 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 1397 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -1064,25 +1399,28 @@ else | |||
1064 | if test -n "$ac_ct_CC"; then | 1399 | if test -n "$ac_ct_CC"; then |
1065 | ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. | 1400 | ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. |
1066 | else | 1401 | else |
1067 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 1402 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1068 | ac_dummy="$PATH" | 1403 | for as_dir in $PATH |
1069 | for ac_dir in $ac_dummy; do | 1404 | do |
1070 | IFS=$ac_save_IFS | 1405 | IFS=$as_save_IFS |
1071 | test -z "$ac_dir" && ac_dir=. | 1406 | test -z "$as_dir" && as_dir=. |
1072 | $as_executable_p "$ac_dir/$ac_word" || continue | 1407 | for ac_exec_ext in '' $ac_executable_extensions; do |
1073 | ac_cv_prog_ac_ct_CC="gcc" | 1408 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1074 | echo "$as_me:1074: found $ac_dir/$ac_word" >&5 | 1409 | ac_cv_prog_ac_ct_CC="gcc" |
1075 | break | 1410 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1411 | break 2 | ||
1412 | fi | ||
1413 | done | ||
1076 | done | 1414 | done |
1077 | 1415 | ||
1078 | fi | 1416 | fi |
1079 | fi | 1417 | fi |
1080 | ac_ct_CC=$ac_cv_prog_ac_ct_CC | 1418 | ac_ct_CC=$ac_cv_prog_ac_ct_CC |
1081 | if test -n "$ac_ct_CC"; then | 1419 | if test -n "$ac_ct_CC"; then |
1082 | echo "$as_me:1082: result: $ac_ct_CC" >&5 | 1420 | echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 |
1083 | echo "${ECHO_T}$ac_ct_CC" >&6 | 1421 | echo "${ECHO_T}$ac_ct_CC" >&6 |
1084 | else | 1422 | else |
1085 | echo "$as_me:1085: result: no" >&5 | 1423 | echo "$as_me:$LINENO: result: no" >&5 |
1086 | echo "${ECHO_T}no" >&6 | 1424 | echo "${ECHO_T}no" >&6 |
1087 | fi | 1425 | fi |
1088 | 1426 | ||
@@ -1095,7 +1433,7 @@ if test -z "$CC"; then | |||
1095 | if test -n "$ac_tool_prefix"; then | 1433 | if test -n "$ac_tool_prefix"; then |
1096 | # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. | 1434 | # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. |
1097 | set dummy ${ac_tool_prefix}cc; ac_word=$2 | 1435 | set dummy ${ac_tool_prefix}cc; ac_word=$2 |
1098 | echo "$as_me:1098: checking for $ac_word" >&5 | 1436 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
1099 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 1437 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
1100 | if test "${ac_cv_prog_CC+set}" = set; then | 1438 | if test "${ac_cv_prog_CC+set}" = set; then |
1101 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 1439 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -1103,25 +1441,28 @@ else | |||
1103 | if test -n "$CC"; then | 1441 | if test -n "$CC"; then |
1104 | ac_cv_prog_CC="$CC" # Let the user override the test. | 1442 | ac_cv_prog_CC="$CC" # Let the user override the test. |
1105 | else | 1443 | else |
1106 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 1444 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1107 | ac_dummy="$PATH" | 1445 | for as_dir in $PATH |
1108 | for ac_dir in $ac_dummy; do | 1446 | do |
1109 | IFS=$ac_save_IFS | 1447 | IFS=$as_save_IFS |
1110 | test -z "$ac_dir" && ac_dir=. | 1448 | test -z "$as_dir" && as_dir=. |
1111 | $as_executable_p "$ac_dir/$ac_word" || continue | 1449 | for ac_exec_ext in '' $ac_executable_extensions; do |
1112 | ac_cv_prog_CC="${ac_tool_prefix}cc" | 1450 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1113 | echo "$as_me:1113: found $ac_dir/$ac_word" >&5 | 1451 | ac_cv_prog_CC="${ac_tool_prefix}cc" |
1114 | break | 1452 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1453 | break 2 | ||
1454 | fi | ||
1455 | done | ||
1115 | done | 1456 | done |
1116 | 1457 | ||
1117 | fi | 1458 | fi |
1118 | fi | 1459 | fi |
1119 | CC=$ac_cv_prog_CC | 1460 | CC=$ac_cv_prog_CC |
1120 | if test -n "$CC"; then | 1461 | if test -n "$CC"; then |
1121 | echo "$as_me:1121: result: $CC" >&5 | 1462 | echo "$as_me:$LINENO: result: $CC" >&5 |
1122 | echo "${ECHO_T}$CC" >&6 | 1463 | echo "${ECHO_T}$CC" >&6 |
1123 | else | 1464 | else |
1124 | echo "$as_me:1124: result: no" >&5 | 1465 | echo "$as_me:$LINENO: result: no" >&5 |
1125 | echo "${ECHO_T}no" >&6 | 1466 | echo "${ECHO_T}no" >&6 |
1126 | fi | 1467 | fi |
1127 | 1468 | ||
@@ -1130,7 +1471,7 @@ if test -z "$ac_cv_prog_CC"; then | |||
1130 | ac_ct_CC=$CC | 1471 | ac_ct_CC=$CC |
1131 | # Extract the first word of "cc", so it can be a program name with args. | 1472 | # Extract the first word of "cc", so it can be a program name with args. |
1132 | set dummy cc; ac_word=$2 | 1473 | set dummy cc; ac_word=$2 |
1133 | echo "$as_me:1133: checking for $ac_word" >&5 | 1474 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
1134 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 1475 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
1135 | if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | 1476 | if test "${ac_cv_prog_ac_ct_CC+set}" = set; then |
1136 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 1477 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -1138,25 +1479,28 @@ else | |||
1138 | if test -n "$ac_ct_CC"; then | 1479 | if test -n "$ac_ct_CC"; then |
1139 | ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. | 1480 | ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. |
1140 | else | 1481 | else |
1141 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 1482 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1142 | ac_dummy="$PATH" | 1483 | for as_dir in $PATH |
1143 | for ac_dir in $ac_dummy; do | 1484 | do |
1144 | IFS=$ac_save_IFS | 1485 | IFS=$as_save_IFS |
1145 | test -z "$ac_dir" && ac_dir=. | 1486 | test -z "$as_dir" && as_dir=. |
1146 | $as_executable_p "$ac_dir/$ac_word" || continue | 1487 | for ac_exec_ext in '' $ac_executable_extensions; do |
1147 | ac_cv_prog_ac_ct_CC="cc" | 1488 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1148 | echo "$as_me:1148: found $ac_dir/$ac_word" >&5 | 1489 | ac_cv_prog_ac_ct_CC="cc" |
1149 | break | 1490 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1491 | break 2 | ||
1492 | fi | ||
1493 | done | ||
1150 | done | 1494 | done |
1151 | 1495 | ||
1152 | fi | 1496 | fi |
1153 | fi | 1497 | fi |
1154 | ac_ct_CC=$ac_cv_prog_ac_ct_CC | 1498 | ac_ct_CC=$ac_cv_prog_ac_ct_CC |
1155 | if test -n "$ac_ct_CC"; then | 1499 | if test -n "$ac_ct_CC"; then |
1156 | echo "$as_me:1156: result: $ac_ct_CC" >&5 | 1500 | echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 |
1157 | echo "${ECHO_T}$ac_ct_CC" >&6 | 1501 | echo "${ECHO_T}$ac_ct_CC" >&6 |
1158 | else | 1502 | else |
1159 | echo "$as_me:1159: result: no" >&5 | 1503 | echo "$as_me:$LINENO: result: no" >&5 |
1160 | echo "${ECHO_T}no" >&6 | 1504 | echo "${ECHO_T}no" >&6 |
1161 | fi | 1505 | fi |
1162 | 1506 | ||
@@ -1169,7 +1513,7 @@ fi | |||
1169 | if test -z "$CC"; then | 1513 | if test -z "$CC"; then |
1170 | # Extract the first word of "cc", so it can be a program name with args. | 1514 | # Extract the first word of "cc", so it can be a program name with args. |
1171 | set dummy cc; ac_word=$2 | 1515 | set dummy cc; ac_word=$2 |
1172 | echo "$as_me:1172: checking for $ac_word" >&5 | 1516 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
1173 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 1517 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
1174 | if test "${ac_cv_prog_CC+set}" = set; then | 1518 | if test "${ac_cv_prog_CC+set}" = set; then |
1175 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 1519 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -1178,19 +1522,22 @@ else | |||
1178 | ac_cv_prog_CC="$CC" # Let the user override the test. | 1522 | ac_cv_prog_CC="$CC" # Let the user override the test. |
1179 | else | 1523 | else |
1180 | ac_prog_rejected=no | 1524 | ac_prog_rejected=no |
1181 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 1525 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1182 | ac_dummy="$PATH" | 1526 | for as_dir in $PATH |
1183 | for ac_dir in $ac_dummy; do | 1527 | do |
1184 | IFS=$ac_save_IFS | 1528 | IFS=$as_save_IFS |
1185 | test -z "$ac_dir" && ac_dir=. | 1529 | test -z "$as_dir" && as_dir=. |
1186 | $as_executable_p "$ac_dir/$ac_word" || continue | 1530 | for ac_exec_ext in '' $ac_executable_extensions; do |
1187 | if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then | 1531 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1188 | ac_prog_rejected=yes | 1532 | if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then |
1189 | continue | 1533 | ac_prog_rejected=yes |
1190 | fi | 1534 | continue |
1191 | ac_cv_prog_CC="cc" | 1535 | fi |
1192 | echo "$as_me:1192: found $ac_dir/$ac_word" >&5 | 1536 | ac_cv_prog_CC="cc" |
1193 | break | 1537 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1538 | break 2 | ||
1539 | fi | ||
1540 | done | ||
1194 | done | 1541 | done |
1195 | 1542 | ||
1196 | if test $ac_prog_rejected = yes; then | 1543 | if test $ac_prog_rejected = yes; then |
@@ -1202,19 +1549,17 @@ if test $ac_prog_rejected = yes; then | |||
1202 | # However, it has the same basename, so the bogon will be chosen | 1549 | # However, it has the same basename, so the bogon will be chosen |
1203 | # first if we set CC to just the basename; use the full file name. | 1550 | # first if we set CC to just the basename; use the full file name. |
1204 | shift | 1551 | shift |
1205 | set dummy "$ac_dir/$ac_word" ${1+"$@"} | 1552 | ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" |
1206 | shift | ||
1207 | ac_cv_prog_CC="$@" | ||
1208 | fi | 1553 | fi |
1209 | fi | 1554 | fi |
1210 | fi | 1555 | fi |
1211 | fi | 1556 | fi |
1212 | CC=$ac_cv_prog_CC | 1557 | CC=$ac_cv_prog_CC |
1213 | if test -n "$CC"; then | 1558 | if test -n "$CC"; then |
1214 | echo "$as_me:1214: result: $CC" >&5 | 1559 | echo "$as_me:$LINENO: result: $CC" >&5 |
1215 | echo "${ECHO_T}$CC" >&6 | 1560 | echo "${ECHO_T}$CC" >&6 |
1216 | else | 1561 | else |
1217 | echo "$as_me:1217: result: no" >&5 | 1562 | echo "$as_me:$LINENO: result: no" >&5 |
1218 | echo "${ECHO_T}no" >&6 | 1563 | echo "${ECHO_T}no" >&6 |
1219 | fi | 1564 | fi |
1220 | 1565 | ||
@@ -1225,7 +1570,7 @@ if test -z "$CC"; then | |||
1225 | do | 1570 | do |
1226 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | 1571 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
1227 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | 1572 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
1228 | echo "$as_me:1228: checking for $ac_word" >&5 | 1573 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
1229 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 1574 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
1230 | if test "${ac_cv_prog_CC+set}" = set; then | 1575 | if test "${ac_cv_prog_CC+set}" = set; then |
1231 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 1576 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -1233,25 +1578,28 @@ else | |||
1233 | if test -n "$CC"; then | 1578 | if test -n "$CC"; then |
1234 | ac_cv_prog_CC="$CC" # Let the user override the test. | 1579 | ac_cv_prog_CC="$CC" # Let the user override the test. |
1235 | else | 1580 | else |
1236 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 1581 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1237 | ac_dummy="$PATH" | 1582 | for as_dir in $PATH |
1238 | for ac_dir in $ac_dummy; do | 1583 | do |
1239 | IFS=$ac_save_IFS | 1584 | IFS=$as_save_IFS |
1240 | test -z "$ac_dir" && ac_dir=. | 1585 | test -z "$as_dir" && as_dir=. |
1241 | $as_executable_p "$ac_dir/$ac_word" || continue | 1586 | for ac_exec_ext in '' $ac_executable_extensions; do |
1242 | ac_cv_prog_CC="$ac_tool_prefix$ac_prog" | 1587 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1243 | echo "$as_me:1243: found $ac_dir/$ac_word" >&5 | 1588 | ac_cv_prog_CC="$ac_tool_prefix$ac_prog" |
1244 | break | 1589 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1590 | break 2 | ||
1591 | fi | ||
1592 | done | ||
1245 | done | 1593 | done |
1246 | 1594 | ||
1247 | fi | 1595 | fi |
1248 | fi | 1596 | fi |
1249 | CC=$ac_cv_prog_CC | 1597 | CC=$ac_cv_prog_CC |
1250 | if test -n "$CC"; then | 1598 | if test -n "$CC"; then |
1251 | echo "$as_me:1251: result: $CC" >&5 | 1599 | echo "$as_me:$LINENO: result: $CC" >&5 |
1252 | echo "${ECHO_T}$CC" >&6 | 1600 | echo "${ECHO_T}$CC" >&6 |
1253 | else | 1601 | else |
1254 | echo "$as_me:1254: result: no" >&5 | 1602 | echo "$as_me:$LINENO: result: no" >&5 |
1255 | echo "${ECHO_T}no" >&6 | 1603 | echo "${ECHO_T}no" >&6 |
1256 | fi | 1604 | fi |
1257 | 1605 | ||
@@ -1264,7 +1612,7 @@ if test -z "$CC"; then | |||
1264 | do | 1612 | do |
1265 | # Extract the first word of "$ac_prog", so it can be a program name with args. | 1613 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
1266 | set dummy $ac_prog; ac_word=$2 | 1614 | set dummy $ac_prog; ac_word=$2 |
1267 | echo "$as_me:1267: checking for $ac_word" >&5 | 1615 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
1268 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 1616 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
1269 | if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | 1617 | if test "${ac_cv_prog_ac_ct_CC+set}" = set; then |
1270 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 1618 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -1272,25 +1620,28 @@ else | |||
1272 | if test -n "$ac_ct_CC"; then | 1620 | if test -n "$ac_ct_CC"; then |
1273 | ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. | 1621 | ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. |
1274 | else | 1622 | else |
1275 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 1623 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1276 | ac_dummy="$PATH" | 1624 | for as_dir in $PATH |
1277 | for ac_dir in $ac_dummy; do | 1625 | do |
1278 | IFS=$ac_save_IFS | 1626 | IFS=$as_save_IFS |
1279 | test -z "$ac_dir" && ac_dir=. | 1627 | test -z "$as_dir" && as_dir=. |
1280 | $as_executable_p "$ac_dir/$ac_word" || continue | 1628 | for ac_exec_ext in '' $ac_executable_extensions; do |
1281 | ac_cv_prog_ac_ct_CC="$ac_prog" | 1629 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1282 | echo "$as_me:1282: found $ac_dir/$ac_word" >&5 | 1630 | ac_cv_prog_ac_ct_CC="$ac_prog" |
1283 | break | 1631 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1632 | break 2 | ||
1633 | fi | ||
1634 | done | ||
1284 | done | 1635 | done |
1285 | 1636 | ||
1286 | fi | 1637 | fi |
1287 | fi | 1638 | fi |
1288 | ac_ct_CC=$ac_cv_prog_ac_ct_CC | 1639 | ac_ct_CC=$ac_cv_prog_ac_ct_CC |
1289 | if test -n "$ac_ct_CC"; then | 1640 | if test -n "$ac_ct_CC"; then |
1290 | echo "$as_me:1290: result: $ac_ct_CC" >&5 | 1641 | echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 |
1291 | echo "${ECHO_T}$ac_ct_CC" >&6 | 1642 | echo "${ECHO_T}$ac_ct_CC" >&6 |
1292 | else | 1643 | else |
1293 | echo "$as_me:1293: result: no" >&5 | 1644 | echo "$as_me:$LINENO: result: no" >&5 |
1294 | echo "${ECHO_T}no" >&6 | 1645 | echo "${ECHO_T}no" >&6 |
1295 | fi | 1646 | fi |
1296 | 1647 | ||
@@ -1302,33 +1653,39 @@ fi | |||
1302 | 1653 | ||
1303 | fi | 1654 | fi |
1304 | 1655 | ||
1305 | test -z "$CC" && { { echo "$as_me:1305: error: no acceptable cc found in \$PATH" >&5 | 1656 | |
1306 | echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} | 1657 | test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH |
1658 | See \`config.log' for more details." >&5 | ||
1659 | echo "$as_me: error: no acceptable C compiler found in \$PATH | ||
1660 | See \`config.log' for more details." >&2;} | ||
1307 | { (exit 1); exit 1; }; } | 1661 | { (exit 1); exit 1; }; } |
1308 | 1662 | ||
1309 | # Provide some information about the compiler. | 1663 | # Provide some information about the compiler. |
1310 | echo "$as_me:1310:" \ | 1664 | echo "$as_me:$LINENO:" \ |
1311 | "checking for C compiler version" >&5 | 1665 | "checking for C compiler version" >&5 |
1312 | ac_compiler=`set X $ac_compile; echo $2` | 1666 | ac_compiler=`set X $ac_compile; echo $2` |
1313 | { (eval echo "$as_me:1313: \"$ac_compiler --version </dev/null >&5\"") >&5 | 1667 | { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 |
1314 | (eval $ac_compiler --version </dev/null >&5) 2>&5 | 1668 | (eval $ac_compiler --version </dev/null >&5) 2>&5 |
1315 | ac_status=$? | 1669 | ac_status=$? |
1316 | echo "$as_me:1316: \$? = $ac_status" >&5 | 1670 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
1317 | (exit $ac_status); } | 1671 | (exit $ac_status); } |
1318 | { (eval echo "$as_me:1318: \"$ac_compiler -v </dev/null >&5\"") >&5 | 1672 | { (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 |
1319 | (eval $ac_compiler -v </dev/null >&5) 2>&5 | 1673 | (eval $ac_compiler -v </dev/null >&5) 2>&5 |
1320 | ac_status=$? | 1674 | ac_status=$? |
1321 | echo "$as_me:1321: \$? = $ac_status" >&5 | 1675 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
1322 | (exit $ac_status); } | 1676 | (exit $ac_status); } |
1323 | { (eval echo "$as_me:1323: \"$ac_compiler -V </dev/null >&5\"") >&5 | 1677 | { (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 |
1324 | (eval $ac_compiler -V </dev/null >&5) 2>&5 | 1678 | (eval $ac_compiler -V </dev/null >&5) 2>&5 |
1325 | ac_status=$? | 1679 | ac_status=$? |
1326 | echo "$as_me:1326: \$? = $ac_status" >&5 | 1680 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
1327 | (exit $ac_status); } | 1681 | (exit $ac_status); } |
1328 | 1682 | ||
1329 | cat >conftest.$ac_ext <<_ACEOF | 1683 | cat >conftest.$ac_ext <<_ACEOF |
1330 | #line 1330 "configure" | 1684 | /* confdefs.h. */ |
1331 | #include "confdefs.h" | 1685 | _ACEOF |
1686 | cat confdefs.h >>conftest.$ac_ext | ||
1687 | cat >>conftest.$ac_ext <<_ACEOF | ||
1688 | /* end confdefs.h. */ | ||
1332 | 1689 | ||
1333 | int | 1690 | int |
1334 | main () | 1691 | main () |
@@ -1339,127 +1696,152 @@ main () | |||
1339 | } | 1696 | } |
1340 | _ACEOF | 1697 | _ACEOF |
1341 | ac_clean_files_save=$ac_clean_files | 1698 | ac_clean_files_save=$ac_clean_files |
1342 | ac_clean_files="$ac_clean_files a.out a.exe" | 1699 | ac_clean_files="$ac_clean_files a.out a.exe b.out" |
1343 | # Try to create an executable without -o first, disregard a.out. | 1700 | # Try to create an executable without -o first, disregard a.out. |
1344 | # It will help us diagnose broken compilers, and finding out an intuition | 1701 | # It will help us diagnose broken compilers, and finding out an intuition |
1345 | # of exeext. | 1702 | # of exeext. |
1346 | echo "$as_me:1346: checking for C compiler default output" >&5 | 1703 | echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 |
1347 | echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 | 1704 | echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 |
1348 | ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` | 1705 | ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` |
1349 | if { (eval echo "$as_me:1349: \"$ac_link_default\"") >&5 | 1706 | if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 |
1350 | (eval $ac_link_default) 2>&5 | 1707 | (eval $ac_link_default) 2>&5 |
1351 | ac_status=$? | 1708 | ac_status=$? |
1352 | echo "$as_me:1352: \$? = $ac_status" >&5 | 1709 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
1353 | (exit $ac_status); }; then | 1710 | (exit $ac_status); }; then |
1354 | # Find the output, starting from the most likely. This scheme is | 1711 | # Find the output, starting from the most likely. This scheme is |
1355 | # not robust to junk in `.', hence go to wildcards (a.*) only as a last | 1712 | # not robust to junk in `.', hence go to wildcards (a.*) only as a last |
1356 | # resort. | 1713 | # resort. |
1357 | for ac_file in `ls a.exe conftest.exe 2>/dev/null; | 1714 | |
1358 | ls a.out conftest 2>/dev/null; | 1715 | # Be careful to initialize this variable, since it used to be cached. |
1359 | ls a.* conftest.* 2>/dev/null`; do | 1716 | # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. |
1717 | ac_cv_exeext= | ||
1718 | # b.out is created by i960 compilers. | ||
1719 | for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out | ||
1720 | do | ||
1721 | test -f "$ac_file" || continue | ||
1360 | case $ac_file in | 1722 | case $ac_file in |
1361 | *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; | 1723 | *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) |
1362 | a.out ) # We found the default executable, but exeext='' is most | 1724 | ;; |
1363 | # certainly right. | 1725 | conftest.$ac_ext ) |
1364 | break;; | 1726 | # This is the source file. |
1365 | *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` | 1727 | ;; |
1366 | # FIXME: I believe we export ac_cv_exeext for Libtool --akim. | 1728 | [ab].out ) |
1367 | export ac_cv_exeext | 1729 | # We found the default executable, but exeext='' is most |
1368 | break;; | 1730 | # certainly right. |
1369 | * ) break;; | 1731 | break;; |
1732 | *.* ) | ||
1733 | ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` | ||
1734 | # FIXME: I believe we export ac_cv_exeext for Libtool, | ||
1735 | # but it would be cool to find out if it's true. Does anybody | ||
1736 | # maintain Libtool? --akim. | ||
1737 | export ac_cv_exeext | ||
1738 | break;; | ||
1739 | * ) | ||
1740 | break;; | ||
1370 | esac | 1741 | esac |
1371 | done | 1742 | done |
1372 | else | 1743 | else |
1373 | echo "$as_me: failed program was:" >&5 | 1744 | echo "$as_me: failed program was:" >&5 |
1374 | cat conftest.$ac_ext >&5 | 1745 | sed 's/^/| /' conftest.$ac_ext >&5 |
1375 | { { echo "$as_me:1375: error: C compiler cannot create executables" >&5 | 1746 | |
1376 | echo "$as_me: error: C compiler cannot create executables" >&2;} | 1747 | { { echo "$as_me:$LINENO: error: C compiler cannot create executables |
1748 | See \`config.log' for more details." >&5 | ||
1749 | echo "$as_me: error: C compiler cannot create executables | ||
1750 | See \`config.log' for more details." >&2;} | ||
1377 | { (exit 77); exit 77; }; } | 1751 | { (exit 77); exit 77; }; } |
1378 | fi | 1752 | fi |
1379 | 1753 | ||
1380 | ac_exeext=$ac_cv_exeext | 1754 | ac_exeext=$ac_cv_exeext |
1381 | echo "$as_me:1381: result: $ac_file" >&5 | 1755 | echo "$as_me:$LINENO: result: $ac_file" >&5 |
1382 | echo "${ECHO_T}$ac_file" >&6 | 1756 | echo "${ECHO_T}$ac_file" >&6 |
1383 | 1757 | ||
1384 | # Check the compiler produces executables we can run. If not, either | 1758 | # Check the compiler produces executables we can run. If not, either |
1385 | # the compiler is broken, or we cross compile. | 1759 | # the compiler is broken, or we cross compile. |
1386 | echo "$as_me:1386: checking whether the C compiler works" >&5 | 1760 | echo "$as_me:$LINENO: checking whether the C compiler works" >&5 |
1387 | echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 | 1761 | echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 |
1388 | # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 | 1762 | # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 |
1389 | # If not cross compiling, check that we can run a simple program. | 1763 | # If not cross compiling, check that we can run a simple program. |
1390 | if test "$cross_compiling" != yes; then | 1764 | if test "$cross_compiling" != yes; then |
1391 | if { ac_try='./$ac_file' | 1765 | if { ac_try='./$ac_file' |
1392 | { (eval echo "$as_me:1392: \"$ac_try\"") >&5 | 1766 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
1393 | (eval $ac_try) 2>&5 | 1767 | (eval $ac_try) 2>&5 |
1394 | ac_status=$? | 1768 | ac_status=$? |
1395 | echo "$as_me:1395: \$? = $ac_status" >&5 | 1769 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
1396 | (exit $ac_status); }; }; then | 1770 | (exit $ac_status); }; }; then |
1397 | cross_compiling=no | 1771 | cross_compiling=no |
1398 | else | 1772 | else |
1399 | if test "$cross_compiling" = maybe; then | 1773 | if test "$cross_compiling" = maybe; then |
1400 | cross_compiling=yes | 1774 | cross_compiling=yes |
1401 | else | 1775 | else |
1402 | { { echo "$as_me:1402: error: cannot run C compiled programs. | 1776 | { { echo "$as_me:$LINENO: error: cannot run C compiled programs. |
1403 | If you meant to cross compile, use \`--host'." >&5 | 1777 | If you meant to cross compile, use \`--host'. |
1778 | See \`config.log' for more details." >&5 | ||
1404 | echo "$as_me: error: cannot run C compiled programs. | 1779 | echo "$as_me: error: cannot run C compiled programs. |
1405 | If you meant to cross compile, use \`--host'." >&2;} | 1780 | If you meant to cross compile, use \`--host'. |
1781 | See \`config.log' for more details." >&2;} | ||
1406 | { (exit 1); exit 1; }; } | 1782 | { (exit 1); exit 1; }; } |
1407 | fi | 1783 | fi |
1408 | fi | 1784 | fi |
1409 | fi | 1785 | fi |
1410 | echo "$as_me:1410: result: yes" >&5 | 1786 | echo "$as_me:$LINENO: result: yes" >&5 |
1411 | echo "${ECHO_T}yes" >&6 | 1787 | echo "${ECHO_T}yes" >&6 |
1412 | 1788 | ||
1413 | rm -f a.out a.exe conftest$ac_cv_exeext | 1789 | rm -f a.out a.exe conftest$ac_cv_exeext b.out |
1414 | ac_clean_files=$ac_clean_files_save | 1790 | ac_clean_files=$ac_clean_files_save |
1415 | # Check the compiler produces executables we can run. If not, either | 1791 | # Check the compiler produces executables we can run. If not, either |
1416 | # the compiler is broken, or we cross compile. | 1792 | # the compiler is broken, or we cross compile. |
1417 | echo "$as_me:1417: checking whether we are cross compiling" >&5 | 1793 | echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 |
1418 | echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 | 1794 | echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 |
1419 | echo "$as_me:1419: result: $cross_compiling" >&5 | 1795 | echo "$as_me:$LINENO: result: $cross_compiling" >&5 |
1420 | echo "${ECHO_T}$cross_compiling" >&6 | 1796 | echo "${ECHO_T}$cross_compiling" >&6 |
1421 | 1797 | ||
1422 | echo "$as_me:1422: checking for executable suffix" >&5 | 1798 | echo "$as_me:$LINENO: checking for suffix of executables" >&5 |
1423 | echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 | 1799 | echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 |
1424 | if { (eval echo "$as_me:1424: \"$ac_link\"") >&5 | 1800 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
1425 | (eval $ac_link) 2>&5 | 1801 | (eval $ac_link) 2>&5 |
1426 | ac_status=$? | 1802 | ac_status=$? |
1427 | echo "$as_me:1427: \$? = $ac_status" >&5 | 1803 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
1428 | (exit $ac_status); }; then | 1804 | (exit $ac_status); }; then |
1429 | # If both `conftest.exe' and `conftest' are `present' (well, observable) | 1805 | # If both `conftest.exe' and `conftest' are `present' (well, observable) |
1430 | # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will | 1806 | # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will |
1431 | # work properly (i.e., refer to `conftest.exe'), while it won't with | 1807 | # work properly (i.e., refer to `conftest.exe'), while it won't with |
1432 | # `rm'. | 1808 | # `rm'. |
1433 | for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do | 1809 | for ac_file in conftest.exe conftest conftest.*; do |
1810 | test -f "$ac_file" || continue | ||
1434 | case $ac_file in | 1811 | case $ac_file in |
1435 | *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; | 1812 | *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; |
1436 | *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` | 1813 | *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` |
1437 | export ac_cv_exeext | 1814 | export ac_cv_exeext |
1438 | break;; | 1815 | break;; |
1439 | * ) break;; | 1816 | * ) break;; |
1440 | esac | 1817 | esac |
1441 | done | 1818 | done |
1442 | else | 1819 | else |
1443 | { { echo "$as_me:1443: error: cannot compute EXEEXT: cannot compile and link" >&5 | 1820 | { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link |
1444 | echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} | 1821 | See \`config.log' for more details." >&5 |
1822 | echo "$as_me: error: cannot compute suffix of executables: cannot compile and link | ||
1823 | See \`config.log' for more details." >&2;} | ||
1445 | { (exit 1); exit 1; }; } | 1824 | { (exit 1); exit 1; }; } |
1446 | fi | 1825 | fi |
1447 | 1826 | ||
1448 | rm -f conftest$ac_cv_exeext | 1827 | rm -f conftest$ac_cv_exeext |
1449 | echo "$as_me:1449: result: $ac_cv_exeext" >&5 | 1828 | echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 |
1450 | echo "${ECHO_T}$ac_cv_exeext" >&6 | 1829 | echo "${ECHO_T}$ac_cv_exeext" >&6 |
1451 | 1830 | ||
1452 | rm -f conftest.$ac_ext | 1831 | rm -f conftest.$ac_ext |
1453 | EXEEXT=$ac_cv_exeext | 1832 | EXEEXT=$ac_cv_exeext |
1454 | ac_exeext=$EXEEXT | 1833 | ac_exeext=$EXEEXT |
1455 | echo "$as_me:1455: checking for object suffix" >&5 | 1834 | echo "$as_me:$LINENO: checking for suffix of object files" >&5 |
1456 | echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 | 1835 | echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 |
1457 | if test "${ac_cv_objext+set}" = set; then | 1836 | if test "${ac_cv_objext+set}" = set; then |
1458 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 1837 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
1459 | else | 1838 | else |
1460 | cat >conftest.$ac_ext <<_ACEOF | 1839 | cat >conftest.$ac_ext <<_ACEOF |
1461 | #line 1461 "configure" | 1840 | /* confdefs.h. */ |
1462 | #include "confdefs.h" | 1841 | _ACEOF |
1842 | cat confdefs.h >>conftest.$ac_ext | ||
1843 | cat >>conftest.$ac_ext <<_ACEOF | ||
1844 | /* end confdefs.h. */ | ||
1463 | 1845 | ||
1464 | int | 1846 | int |
1465 | main () | 1847 | main () |
@@ -1470,40 +1852,46 @@ main () | |||
1470 | } | 1852 | } |
1471 | _ACEOF | 1853 | _ACEOF |
1472 | rm -f conftest.o conftest.obj | 1854 | rm -f conftest.o conftest.obj |
1473 | if { (eval echo "$as_me:1473: \"$ac_compile\"") >&5 | 1855 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
1474 | (eval $ac_compile) 2>&5 | 1856 | (eval $ac_compile) 2>&5 |
1475 | ac_status=$? | 1857 | ac_status=$? |
1476 | echo "$as_me:1476: \$? = $ac_status" >&5 | 1858 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
1477 | (exit $ac_status); }; then | 1859 | (exit $ac_status); }; then |
1478 | for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do | 1860 | for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do |
1479 | case $ac_file in | 1861 | case $ac_file in |
1480 | *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;; | 1862 | *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; |
1481 | *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` | 1863 | *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` |
1482 | break;; | 1864 | break;; |
1483 | esac | 1865 | esac |
1484 | done | 1866 | done |
1485 | else | 1867 | else |
1486 | echo "$as_me: failed program was:" >&5 | 1868 | echo "$as_me: failed program was:" >&5 |
1487 | cat conftest.$ac_ext >&5 | 1869 | sed 's/^/| /' conftest.$ac_ext >&5 |
1488 | { { echo "$as_me:1488: error: cannot compute OBJEXT: cannot compile" >&5 | 1870 | |
1489 | echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} | 1871 | { { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile |
1872 | See \`config.log' for more details." >&5 | ||
1873 | echo "$as_me: error: cannot compute suffix of object files: cannot compile | ||
1874 | See \`config.log' for more details." >&2;} | ||
1490 | { (exit 1); exit 1; }; } | 1875 | { (exit 1); exit 1; }; } |
1491 | fi | 1876 | fi |
1492 | 1877 | ||
1493 | rm -f conftest.$ac_cv_objext conftest.$ac_ext | 1878 | rm -f conftest.$ac_cv_objext conftest.$ac_ext |
1494 | fi | 1879 | fi |
1495 | echo "$as_me:1495: result: $ac_cv_objext" >&5 | 1880 | echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 |
1496 | echo "${ECHO_T}$ac_cv_objext" >&6 | 1881 | echo "${ECHO_T}$ac_cv_objext" >&6 |
1497 | OBJEXT=$ac_cv_objext | 1882 | OBJEXT=$ac_cv_objext |
1498 | ac_objext=$OBJEXT | 1883 | ac_objext=$OBJEXT |
1499 | echo "$as_me:1499: checking whether we are using the GNU C compiler" >&5 | 1884 | echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 |
1500 | echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 | 1885 | echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 |
1501 | if test "${ac_cv_c_compiler_gnu+set}" = set; then | 1886 | if test "${ac_cv_c_compiler_gnu+set}" = set; then |
1502 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 1887 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
1503 | else | 1888 | else |
1504 | cat >conftest.$ac_ext <<_ACEOF | 1889 | cat >conftest.$ac_ext <<_ACEOF |
1505 | #line 1505 "configure" | 1890 | /* confdefs.h. */ |
1506 | #include "confdefs.h" | 1891 | _ACEOF |
1892 | cat confdefs.h >>conftest.$ac_ext | ||
1893 | cat >>conftest.$ac_ext <<_ACEOF | ||
1894 | /* end confdefs.h. */ | ||
1507 | 1895 | ||
1508 | int | 1896 | int |
1509 | main () | 1897 | main () |
@@ -1517,41 +1905,55 @@ main () | |||
1517 | } | 1905 | } |
1518 | _ACEOF | 1906 | _ACEOF |
1519 | rm -f conftest.$ac_objext | 1907 | rm -f conftest.$ac_objext |
1520 | if { (eval echo "$as_me:1520: \"$ac_compile\"") >&5 | 1908 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
1521 | (eval $ac_compile) 2>&5 | 1909 | (eval $ac_compile) 2>conftest.er1 |
1522 | ac_status=$? | 1910 | ac_status=$? |
1523 | echo "$as_me:1523: \$? = $ac_status" >&5 | 1911 | grep -v '^ *+' conftest.er1 >conftest.err |
1912 | rm -f conftest.er1 | ||
1913 | cat conftest.err >&5 | ||
1914 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
1524 | (exit $ac_status); } && | 1915 | (exit $ac_status); } && |
1525 | { ac_try='test -s conftest.$ac_objext' | 1916 | { ac_try='test -z "$ac_c_werror_flag" |
1526 | { (eval echo "$as_me:1526: \"$ac_try\"") >&5 | 1917 | || test ! -s conftest.err' |
1918 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
1919 | (eval $ac_try) 2>&5 | ||
1920 | ac_status=$? | ||
1921 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
1922 | (exit $ac_status); }; } && | ||
1923 | { ac_try='test -s conftest.$ac_objext' | ||
1924 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
1527 | (eval $ac_try) 2>&5 | 1925 | (eval $ac_try) 2>&5 |
1528 | ac_status=$? | 1926 | ac_status=$? |
1529 | echo "$as_me:1529: \$? = $ac_status" >&5 | 1927 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
1530 | (exit $ac_status); }; }; then | 1928 | (exit $ac_status); }; }; then |
1531 | ac_compiler_gnu=yes | 1929 | ac_compiler_gnu=yes |
1532 | else | 1930 | else |
1533 | echo "$as_me: failed program was:" >&5 | 1931 | echo "$as_me: failed program was:" >&5 |
1534 | cat conftest.$ac_ext >&5 | 1932 | sed 's/^/| /' conftest.$ac_ext >&5 |
1933 | |||
1535 | ac_compiler_gnu=no | 1934 | ac_compiler_gnu=no |
1536 | fi | 1935 | fi |
1537 | rm -f conftest.$ac_objext conftest.$ac_ext | 1936 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
1538 | ac_cv_c_compiler_gnu=$ac_compiler_gnu | 1937 | ac_cv_c_compiler_gnu=$ac_compiler_gnu |
1539 | 1938 | ||
1540 | fi | 1939 | fi |
1541 | echo "$as_me:1541: result: $ac_cv_c_compiler_gnu" >&5 | 1940 | echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 |
1542 | echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 | 1941 | echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 |
1543 | GCC=`test $ac_compiler_gnu = yes && echo yes` | 1942 | GCC=`test $ac_compiler_gnu = yes && echo yes` |
1544 | ac_test_CFLAGS=${CFLAGS+set} | 1943 | ac_test_CFLAGS=${CFLAGS+set} |
1545 | ac_save_CFLAGS=$CFLAGS | 1944 | ac_save_CFLAGS=$CFLAGS |
1546 | CFLAGS="-g" | 1945 | CFLAGS="-g" |
1547 | echo "$as_me:1547: checking whether $CC accepts -g" >&5 | 1946 | echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 |
1548 | echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 | 1947 | echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 |
1549 | if test "${ac_cv_prog_cc_g+set}" = set; then | 1948 | if test "${ac_cv_prog_cc_g+set}" = set; then |
1550 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 1949 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
1551 | else | 1950 | else |
1552 | cat >conftest.$ac_ext <<_ACEOF | 1951 | cat >conftest.$ac_ext <<_ACEOF |
1553 | #line 1553 "configure" | 1952 | /* confdefs.h. */ |
1554 | #include "confdefs.h" | 1953 | _ACEOF |
1954 | cat confdefs.h >>conftest.$ac_ext | ||
1955 | cat >>conftest.$ac_ext <<_ACEOF | ||
1956 | /* end confdefs.h. */ | ||
1555 | 1957 | ||
1556 | int | 1958 | int |
1557 | main () | 1959 | main () |
@@ -1562,26 +1964,37 @@ main () | |||
1562 | } | 1964 | } |
1563 | _ACEOF | 1965 | _ACEOF |
1564 | rm -f conftest.$ac_objext | 1966 | rm -f conftest.$ac_objext |
1565 | if { (eval echo "$as_me:1565: \"$ac_compile\"") >&5 | 1967 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
1566 | (eval $ac_compile) 2>&5 | 1968 | (eval $ac_compile) 2>conftest.er1 |
1567 | ac_status=$? | 1969 | ac_status=$? |
1568 | echo "$as_me:1568: \$? = $ac_status" >&5 | 1970 | grep -v '^ *+' conftest.er1 >conftest.err |
1971 | rm -f conftest.er1 | ||
1972 | cat conftest.err >&5 | ||
1973 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
1569 | (exit $ac_status); } && | 1974 | (exit $ac_status); } && |
1570 | { ac_try='test -s conftest.$ac_objext' | 1975 | { ac_try='test -z "$ac_c_werror_flag" |
1571 | { (eval echo "$as_me:1571: \"$ac_try\"") >&5 | 1976 | || test ! -s conftest.err' |
1977 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
1978 | (eval $ac_try) 2>&5 | ||
1979 | ac_status=$? | ||
1980 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
1981 | (exit $ac_status); }; } && | ||
1982 | { ac_try='test -s conftest.$ac_objext' | ||
1983 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
1572 | (eval $ac_try) 2>&5 | 1984 | (eval $ac_try) 2>&5 |
1573 | ac_status=$? | 1985 | ac_status=$? |
1574 | echo "$as_me:1574: \$? = $ac_status" >&5 | 1986 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
1575 | (exit $ac_status); }; }; then | 1987 | (exit $ac_status); }; }; then |
1576 | ac_cv_prog_cc_g=yes | 1988 | ac_cv_prog_cc_g=yes |
1577 | else | 1989 | else |
1578 | echo "$as_me: failed program was:" >&5 | 1990 | echo "$as_me: failed program was:" >&5 |
1579 | cat conftest.$ac_ext >&5 | 1991 | sed 's/^/| /' conftest.$ac_ext >&5 |
1992 | |||
1580 | ac_cv_prog_cc_g=no | 1993 | ac_cv_prog_cc_g=no |
1581 | fi | 1994 | fi |
1582 | rm -f conftest.$ac_objext conftest.$ac_ext | 1995 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
1583 | fi | 1996 | fi |
1584 | echo "$as_me:1584: result: $ac_cv_prog_cc_g" >&5 | 1997 | echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 |
1585 | echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 | 1998 | echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 |
1586 | if test "$ac_test_CFLAGS" = set; then | 1999 | if test "$ac_test_CFLAGS" = set; then |
1587 | CFLAGS=$ac_save_CFLAGS | 2000 | CFLAGS=$ac_save_CFLAGS |
@@ -1598,6 +2011,121 @@ else | |||
1598 | CFLAGS= | 2011 | CFLAGS= |
1599 | fi | 2012 | fi |
1600 | fi | 2013 | fi |
2014 | echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 | ||
2015 | echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 | ||
2016 | if test "${ac_cv_prog_cc_stdc+set}" = set; then | ||
2017 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2018 | else | ||
2019 | ac_cv_prog_cc_stdc=no | ||
2020 | ac_save_CC=$CC | ||
2021 | cat >conftest.$ac_ext <<_ACEOF | ||
2022 | /* confdefs.h. */ | ||
2023 | _ACEOF | ||
2024 | cat confdefs.h >>conftest.$ac_ext | ||
2025 | cat >>conftest.$ac_ext <<_ACEOF | ||
2026 | /* end confdefs.h. */ | ||
2027 | #include <stdarg.h> | ||
2028 | #include <stdio.h> | ||
2029 | #include <sys/types.h> | ||
2030 | #include <sys/stat.h> | ||
2031 | /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ | ||
2032 | struct buf { int x; }; | ||
2033 | FILE * (*rcsopen) (struct buf *, struct stat *, int); | ||
2034 | static char *e (p, i) | ||
2035 | char **p; | ||
2036 | int i; | ||
2037 | { | ||
2038 | return p[i]; | ||
2039 | } | ||
2040 | static char *f (char * (*g) (char **, int), char **p, ...) | ||
2041 | { | ||
2042 | char *s; | ||
2043 | va_list v; | ||
2044 | va_start (v,p); | ||
2045 | s = g (p, va_arg (v,int)); | ||
2046 | va_end (v); | ||
2047 | return s; | ||
2048 | } | ||
2049 | |||
2050 | /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has | ||
2051 | function prototypes and stuff, but not '\xHH' hex character constants. | ||
2052 | These don't provoke an error unfortunately, instead are silently treated | ||
2053 | as 'x'. The following induces an error, until -std1 is added to get | ||
2054 | proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an | ||
2055 | array size at least. It's necessary to write '\x00'==0 to get something | ||
2056 | that's true only with -std1. */ | ||
2057 | int osf4_cc_array ['\x00' == 0 ? 1 : -1]; | ||
2058 | |||
2059 | int test (int i, double x); | ||
2060 | struct s1 {int (*f) (int a);}; | ||
2061 | struct s2 {int (*f) (double a);}; | ||
2062 | int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); | ||
2063 | int argc; | ||
2064 | char **argv; | ||
2065 | int | ||
2066 | main () | ||
2067 | { | ||
2068 | return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; | ||
2069 | ; | ||
2070 | return 0; | ||
2071 | } | ||
2072 | _ACEOF | ||
2073 | # Don't try gcc -ansi; that turns off useful extensions and | ||
2074 | # breaks some systems' header files. | ||
2075 | # AIX -qlanglvl=ansi | ||
2076 | # Ultrix and OSF/1 -std1 | ||
2077 | # HP-UX 10.20 and later -Ae | ||
2078 | # HP-UX older versions -Aa -D_HPUX_SOURCE | ||
2079 | # SVR4 -Xc -D__EXTENSIONS__ | ||
2080 | for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" | ||
2081 | do | ||
2082 | CC="$ac_save_CC $ac_arg" | ||
2083 | rm -f conftest.$ac_objext | ||
2084 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2085 | (eval $ac_compile) 2>conftest.er1 | ||
2086 | ac_status=$? | ||
2087 | grep -v '^ *+' conftest.er1 >conftest.err | ||
2088 | rm -f conftest.er1 | ||
2089 | cat conftest.err >&5 | ||
2090 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2091 | (exit $ac_status); } && | ||
2092 | { ac_try='test -z "$ac_c_werror_flag" | ||
2093 | || test ! -s conftest.err' | ||
2094 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2095 | (eval $ac_try) 2>&5 | ||
2096 | ac_status=$? | ||
2097 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2098 | (exit $ac_status); }; } && | ||
2099 | { ac_try='test -s conftest.$ac_objext' | ||
2100 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2101 | (eval $ac_try) 2>&5 | ||
2102 | ac_status=$? | ||
2103 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2104 | (exit $ac_status); }; }; then | ||
2105 | ac_cv_prog_cc_stdc=$ac_arg | ||
2106 | break | ||
2107 | else | ||
2108 | echo "$as_me: failed program was:" >&5 | ||
2109 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
2110 | |||
2111 | fi | ||
2112 | rm -f conftest.err conftest.$ac_objext | ||
2113 | done | ||
2114 | rm -f conftest.$ac_ext conftest.$ac_objext | ||
2115 | CC=$ac_save_CC | ||
2116 | |||
2117 | fi | ||
2118 | |||
2119 | case "x$ac_cv_prog_cc_stdc" in | ||
2120 | x|xno) | ||
2121 | echo "$as_me:$LINENO: result: none needed" >&5 | ||
2122 | echo "${ECHO_T}none needed" >&6 ;; | ||
2123 | *) | ||
2124 | echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 | ||
2125 | echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 | ||
2126 | CC="$CC $ac_cv_prog_cc_stdc" ;; | ||
2127 | esac | ||
2128 | |||
1601 | # Some people use a C++ compiler to compile C. Since we use `exit', | 2129 | # Some people use a C++ compiler to compile C. Since we use `exit', |
1602 | # in C++ we need to declare it. In case someone uses the same compiler | 2130 | # in C++ we need to declare it. In case someone uses the same compiler |
1603 | # for both compiling C and C++ we need to have the C++ compiler decide | 2131 | # for both compiling C and C++ we need to have the C++ compiler decide |
@@ -1608,20 +2136,29 @@ cat >conftest.$ac_ext <<_ACEOF | |||
1608 | #endif | 2136 | #endif |
1609 | _ACEOF | 2137 | _ACEOF |
1610 | rm -f conftest.$ac_objext | 2138 | rm -f conftest.$ac_objext |
1611 | if { (eval echo "$as_me:1611: \"$ac_compile\"") >&5 | 2139 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
1612 | (eval $ac_compile) 2>&5 | 2140 | (eval $ac_compile) 2>conftest.er1 |
1613 | ac_status=$? | 2141 | ac_status=$? |
1614 | echo "$as_me:1614: \$? = $ac_status" >&5 | 2142 | grep -v '^ *+' conftest.er1 >conftest.err |
2143 | rm -f conftest.er1 | ||
2144 | cat conftest.err >&5 | ||
2145 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
1615 | (exit $ac_status); } && | 2146 | (exit $ac_status); } && |
1616 | { ac_try='test -s conftest.$ac_objext' | 2147 | { ac_try='test -z "$ac_c_werror_flag" |
1617 | { (eval echo "$as_me:1617: \"$ac_try\"") >&5 | 2148 | || test ! -s conftest.err' |
2149 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2150 | (eval $ac_try) 2>&5 | ||
2151 | ac_status=$? | ||
2152 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2153 | (exit $ac_status); }; } && | ||
2154 | { ac_try='test -s conftest.$ac_objext' | ||
2155 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
1618 | (eval $ac_try) 2>&5 | 2156 | (eval $ac_try) 2>&5 |
1619 | ac_status=$? | 2157 | ac_status=$? |
1620 | echo "$as_me:1620: \$? = $ac_status" >&5 | 2158 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
1621 | (exit $ac_status); }; }; then | 2159 | (exit $ac_status); }; }; then |
1622 | for ac_declaration in \ | 2160 | for ac_declaration in \ |
1623 | ''\ | 2161 | '' \ |
1624 | '#include <stdlib.h>' \ | ||
1625 | 'extern "C" void std::exit (int) throw (); using std::exit;' \ | 2162 | 'extern "C" void std::exit (int) throw (); using std::exit;' \ |
1626 | 'extern "C" void std::exit (int); using std::exit;' \ | 2163 | 'extern "C" void std::exit (int); using std::exit;' \ |
1627 | 'extern "C" void exit (int) throw ();' \ | 2164 | 'extern "C" void exit (int) throw ();' \ |
@@ -1629,10 +2166,13 @@ if { (eval echo "$as_me:1611: \"$ac_compile\"") >&5 | |||
1629 | 'void exit (int);' | 2166 | 'void exit (int);' |
1630 | do | 2167 | do |
1631 | cat >conftest.$ac_ext <<_ACEOF | 2168 | cat >conftest.$ac_ext <<_ACEOF |
1632 | #line 1632 "configure" | 2169 | /* confdefs.h. */ |
1633 | #include "confdefs.h" | 2170 | _ACEOF |
1634 | #include <stdlib.h> | 2171 | cat confdefs.h >>conftest.$ac_ext |
2172 | cat >>conftest.$ac_ext <<_ACEOF | ||
2173 | /* end confdefs.h. */ | ||
1635 | $ac_declaration | 2174 | $ac_declaration |
2175 | #include <stdlib.h> | ||
1636 | int | 2176 | int |
1637 | main () | 2177 | main () |
1638 | { | 2178 | { |
@@ -1642,27 +2182,41 @@ exit (42); | |||
1642 | } | 2182 | } |
1643 | _ACEOF | 2183 | _ACEOF |
1644 | rm -f conftest.$ac_objext | 2184 | rm -f conftest.$ac_objext |
1645 | if { (eval echo "$as_me:1645: \"$ac_compile\"") >&5 | 2185 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
1646 | (eval $ac_compile) 2>&5 | 2186 | (eval $ac_compile) 2>conftest.er1 |
1647 | ac_status=$? | 2187 | ac_status=$? |
1648 | echo "$as_me:1648: \$? = $ac_status" >&5 | 2188 | grep -v '^ *+' conftest.er1 >conftest.err |
2189 | rm -f conftest.er1 | ||
2190 | cat conftest.err >&5 | ||
2191 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
1649 | (exit $ac_status); } && | 2192 | (exit $ac_status); } && |
1650 | { ac_try='test -s conftest.$ac_objext' | 2193 | { ac_try='test -z "$ac_c_werror_flag" |
1651 | { (eval echo "$as_me:1651: \"$ac_try\"") >&5 | 2194 | || test ! -s conftest.err' |
2195 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
1652 | (eval $ac_try) 2>&5 | 2196 | (eval $ac_try) 2>&5 |
1653 | ac_status=$? | 2197 | ac_status=$? |
1654 | echo "$as_me:1654: \$? = $ac_status" >&5 | 2198 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
2199 | (exit $ac_status); }; } && | ||
2200 | { ac_try='test -s conftest.$ac_objext' | ||
2201 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2202 | (eval $ac_try) 2>&5 | ||
2203 | ac_status=$? | ||
2204 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
1655 | (exit $ac_status); }; }; then | 2205 | (exit $ac_status); }; }; then |
1656 | : | 2206 | : |
1657 | else | 2207 | else |
1658 | echo "$as_me: failed program was:" >&5 | 2208 | echo "$as_me: failed program was:" >&5 |
1659 | cat conftest.$ac_ext >&5 | 2209 | sed 's/^/| /' conftest.$ac_ext >&5 |
2210 | |||
1660 | continue | 2211 | continue |
1661 | fi | 2212 | fi |
1662 | rm -f conftest.$ac_objext conftest.$ac_ext | 2213 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
1663 | cat >conftest.$ac_ext <<_ACEOF | 2214 | cat >conftest.$ac_ext <<_ACEOF |
1664 | #line 1664 "configure" | 2215 | /* confdefs.h. */ |
1665 | #include "confdefs.h" | 2216 | _ACEOF |
2217 | cat confdefs.h >>conftest.$ac_ext | ||
2218 | cat >>conftest.$ac_ext <<_ACEOF | ||
2219 | /* end confdefs.h. */ | ||
1666 | $ac_declaration | 2220 | $ac_declaration |
1667 | int | 2221 | int |
1668 | main () | 2222 | main () |
@@ -1673,23 +2227,34 @@ exit (42); | |||
1673 | } | 2227 | } |
1674 | _ACEOF | 2228 | _ACEOF |
1675 | rm -f conftest.$ac_objext | 2229 | rm -f conftest.$ac_objext |
1676 | if { (eval echo "$as_me:1676: \"$ac_compile\"") >&5 | 2230 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
1677 | (eval $ac_compile) 2>&5 | 2231 | (eval $ac_compile) 2>conftest.er1 |
1678 | ac_status=$? | 2232 | ac_status=$? |
1679 | echo "$as_me:1679: \$? = $ac_status" >&5 | 2233 | grep -v '^ *+' conftest.er1 >conftest.err |
2234 | rm -f conftest.er1 | ||
2235 | cat conftest.err >&5 | ||
2236 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
1680 | (exit $ac_status); } && | 2237 | (exit $ac_status); } && |
1681 | { ac_try='test -s conftest.$ac_objext' | 2238 | { ac_try='test -z "$ac_c_werror_flag" |
1682 | { (eval echo "$as_me:1682: \"$ac_try\"") >&5 | 2239 | || test ! -s conftest.err' |
2240 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2241 | (eval $ac_try) 2>&5 | ||
2242 | ac_status=$? | ||
2243 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2244 | (exit $ac_status); }; } && | ||
2245 | { ac_try='test -s conftest.$ac_objext' | ||
2246 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
1683 | (eval $ac_try) 2>&5 | 2247 | (eval $ac_try) 2>&5 |
1684 | ac_status=$? | 2248 | ac_status=$? |
1685 | echo "$as_me:1685: \$? = $ac_status" >&5 | 2249 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
1686 | (exit $ac_status); }; }; then | 2250 | (exit $ac_status); }; }; then |
1687 | break | 2251 | break |
1688 | else | 2252 | else |
1689 | echo "$as_me: failed program was:" >&5 | 2253 | echo "$as_me: failed program was:" >&5 |
1690 | cat conftest.$ac_ext >&5 | 2254 | sed 's/^/| /' conftest.$ac_ext >&5 |
2255 | |||
1691 | fi | 2256 | fi |
1692 | rm -f conftest.$ac_objext conftest.$ac_ext | 2257 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
1693 | done | 2258 | done |
1694 | rm -f conftest* | 2259 | rm -f conftest* |
1695 | if test -n "$ac_declaration"; then | 2260 | if test -n "$ac_declaration"; then |
@@ -1700,9 +2265,10 @@ fi | |||
1700 | 2265 | ||
1701 | else | 2266 | else |
1702 | echo "$as_me: failed program was:" >&5 | 2267 | echo "$as_me: failed program was:" >&5 |
1703 | cat conftest.$ac_ext >&5 | 2268 | sed 's/^/| /' conftest.$ac_ext >&5 |
2269 | |||
1704 | fi | 2270 | fi |
1705 | rm -f conftest.$ac_objext conftest.$ac_ext | 2271 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
1706 | ac_ext=c | 2272 | ac_ext=c |
1707 | ac_cpp='$CPP $CPPFLAGS' | 2273 | ac_cpp='$CPP $CPPFLAGS' |
1708 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 2274 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
@@ -1726,7 +2292,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do | |||
1726 | fi | 2292 | fi |
1727 | done | 2293 | done |
1728 | if test -z "$ac_aux_dir"; then | 2294 | if test -z "$ac_aux_dir"; then |
1729 | { { echo "$as_me:1729: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 | 2295 | { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 |
1730 | echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} | 2296 | echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} |
1731 | { (exit 1); exit 1; }; } | 2297 | { (exit 1); exit 1; }; } |
1732 | fi | 2298 | fi |
@@ -1736,11 +2302,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. | |||
1736 | 2302 | ||
1737 | # Make sure we can run config.sub. | 2303 | # Make sure we can run config.sub. |
1738 | $ac_config_sub sun4 >/dev/null 2>&1 || | 2304 | $ac_config_sub sun4 >/dev/null 2>&1 || |
1739 | { { echo "$as_me:1739: error: cannot run $ac_config_sub" >&5 | 2305 | { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 |
1740 | echo "$as_me: error: cannot run $ac_config_sub" >&2;} | 2306 | echo "$as_me: error: cannot run $ac_config_sub" >&2;} |
1741 | { (exit 1); exit 1; }; } | 2307 | { (exit 1); exit 1; }; } |
1742 | 2308 | ||
1743 | echo "$as_me:1743: checking build system type" >&5 | 2309 | echo "$as_me:$LINENO: checking build system type" >&5 |
1744 | echo $ECHO_N "checking build system type... $ECHO_C" >&6 | 2310 | echo $ECHO_N "checking build system type... $ECHO_C" >&6 |
1745 | if test "${ac_cv_build+set}" = set; then | 2311 | if test "${ac_cv_build+set}" = set; then |
1746 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 2312 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -1749,23 +2315,24 @@ else | |||
1749 | test -z "$ac_cv_build_alias" && | 2315 | test -z "$ac_cv_build_alias" && |
1750 | ac_cv_build_alias=`$ac_config_guess` | 2316 | ac_cv_build_alias=`$ac_config_guess` |
1751 | test -z "$ac_cv_build_alias" && | 2317 | test -z "$ac_cv_build_alias" && |
1752 | { { echo "$as_me:1752: error: cannot guess build type; you must specify one" >&5 | 2318 | { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 |
1753 | echo "$as_me: error: cannot guess build type; you must specify one" >&2;} | 2319 | echo "$as_me: error: cannot guess build type; you must specify one" >&2;} |
1754 | { (exit 1); exit 1; }; } | 2320 | { (exit 1); exit 1; }; } |
1755 | ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || | 2321 | ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || |
1756 | { { echo "$as_me:1756: error: $ac_config_sub $ac_cv_build_alias failed." >&5 | 2322 | { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 |
1757 | echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} | 2323 | echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} |
1758 | { (exit 1); exit 1; }; } | 2324 | { (exit 1); exit 1; }; } |
1759 | 2325 | ||
1760 | fi | 2326 | fi |
1761 | echo "$as_me:1761: result: $ac_cv_build" >&5 | 2327 | echo "$as_me:$LINENO: result: $ac_cv_build" >&5 |
1762 | echo "${ECHO_T}$ac_cv_build" >&6 | 2328 | echo "${ECHO_T}$ac_cv_build" >&6 |
1763 | build=$ac_cv_build | 2329 | build=$ac_cv_build |
1764 | build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` | 2330 | build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` |
1765 | build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` | 2331 | build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` |
1766 | build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` | 2332 | build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` |
1767 | 2333 | ||
1768 | echo "$as_me:1768: checking host system type" >&5 | 2334 | |
2335 | echo "$as_me:$LINENO: checking host system type" >&5 | ||
1769 | echo $ECHO_N "checking host system type... $ECHO_C" >&6 | 2336 | echo $ECHO_N "checking host system type... $ECHO_C" >&6 |
1770 | if test "${ac_cv_host+set}" = set; then | 2337 | if test "${ac_cv_host+set}" = set; then |
1771 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 2338 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -1774,28 +2341,32 @@ else | |||
1774 | test -z "$ac_cv_host_alias" && | 2341 | test -z "$ac_cv_host_alias" && |
1775 | ac_cv_host_alias=$ac_cv_build_alias | 2342 | ac_cv_host_alias=$ac_cv_build_alias |
1776 | ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || | 2343 | ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || |
1777 | { { echo "$as_me:1777: error: $ac_config_sub $ac_cv_host_alias failed" >&5 | 2344 | { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 |
1778 | echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} | 2345 | echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} |
1779 | { (exit 1); exit 1; }; } | 2346 | { (exit 1); exit 1; }; } |
1780 | 2347 | ||
1781 | fi | 2348 | fi |
1782 | echo "$as_me:1782: result: $ac_cv_host" >&5 | 2349 | echo "$as_me:$LINENO: result: $ac_cv_host" >&5 |
1783 | echo "${ECHO_T}$ac_cv_host" >&6 | 2350 | echo "${ECHO_T}$ac_cv_host" >&6 |
1784 | host=$ac_cv_host | 2351 | host=$ac_cv_host |
1785 | host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` | 2352 | host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` |
1786 | host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` | 2353 | host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` |
1787 | host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` | 2354 | host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` |
1788 | 2355 | ||
1789 | echo "$as_me:1789: checking whether byte ordering is bigendian" >&5 | 2356 | |
2357 | |||
2358 | echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 | ||
1790 | echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 | 2359 | echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 |
1791 | if test "${ac_cv_c_bigendian+set}" = set; then | 2360 | if test "${ac_cv_c_bigendian+set}" = set; then |
1792 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 2361 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
1793 | else | 2362 | else |
1794 | ac_cv_c_bigendian=unknown | 2363 | # See if sys/param.h defines the BYTE_ORDER macro. |
1795 | # See if sys/param.h defines the BYTE_ORDER macro. | ||
1796 | cat >conftest.$ac_ext <<_ACEOF | 2364 | cat >conftest.$ac_ext <<_ACEOF |
1797 | #line 1797 "configure" | 2365 | /* confdefs.h. */ |
1798 | #include "confdefs.h" | 2366 | _ACEOF |
2367 | cat confdefs.h >>conftest.$ac_ext | ||
2368 | cat >>conftest.$ac_ext <<_ACEOF | ||
2369 | /* end confdefs.h. */ | ||
1799 | #include <sys/types.h> | 2370 | #include <sys/types.h> |
1800 | #include <sys/param.h> | 2371 | #include <sys/param.h> |
1801 | 2372 | ||
@@ -1811,21 +2382,34 @@ main () | |||
1811 | } | 2382 | } |
1812 | _ACEOF | 2383 | _ACEOF |
1813 | rm -f conftest.$ac_objext | 2384 | rm -f conftest.$ac_objext |
1814 | if { (eval echo "$as_me:1814: \"$ac_compile\"") >&5 | 2385 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
1815 | (eval $ac_compile) 2>&5 | 2386 | (eval $ac_compile) 2>conftest.er1 |
1816 | ac_status=$? | 2387 | ac_status=$? |
1817 | echo "$as_me:1817: \$? = $ac_status" >&5 | 2388 | grep -v '^ *+' conftest.er1 >conftest.err |
2389 | rm -f conftest.er1 | ||
2390 | cat conftest.err >&5 | ||
2391 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
1818 | (exit $ac_status); } && | 2392 | (exit $ac_status); } && |
1819 | { ac_try='test -s conftest.$ac_objext' | 2393 | { ac_try='test -z "$ac_c_werror_flag" |
1820 | { (eval echo "$as_me:1820: \"$ac_try\"") >&5 | 2394 | || test ! -s conftest.err' |
2395 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2396 | (eval $ac_try) 2>&5 | ||
2397 | ac_status=$? | ||
2398 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2399 | (exit $ac_status); }; } && | ||
2400 | { ac_try='test -s conftest.$ac_objext' | ||
2401 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
1821 | (eval $ac_try) 2>&5 | 2402 | (eval $ac_try) 2>&5 |
1822 | ac_status=$? | 2403 | ac_status=$? |
1823 | echo "$as_me:1823: \$? = $ac_status" >&5 | 2404 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
1824 | (exit $ac_status); }; }; then | 2405 | (exit $ac_status); }; }; then |
1825 | # It does; now see whether it defined to BIG_ENDIAN or not. | 2406 | # It does; now see whether it defined to BIG_ENDIAN or not. |
1826 | cat >conftest.$ac_ext <<_ACEOF | 2407 | cat >conftest.$ac_ext <<_ACEOF |
1827 | #line 1827 "configure" | 2408 | /* confdefs.h. */ |
1828 | #include "confdefs.h" | 2409 | _ACEOF |
2410 | cat confdefs.h >>conftest.$ac_ext | ||
2411 | cat >>conftest.$ac_ext <<_ACEOF | ||
2412 | /* end confdefs.h. */ | ||
1829 | #include <sys/types.h> | 2413 | #include <sys/types.h> |
1830 | #include <sys/param.h> | 2414 | #include <sys/param.h> |
1831 | 2415 | ||
@@ -1841,38 +2425,109 @@ main () | |||
1841 | } | 2425 | } |
1842 | _ACEOF | 2426 | _ACEOF |
1843 | rm -f conftest.$ac_objext | 2427 | rm -f conftest.$ac_objext |
1844 | if { (eval echo "$as_me:1844: \"$ac_compile\"") >&5 | 2428 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
1845 | (eval $ac_compile) 2>&5 | 2429 | (eval $ac_compile) 2>conftest.er1 |
1846 | ac_status=$? | 2430 | ac_status=$? |
1847 | echo "$as_me:1847: \$? = $ac_status" >&5 | 2431 | grep -v '^ *+' conftest.er1 >conftest.err |
2432 | rm -f conftest.er1 | ||
2433 | cat conftest.err >&5 | ||
2434 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
1848 | (exit $ac_status); } && | 2435 | (exit $ac_status); } && |
1849 | { ac_try='test -s conftest.$ac_objext' | 2436 | { ac_try='test -z "$ac_c_werror_flag" |
1850 | { (eval echo "$as_me:1850: \"$ac_try\"") >&5 | 2437 | || test ! -s conftest.err' |
2438 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
1851 | (eval $ac_try) 2>&5 | 2439 | (eval $ac_try) 2>&5 |
1852 | ac_status=$? | 2440 | ac_status=$? |
1853 | echo "$as_me:1853: \$? = $ac_status" >&5 | 2441 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
2442 | (exit $ac_status); }; } && | ||
2443 | { ac_try='test -s conftest.$ac_objext' | ||
2444 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2445 | (eval $ac_try) 2>&5 | ||
2446 | ac_status=$? | ||
2447 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
1854 | (exit $ac_status); }; }; then | 2448 | (exit $ac_status); }; }; then |
1855 | ac_cv_c_bigendian=yes | 2449 | ac_cv_c_bigendian=yes |
1856 | else | 2450 | else |
1857 | echo "$as_me: failed program was:" >&5 | 2451 | echo "$as_me: failed program was:" >&5 |
1858 | cat conftest.$ac_ext >&5 | 2452 | sed 's/^/| /' conftest.$ac_ext >&5 |
2453 | |||
1859 | ac_cv_c_bigendian=no | 2454 | ac_cv_c_bigendian=no |
1860 | fi | 2455 | fi |
1861 | rm -f conftest.$ac_objext conftest.$ac_ext | 2456 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
1862 | else | 2457 | else |
1863 | echo "$as_me: failed program was:" >&5 | 2458 | echo "$as_me: failed program was:" >&5 |
1864 | cat conftest.$ac_ext >&5 | 2459 | sed 's/^/| /' conftest.$ac_ext >&5 |
1865 | fi | 2460 | |
1866 | rm -f conftest.$ac_objext conftest.$ac_ext | 2461 | # It does not; compile a test program. |
1867 | if test $ac_cv_c_bigendian = unknown; then | ||
1868 | if test "$cross_compiling" = yes; then | 2462 | if test "$cross_compiling" = yes; then |
1869 | { { echo "$as_me:1869: error: cannot run test program while cross compiling" >&5 | 2463 | # try to guess the endianness by grepping values into an object file |
1870 | echo "$as_me: error: cannot run test program while cross compiling" >&2;} | 2464 | ac_cv_c_bigendian=unknown |
1871 | { (exit 1); exit 1; }; } | 2465 | cat >conftest.$ac_ext <<_ACEOF |
2466 | /* confdefs.h. */ | ||
2467 | _ACEOF | ||
2468 | cat confdefs.h >>conftest.$ac_ext | ||
2469 | cat >>conftest.$ac_ext <<_ACEOF | ||
2470 | /* end confdefs.h. */ | ||
2471 | short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; | ||
2472 | short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; | ||
2473 | void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } | ||
2474 | short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; | ||
2475 | short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; | ||
2476 | void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } | ||
2477 | int | ||
2478 | main () | ||
2479 | { | ||
2480 | _ascii (); _ebcdic (); | ||
2481 | ; | ||
2482 | return 0; | ||
2483 | } | ||
2484 | _ACEOF | ||
2485 | rm -f conftest.$ac_objext | ||
2486 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
2487 | (eval $ac_compile) 2>conftest.er1 | ||
2488 | ac_status=$? | ||
2489 | grep -v '^ *+' conftest.er1 >conftest.err | ||
2490 | rm -f conftest.er1 | ||
2491 | cat conftest.err >&5 | ||
2492 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2493 | (exit $ac_status); } && | ||
2494 | { ac_try='test -z "$ac_c_werror_flag" | ||
2495 | || test ! -s conftest.err' | ||
2496 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2497 | (eval $ac_try) 2>&5 | ||
2498 | ac_status=$? | ||
2499 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2500 | (exit $ac_status); }; } && | ||
2501 | { ac_try='test -s conftest.$ac_objext' | ||
2502 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2503 | (eval $ac_try) 2>&5 | ||
2504 | ac_status=$? | ||
2505 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2506 | (exit $ac_status); }; }; then | ||
2507 | if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then | ||
2508 | ac_cv_c_bigendian=yes | ||
2509 | fi | ||
2510 | if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then | ||
2511 | if test "$ac_cv_c_bigendian" = unknown; then | ||
2512 | ac_cv_c_bigendian=no | ||
2513 | else | ||
2514 | # finding both strings is unlikely to happen, but who knows? | ||
2515 | ac_cv_c_bigendian=unknown | ||
2516 | fi | ||
2517 | fi | ||
2518 | else | ||
2519 | echo "$as_me: failed program was:" >&5 | ||
2520 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
2521 | |||
2522 | fi | ||
2523 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
1872 | else | 2524 | else |
1873 | cat >conftest.$ac_ext <<_ACEOF | 2525 | cat >conftest.$ac_ext <<_ACEOF |
1874 | #line 1874 "configure" | 2526 | /* confdefs.h. */ |
1875 | #include "confdefs.h" | 2527 | _ACEOF |
2528 | cat confdefs.h >>conftest.$ac_ext | ||
2529 | cat >>conftest.$ac_ext <<_ACEOF | ||
2530 | /* end confdefs.h. */ | ||
1876 | int | 2531 | int |
1877 | main () | 2532 | main () |
1878 | { | 2533 | { |
@@ -1887,43 +2542,56 @@ main () | |||
1887 | } | 2542 | } |
1888 | _ACEOF | 2543 | _ACEOF |
1889 | rm -f conftest$ac_exeext | 2544 | rm -f conftest$ac_exeext |
1890 | if { (eval echo "$as_me:1890: \"$ac_link\"") >&5 | 2545 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
1891 | (eval $ac_link) 2>&5 | 2546 | (eval $ac_link) 2>&5 |
1892 | ac_status=$? | 2547 | ac_status=$? |
1893 | echo "$as_me:1893: \$? = $ac_status" >&5 | 2548 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
1894 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | 2549 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
1895 | { (eval echo "$as_me:1895: \"$ac_try\"") >&5 | 2550 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
1896 | (eval $ac_try) 2>&5 | 2551 | (eval $ac_try) 2>&5 |
1897 | ac_status=$? | 2552 | ac_status=$? |
1898 | echo "$as_me:1898: \$? = $ac_status" >&5 | 2553 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
1899 | (exit $ac_status); }; }; then | 2554 | (exit $ac_status); }; }; then |
1900 | ac_cv_c_bigendian=no | 2555 | ac_cv_c_bigendian=no |
1901 | else | 2556 | else |
1902 | echo "$as_me: program exited with status $ac_status" >&5 | 2557 | echo "$as_me: program exited with status $ac_status" >&5 |
1903 | echo "$as_me: failed program was:" >&5 | 2558 | echo "$as_me: failed program was:" >&5 |
1904 | cat conftest.$ac_ext >&5 | 2559 | sed 's/^/| /' conftest.$ac_ext >&5 |
2560 | |||
2561 | ( exit $ac_status ) | ||
1905 | ac_cv_c_bigendian=yes | 2562 | ac_cv_c_bigendian=yes |
1906 | fi | 2563 | fi |
1907 | rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | 2564 | rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext |
1908 | fi | 2565 | fi |
1909 | fi | 2566 | fi |
2567 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
1910 | fi | 2568 | fi |
1911 | echo "$as_me:1911: result: $ac_cv_c_bigendian" >&5 | 2569 | echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 |
1912 | echo "${ECHO_T}$ac_cv_c_bigendian" >&6 | 2570 | echo "${ECHO_T}$ac_cv_c_bigendian" >&6 |
1913 | if test $ac_cv_c_bigendian = yes; then | 2571 | case $ac_cv_c_bigendian in |
2572 | yes) | ||
1914 | 2573 | ||
1915 | cat >>confdefs.h <<\EOF | 2574 | cat >>confdefs.h <<\_ACEOF |
1916 | #define WORDS_BIGENDIAN 1 | 2575 | #define WORDS_BIGENDIAN 1 |
1917 | EOF | 2576 | _ACEOF |
2577 | ;; | ||
2578 | no) | ||
2579 | ;; | ||
2580 | *) | ||
2581 | { { echo "$as_me:$LINENO: error: unknown endianness | ||
2582 | presetting ac_cv_c_bigendian=no (or yes) will help" >&5 | ||
2583 | echo "$as_me: error: unknown endianness | ||
2584 | presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} | ||
2585 | { (exit 1); exit 1; }; } ;; | ||
2586 | esac | ||
1918 | 2587 | ||
1919 | fi | ||
1920 | 2588 | ||
1921 | # Checks for programs. | 2589 | # Checks for programs. |
1922 | for ac_prog in mawk gawk nawk awk | 2590 | for ac_prog in gawk mawk nawk awk |
1923 | do | 2591 | do |
1924 | # Extract the first word of "$ac_prog", so it can be a program name with args. | 2592 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
1925 | set dummy $ac_prog; ac_word=$2 | 2593 | set dummy $ac_prog; ac_word=$2 |
1926 | echo "$as_me:1926: checking for $ac_word" >&5 | 2594 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
1927 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 2595 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
1928 | if test "${ac_cv_prog_AWK+set}" = set; then | 2596 | if test "${ac_cv_prog_AWK+set}" = set; then |
1929 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 2597 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -1931,25 +2599,28 @@ else | |||
1931 | if test -n "$AWK"; then | 2599 | if test -n "$AWK"; then |
1932 | ac_cv_prog_AWK="$AWK" # Let the user override the test. | 2600 | ac_cv_prog_AWK="$AWK" # Let the user override the test. |
1933 | else | 2601 | else |
1934 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 2602 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1935 | ac_dummy="$PATH" | 2603 | for as_dir in $PATH |
1936 | for ac_dir in $ac_dummy; do | 2604 | do |
1937 | IFS=$ac_save_IFS | 2605 | IFS=$as_save_IFS |
1938 | test -z "$ac_dir" && ac_dir=. | 2606 | test -z "$as_dir" && as_dir=. |
1939 | $as_executable_p "$ac_dir/$ac_word" || continue | 2607 | for ac_exec_ext in '' $ac_executable_extensions; do |
1940 | ac_cv_prog_AWK="$ac_prog" | 2608 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1941 | echo "$as_me:1941: found $ac_dir/$ac_word" >&5 | 2609 | ac_cv_prog_AWK="$ac_prog" |
1942 | break | 2610 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2611 | break 2 | ||
2612 | fi | ||
2613 | done | ||
1943 | done | 2614 | done |
1944 | 2615 | ||
1945 | fi | 2616 | fi |
1946 | fi | 2617 | fi |
1947 | AWK=$ac_cv_prog_AWK | 2618 | AWK=$ac_cv_prog_AWK |
1948 | if test -n "$AWK"; then | 2619 | if test -n "$AWK"; then |
1949 | echo "$as_me:1949: result: $AWK" >&5 | 2620 | echo "$as_me:$LINENO: result: $AWK" >&5 |
1950 | echo "${ECHO_T}$AWK" >&6 | 2621 | echo "${ECHO_T}$AWK" >&6 |
1951 | else | 2622 | else |
1952 | echo "$as_me:1952: result: no" >&5 | 2623 | echo "$as_me:$LINENO: result: no" >&5 |
1953 | echo "${ECHO_T}no" >&6 | 2624 | echo "${ECHO_T}no" >&6 |
1954 | fi | 2625 | fi |
1955 | 2626 | ||
@@ -1961,7 +2632,7 @@ ac_cpp='$CPP $CPPFLAGS' | |||
1961 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 2632 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
1962 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | 2633 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
1963 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | 2634 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
1964 | echo "$as_me:1964: checking how to run the C preprocessor" >&5 | 2635 | echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 |
1965 | echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 | 2636 | echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 |
1966 | # On Suns, sometimes $CPP names a directory. | 2637 | # On Suns, sometimes $CPP names a directory. |
1967 | if test -n "$CPP" && test -d "$CPP"; then | 2638 | if test -n "$CPP" && test -d "$CPP"; then |
@@ -1979,24 +2650,34 @@ for ac_c_preproc_warn_flag in '' yes | |||
1979 | do | 2650 | do |
1980 | # Use a header file that comes with gcc, so configuring glibc | 2651 | # Use a header file that comes with gcc, so configuring glibc |
1981 | # with a fresh cross-compiler works. | 2652 | # with a fresh cross-compiler works. |
2653 | # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
2654 | # <limits.h> exists even on freestanding compilers. | ||
1982 | # On the NeXT, cc -E runs the code through the compiler's parser, | 2655 | # On the NeXT, cc -E runs the code through the compiler's parser, |
1983 | # not just through cpp. "Syntax error" is here to catch this case. | 2656 | # not just through cpp. "Syntax error" is here to catch this case. |
1984 | cat >conftest.$ac_ext <<_ACEOF | 2657 | cat >conftest.$ac_ext <<_ACEOF |
1985 | #line 1985 "configure" | 2658 | /* confdefs.h. */ |
1986 | #include "confdefs.h" | ||
1987 | #include <assert.h> | ||
1988 | Syntax error | ||
1989 | _ACEOF | 2659 | _ACEOF |
1990 | if { (eval echo "$as_me:1990: \"$ac_cpp conftest.$ac_ext\"") >&5 | 2660 | cat confdefs.h >>conftest.$ac_ext |
2661 | cat >>conftest.$ac_ext <<_ACEOF | ||
2662 | /* end confdefs.h. */ | ||
2663 | #ifdef __STDC__ | ||
2664 | # include <limits.h> | ||
2665 | #else | ||
2666 | # include <assert.h> | ||
2667 | #endif | ||
2668 | Syntax error | ||
2669 | _ACEOF | ||
2670 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
1991 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | 2671 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
1992 | ac_status=$? | 2672 | ac_status=$? |
1993 | egrep -v '^ *\+' conftest.er1 >conftest.err | 2673 | grep -v '^ *+' conftest.er1 >conftest.err |
1994 | rm -f conftest.er1 | 2674 | rm -f conftest.er1 |
1995 | cat conftest.err >&5 | 2675 | cat conftest.err >&5 |
1996 | echo "$as_me:1996: \$? = $ac_status" >&5 | 2676 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
1997 | (exit $ac_status); } >/dev/null; then | 2677 | (exit $ac_status); } >/dev/null; then |
1998 | if test -s conftest.err; then | 2678 | if test -s conftest.err; then |
1999 | ac_cpp_err=$ac_c_preproc_warn_flag | 2679 | ac_cpp_err=$ac_c_preproc_warn_flag |
2680 | ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
2000 | else | 2681 | else |
2001 | ac_cpp_err= | 2682 | ac_cpp_err= |
2002 | fi | 2683 | fi |
@@ -2007,7 +2688,8 @@ if test -z "$ac_cpp_err"; then | |||
2007 | : | 2688 | : |
2008 | else | 2689 | else |
2009 | echo "$as_me: failed program was:" >&5 | 2690 | echo "$as_me: failed program was:" >&5 |
2010 | cat conftest.$ac_ext >&5 | 2691 | sed 's/^/| /' conftest.$ac_ext >&5 |
2692 | |||
2011 | # Broken: fails on valid input. | 2693 | # Broken: fails on valid input. |
2012 | continue | 2694 | continue |
2013 | fi | 2695 | fi |
@@ -2016,20 +2698,24 @@ rm -f conftest.err conftest.$ac_ext | |||
2016 | # OK, works on sane cases. Now check whether non-existent headers | 2698 | # OK, works on sane cases. Now check whether non-existent headers |
2017 | # can be detected and how. | 2699 | # can be detected and how. |
2018 | cat >conftest.$ac_ext <<_ACEOF | 2700 | cat >conftest.$ac_ext <<_ACEOF |
2019 | #line 2019 "configure" | 2701 | /* confdefs.h. */ |
2020 | #include "confdefs.h" | 2702 | _ACEOF |
2703 | cat confdefs.h >>conftest.$ac_ext | ||
2704 | cat >>conftest.$ac_ext <<_ACEOF | ||
2705 | /* end confdefs.h. */ | ||
2021 | #include <ac_nonexistent.h> | 2706 | #include <ac_nonexistent.h> |
2022 | _ACEOF | 2707 | _ACEOF |
2023 | if { (eval echo "$as_me:2023: \"$ac_cpp conftest.$ac_ext\"") >&5 | 2708 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 |
2024 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | 2709 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
2025 | ac_status=$? | 2710 | ac_status=$? |
2026 | egrep -v '^ *\+' conftest.er1 >conftest.err | 2711 | grep -v '^ *+' conftest.er1 >conftest.err |
2027 | rm -f conftest.er1 | 2712 | rm -f conftest.er1 |
2028 | cat conftest.err >&5 | 2713 | cat conftest.err >&5 |
2029 | echo "$as_me:2029: \$? = $ac_status" >&5 | 2714 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
2030 | (exit $ac_status); } >/dev/null; then | 2715 | (exit $ac_status); } >/dev/null; then |
2031 | if test -s conftest.err; then | 2716 | if test -s conftest.err; then |
2032 | ac_cpp_err=$ac_c_preproc_warn_flag | 2717 | ac_cpp_err=$ac_c_preproc_warn_flag |
2718 | ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
2033 | else | 2719 | else |
2034 | ac_cpp_err= | 2720 | ac_cpp_err= |
2035 | fi | 2721 | fi |
@@ -2041,7 +2727,8 @@ if test -z "$ac_cpp_err"; then | |||
2041 | continue | 2727 | continue |
2042 | else | 2728 | else |
2043 | echo "$as_me: failed program was:" >&5 | 2729 | echo "$as_me: failed program was:" >&5 |
2044 | cat conftest.$ac_ext >&5 | 2730 | sed 's/^/| /' conftest.$ac_ext >&5 |
2731 | |||
2045 | # Passes both tests. | 2732 | # Passes both tests. |
2046 | ac_preproc_ok=: | 2733 | ac_preproc_ok=: |
2047 | break | 2734 | break |
@@ -2063,31 +2750,41 @@ fi | |||
2063 | else | 2750 | else |
2064 | ac_cv_prog_CPP=$CPP | 2751 | ac_cv_prog_CPP=$CPP |
2065 | fi | 2752 | fi |
2066 | echo "$as_me:2066: result: $CPP" >&5 | 2753 | echo "$as_me:$LINENO: result: $CPP" >&5 |
2067 | echo "${ECHO_T}$CPP" >&6 | 2754 | echo "${ECHO_T}$CPP" >&6 |
2068 | ac_preproc_ok=false | 2755 | ac_preproc_ok=false |
2069 | for ac_c_preproc_warn_flag in '' yes | 2756 | for ac_c_preproc_warn_flag in '' yes |
2070 | do | 2757 | do |
2071 | # Use a header file that comes with gcc, so configuring glibc | 2758 | # Use a header file that comes with gcc, so configuring glibc |
2072 | # with a fresh cross-compiler works. | 2759 | # with a fresh cross-compiler works. |
2760 | # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | ||
2761 | # <limits.h> exists even on freestanding compilers. | ||
2073 | # On the NeXT, cc -E runs the code through the compiler's parser, | 2762 | # On the NeXT, cc -E runs the code through the compiler's parser, |
2074 | # not just through cpp. "Syntax error" is here to catch this case. | 2763 | # not just through cpp. "Syntax error" is here to catch this case. |
2075 | cat >conftest.$ac_ext <<_ACEOF | 2764 | cat >conftest.$ac_ext <<_ACEOF |
2076 | #line 2076 "configure" | 2765 | /* confdefs.h. */ |
2077 | #include "confdefs.h" | ||
2078 | #include <assert.h> | ||
2079 | Syntax error | ||
2080 | _ACEOF | 2766 | _ACEOF |
2081 | if { (eval echo "$as_me:2081: \"$ac_cpp conftest.$ac_ext\"") >&5 | 2767 | cat confdefs.h >>conftest.$ac_ext |
2768 | cat >>conftest.$ac_ext <<_ACEOF | ||
2769 | /* end confdefs.h. */ | ||
2770 | #ifdef __STDC__ | ||
2771 | # include <limits.h> | ||
2772 | #else | ||
2773 | # include <assert.h> | ||
2774 | #endif | ||
2775 | Syntax error | ||
2776 | _ACEOF | ||
2777 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
2082 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | 2778 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
2083 | ac_status=$? | 2779 | ac_status=$? |
2084 | egrep -v '^ *\+' conftest.er1 >conftest.err | 2780 | grep -v '^ *+' conftest.er1 >conftest.err |
2085 | rm -f conftest.er1 | 2781 | rm -f conftest.er1 |
2086 | cat conftest.err >&5 | 2782 | cat conftest.err >&5 |
2087 | echo "$as_me:2087: \$? = $ac_status" >&5 | 2783 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
2088 | (exit $ac_status); } >/dev/null; then | 2784 | (exit $ac_status); } >/dev/null; then |
2089 | if test -s conftest.err; then | 2785 | if test -s conftest.err; then |
2090 | ac_cpp_err=$ac_c_preproc_warn_flag | 2786 | ac_cpp_err=$ac_c_preproc_warn_flag |
2787 | ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
2091 | else | 2788 | else |
2092 | ac_cpp_err= | 2789 | ac_cpp_err= |
2093 | fi | 2790 | fi |
@@ -2098,7 +2795,8 @@ if test -z "$ac_cpp_err"; then | |||
2098 | : | 2795 | : |
2099 | else | 2796 | else |
2100 | echo "$as_me: failed program was:" >&5 | 2797 | echo "$as_me: failed program was:" >&5 |
2101 | cat conftest.$ac_ext >&5 | 2798 | sed 's/^/| /' conftest.$ac_ext >&5 |
2799 | |||
2102 | # Broken: fails on valid input. | 2800 | # Broken: fails on valid input. |
2103 | continue | 2801 | continue |
2104 | fi | 2802 | fi |
@@ -2107,20 +2805,24 @@ rm -f conftest.err conftest.$ac_ext | |||
2107 | # OK, works on sane cases. Now check whether non-existent headers | 2805 | # OK, works on sane cases. Now check whether non-existent headers |
2108 | # can be detected and how. | 2806 | # can be detected and how. |
2109 | cat >conftest.$ac_ext <<_ACEOF | 2807 | cat >conftest.$ac_ext <<_ACEOF |
2110 | #line 2110 "configure" | 2808 | /* confdefs.h. */ |
2111 | #include "confdefs.h" | 2809 | _ACEOF |
2810 | cat confdefs.h >>conftest.$ac_ext | ||
2811 | cat >>conftest.$ac_ext <<_ACEOF | ||
2812 | /* end confdefs.h. */ | ||
2112 | #include <ac_nonexistent.h> | 2813 | #include <ac_nonexistent.h> |
2113 | _ACEOF | 2814 | _ACEOF |
2114 | if { (eval echo "$as_me:2114: \"$ac_cpp conftest.$ac_ext\"") >&5 | 2815 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 |
2115 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | 2816 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
2116 | ac_status=$? | 2817 | ac_status=$? |
2117 | egrep -v '^ *\+' conftest.er1 >conftest.err | 2818 | grep -v '^ *+' conftest.er1 >conftest.err |
2118 | rm -f conftest.er1 | 2819 | rm -f conftest.er1 |
2119 | cat conftest.err >&5 | 2820 | cat conftest.err >&5 |
2120 | echo "$as_me:2120: \$? = $ac_status" >&5 | 2821 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
2121 | (exit $ac_status); } >/dev/null; then | 2822 | (exit $ac_status); } >/dev/null; then |
2122 | if test -s conftest.err; then | 2823 | if test -s conftest.err; then |
2123 | ac_cpp_err=$ac_c_preproc_warn_flag | 2824 | ac_cpp_err=$ac_c_preproc_warn_flag |
2825 | ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
2124 | else | 2826 | else |
2125 | ac_cpp_err= | 2827 | ac_cpp_err= |
2126 | fi | 2828 | fi |
@@ -2132,7 +2834,8 @@ if test -z "$ac_cpp_err"; then | |||
2132 | continue | 2834 | continue |
2133 | else | 2835 | else |
2134 | echo "$as_me: failed program was:" >&5 | 2836 | echo "$as_me: failed program was:" >&5 |
2135 | cat conftest.$ac_ext >&5 | 2837 | sed 's/^/| /' conftest.$ac_ext >&5 |
2838 | |||
2136 | # Passes both tests. | 2839 | # Passes both tests. |
2137 | ac_preproc_ok=: | 2840 | ac_preproc_ok=: |
2138 | break | 2841 | break |
@@ -2145,8 +2848,10 @@ rm -f conftest.err conftest.$ac_ext | |||
2145 | if $ac_preproc_ok; then | 2848 | if $ac_preproc_ok; then |
2146 | : | 2849 | : |
2147 | else | 2850 | else |
2148 | { { echo "$as_me:2148: error: C preprocessor \"$CPP\" fails sanity check" >&5 | 2851 | { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check |
2149 | echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} | 2852 | See \`config.log' for more details." >&5 |
2853 | echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check | ||
2854 | See \`config.log' for more details." >&2;} | ||
2150 | { (exit 1); exit 1; }; } | 2855 | { (exit 1); exit 1; }; } |
2151 | fi | 2856 | fi |
2152 | 2857 | ||
@@ -2159,7 +2864,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu | |||
2159 | if test -n "$ac_tool_prefix"; then | 2864 | if test -n "$ac_tool_prefix"; then |
2160 | # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. | 2865 | # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. |
2161 | set dummy ${ac_tool_prefix}ranlib; ac_word=$2 | 2866 | set dummy ${ac_tool_prefix}ranlib; ac_word=$2 |
2162 | echo "$as_me:2162: checking for $ac_word" >&5 | 2867 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
2163 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 2868 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
2164 | if test "${ac_cv_prog_RANLIB+set}" = set; then | 2869 | if test "${ac_cv_prog_RANLIB+set}" = set; then |
2165 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 2870 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -2167,25 +2872,28 @@ else | |||
2167 | if test -n "$RANLIB"; then | 2872 | if test -n "$RANLIB"; then |
2168 | ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. | 2873 | ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. |
2169 | else | 2874 | else |
2170 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 2875 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2171 | ac_dummy="$PATH" | 2876 | for as_dir in $PATH |
2172 | for ac_dir in $ac_dummy; do | 2877 | do |
2173 | IFS=$ac_save_IFS | 2878 | IFS=$as_save_IFS |
2174 | test -z "$ac_dir" && ac_dir=. | 2879 | test -z "$as_dir" && as_dir=. |
2175 | $as_executable_p "$ac_dir/$ac_word" || continue | 2880 | for ac_exec_ext in '' $ac_executable_extensions; do |
2176 | ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" | 2881 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2177 | echo "$as_me:2177: found $ac_dir/$ac_word" >&5 | 2882 | ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" |
2178 | break | 2883 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2884 | break 2 | ||
2885 | fi | ||
2886 | done | ||
2179 | done | 2887 | done |
2180 | 2888 | ||
2181 | fi | 2889 | fi |
2182 | fi | 2890 | fi |
2183 | RANLIB=$ac_cv_prog_RANLIB | 2891 | RANLIB=$ac_cv_prog_RANLIB |
2184 | if test -n "$RANLIB"; then | 2892 | if test -n "$RANLIB"; then |
2185 | echo "$as_me:2185: result: $RANLIB" >&5 | 2893 | echo "$as_me:$LINENO: result: $RANLIB" >&5 |
2186 | echo "${ECHO_T}$RANLIB" >&6 | 2894 | echo "${ECHO_T}$RANLIB" >&6 |
2187 | else | 2895 | else |
2188 | echo "$as_me:2188: result: no" >&5 | 2896 | echo "$as_me:$LINENO: result: no" >&5 |
2189 | echo "${ECHO_T}no" >&6 | 2897 | echo "${ECHO_T}no" >&6 |
2190 | fi | 2898 | fi |
2191 | 2899 | ||
@@ -2194,7 +2902,7 @@ if test -z "$ac_cv_prog_RANLIB"; then | |||
2194 | ac_ct_RANLIB=$RANLIB | 2902 | ac_ct_RANLIB=$RANLIB |
2195 | # Extract the first word of "ranlib", so it can be a program name with args. | 2903 | # Extract the first word of "ranlib", so it can be a program name with args. |
2196 | set dummy ranlib; ac_word=$2 | 2904 | set dummy ranlib; ac_word=$2 |
2197 | echo "$as_me:2197: checking for $ac_word" >&5 | 2905 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
2198 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 2906 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
2199 | if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then | 2907 | if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then |
2200 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 2908 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -2202,15 +2910,18 @@ else | |||
2202 | if test -n "$ac_ct_RANLIB"; then | 2910 | if test -n "$ac_ct_RANLIB"; then |
2203 | ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. | 2911 | ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. |
2204 | else | 2912 | else |
2205 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 2913 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2206 | ac_dummy="$PATH" | 2914 | for as_dir in $PATH |
2207 | for ac_dir in $ac_dummy; do | 2915 | do |
2208 | IFS=$ac_save_IFS | 2916 | IFS=$as_save_IFS |
2209 | test -z "$ac_dir" && ac_dir=. | 2917 | test -z "$as_dir" && as_dir=. |
2210 | $as_executable_p "$ac_dir/$ac_word" || continue | 2918 | for ac_exec_ext in '' $ac_executable_extensions; do |
2211 | ac_cv_prog_ac_ct_RANLIB="ranlib" | 2919 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2212 | echo "$as_me:2212: found $ac_dir/$ac_word" >&5 | 2920 | ac_cv_prog_ac_ct_RANLIB="ranlib" |
2213 | break | 2921 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2922 | break 2 | ||
2923 | fi | ||
2924 | done | ||
2214 | done | 2925 | done |
2215 | 2926 | ||
2216 | test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" | 2927 | test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" |
@@ -2218,10 +2929,10 @@ fi | |||
2218 | fi | 2929 | fi |
2219 | ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB | 2930 | ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB |
2220 | if test -n "$ac_ct_RANLIB"; then | 2931 | if test -n "$ac_ct_RANLIB"; then |
2221 | echo "$as_me:2221: result: $ac_ct_RANLIB" >&5 | 2932 | echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 |
2222 | echo "${ECHO_T}$ac_ct_RANLIB" >&6 | 2933 | echo "${ECHO_T}$ac_ct_RANLIB" >&6 |
2223 | else | 2934 | else |
2224 | echo "$as_me:2224: result: no" >&5 | 2935 | echo "$as_me:$LINENO: result: no" >&5 |
2225 | echo "${ECHO_T}no" >&6 | 2936 | echo "${ECHO_T}no" >&6 |
2226 | fi | 2937 | fi |
2227 | 2938 | ||
@@ -2241,44 +2952,51 @@ fi | |||
2241 | # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag | 2952 | # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag |
2242 | # AFS /usr/afsws/bin/install, which mishandles nonexistent args | 2953 | # AFS /usr/afsws/bin/install, which mishandles nonexistent args |
2243 | # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" | 2954 | # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" |
2955 | # OS/2's system install, which has a completely different semantic | ||
2244 | # ./install, which can be erroneously created by make from ./install.sh. | 2956 | # ./install, which can be erroneously created by make from ./install.sh. |
2245 | echo "$as_me:2245: checking for a BSD compatible install" >&5 | 2957 | echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 |
2246 | echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 | 2958 | echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 |
2247 | if test -z "$INSTALL"; then | 2959 | if test -z "$INSTALL"; then |
2248 | if test "${ac_cv_path_install+set}" = set; then | 2960 | if test "${ac_cv_path_install+set}" = set; then |
2249 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 2961 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
2250 | else | 2962 | else |
2251 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 2963 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2252 | for ac_dir in $PATH; do | 2964 | for as_dir in $PATH |
2253 | IFS=$ac_save_IFS | 2965 | do |
2254 | # Account for people who put trailing slashes in PATH elements. | 2966 | IFS=$as_save_IFS |
2255 | case $ac_dir/ in | 2967 | test -z "$as_dir" && as_dir=. |
2256 | / | ./ | .// | /cC/* \ | 2968 | # Account for people who put trailing slashes in PATH elements. |
2257 | | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ | 2969 | case $as_dir/ in |
2258 | | /usr/ucb/* ) ;; | 2970 | ./ | .// | /cC/* | \ |
2259 | *) | 2971 | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ |
2260 | # OSF1 and SCO ODT 3.0 have their own names for install. | 2972 | ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ |
2261 | # Don't use installbsd from OSF since it installs stuff as root | 2973 | /usr/ucb/* ) ;; |
2262 | # by default. | 2974 | *) |
2263 | for ac_prog in ginstall scoinst install; do | 2975 | # OSF1 and SCO ODT 3.0 have their own names for install. |
2264 | if $as_executable_p "$ac_dir/$ac_prog"; then | 2976 | # Don't use installbsd from OSF since it installs stuff as root |
2977 | # by default. | ||
2978 | for ac_prog in ginstall scoinst install; do | ||
2979 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2980 | if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then | ||
2265 | if test $ac_prog = install && | 2981 | if test $ac_prog = install && |
2266 | grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then | 2982 | grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then |
2267 | # AIX install. It has an incompatible calling convention. | 2983 | # AIX install. It has an incompatible calling convention. |
2268 | : | 2984 | : |
2269 | elif test $ac_prog = install && | 2985 | elif test $ac_prog = install && |
2270 | grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then | 2986 | grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then |
2271 | # program-specific install script used by HP pwplus--don't use. | 2987 | # program-specific install script used by HP pwplus--don't use. |
2272 | : | 2988 | : |
2273 | else | 2989 | else |
2274 | ac_cv_path_install="$ac_dir/$ac_prog -c" | 2990 | ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" |
2275 | break 2 | 2991 | break 3 |
2276 | fi | 2992 | fi |
2277 | fi | 2993 | fi |
2278 | done | 2994 | done |
2279 | ;; | 2995 | done |
2280 | esac | 2996 | ;; |
2281 | done | 2997 | esac |
2998 | done | ||
2999 | |||
2282 | 3000 | ||
2283 | fi | 3001 | fi |
2284 | if test "${ac_cv_path_install+set}" = set; then | 3002 | if test "${ac_cv_path_install+set}" = set; then |
@@ -2291,7 +3009,7 @@ fi | |||
2291 | INSTALL=$ac_install_sh | 3009 | INSTALL=$ac_install_sh |
2292 | fi | 3010 | fi |
2293 | fi | 3011 | fi |
2294 | echo "$as_me:2294: result: $INSTALL" >&5 | 3012 | echo "$as_me:$LINENO: result: $INSTALL" >&5 |
2295 | echo "${ECHO_T}$INSTALL" >&6 | 3013 | echo "${ECHO_T}$INSTALL" >&6 |
2296 | 3014 | ||
2297 | # Use test -z because SunOS4 sh mishandles braces in ${var-val}. | 3015 | # Use test -z because SunOS4 sh mishandles braces in ${var-val}. |
@@ -2304,7 +3022,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' | |||
2304 | 3022 | ||
2305 | # Extract the first word of "ar", so it can be a program name with args. | 3023 | # Extract the first word of "ar", so it can be a program name with args. |
2306 | set dummy ar; ac_word=$2 | 3024 | set dummy ar; ac_word=$2 |
2307 | echo "$as_me:2307: checking for $ac_word" >&5 | 3025 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
2308 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 3026 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
2309 | if test "${ac_cv_path_AR+set}" = set; then | 3027 | if test "${ac_cv_path_AR+set}" = set; then |
2310 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3028 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -2314,16 +3032,18 @@ else | |||
2314 | ac_cv_path_AR="$AR" # Let the user override the test with a path. | 3032 | ac_cv_path_AR="$AR" # Let the user override the test with a path. |
2315 | ;; | 3033 | ;; |
2316 | *) | 3034 | *) |
2317 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 3035 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2318 | ac_dummy="$PATH" | 3036 | for as_dir in $PATH |
2319 | for ac_dir in $ac_dummy; do | 3037 | do |
2320 | IFS=$ac_save_IFS | 3038 | IFS=$as_save_IFS |
2321 | test -z "$ac_dir" && ac_dir=. | 3039 | test -z "$as_dir" && as_dir=. |
2322 | if $as_executable_p "$ac_dir/$ac_word"; then | 3040 | for ac_exec_ext in '' $ac_executable_extensions; do |
2323 | ac_cv_path_AR="$ac_dir/$ac_word" | 3041 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2324 | echo "$as_me:2324: found $ac_dir/$ac_word" >&5 | 3042 | ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext" |
2325 | break | 3043 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2326 | fi | 3044 | break 2 |
3045 | fi | ||
3046 | done | ||
2327 | done | 3047 | done |
2328 | 3048 | ||
2329 | ;; | 3049 | ;; |
@@ -2332,10 +3052,88 @@ fi | |||
2332 | AR=$ac_cv_path_AR | 3052 | AR=$ac_cv_path_AR |
2333 | 3053 | ||
2334 | if test -n "$AR"; then | 3054 | if test -n "$AR"; then |
2335 | echo "$as_me:2335: result: $AR" >&5 | 3055 | echo "$as_me:$LINENO: result: $AR" >&5 |
2336 | echo "${ECHO_T}$AR" >&6 | 3056 | echo "${ECHO_T}$AR" >&6 |
2337 | else | 3057 | else |
2338 | echo "$as_me:2338: result: no" >&5 | 3058 | echo "$as_me:$LINENO: result: no" >&5 |
3059 | echo "${ECHO_T}no" >&6 | ||
3060 | fi | ||
3061 | |||
3062 | # Extract the first word of "cat", so it can be a program name with args. | ||
3063 | set dummy cat; ac_word=$2 | ||
3064 | echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
3065 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
3066 | if test "${ac_cv_path_CAT+set}" = set; then | ||
3067 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3068 | else | ||
3069 | case $CAT in | ||
3070 | [\\/]* | ?:[\\/]*) | ||
3071 | ac_cv_path_CAT="$CAT" # Let the user override the test with a path. | ||
3072 | ;; | ||
3073 | *) | ||
3074 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
3075 | for as_dir in $PATH | ||
3076 | do | ||
3077 | IFS=$as_save_IFS | ||
3078 | test -z "$as_dir" && as_dir=. | ||
3079 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
3080 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
3081 | ac_cv_path_CAT="$as_dir/$ac_word$ac_exec_ext" | ||
3082 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
3083 | break 2 | ||
3084 | fi | ||
3085 | done | ||
3086 | done | ||
3087 | |||
3088 | ;; | ||
3089 | esac | ||
3090 | fi | ||
3091 | CAT=$ac_cv_path_CAT | ||
3092 | |||
3093 | if test -n "$CAT"; then | ||
3094 | echo "$as_me:$LINENO: result: $CAT" >&5 | ||
3095 | echo "${ECHO_T}$CAT" >&6 | ||
3096 | else | ||
3097 | echo "$as_me:$LINENO: result: no" >&5 | ||
3098 | echo "${ECHO_T}no" >&6 | ||
3099 | fi | ||
3100 | |||
3101 | # Extract the first word of "kill", so it can be a program name with args. | ||
3102 | set dummy kill; ac_word=$2 | ||
3103 | echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
3104 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
3105 | if test "${ac_cv_path_KILL+set}" = set; then | ||
3106 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3107 | else | ||
3108 | case $KILL in | ||
3109 | [\\/]* | ?:[\\/]*) | ||
3110 | ac_cv_path_KILL="$KILL" # Let the user override the test with a path. | ||
3111 | ;; | ||
3112 | *) | ||
3113 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
3114 | for as_dir in $PATH | ||
3115 | do | ||
3116 | IFS=$as_save_IFS | ||
3117 | test -z "$as_dir" && as_dir=. | ||
3118 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
3119 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
3120 | ac_cv_path_KILL="$as_dir/$ac_word$ac_exec_ext" | ||
3121 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
3122 | break 2 | ||
3123 | fi | ||
3124 | done | ||
3125 | done | ||
3126 | |||
3127 | ;; | ||
3128 | esac | ||
3129 | fi | ||
3130 | KILL=$ac_cv_path_KILL | ||
3131 | |||
3132 | if test -n "$KILL"; then | ||
3133 | echo "$as_me:$LINENO: result: $KILL" >&5 | ||
3134 | echo "${ECHO_T}$KILL" >&6 | ||
3135 | else | ||
3136 | echo "$as_me:$LINENO: result: no" >&5 | ||
2339 | echo "${ECHO_T}no" >&6 | 3137 | echo "${ECHO_T}no" >&6 |
2340 | fi | 3138 | fi |
2341 | 3139 | ||
@@ -2343,7 +3141,7 @@ for ac_prog in perl5 perl | |||
2343 | do | 3141 | do |
2344 | # Extract the first word of "$ac_prog", so it can be a program name with args. | 3142 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
2345 | set dummy $ac_prog; ac_word=$2 | 3143 | set dummy $ac_prog; ac_word=$2 |
2346 | echo "$as_me:2346: checking for $ac_word" >&5 | 3144 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
2347 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 3145 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
2348 | if test "${ac_cv_path_PERL+set}" = set; then | 3146 | if test "${ac_cv_path_PERL+set}" = set; then |
2349 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3147 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -2353,16 +3151,18 @@ else | |||
2353 | ac_cv_path_PERL="$PERL" # Let the user override the test with a path. | 3151 | ac_cv_path_PERL="$PERL" # Let the user override the test with a path. |
2354 | ;; | 3152 | ;; |
2355 | *) | 3153 | *) |
2356 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 3154 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2357 | ac_dummy="$PATH" | 3155 | for as_dir in $PATH |
2358 | for ac_dir in $ac_dummy; do | 3156 | do |
2359 | IFS=$ac_save_IFS | 3157 | IFS=$as_save_IFS |
2360 | test -z "$ac_dir" && ac_dir=. | 3158 | test -z "$as_dir" && as_dir=. |
2361 | if $as_executable_p "$ac_dir/$ac_word"; then | 3159 | for ac_exec_ext in '' $ac_executable_extensions; do |
2362 | ac_cv_path_PERL="$ac_dir/$ac_word" | 3160 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2363 | echo "$as_me:2363: found $ac_dir/$ac_word" >&5 | 3161 | ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" |
2364 | break | 3162 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2365 | fi | 3163 | break 2 |
3164 | fi | ||
3165 | done | ||
2366 | done | 3166 | done |
2367 | 3167 | ||
2368 | ;; | 3168 | ;; |
@@ -2371,10 +3171,10 @@ fi | |||
2371 | PERL=$ac_cv_path_PERL | 3171 | PERL=$ac_cv_path_PERL |
2372 | 3172 | ||
2373 | if test -n "$PERL"; then | 3173 | if test -n "$PERL"; then |
2374 | echo "$as_me:2374: result: $PERL" >&5 | 3174 | echo "$as_me:$LINENO: result: $PERL" >&5 |
2375 | echo "${ECHO_T}$PERL" >&6 | 3175 | echo "${ECHO_T}$PERL" >&6 |
2376 | else | 3176 | else |
2377 | echo "$as_me:2377: result: no" >&5 | 3177 | echo "$as_me:$LINENO: result: no" >&5 |
2378 | echo "${ECHO_T}no" >&6 | 3178 | echo "${ECHO_T}no" >&6 |
2379 | fi | 3179 | fi |
2380 | 3180 | ||
@@ -2383,7 +3183,7 @@ done | |||
2383 | 3183 | ||
2384 | # Extract the first word of "sed", so it can be a program name with args. | 3184 | # Extract the first word of "sed", so it can be a program name with args. |
2385 | set dummy sed; ac_word=$2 | 3185 | set dummy sed; ac_word=$2 |
2386 | echo "$as_me:2386: checking for $ac_word" >&5 | 3186 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
2387 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 3187 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
2388 | if test "${ac_cv_path_SED+set}" = set; then | 3188 | if test "${ac_cv_path_SED+set}" = set; then |
2389 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3189 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -2393,16 +3193,18 @@ else | |||
2393 | ac_cv_path_SED="$SED" # Let the user override the test with a path. | 3193 | ac_cv_path_SED="$SED" # Let the user override the test with a path. |
2394 | ;; | 3194 | ;; |
2395 | *) | 3195 | *) |
2396 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 3196 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2397 | ac_dummy="$PATH" | 3197 | for as_dir in $PATH |
2398 | for ac_dir in $ac_dummy; do | 3198 | do |
2399 | IFS=$ac_save_IFS | 3199 | IFS=$as_save_IFS |
2400 | test -z "$ac_dir" && ac_dir=. | 3200 | test -z "$as_dir" && as_dir=. |
2401 | if $as_executable_p "$ac_dir/$ac_word"; then | 3201 | for ac_exec_ext in '' $ac_executable_extensions; do |
2402 | ac_cv_path_SED="$ac_dir/$ac_word" | 3202 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2403 | echo "$as_me:2403: found $ac_dir/$ac_word" >&5 | 3203 | ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext" |
2404 | break | 3204 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2405 | fi | 3205 | break 2 |
3206 | fi | ||
3207 | done | ||
2406 | done | 3208 | done |
2407 | 3209 | ||
2408 | ;; | 3210 | ;; |
@@ -2411,16 +3213,17 @@ fi | |||
2411 | SED=$ac_cv_path_SED | 3213 | SED=$ac_cv_path_SED |
2412 | 3214 | ||
2413 | if test -n "$SED"; then | 3215 | if test -n "$SED"; then |
2414 | echo "$as_me:2414: result: $SED" >&5 | 3216 | echo "$as_me:$LINENO: result: $SED" >&5 |
2415 | echo "${ECHO_T}$SED" >&6 | 3217 | echo "${ECHO_T}$SED" >&6 |
2416 | else | 3218 | else |
2417 | echo "$as_me:2417: result: no" >&5 | 3219 | echo "$as_me:$LINENO: result: no" >&5 |
2418 | echo "${ECHO_T}no" >&6 | 3220 | echo "${ECHO_T}no" >&6 |
2419 | fi | 3221 | fi |
2420 | 3222 | ||
3223 | |||
2421 | # Extract the first word of "ent", so it can be a program name with args. | 3224 | # Extract the first word of "ent", so it can be a program name with args. |
2422 | set dummy ent; ac_word=$2 | 3225 | set dummy ent; ac_word=$2 |
2423 | echo "$as_me:2423: checking for $ac_word" >&5 | 3226 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
2424 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 3227 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
2425 | if test "${ac_cv_path_ENT+set}" = set; then | 3228 | if test "${ac_cv_path_ENT+set}" = set; then |
2426 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3229 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -2430,16 +3233,18 @@ else | |||
2430 | ac_cv_path_ENT="$ENT" # Let the user override the test with a path. | 3233 | ac_cv_path_ENT="$ENT" # Let the user override the test with a path. |
2431 | ;; | 3234 | ;; |
2432 | *) | 3235 | *) |
2433 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 3236 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2434 | ac_dummy="$PATH" | 3237 | for as_dir in $PATH |
2435 | for ac_dir in $ac_dummy; do | 3238 | do |
2436 | IFS=$ac_save_IFS | 3239 | IFS=$as_save_IFS |
2437 | test -z "$ac_dir" && ac_dir=. | 3240 | test -z "$as_dir" && as_dir=. |
2438 | if $as_executable_p "$ac_dir/$ac_word"; then | 3241 | for ac_exec_ext in '' $ac_executable_extensions; do |
2439 | ac_cv_path_ENT="$ac_dir/$ac_word" | 3242 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2440 | echo "$as_me:2440: found $ac_dir/$ac_word" >&5 | 3243 | ac_cv_path_ENT="$as_dir/$ac_word$ac_exec_ext" |
2441 | break | 3244 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2442 | fi | 3245 | break 2 |
3246 | fi | ||
3247 | done | ||
2443 | done | 3248 | done |
2444 | 3249 | ||
2445 | ;; | 3250 | ;; |
@@ -2448,16 +3253,17 @@ fi | |||
2448 | ENT=$ac_cv_path_ENT | 3253 | ENT=$ac_cv_path_ENT |
2449 | 3254 | ||
2450 | if test -n "$ENT"; then | 3255 | if test -n "$ENT"; then |
2451 | echo "$as_me:2451: result: $ENT" >&5 | 3256 | echo "$as_me:$LINENO: result: $ENT" >&5 |
2452 | echo "${ECHO_T}$ENT" >&6 | 3257 | echo "${ECHO_T}$ENT" >&6 |
2453 | else | 3258 | else |
2454 | echo "$as_me:2454: result: no" >&5 | 3259 | echo "$as_me:$LINENO: result: no" >&5 |
2455 | echo "${ECHO_T}no" >&6 | 3260 | echo "${ECHO_T}no" >&6 |
2456 | fi | 3261 | fi |
2457 | 3262 | ||
3263 | |||
2458 | # Extract the first word of "bash", so it can be a program name with args. | 3264 | # Extract the first word of "bash", so it can be a program name with args. |
2459 | set dummy bash; ac_word=$2 | 3265 | set dummy bash; ac_word=$2 |
2460 | echo "$as_me:2460: checking for $ac_word" >&5 | 3266 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
2461 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 3267 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
2462 | if test "${ac_cv_path_TEST_MINUS_S_SH+set}" = set; then | 3268 | if test "${ac_cv_path_TEST_MINUS_S_SH+set}" = set; then |
2463 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3269 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -2467,16 +3273,18 @@ else | |||
2467 | ac_cv_path_TEST_MINUS_S_SH="$TEST_MINUS_S_SH" # Let the user override the test with a path. | 3273 | ac_cv_path_TEST_MINUS_S_SH="$TEST_MINUS_S_SH" # Let the user override the test with a path. |
2468 | ;; | 3274 | ;; |
2469 | *) | 3275 | *) |
2470 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 3276 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2471 | ac_dummy="$PATH" | 3277 | for as_dir in $PATH |
2472 | for ac_dir in $ac_dummy; do | 3278 | do |
2473 | IFS=$ac_save_IFS | 3279 | IFS=$as_save_IFS |
2474 | test -z "$ac_dir" && ac_dir=. | 3280 | test -z "$as_dir" && as_dir=. |
2475 | if $as_executable_p "$ac_dir/$ac_word"; then | 3281 | for ac_exec_ext in '' $ac_executable_extensions; do |
2476 | ac_cv_path_TEST_MINUS_S_SH="$ac_dir/$ac_word" | 3282 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2477 | echo "$as_me:2477: found $ac_dir/$ac_word" >&5 | 3283 | ac_cv_path_TEST_MINUS_S_SH="$as_dir/$ac_word$ac_exec_ext" |
2478 | break | 3284 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2479 | fi | 3285 | break 2 |
3286 | fi | ||
3287 | done | ||
2480 | done | 3288 | done |
2481 | 3289 | ||
2482 | ;; | 3290 | ;; |
@@ -2485,16 +3293,16 @@ fi | |||
2485 | TEST_MINUS_S_SH=$ac_cv_path_TEST_MINUS_S_SH | 3293 | TEST_MINUS_S_SH=$ac_cv_path_TEST_MINUS_S_SH |
2486 | 3294 | ||
2487 | if test -n "$TEST_MINUS_S_SH"; then | 3295 | if test -n "$TEST_MINUS_S_SH"; then |
2488 | echo "$as_me:2488: result: $TEST_MINUS_S_SH" >&5 | 3296 | echo "$as_me:$LINENO: result: $TEST_MINUS_S_SH" >&5 |
2489 | echo "${ECHO_T}$TEST_MINUS_S_SH" >&6 | 3297 | echo "${ECHO_T}$TEST_MINUS_S_SH" >&6 |
2490 | else | 3298 | else |
2491 | echo "$as_me:2491: result: no" >&5 | 3299 | echo "$as_me:$LINENO: result: no" >&5 |
2492 | echo "${ECHO_T}no" >&6 | 3300 | echo "${ECHO_T}no" >&6 |
2493 | fi | 3301 | fi |
2494 | 3302 | ||
2495 | # Extract the first word of "ksh", so it can be a program name with args. | 3303 | # Extract the first word of "ksh", so it can be a program name with args. |
2496 | set dummy ksh; ac_word=$2 | 3304 | set dummy ksh; ac_word=$2 |
2497 | echo "$as_me:2497: checking for $ac_word" >&5 | 3305 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
2498 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 3306 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
2499 | if test "${ac_cv_path_TEST_MINUS_S_SH+set}" = set; then | 3307 | if test "${ac_cv_path_TEST_MINUS_S_SH+set}" = set; then |
2500 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3308 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -2504,16 +3312,18 @@ else | |||
2504 | ac_cv_path_TEST_MINUS_S_SH="$TEST_MINUS_S_SH" # Let the user override the test with a path. | 3312 | ac_cv_path_TEST_MINUS_S_SH="$TEST_MINUS_S_SH" # Let the user override the test with a path. |
2505 | ;; | 3313 | ;; |
2506 | *) | 3314 | *) |
2507 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 3315 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2508 | ac_dummy="$PATH" | 3316 | for as_dir in $PATH |
2509 | for ac_dir in $ac_dummy; do | 3317 | do |
2510 | IFS=$ac_save_IFS | 3318 | IFS=$as_save_IFS |
2511 | test -z "$ac_dir" && ac_dir=. | 3319 | test -z "$as_dir" && as_dir=. |
2512 | if $as_executable_p "$ac_dir/$ac_word"; then | 3320 | for ac_exec_ext in '' $ac_executable_extensions; do |
2513 | ac_cv_path_TEST_MINUS_S_SH="$ac_dir/$ac_word" | 3321 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2514 | echo "$as_me:2514: found $ac_dir/$ac_word" >&5 | 3322 | ac_cv_path_TEST_MINUS_S_SH="$as_dir/$ac_word$ac_exec_ext" |
2515 | break | 3323 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2516 | fi | 3324 | break 2 |
3325 | fi | ||
3326 | done | ||
2517 | done | 3327 | done |
2518 | 3328 | ||
2519 | ;; | 3329 | ;; |
@@ -2522,16 +3332,16 @@ fi | |||
2522 | TEST_MINUS_S_SH=$ac_cv_path_TEST_MINUS_S_SH | 3332 | TEST_MINUS_S_SH=$ac_cv_path_TEST_MINUS_S_SH |
2523 | 3333 | ||
2524 | if test -n "$TEST_MINUS_S_SH"; then | 3334 | if test -n "$TEST_MINUS_S_SH"; then |
2525 | echo "$as_me:2525: result: $TEST_MINUS_S_SH" >&5 | 3335 | echo "$as_me:$LINENO: result: $TEST_MINUS_S_SH" >&5 |
2526 | echo "${ECHO_T}$TEST_MINUS_S_SH" >&6 | 3336 | echo "${ECHO_T}$TEST_MINUS_S_SH" >&6 |
2527 | else | 3337 | else |
2528 | echo "$as_me:2528: result: no" >&5 | 3338 | echo "$as_me:$LINENO: result: no" >&5 |
2529 | echo "${ECHO_T}no" >&6 | 3339 | echo "${ECHO_T}no" >&6 |
2530 | fi | 3340 | fi |
2531 | 3341 | ||
2532 | # Extract the first word of "sh", so it can be a program name with args. | 3342 | # Extract the first word of "sh", so it can be a program name with args. |
2533 | set dummy sh; ac_word=$2 | 3343 | set dummy sh; ac_word=$2 |
2534 | echo "$as_me:2534: checking for $ac_word" >&5 | 3344 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
2535 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 3345 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
2536 | if test "${ac_cv_path_TEST_MINUS_S_SH+set}" = set; then | 3346 | if test "${ac_cv_path_TEST_MINUS_S_SH+set}" = set; then |
2537 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3347 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -2541,16 +3351,18 @@ else | |||
2541 | ac_cv_path_TEST_MINUS_S_SH="$TEST_MINUS_S_SH" # Let the user override the test with a path. | 3351 | ac_cv_path_TEST_MINUS_S_SH="$TEST_MINUS_S_SH" # Let the user override the test with a path. |
2542 | ;; | 3352 | ;; |
2543 | *) | 3353 | *) |
2544 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 3354 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2545 | ac_dummy="$PATH" | 3355 | for as_dir in $PATH |
2546 | for ac_dir in $ac_dummy; do | 3356 | do |
2547 | IFS=$ac_save_IFS | 3357 | IFS=$as_save_IFS |
2548 | test -z "$ac_dir" && ac_dir=. | 3358 | test -z "$as_dir" && as_dir=. |
2549 | if $as_executable_p "$ac_dir/$ac_word"; then | 3359 | for ac_exec_ext in '' $ac_executable_extensions; do |
2550 | ac_cv_path_TEST_MINUS_S_SH="$ac_dir/$ac_word" | 3360 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2551 | echo "$as_me:2551: found $ac_dir/$ac_word" >&5 | 3361 | ac_cv_path_TEST_MINUS_S_SH="$as_dir/$ac_word$ac_exec_ext" |
2552 | break | 3362 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2553 | fi | 3363 | break 2 |
3364 | fi | ||
3365 | done | ||
2554 | done | 3366 | done |
2555 | 3367 | ||
2556 | ;; | 3368 | ;; |
@@ -2559,16 +3371,16 @@ fi | |||
2559 | TEST_MINUS_S_SH=$ac_cv_path_TEST_MINUS_S_SH | 3371 | TEST_MINUS_S_SH=$ac_cv_path_TEST_MINUS_S_SH |
2560 | 3372 | ||
2561 | if test -n "$TEST_MINUS_S_SH"; then | 3373 | if test -n "$TEST_MINUS_S_SH"; then |
2562 | echo "$as_me:2562: result: $TEST_MINUS_S_SH" >&5 | 3374 | echo "$as_me:$LINENO: result: $TEST_MINUS_S_SH" >&5 |
2563 | echo "${ECHO_T}$TEST_MINUS_S_SH" >&6 | 3375 | echo "${ECHO_T}$TEST_MINUS_S_SH" >&6 |
2564 | else | 3376 | else |
2565 | echo "$as_me:2565: result: no" >&5 | 3377 | echo "$as_me:$LINENO: result: no" >&5 |
2566 | echo "${ECHO_T}no" >&6 | 3378 | echo "${ECHO_T}no" >&6 |
2567 | fi | 3379 | fi |
2568 | 3380 | ||
2569 | # Extract the first word of "sh", so it can be a program name with args. | 3381 | # Extract the first word of "sh", so it can be a program name with args. |
2570 | set dummy sh; ac_word=$2 | 3382 | set dummy sh; ac_word=$2 |
2571 | echo "$as_me:2571: checking for $ac_word" >&5 | 3383 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
2572 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 3384 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
2573 | if test "${ac_cv_path_SH+set}" = set; then | 3385 | if test "${ac_cv_path_SH+set}" = set; then |
2574 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3386 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -2578,16 +3390,18 @@ else | |||
2578 | ac_cv_path_SH="$SH" # Let the user override the test with a path. | 3390 | ac_cv_path_SH="$SH" # Let the user override the test with a path. |
2579 | ;; | 3391 | ;; |
2580 | *) | 3392 | *) |
2581 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 3393 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2582 | ac_dummy="$PATH" | 3394 | for as_dir in $PATH |
2583 | for ac_dir in $ac_dummy; do | 3395 | do |
2584 | IFS=$ac_save_IFS | 3396 | IFS=$as_save_IFS |
2585 | test -z "$ac_dir" && ac_dir=. | 3397 | test -z "$as_dir" && as_dir=. |
2586 | if $as_executable_p "$ac_dir/$ac_word"; then | 3398 | for ac_exec_ext in '' $ac_executable_extensions; do |
2587 | ac_cv_path_SH="$ac_dir/$ac_word" | 3399 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2588 | echo "$as_me:2588: found $ac_dir/$ac_word" >&5 | 3400 | ac_cv_path_SH="$as_dir/$ac_word$ac_exec_ext" |
2589 | break | 3401 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2590 | fi | 3402 | break 2 |
3403 | fi | ||
3404 | done | ||
2591 | done | 3405 | done |
2592 | 3406 | ||
2593 | ;; | 3407 | ;; |
@@ -2596,13 +3410,133 @@ fi | |||
2596 | SH=$ac_cv_path_SH | 3410 | SH=$ac_cv_path_SH |
2597 | 3411 | ||
2598 | if test -n "$SH"; then | 3412 | if test -n "$SH"; then |
2599 | echo "$as_me:2599: result: $SH" >&5 | 3413 | echo "$as_me:$LINENO: result: $SH" >&5 |
2600 | echo "${ECHO_T}$SH" >&6 | 3414 | echo "${ECHO_T}$SH" >&6 |
2601 | else | 3415 | else |
2602 | echo "$as_me:2602: result: no" >&5 | 3416 | echo "$as_me:$LINENO: result: no" >&5 |
2603 | echo "${ECHO_T}no" >&6 | 3417 | echo "${ECHO_T}no" >&6 |
2604 | fi | 3418 | fi |
2605 | 3419 | ||
3420 | TEST_SHELL=sh | ||
3421 | |||
3422 | |||
3423 | # Extract the first word of "groupadd", so it can be a program name with args. | ||
3424 | set dummy groupadd; ac_word=$2 | ||
3425 | echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
3426 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
3427 | if test "${ac_cv_path_PATH_GROUPADD_PROG+set}" = set; then | ||
3428 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3429 | else | ||
3430 | case $PATH_GROUPADD_PROG in | ||
3431 | [\\/]* | ?:[\\/]*) | ||
3432 | ac_cv_path_PATH_GROUPADD_PROG="$PATH_GROUPADD_PROG" # Let the user override the test with a path. | ||
3433 | ;; | ||
3434 | *) | ||
3435 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
3436 | for as_dir in /usr/sbin${PATH_SEPARATOR}/etc | ||
3437 | do | ||
3438 | IFS=$as_save_IFS | ||
3439 | test -z "$as_dir" && as_dir=. | ||
3440 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
3441 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
3442 | ac_cv_path_PATH_GROUPADD_PROG="$as_dir/$ac_word$ac_exec_ext" | ||
3443 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
3444 | break 2 | ||
3445 | fi | ||
3446 | done | ||
3447 | done | ||
3448 | |||
3449 | test -z "$ac_cv_path_PATH_GROUPADD_PROG" && ac_cv_path_PATH_GROUPADD_PROG="groupadd" | ||
3450 | ;; | ||
3451 | esac | ||
3452 | fi | ||
3453 | PATH_GROUPADD_PROG=$ac_cv_path_PATH_GROUPADD_PROG | ||
3454 | |||
3455 | if test -n "$PATH_GROUPADD_PROG"; then | ||
3456 | echo "$as_me:$LINENO: result: $PATH_GROUPADD_PROG" >&5 | ||
3457 | echo "${ECHO_T}$PATH_GROUPADD_PROG" >&6 | ||
3458 | else | ||
3459 | echo "$as_me:$LINENO: result: no" >&5 | ||
3460 | echo "${ECHO_T}no" >&6 | ||
3461 | fi | ||
3462 | |||
3463 | # Extract the first word of "useradd", so it can be a program name with args. | ||
3464 | set dummy useradd; ac_word=$2 | ||
3465 | echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
3466 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
3467 | if test "${ac_cv_path_PATH_USERADD_PROG+set}" = set; then | ||
3468 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3469 | else | ||
3470 | case $PATH_USERADD_PROG in | ||
3471 | [\\/]* | ?:[\\/]*) | ||
3472 | ac_cv_path_PATH_USERADD_PROG="$PATH_USERADD_PROG" # Let the user override the test with a path. | ||
3473 | ;; | ||
3474 | *) | ||
3475 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
3476 | for as_dir in /usr/sbin${PATH_SEPARATOR}/etc | ||
3477 | do | ||
3478 | IFS=$as_save_IFS | ||
3479 | test -z "$as_dir" && as_dir=. | ||
3480 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
3481 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
3482 | ac_cv_path_PATH_USERADD_PROG="$as_dir/$ac_word$ac_exec_ext" | ||
3483 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
3484 | break 2 | ||
3485 | fi | ||
3486 | done | ||
3487 | done | ||
3488 | |||
3489 | test -z "$ac_cv_path_PATH_USERADD_PROG" && ac_cv_path_PATH_USERADD_PROG="useradd" | ||
3490 | ;; | ||
3491 | esac | ||
3492 | fi | ||
3493 | PATH_USERADD_PROG=$ac_cv_path_PATH_USERADD_PROG | ||
3494 | |||
3495 | if test -n "$PATH_USERADD_PROG"; then | ||
3496 | echo "$as_me:$LINENO: result: $PATH_USERADD_PROG" >&5 | ||
3497 | echo "${ECHO_T}$PATH_USERADD_PROG" >&6 | ||
3498 | else | ||
3499 | echo "$as_me:$LINENO: result: no" >&5 | ||
3500 | echo "${ECHO_T}no" >&6 | ||
3501 | fi | ||
3502 | |||
3503 | # Extract the first word of "pkgmk", so it can be a program name with args. | ||
3504 | set dummy pkgmk; ac_word=$2 | ||
3505 | echo "$as_me:$LINENO: checking for $ac_word" >&5 | ||
3506 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
3507 | if test "${ac_cv_prog_MAKE_PACKAGE_SUPPORTED+set}" = set; then | ||
3508 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3509 | else | ||
3510 | if test -n "$MAKE_PACKAGE_SUPPORTED"; then | ||
3511 | ac_cv_prog_MAKE_PACKAGE_SUPPORTED="$MAKE_PACKAGE_SUPPORTED" # Let the user override the test. | ||
3512 | else | ||
3513 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
3514 | for as_dir in $PATH | ||
3515 | do | ||
3516 | IFS=$as_save_IFS | ||
3517 | test -z "$as_dir" && as_dir=. | ||
3518 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
3519 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
3520 | ac_cv_prog_MAKE_PACKAGE_SUPPORTED="yes" | ||
3521 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
3522 | break 2 | ||
3523 | fi | ||
3524 | done | ||
3525 | done | ||
3526 | |||
3527 | test -z "$ac_cv_prog_MAKE_PACKAGE_SUPPORTED" && ac_cv_prog_MAKE_PACKAGE_SUPPORTED="no" | ||
3528 | fi | ||
3529 | fi | ||
3530 | MAKE_PACKAGE_SUPPORTED=$ac_cv_prog_MAKE_PACKAGE_SUPPORTED | ||
3531 | if test -n "$MAKE_PACKAGE_SUPPORTED"; then | ||
3532 | echo "$as_me:$LINENO: result: $MAKE_PACKAGE_SUPPORTED" >&5 | ||
3533 | echo "${ECHO_T}$MAKE_PACKAGE_SUPPORTED" >&6 | ||
3534 | else | ||
3535 | echo "$as_me:$LINENO: result: no" >&5 | ||
3536 | echo "${ECHO_T}no" >&6 | ||
3537 | fi | ||
3538 | |||
3539 | |||
2606 | # System features | 3540 | # System features |
2607 | # Check whether --enable-largefile or --disable-largefile was given. | 3541 | # Check whether --enable-largefile or --disable-largefile was given. |
2608 | if test "${enable_largefile+set}" = set; then | 3542 | if test "${enable_largefile+set}" = set; then |
@@ -2611,7 +3545,7 @@ if test "${enable_largefile+set}" = set; then | |||
2611 | fi; | 3545 | fi; |
2612 | if test "$enable_largefile" != no; then | 3546 | if test "$enable_largefile" != no; then |
2613 | 3547 | ||
2614 | echo "$as_me:2614: checking for special C compiler options needed for large files" >&5 | 3548 | echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 |
2615 | echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 | 3549 | echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 |
2616 | if test "${ac_cv_sys_largefile_CC+set}" = set; then | 3550 | if test "${ac_cv_sys_largefile_CC+set}" = set; then |
2617 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3551 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -2622,9 +3556,12 @@ else | |||
2622 | while :; do | 3556 | while :; do |
2623 | # IRIX 6.2 and later do not support large files by default, | 3557 | # IRIX 6.2 and later do not support large files by default, |
2624 | # so use the C compiler's -n32 option if that helps. | 3558 | # so use the C compiler's -n32 option if that helps. |
2625 | cat >conftest.$ac_ext <<_ACEOF | 3559 | cat >conftest.$ac_ext <<_ACEOF |
2626 | #line 2626 "configure" | 3560 | /* confdefs.h. */ |
2627 | #include "confdefs.h" | 3561 | _ACEOF |
3562 | cat confdefs.h >>conftest.$ac_ext | ||
3563 | cat >>conftest.$ac_ext <<_ACEOF | ||
3564 | /* end confdefs.h. */ | ||
2628 | #include <sys/types.h> | 3565 | #include <sys/types.h> |
2629 | /* Check that off_t can represent 2**63 - 1 correctly. | 3566 | /* Check that off_t can represent 2**63 - 1 correctly. |
2630 | We can't simply define LARGE_OFF_T to be 9223372036854775807, | 3567 | We can't simply define LARGE_OFF_T to be 9223372036854775807, |
@@ -2643,55 +3580,77 @@ main () | |||
2643 | } | 3580 | } |
2644 | _ACEOF | 3581 | _ACEOF |
2645 | rm -f conftest.$ac_objext | 3582 | rm -f conftest.$ac_objext |
2646 | if { (eval echo "$as_me:2646: \"$ac_compile\"") >&5 | 3583 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
2647 | (eval $ac_compile) 2>&5 | 3584 | (eval $ac_compile) 2>conftest.er1 |
2648 | ac_status=$? | 3585 | ac_status=$? |
2649 | echo "$as_me:2649: \$? = $ac_status" >&5 | 3586 | grep -v '^ *+' conftest.er1 >conftest.err |
3587 | rm -f conftest.er1 | ||
3588 | cat conftest.err >&5 | ||
3589 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2650 | (exit $ac_status); } && | 3590 | (exit $ac_status); } && |
2651 | { ac_try='test -s conftest.$ac_objext' | 3591 | { ac_try='test -z "$ac_c_werror_flag" |
2652 | { (eval echo "$as_me:2652: \"$ac_try\"") >&5 | 3592 | || test ! -s conftest.err' |
3593 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2653 | (eval $ac_try) 2>&5 | 3594 | (eval $ac_try) 2>&5 |
2654 | ac_status=$? | 3595 | ac_status=$? |
2655 | echo "$as_me:2655: \$? = $ac_status" >&5 | 3596 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3597 | (exit $ac_status); }; } && | ||
3598 | { ac_try='test -s conftest.$ac_objext' | ||
3599 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3600 | (eval $ac_try) 2>&5 | ||
3601 | ac_status=$? | ||
3602 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2656 | (exit $ac_status); }; }; then | 3603 | (exit $ac_status); }; }; then |
2657 | break | 3604 | break |
2658 | else | 3605 | else |
2659 | echo "$as_me: failed program was:" >&5 | 3606 | echo "$as_me: failed program was:" >&5 |
2660 | cat conftest.$ac_ext >&5 | 3607 | sed 's/^/| /' conftest.$ac_ext >&5 |
3608 | |||
2661 | fi | 3609 | fi |
2662 | rm -f conftest.$ac_objext | 3610 | rm -f conftest.err conftest.$ac_objext |
2663 | CC="$CC -n32" | 3611 | CC="$CC -n32" |
2664 | rm -f conftest.$ac_objext | 3612 | rm -f conftest.$ac_objext |
2665 | if { (eval echo "$as_me:2665: \"$ac_compile\"") >&5 | 3613 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
2666 | (eval $ac_compile) 2>&5 | 3614 | (eval $ac_compile) 2>conftest.er1 |
2667 | ac_status=$? | 3615 | ac_status=$? |
2668 | echo "$as_me:2668: \$? = $ac_status" >&5 | 3616 | grep -v '^ *+' conftest.er1 >conftest.err |
3617 | rm -f conftest.er1 | ||
3618 | cat conftest.err >&5 | ||
3619 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2669 | (exit $ac_status); } && | 3620 | (exit $ac_status); } && |
2670 | { ac_try='test -s conftest.$ac_objext' | 3621 | { ac_try='test -z "$ac_c_werror_flag" |
2671 | { (eval echo "$as_me:2671: \"$ac_try\"") >&5 | 3622 | || test ! -s conftest.err' |
3623 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2672 | (eval $ac_try) 2>&5 | 3624 | (eval $ac_try) 2>&5 |
2673 | ac_status=$? | 3625 | ac_status=$? |
2674 | echo "$as_me:2674: \$? = $ac_status" >&5 | 3626 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3627 | (exit $ac_status); }; } && | ||
3628 | { ac_try='test -s conftest.$ac_objext' | ||
3629 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3630 | (eval $ac_try) 2>&5 | ||
3631 | ac_status=$? | ||
3632 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2675 | (exit $ac_status); }; }; then | 3633 | (exit $ac_status); }; }; then |
2676 | ac_cv_sys_largefile_CC=' -n32'; break | 3634 | ac_cv_sys_largefile_CC=' -n32'; break |
2677 | else | 3635 | else |
2678 | echo "$as_me: failed program was:" >&5 | 3636 | echo "$as_me: failed program was:" >&5 |
2679 | cat conftest.$ac_ext >&5 | 3637 | sed 's/^/| /' conftest.$ac_ext >&5 |
3638 | |||
2680 | fi | 3639 | fi |
2681 | rm -f conftest.$ac_objext | 3640 | rm -f conftest.err conftest.$ac_objext |
2682 | break | 3641 | break |
2683 | done | 3642 | done |
2684 | CC=$ac_save_CC | 3643 | CC=$ac_save_CC |
2685 | rm -f conftest.$ac_ext | 3644 | rm -f conftest.$ac_ext |
2686 | fi | 3645 | fi |
2687 | fi | 3646 | fi |
2688 | echo "$as_me:2688: result: $ac_cv_sys_largefile_CC" >&5 | 3647 | echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 |
2689 | echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 | 3648 | echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 |
2690 | if test "$ac_cv_sys_largefile_CC" != no; then | 3649 | if test "$ac_cv_sys_largefile_CC" != no; then |
2691 | CC=$CC$ac_cv_sys_largefile_CC | 3650 | CC=$CC$ac_cv_sys_largefile_CC |
2692 | fi | 3651 | fi |
2693 | 3652 | ||
2694 | echo "$as_me:2694: checking for _FILE_OFFSET_BITS value needed for large files" >&5 | 3653 | echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 |
2695 | echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 | 3654 | echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 |
2696 | if test "${ac_cv_sys_file_offset_bits+set}" = set; then | 3655 | if test "${ac_cv_sys_file_offset_bits+set}" = set; then |
2697 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3656 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -2699,8 +3658,11 @@ else | |||
2699 | while :; do | 3658 | while :; do |
2700 | ac_cv_sys_file_offset_bits=no | 3659 | ac_cv_sys_file_offset_bits=no |
2701 | cat >conftest.$ac_ext <<_ACEOF | 3660 | cat >conftest.$ac_ext <<_ACEOF |
2702 | #line 2702 "configure" | 3661 | /* confdefs.h. */ |
2703 | #include "confdefs.h" | 3662 | _ACEOF |
3663 | cat confdefs.h >>conftest.$ac_ext | ||
3664 | cat >>conftest.$ac_ext <<_ACEOF | ||
3665 | /* end confdefs.h. */ | ||
2704 | #include <sys/types.h> | 3666 | #include <sys/types.h> |
2705 | /* Check that off_t can represent 2**63 - 1 correctly. | 3667 | /* Check that off_t can represent 2**63 - 1 correctly. |
2706 | We can't simply define LARGE_OFF_T to be 9223372036854775807, | 3668 | We can't simply define LARGE_OFF_T to be 9223372036854775807, |
@@ -2719,26 +3681,40 @@ main () | |||
2719 | } | 3681 | } |
2720 | _ACEOF | 3682 | _ACEOF |
2721 | rm -f conftest.$ac_objext | 3683 | rm -f conftest.$ac_objext |
2722 | if { (eval echo "$as_me:2722: \"$ac_compile\"") >&5 | 3684 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
2723 | (eval $ac_compile) 2>&5 | 3685 | (eval $ac_compile) 2>conftest.er1 |
2724 | ac_status=$? | 3686 | ac_status=$? |
2725 | echo "$as_me:2725: \$? = $ac_status" >&5 | 3687 | grep -v '^ *+' conftest.er1 >conftest.err |
3688 | rm -f conftest.er1 | ||
3689 | cat conftest.err >&5 | ||
3690 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2726 | (exit $ac_status); } && | 3691 | (exit $ac_status); } && |
2727 | { ac_try='test -s conftest.$ac_objext' | 3692 | { ac_try='test -z "$ac_c_werror_flag" |
2728 | { (eval echo "$as_me:2728: \"$ac_try\"") >&5 | 3693 | || test ! -s conftest.err' |
3694 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3695 | (eval $ac_try) 2>&5 | ||
3696 | ac_status=$? | ||
3697 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3698 | (exit $ac_status); }; } && | ||
3699 | { ac_try='test -s conftest.$ac_objext' | ||
3700 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2729 | (eval $ac_try) 2>&5 | 3701 | (eval $ac_try) 2>&5 |
2730 | ac_status=$? | 3702 | ac_status=$? |
2731 | echo "$as_me:2731: \$? = $ac_status" >&5 | 3703 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
2732 | (exit $ac_status); }; }; then | 3704 | (exit $ac_status); }; }; then |
2733 | break | 3705 | break |
2734 | else | 3706 | else |
2735 | echo "$as_me: failed program was:" >&5 | 3707 | echo "$as_me: failed program was:" >&5 |
2736 | cat conftest.$ac_ext >&5 | 3708 | sed 's/^/| /' conftest.$ac_ext >&5 |
3709 | |||
2737 | fi | 3710 | fi |
2738 | rm -f conftest.$ac_objext conftest.$ac_ext | 3711 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
2739 | cat >conftest.$ac_ext <<_ACEOF | 3712 | cat >conftest.$ac_ext <<_ACEOF |
2740 | #line 2740 "configure" | 3713 | /* confdefs.h. */ |
2741 | #include "confdefs.h" | 3714 | _ACEOF |
3715 | cat confdefs.h >>conftest.$ac_ext | ||
3716 | cat >>conftest.$ac_ext <<_ACEOF | ||
3717 | /* end confdefs.h. */ | ||
2742 | #define _FILE_OFFSET_BITS 64 | 3718 | #define _FILE_OFFSET_BITS 64 |
2743 | #include <sys/types.h> | 3719 | #include <sys/types.h> |
2744 | /* Check that off_t can represent 2**63 - 1 correctly. | 3720 | /* Check that off_t can represent 2**63 - 1 correctly. |
@@ -2758,37 +3734,48 @@ main () | |||
2758 | } | 3734 | } |
2759 | _ACEOF | 3735 | _ACEOF |
2760 | rm -f conftest.$ac_objext | 3736 | rm -f conftest.$ac_objext |
2761 | if { (eval echo "$as_me:2761: \"$ac_compile\"") >&5 | 3737 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
2762 | (eval $ac_compile) 2>&5 | 3738 | (eval $ac_compile) 2>conftest.er1 |
2763 | ac_status=$? | 3739 | ac_status=$? |
2764 | echo "$as_me:2764: \$? = $ac_status" >&5 | 3740 | grep -v '^ *+' conftest.er1 >conftest.err |
3741 | rm -f conftest.er1 | ||
3742 | cat conftest.err >&5 | ||
3743 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2765 | (exit $ac_status); } && | 3744 | (exit $ac_status); } && |
2766 | { ac_try='test -s conftest.$ac_objext' | 3745 | { ac_try='test -z "$ac_c_werror_flag" |
2767 | { (eval echo "$as_me:2767: \"$ac_try\"") >&5 | 3746 | || test ! -s conftest.err' |
3747 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2768 | (eval $ac_try) 2>&5 | 3748 | (eval $ac_try) 2>&5 |
2769 | ac_status=$? | 3749 | ac_status=$? |
2770 | echo "$as_me:2770: \$? = $ac_status" >&5 | 3750 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3751 | (exit $ac_status); }; } && | ||
3752 | { ac_try='test -s conftest.$ac_objext' | ||
3753 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3754 | (eval $ac_try) 2>&5 | ||
3755 | ac_status=$? | ||
3756 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2771 | (exit $ac_status); }; }; then | 3757 | (exit $ac_status); }; }; then |
2772 | ac_cv_sys_file_offset_bits=64; break | 3758 | ac_cv_sys_file_offset_bits=64; break |
2773 | else | 3759 | else |
2774 | echo "$as_me: failed program was:" >&5 | 3760 | echo "$as_me: failed program was:" >&5 |
2775 | cat conftest.$ac_ext >&5 | 3761 | sed 's/^/| /' conftest.$ac_ext >&5 |
3762 | |||
2776 | fi | 3763 | fi |
2777 | rm -f conftest.$ac_objext conftest.$ac_ext | 3764 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
2778 | break | 3765 | break |
2779 | done | 3766 | done |
2780 | fi | 3767 | fi |
2781 | echo "$as_me:2781: result: $ac_cv_sys_file_offset_bits" >&5 | 3768 | echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 |
2782 | echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 | 3769 | echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 |
2783 | if test "$ac_cv_sys_file_offset_bits" != no; then | 3770 | if test "$ac_cv_sys_file_offset_bits" != no; then |
2784 | 3771 | ||
2785 | cat >>confdefs.h <<EOF | 3772 | cat >>confdefs.h <<_ACEOF |
2786 | #define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits | 3773 | #define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits |
2787 | EOF | 3774 | _ACEOF |
2788 | 3775 | ||
2789 | fi | 3776 | fi |
2790 | rm -f conftest* | 3777 | rm -f conftest* |
2791 | echo "$as_me:2791: checking for _LARGE_FILES value needed for large files" >&5 | 3778 | echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 |
2792 | echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 | 3779 | echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 |
2793 | if test "${ac_cv_sys_large_files+set}" = set; then | 3780 | if test "${ac_cv_sys_large_files+set}" = set; then |
2794 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3781 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -2796,8 +3783,11 @@ else | |||
2796 | while :; do | 3783 | while :; do |
2797 | ac_cv_sys_large_files=no | 3784 | ac_cv_sys_large_files=no |
2798 | cat >conftest.$ac_ext <<_ACEOF | 3785 | cat >conftest.$ac_ext <<_ACEOF |
2799 | #line 2799 "configure" | 3786 | /* confdefs.h. */ |
2800 | #include "confdefs.h" | 3787 | _ACEOF |
3788 | cat confdefs.h >>conftest.$ac_ext | ||
3789 | cat >>conftest.$ac_ext <<_ACEOF | ||
3790 | /* end confdefs.h. */ | ||
2801 | #include <sys/types.h> | 3791 | #include <sys/types.h> |
2802 | /* Check that off_t can represent 2**63 - 1 correctly. | 3792 | /* Check that off_t can represent 2**63 - 1 correctly. |
2803 | We can't simply define LARGE_OFF_T to be 9223372036854775807, | 3793 | We can't simply define LARGE_OFF_T to be 9223372036854775807, |
@@ -2816,26 +3806,40 @@ main () | |||
2816 | } | 3806 | } |
2817 | _ACEOF | 3807 | _ACEOF |
2818 | rm -f conftest.$ac_objext | 3808 | rm -f conftest.$ac_objext |
2819 | if { (eval echo "$as_me:2819: \"$ac_compile\"") >&5 | 3809 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
2820 | (eval $ac_compile) 2>&5 | 3810 | (eval $ac_compile) 2>conftest.er1 |
2821 | ac_status=$? | 3811 | ac_status=$? |
2822 | echo "$as_me:2822: \$? = $ac_status" >&5 | 3812 | grep -v '^ *+' conftest.er1 >conftest.err |
3813 | rm -f conftest.er1 | ||
3814 | cat conftest.err >&5 | ||
3815 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2823 | (exit $ac_status); } && | 3816 | (exit $ac_status); } && |
2824 | { ac_try='test -s conftest.$ac_objext' | 3817 | { ac_try='test -z "$ac_c_werror_flag" |
2825 | { (eval echo "$as_me:2825: \"$ac_try\"") >&5 | 3818 | || test ! -s conftest.err' |
3819 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2826 | (eval $ac_try) 2>&5 | 3820 | (eval $ac_try) 2>&5 |
2827 | ac_status=$? | 3821 | ac_status=$? |
2828 | echo "$as_me:2828: \$? = $ac_status" >&5 | 3822 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3823 | (exit $ac_status); }; } && | ||
3824 | { ac_try='test -s conftest.$ac_objext' | ||
3825 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3826 | (eval $ac_try) 2>&5 | ||
3827 | ac_status=$? | ||
3828 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2829 | (exit $ac_status); }; }; then | 3829 | (exit $ac_status); }; }; then |
2830 | break | 3830 | break |
2831 | else | 3831 | else |
2832 | echo "$as_me: failed program was:" >&5 | 3832 | echo "$as_me: failed program was:" >&5 |
2833 | cat conftest.$ac_ext >&5 | 3833 | sed 's/^/| /' conftest.$ac_ext >&5 |
3834 | |||
2834 | fi | 3835 | fi |
2835 | rm -f conftest.$ac_objext conftest.$ac_ext | 3836 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
2836 | cat >conftest.$ac_ext <<_ACEOF | 3837 | cat >conftest.$ac_ext <<_ACEOF |
2837 | #line 2837 "configure" | 3838 | /* confdefs.h. */ |
2838 | #include "confdefs.h" | 3839 | _ACEOF |
3840 | cat confdefs.h >>conftest.$ac_ext | ||
3841 | cat >>conftest.$ac_ext <<_ACEOF | ||
3842 | /* end confdefs.h. */ | ||
2839 | #define _LARGE_FILES 1 | 3843 | #define _LARGE_FILES 1 |
2840 | #include <sys/types.h> | 3844 | #include <sys/types.h> |
2841 | /* Check that off_t can represent 2**63 - 1 correctly. | 3845 | /* Check that off_t can represent 2**63 - 1 correctly. |
@@ -2855,55 +3859,67 @@ main () | |||
2855 | } | 3859 | } |
2856 | _ACEOF | 3860 | _ACEOF |
2857 | rm -f conftest.$ac_objext | 3861 | rm -f conftest.$ac_objext |
2858 | if { (eval echo "$as_me:2858: \"$ac_compile\"") >&5 | 3862 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
2859 | (eval $ac_compile) 2>&5 | 3863 | (eval $ac_compile) 2>conftest.er1 |
2860 | ac_status=$? | 3864 | ac_status=$? |
2861 | echo "$as_me:2861: \$? = $ac_status" >&5 | 3865 | grep -v '^ *+' conftest.er1 >conftest.err |
3866 | rm -f conftest.er1 | ||
3867 | cat conftest.err >&5 | ||
3868 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2862 | (exit $ac_status); } && | 3869 | (exit $ac_status); } && |
2863 | { ac_try='test -s conftest.$ac_objext' | 3870 | { ac_try='test -z "$ac_c_werror_flag" |
2864 | { (eval echo "$as_me:2864: \"$ac_try\"") >&5 | 3871 | || test ! -s conftest.err' |
3872 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
2865 | (eval $ac_try) 2>&5 | 3873 | (eval $ac_try) 2>&5 |
2866 | ac_status=$? | 3874 | ac_status=$? |
2867 | echo "$as_me:2867: \$? = $ac_status" >&5 | 3875 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3876 | (exit $ac_status); }; } && | ||
3877 | { ac_try='test -s conftest.$ac_objext' | ||
3878 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3879 | (eval $ac_try) 2>&5 | ||
3880 | ac_status=$? | ||
3881 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
2868 | (exit $ac_status); }; }; then | 3882 | (exit $ac_status); }; }; then |
2869 | ac_cv_sys_large_files=1; break | 3883 | ac_cv_sys_large_files=1; break |
2870 | else | 3884 | else |
2871 | echo "$as_me: failed program was:" >&5 | 3885 | echo "$as_me: failed program was:" >&5 |
2872 | cat conftest.$ac_ext >&5 | 3886 | sed 's/^/| /' conftest.$ac_ext >&5 |
3887 | |||
2873 | fi | 3888 | fi |
2874 | rm -f conftest.$ac_objext conftest.$ac_ext | 3889 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
2875 | break | 3890 | break |
2876 | done | 3891 | done |
2877 | fi | 3892 | fi |
2878 | echo "$as_me:2878: result: $ac_cv_sys_large_files" >&5 | 3893 | echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 |
2879 | echo "${ECHO_T}$ac_cv_sys_large_files" >&6 | 3894 | echo "${ECHO_T}$ac_cv_sys_large_files" >&6 |
2880 | if test "$ac_cv_sys_large_files" != no; then | 3895 | if test "$ac_cv_sys_large_files" != no; then |
2881 | 3896 | ||
2882 | cat >>confdefs.h <<EOF | 3897 | cat >>confdefs.h <<_ACEOF |
2883 | #define _LARGE_FILES $ac_cv_sys_large_files | 3898 | #define _LARGE_FILES $ac_cv_sys_large_files |
2884 | EOF | 3899 | _ACEOF |
2885 | 3900 | ||
2886 | fi | 3901 | fi |
2887 | rm -f conftest* | 3902 | rm -f conftest* |
2888 | fi | 3903 | fi |
2889 | 3904 | ||
3905 | |||
2890 | if test -z "$AR" ; then | 3906 | if test -z "$AR" ; then |
2891 | { { echo "$as_me:2891: error: *** 'ar' missing, please install or fix your \$PATH ***" >&5 | 3907 | { { echo "$as_me:$LINENO: error: *** 'ar' missing, please install or fix your \$PATH ***" >&5 |
2892 | echo "$as_me: error: *** 'ar' missing, please install or fix your \$PATH ***" >&2;} | 3908 | echo "$as_me: error: *** 'ar' missing, please install or fix your \$PATH ***" >&2;} |
2893 | { (exit 1); exit 1; }; } | 3909 | { (exit 1); exit 1; }; } |
2894 | fi | 3910 | fi |
2895 | 3911 | ||
2896 | # Use LOGIN_PROGRAM from environment if possible | 3912 | # Use LOGIN_PROGRAM from environment if possible |
2897 | if test ! -z "$LOGIN_PROGRAM" ; then | 3913 | if test ! -z "$LOGIN_PROGRAM" ; then |
2898 | cat >>confdefs.h <<EOF | 3914 | cat >>confdefs.h <<_ACEOF |
2899 | #define LOGIN_PROGRAM_FALLBACK "$LOGIN_PROGRAM" | 3915 | #define LOGIN_PROGRAM_FALLBACK "$LOGIN_PROGRAM" |
2900 | EOF | 3916 | _ACEOF |
2901 | 3917 | ||
2902 | else | 3918 | else |
2903 | # Search for login | 3919 | # Search for login |
2904 | # Extract the first word of "login", so it can be a program name with args. | 3920 | # Extract the first word of "login", so it can be a program name with args. |
2905 | set dummy login; ac_word=$2 | 3921 | set dummy login; ac_word=$2 |
2906 | echo "$as_me:2906: checking for $ac_word" >&5 | 3922 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
2907 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 3923 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
2908 | if test "${ac_cv_path_LOGIN_PROGRAM_FALLBACK+set}" = set; then | 3924 | if test "${ac_cv_path_LOGIN_PROGRAM_FALLBACK+set}" = set; then |
2909 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3925 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -2913,16 +3929,18 @@ else | |||
2913 | ac_cv_path_LOGIN_PROGRAM_FALLBACK="$LOGIN_PROGRAM_FALLBACK" # Let the user override the test with a path. | 3929 | ac_cv_path_LOGIN_PROGRAM_FALLBACK="$LOGIN_PROGRAM_FALLBACK" # Let the user override the test with a path. |
2914 | ;; | 3930 | ;; |
2915 | *) | 3931 | *) |
2916 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 3932 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2917 | ac_dummy="$PATH" | 3933 | for as_dir in $PATH |
2918 | for ac_dir in $ac_dummy; do | 3934 | do |
2919 | IFS=$ac_save_IFS | 3935 | IFS=$as_save_IFS |
2920 | test -z "$ac_dir" && ac_dir=. | 3936 | test -z "$as_dir" && as_dir=. |
2921 | if $as_executable_p "$ac_dir/$ac_word"; then | 3937 | for ac_exec_ext in '' $ac_executable_extensions; do |
2922 | ac_cv_path_LOGIN_PROGRAM_FALLBACK="$ac_dir/$ac_word" | 3938 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2923 | echo "$as_me:2923: found $ac_dir/$ac_word" >&5 | 3939 | ac_cv_path_LOGIN_PROGRAM_FALLBACK="$as_dir/$ac_word$ac_exec_ext" |
2924 | break | 3940 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2925 | fi | 3941 | break 2 |
3942 | fi | ||
3943 | done | ||
2926 | done | 3944 | done |
2927 | 3945 | ||
2928 | ;; | 3946 | ;; |
@@ -2931,24 +3949,24 @@ fi | |||
2931 | LOGIN_PROGRAM_FALLBACK=$ac_cv_path_LOGIN_PROGRAM_FALLBACK | 3949 | LOGIN_PROGRAM_FALLBACK=$ac_cv_path_LOGIN_PROGRAM_FALLBACK |
2932 | 3950 | ||
2933 | if test -n "$LOGIN_PROGRAM_FALLBACK"; then | 3951 | if test -n "$LOGIN_PROGRAM_FALLBACK"; then |
2934 | echo "$as_me:2934: result: $LOGIN_PROGRAM_FALLBACK" >&5 | 3952 | echo "$as_me:$LINENO: result: $LOGIN_PROGRAM_FALLBACK" >&5 |
2935 | echo "${ECHO_T}$LOGIN_PROGRAM_FALLBACK" >&6 | 3953 | echo "${ECHO_T}$LOGIN_PROGRAM_FALLBACK" >&6 |
2936 | else | 3954 | else |
2937 | echo "$as_me:2937: result: no" >&5 | 3955 | echo "$as_me:$LINENO: result: no" >&5 |
2938 | echo "${ECHO_T}no" >&6 | 3956 | echo "${ECHO_T}no" >&6 |
2939 | fi | 3957 | fi |
2940 | 3958 | ||
2941 | if test ! -z "$LOGIN_PROGRAM_FALLBACK" ; then | 3959 | if test ! -z "$LOGIN_PROGRAM_FALLBACK" ; then |
2942 | cat >>confdefs.h <<EOF | 3960 | cat >>confdefs.h <<_ACEOF |
2943 | #define LOGIN_PROGRAM_FALLBACK "$LOGIN_PROGRAM_FALLBACK" | 3961 | #define LOGIN_PROGRAM_FALLBACK "$LOGIN_PROGRAM_FALLBACK" |
2944 | EOF | 3962 | _ACEOF |
2945 | 3963 | ||
2946 | fi | 3964 | fi |
2947 | fi | 3965 | fi |
2948 | 3966 | ||
2949 | # Extract the first word of "passwd", so it can be a program name with args. | 3967 | # Extract the first word of "passwd", so it can be a program name with args. |
2950 | set dummy passwd; ac_word=$2 | 3968 | set dummy passwd; ac_word=$2 |
2951 | echo "$as_me:2951: checking for $ac_word" >&5 | 3969 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
2952 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 3970 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
2953 | if test "${ac_cv_path_PATH_PASSWD_PROG+set}" = set; then | 3971 | if test "${ac_cv_path_PATH_PASSWD_PROG+set}" = set; then |
2954 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 3972 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -2958,16 +3976,18 @@ else | |||
2958 | ac_cv_path_PATH_PASSWD_PROG="$PATH_PASSWD_PROG" # Let the user override the test with a path. | 3976 | ac_cv_path_PATH_PASSWD_PROG="$PATH_PASSWD_PROG" # Let the user override the test with a path. |
2959 | ;; | 3977 | ;; |
2960 | *) | 3978 | *) |
2961 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 3979 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2962 | ac_dummy="$PATH" | 3980 | for as_dir in $PATH |
2963 | for ac_dir in $ac_dummy; do | 3981 | do |
2964 | IFS=$ac_save_IFS | 3982 | IFS=$as_save_IFS |
2965 | test -z "$ac_dir" && ac_dir=. | 3983 | test -z "$as_dir" && as_dir=. |
2966 | if $as_executable_p "$ac_dir/$ac_word"; then | 3984 | for ac_exec_ext in '' $ac_executable_extensions; do |
2967 | ac_cv_path_PATH_PASSWD_PROG="$ac_dir/$ac_word" | 3985 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2968 | echo "$as_me:2968: found $ac_dir/$ac_word" >&5 | 3986 | ac_cv_path_PATH_PASSWD_PROG="$as_dir/$ac_word$ac_exec_ext" |
2969 | break | 3987 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2970 | fi | 3988 | break 2 |
3989 | fi | ||
3990 | done | ||
2971 | done | 3991 | done |
2972 | 3992 | ||
2973 | ;; | 3993 | ;; |
@@ -2976,17 +3996,17 @@ fi | |||
2976 | PATH_PASSWD_PROG=$ac_cv_path_PATH_PASSWD_PROG | 3996 | PATH_PASSWD_PROG=$ac_cv_path_PATH_PASSWD_PROG |
2977 | 3997 | ||
2978 | if test -n "$PATH_PASSWD_PROG"; then | 3998 | if test -n "$PATH_PASSWD_PROG"; then |
2979 | echo "$as_me:2979: result: $PATH_PASSWD_PROG" >&5 | 3999 | echo "$as_me:$LINENO: result: $PATH_PASSWD_PROG" >&5 |
2980 | echo "${ECHO_T}$PATH_PASSWD_PROG" >&6 | 4000 | echo "${ECHO_T}$PATH_PASSWD_PROG" >&6 |
2981 | else | 4001 | else |
2982 | echo "$as_me:2982: result: no" >&5 | 4002 | echo "$as_me:$LINENO: result: no" >&5 |
2983 | echo "${ECHO_T}no" >&6 | 4003 | echo "${ECHO_T}no" >&6 |
2984 | fi | 4004 | fi |
2985 | 4005 | ||
2986 | if test ! -z "$PATH_PASSWD_PROG" ; then | 4006 | if test ! -z "$PATH_PASSWD_PROG" ; then |
2987 | cat >>confdefs.h <<EOF | 4007 | cat >>confdefs.h <<_ACEOF |
2988 | #define _PATH_PASSWD_PROG "$PATH_PASSWD_PROG" | 4008 | #define _PATH_PASSWD_PROG "$PATH_PASSWD_PROG" |
2989 | EOF | 4009 | _ACEOF |
2990 | 4010 | ||
2991 | fi | 4011 | fi |
2992 | 4012 | ||
@@ -2994,98 +4014,8 @@ if test -z "$LD" ; then | |||
2994 | LD=$CC | 4014 | LD=$CC |
2995 | fi | 4015 | fi |
2996 | 4016 | ||
2997 | echo "$as_me:2997: checking for $CC option to accept ANSI C" >&5 | ||
2998 | echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 | ||
2999 | if test "${ac_cv_prog_cc_stdc+set}" = set; then | ||
3000 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3001 | else | ||
3002 | ac_cv_prog_cc_stdc=no | ||
3003 | ac_save_CC=$CC | ||
3004 | cat >conftest.$ac_ext <<_ACEOF | ||
3005 | #line 3005 "configure" | ||
3006 | #include "confdefs.h" | ||
3007 | #include <stdarg.h> | ||
3008 | #include <stdio.h> | ||
3009 | #include <sys/types.h> | ||
3010 | #include <sys/stat.h> | ||
3011 | /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ | ||
3012 | struct buf { int x; }; | ||
3013 | FILE * (*rcsopen) (struct buf *, struct stat *, int); | ||
3014 | static char *e (p, i) | ||
3015 | char **p; | ||
3016 | int i; | ||
3017 | { | ||
3018 | return p[i]; | ||
3019 | } | ||
3020 | static char *f (char * (*g) (char **, int), char **p, ...) | ||
3021 | { | ||
3022 | char *s; | ||
3023 | va_list v; | ||
3024 | va_start (v,p); | ||
3025 | s = g (p, va_arg (v,int)); | ||
3026 | va_end (v); | ||
3027 | return s; | ||
3028 | } | ||
3029 | int test (int i, double x); | ||
3030 | struct s1 {int (*f) (int a);}; | ||
3031 | struct s2 {int (*f) (double a);}; | ||
3032 | int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); | ||
3033 | int argc; | ||
3034 | char **argv; | ||
3035 | int | ||
3036 | main () | ||
3037 | { | ||
3038 | return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; | ||
3039 | ; | ||
3040 | return 0; | ||
3041 | } | ||
3042 | _ACEOF | ||
3043 | # Don't try gcc -ansi; that turns off useful extensions and | ||
3044 | # breaks some systems' header files. | ||
3045 | # AIX -qlanglvl=ansi | ||
3046 | # Ultrix and OSF/1 -std1 | ||
3047 | # HP-UX 10.20 and later -Ae | ||
3048 | # HP-UX older versions -Aa -D_HPUX_SOURCE | ||
3049 | # SVR4 -Xc -D__EXTENSIONS__ | ||
3050 | for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" | ||
3051 | do | ||
3052 | CC="$ac_save_CC $ac_arg" | ||
3053 | rm -f conftest.$ac_objext | ||
3054 | if { (eval echo "$as_me:3054: \"$ac_compile\"") >&5 | ||
3055 | (eval $ac_compile) 2>&5 | ||
3056 | ac_status=$? | ||
3057 | echo "$as_me:3057: \$? = $ac_status" >&5 | ||
3058 | (exit $ac_status); } && | ||
3059 | { ac_try='test -s conftest.$ac_objext' | ||
3060 | { (eval echo "$as_me:3060: \"$ac_try\"") >&5 | ||
3061 | (eval $ac_try) 2>&5 | ||
3062 | ac_status=$? | ||
3063 | echo "$as_me:3063: \$? = $ac_status" >&5 | ||
3064 | (exit $ac_status); }; }; then | ||
3065 | ac_cv_prog_cc_stdc=$ac_arg | ||
3066 | break | ||
3067 | else | ||
3068 | echo "$as_me: failed program was:" >&5 | ||
3069 | cat conftest.$ac_ext >&5 | ||
3070 | fi | ||
3071 | rm -f conftest.$ac_objext | ||
3072 | done | ||
3073 | rm -f conftest.$ac_ext conftest.$ac_objext | ||
3074 | CC=$ac_save_CC | ||
3075 | |||
3076 | fi | ||
3077 | 4017 | ||
3078 | case "x$ac_cv_prog_cc_stdc" in | 4018 | echo "$as_me:$LINENO: checking for inline" >&5 |
3079 | x|xno) | ||
3080 | echo "$as_me:3080: result: none needed" >&5 | ||
3081 | echo "${ECHO_T}none needed" >&6 ;; | ||
3082 | *) | ||
3083 | echo "$as_me:3083: result: $ac_cv_prog_cc_stdc" >&5 | ||
3084 | echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 | ||
3085 | CC="$CC $ac_cv_prog_cc_stdc" ;; | ||
3086 | esac | ||
3087 | |||
3088 | echo "$as_me:3088: checking for inline" >&5 | ||
3089 | echo $ECHO_N "checking for inline... $ECHO_C" >&6 | 4019 | echo $ECHO_N "checking for inline... $ECHO_C" >&6 |
3090 | if test "${ac_cv_c_inline+set}" = set; then | 4020 | if test "${ac_cv_c_inline+set}" = set; then |
3091 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 4021 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -3093,54 +4023,74 @@ else | |||
3093 | ac_cv_c_inline=no | 4023 | ac_cv_c_inline=no |
3094 | for ac_kw in inline __inline__ __inline; do | 4024 | for ac_kw in inline __inline__ __inline; do |
3095 | cat >conftest.$ac_ext <<_ACEOF | 4025 | cat >conftest.$ac_ext <<_ACEOF |
3096 | #line 3096 "configure" | 4026 | /* confdefs.h. */ |
3097 | #include "confdefs.h" | 4027 | _ACEOF |
4028 | cat confdefs.h >>conftest.$ac_ext | ||
4029 | cat >>conftest.$ac_ext <<_ACEOF | ||
4030 | /* end confdefs.h. */ | ||
3098 | #ifndef __cplusplus | 4031 | #ifndef __cplusplus |
3099 | static $ac_kw int static_foo () {return 0; } | 4032 | typedef int foo_t; |
3100 | $ac_kw int foo () {return 0; } | 4033 | static $ac_kw foo_t static_foo () {return 0; } |
4034 | $ac_kw foo_t foo () {return 0; } | ||
3101 | #endif | 4035 | #endif |
3102 | 4036 | ||
3103 | _ACEOF | 4037 | _ACEOF |
3104 | rm -f conftest.$ac_objext | 4038 | rm -f conftest.$ac_objext |
3105 | if { (eval echo "$as_me:3105: \"$ac_compile\"") >&5 | 4039 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
3106 | (eval $ac_compile) 2>&5 | 4040 | (eval $ac_compile) 2>conftest.er1 |
3107 | ac_status=$? | 4041 | ac_status=$? |
3108 | echo "$as_me:3108: \$? = $ac_status" >&5 | 4042 | grep -v '^ *+' conftest.er1 >conftest.err |
4043 | rm -f conftest.er1 | ||
4044 | cat conftest.err >&5 | ||
4045 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3109 | (exit $ac_status); } && | 4046 | (exit $ac_status); } && |
3110 | { ac_try='test -s conftest.$ac_objext' | 4047 | { ac_try='test -z "$ac_c_werror_flag" |
3111 | { (eval echo "$as_me:3111: \"$ac_try\"") >&5 | 4048 | || test ! -s conftest.err' |
4049 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4050 | (eval $ac_try) 2>&5 | ||
4051 | ac_status=$? | ||
4052 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4053 | (exit $ac_status); }; } && | ||
4054 | { ac_try='test -s conftest.$ac_objext' | ||
4055 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3112 | (eval $ac_try) 2>&5 | 4056 | (eval $ac_try) 2>&5 |
3113 | ac_status=$? | 4057 | ac_status=$? |
3114 | echo "$as_me:3114: \$? = $ac_status" >&5 | 4058 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3115 | (exit $ac_status); }; }; then | 4059 | (exit $ac_status); }; }; then |
3116 | ac_cv_c_inline=$ac_kw; break | 4060 | ac_cv_c_inline=$ac_kw; break |
3117 | else | 4061 | else |
3118 | echo "$as_me: failed program was:" >&5 | 4062 | echo "$as_me: failed program was:" >&5 |
3119 | cat conftest.$ac_ext >&5 | 4063 | sed 's/^/| /' conftest.$ac_ext >&5 |
4064 | |||
3120 | fi | 4065 | fi |
3121 | rm -f conftest.$ac_objext conftest.$ac_ext | 4066 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
3122 | done | 4067 | done |
3123 | 4068 | ||
3124 | fi | 4069 | fi |
3125 | echo "$as_me:3125: result: $ac_cv_c_inline" >&5 | 4070 | echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 |
3126 | echo "${ECHO_T}$ac_cv_c_inline" >&6 | 4071 | echo "${ECHO_T}$ac_cv_c_inline" >&6 |
4072 | |||
4073 | |||
3127 | case $ac_cv_c_inline in | 4074 | case $ac_cv_c_inline in |
3128 | inline | yes) ;; | 4075 | inline | yes) ;; |
3129 | no) | 4076 | *) |
3130 | cat >>confdefs.h <<\EOF | 4077 | case $ac_cv_c_inline in |
3131 | #define inline | 4078 | no) ac_val=;; |
3132 | EOF | 4079 | *) ac_val=$ac_cv_c_inline;; |
3133 | ;; | 4080 | esac |
3134 | *) cat >>confdefs.h <<EOF | 4081 | cat >>confdefs.h <<_ACEOF |
3135 | #define inline $ac_cv_c_inline | 4082 | #ifndef __cplusplus |
3136 | EOF | 4083 | #define inline $ac_val |
3137 | ;; | 4084 | #endif |
4085 | _ACEOF | ||
4086 | ;; | ||
3138 | esac | 4087 | esac |
3139 | 4088 | ||
3140 | if test "$GCC" = "yes" || test "$GCC" = "egcs"; then | 4089 | if test "$GCC" = "yes" || test "$GCC" = "egcs"; then |
3141 | CFLAGS="$CFLAGS -Wall -Wpointer-arith -Wno-uninitialized" | 4090 | CFLAGS="$CFLAGS -Wall -Wpointer-arith -Wno-uninitialized" |
3142 | fi | 4091 | fi |
3143 | 4092 | ||
4093 | |||
3144 | # Check whether --with-rpath or --without-rpath was given. | 4094 | # Check whether --with-rpath or --without-rpath was given. |
3145 | if test "${with_rpath+set}" = set; then | 4095 | if test "${with_rpath+set}" = set; then |
3146 | withval="$with_rpath" | 4096 | withval="$with_rpath" |
@@ -3152,12 +4102,13 @@ if test "${with_rpath+set}" = set; then | |||
3152 | need_dash_r=1 | 4102 | need_dash_r=1 |
3153 | fi | 4103 | fi |
3154 | 4104 | ||
4105 | |||
3155 | fi; | 4106 | fi; |
3156 | 4107 | ||
3157 | # Check for some target-specific stuff | 4108 | # Check for some target-specific stuff |
3158 | case "$host" in | 4109 | case "$host" in |
3159 | *-*-aix*) | 4110 | *-*-aix*) |
3160 | echo "$as_me:3160: checking how to specify blibpath for linker ($LD)" >&5 | 4111 | echo "$as_me:$LINENO: checking how to specify blibpath for linker ($LD)" >&5 |
3161 | echo $ECHO_N "checking how to specify blibpath for linker ($LD)... $ECHO_C" >&6 | 4112 | echo $ECHO_N "checking how to specify blibpath for linker ($LD)... $ECHO_C" >&6 |
3162 | if (test -z "$blibpath"); then | 4113 | if (test -z "$blibpath"); then |
3163 | blibpath="/usr/lib:/lib" | 4114 | blibpath="/usr/lib:/lib" |
@@ -3167,8 +4118,11 @@ echo $ECHO_N "checking how to specify blibpath for linker ($LD)... $ECHO_C" >&6 | |||
3167 | if (test -z "$blibflags"); then | 4118 | if (test -z "$blibflags"); then |
3168 | LDFLAGS="$saved_LDFLAGS $tryflags$blibpath" | 4119 | LDFLAGS="$saved_LDFLAGS $tryflags$blibpath" |
3169 | cat >conftest.$ac_ext <<_ACEOF | 4120 | cat >conftest.$ac_ext <<_ACEOF |
3170 | #line 3170 "configure" | 4121 | /* confdefs.h. */ |
3171 | #include "confdefs.h" | 4122 | _ACEOF |
4123 | cat confdefs.h >>conftest.$ac_ext | ||
4124 | cat >>conftest.$ac_ext <<_ACEOF | ||
4125 | /* end confdefs.h. */ | ||
3172 | 4126 | ||
3173 | int | 4127 | int |
3174 | main () | 4128 | main () |
@@ -3179,101 +4133,145 @@ main () | |||
3179 | } | 4133 | } |
3180 | _ACEOF | 4134 | _ACEOF |
3181 | rm -f conftest.$ac_objext conftest$ac_exeext | 4135 | rm -f conftest.$ac_objext conftest$ac_exeext |
3182 | if { (eval echo "$as_me:3182: \"$ac_link\"") >&5 | 4136 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
3183 | (eval $ac_link) 2>&5 | 4137 | (eval $ac_link) 2>conftest.er1 |
3184 | ac_status=$? | 4138 | ac_status=$? |
3185 | echo "$as_me:3185: \$? = $ac_status" >&5 | 4139 | grep -v '^ *+' conftest.er1 >conftest.err |
4140 | rm -f conftest.er1 | ||
4141 | cat conftest.err >&5 | ||
4142 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3186 | (exit $ac_status); } && | 4143 | (exit $ac_status); } && |
3187 | { ac_try='test -s conftest$ac_exeext' | 4144 | { ac_try='test -z "$ac_c_werror_flag" |
3188 | { (eval echo "$as_me:3188: \"$ac_try\"") >&5 | 4145 | || test ! -s conftest.err' |
4146 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3189 | (eval $ac_try) 2>&5 | 4147 | (eval $ac_try) 2>&5 |
3190 | ac_status=$? | 4148 | ac_status=$? |
3191 | echo "$as_me:3191: \$? = $ac_status" >&5 | 4149 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4150 | (exit $ac_status); }; } && | ||
4151 | { ac_try='test -s conftest$ac_exeext' | ||
4152 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4153 | (eval $ac_try) 2>&5 | ||
4154 | ac_status=$? | ||
4155 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3192 | (exit $ac_status); }; }; then | 4156 | (exit $ac_status); }; }; then |
3193 | blibflags=$tryflags | 4157 | blibflags=$tryflags |
3194 | else | 4158 | else |
3195 | echo "$as_me: failed program was:" >&5 | 4159 | echo "$as_me: failed program was:" >&5 |
3196 | cat conftest.$ac_ext >&5 | 4160 | sed 's/^/| /' conftest.$ac_ext >&5 |
4161 | |||
3197 | fi | 4162 | fi |
3198 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 4163 | rm -f conftest.err conftest.$ac_objext \ |
4164 | conftest$ac_exeext conftest.$ac_ext | ||
3199 | fi | 4165 | fi |
3200 | done | 4166 | done |
3201 | if (test -z "$blibflags"); then | 4167 | if (test -z "$blibflags"); then |
3202 | echo "$as_me:3202: result: not found" >&5 | 4168 | echo "$as_me:$LINENO: result: not found" >&5 |
3203 | echo "${ECHO_T}not found" >&6 | 4169 | echo "${ECHO_T}not found" >&6 |
3204 | { { echo "$as_me:3204: error: *** must be able to specify blibpath on AIX - check config.log" >&5 | 4170 | { { echo "$as_me:$LINENO: error: *** must be able to specify blibpath on AIX - check config.log" >&5 |
3205 | echo "$as_me: error: *** must be able to specify blibpath on AIX - check config.log" >&2;} | 4171 | echo "$as_me: error: *** must be able to specify blibpath on AIX - check config.log" >&2;} |
3206 | { (exit 1); exit 1; }; } | 4172 | { (exit 1); exit 1; }; } |
3207 | else | 4173 | else |
3208 | echo "$as_me:3208: result: $blibflags" >&5 | 4174 | echo "$as_me:$LINENO: result: $blibflags" >&5 |
3209 | echo "${ECHO_T}$blibflags" >&6 | 4175 | echo "${ECHO_T}$blibflags" >&6 |
3210 | fi | 4176 | fi |
3211 | LDFLAGS="$saved_LDFLAGS" | 4177 | LDFLAGS="$saved_LDFLAGS" |
3212 | echo "$as_me:3212: checking for authenticate" >&5 | 4178 | echo "$as_me:$LINENO: checking for authenticate" >&5 |
3213 | echo $ECHO_N "checking for authenticate... $ECHO_C" >&6 | 4179 | echo $ECHO_N "checking for authenticate... $ECHO_C" >&6 |
3214 | if test "${ac_cv_func_authenticate+set}" = set; then | 4180 | if test "${ac_cv_func_authenticate+set}" = set; then |
3215 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 4181 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
3216 | else | 4182 | else |
3217 | cat >conftest.$ac_ext <<_ACEOF | 4183 | cat >conftest.$ac_ext <<_ACEOF |
3218 | #line 3218 "configure" | 4184 | /* confdefs.h. */ |
3219 | #include "confdefs.h" | 4185 | _ACEOF |
4186 | cat confdefs.h >>conftest.$ac_ext | ||
4187 | cat >>conftest.$ac_ext <<_ACEOF | ||
4188 | /* end confdefs.h. */ | ||
4189 | /* Define authenticate to an innocuous variant, in case <limits.h> declares authenticate. | ||
4190 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
4191 | #define authenticate innocuous_authenticate | ||
4192 | |||
3220 | /* System header to define __stub macros and hopefully few prototypes, | 4193 | /* System header to define __stub macros and hopefully few prototypes, |
3221 | which can conflict with char authenticate (); below. */ | 4194 | which can conflict with char authenticate (); below. |
3222 | #include <assert.h> | 4195 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
4196 | <limits.h> exists even on freestanding compilers. */ | ||
4197 | |||
4198 | #ifdef __STDC__ | ||
4199 | # include <limits.h> | ||
4200 | #else | ||
4201 | # include <assert.h> | ||
4202 | #endif | ||
4203 | |||
4204 | #undef authenticate | ||
4205 | |||
3223 | /* Override any gcc2 internal prototype to avoid an error. */ | 4206 | /* Override any gcc2 internal prototype to avoid an error. */ |
3224 | #ifdef __cplusplus | 4207 | #ifdef __cplusplus |
3225 | extern "C" | 4208 | extern "C" |
4209 | { | ||
3226 | #endif | 4210 | #endif |
3227 | /* We use char because int might match the return type of a gcc2 | 4211 | /* We use char because int might match the return type of a gcc2 |
3228 | builtin and then its argument prototype would still apply. */ | 4212 | builtin and then its argument prototype would still apply. */ |
3229 | char authenticate (); | 4213 | char authenticate (); |
3230 | char (*f) (); | ||
3231 | |||
3232 | int | ||
3233 | main () | ||
3234 | { | ||
3235 | /* The GNU C library defines this for functions which it implements | 4214 | /* The GNU C library defines this for functions which it implements |
3236 | to always fail with ENOSYS. Some functions are actually named | 4215 | to always fail with ENOSYS. Some functions are actually named |
3237 | something starting with __ and the normal name is an alias. */ | 4216 | something starting with __ and the normal name is an alias. */ |
3238 | #if defined (__stub_authenticate) || defined (__stub___authenticate) | 4217 | #if defined (__stub_authenticate) || defined (__stub___authenticate) |
3239 | choke me | 4218 | choke me |
3240 | #else | 4219 | #else |
3241 | f = authenticate; | 4220 | char (*f) () = authenticate; |
4221 | #endif | ||
4222 | #ifdef __cplusplus | ||
4223 | } | ||
3242 | #endif | 4224 | #endif |
3243 | 4225 | ||
4226 | int | ||
4227 | main () | ||
4228 | { | ||
4229 | return f != authenticate; | ||
3244 | ; | 4230 | ; |
3245 | return 0; | 4231 | return 0; |
3246 | } | 4232 | } |
3247 | _ACEOF | 4233 | _ACEOF |
3248 | rm -f conftest.$ac_objext conftest$ac_exeext | 4234 | rm -f conftest.$ac_objext conftest$ac_exeext |
3249 | if { (eval echo "$as_me:3249: \"$ac_link\"") >&5 | 4235 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
3250 | (eval $ac_link) 2>&5 | 4236 | (eval $ac_link) 2>conftest.er1 |
3251 | ac_status=$? | 4237 | ac_status=$? |
3252 | echo "$as_me:3252: \$? = $ac_status" >&5 | 4238 | grep -v '^ *+' conftest.er1 >conftest.err |
4239 | rm -f conftest.er1 | ||
4240 | cat conftest.err >&5 | ||
4241 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3253 | (exit $ac_status); } && | 4242 | (exit $ac_status); } && |
3254 | { ac_try='test -s conftest$ac_exeext' | 4243 | { ac_try='test -z "$ac_c_werror_flag" |
3255 | { (eval echo "$as_me:3255: \"$ac_try\"") >&5 | 4244 | || test ! -s conftest.err' |
4245 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4246 | (eval $ac_try) 2>&5 | ||
4247 | ac_status=$? | ||
4248 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4249 | (exit $ac_status); }; } && | ||
4250 | { ac_try='test -s conftest$ac_exeext' | ||
4251 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3256 | (eval $ac_try) 2>&5 | 4252 | (eval $ac_try) 2>&5 |
3257 | ac_status=$? | 4253 | ac_status=$? |
3258 | echo "$as_me:3258: \$? = $ac_status" >&5 | 4254 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3259 | (exit $ac_status); }; }; then | 4255 | (exit $ac_status); }; }; then |
3260 | ac_cv_func_authenticate=yes | 4256 | ac_cv_func_authenticate=yes |
3261 | else | 4257 | else |
3262 | echo "$as_me: failed program was:" >&5 | 4258 | echo "$as_me: failed program was:" >&5 |
3263 | cat conftest.$ac_ext >&5 | 4259 | sed 's/^/| /' conftest.$ac_ext >&5 |
4260 | |||
3264 | ac_cv_func_authenticate=no | 4261 | ac_cv_func_authenticate=no |
3265 | fi | 4262 | fi |
3266 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 4263 | rm -f conftest.err conftest.$ac_objext \ |
4264 | conftest$ac_exeext conftest.$ac_ext | ||
3267 | fi | 4265 | fi |
3268 | echo "$as_me:3268: result: $ac_cv_func_authenticate" >&5 | 4266 | echo "$as_me:$LINENO: result: $ac_cv_func_authenticate" >&5 |
3269 | echo "${ECHO_T}$ac_cv_func_authenticate" >&6 | 4267 | echo "${ECHO_T}$ac_cv_func_authenticate" >&6 |
3270 | if test $ac_cv_func_authenticate = yes; then | 4268 | if test $ac_cv_func_authenticate = yes; then |
3271 | cat >>confdefs.h <<\EOF | 4269 | cat >>confdefs.h <<\_ACEOF |
3272 | #define WITH_AIXAUTHENTICATE 1 | 4270 | #define WITH_AIXAUTHENTICATE 1 |
3273 | EOF | 4271 | _ACEOF |
3274 | 4272 | ||
3275 | else | 4273 | else |
3276 | echo "$as_me:3276: checking for authenticate in -ls" >&5 | 4274 | echo "$as_me:$LINENO: checking for authenticate in -ls" >&5 |
3277 | echo $ECHO_N "checking for authenticate in -ls... $ECHO_C" >&6 | 4275 | echo $ECHO_N "checking for authenticate in -ls... $ECHO_C" >&6 |
3278 | if test "${ac_cv_lib_s_authenticate+set}" = set; then | 4276 | if test "${ac_cv_lib_s_authenticate+set}" = set; then |
3279 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 4277 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -3281,8 +4279,11 @@ else | |||
3281 | ac_check_lib_save_LIBS=$LIBS | 4279 | ac_check_lib_save_LIBS=$LIBS |
3282 | LIBS="-ls $LIBS" | 4280 | LIBS="-ls $LIBS" |
3283 | cat >conftest.$ac_ext <<_ACEOF | 4281 | cat >conftest.$ac_ext <<_ACEOF |
3284 | #line 3284 "configure" | 4282 | /* confdefs.h. */ |
3285 | #include "confdefs.h" | 4283 | _ACEOF |
4284 | cat confdefs.h >>conftest.$ac_ext | ||
4285 | cat >>conftest.$ac_ext <<_ACEOF | ||
4286 | /* end confdefs.h. */ | ||
3286 | 4287 | ||
3287 | /* Override any gcc2 internal prototype to avoid an error. */ | 4288 | /* Override any gcc2 internal prototype to avoid an error. */ |
3288 | #ifdef __cplusplus | 4289 | #ifdef __cplusplus |
@@ -3300,49 +4301,66 @@ authenticate (); | |||
3300 | } | 4301 | } |
3301 | _ACEOF | 4302 | _ACEOF |
3302 | rm -f conftest.$ac_objext conftest$ac_exeext | 4303 | rm -f conftest.$ac_objext conftest$ac_exeext |
3303 | if { (eval echo "$as_me:3303: \"$ac_link\"") >&5 | 4304 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
3304 | (eval $ac_link) 2>&5 | 4305 | (eval $ac_link) 2>conftest.er1 |
3305 | ac_status=$? | 4306 | ac_status=$? |
3306 | echo "$as_me:3306: \$? = $ac_status" >&5 | 4307 | grep -v '^ *+' conftest.er1 >conftest.err |
4308 | rm -f conftest.er1 | ||
4309 | cat conftest.err >&5 | ||
4310 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3307 | (exit $ac_status); } && | 4311 | (exit $ac_status); } && |
3308 | { ac_try='test -s conftest$ac_exeext' | 4312 | { ac_try='test -z "$ac_c_werror_flag" |
3309 | { (eval echo "$as_me:3309: \"$ac_try\"") >&5 | 4313 | || test ! -s conftest.err' |
4314 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3310 | (eval $ac_try) 2>&5 | 4315 | (eval $ac_try) 2>&5 |
3311 | ac_status=$? | 4316 | ac_status=$? |
3312 | echo "$as_me:3312: \$? = $ac_status" >&5 | 4317 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4318 | (exit $ac_status); }; } && | ||
4319 | { ac_try='test -s conftest$ac_exeext' | ||
4320 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4321 | (eval $ac_try) 2>&5 | ||
4322 | ac_status=$? | ||
4323 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3313 | (exit $ac_status); }; }; then | 4324 | (exit $ac_status); }; }; then |
3314 | ac_cv_lib_s_authenticate=yes | 4325 | ac_cv_lib_s_authenticate=yes |
3315 | else | 4326 | else |
3316 | echo "$as_me: failed program was:" >&5 | 4327 | echo "$as_me: failed program was:" >&5 |
3317 | cat conftest.$ac_ext >&5 | 4328 | sed 's/^/| /' conftest.$ac_ext >&5 |
4329 | |||
3318 | ac_cv_lib_s_authenticate=no | 4330 | ac_cv_lib_s_authenticate=no |
3319 | fi | 4331 | fi |
3320 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 4332 | rm -f conftest.err conftest.$ac_objext \ |
4333 | conftest$ac_exeext conftest.$ac_ext | ||
3321 | LIBS=$ac_check_lib_save_LIBS | 4334 | LIBS=$ac_check_lib_save_LIBS |
3322 | fi | 4335 | fi |
3323 | echo "$as_me:3323: result: $ac_cv_lib_s_authenticate" >&5 | 4336 | echo "$as_me:$LINENO: result: $ac_cv_lib_s_authenticate" >&5 |
3324 | echo "${ECHO_T}$ac_cv_lib_s_authenticate" >&6 | 4337 | echo "${ECHO_T}$ac_cv_lib_s_authenticate" >&6 |
3325 | if test $ac_cv_lib_s_authenticate = yes; then | 4338 | if test $ac_cv_lib_s_authenticate = yes; then |
3326 | cat >>confdefs.h <<\EOF | 4339 | cat >>confdefs.h <<\_ACEOF |
3327 | #define WITH_AIXAUTHENTICATE 1 | 4340 | #define WITH_AIXAUTHENTICATE 1 |
3328 | EOF | 4341 | _ACEOF |
3329 | 4342 | ||
3330 | LIBS="$LIBS -ls" | 4343 | LIBS="$LIBS -ls" |
3331 | 4344 | ||
3332 | fi | 4345 | fi |
3333 | 4346 | ||
4347 | |||
3334 | fi | 4348 | fi |
3335 | 4349 | ||
3336 | echo "$as_me:3336: checking whether loginfailed is declared" >&5 | 4350 | echo "$as_me:$LINENO: checking whether loginfailed is declared" >&5 |
3337 | echo $ECHO_N "checking whether loginfailed is declared... $ECHO_C" >&6 | 4351 | echo $ECHO_N "checking whether loginfailed is declared... $ECHO_C" >&6 |
3338 | if test "${ac_cv_have_decl_loginfailed+set}" = set; then | 4352 | if test "${ac_cv_have_decl_loginfailed+set}" = set; then |
3339 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 4353 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
3340 | else | 4354 | else |
3341 | cat >conftest.$ac_ext <<_ACEOF | 4355 | cat >conftest.$ac_ext <<_ACEOF |
3342 | #line 3342 "configure" | 4356 | /* confdefs.h. */ |
3343 | #include "confdefs.h" | 4357 | _ACEOF |
4358 | cat confdefs.h >>conftest.$ac_ext | ||
4359 | cat >>conftest.$ac_ext <<_ACEOF | ||
4360 | /* end confdefs.h. */ | ||
3344 | #include <usersec.h> | 4361 | #include <usersec.h> |
3345 | 4362 | ||
4363 | |||
3346 | int | 4364 | int |
3347 | main () | 4365 | main () |
3348 | { | 4366 | { |
@@ -3355,33 +4373,47 @@ main () | |||
3355 | } | 4373 | } |
3356 | _ACEOF | 4374 | _ACEOF |
3357 | rm -f conftest.$ac_objext | 4375 | rm -f conftest.$ac_objext |
3358 | if { (eval echo "$as_me:3358: \"$ac_compile\"") >&5 | 4376 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
3359 | (eval $ac_compile) 2>&5 | 4377 | (eval $ac_compile) 2>conftest.er1 |
3360 | ac_status=$? | 4378 | ac_status=$? |
3361 | echo "$as_me:3361: \$? = $ac_status" >&5 | 4379 | grep -v '^ *+' conftest.er1 >conftest.err |
4380 | rm -f conftest.er1 | ||
4381 | cat conftest.err >&5 | ||
4382 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3362 | (exit $ac_status); } && | 4383 | (exit $ac_status); } && |
3363 | { ac_try='test -s conftest.$ac_objext' | 4384 | { ac_try='test -z "$ac_c_werror_flag" |
3364 | { (eval echo "$as_me:3364: \"$ac_try\"") >&5 | 4385 | || test ! -s conftest.err' |
4386 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3365 | (eval $ac_try) 2>&5 | 4387 | (eval $ac_try) 2>&5 |
3366 | ac_status=$? | 4388 | ac_status=$? |
3367 | echo "$as_me:3367: \$? = $ac_status" >&5 | 4389 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4390 | (exit $ac_status); }; } && | ||
4391 | { ac_try='test -s conftest.$ac_objext' | ||
4392 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4393 | (eval $ac_try) 2>&5 | ||
4394 | ac_status=$? | ||
4395 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3368 | (exit $ac_status); }; }; then | 4396 | (exit $ac_status); }; }; then |
3369 | ac_cv_have_decl_loginfailed=yes | 4397 | ac_cv_have_decl_loginfailed=yes |
3370 | else | 4398 | else |
3371 | echo "$as_me: failed program was:" >&5 | 4399 | echo "$as_me: failed program was:" >&5 |
3372 | cat conftest.$ac_ext >&5 | 4400 | sed 's/^/| /' conftest.$ac_ext >&5 |
4401 | |||
3373 | ac_cv_have_decl_loginfailed=no | 4402 | ac_cv_have_decl_loginfailed=no |
3374 | fi | 4403 | fi |
3375 | rm -f conftest.$ac_objext conftest.$ac_ext | 4404 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
3376 | fi | 4405 | fi |
3377 | echo "$as_me:3377: result: $ac_cv_have_decl_loginfailed" >&5 | 4406 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_loginfailed" >&5 |
3378 | echo "${ECHO_T}$ac_cv_have_decl_loginfailed" >&6 | 4407 | echo "${ECHO_T}$ac_cv_have_decl_loginfailed" >&6 |
3379 | if test $ac_cv_have_decl_loginfailed = yes; then | 4408 | if test $ac_cv_have_decl_loginfailed = yes; then |
3380 | echo "$as_me:3380: checking if loginfailed takes 4 arguments" >&5 | 4409 | echo "$as_me:$LINENO: checking if loginfailed takes 4 arguments" >&5 |
3381 | echo $ECHO_N "checking if loginfailed takes 4 arguments... $ECHO_C" >&6 | 4410 | echo $ECHO_N "checking if loginfailed takes 4 arguments... $ECHO_C" >&6 |
3382 | cat >conftest.$ac_ext <<_ACEOF | 4411 | cat >conftest.$ac_ext <<_ACEOF |
3383 | #line 3383 "configure" | 4412 | /* confdefs.h. */ |
3384 | #include "confdefs.h" | 4413 | _ACEOF |
4414 | cat confdefs.h >>conftest.$ac_ext | ||
4415 | cat >>conftest.$ac_ext <<_ACEOF | ||
4416 | /* end confdefs.h. */ | ||
3385 | #include <usersec.h> | 4417 | #include <usersec.h> |
3386 | int | 4418 | int |
3387 | main () | 4419 | main () |
@@ -3392,199 +4424,246 @@ main () | |||
3392 | } | 4424 | } |
3393 | _ACEOF | 4425 | _ACEOF |
3394 | rm -f conftest.$ac_objext | 4426 | rm -f conftest.$ac_objext |
3395 | if { (eval echo "$as_me:3395: \"$ac_compile\"") >&5 | 4427 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
3396 | (eval $ac_compile) 2>&5 | 4428 | (eval $ac_compile) 2>conftest.er1 |
3397 | ac_status=$? | 4429 | ac_status=$? |
3398 | echo "$as_me:3398: \$? = $ac_status" >&5 | 4430 | grep -v '^ *+' conftest.er1 >conftest.err |
4431 | rm -f conftest.er1 | ||
4432 | cat conftest.err >&5 | ||
4433 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3399 | (exit $ac_status); } && | 4434 | (exit $ac_status); } && |
3400 | { ac_try='test -s conftest.$ac_objext' | 4435 | { ac_try='test -z "$ac_c_werror_flag" |
3401 | { (eval echo "$as_me:3401: \"$ac_try\"") >&5 | 4436 | || test ! -s conftest.err' |
4437 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4438 | (eval $ac_try) 2>&5 | ||
4439 | ac_status=$? | ||
4440 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4441 | (exit $ac_status); }; } && | ||
4442 | { ac_try='test -s conftest.$ac_objext' | ||
4443 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3402 | (eval $ac_try) 2>&5 | 4444 | (eval $ac_try) 2>&5 |
3403 | ac_status=$? | 4445 | ac_status=$? |
3404 | echo "$as_me:3404: \$? = $ac_status" >&5 | 4446 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3405 | (exit $ac_status); }; }; then | 4447 | (exit $ac_status); }; }; then |
3406 | echo "$as_me:3406: result: yes" >&5 | 4448 | echo "$as_me:$LINENO: result: yes" >&5 |
3407 | echo "${ECHO_T}yes" >&6 | 4449 | echo "${ECHO_T}yes" >&6 |
3408 | cat >>confdefs.h <<\EOF | 4450 | cat >>confdefs.h <<\_ACEOF |
3409 | #define AIX_LOGINFAILED_4ARG 1 | 4451 | #define AIX_LOGINFAILED_4ARG 1 |
3410 | EOF | 4452 | _ACEOF |
3411 | 4453 | ||
3412 | else | 4454 | else |
3413 | echo "$as_me: failed program was:" >&5 | 4455 | echo "$as_me: failed program was:" >&5 |
3414 | cat conftest.$ac_ext >&5 | 4456 | sed 's/^/| /' conftest.$ac_ext >&5 |
3415 | echo "$as_me:3415: result: no" >&5 | 4457 | |
4458 | echo "$as_me:$LINENO: result: no" >&5 | ||
3416 | echo "${ECHO_T}no" >&6 | 4459 | echo "${ECHO_T}no" >&6 |
3417 | 4460 | ||
3418 | fi | 4461 | fi |
3419 | rm -f conftest.$ac_objext conftest.$ac_ext | 4462 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
3420 | fi | 4463 | fi |
3421 | 4464 | ||
4465 | |||
3422 | for ac_func in setauthdb | 4466 | for ac_func in setauthdb |
3423 | do | 4467 | do |
3424 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | 4468 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
3425 | echo "$as_me:3425: checking for $ac_func" >&5 | 4469 | echo "$as_me:$LINENO: checking for $ac_func" >&5 |
3426 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | 4470 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 |
3427 | if eval "test \"\${$as_ac_var+set}\" = set"; then | 4471 | if eval "test \"\${$as_ac_var+set}\" = set"; then |
3428 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 4472 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
3429 | else | 4473 | else |
3430 | cat >conftest.$ac_ext <<_ACEOF | 4474 | cat >conftest.$ac_ext <<_ACEOF |
3431 | #line 3431 "configure" | 4475 | /* confdefs.h. */ |
3432 | #include "confdefs.h" | 4476 | _ACEOF |
4477 | cat confdefs.h >>conftest.$ac_ext | ||
4478 | cat >>conftest.$ac_ext <<_ACEOF | ||
4479 | /* end confdefs.h. */ | ||
4480 | /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
4481 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
4482 | #define $ac_func innocuous_$ac_func | ||
4483 | |||
3433 | /* System header to define __stub macros and hopefully few prototypes, | 4484 | /* System header to define __stub macros and hopefully few prototypes, |
3434 | which can conflict with char $ac_func (); below. */ | 4485 | which can conflict with char $ac_func (); below. |
3435 | #include <assert.h> | 4486 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
4487 | <limits.h> exists even on freestanding compilers. */ | ||
4488 | |||
4489 | #ifdef __STDC__ | ||
4490 | # include <limits.h> | ||
4491 | #else | ||
4492 | # include <assert.h> | ||
4493 | #endif | ||
4494 | |||
4495 | #undef $ac_func | ||
4496 | |||
3436 | /* Override any gcc2 internal prototype to avoid an error. */ | 4497 | /* Override any gcc2 internal prototype to avoid an error. */ |
3437 | #ifdef __cplusplus | 4498 | #ifdef __cplusplus |
3438 | extern "C" | 4499 | extern "C" |
4500 | { | ||
3439 | #endif | 4501 | #endif |
3440 | /* We use char because int might match the return type of a gcc2 | 4502 | /* We use char because int might match the return type of a gcc2 |
3441 | builtin and then its argument prototype would still apply. */ | 4503 | builtin and then its argument prototype would still apply. */ |
3442 | char $ac_func (); | 4504 | char $ac_func (); |
3443 | char (*f) (); | ||
3444 | |||
3445 | int | ||
3446 | main () | ||
3447 | { | ||
3448 | /* The GNU C library defines this for functions which it implements | 4505 | /* The GNU C library defines this for functions which it implements |
3449 | to always fail with ENOSYS. Some functions are actually named | 4506 | to always fail with ENOSYS. Some functions are actually named |
3450 | something starting with __ and the normal name is an alias. */ | 4507 | something starting with __ and the normal name is an alias. */ |
3451 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) | 4508 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) |
3452 | choke me | 4509 | choke me |
3453 | #else | 4510 | #else |
3454 | f = $ac_func; | 4511 | char (*f) () = $ac_func; |
4512 | #endif | ||
4513 | #ifdef __cplusplus | ||
4514 | } | ||
3455 | #endif | 4515 | #endif |
3456 | 4516 | ||
4517 | int | ||
4518 | main () | ||
4519 | { | ||
4520 | return f != $ac_func; | ||
3457 | ; | 4521 | ; |
3458 | return 0; | 4522 | return 0; |
3459 | } | 4523 | } |
3460 | _ACEOF | 4524 | _ACEOF |
3461 | rm -f conftest.$ac_objext conftest$ac_exeext | 4525 | rm -f conftest.$ac_objext conftest$ac_exeext |
3462 | if { (eval echo "$as_me:3462: \"$ac_link\"") >&5 | 4526 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
3463 | (eval $ac_link) 2>&5 | 4527 | (eval $ac_link) 2>conftest.er1 |
3464 | ac_status=$? | 4528 | ac_status=$? |
3465 | echo "$as_me:3465: \$? = $ac_status" >&5 | 4529 | grep -v '^ *+' conftest.er1 >conftest.err |
4530 | rm -f conftest.er1 | ||
4531 | cat conftest.err >&5 | ||
4532 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3466 | (exit $ac_status); } && | 4533 | (exit $ac_status); } && |
3467 | { ac_try='test -s conftest$ac_exeext' | 4534 | { ac_try='test -z "$ac_c_werror_flag" |
3468 | { (eval echo "$as_me:3468: \"$ac_try\"") >&5 | 4535 | || test ! -s conftest.err' |
4536 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4537 | (eval $ac_try) 2>&5 | ||
4538 | ac_status=$? | ||
4539 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4540 | (exit $ac_status); }; } && | ||
4541 | { ac_try='test -s conftest$ac_exeext' | ||
4542 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3469 | (eval $ac_try) 2>&5 | 4543 | (eval $ac_try) 2>&5 |
3470 | ac_status=$? | 4544 | ac_status=$? |
3471 | echo "$as_me:3471: \$? = $ac_status" >&5 | 4545 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3472 | (exit $ac_status); }; }; then | 4546 | (exit $ac_status); }; }; then |
3473 | eval "$as_ac_var=yes" | 4547 | eval "$as_ac_var=yes" |
3474 | else | 4548 | else |
3475 | echo "$as_me: failed program was:" >&5 | 4549 | echo "$as_me: failed program was:" >&5 |
3476 | cat conftest.$ac_ext >&5 | 4550 | sed 's/^/| /' conftest.$ac_ext >&5 |
4551 | |||
3477 | eval "$as_ac_var=no" | 4552 | eval "$as_ac_var=no" |
3478 | fi | 4553 | fi |
3479 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 4554 | rm -f conftest.err conftest.$ac_objext \ |
4555 | conftest$ac_exeext conftest.$ac_ext | ||
3480 | fi | 4556 | fi |
3481 | echo "$as_me:3481: result: `eval echo '${'$as_ac_var'}'`" >&5 | 4557 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 |
3482 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | 4558 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 |
3483 | if test `eval echo '${'$as_ac_var'}'` = yes; then | 4559 | if test `eval echo '${'$as_ac_var'}'` = yes; then |
3484 | cat >>confdefs.h <<EOF | 4560 | cat >>confdefs.h <<_ACEOF |
3485 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 4561 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
3486 | EOF | 4562 | _ACEOF |
3487 | 4563 | ||
3488 | fi | 4564 | fi |
3489 | done | 4565 | done |
3490 | 4566 | ||
3491 | cat >>confdefs.h <<\EOF | 4567 | cat >>confdefs.h <<\_ACEOF |
3492 | #define BROKEN_GETADDRINFO 1 | 4568 | #define BROKEN_GETADDRINFO 1 |
3493 | EOF | 4569 | _ACEOF |
3494 | 4570 | ||
3495 | cat >>confdefs.h <<\EOF | 4571 | cat >>confdefs.h <<\_ACEOF |
3496 | #define BROKEN_REALPATH 1 | 4572 | #define BROKEN_REALPATH 1 |
3497 | EOF | 4573 | _ACEOF |
3498 | 4574 | ||
3499 | cat >>confdefs.h <<\EOF | 4575 | cat >>confdefs.h <<\_ACEOF |
3500 | #define SETEUID_BREAKS_SETUID 1 | 4576 | #define SETEUID_BREAKS_SETUID 1 |
3501 | EOF | 4577 | _ACEOF |
3502 | 4578 | ||
3503 | cat >>confdefs.h <<\EOF | 4579 | cat >>confdefs.h <<\_ACEOF |
3504 | #define BROKEN_SETREUID 1 | 4580 | #define BROKEN_SETREUID 1 |
3505 | EOF | 4581 | _ACEOF |
3506 | 4582 | ||
3507 | cat >>confdefs.h <<\EOF | 4583 | cat >>confdefs.h <<\_ACEOF |
3508 | #define BROKEN_SETREGID 1 | 4584 | #define BROKEN_SETREGID 1 |
3509 | EOF | 4585 | _ACEOF |
3510 | 4586 | ||
3511 | cat >>confdefs.h <<\EOF | 4587 | cat >>confdefs.h <<\_ACEOF |
3512 | #define DISABLE_LASTLOG 1 | 4588 | #define DISABLE_LASTLOG 1 |
3513 | EOF | 4589 | _ACEOF |
3514 | 4590 | ||
3515 | cat >>confdefs.h <<\EOF | 4591 | cat >>confdefs.h <<\_ACEOF |
3516 | #define LOGIN_NEEDS_UTMPX 1 | 4592 | #define LOGIN_NEEDS_UTMPX 1 |
3517 | EOF | 4593 | _ACEOF |
3518 | 4594 | ||
3519 | cat >>confdefs.h <<\EOF | 4595 | cat >>confdefs.h <<\_ACEOF |
3520 | #define SPT_TYPE SPT_REUSEARGV | 4596 | #define SPT_TYPE SPT_REUSEARGV |
3521 | EOF | 4597 | _ACEOF |
3522 | 4598 | ||
3523 | ;; | 4599 | ;; |
3524 | *-*-cygwin*) | 4600 | *-*-cygwin*) |
3525 | check_for_libcrypt_later=1 | 4601 | check_for_libcrypt_later=1 |
3526 | LIBS="$LIBS /usr/lib/textmode.o" | 4602 | LIBS="$LIBS /usr/lib/textmode.o" |
3527 | cat >>confdefs.h <<\EOF | 4603 | cat >>confdefs.h <<\_ACEOF |
3528 | #define HAVE_CYGWIN 1 | 4604 | #define HAVE_CYGWIN 1 |
3529 | EOF | 4605 | _ACEOF |
3530 | 4606 | ||
3531 | cat >>confdefs.h <<\EOF | 4607 | cat >>confdefs.h <<\_ACEOF |
3532 | #define USE_PIPES 1 | 4608 | #define USE_PIPES 1 |
3533 | EOF | 4609 | _ACEOF |
3534 | 4610 | ||
3535 | cat >>confdefs.h <<\EOF | 4611 | cat >>confdefs.h <<\_ACEOF |
3536 | #define DISABLE_SHADOW 1 | 4612 | #define DISABLE_SHADOW 1 |
3537 | EOF | 4613 | _ACEOF |
3538 | 4614 | ||
3539 | cat >>confdefs.h <<\EOF | 4615 | cat >>confdefs.h <<\_ACEOF |
3540 | #define IP_TOS_IS_BROKEN 1 | 4616 | #define IP_TOS_IS_BROKEN 1 |
3541 | EOF | 4617 | _ACEOF |
3542 | 4618 | ||
3543 | cat >>confdefs.h <<\EOF | 4619 | cat >>confdefs.h <<\_ACEOF |
3544 | #define NO_X11_UNIX_SOCKETS 1 | 4620 | #define NO_X11_UNIX_SOCKETS 1 |
3545 | EOF | 4621 | _ACEOF |
3546 | 4622 | ||
3547 | cat >>confdefs.h <<\EOF | 4623 | cat >>confdefs.h <<\_ACEOF |
3548 | #define NO_IPPORT_RESERVED_CONCEPT 1 | 4624 | #define NO_IPPORT_RESERVED_CONCEPT 1 |
3549 | EOF | 4625 | _ACEOF |
3550 | 4626 | ||
3551 | cat >>confdefs.h <<\EOF | 4627 | cat >>confdefs.h <<\_ACEOF |
3552 | #define DISABLE_FD_PASSING 1 | 4628 | #define DISABLE_FD_PASSING 1 |
3553 | EOF | 4629 | _ACEOF |
3554 | 4630 | ||
3555 | cat >>confdefs.h <<\EOF | 4631 | cat >>confdefs.h <<\_ACEOF |
3556 | #define SETGROUPS_NOOP 1 | 4632 | #define SETGROUPS_NOOP 1 |
3557 | EOF | 4633 | _ACEOF |
3558 | 4634 | ||
3559 | ;; | 4635 | ;; |
3560 | *-*-dgux*) | 4636 | *-*-dgux*) |
3561 | cat >>confdefs.h <<\EOF | 4637 | cat >>confdefs.h <<\_ACEOF |
3562 | #define IP_TOS_IS_BROKEN 1 | 4638 | #define IP_TOS_IS_BROKEN 1 |
3563 | EOF | 4639 | _ACEOF |
3564 | 4640 | ||
3565 | cat >>confdefs.h <<\EOF | 4641 | cat >>confdefs.h <<\_ACEOF |
3566 | #define SETEUID_BREAKS_SETUID 1 | 4642 | #define SETEUID_BREAKS_SETUID 1 |
3567 | EOF | 4643 | _ACEOF |
3568 | 4644 | ||
3569 | cat >>confdefs.h <<\EOF | 4645 | cat >>confdefs.h <<\_ACEOF |
3570 | #define BROKEN_SETREUID 1 | 4646 | #define BROKEN_SETREUID 1 |
3571 | EOF | 4647 | _ACEOF |
3572 | 4648 | ||
3573 | cat >>confdefs.h <<\EOF | 4649 | cat >>confdefs.h <<\_ACEOF |
3574 | #define BROKEN_SETREGID 1 | 4650 | #define BROKEN_SETREGID 1 |
3575 | EOF | 4651 | _ACEOF |
3576 | 4652 | ||
3577 | ;; | 4653 | ;; |
3578 | *-*-darwin*) | 4654 | *-*-darwin*) |
3579 | echo "$as_me:3579: checking if we have working getaddrinfo" >&5 | 4655 | echo "$as_me:$LINENO: checking if we have working getaddrinfo" >&5 |
3580 | echo $ECHO_N "checking if we have working getaddrinfo... $ECHO_C" >&6 | 4656 | echo $ECHO_N "checking if we have working getaddrinfo... $ECHO_C" >&6 |
3581 | if test "$cross_compiling" = yes; then | 4657 | if test "$cross_compiling" = yes; then |
3582 | echo "$as_me:3582: result: assume it is working" >&5 | 4658 | echo "$as_me:$LINENO: result: assume it is working" >&5 |
3583 | echo "${ECHO_T}assume it is working" >&6 | 4659 | echo "${ECHO_T}assume it is working" >&6 |
3584 | else | 4660 | else |
3585 | cat >conftest.$ac_ext <<_ACEOF | 4661 | cat >conftest.$ac_ext <<_ACEOF |
3586 | #line 3586 "configure" | 4662 | /* confdefs.h. */ |
3587 | #include "confdefs.h" | 4663 | _ACEOF |
4664 | cat confdefs.h >>conftest.$ac_ext | ||
4665 | cat >>conftest.$ac_ext <<_ACEOF | ||
4666 | /* end confdefs.h. */ | ||
3588 | #include <mach-o/dyld.h> | 4667 | #include <mach-o/dyld.h> |
3589 | main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) | 4668 | main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) |
3590 | exit(0); | 4669 | exit(0); |
@@ -3593,46 +4672,48 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) | |||
3593 | } | 4672 | } |
3594 | _ACEOF | 4673 | _ACEOF |
3595 | rm -f conftest$ac_exeext | 4674 | rm -f conftest$ac_exeext |
3596 | if { (eval echo "$as_me:3596: \"$ac_link\"") >&5 | 4675 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
3597 | (eval $ac_link) 2>&5 | 4676 | (eval $ac_link) 2>&5 |
3598 | ac_status=$? | 4677 | ac_status=$? |
3599 | echo "$as_me:3599: \$? = $ac_status" >&5 | 4678 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3600 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | 4679 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
3601 | { (eval echo "$as_me:3601: \"$ac_try\"") >&5 | 4680 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
3602 | (eval $ac_try) 2>&5 | 4681 | (eval $ac_try) 2>&5 |
3603 | ac_status=$? | 4682 | ac_status=$? |
3604 | echo "$as_me:3604: \$? = $ac_status" >&5 | 4683 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3605 | (exit $ac_status); }; }; then | 4684 | (exit $ac_status); }; }; then |
3606 | echo "$as_me:3606: result: working" >&5 | 4685 | echo "$as_me:$LINENO: result: working" >&5 |
3607 | echo "${ECHO_T}working" >&6 | 4686 | echo "${ECHO_T}working" >&6 |
3608 | else | 4687 | else |
3609 | echo "$as_me: program exited with status $ac_status" >&5 | 4688 | echo "$as_me: program exited with status $ac_status" >&5 |
3610 | echo "$as_me: failed program was:" >&5 | 4689 | echo "$as_me: failed program was:" >&5 |
3611 | cat conftest.$ac_ext >&5 | 4690 | sed 's/^/| /' conftest.$ac_ext >&5 |
3612 | echo "$as_me:3612: result: buggy" >&5 | 4691 | |
4692 | ( exit $ac_status ) | ||
4693 | echo "$as_me:$LINENO: result: buggy" >&5 | ||
3613 | echo "${ECHO_T}buggy" >&6 | 4694 | echo "${ECHO_T}buggy" >&6 |
3614 | cat >>confdefs.h <<\EOF | 4695 | cat >>confdefs.h <<\_ACEOF |
3615 | #define BROKEN_GETADDRINFO 1 | 4696 | #define BROKEN_GETADDRINFO 1 |
3616 | EOF | 4697 | _ACEOF |
3617 | 4698 | ||
3618 | fi | 4699 | fi |
3619 | rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | 4700 | rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext |
3620 | fi | 4701 | fi |
3621 | cat >>confdefs.h <<\EOF | 4702 | cat >>confdefs.h <<\_ACEOF |
3622 | #define SETEUID_BREAKS_SETUID 1 | 4703 | #define SETEUID_BREAKS_SETUID 1 |
3623 | EOF | 4704 | _ACEOF |
3624 | 4705 | ||
3625 | cat >>confdefs.h <<\EOF | 4706 | cat >>confdefs.h <<\_ACEOF |
3626 | #define BROKEN_SETREUID 1 | 4707 | #define BROKEN_SETREUID 1 |
3627 | EOF | 4708 | _ACEOF |
3628 | 4709 | ||
3629 | cat >>confdefs.h <<\EOF | 4710 | cat >>confdefs.h <<\_ACEOF |
3630 | #define BROKEN_SETREGID 1 | 4711 | #define BROKEN_SETREGID 1 |
3631 | EOF | 4712 | _ACEOF |
3632 | 4713 | ||
3633 | cat >>confdefs.h <<EOF | 4714 | cat >>confdefs.h <<_ACEOF |
3634 | #define BIND_8_COMPAT 1 | 4715 | #define BIND_8_COMPAT 1 |
3635 | EOF | 4716 | _ACEOF |
3636 | 4717 | ||
3637 | ;; | 4718 | ;; |
3638 | *-*-hpux10.26) | 4719 | *-*-hpux10.26) |
@@ -3641,33 +4722,33 @@ EOF | |||
3641 | fi | 4722 | fi |
3642 | CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1" | 4723 | CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1" |
3643 | IPADDR_IN_DISPLAY=yes | 4724 | IPADDR_IN_DISPLAY=yes |
3644 | cat >>confdefs.h <<\EOF | 4725 | cat >>confdefs.h <<\_ACEOF |
3645 | #define HAVE_SECUREWARE 1 | 4726 | #define HAVE_SECUREWARE 1 |
3646 | EOF | 4727 | _ACEOF |
3647 | 4728 | ||
3648 | cat >>confdefs.h <<\EOF | 4729 | cat >>confdefs.h <<\_ACEOF |
3649 | #define USE_PIPES 1 | 4730 | #define USE_PIPES 1 |
3650 | EOF | 4731 | _ACEOF |
3651 | 4732 | ||
3652 | cat >>confdefs.h <<\EOF | 4733 | cat >>confdefs.h <<\_ACEOF |
3653 | #define LOGIN_NO_ENDOPT 1 | 4734 | #define LOGIN_NO_ENDOPT 1 |
3654 | EOF | 4735 | _ACEOF |
3655 | 4736 | ||
3656 | cat >>confdefs.h <<\EOF | 4737 | cat >>confdefs.h <<\_ACEOF |
3657 | #define LOGIN_NEEDS_UTMPX 1 | 4738 | #define LOGIN_NEEDS_UTMPX 1 |
3658 | EOF | 4739 | _ACEOF |
3659 | 4740 | ||
3660 | cat >>confdefs.h <<\EOF | 4741 | cat >>confdefs.h <<\_ACEOF |
3661 | #define LOCKED_PASSWD_STRING "*" | 4742 | #define LOCKED_PASSWD_STRING "*" |
3662 | EOF | 4743 | _ACEOF |
3663 | 4744 | ||
3664 | cat >>confdefs.h <<\EOF | 4745 | cat >>confdefs.h <<\_ACEOF |
3665 | #define SPT_TYPE SPT_PSTAT | 4746 | #define SPT_TYPE SPT_PSTAT |
3666 | EOF | 4747 | _ACEOF |
3667 | 4748 | ||
3668 | LIBS="$LIBS -lsec -lsecpw" | 4749 | LIBS="$LIBS -lsec -lsecpw" |
3669 | 4750 | ||
3670 | echo "$as_me:3670: checking for t_error in -lxnet" >&5 | 4751 | echo "$as_me:$LINENO: checking for t_error in -lxnet" >&5 |
3671 | echo $ECHO_N "checking for t_error in -lxnet... $ECHO_C" >&6 | 4752 | echo $ECHO_N "checking for t_error in -lxnet... $ECHO_C" >&6 |
3672 | if test "${ac_cv_lib_xnet_t_error+set}" = set; then | 4753 | if test "${ac_cv_lib_xnet_t_error+set}" = set; then |
3673 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 4754 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -3675,8 +4756,11 @@ else | |||
3675 | ac_check_lib_save_LIBS=$LIBS | 4756 | ac_check_lib_save_LIBS=$LIBS |
3676 | LIBS="-lxnet $LIBS" | 4757 | LIBS="-lxnet $LIBS" |
3677 | cat >conftest.$ac_ext <<_ACEOF | 4758 | cat >conftest.$ac_ext <<_ACEOF |
3678 | #line 3678 "configure" | 4759 | /* confdefs.h. */ |
3679 | #include "confdefs.h" | 4760 | _ACEOF |
4761 | cat confdefs.h >>conftest.$ac_ext | ||
4762 | cat >>conftest.$ac_ext <<_ACEOF | ||
4763 | /* end confdefs.h. */ | ||
3680 | 4764 | ||
3681 | /* Override any gcc2 internal prototype to avoid an error. */ | 4765 | /* Override any gcc2 internal prototype to avoid an error. */ |
3682 | #ifdef __cplusplus | 4766 | #ifdef __cplusplus |
@@ -3694,37 +4778,49 @@ t_error (); | |||
3694 | } | 4778 | } |
3695 | _ACEOF | 4779 | _ACEOF |
3696 | rm -f conftest.$ac_objext conftest$ac_exeext | 4780 | rm -f conftest.$ac_objext conftest$ac_exeext |
3697 | if { (eval echo "$as_me:3697: \"$ac_link\"") >&5 | 4781 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
3698 | (eval $ac_link) 2>&5 | 4782 | (eval $ac_link) 2>conftest.er1 |
3699 | ac_status=$? | 4783 | ac_status=$? |
3700 | echo "$as_me:3700: \$? = $ac_status" >&5 | 4784 | grep -v '^ *+' conftest.er1 >conftest.err |
4785 | rm -f conftest.er1 | ||
4786 | cat conftest.err >&5 | ||
4787 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3701 | (exit $ac_status); } && | 4788 | (exit $ac_status); } && |
3702 | { ac_try='test -s conftest$ac_exeext' | 4789 | { ac_try='test -z "$ac_c_werror_flag" |
3703 | { (eval echo "$as_me:3703: \"$ac_try\"") >&5 | 4790 | || test ! -s conftest.err' |
4791 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4792 | (eval $ac_try) 2>&5 | ||
4793 | ac_status=$? | ||
4794 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4795 | (exit $ac_status); }; } && | ||
4796 | { ac_try='test -s conftest$ac_exeext' | ||
4797 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3704 | (eval $ac_try) 2>&5 | 4798 | (eval $ac_try) 2>&5 |
3705 | ac_status=$? | 4799 | ac_status=$? |
3706 | echo "$as_me:3706: \$? = $ac_status" >&5 | 4800 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3707 | (exit $ac_status); }; }; then | 4801 | (exit $ac_status); }; }; then |
3708 | ac_cv_lib_xnet_t_error=yes | 4802 | ac_cv_lib_xnet_t_error=yes |
3709 | else | 4803 | else |
3710 | echo "$as_me: failed program was:" >&5 | 4804 | echo "$as_me: failed program was:" >&5 |
3711 | cat conftest.$ac_ext >&5 | 4805 | sed 's/^/| /' conftest.$ac_ext >&5 |
4806 | |||
3712 | ac_cv_lib_xnet_t_error=no | 4807 | ac_cv_lib_xnet_t_error=no |
3713 | fi | 4808 | fi |
3714 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 4809 | rm -f conftest.err conftest.$ac_objext \ |
4810 | conftest$ac_exeext conftest.$ac_ext | ||
3715 | LIBS=$ac_check_lib_save_LIBS | 4811 | LIBS=$ac_check_lib_save_LIBS |
3716 | fi | 4812 | fi |
3717 | echo "$as_me:3717: result: $ac_cv_lib_xnet_t_error" >&5 | 4813 | echo "$as_me:$LINENO: result: $ac_cv_lib_xnet_t_error" >&5 |
3718 | echo "${ECHO_T}$ac_cv_lib_xnet_t_error" >&6 | 4814 | echo "${ECHO_T}$ac_cv_lib_xnet_t_error" >&6 |
3719 | if test $ac_cv_lib_xnet_t_error = yes; then | 4815 | if test $ac_cv_lib_xnet_t_error = yes; then |
3720 | cat >>confdefs.h <<EOF | 4816 | cat >>confdefs.h <<_ACEOF |
3721 | #define HAVE_LIBXNET 1 | 4817 | #define HAVE_LIBXNET 1 |
3722 | EOF | 4818 | _ACEOF |
3723 | 4819 | ||
3724 | LIBS="-lxnet $LIBS" | 4820 | LIBS="-lxnet $LIBS" |
3725 | 4821 | ||
3726 | else | 4822 | else |
3727 | { { echo "$as_me:3727: error: *** -lxnet needed on HP-UX - check config.log ***" >&5 | 4823 | { { echo "$as_me:$LINENO: error: *** -lxnet needed on HP-UX - check config.log ***" >&5 |
3728 | echo "$as_me: error: *** -lxnet needed on HP-UX - check config.log ***" >&2;} | 4824 | echo "$as_me: error: *** -lxnet needed on HP-UX - check config.log ***" >&2;} |
3729 | { (exit 1); exit 1; }; } | 4825 | { (exit 1); exit 1; }; } |
3730 | fi | 4826 | fi |
@@ -3737,29 +4833,29 @@ fi | |||
3737 | fi | 4833 | fi |
3738 | CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1" | 4834 | CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1" |
3739 | IPADDR_IN_DISPLAY=yes | 4835 | IPADDR_IN_DISPLAY=yes |
3740 | cat >>confdefs.h <<\EOF | 4836 | cat >>confdefs.h <<\_ACEOF |
3741 | #define USE_PIPES 1 | 4837 | #define USE_PIPES 1 |
3742 | EOF | 4838 | _ACEOF |
3743 | 4839 | ||
3744 | cat >>confdefs.h <<\EOF | 4840 | cat >>confdefs.h <<\_ACEOF |
3745 | #define LOGIN_NO_ENDOPT 1 | 4841 | #define LOGIN_NO_ENDOPT 1 |
3746 | EOF | 4842 | _ACEOF |
3747 | 4843 | ||
3748 | cat >>confdefs.h <<\EOF | 4844 | cat >>confdefs.h <<\_ACEOF |
3749 | #define LOGIN_NEEDS_UTMPX 1 | 4845 | #define LOGIN_NEEDS_UTMPX 1 |
3750 | EOF | 4846 | _ACEOF |
3751 | 4847 | ||
3752 | cat >>confdefs.h <<\EOF | 4848 | cat >>confdefs.h <<\_ACEOF |
3753 | #define LOCKED_PASSWD_STRING "*" | 4849 | #define LOCKED_PASSWD_STRING "*" |
3754 | EOF | 4850 | _ACEOF |
3755 | 4851 | ||
3756 | cat >>confdefs.h <<\EOF | 4852 | cat >>confdefs.h <<\_ACEOF |
3757 | #define SPT_TYPE SPT_PSTAT | 4853 | #define SPT_TYPE SPT_PSTAT |
3758 | EOF | 4854 | _ACEOF |
3759 | 4855 | ||
3760 | LIBS="$LIBS -lsec" | 4856 | LIBS="$LIBS -lsec" |
3761 | 4857 | ||
3762 | echo "$as_me:3762: checking for t_error in -lxnet" >&5 | 4858 | echo "$as_me:$LINENO: checking for t_error in -lxnet" >&5 |
3763 | echo $ECHO_N "checking for t_error in -lxnet... $ECHO_C" >&6 | 4859 | echo $ECHO_N "checking for t_error in -lxnet... $ECHO_C" >&6 |
3764 | if test "${ac_cv_lib_xnet_t_error+set}" = set; then | 4860 | if test "${ac_cv_lib_xnet_t_error+set}" = set; then |
3765 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 4861 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -3767,8 +4863,11 @@ else | |||
3767 | ac_check_lib_save_LIBS=$LIBS | 4863 | ac_check_lib_save_LIBS=$LIBS |
3768 | LIBS="-lxnet $LIBS" | 4864 | LIBS="-lxnet $LIBS" |
3769 | cat >conftest.$ac_ext <<_ACEOF | 4865 | cat >conftest.$ac_ext <<_ACEOF |
3770 | #line 3770 "configure" | 4866 | /* confdefs.h. */ |
3771 | #include "confdefs.h" | 4867 | _ACEOF |
4868 | cat confdefs.h >>conftest.$ac_ext | ||
4869 | cat >>conftest.$ac_ext <<_ACEOF | ||
4870 | /* end confdefs.h. */ | ||
3772 | 4871 | ||
3773 | /* Override any gcc2 internal prototype to avoid an error. */ | 4872 | /* Override any gcc2 internal prototype to avoid an error. */ |
3774 | #ifdef __cplusplus | 4873 | #ifdef __cplusplus |
@@ -3786,37 +4885,49 @@ t_error (); | |||
3786 | } | 4885 | } |
3787 | _ACEOF | 4886 | _ACEOF |
3788 | rm -f conftest.$ac_objext conftest$ac_exeext | 4887 | rm -f conftest.$ac_objext conftest$ac_exeext |
3789 | if { (eval echo "$as_me:3789: \"$ac_link\"") >&5 | 4888 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
3790 | (eval $ac_link) 2>&5 | 4889 | (eval $ac_link) 2>conftest.er1 |
3791 | ac_status=$? | 4890 | ac_status=$? |
3792 | echo "$as_me:3792: \$? = $ac_status" >&5 | 4891 | grep -v '^ *+' conftest.er1 >conftest.err |
4892 | rm -f conftest.er1 | ||
4893 | cat conftest.err >&5 | ||
4894 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3793 | (exit $ac_status); } && | 4895 | (exit $ac_status); } && |
3794 | { ac_try='test -s conftest$ac_exeext' | 4896 | { ac_try='test -z "$ac_c_werror_flag" |
3795 | { (eval echo "$as_me:3795: \"$ac_try\"") >&5 | 4897 | || test ! -s conftest.err' |
4898 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4899 | (eval $ac_try) 2>&5 | ||
4900 | ac_status=$? | ||
4901 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4902 | (exit $ac_status); }; } && | ||
4903 | { ac_try='test -s conftest$ac_exeext' | ||
4904 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3796 | (eval $ac_try) 2>&5 | 4905 | (eval $ac_try) 2>&5 |
3797 | ac_status=$? | 4906 | ac_status=$? |
3798 | echo "$as_me:3798: \$? = $ac_status" >&5 | 4907 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3799 | (exit $ac_status); }; }; then | 4908 | (exit $ac_status); }; }; then |
3800 | ac_cv_lib_xnet_t_error=yes | 4909 | ac_cv_lib_xnet_t_error=yes |
3801 | else | 4910 | else |
3802 | echo "$as_me: failed program was:" >&5 | 4911 | echo "$as_me: failed program was:" >&5 |
3803 | cat conftest.$ac_ext >&5 | 4912 | sed 's/^/| /' conftest.$ac_ext >&5 |
4913 | |||
3804 | ac_cv_lib_xnet_t_error=no | 4914 | ac_cv_lib_xnet_t_error=no |
3805 | fi | 4915 | fi |
3806 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 4916 | rm -f conftest.err conftest.$ac_objext \ |
4917 | conftest$ac_exeext conftest.$ac_ext | ||
3807 | LIBS=$ac_check_lib_save_LIBS | 4918 | LIBS=$ac_check_lib_save_LIBS |
3808 | fi | 4919 | fi |
3809 | echo "$as_me:3809: result: $ac_cv_lib_xnet_t_error" >&5 | 4920 | echo "$as_me:$LINENO: result: $ac_cv_lib_xnet_t_error" >&5 |
3810 | echo "${ECHO_T}$ac_cv_lib_xnet_t_error" >&6 | 4921 | echo "${ECHO_T}$ac_cv_lib_xnet_t_error" >&6 |
3811 | if test $ac_cv_lib_xnet_t_error = yes; then | 4922 | if test $ac_cv_lib_xnet_t_error = yes; then |
3812 | cat >>confdefs.h <<EOF | 4923 | cat >>confdefs.h <<_ACEOF |
3813 | #define HAVE_LIBXNET 1 | 4924 | #define HAVE_LIBXNET 1 |
3814 | EOF | 4925 | _ACEOF |
3815 | 4926 | ||
3816 | LIBS="-lxnet $LIBS" | 4927 | LIBS="-lxnet $LIBS" |
3817 | 4928 | ||
3818 | else | 4929 | else |
3819 | { { echo "$as_me:3819: error: *** -lxnet needed on HP-UX - check config.log ***" >&5 | 4930 | { { echo "$as_me:$LINENO: error: *** -lxnet needed on HP-UX - check config.log ***" >&5 |
3820 | echo "$as_me: error: *** -lxnet needed on HP-UX - check config.log ***" >&2;} | 4931 | echo "$as_me: error: *** -lxnet needed on HP-UX - check config.log ***" >&2;} |
3821 | { (exit 1); exit 1; }; } | 4932 | { (exit 1); exit 1; }; } |
3822 | fi | 4933 | fi |
@@ -3825,38 +4936,38 @@ fi | |||
3825 | *-*-hpux11*) | 4936 | *-*-hpux11*) |
3826 | CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1" | 4937 | CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1" |
3827 | IPADDR_IN_DISPLAY=yes | 4938 | IPADDR_IN_DISPLAY=yes |
3828 | cat >>confdefs.h <<\EOF | 4939 | cat >>confdefs.h <<\_ACEOF |
3829 | #define PAM_SUN_CODEBASE 1 | 4940 | #define PAM_SUN_CODEBASE 1 |
3830 | EOF | 4941 | _ACEOF |
3831 | 4942 | ||
3832 | cat >>confdefs.h <<\EOF | 4943 | cat >>confdefs.h <<\_ACEOF |
3833 | #define USE_PIPES 1 | 4944 | #define USE_PIPES 1 |
3834 | EOF | 4945 | _ACEOF |
3835 | 4946 | ||
3836 | cat >>confdefs.h <<\EOF | 4947 | cat >>confdefs.h <<\_ACEOF |
3837 | #define LOGIN_NO_ENDOPT 1 | 4948 | #define LOGIN_NO_ENDOPT 1 |
3838 | EOF | 4949 | _ACEOF |
3839 | 4950 | ||
3840 | cat >>confdefs.h <<\EOF | 4951 | cat >>confdefs.h <<\_ACEOF |
3841 | #define LOGIN_NEEDS_UTMPX 1 | 4952 | #define LOGIN_NEEDS_UTMPX 1 |
3842 | EOF | 4953 | _ACEOF |
3843 | 4954 | ||
3844 | cat >>confdefs.h <<\EOF | 4955 | cat >>confdefs.h <<\_ACEOF |
3845 | #define DISABLE_UTMP 1 | 4956 | #define DISABLE_UTMP 1 |
3846 | EOF | 4957 | _ACEOF |
3847 | 4958 | ||
3848 | cat >>confdefs.h <<\EOF | 4959 | cat >>confdefs.h <<\_ACEOF |
3849 | #define LOCKED_PASSWD_STRING "*" | 4960 | #define LOCKED_PASSWD_STRING "*" |
3850 | EOF | 4961 | _ACEOF |
3851 | 4962 | ||
3852 | cat >>confdefs.h <<\EOF | 4963 | cat >>confdefs.h <<\_ACEOF |
3853 | #define SPT_TYPE SPT_PSTAT | 4964 | #define SPT_TYPE SPT_PSTAT |
3854 | EOF | 4965 | _ACEOF |
3855 | 4966 | ||
3856 | check_for_hpux_broken_getaddrinfo=1 | 4967 | check_for_hpux_broken_getaddrinfo=1 |
3857 | LIBS="$LIBS -lsec" | 4968 | LIBS="$LIBS -lsec" |
3858 | 4969 | ||
3859 | echo "$as_me:3859: checking for t_error in -lxnet" >&5 | 4970 | echo "$as_me:$LINENO: checking for t_error in -lxnet" >&5 |
3860 | echo $ECHO_N "checking for t_error in -lxnet... $ECHO_C" >&6 | 4971 | echo $ECHO_N "checking for t_error in -lxnet... $ECHO_C" >&6 |
3861 | if test "${ac_cv_lib_xnet_t_error+set}" = set; then | 4972 | if test "${ac_cv_lib_xnet_t_error+set}" = set; then |
3862 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 4973 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -3864,8 +4975,11 @@ else | |||
3864 | ac_check_lib_save_LIBS=$LIBS | 4975 | ac_check_lib_save_LIBS=$LIBS |
3865 | LIBS="-lxnet $LIBS" | 4976 | LIBS="-lxnet $LIBS" |
3866 | cat >conftest.$ac_ext <<_ACEOF | 4977 | cat >conftest.$ac_ext <<_ACEOF |
3867 | #line 3867 "configure" | 4978 | /* confdefs.h. */ |
3868 | #include "confdefs.h" | 4979 | _ACEOF |
4980 | cat confdefs.h >>conftest.$ac_ext | ||
4981 | cat >>conftest.$ac_ext <<_ACEOF | ||
4982 | /* end confdefs.h. */ | ||
3869 | 4983 | ||
3870 | /* Override any gcc2 internal prototype to avoid an error. */ | 4984 | /* Override any gcc2 internal prototype to avoid an error. */ |
3871 | #ifdef __cplusplus | 4985 | #ifdef __cplusplus |
@@ -3883,37 +4997,49 @@ t_error (); | |||
3883 | } | 4997 | } |
3884 | _ACEOF | 4998 | _ACEOF |
3885 | rm -f conftest.$ac_objext conftest$ac_exeext | 4999 | rm -f conftest.$ac_objext conftest$ac_exeext |
3886 | if { (eval echo "$as_me:3886: \"$ac_link\"") >&5 | 5000 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
3887 | (eval $ac_link) 2>&5 | 5001 | (eval $ac_link) 2>conftest.er1 |
3888 | ac_status=$? | 5002 | ac_status=$? |
3889 | echo "$as_me:3889: \$? = $ac_status" >&5 | 5003 | grep -v '^ *+' conftest.er1 >conftest.err |
5004 | rm -f conftest.er1 | ||
5005 | cat conftest.err >&5 | ||
5006 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3890 | (exit $ac_status); } && | 5007 | (exit $ac_status); } && |
3891 | { ac_try='test -s conftest$ac_exeext' | 5008 | { ac_try='test -z "$ac_c_werror_flag" |
3892 | { (eval echo "$as_me:3892: \"$ac_try\"") >&5 | 5009 | || test ! -s conftest.err' |
5010 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
3893 | (eval $ac_try) 2>&5 | 5011 | (eval $ac_try) 2>&5 |
3894 | ac_status=$? | 5012 | ac_status=$? |
3895 | echo "$as_me:3895: \$? = $ac_status" >&5 | 5013 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
5014 | (exit $ac_status); }; } && | ||
5015 | { ac_try='test -s conftest$ac_exeext' | ||
5016 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5017 | (eval $ac_try) 2>&5 | ||
5018 | ac_status=$? | ||
5019 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
3896 | (exit $ac_status); }; }; then | 5020 | (exit $ac_status); }; }; then |
3897 | ac_cv_lib_xnet_t_error=yes | 5021 | ac_cv_lib_xnet_t_error=yes |
3898 | else | 5022 | else |
3899 | echo "$as_me: failed program was:" >&5 | 5023 | echo "$as_me: failed program was:" >&5 |
3900 | cat conftest.$ac_ext >&5 | 5024 | sed 's/^/| /' conftest.$ac_ext >&5 |
5025 | |||
3901 | ac_cv_lib_xnet_t_error=no | 5026 | ac_cv_lib_xnet_t_error=no |
3902 | fi | 5027 | fi |
3903 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 5028 | rm -f conftest.err conftest.$ac_objext \ |
5029 | conftest$ac_exeext conftest.$ac_ext | ||
3904 | LIBS=$ac_check_lib_save_LIBS | 5030 | LIBS=$ac_check_lib_save_LIBS |
3905 | fi | 5031 | fi |
3906 | echo "$as_me:3906: result: $ac_cv_lib_xnet_t_error" >&5 | 5032 | echo "$as_me:$LINENO: result: $ac_cv_lib_xnet_t_error" >&5 |
3907 | echo "${ECHO_T}$ac_cv_lib_xnet_t_error" >&6 | 5033 | echo "${ECHO_T}$ac_cv_lib_xnet_t_error" >&6 |
3908 | if test $ac_cv_lib_xnet_t_error = yes; then | 5034 | if test $ac_cv_lib_xnet_t_error = yes; then |
3909 | cat >>confdefs.h <<EOF | 5035 | cat >>confdefs.h <<_ACEOF |
3910 | #define HAVE_LIBXNET 1 | 5036 | #define HAVE_LIBXNET 1 |
3911 | EOF | 5037 | _ACEOF |
3912 | 5038 | ||
3913 | LIBS="-lxnet $LIBS" | 5039 | LIBS="-lxnet $LIBS" |
3914 | 5040 | ||
3915 | else | 5041 | else |
3916 | { { echo "$as_me:3916: error: *** -lxnet needed on HP-UX - check config.log ***" >&5 | 5042 | { { echo "$as_me:$LINENO: error: *** -lxnet needed on HP-UX - check config.log ***" >&5 |
3917 | echo "$as_me: error: *** -lxnet needed on HP-UX - check config.log ***" >&2;} | 5043 | echo "$as_me: error: *** -lxnet needed on HP-UX - check config.log ***" >&2;} |
3918 | { (exit 1); exit 1; }; } | 5044 | { (exit 1); exit 1; }; } |
3919 | fi | 5045 | fi |
@@ -3921,173 +5047,209 @@ fi | |||
3921 | ;; | 5047 | ;; |
3922 | *-*-irix5*) | 5048 | *-*-irix5*) |
3923 | PATH="$PATH:/usr/etc" | 5049 | PATH="$PATH:/usr/etc" |
3924 | cat >>confdefs.h <<\EOF | 5050 | cat >>confdefs.h <<\_ACEOF |
3925 | #define BROKEN_INET_NTOA 1 | 5051 | #define BROKEN_INET_NTOA 1 |
3926 | EOF | 5052 | _ACEOF |
3927 | 5053 | ||
3928 | cat >>confdefs.h <<\EOF | 5054 | cat >>confdefs.h <<\_ACEOF |
3929 | #define SETEUID_BREAKS_SETUID 1 | 5055 | #define SETEUID_BREAKS_SETUID 1 |
3930 | EOF | 5056 | _ACEOF |
3931 | 5057 | ||
3932 | cat >>confdefs.h <<\EOF | 5058 | cat >>confdefs.h <<\_ACEOF |
3933 | #define BROKEN_SETREUID 1 | 5059 | #define BROKEN_SETREUID 1 |
3934 | EOF | 5060 | _ACEOF |
3935 | 5061 | ||
3936 | cat >>confdefs.h <<\EOF | 5062 | cat >>confdefs.h <<\_ACEOF |
3937 | #define BROKEN_SETREGID 1 | 5063 | #define BROKEN_SETREGID 1 |
3938 | EOF | 5064 | _ACEOF |
3939 | 5065 | ||
3940 | cat >>confdefs.h <<\EOF | 5066 | cat >>confdefs.h <<\_ACEOF |
3941 | #define WITH_ABBREV_NO_TTY 1 | 5067 | #define WITH_ABBREV_NO_TTY 1 |
3942 | EOF | 5068 | _ACEOF |
3943 | 5069 | ||
3944 | cat >>confdefs.h <<\EOF | 5070 | cat >>confdefs.h <<\_ACEOF |
3945 | #define LOCKED_PASSWD_STRING "*LK*" | 5071 | #define LOCKED_PASSWD_STRING "*LK*" |
3946 | EOF | 5072 | _ACEOF |
3947 | 5073 | ||
3948 | ;; | 5074 | ;; |
3949 | *-*-irix6*) | 5075 | *-*-irix6*) |
3950 | PATH="$PATH:/usr/etc" | 5076 | PATH="$PATH:/usr/etc" |
3951 | cat >>confdefs.h <<\EOF | 5077 | cat >>confdefs.h <<\_ACEOF |
3952 | #define WITH_IRIX_ARRAY 1 | 5078 | #define WITH_IRIX_ARRAY 1 |
3953 | EOF | 5079 | _ACEOF |
3954 | 5080 | ||
3955 | cat >>confdefs.h <<\EOF | 5081 | cat >>confdefs.h <<\_ACEOF |
3956 | #define WITH_IRIX_PROJECT 1 | 5082 | #define WITH_IRIX_PROJECT 1 |
3957 | EOF | 5083 | _ACEOF |
3958 | 5084 | ||
3959 | cat >>confdefs.h <<\EOF | 5085 | cat >>confdefs.h <<\_ACEOF |
3960 | #define WITH_IRIX_AUDIT 1 | 5086 | #define WITH_IRIX_AUDIT 1 |
3961 | EOF | 5087 | _ACEOF |
3962 | 5088 | ||
3963 | echo "$as_me:3963: checking for jlimit_startjob" >&5 | 5089 | echo "$as_me:$LINENO: checking for jlimit_startjob" >&5 |
3964 | echo $ECHO_N "checking for jlimit_startjob... $ECHO_C" >&6 | 5090 | echo $ECHO_N "checking for jlimit_startjob... $ECHO_C" >&6 |
3965 | if test "${ac_cv_func_jlimit_startjob+set}" = set; then | 5091 | if test "${ac_cv_func_jlimit_startjob+set}" = set; then |
3966 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 5092 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
3967 | else | 5093 | else |
3968 | cat >conftest.$ac_ext <<_ACEOF | 5094 | cat >conftest.$ac_ext <<_ACEOF |
3969 | #line 3969 "configure" | 5095 | /* confdefs.h. */ |
3970 | #include "confdefs.h" | 5096 | _ACEOF |
5097 | cat confdefs.h >>conftest.$ac_ext | ||
5098 | cat >>conftest.$ac_ext <<_ACEOF | ||
5099 | /* end confdefs.h. */ | ||
5100 | /* Define jlimit_startjob to an innocuous variant, in case <limits.h> declares jlimit_startjob. | ||
5101 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
5102 | #define jlimit_startjob innocuous_jlimit_startjob | ||
5103 | |||
3971 | /* System header to define __stub macros and hopefully few prototypes, | 5104 | /* System header to define __stub macros and hopefully few prototypes, |
3972 | which can conflict with char jlimit_startjob (); below. */ | 5105 | which can conflict with char jlimit_startjob (); below. |
3973 | #include <assert.h> | 5106 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
5107 | <limits.h> exists even on freestanding compilers. */ | ||
5108 | |||
5109 | #ifdef __STDC__ | ||
5110 | # include <limits.h> | ||
5111 | #else | ||
5112 | # include <assert.h> | ||
5113 | #endif | ||
5114 | |||
5115 | #undef jlimit_startjob | ||
5116 | |||
3974 | /* Override any gcc2 internal prototype to avoid an error. */ | 5117 | /* Override any gcc2 internal prototype to avoid an error. */ |
3975 | #ifdef __cplusplus | 5118 | #ifdef __cplusplus |
3976 | extern "C" | 5119 | extern "C" |
5120 | { | ||
3977 | #endif | 5121 | #endif |
3978 | /* We use char because int might match the return type of a gcc2 | 5122 | /* We use char because int might match the return type of a gcc2 |
3979 | builtin and then its argument prototype would still apply. */ | 5123 | builtin and then its argument prototype would still apply. */ |
3980 | char jlimit_startjob (); | 5124 | char jlimit_startjob (); |
3981 | char (*f) (); | ||
3982 | |||
3983 | int | ||
3984 | main () | ||
3985 | { | ||
3986 | /* The GNU C library defines this for functions which it implements | 5125 | /* The GNU C library defines this for functions which it implements |
3987 | to always fail with ENOSYS. Some functions are actually named | 5126 | to always fail with ENOSYS. Some functions are actually named |
3988 | something starting with __ and the normal name is an alias. */ | 5127 | something starting with __ and the normal name is an alias. */ |
3989 | #if defined (__stub_jlimit_startjob) || defined (__stub___jlimit_startjob) | 5128 | #if defined (__stub_jlimit_startjob) || defined (__stub___jlimit_startjob) |
3990 | choke me | 5129 | choke me |
3991 | #else | 5130 | #else |
3992 | f = jlimit_startjob; | 5131 | char (*f) () = jlimit_startjob; |
5132 | #endif | ||
5133 | #ifdef __cplusplus | ||
5134 | } | ||
3993 | #endif | 5135 | #endif |
3994 | 5136 | ||
5137 | int | ||
5138 | main () | ||
5139 | { | ||
5140 | return f != jlimit_startjob; | ||
3995 | ; | 5141 | ; |
3996 | return 0; | 5142 | return 0; |
3997 | } | 5143 | } |
3998 | _ACEOF | 5144 | _ACEOF |
3999 | rm -f conftest.$ac_objext conftest$ac_exeext | 5145 | rm -f conftest.$ac_objext conftest$ac_exeext |
4000 | if { (eval echo "$as_me:4000: \"$ac_link\"") >&5 | 5146 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
4001 | (eval $ac_link) 2>&5 | 5147 | (eval $ac_link) 2>conftest.er1 |
4002 | ac_status=$? | 5148 | ac_status=$? |
4003 | echo "$as_me:4003: \$? = $ac_status" >&5 | 5149 | grep -v '^ *+' conftest.er1 >conftest.err |
5150 | rm -f conftest.er1 | ||
5151 | cat conftest.err >&5 | ||
5152 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4004 | (exit $ac_status); } && | 5153 | (exit $ac_status); } && |
4005 | { ac_try='test -s conftest$ac_exeext' | 5154 | { ac_try='test -z "$ac_c_werror_flag" |
4006 | { (eval echo "$as_me:4006: \"$ac_try\"") >&5 | 5155 | || test ! -s conftest.err' |
5156 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5157 | (eval $ac_try) 2>&5 | ||
5158 | ac_status=$? | ||
5159 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5160 | (exit $ac_status); }; } && | ||
5161 | { ac_try='test -s conftest$ac_exeext' | ||
5162 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4007 | (eval $ac_try) 2>&5 | 5163 | (eval $ac_try) 2>&5 |
4008 | ac_status=$? | 5164 | ac_status=$? |
4009 | echo "$as_me:4009: \$? = $ac_status" >&5 | 5165 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4010 | (exit $ac_status); }; }; then | 5166 | (exit $ac_status); }; }; then |
4011 | ac_cv_func_jlimit_startjob=yes | 5167 | ac_cv_func_jlimit_startjob=yes |
4012 | else | 5168 | else |
4013 | echo "$as_me: failed program was:" >&5 | 5169 | echo "$as_me: failed program was:" >&5 |
4014 | cat conftest.$ac_ext >&5 | 5170 | sed 's/^/| /' conftest.$ac_ext >&5 |
5171 | |||
4015 | ac_cv_func_jlimit_startjob=no | 5172 | ac_cv_func_jlimit_startjob=no |
4016 | fi | 5173 | fi |
4017 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 5174 | rm -f conftest.err conftest.$ac_objext \ |
5175 | conftest$ac_exeext conftest.$ac_ext | ||
4018 | fi | 5176 | fi |
4019 | echo "$as_me:4019: result: $ac_cv_func_jlimit_startjob" >&5 | 5177 | echo "$as_me:$LINENO: result: $ac_cv_func_jlimit_startjob" >&5 |
4020 | echo "${ECHO_T}$ac_cv_func_jlimit_startjob" >&6 | 5178 | echo "${ECHO_T}$ac_cv_func_jlimit_startjob" >&6 |
4021 | if test $ac_cv_func_jlimit_startjob = yes; then | 5179 | if test $ac_cv_func_jlimit_startjob = yes; then |
4022 | cat >>confdefs.h <<\EOF | 5180 | cat >>confdefs.h <<\_ACEOF |
4023 | #define WITH_IRIX_JOBS 1 | 5181 | #define WITH_IRIX_JOBS 1 |
4024 | EOF | 5182 | _ACEOF |
4025 | 5183 | ||
4026 | fi | 5184 | fi |
4027 | 5185 | ||
4028 | cat >>confdefs.h <<\EOF | 5186 | cat >>confdefs.h <<\_ACEOF |
4029 | #define BROKEN_INET_NTOA 1 | 5187 | #define BROKEN_INET_NTOA 1 |
4030 | EOF | 5188 | _ACEOF |
4031 | 5189 | ||
4032 | cat >>confdefs.h <<\EOF | 5190 | cat >>confdefs.h <<\_ACEOF |
4033 | #define SETEUID_BREAKS_SETUID 1 | 5191 | #define SETEUID_BREAKS_SETUID 1 |
4034 | EOF | 5192 | _ACEOF |
4035 | 5193 | ||
4036 | cat >>confdefs.h <<\EOF | 5194 | cat >>confdefs.h <<\_ACEOF |
4037 | #define BROKEN_SETREUID 1 | 5195 | #define BROKEN_SETREUID 1 |
4038 | EOF | 5196 | _ACEOF |
4039 | 5197 | ||
4040 | cat >>confdefs.h <<\EOF | 5198 | cat >>confdefs.h <<\_ACEOF |
4041 | #define BROKEN_SETREGID 1 | 5199 | #define BROKEN_SETREGID 1 |
4042 | EOF | 5200 | _ACEOF |
4043 | 5201 | ||
4044 | cat >>confdefs.h <<\EOF | 5202 | cat >>confdefs.h <<\_ACEOF |
4045 | #define BROKEN_UPDWTMPX 1 | 5203 | #define BROKEN_UPDWTMPX 1 |
4046 | EOF | 5204 | _ACEOF |
4047 | 5205 | ||
4048 | cat >>confdefs.h <<\EOF | 5206 | cat >>confdefs.h <<\_ACEOF |
4049 | #define WITH_ABBREV_NO_TTY 1 | 5207 | #define WITH_ABBREV_NO_TTY 1 |
4050 | EOF | 5208 | _ACEOF |
4051 | 5209 | ||
4052 | cat >>confdefs.h <<\EOF | 5210 | cat >>confdefs.h <<\_ACEOF |
4053 | #define LOCKED_PASSWD_STRING "*LK*" | 5211 | #define LOCKED_PASSWD_STRING "*LK*" |
4054 | EOF | 5212 | _ACEOF |
4055 | 5213 | ||
4056 | ;; | 5214 | ;; |
4057 | *-*-linux*) | 5215 | *-*-linux*) |
4058 | no_dev_ptmx=1 | 5216 | no_dev_ptmx=1 |
4059 | check_for_libcrypt_later=1 | 5217 | check_for_libcrypt_later=1 |
4060 | check_for_openpty_ctty_bug=1 | 5218 | check_for_openpty_ctty_bug=1 |
4061 | cat >>confdefs.h <<\EOF | 5219 | cat >>confdefs.h <<\_ACEOF |
4062 | #define DONT_TRY_OTHER_AF 1 | 5220 | #define DONT_TRY_OTHER_AF 1 |
4063 | EOF | 5221 | _ACEOF |
4064 | 5222 | ||
4065 | cat >>confdefs.h <<\EOF | 5223 | cat >>confdefs.h <<\_ACEOF |
4066 | #define PAM_TTY_KLUDGE 1 | 5224 | #define PAM_TTY_KLUDGE 1 |
4067 | EOF | 5225 | _ACEOF |
4068 | 5226 | ||
4069 | cat >>confdefs.h <<\EOF | 5227 | cat >>confdefs.h <<\_ACEOF |
4070 | #define LOCKED_PASSWD_PREFIX "!" | 5228 | #define LOCKED_PASSWD_PREFIX "!" |
4071 | EOF | 5229 | _ACEOF |
4072 | 5230 | ||
4073 | cat >>confdefs.h <<\EOF | 5231 | cat >>confdefs.h <<\_ACEOF |
4074 | #define SPT_TYPE SPT_REUSEARGV | 5232 | #define SPT_TYPE SPT_REUSEARGV |
4075 | EOF | 5233 | _ACEOF |
5234 | |||
5235 | cat >>confdefs.h <<\_ACEOF | ||
5236 | #define LINK_OPNOTSUPP_ERRNO EPERM | ||
5237 | _ACEOF | ||
4076 | 5238 | ||
4077 | inet6_default_4in6=yes | 5239 | inet6_default_4in6=yes |
4078 | case `uname -r` in | 5240 | case `uname -r` in |
4079 | 1.*|2.0.*) | 5241 | 1.*|2.0.*) |
4080 | cat >>confdefs.h <<\EOF | 5242 | cat >>confdefs.h <<\_ACEOF |
4081 | #define BROKEN_CMSG_TYPE 1 | 5243 | #define BROKEN_CMSG_TYPE 1 |
4082 | EOF | 5244 | _ACEOF |
4083 | 5245 | ||
4084 | ;; | 5246 | ;; |
4085 | esac | 5247 | esac |
4086 | ;; | 5248 | ;; |
4087 | mips-sony-bsd|mips-sony-newsos4) | 5249 | mips-sony-bsd|mips-sony-newsos4) |
4088 | cat >>confdefs.h <<\EOF | 5250 | cat >>confdefs.h <<\_ACEOF |
4089 | #define HAVE_NEWS4 1 | 5251 | #define HAVE_NEWS4 1 |
4090 | EOF | 5252 | _ACEOF |
4091 | 5253 | ||
4092 | SONY=1 | 5254 | SONY=1 |
4093 | ;; | 5255 | ;; |
@@ -4101,17 +5263,17 @@ EOF | |||
4101 | check_for_libcrypt_later=1 | 5263 | check_for_libcrypt_later=1 |
4102 | ;; | 5264 | ;; |
4103 | *-*-bsdi*) | 5265 | *-*-bsdi*) |
4104 | cat >>confdefs.h <<\EOF | 5266 | cat >>confdefs.h <<\_ACEOF |
4105 | #define SETEUID_BREAKS_SETUID 1 | 5267 | #define SETEUID_BREAKS_SETUID 1 |
4106 | EOF | 5268 | _ACEOF |
4107 | 5269 | ||
4108 | cat >>confdefs.h <<\EOF | 5270 | cat >>confdefs.h <<\_ACEOF |
4109 | #define BROKEN_SETREUID 1 | 5271 | #define BROKEN_SETREUID 1 |
4110 | EOF | 5272 | _ACEOF |
4111 | 5273 | ||
4112 | cat >>confdefs.h <<\EOF | 5274 | cat >>confdefs.h <<\_ACEOF |
4113 | #define BROKEN_SETREGID 1 | 5275 | #define BROKEN_SETREGID 1 |
4114 | EOF | 5276 | _ACEOF |
4115 | 5277 | ||
4116 | ;; | 5278 | ;; |
4117 | *-next-*) | 5279 | *-next-*) |
@@ -4119,71 +5281,75 @@ EOF | |||
4119 | conf_utmp_location=/etc/utmp | 5281 | conf_utmp_location=/etc/utmp |
4120 | conf_wtmp_location=/usr/adm/wtmp | 5282 | conf_wtmp_location=/usr/adm/wtmp |
4121 | MAIL=/usr/spool/mail | 5283 | MAIL=/usr/spool/mail |
4122 | cat >>confdefs.h <<\EOF | 5284 | cat >>confdefs.h <<\_ACEOF |
4123 | #define HAVE_NEXT 1 | 5285 | #define HAVE_NEXT 1 |
4124 | EOF | 5286 | _ACEOF |
4125 | 5287 | ||
4126 | cat >>confdefs.h <<\EOF | 5288 | cat >>confdefs.h <<\_ACEOF |
4127 | #define BROKEN_REALPATH 1 | 5289 | #define BROKEN_REALPATH 1 |
4128 | EOF | 5290 | _ACEOF |
4129 | 5291 | ||
4130 | cat >>confdefs.h <<\EOF | 5292 | cat >>confdefs.h <<\_ACEOF |
4131 | #define USE_PIPES 1 | 5293 | #define USE_PIPES 1 |
4132 | EOF | 5294 | _ACEOF |
4133 | 5295 | ||
4134 | cat >>confdefs.h <<\EOF | 5296 | cat >>confdefs.h <<\_ACEOF |
4135 | #define BROKEN_SAVED_UIDS 1 | 5297 | #define BROKEN_SAVED_UIDS 1 |
4136 | EOF | 5298 | _ACEOF |
4137 | 5299 | ||
4138 | ;; | 5300 | ;; |
4139 | *-*-solaris*) | 5301 | *-*-solaris*) |
4140 | if test "x$withval" != "xno" ; then | 5302 | if test "x$withval" != "xno" ; then |
4141 | need_dash_r=1 | 5303 | need_dash_r=1 |
4142 | fi | 5304 | fi |
4143 | cat >>confdefs.h <<\EOF | 5305 | cat >>confdefs.h <<\_ACEOF |
4144 | #define PAM_SUN_CODEBASE 1 | 5306 | #define PAM_SUN_CODEBASE 1 |
4145 | EOF | 5307 | _ACEOF |
4146 | 5308 | ||
4147 | cat >>confdefs.h <<\EOF | 5309 | cat >>confdefs.h <<\_ACEOF |
4148 | #define LOGIN_NEEDS_UTMPX 1 | 5310 | #define LOGIN_NEEDS_UTMPX 1 |
4149 | EOF | 5311 | _ACEOF |
4150 | 5312 | ||
4151 | cat >>confdefs.h <<\EOF | 5313 | cat >>confdefs.h <<\_ACEOF |
4152 | #define LOGIN_NEEDS_TERM 1 | 5314 | #define LOGIN_NEEDS_TERM 1 |
4153 | EOF | 5315 | _ACEOF |
4154 | 5316 | ||
4155 | cat >>confdefs.h <<\EOF | 5317 | cat >>confdefs.h <<\_ACEOF |
4156 | #define PAM_TTY_KLUDGE 1 | 5318 | #define PAM_TTY_KLUDGE 1 |
4157 | EOF | 5319 | _ACEOF |
5320 | |||
5321 | cat >>confdefs.h <<\_ACEOF | ||
5322 | #define SSHPAM_CHAUTHTOK_NEEDS_RUID 1 | ||
5323 | _ACEOF | ||
4158 | 5324 | ||
4159 | cat >>confdefs.h <<\EOF | 5325 | cat >>confdefs.h <<\_ACEOF |
4160 | #define LOCKED_PASSWD_STRING "*LK*" | 5326 | #define LOCKED_PASSWD_STRING "*LK*" |
4161 | EOF | 5327 | _ACEOF |
4162 | 5328 | ||
4163 | # Pushing STREAMS modules will cause sshd to acquire a controlling tty. | 5329 | # Pushing STREAMS modules will cause sshd to acquire a controlling tty. |
4164 | cat >>confdefs.h <<\EOF | 5330 | cat >>confdefs.h <<\_ACEOF |
4165 | #define SSHD_ACQUIRES_CTTY 1 | 5331 | #define SSHD_ACQUIRES_CTTY 1 |
4166 | EOF | 5332 | _ACEOF |
4167 | 5333 | ||
4168 | external_path_file=/etc/default/login | 5334 | external_path_file=/etc/default/login |
4169 | # hardwire lastlog location (can't detect it on some versions) | 5335 | # hardwire lastlog location (can't detect it on some versions) |
4170 | conf_lastlog_location="/var/adm/lastlog" | 5336 | conf_lastlog_location="/var/adm/lastlog" |
4171 | echo "$as_me:4171: checking for obsolete utmp and wtmp in solaris2.x" >&5 | 5337 | echo "$as_me:$LINENO: checking for obsolete utmp and wtmp in solaris2.x" >&5 |
4172 | echo $ECHO_N "checking for obsolete utmp and wtmp in solaris2.x... $ECHO_C" >&6 | 5338 | echo $ECHO_N "checking for obsolete utmp and wtmp in solaris2.x... $ECHO_C" >&6 |
4173 | sol2ver=`echo "$host"| sed -e 's/.*[0-9]\.//'` | 5339 | sol2ver=`echo "$host"| sed -e 's/.*[0-9]\.//'` |
4174 | if test "$sol2ver" -ge 8; then | 5340 | if test "$sol2ver" -ge 8; then |
4175 | echo "$as_me:4175: result: yes" >&5 | 5341 | echo "$as_me:$LINENO: result: yes" >&5 |
4176 | echo "${ECHO_T}yes" >&6 | 5342 | echo "${ECHO_T}yes" >&6 |
4177 | cat >>confdefs.h <<\EOF | 5343 | cat >>confdefs.h <<\_ACEOF |
4178 | #define DISABLE_UTMP 1 | 5344 | #define DISABLE_UTMP 1 |
4179 | EOF | 5345 | _ACEOF |
4180 | 5346 | ||
4181 | cat >>confdefs.h <<\EOF | 5347 | cat >>confdefs.h <<\_ACEOF |
4182 | #define DISABLE_WTMP 1 | 5348 | #define DISABLE_WTMP 1 |
4183 | EOF | 5349 | _ACEOF |
4184 | 5350 | ||
4185 | else | 5351 | else |
4186 | echo "$as_me:4186: result: no" >&5 | 5352 | echo "$as_me:$LINENO: result: no" >&5 |
4187 | echo "${ECHO_T}no" >&6 | 5353 | echo "${ECHO_T}no" >&6 |
4188 | fi | 5354 | fi |
4189 | ;; | 5355 | ;; |
@@ -4193,111 +5359,143 @@ echo "${ECHO_T}no" >&6 | |||
4193 | for ac_func in getpwanam | 5359 | for ac_func in getpwanam |
4194 | do | 5360 | do |
4195 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | 5361 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
4196 | echo "$as_me:4196: checking for $ac_func" >&5 | 5362 | echo "$as_me:$LINENO: checking for $ac_func" >&5 |
4197 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | 5363 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 |
4198 | if eval "test \"\${$as_ac_var+set}\" = set"; then | 5364 | if eval "test \"\${$as_ac_var+set}\" = set"; then |
4199 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 5365 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
4200 | else | 5366 | else |
4201 | cat >conftest.$ac_ext <<_ACEOF | 5367 | cat >conftest.$ac_ext <<_ACEOF |
4202 | #line 4202 "configure" | 5368 | /* confdefs.h. */ |
4203 | #include "confdefs.h" | 5369 | _ACEOF |
5370 | cat confdefs.h >>conftest.$ac_ext | ||
5371 | cat >>conftest.$ac_ext <<_ACEOF | ||
5372 | /* end confdefs.h. */ | ||
5373 | /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
5374 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
5375 | #define $ac_func innocuous_$ac_func | ||
5376 | |||
4204 | /* System header to define __stub macros and hopefully few prototypes, | 5377 | /* System header to define __stub macros and hopefully few prototypes, |
4205 | which can conflict with char $ac_func (); below. */ | 5378 | which can conflict with char $ac_func (); below. |
4206 | #include <assert.h> | 5379 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
5380 | <limits.h> exists even on freestanding compilers. */ | ||
5381 | |||
5382 | #ifdef __STDC__ | ||
5383 | # include <limits.h> | ||
5384 | #else | ||
5385 | # include <assert.h> | ||
5386 | #endif | ||
5387 | |||
5388 | #undef $ac_func | ||
5389 | |||
4207 | /* Override any gcc2 internal prototype to avoid an error. */ | 5390 | /* Override any gcc2 internal prototype to avoid an error. */ |
4208 | #ifdef __cplusplus | 5391 | #ifdef __cplusplus |
4209 | extern "C" | 5392 | extern "C" |
5393 | { | ||
4210 | #endif | 5394 | #endif |
4211 | /* We use char because int might match the return type of a gcc2 | 5395 | /* We use char because int might match the return type of a gcc2 |
4212 | builtin and then its argument prototype would still apply. */ | 5396 | builtin and then its argument prototype would still apply. */ |
4213 | char $ac_func (); | 5397 | char $ac_func (); |
4214 | char (*f) (); | ||
4215 | |||
4216 | int | ||
4217 | main () | ||
4218 | { | ||
4219 | /* The GNU C library defines this for functions which it implements | 5398 | /* The GNU C library defines this for functions which it implements |
4220 | to always fail with ENOSYS. Some functions are actually named | 5399 | to always fail with ENOSYS. Some functions are actually named |
4221 | something starting with __ and the normal name is an alias. */ | 5400 | something starting with __ and the normal name is an alias. */ |
4222 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) | 5401 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) |
4223 | choke me | 5402 | choke me |
4224 | #else | 5403 | #else |
4225 | f = $ac_func; | 5404 | char (*f) () = $ac_func; |
5405 | #endif | ||
5406 | #ifdef __cplusplus | ||
5407 | } | ||
4226 | #endif | 5408 | #endif |
4227 | 5409 | ||
5410 | int | ||
5411 | main () | ||
5412 | { | ||
5413 | return f != $ac_func; | ||
4228 | ; | 5414 | ; |
4229 | return 0; | 5415 | return 0; |
4230 | } | 5416 | } |
4231 | _ACEOF | 5417 | _ACEOF |
4232 | rm -f conftest.$ac_objext conftest$ac_exeext | 5418 | rm -f conftest.$ac_objext conftest$ac_exeext |
4233 | if { (eval echo "$as_me:4233: \"$ac_link\"") >&5 | 5419 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
4234 | (eval $ac_link) 2>&5 | 5420 | (eval $ac_link) 2>conftest.er1 |
4235 | ac_status=$? | 5421 | ac_status=$? |
4236 | echo "$as_me:4236: \$? = $ac_status" >&5 | 5422 | grep -v '^ *+' conftest.er1 >conftest.err |
5423 | rm -f conftest.er1 | ||
5424 | cat conftest.err >&5 | ||
5425 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4237 | (exit $ac_status); } && | 5426 | (exit $ac_status); } && |
4238 | { ac_try='test -s conftest$ac_exeext' | 5427 | { ac_try='test -z "$ac_c_werror_flag" |
4239 | { (eval echo "$as_me:4239: \"$ac_try\"") >&5 | 5428 | || test ! -s conftest.err' |
5429 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4240 | (eval $ac_try) 2>&5 | 5430 | (eval $ac_try) 2>&5 |
4241 | ac_status=$? | 5431 | ac_status=$? |
4242 | echo "$as_me:4242: \$? = $ac_status" >&5 | 5432 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
5433 | (exit $ac_status); }; } && | ||
5434 | { ac_try='test -s conftest$ac_exeext' | ||
5435 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5436 | (eval $ac_try) 2>&5 | ||
5437 | ac_status=$? | ||
5438 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4243 | (exit $ac_status); }; }; then | 5439 | (exit $ac_status); }; }; then |
4244 | eval "$as_ac_var=yes" | 5440 | eval "$as_ac_var=yes" |
4245 | else | 5441 | else |
4246 | echo "$as_me: failed program was:" >&5 | 5442 | echo "$as_me: failed program was:" >&5 |
4247 | cat conftest.$ac_ext >&5 | 5443 | sed 's/^/| /' conftest.$ac_ext >&5 |
5444 | |||
4248 | eval "$as_ac_var=no" | 5445 | eval "$as_ac_var=no" |
4249 | fi | 5446 | fi |
4250 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 5447 | rm -f conftest.err conftest.$ac_objext \ |
5448 | conftest$ac_exeext conftest.$ac_ext | ||
4251 | fi | 5449 | fi |
4252 | echo "$as_me:4252: result: `eval echo '${'$as_ac_var'}'`" >&5 | 5450 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 |
4253 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | 5451 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 |
4254 | if test `eval echo '${'$as_ac_var'}'` = yes; then | 5452 | if test `eval echo '${'$as_ac_var'}'` = yes; then |
4255 | cat >>confdefs.h <<EOF | 5453 | cat >>confdefs.h <<_ACEOF |
4256 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 5454 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
4257 | EOF | 5455 | _ACEOF |
4258 | 5456 | ||
4259 | fi | 5457 | fi |
4260 | done | 5458 | done |
4261 | 5459 | ||
4262 | cat >>confdefs.h <<\EOF | 5460 | cat >>confdefs.h <<\_ACEOF |
4263 | #define PAM_SUN_CODEBASE 1 | 5461 | #define PAM_SUN_CODEBASE 1 |
4264 | EOF | 5462 | _ACEOF |
4265 | 5463 | ||
4266 | conf_utmp_location=/etc/utmp | 5464 | conf_utmp_location=/etc/utmp |
4267 | conf_wtmp_location=/var/adm/wtmp | 5465 | conf_wtmp_location=/var/adm/wtmp |
4268 | conf_lastlog_location=/var/adm/lastlog | 5466 | conf_lastlog_location=/var/adm/lastlog |
4269 | cat >>confdefs.h <<\EOF | 5467 | cat >>confdefs.h <<\_ACEOF |
4270 | #define USE_PIPES 1 | 5468 | #define USE_PIPES 1 |
4271 | EOF | 5469 | _ACEOF |
4272 | 5470 | ||
4273 | ;; | 5471 | ;; |
4274 | *-ncr-sysv*) | 5472 | *-ncr-sysv*) |
4275 | LIBS="$LIBS -lc89" | 5473 | LIBS="$LIBS -lc89" |
4276 | cat >>confdefs.h <<\EOF | 5474 | cat >>confdefs.h <<\_ACEOF |
4277 | #define USE_PIPES 1 | 5475 | #define USE_PIPES 1 |
4278 | EOF | 5476 | _ACEOF |
4279 | 5477 | ||
4280 | cat >>confdefs.h <<\EOF | 5478 | cat >>confdefs.h <<\_ACEOF |
4281 | #define SSHD_ACQUIRES_CTTY 1 | 5479 | #define SSHD_ACQUIRES_CTTY 1 |
4282 | EOF | 5480 | _ACEOF |
4283 | 5481 | ||
4284 | cat >>confdefs.h <<\EOF | 5482 | cat >>confdefs.h <<\_ACEOF |
4285 | #define SETEUID_BREAKS_SETUID 1 | 5483 | #define SETEUID_BREAKS_SETUID 1 |
4286 | EOF | 5484 | _ACEOF |
4287 | 5485 | ||
4288 | cat >>confdefs.h <<\EOF | 5486 | cat >>confdefs.h <<\_ACEOF |
4289 | #define BROKEN_SETREUID 1 | 5487 | #define BROKEN_SETREUID 1 |
4290 | EOF | 5488 | _ACEOF |
4291 | 5489 | ||
4292 | cat >>confdefs.h <<\EOF | 5490 | cat >>confdefs.h <<\_ACEOF |
4293 | #define BROKEN_SETREGID 1 | 5491 | #define BROKEN_SETREGID 1 |
4294 | EOF | 5492 | _ACEOF |
4295 | 5493 | ||
4296 | ;; | 5494 | ;; |
4297 | *-sni-sysv*) | 5495 | *-sni-sysv*) |
4298 | # /usr/ucblib MUST NOT be searched on ReliantUNIX | 5496 | # /usr/ucblib MUST NOT be searched on ReliantUNIX |
4299 | 5497 | ||
4300 | echo "$as_me:4300: checking for dlsym in -ldl" >&5 | 5498 | echo "$as_me:$LINENO: checking for dlsym in -ldl" >&5 |
4301 | echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6 | 5499 | echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6 |
4302 | if test "${ac_cv_lib_dl_dlsym+set}" = set; then | 5500 | if test "${ac_cv_lib_dl_dlsym+set}" = set; then |
4303 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 5501 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -4305,8 +5503,11 @@ else | |||
4305 | ac_check_lib_save_LIBS=$LIBS | 5503 | ac_check_lib_save_LIBS=$LIBS |
4306 | LIBS="-ldl $LIBS" | 5504 | LIBS="-ldl $LIBS" |
4307 | cat >conftest.$ac_ext <<_ACEOF | 5505 | cat >conftest.$ac_ext <<_ACEOF |
4308 | #line 4308 "configure" | 5506 | /* confdefs.h. */ |
4309 | #include "confdefs.h" | 5507 | _ACEOF |
5508 | cat confdefs.h >>conftest.$ac_ext | ||
5509 | cat >>conftest.$ac_ext <<_ACEOF | ||
5510 | /* end confdefs.h. */ | ||
4310 | 5511 | ||
4311 | /* Override any gcc2 internal prototype to avoid an error. */ | 5512 | /* Override any gcc2 internal prototype to avoid an error. */ |
4312 | #ifdef __cplusplus | 5513 | #ifdef __cplusplus |
@@ -4324,61 +5525,73 @@ dlsym (); | |||
4324 | } | 5525 | } |
4325 | _ACEOF | 5526 | _ACEOF |
4326 | rm -f conftest.$ac_objext conftest$ac_exeext | 5527 | rm -f conftest.$ac_objext conftest$ac_exeext |
4327 | if { (eval echo "$as_me:4327: \"$ac_link\"") >&5 | 5528 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
4328 | (eval $ac_link) 2>&5 | 5529 | (eval $ac_link) 2>conftest.er1 |
4329 | ac_status=$? | 5530 | ac_status=$? |
4330 | echo "$as_me:4330: \$? = $ac_status" >&5 | 5531 | grep -v '^ *+' conftest.er1 >conftest.err |
5532 | rm -f conftest.er1 | ||
5533 | cat conftest.err >&5 | ||
5534 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4331 | (exit $ac_status); } && | 5535 | (exit $ac_status); } && |
4332 | { ac_try='test -s conftest$ac_exeext' | 5536 | { ac_try='test -z "$ac_c_werror_flag" |
4333 | { (eval echo "$as_me:4333: \"$ac_try\"") >&5 | 5537 | || test ! -s conftest.err' |
5538 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4334 | (eval $ac_try) 2>&5 | 5539 | (eval $ac_try) 2>&5 |
4335 | ac_status=$? | 5540 | ac_status=$? |
4336 | echo "$as_me:4336: \$? = $ac_status" >&5 | 5541 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
5542 | (exit $ac_status); }; } && | ||
5543 | { ac_try='test -s conftest$ac_exeext' | ||
5544 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5545 | (eval $ac_try) 2>&5 | ||
5546 | ac_status=$? | ||
5547 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4337 | (exit $ac_status); }; }; then | 5548 | (exit $ac_status); }; }; then |
4338 | ac_cv_lib_dl_dlsym=yes | 5549 | ac_cv_lib_dl_dlsym=yes |
4339 | else | 5550 | else |
4340 | echo "$as_me: failed program was:" >&5 | 5551 | echo "$as_me: failed program was:" >&5 |
4341 | cat conftest.$ac_ext >&5 | 5552 | sed 's/^/| /' conftest.$ac_ext >&5 |
5553 | |||
4342 | ac_cv_lib_dl_dlsym=no | 5554 | ac_cv_lib_dl_dlsym=no |
4343 | fi | 5555 | fi |
4344 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 5556 | rm -f conftest.err conftest.$ac_objext \ |
5557 | conftest$ac_exeext conftest.$ac_ext | ||
4345 | LIBS=$ac_check_lib_save_LIBS | 5558 | LIBS=$ac_check_lib_save_LIBS |
4346 | fi | 5559 | fi |
4347 | echo "$as_me:4347: result: $ac_cv_lib_dl_dlsym" >&5 | 5560 | echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlsym" >&5 |
4348 | echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6 | 5561 | echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6 |
4349 | if test $ac_cv_lib_dl_dlsym = yes; then | 5562 | if test $ac_cv_lib_dl_dlsym = yes; then |
4350 | cat >>confdefs.h <<EOF | 5563 | cat >>confdefs.h <<_ACEOF |
4351 | #define HAVE_LIBDL 1 | 5564 | #define HAVE_LIBDL 1 |
4352 | EOF | 5565 | _ACEOF |
4353 | 5566 | ||
4354 | LIBS="-ldl $LIBS" | 5567 | LIBS="-ldl $LIBS" |
4355 | 5568 | ||
4356 | fi | 5569 | fi |
4357 | 5570 | ||
4358 | IPADDR_IN_DISPLAY=yes | 5571 | IPADDR_IN_DISPLAY=yes |
4359 | cat >>confdefs.h <<\EOF | 5572 | cat >>confdefs.h <<\_ACEOF |
4360 | #define USE_PIPES 1 | 5573 | #define USE_PIPES 1 |
4361 | EOF | 5574 | _ACEOF |
4362 | 5575 | ||
4363 | cat >>confdefs.h <<\EOF | 5576 | cat >>confdefs.h <<\_ACEOF |
4364 | #define IP_TOS_IS_BROKEN 1 | 5577 | #define IP_TOS_IS_BROKEN 1 |
4365 | EOF | 5578 | _ACEOF |
4366 | 5579 | ||
4367 | cat >>confdefs.h <<\EOF | 5580 | cat >>confdefs.h <<\_ACEOF |
4368 | #define SETEUID_BREAKS_SETUID 1 | 5581 | #define SETEUID_BREAKS_SETUID 1 |
4369 | EOF | 5582 | _ACEOF |
4370 | 5583 | ||
4371 | cat >>confdefs.h <<\EOF | 5584 | cat >>confdefs.h <<\_ACEOF |
4372 | #define BROKEN_SETREUID 1 | 5585 | #define BROKEN_SETREUID 1 |
4373 | EOF | 5586 | _ACEOF |
4374 | 5587 | ||
4375 | cat >>confdefs.h <<\EOF | 5588 | cat >>confdefs.h <<\_ACEOF |
4376 | #define BROKEN_SETREGID 1 | 5589 | #define BROKEN_SETREGID 1 |
4377 | EOF | 5590 | _ACEOF |
4378 | 5591 | ||
4379 | cat >>confdefs.h <<\EOF | 5592 | cat >>confdefs.h <<\_ACEOF |
4380 | #define SSHD_ACQUIRES_CTTY 1 | 5593 | #define SSHD_ACQUIRES_CTTY 1 |
4381 | EOF | 5594 | _ACEOF |
4382 | 5595 | ||
4383 | external_path_file=/etc/default/login | 5596 | external_path_file=/etc/default/login |
4384 | # /usr/ucblib/libucb.a no longer needed on ReliantUNIX | 5597 | # /usr/ucblib/libucb.a no longer needed on ReliantUNIX |
@@ -4386,39 +5599,39 @@ EOF | |||
4386 | # otherwise you will find lots of "SIOCGPGRP errno 22" on syslog | 5599 | # otherwise you will find lots of "SIOCGPGRP errno 22" on syslog |
4387 | ;; | 5600 | ;; |
4388 | *-*-sysv4.2*) | 5601 | *-*-sysv4.2*) |
4389 | cat >>confdefs.h <<\EOF | 5602 | cat >>confdefs.h <<\_ACEOF |
4390 | #define USE_PIPES 1 | 5603 | #define USE_PIPES 1 |
4391 | EOF | 5604 | _ACEOF |
4392 | 5605 | ||
4393 | cat >>confdefs.h <<\EOF | 5606 | cat >>confdefs.h <<\_ACEOF |
4394 | #define SETEUID_BREAKS_SETUID 1 | 5607 | #define SETEUID_BREAKS_SETUID 1 |
4395 | EOF | 5608 | _ACEOF |
4396 | 5609 | ||
4397 | cat >>confdefs.h <<\EOF | 5610 | cat >>confdefs.h <<\_ACEOF |
4398 | #define BROKEN_SETREUID 1 | 5611 | #define BROKEN_SETREUID 1 |
4399 | EOF | 5612 | _ACEOF |
4400 | 5613 | ||
4401 | cat >>confdefs.h <<\EOF | 5614 | cat >>confdefs.h <<\_ACEOF |
4402 | #define BROKEN_SETREGID 1 | 5615 | #define BROKEN_SETREGID 1 |
4403 | EOF | 5616 | _ACEOF |
4404 | 5617 | ||
4405 | ;; | 5618 | ;; |
4406 | *-*-sysv5*) | 5619 | *-*-sysv5*) |
4407 | cat >>confdefs.h <<\EOF | 5620 | cat >>confdefs.h <<\_ACEOF |
4408 | #define USE_PIPES 1 | 5621 | #define USE_PIPES 1 |
4409 | EOF | 5622 | _ACEOF |
4410 | 5623 | ||
4411 | cat >>confdefs.h <<\EOF | 5624 | cat >>confdefs.h <<\_ACEOF |
4412 | #define SETEUID_BREAKS_SETUID 1 | 5625 | #define SETEUID_BREAKS_SETUID 1 |
4413 | EOF | 5626 | _ACEOF |
4414 | 5627 | ||
4415 | cat >>confdefs.h <<\EOF | 5628 | cat >>confdefs.h <<\_ACEOF |
4416 | #define BROKEN_SETREUID 1 | 5629 | #define BROKEN_SETREUID 1 |
4417 | EOF | 5630 | _ACEOF |
4418 | 5631 | ||
4419 | cat >>confdefs.h <<\EOF | 5632 | cat >>confdefs.h <<\_ACEOF |
4420 | #define BROKEN_SETREGID 1 | 5633 | #define BROKEN_SETREGID 1 |
4421 | EOF | 5634 | _ACEOF |
4422 | 5635 | ||
4423 | ;; | 5636 | ;; |
4424 | *-*-sysv*) | 5637 | *-*-sysv*) |
@@ -4428,113 +5641,148 @@ EOF | |||
4428 | LIBS="$LIBS -los -lprot -lcrypt_i -lx -ltinfo -lm" | 5641 | LIBS="$LIBS -los -lprot -lcrypt_i -lx -ltinfo -lm" |
4429 | RANLIB=true | 5642 | RANLIB=true |
4430 | no_dev_ptmx=1 | 5643 | no_dev_ptmx=1 |
4431 | cat >>confdefs.h <<\EOF | 5644 | cat >>confdefs.h <<\_ACEOF |
4432 | #define BROKEN_SYS_TERMIO_H 1 | 5645 | #define BROKEN_SYS_TERMIO_H 1 |
4433 | EOF | 5646 | _ACEOF |
4434 | 5647 | ||
4435 | cat >>confdefs.h <<\EOF | 5648 | cat >>confdefs.h <<\_ACEOF |
4436 | #define USE_PIPES 1 | 5649 | #define USE_PIPES 1 |
4437 | EOF | 5650 | _ACEOF |
4438 | 5651 | ||
4439 | cat >>confdefs.h <<\EOF | 5652 | cat >>confdefs.h <<\_ACEOF |
4440 | #define HAVE_SECUREWARE 1 | 5653 | #define HAVE_SECUREWARE 1 |
4441 | EOF | 5654 | _ACEOF |
4442 | 5655 | ||
4443 | cat >>confdefs.h <<\EOF | 5656 | cat >>confdefs.h <<\_ACEOF |
4444 | #define DISABLE_SHADOW 1 | 5657 | #define DISABLE_SHADOW 1 |
4445 | EOF | 5658 | _ACEOF |
4446 | 5659 | ||
4447 | cat >>confdefs.h <<\EOF | 5660 | cat >>confdefs.h <<\_ACEOF |
4448 | #define BROKEN_SAVED_UIDS 1 | 5661 | #define BROKEN_SAVED_UIDS 1 |
4449 | EOF | 5662 | _ACEOF |
4450 | 5663 | ||
4451 | cat >>confdefs.h <<\EOF | 5664 | cat >>confdefs.h <<\_ACEOF |
4452 | #define SETEUID_BREAKS_SETUID 1 | 5665 | #define SETEUID_BREAKS_SETUID 1 |
4453 | EOF | 5666 | _ACEOF |
4454 | 5667 | ||
4455 | cat >>confdefs.h <<\EOF | 5668 | cat >>confdefs.h <<\_ACEOF |
4456 | #define BROKEN_SETREUID 1 | 5669 | #define BROKEN_SETREUID 1 |
4457 | EOF | 5670 | _ACEOF |
4458 | 5671 | ||
4459 | cat >>confdefs.h <<\EOF | 5672 | cat >>confdefs.h <<\_ACEOF |
4460 | #define BROKEN_SETREGID 1 | 5673 | #define BROKEN_SETREGID 1 |
4461 | EOF | 5674 | _ACEOF |
4462 | 5675 | ||
4463 | cat >>confdefs.h <<\EOF | 5676 | cat >>confdefs.h <<\_ACEOF |
4464 | #define WITH_ABBREV_NO_TTY 1 | 5677 | #define WITH_ABBREV_NO_TTY 1 |
4465 | EOF | 5678 | _ACEOF |
5679 | |||
5680 | |||
4466 | 5681 | ||
4467 | for ac_func in getluid setluid | 5682 | for ac_func in getluid setluid |
4468 | do | 5683 | do |
4469 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | 5684 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
4470 | echo "$as_me:4470: checking for $ac_func" >&5 | 5685 | echo "$as_me:$LINENO: checking for $ac_func" >&5 |
4471 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | 5686 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 |
4472 | if eval "test \"\${$as_ac_var+set}\" = set"; then | 5687 | if eval "test \"\${$as_ac_var+set}\" = set"; then |
4473 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 5688 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
4474 | else | 5689 | else |
4475 | cat >conftest.$ac_ext <<_ACEOF | 5690 | cat >conftest.$ac_ext <<_ACEOF |
4476 | #line 4476 "configure" | 5691 | /* confdefs.h. */ |
4477 | #include "confdefs.h" | 5692 | _ACEOF |
5693 | cat confdefs.h >>conftest.$ac_ext | ||
5694 | cat >>conftest.$ac_ext <<_ACEOF | ||
5695 | /* end confdefs.h. */ | ||
5696 | /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
5697 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
5698 | #define $ac_func innocuous_$ac_func | ||
5699 | |||
4478 | /* System header to define __stub macros and hopefully few prototypes, | 5700 | /* System header to define __stub macros and hopefully few prototypes, |
4479 | which can conflict with char $ac_func (); below. */ | 5701 | which can conflict with char $ac_func (); below. |
4480 | #include <assert.h> | 5702 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
5703 | <limits.h> exists even on freestanding compilers. */ | ||
5704 | |||
5705 | #ifdef __STDC__ | ||
5706 | # include <limits.h> | ||
5707 | #else | ||
5708 | # include <assert.h> | ||
5709 | #endif | ||
5710 | |||
5711 | #undef $ac_func | ||
5712 | |||
4481 | /* Override any gcc2 internal prototype to avoid an error. */ | 5713 | /* Override any gcc2 internal prototype to avoid an error. */ |
4482 | #ifdef __cplusplus | 5714 | #ifdef __cplusplus |
4483 | extern "C" | 5715 | extern "C" |
5716 | { | ||
4484 | #endif | 5717 | #endif |
4485 | /* We use char because int might match the return type of a gcc2 | 5718 | /* We use char because int might match the return type of a gcc2 |
4486 | builtin and then its argument prototype would still apply. */ | 5719 | builtin and then its argument prototype would still apply. */ |
4487 | char $ac_func (); | 5720 | char $ac_func (); |
4488 | char (*f) (); | ||
4489 | |||
4490 | int | ||
4491 | main () | ||
4492 | { | ||
4493 | /* The GNU C library defines this for functions which it implements | 5721 | /* The GNU C library defines this for functions which it implements |
4494 | to always fail with ENOSYS. Some functions are actually named | 5722 | to always fail with ENOSYS. Some functions are actually named |
4495 | something starting with __ and the normal name is an alias. */ | 5723 | something starting with __ and the normal name is an alias. */ |
4496 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) | 5724 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) |
4497 | choke me | 5725 | choke me |
4498 | #else | 5726 | #else |
4499 | f = $ac_func; | 5727 | char (*f) () = $ac_func; |
5728 | #endif | ||
5729 | #ifdef __cplusplus | ||
5730 | } | ||
4500 | #endif | 5731 | #endif |
4501 | 5732 | ||
5733 | int | ||
5734 | main () | ||
5735 | { | ||
5736 | return f != $ac_func; | ||
4502 | ; | 5737 | ; |
4503 | return 0; | 5738 | return 0; |
4504 | } | 5739 | } |
4505 | _ACEOF | 5740 | _ACEOF |
4506 | rm -f conftest.$ac_objext conftest$ac_exeext | 5741 | rm -f conftest.$ac_objext conftest$ac_exeext |
4507 | if { (eval echo "$as_me:4507: \"$ac_link\"") >&5 | 5742 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
4508 | (eval $ac_link) 2>&5 | 5743 | (eval $ac_link) 2>conftest.er1 |
4509 | ac_status=$? | 5744 | ac_status=$? |
4510 | echo "$as_me:4510: \$? = $ac_status" >&5 | 5745 | grep -v '^ *+' conftest.er1 >conftest.err |
5746 | rm -f conftest.er1 | ||
5747 | cat conftest.err >&5 | ||
5748 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4511 | (exit $ac_status); } && | 5749 | (exit $ac_status); } && |
4512 | { ac_try='test -s conftest$ac_exeext' | 5750 | { ac_try='test -z "$ac_c_werror_flag" |
4513 | { (eval echo "$as_me:4513: \"$ac_try\"") >&5 | 5751 | || test ! -s conftest.err' |
5752 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4514 | (eval $ac_try) 2>&5 | 5753 | (eval $ac_try) 2>&5 |
4515 | ac_status=$? | 5754 | ac_status=$? |
4516 | echo "$as_me:4516: \$? = $ac_status" >&5 | 5755 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
5756 | (exit $ac_status); }; } && | ||
5757 | { ac_try='test -s conftest$ac_exeext' | ||
5758 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5759 | (eval $ac_try) 2>&5 | ||
5760 | ac_status=$? | ||
5761 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4517 | (exit $ac_status); }; }; then | 5762 | (exit $ac_status); }; }; then |
4518 | eval "$as_ac_var=yes" | 5763 | eval "$as_ac_var=yes" |
4519 | else | 5764 | else |
4520 | echo "$as_me: failed program was:" >&5 | 5765 | echo "$as_me: failed program was:" >&5 |
4521 | cat conftest.$ac_ext >&5 | 5766 | sed 's/^/| /' conftest.$ac_ext >&5 |
5767 | |||
4522 | eval "$as_ac_var=no" | 5768 | eval "$as_ac_var=no" |
4523 | fi | 5769 | fi |
4524 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 5770 | rm -f conftest.err conftest.$ac_objext \ |
5771 | conftest$ac_exeext conftest.$ac_ext | ||
4525 | fi | 5772 | fi |
4526 | echo "$as_me:4526: result: `eval echo '${'$as_ac_var'}'`" >&5 | 5773 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 |
4527 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | 5774 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 |
4528 | if test `eval echo '${'$as_ac_var'}'` = yes; then | 5775 | if test `eval echo '${'$as_ac_var'}'` = yes; then |
4529 | cat >>confdefs.h <<EOF | 5776 | cat >>confdefs.h <<_ACEOF |
4530 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 5777 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
4531 | EOF | 5778 | _ACEOF |
4532 | 5779 | ||
4533 | fi | 5780 | fi |
4534 | done | 5781 | done |
4535 | 5782 | ||
4536 | MANTYPE=man | 5783 | MANTYPE=man |
4537 | do_sco3_extra_lib_check=yes | 5784 | do_sco3_extra_lib_check=yes |
5785 | TEST_SHELL=ksh | ||
4538 | ;; | 5786 | ;; |
4539 | *-*-sco3.2v5*) | 5787 | *-*-sco3.2v5*) |
4540 | if test -z "$GCC"; then | 5788 | if test -z "$GCC"; then |
@@ -4542,198 +5790,237 @@ done | |||
4542 | fi | 5790 | fi |
4543 | LIBS="$LIBS -lprot -lx -ltinfo -lm" | 5791 | LIBS="$LIBS -lprot -lx -ltinfo -lm" |
4544 | no_dev_ptmx=1 | 5792 | no_dev_ptmx=1 |
4545 | cat >>confdefs.h <<\EOF | 5793 | cat >>confdefs.h <<\_ACEOF |
4546 | #define USE_PIPES 1 | 5794 | #define USE_PIPES 1 |
4547 | EOF | 5795 | _ACEOF |
4548 | 5796 | ||
4549 | cat >>confdefs.h <<\EOF | 5797 | cat >>confdefs.h <<\_ACEOF |
4550 | #define HAVE_SECUREWARE 1 | 5798 | #define HAVE_SECUREWARE 1 |
4551 | EOF | 5799 | _ACEOF |
4552 | 5800 | ||
4553 | cat >>confdefs.h <<\EOF | 5801 | cat >>confdefs.h <<\_ACEOF |
4554 | #define DISABLE_SHADOW 1 | 5802 | #define DISABLE_SHADOW 1 |
4555 | EOF | 5803 | _ACEOF |
4556 | 5804 | ||
4557 | cat >>confdefs.h <<\EOF | 5805 | cat >>confdefs.h <<\_ACEOF |
4558 | #define DISABLE_FD_PASSING 1 | 5806 | #define DISABLE_FD_PASSING 1 |
4559 | EOF | 5807 | _ACEOF |
4560 | 5808 | ||
4561 | cat >>confdefs.h <<\EOF | 5809 | cat >>confdefs.h <<\_ACEOF |
4562 | #define SETEUID_BREAKS_SETUID 1 | 5810 | #define SETEUID_BREAKS_SETUID 1 |
4563 | EOF | 5811 | _ACEOF |
4564 | 5812 | ||
4565 | cat >>confdefs.h <<\EOF | 5813 | cat >>confdefs.h <<\_ACEOF |
4566 | #define BROKEN_SETREUID 1 | 5814 | #define BROKEN_SETREUID 1 |
4567 | EOF | 5815 | _ACEOF |
4568 | 5816 | ||
4569 | cat >>confdefs.h <<\EOF | 5817 | cat >>confdefs.h <<\_ACEOF |
4570 | #define BROKEN_SETREGID 1 | 5818 | #define BROKEN_SETREGID 1 |
4571 | EOF | 5819 | _ACEOF |
4572 | 5820 | ||
4573 | cat >>confdefs.h <<\EOF | 5821 | cat >>confdefs.h <<\_ACEOF |
4574 | #define WITH_ABBREV_NO_TTY 1 | 5822 | #define WITH_ABBREV_NO_TTY 1 |
4575 | EOF | 5823 | _ACEOF |
5824 | |||
5825 | cat >>confdefs.h <<\_ACEOF | ||
5826 | #define BROKEN_UPDWTMPX 1 | ||
5827 | _ACEOF | ||
5828 | |||
5829 | |||
4576 | 5830 | ||
4577 | for ac_func in getluid setluid | 5831 | for ac_func in getluid setluid |
4578 | do | 5832 | do |
4579 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | 5833 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
4580 | echo "$as_me:4580: checking for $ac_func" >&5 | 5834 | echo "$as_me:$LINENO: checking for $ac_func" >&5 |
4581 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | 5835 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 |
4582 | if eval "test \"\${$as_ac_var+set}\" = set"; then | 5836 | if eval "test \"\${$as_ac_var+set}\" = set"; then |
4583 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 5837 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
4584 | else | 5838 | else |
4585 | cat >conftest.$ac_ext <<_ACEOF | 5839 | cat >conftest.$ac_ext <<_ACEOF |
4586 | #line 4586 "configure" | 5840 | /* confdefs.h. */ |
4587 | #include "confdefs.h" | 5841 | _ACEOF |
5842 | cat confdefs.h >>conftest.$ac_ext | ||
5843 | cat >>conftest.$ac_ext <<_ACEOF | ||
5844 | /* end confdefs.h. */ | ||
5845 | /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
5846 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
5847 | #define $ac_func innocuous_$ac_func | ||
5848 | |||
4588 | /* System header to define __stub macros and hopefully few prototypes, | 5849 | /* System header to define __stub macros and hopefully few prototypes, |
4589 | which can conflict with char $ac_func (); below. */ | 5850 | which can conflict with char $ac_func (); below. |
4590 | #include <assert.h> | 5851 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
5852 | <limits.h> exists even on freestanding compilers. */ | ||
5853 | |||
5854 | #ifdef __STDC__ | ||
5855 | # include <limits.h> | ||
5856 | #else | ||
5857 | # include <assert.h> | ||
5858 | #endif | ||
5859 | |||
5860 | #undef $ac_func | ||
5861 | |||
4591 | /* Override any gcc2 internal prototype to avoid an error. */ | 5862 | /* Override any gcc2 internal prototype to avoid an error. */ |
4592 | #ifdef __cplusplus | 5863 | #ifdef __cplusplus |
4593 | extern "C" | 5864 | extern "C" |
5865 | { | ||
4594 | #endif | 5866 | #endif |
4595 | /* We use char because int might match the return type of a gcc2 | 5867 | /* We use char because int might match the return type of a gcc2 |
4596 | builtin and then its argument prototype would still apply. */ | 5868 | builtin and then its argument prototype would still apply. */ |
4597 | char $ac_func (); | 5869 | char $ac_func (); |
4598 | char (*f) (); | ||
4599 | |||
4600 | int | ||
4601 | main () | ||
4602 | { | ||
4603 | /* The GNU C library defines this for functions which it implements | 5870 | /* The GNU C library defines this for functions which it implements |
4604 | to always fail with ENOSYS. Some functions are actually named | 5871 | to always fail with ENOSYS. Some functions are actually named |
4605 | something starting with __ and the normal name is an alias. */ | 5872 | something starting with __ and the normal name is an alias. */ |
4606 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) | 5873 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) |
4607 | choke me | 5874 | choke me |
4608 | #else | 5875 | #else |
4609 | f = $ac_func; | 5876 | char (*f) () = $ac_func; |
5877 | #endif | ||
5878 | #ifdef __cplusplus | ||
5879 | } | ||
4610 | #endif | 5880 | #endif |
4611 | 5881 | ||
5882 | int | ||
5883 | main () | ||
5884 | { | ||
5885 | return f != $ac_func; | ||
4612 | ; | 5886 | ; |
4613 | return 0; | 5887 | return 0; |
4614 | } | 5888 | } |
4615 | _ACEOF | 5889 | _ACEOF |
4616 | rm -f conftest.$ac_objext conftest$ac_exeext | 5890 | rm -f conftest.$ac_objext conftest$ac_exeext |
4617 | if { (eval echo "$as_me:4617: \"$ac_link\"") >&5 | 5891 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
4618 | (eval $ac_link) 2>&5 | 5892 | (eval $ac_link) 2>conftest.er1 |
4619 | ac_status=$? | 5893 | ac_status=$? |
4620 | echo "$as_me:4620: \$? = $ac_status" >&5 | 5894 | grep -v '^ *+' conftest.er1 >conftest.err |
5895 | rm -f conftest.er1 | ||
5896 | cat conftest.err >&5 | ||
5897 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
4621 | (exit $ac_status); } && | 5898 | (exit $ac_status); } && |
4622 | { ac_try='test -s conftest$ac_exeext' | 5899 | { ac_try='test -z "$ac_c_werror_flag" |
4623 | { (eval echo "$as_me:4623: \"$ac_try\"") >&5 | 5900 | || test ! -s conftest.err' |
5901 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5902 | (eval $ac_try) 2>&5 | ||
5903 | ac_status=$? | ||
5904 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5905 | (exit $ac_status); }; } && | ||
5906 | { ac_try='test -s conftest$ac_exeext' | ||
5907 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
4624 | (eval $ac_try) 2>&5 | 5908 | (eval $ac_try) 2>&5 |
4625 | ac_status=$? | 5909 | ac_status=$? |
4626 | echo "$as_me:4626: \$? = $ac_status" >&5 | 5910 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4627 | (exit $ac_status); }; }; then | 5911 | (exit $ac_status); }; }; then |
4628 | eval "$as_ac_var=yes" | 5912 | eval "$as_ac_var=yes" |
4629 | else | 5913 | else |
4630 | echo "$as_me: failed program was:" >&5 | 5914 | echo "$as_me: failed program was:" >&5 |
4631 | cat conftest.$ac_ext >&5 | 5915 | sed 's/^/| /' conftest.$ac_ext >&5 |
5916 | |||
4632 | eval "$as_ac_var=no" | 5917 | eval "$as_ac_var=no" |
4633 | fi | 5918 | fi |
4634 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 5919 | rm -f conftest.err conftest.$ac_objext \ |
5920 | conftest$ac_exeext conftest.$ac_ext | ||
4635 | fi | 5921 | fi |
4636 | echo "$as_me:4636: result: `eval echo '${'$as_ac_var'}'`" >&5 | 5922 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 |
4637 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | 5923 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 |
4638 | if test `eval echo '${'$as_ac_var'}'` = yes; then | 5924 | if test `eval echo '${'$as_ac_var'}'` = yes; then |
4639 | cat >>confdefs.h <<EOF | 5925 | cat >>confdefs.h <<_ACEOF |
4640 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 5926 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
4641 | EOF | 5927 | _ACEOF |
4642 | 5928 | ||
4643 | fi | 5929 | fi |
4644 | done | 5930 | done |
4645 | 5931 | ||
4646 | MANTYPE=man | 5932 | MANTYPE=man |
5933 | TEST_SHELL=ksh | ||
4647 | ;; | 5934 | ;; |
4648 | *-*-unicosmk*) | 5935 | *-*-unicosmk*) |
4649 | cat >>confdefs.h <<\EOF | 5936 | cat >>confdefs.h <<\_ACEOF |
4650 | #define NO_SSH_LASTLOG 1 | 5937 | #define NO_SSH_LASTLOG 1 |
4651 | EOF | 5938 | _ACEOF |
4652 | 5939 | ||
4653 | cat >>confdefs.h <<\EOF | 5940 | cat >>confdefs.h <<\_ACEOF |
4654 | #define SETEUID_BREAKS_SETUID 1 | 5941 | #define SETEUID_BREAKS_SETUID 1 |
4655 | EOF | 5942 | _ACEOF |
4656 | 5943 | ||
4657 | cat >>confdefs.h <<\EOF | 5944 | cat >>confdefs.h <<\_ACEOF |
4658 | #define BROKEN_SETREUID 1 | 5945 | #define BROKEN_SETREUID 1 |
4659 | EOF | 5946 | _ACEOF |
4660 | 5947 | ||
4661 | cat >>confdefs.h <<\EOF | 5948 | cat >>confdefs.h <<\_ACEOF |
4662 | #define BROKEN_SETREGID 1 | 5949 | #define BROKEN_SETREGID 1 |
4663 | EOF | 5950 | _ACEOF |
4664 | 5951 | ||
4665 | cat >>confdefs.h <<\EOF | 5952 | cat >>confdefs.h <<\_ACEOF |
4666 | #define USE_PIPES 1 | 5953 | #define USE_PIPES 1 |
4667 | EOF | 5954 | _ACEOF |
4668 | 5955 | ||
4669 | cat >>confdefs.h <<\EOF | 5956 | cat >>confdefs.h <<\_ACEOF |
4670 | #define DISABLE_FD_PASSING 1 | 5957 | #define DISABLE_FD_PASSING 1 |
4671 | EOF | 5958 | _ACEOF |
4672 | 5959 | ||
4673 | LDFLAGS="$LDFLAGS" | 5960 | LDFLAGS="$LDFLAGS" |
4674 | LIBS="$LIBS -lgen -lrsc -lshare -luex -lacm" | 5961 | LIBS="$LIBS -lgen -lrsc -lshare -luex -lacm" |
4675 | MANTYPE=cat | 5962 | MANTYPE=cat |
4676 | ;; | 5963 | ;; |
4677 | *-*-unicosmp*) | 5964 | *-*-unicosmp*) |
4678 | cat >>confdefs.h <<\EOF | 5965 | cat >>confdefs.h <<\_ACEOF |
4679 | #define SETEUID_BREAKS_SETUID 1 | 5966 | #define SETEUID_BREAKS_SETUID 1 |
4680 | EOF | 5967 | _ACEOF |
4681 | 5968 | ||
4682 | cat >>confdefs.h <<\EOF | 5969 | cat >>confdefs.h <<\_ACEOF |
4683 | #define BROKEN_SETREUID 1 | 5970 | #define BROKEN_SETREUID 1 |
4684 | EOF | 5971 | _ACEOF |
4685 | 5972 | ||
4686 | cat >>confdefs.h <<\EOF | 5973 | cat >>confdefs.h <<\_ACEOF |
4687 | #define BROKEN_SETREGID 1 | 5974 | #define BROKEN_SETREGID 1 |
4688 | EOF | 5975 | _ACEOF |
4689 | 5976 | ||
4690 | cat >>confdefs.h <<\EOF | 5977 | cat >>confdefs.h <<\_ACEOF |
4691 | #define WITH_ABBREV_NO_TTY 1 | 5978 | #define WITH_ABBREV_NO_TTY 1 |
4692 | EOF | 5979 | _ACEOF |
4693 | 5980 | ||
4694 | cat >>confdefs.h <<\EOF | 5981 | cat >>confdefs.h <<\_ACEOF |
4695 | #define USE_PIPES 1 | 5982 | #define USE_PIPES 1 |
4696 | EOF | 5983 | _ACEOF |
4697 | 5984 | ||
4698 | cat >>confdefs.h <<\EOF | 5985 | cat >>confdefs.h <<\_ACEOF |
4699 | #define DISABLE_FD_PASSING 1 | 5986 | #define DISABLE_FD_PASSING 1 |
4700 | EOF | 5987 | _ACEOF |
4701 | 5988 | ||
4702 | LDFLAGS="$LDFLAGS" | 5989 | LDFLAGS="$LDFLAGS" |
4703 | LIBS="$LIBS -lgen -lacid -ldb" | 5990 | LIBS="$LIBS -lgen -lacid -ldb" |
4704 | MANTYPE=cat | 5991 | MANTYPE=cat |
4705 | ;; | 5992 | ;; |
4706 | *-*-unicos*) | 5993 | *-*-unicos*) |
4707 | cat >>confdefs.h <<\EOF | 5994 | cat >>confdefs.h <<\_ACEOF |
4708 | #define SETEUID_BREAKS_SETUID 1 | 5995 | #define SETEUID_BREAKS_SETUID 1 |
4709 | EOF | 5996 | _ACEOF |
4710 | 5997 | ||
4711 | cat >>confdefs.h <<\EOF | 5998 | cat >>confdefs.h <<\_ACEOF |
4712 | #define BROKEN_SETREUID 1 | 5999 | #define BROKEN_SETREUID 1 |
4713 | EOF | 6000 | _ACEOF |
4714 | 6001 | ||
4715 | cat >>confdefs.h <<\EOF | 6002 | cat >>confdefs.h <<\_ACEOF |
4716 | #define BROKEN_SETREGID 1 | 6003 | #define BROKEN_SETREGID 1 |
4717 | EOF | 6004 | _ACEOF |
4718 | 6005 | ||
4719 | cat >>confdefs.h <<\EOF | 6006 | cat >>confdefs.h <<\_ACEOF |
4720 | #define USE_PIPES 1 | 6007 | #define USE_PIPES 1 |
4721 | EOF | 6008 | _ACEOF |
4722 | 6009 | ||
4723 | cat >>confdefs.h <<\EOF | 6010 | cat >>confdefs.h <<\_ACEOF |
4724 | #define DISABLE_FD_PASSING 1 | 6011 | #define DISABLE_FD_PASSING 1 |
4725 | EOF | 6012 | _ACEOF |
4726 | 6013 | ||
4727 | cat >>confdefs.h <<\EOF | 6014 | cat >>confdefs.h <<\_ACEOF |
4728 | #define NO_SSH_LASTLOG 1 | 6015 | #define NO_SSH_LASTLOG 1 |
4729 | EOF | 6016 | _ACEOF |
4730 | 6017 | ||
4731 | LDFLAGS="$LDFLAGS -Wl,-Dmsglevel=334:fatal" | 6018 | LDFLAGS="$LDFLAGS -Wl,-Dmsglevel=334:fatal" |
4732 | LIBS="$LIBS -lgen -lrsc -lshare -luex -lacm" | 6019 | LIBS="$LIBS -lgen -lrsc -lshare -luex -lacm" |
4733 | MANTYPE=cat | 6020 | MANTYPE=cat |
4734 | ;; | 6021 | ;; |
4735 | *-dec-osf*) | 6022 | *-dec-osf*) |
4736 | echo "$as_me:4736: checking for Digital Unix SIA" >&5 | 6023 | echo "$as_me:$LINENO: checking for Digital Unix SIA" >&5 |
4737 | echo $ECHO_N "checking for Digital Unix SIA... $ECHO_C" >&6 | 6024 | echo $ECHO_N "checking for Digital Unix SIA... $ECHO_C" >&6 |
4738 | no_osfsia="" | 6025 | no_osfsia="" |
4739 | 6026 | ||
@@ -4742,7 +6029,7 @@ if test "${with_osfsia+set}" = set; then | |||
4742 | withval="$with_osfsia" | 6029 | withval="$with_osfsia" |
4743 | 6030 | ||
4744 | if test "x$withval" = "xno" ; then | 6031 | if test "x$withval" = "xno" ; then |
4745 | echo "$as_me:4745: result: disabled" >&5 | 6032 | echo "$as_me:$LINENO: result: disabled" >&5 |
4746 | echo "${ECHO_T}disabled" >&6 | 6033 | echo "${ECHO_T}disabled" >&6 |
4747 | no_osfsia=1 | 6034 | no_osfsia=1 |
4748 | fi | 6035 | fi |
@@ -4750,68 +6037,68 @@ echo "${ECHO_T}disabled" >&6 | |||
4750 | fi; | 6037 | fi; |
4751 | if test -z "$no_osfsia" ; then | 6038 | if test -z "$no_osfsia" ; then |
4752 | if test -f /etc/sia/matrix.conf; then | 6039 | if test -f /etc/sia/matrix.conf; then |
4753 | echo "$as_me:4753: result: yes" >&5 | 6040 | echo "$as_me:$LINENO: result: yes" >&5 |
4754 | echo "${ECHO_T}yes" >&6 | 6041 | echo "${ECHO_T}yes" >&6 |
4755 | cat >>confdefs.h <<\EOF | 6042 | cat >>confdefs.h <<\_ACEOF |
4756 | #define HAVE_OSF_SIA 1 | 6043 | #define HAVE_OSF_SIA 1 |
4757 | EOF | 6044 | _ACEOF |
4758 | 6045 | ||
4759 | cat >>confdefs.h <<\EOF | 6046 | cat >>confdefs.h <<\_ACEOF |
4760 | #define DISABLE_LOGIN 1 | 6047 | #define DISABLE_LOGIN 1 |
4761 | EOF | 6048 | _ACEOF |
4762 | 6049 | ||
4763 | cat >>confdefs.h <<\EOF | 6050 | cat >>confdefs.h <<\_ACEOF |
4764 | #define DISABLE_FD_PASSING 1 | 6051 | #define DISABLE_FD_PASSING 1 |
4765 | EOF | 6052 | _ACEOF |
4766 | 6053 | ||
4767 | LIBS="$LIBS -lsecurity -ldb -lm -laud" | 6054 | LIBS="$LIBS -lsecurity -ldb -lm -laud" |
4768 | else | 6055 | else |
4769 | echo "$as_me:4769: result: no" >&5 | 6056 | echo "$as_me:$LINENO: result: no" >&5 |
4770 | echo "${ECHO_T}no" >&6 | 6057 | echo "${ECHO_T}no" >&6 |
4771 | cat >>confdefs.h <<\EOF | 6058 | cat >>confdefs.h <<\_ACEOF |
4772 | #define LOCKED_PASSWD_SUBSTR "Nologin" | 6059 | #define LOCKED_PASSWD_SUBSTR "Nologin" |
4773 | EOF | 6060 | _ACEOF |
4774 | 6061 | ||
4775 | fi | 6062 | fi |
4776 | fi | 6063 | fi |
4777 | cat >>confdefs.h <<\EOF | 6064 | cat >>confdefs.h <<\_ACEOF |
4778 | #define BROKEN_GETADDRINFO 1 | 6065 | #define BROKEN_GETADDRINFO 1 |
4779 | EOF | 6066 | _ACEOF |
4780 | 6067 | ||
4781 | cat >>confdefs.h <<\EOF | 6068 | cat >>confdefs.h <<\_ACEOF |
4782 | #define SETEUID_BREAKS_SETUID 1 | 6069 | #define SETEUID_BREAKS_SETUID 1 |
4783 | EOF | 6070 | _ACEOF |
4784 | 6071 | ||
4785 | cat >>confdefs.h <<\EOF | 6072 | cat >>confdefs.h <<\_ACEOF |
4786 | #define BROKEN_SETREUID 1 | 6073 | #define BROKEN_SETREUID 1 |
4787 | EOF | 6074 | _ACEOF |
4788 | 6075 | ||
4789 | cat >>confdefs.h <<\EOF | 6076 | cat >>confdefs.h <<\_ACEOF |
4790 | #define BROKEN_SETREGID 1 | 6077 | #define BROKEN_SETREGID 1 |
4791 | EOF | 6078 | _ACEOF |
4792 | 6079 | ||
4793 | ;; | 6080 | ;; |
4794 | 6081 | ||
4795 | *-*-nto-qnx) | 6082 | *-*-nto-qnx) |
4796 | cat >>confdefs.h <<\EOF | 6083 | cat >>confdefs.h <<\_ACEOF |
4797 | #define USE_PIPES 1 | 6084 | #define USE_PIPES 1 |
4798 | EOF | 6085 | _ACEOF |
4799 | 6086 | ||
4800 | cat >>confdefs.h <<\EOF | 6087 | cat >>confdefs.h <<\_ACEOF |
4801 | #define NO_X11_UNIX_SOCKETS 1 | 6088 | #define NO_X11_UNIX_SOCKETS 1 |
4802 | EOF | 6089 | _ACEOF |
4803 | 6090 | ||
4804 | cat >>confdefs.h <<\EOF | 6091 | cat >>confdefs.h <<\_ACEOF |
4805 | #define MISSING_NFDBITS 1 | 6092 | #define MISSING_NFDBITS 1 |
4806 | EOF | 6093 | _ACEOF |
4807 | 6094 | ||
4808 | cat >>confdefs.h <<\EOF | 6095 | cat >>confdefs.h <<\_ACEOF |
4809 | #define MISSING_HOWMANY 1 | 6096 | #define MISSING_HOWMANY 1 |
4810 | EOF | 6097 | _ACEOF |
4811 | 6098 | ||
4812 | cat >>confdefs.h <<\EOF | 6099 | cat >>confdefs.h <<\_ACEOF |
4813 | #define MISSING_FD_MASK 1 | 6100 | #define MISSING_FD_MASK 1 |
4814 | EOF | 6101 | _ACEOF |
4815 | 6102 | ||
4816 | ;; | 6103 | ;; |
4817 | esac | 6104 | esac |
@@ -4826,6 +6113,7 @@ if test "${with_cflags+set}" = set; then | |||
4826 | CFLAGS="$CFLAGS $withval" | 6113 | CFLAGS="$CFLAGS $withval" |
4827 | fi | 6114 | fi |
4828 | 6115 | ||
6116 | |||
4829 | fi; | 6117 | fi; |
4830 | 6118 | ||
4831 | # Check whether --with-cppflags or --without-cppflags was given. | 6119 | # Check whether --with-cppflags or --without-cppflags was given. |
@@ -4836,6 +6124,7 @@ if test "${with_cppflags+set}" = set; then | |||
4836 | CPPFLAGS="$CPPFLAGS $withval" | 6124 | CPPFLAGS="$CPPFLAGS $withval" |
4837 | fi | 6125 | fi |
4838 | 6126 | ||
6127 | |||
4839 | fi; | 6128 | fi; |
4840 | 6129 | ||
4841 | # Check whether --with-ldflags or --without-ldflags was given. | 6130 | # Check whether --with-ldflags or --without-ldflags was given. |
@@ -4846,6 +6135,7 @@ if test "${with_ldflags+set}" = set; then | |||
4846 | LDFLAGS="$LDFLAGS $withval" | 6135 | LDFLAGS="$LDFLAGS $withval" |
4847 | fi | 6136 | fi |
4848 | 6137 | ||
6138 | |||
4849 | fi; | 6139 | fi; |
4850 | 6140 | ||
4851 | # Check whether --with-libs or --without-libs was given. | 6141 | # Check whether --with-libs or --without-libs was given. |
@@ -4856,85 +6146,459 @@ if test "${with_libs+set}" = set; then | |||
4856 | LIBS="$LIBS $withval" | 6146 | LIBS="$LIBS $withval" |
4857 | fi | 6147 | fi |
4858 | 6148 | ||
6149 | |||
4859 | fi; | 6150 | fi; |
4860 | 6151 | ||
4861 | echo "$as_me:4861: checking compiler and flags for sanity" >&5 | 6152 | echo "$as_me:$LINENO: checking compiler and flags for sanity" >&5 |
4862 | echo $ECHO_N "checking compiler and flags for sanity... $ECHO_C" >&6 | 6153 | echo $ECHO_N "checking compiler and flags for sanity... $ECHO_C" >&6 |
4863 | if test "$cross_compiling" = yes; then | 6154 | if test "$cross_compiling" = yes; then |
4864 | { { echo "$as_me:4864: error: cannot run test program while cross compiling" >&5 | 6155 | { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
4865 | echo "$as_me: error: cannot run test program while cross compiling" >&2;} | 6156 | See \`config.log' for more details." >&5 |
6157 | echo "$as_me: error: cannot run test program while cross compiling | ||
6158 | See \`config.log' for more details." >&2;} | ||
4866 | { (exit 1); exit 1; }; } | 6159 | { (exit 1); exit 1; }; } |
4867 | else | 6160 | else |
4868 | cat >conftest.$ac_ext <<_ACEOF | 6161 | cat >conftest.$ac_ext <<_ACEOF |
4869 | #line 4869 "configure" | 6162 | /* confdefs.h. */ |
4870 | #include "confdefs.h" | 6163 | _ACEOF |
6164 | cat confdefs.h >>conftest.$ac_ext | ||
6165 | cat >>conftest.$ac_ext <<_ACEOF | ||
6166 | /* end confdefs.h. */ | ||
4871 | 6167 | ||
4872 | #include <stdio.h> | 6168 | #include <stdio.h> |
4873 | int main(){exit(0);} | 6169 | int main(){exit(0);} |
4874 | 6170 | ||
4875 | _ACEOF | 6171 | _ACEOF |
4876 | rm -f conftest$ac_exeext | 6172 | rm -f conftest$ac_exeext |
4877 | if { (eval echo "$as_me:4877: \"$ac_link\"") >&5 | 6173 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
4878 | (eval $ac_link) 2>&5 | 6174 | (eval $ac_link) 2>&5 |
4879 | ac_status=$? | 6175 | ac_status=$? |
4880 | echo "$as_me:4880: \$? = $ac_status" >&5 | 6176 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4881 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | 6177 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
4882 | { (eval echo "$as_me:4882: \"$ac_try\"") >&5 | 6178 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
4883 | (eval $ac_try) 2>&5 | 6179 | (eval $ac_try) 2>&5 |
4884 | ac_status=$? | 6180 | ac_status=$? |
4885 | echo "$as_me:4885: \$? = $ac_status" >&5 | 6181 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4886 | (exit $ac_status); }; }; then | 6182 | (exit $ac_status); }; }; then |
4887 | echo "$as_me:4887: result: yes" >&5 | 6183 | echo "$as_me:$LINENO: result: yes" >&5 |
4888 | echo "${ECHO_T}yes" >&6 | 6184 | echo "${ECHO_T}yes" >&6 |
4889 | else | 6185 | else |
4890 | echo "$as_me: program exited with status $ac_status" >&5 | 6186 | echo "$as_me: program exited with status $ac_status" >&5 |
4891 | echo "$as_me: failed program was:" >&5 | 6187 | echo "$as_me: failed program was:" >&5 |
4892 | cat conftest.$ac_ext >&5 | 6188 | sed 's/^/| /' conftest.$ac_ext >&5 |
4893 | 6189 | ||
4894 | echo "$as_me:4894: result: no" >&5 | 6190 | ( exit $ac_status ) |
6191 | |||
6192 | echo "$as_me:$LINENO: result: no" >&5 | ||
4895 | echo "${ECHO_T}no" >&6 | 6193 | echo "${ECHO_T}no" >&6 |
4896 | { { echo "$as_me:4896: error: *** compiler cannot create working executables, check config.log ***" >&5 | 6194 | { { echo "$as_me:$LINENO: error: *** compiler cannot create working executables, check config.log ***" >&5 |
4897 | echo "$as_me: error: *** compiler cannot create working executables, check config.log ***" >&2;} | 6195 | echo "$as_me: error: *** compiler cannot create working executables, check config.log ***" >&2;} |
4898 | { (exit 1); exit 1; }; } | 6196 | { (exit 1); exit 1; }; } |
4899 | 6197 | ||
6198 | |||
4900 | fi | 6199 | fi |
4901 | rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | 6200 | rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext |
4902 | fi | 6201 | fi |
4903 | 6202 | ||
4904 | # Checks for header files. | 6203 | # Checks for header files. |
4905 | 6204 | ||
4906 | for ac_header in bstring.h crypt.h endian.h features.h floatingpoint.h \ | 6205 | echo "$as_me:$LINENO: checking for egrep" >&5 |
4907 | getopt.h glob.h ia.h lastlog.h limits.h login.h \ | 6206 | echo $ECHO_N "checking for egrep... $ECHO_C" >&6 |
4908 | login_cap.h maillock.h netdb.h netgroup.h \ | 6207 | if test "${ac_cv_prog_egrep+set}" = set; then |
6208 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6209 | else | ||
6210 | if echo a | (grep -E '(a|b)') >/dev/null 2>&1 | ||
6211 | then ac_cv_prog_egrep='grep -E' | ||
6212 | else ac_cv_prog_egrep='egrep' | ||
6213 | fi | ||
6214 | fi | ||
6215 | echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 | ||
6216 | echo "${ECHO_T}$ac_cv_prog_egrep" >&6 | ||
6217 | EGREP=$ac_cv_prog_egrep | ||
6218 | |||
6219 | |||
6220 | echo "$as_me:$LINENO: checking for ANSI C header files" >&5 | ||
6221 | echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 | ||
6222 | if test "${ac_cv_header_stdc+set}" = set; then | ||
6223 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6224 | else | ||
6225 | cat >conftest.$ac_ext <<_ACEOF | ||
6226 | /* confdefs.h. */ | ||
6227 | _ACEOF | ||
6228 | cat confdefs.h >>conftest.$ac_ext | ||
6229 | cat >>conftest.$ac_ext <<_ACEOF | ||
6230 | /* end confdefs.h. */ | ||
6231 | #include <stdlib.h> | ||
6232 | #include <stdarg.h> | ||
6233 | #include <string.h> | ||
6234 | #include <float.h> | ||
6235 | |||
6236 | int | ||
6237 | main () | ||
6238 | { | ||
6239 | |||
6240 | ; | ||
6241 | return 0; | ||
6242 | } | ||
6243 | _ACEOF | ||
6244 | rm -f conftest.$ac_objext | ||
6245 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
6246 | (eval $ac_compile) 2>conftest.er1 | ||
6247 | ac_status=$? | ||
6248 | grep -v '^ *+' conftest.er1 >conftest.err | ||
6249 | rm -f conftest.er1 | ||
6250 | cat conftest.err >&5 | ||
6251 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6252 | (exit $ac_status); } && | ||
6253 | { ac_try='test -z "$ac_c_werror_flag" | ||
6254 | || test ! -s conftest.err' | ||
6255 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6256 | (eval $ac_try) 2>&5 | ||
6257 | ac_status=$? | ||
6258 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6259 | (exit $ac_status); }; } && | ||
6260 | { ac_try='test -s conftest.$ac_objext' | ||
6261 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6262 | (eval $ac_try) 2>&5 | ||
6263 | ac_status=$? | ||
6264 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6265 | (exit $ac_status); }; }; then | ||
6266 | ac_cv_header_stdc=yes | ||
6267 | else | ||
6268 | echo "$as_me: failed program was:" >&5 | ||
6269 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
6270 | |||
6271 | ac_cv_header_stdc=no | ||
6272 | fi | ||
6273 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6274 | |||
6275 | if test $ac_cv_header_stdc = yes; then | ||
6276 | # SunOS 4.x string.h does not declare mem*, contrary to ANSI. | ||
6277 | cat >conftest.$ac_ext <<_ACEOF | ||
6278 | /* confdefs.h. */ | ||
6279 | _ACEOF | ||
6280 | cat confdefs.h >>conftest.$ac_ext | ||
6281 | cat >>conftest.$ac_ext <<_ACEOF | ||
6282 | /* end confdefs.h. */ | ||
6283 | #include <string.h> | ||
6284 | |||
6285 | _ACEOF | ||
6286 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
6287 | $EGREP "memchr" >/dev/null 2>&1; then | ||
6288 | : | ||
6289 | else | ||
6290 | ac_cv_header_stdc=no | ||
6291 | fi | ||
6292 | rm -f conftest* | ||
6293 | |||
6294 | fi | ||
6295 | |||
6296 | if test $ac_cv_header_stdc = yes; then | ||
6297 | # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. | ||
6298 | cat >conftest.$ac_ext <<_ACEOF | ||
6299 | /* confdefs.h. */ | ||
6300 | _ACEOF | ||
6301 | cat confdefs.h >>conftest.$ac_ext | ||
6302 | cat >>conftest.$ac_ext <<_ACEOF | ||
6303 | /* end confdefs.h. */ | ||
6304 | #include <stdlib.h> | ||
6305 | |||
6306 | _ACEOF | ||
6307 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
6308 | $EGREP "free" >/dev/null 2>&1; then | ||
6309 | : | ||
6310 | else | ||
6311 | ac_cv_header_stdc=no | ||
6312 | fi | ||
6313 | rm -f conftest* | ||
6314 | |||
6315 | fi | ||
6316 | |||
6317 | if test $ac_cv_header_stdc = yes; then | ||
6318 | # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. | ||
6319 | if test "$cross_compiling" = yes; then | ||
6320 | : | ||
6321 | else | ||
6322 | cat >conftest.$ac_ext <<_ACEOF | ||
6323 | /* confdefs.h. */ | ||
6324 | _ACEOF | ||
6325 | cat confdefs.h >>conftest.$ac_ext | ||
6326 | cat >>conftest.$ac_ext <<_ACEOF | ||
6327 | /* end confdefs.h. */ | ||
6328 | #include <ctype.h> | ||
6329 | #if ((' ' & 0x0FF) == 0x020) | ||
6330 | # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') | ||
6331 | # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) | ||
6332 | #else | ||
6333 | # define ISLOWER(c) \ | ||
6334 | (('a' <= (c) && (c) <= 'i') \ | ||
6335 | || ('j' <= (c) && (c) <= 'r') \ | ||
6336 | || ('s' <= (c) && (c) <= 'z')) | ||
6337 | # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) | ||
6338 | #endif | ||
6339 | |||
6340 | #define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) | ||
6341 | int | ||
6342 | main () | ||
6343 | { | ||
6344 | int i; | ||
6345 | for (i = 0; i < 256; i++) | ||
6346 | if (XOR (islower (i), ISLOWER (i)) | ||
6347 | || toupper (i) != TOUPPER (i)) | ||
6348 | exit(2); | ||
6349 | exit (0); | ||
6350 | } | ||
6351 | _ACEOF | ||
6352 | rm -f conftest$ac_exeext | ||
6353 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
6354 | (eval $ac_link) 2>&5 | ||
6355 | ac_status=$? | ||
6356 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6357 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
6358 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6359 | (eval $ac_try) 2>&5 | ||
6360 | ac_status=$? | ||
6361 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6362 | (exit $ac_status); }; }; then | ||
6363 | : | ||
6364 | else | ||
6365 | echo "$as_me: program exited with status $ac_status" >&5 | ||
6366 | echo "$as_me: failed program was:" >&5 | ||
6367 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
6368 | |||
6369 | ( exit $ac_status ) | ||
6370 | ac_cv_header_stdc=no | ||
6371 | fi | ||
6372 | rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
6373 | fi | ||
6374 | fi | ||
6375 | fi | ||
6376 | echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 | ||
6377 | echo "${ECHO_T}$ac_cv_header_stdc" >&6 | ||
6378 | if test $ac_cv_header_stdc = yes; then | ||
6379 | |||
6380 | cat >>confdefs.h <<\_ACEOF | ||
6381 | #define STDC_HEADERS 1 | ||
6382 | _ACEOF | ||
6383 | |||
6384 | fi | ||
6385 | |||
6386 | # On IRIX 5.3, sys/types and inttypes.h are conflicting. | ||
6387 | |||
6388 | |||
6389 | |||
6390 | |||
6391 | |||
6392 | |||
6393 | |||
6394 | |||
6395 | |||
6396 | for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ | ||
6397 | inttypes.h stdint.h unistd.h | ||
6398 | do | ||
6399 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
6400 | echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
6401 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | ||
6402 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
6403 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6404 | else | ||
6405 | cat >conftest.$ac_ext <<_ACEOF | ||
6406 | /* confdefs.h. */ | ||
6407 | _ACEOF | ||
6408 | cat confdefs.h >>conftest.$ac_ext | ||
6409 | cat >>conftest.$ac_ext <<_ACEOF | ||
6410 | /* end confdefs.h. */ | ||
6411 | $ac_includes_default | ||
6412 | |||
6413 | #include <$ac_header> | ||
6414 | _ACEOF | ||
6415 | rm -f conftest.$ac_objext | ||
6416 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
6417 | (eval $ac_compile) 2>conftest.er1 | ||
6418 | ac_status=$? | ||
6419 | grep -v '^ *+' conftest.er1 >conftest.err | ||
6420 | rm -f conftest.er1 | ||
6421 | cat conftest.err >&5 | ||
6422 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6423 | (exit $ac_status); } && | ||
6424 | { ac_try='test -z "$ac_c_werror_flag" | ||
6425 | || test ! -s conftest.err' | ||
6426 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6427 | (eval $ac_try) 2>&5 | ||
6428 | ac_status=$? | ||
6429 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6430 | (exit $ac_status); }; } && | ||
6431 | { ac_try='test -s conftest.$ac_objext' | ||
6432 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6433 | (eval $ac_try) 2>&5 | ||
6434 | ac_status=$? | ||
6435 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6436 | (exit $ac_status); }; }; then | ||
6437 | eval "$as_ac_Header=yes" | ||
6438 | else | ||
6439 | echo "$as_me: failed program was:" >&5 | ||
6440 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
6441 | |||
6442 | eval "$as_ac_Header=no" | ||
6443 | fi | ||
6444 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6445 | fi | ||
6446 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
6447 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
6448 | if test `eval echo '${'$as_ac_Header'}'` = yes; then | ||
6449 | cat >>confdefs.h <<_ACEOF | ||
6450 | #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | ||
6451 | _ACEOF | ||
6452 | |||
6453 | fi | ||
6454 | |||
6455 | done | ||
6456 | |||
6457 | |||
6458 | |||
6459 | |||
6460 | |||
6461 | |||
6462 | |||
6463 | |||
6464 | |||
6465 | |||
6466 | |||
6467 | |||
6468 | |||
6469 | |||
6470 | |||
6471 | |||
6472 | |||
6473 | |||
6474 | |||
6475 | |||
6476 | |||
6477 | |||
6478 | |||
6479 | |||
6480 | |||
6481 | |||
6482 | |||
6483 | |||
6484 | |||
6485 | |||
6486 | |||
6487 | |||
6488 | |||
6489 | |||
6490 | |||
6491 | |||
6492 | |||
6493 | |||
6494 | |||
6495 | |||
6496 | |||
6497 | |||
6498 | |||
6499 | |||
6500 | |||
6501 | |||
6502 | |||
6503 | |||
6504 | |||
6505 | |||
6506 | |||
6507 | |||
6508 | |||
6509 | |||
6510 | |||
6511 | |||
6512 | |||
6513 | |||
6514 | for ac_header in bstring.h crypt.h dirent.h endian.h features.h \ | ||
6515 | floatingpoint.h getopt.h glob.h ia.h lastlog.h limits.h login.h \ | ||
6516 | login_cap.h maillock.h ndir.h netdb.h netgroup.h \ | ||
4909 | netinet/in_systm.h pam/pam_appl.h paths.h pty.h readpassphrase.h \ | 6517 | netinet/in_systm.h pam/pam_appl.h paths.h pty.h readpassphrase.h \ |
4910 | rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \ | 6518 | rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \ |
4911 | strings.h sys/strtio.h sys/audit.h sys/bitypes.h sys/bsdtty.h \ | 6519 | strings.h sys/dir.h sys/strtio.h sys/audit.h sys/bitypes.h \ |
4912 | sys/cdefs.h sys/mman.h sys/prctl.h sys/pstat.h sys/ptms.h \ | 6520 | sys/bsdtty.h sys/cdefs.h sys/mman.h sys/ndir.h sys/prctl.h \ |
4913 | sys/select.h sys/stat.h sys/stream.h sys/stropts.h \ | 6521 | sys/pstat.h sys/ptms.h sys/select.h sys/stat.h sys/stream.h \ |
4914 | sys/sysmacros.h sys/time.h sys/timers.h sys/un.h time.h tmpdir.h \ | 6522 | sys/stropts.h sys/sysmacros.h sys/time.h sys/timers.h sys/un.h \ |
4915 | ttyent.h usersec.h util.h utime.h utmp.h utmpx.h vis.h | 6523 | time.h tmpdir.h ttyent.h usersec.h util.h utime.h utmp.h utmpx.h vis.h |
4916 | do | 6524 | do |
4917 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | 6525 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` |
4918 | echo "$as_me:4918: checking for $ac_header" >&5 | 6526 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
6527 | echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
4919 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | 6528 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 |
4920 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | 6529 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
4921 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 6530 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
6531 | fi | ||
6532 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
6533 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
4922 | else | 6534 | else |
4923 | cat >conftest.$ac_ext <<_ACEOF | 6535 | # Is the header compilable? |
4924 | #line 4924 "configure" | 6536 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 |
4925 | #include "confdefs.h" | 6537 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 |
6538 | cat >conftest.$ac_ext <<_ACEOF | ||
6539 | /* confdefs.h. */ | ||
6540 | _ACEOF | ||
6541 | cat confdefs.h >>conftest.$ac_ext | ||
6542 | cat >>conftest.$ac_ext <<_ACEOF | ||
6543 | /* end confdefs.h. */ | ||
6544 | $ac_includes_default | ||
4926 | #include <$ac_header> | 6545 | #include <$ac_header> |
4927 | _ACEOF | 6546 | _ACEOF |
4928 | if { (eval echo "$as_me:4928: \"$ac_cpp conftest.$ac_ext\"") >&5 | 6547 | rm -f conftest.$ac_objext |
6548 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
6549 | (eval $ac_compile) 2>conftest.er1 | ||
6550 | ac_status=$? | ||
6551 | grep -v '^ *+' conftest.er1 >conftest.err | ||
6552 | rm -f conftest.er1 | ||
6553 | cat conftest.err >&5 | ||
6554 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6555 | (exit $ac_status); } && | ||
6556 | { ac_try='test -z "$ac_c_werror_flag" | ||
6557 | || test ! -s conftest.err' | ||
6558 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6559 | (eval $ac_try) 2>&5 | ||
6560 | ac_status=$? | ||
6561 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6562 | (exit $ac_status); }; } && | ||
6563 | { ac_try='test -s conftest.$ac_objext' | ||
6564 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6565 | (eval $ac_try) 2>&5 | ||
6566 | ac_status=$? | ||
6567 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6568 | (exit $ac_status); }; }; then | ||
6569 | ac_header_compiler=yes | ||
6570 | else | ||
6571 | echo "$as_me: failed program was:" >&5 | ||
6572 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
6573 | |||
6574 | ac_header_compiler=no | ||
6575 | fi | ||
6576 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
6577 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
6578 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
6579 | |||
6580 | # Is the header present? | ||
6581 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
6582 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
6583 | cat >conftest.$ac_ext <<_ACEOF | ||
6584 | /* confdefs.h. */ | ||
6585 | _ACEOF | ||
6586 | cat confdefs.h >>conftest.$ac_ext | ||
6587 | cat >>conftest.$ac_ext <<_ACEOF | ||
6588 | /* end confdefs.h. */ | ||
6589 | #include <$ac_header> | ||
6590 | _ACEOF | ||
6591 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
4929 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | 6592 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
4930 | ac_status=$? | 6593 | ac_status=$? |
4931 | egrep -v '^ *\+' conftest.er1 >conftest.err | 6594 | grep -v '^ *+' conftest.er1 >conftest.err |
4932 | rm -f conftest.er1 | 6595 | rm -f conftest.er1 |
4933 | cat conftest.err >&5 | 6596 | cat conftest.err >&5 |
4934 | echo "$as_me:4934: \$? = $ac_status" >&5 | 6597 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4935 | (exit $ac_status); } >/dev/null; then | 6598 | (exit $ac_status); } >/dev/null; then |
4936 | if test -s conftest.err; then | 6599 | if test -s conftest.err; then |
4937 | ac_cpp_err=$ac_c_preproc_warn_flag | 6600 | ac_cpp_err=$ac_c_preproc_warn_flag |
6601 | ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
4938 | else | 6602 | else |
4939 | ac_cpp_err= | 6603 | ac_cpp_err= |
4940 | fi | 6604 | fi |
@@ -4942,88 +6606,166 @@ else | |||
4942 | ac_cpp_err=yes | 6606 | ac_cpp_err=yes |
4943 | fi | 6607 | fi |
4944 | if test -z "$ac_cpp_err"; then | 6608 | if test -z "$ac_cpp_err"; then |
4945 | eval "$as_ac_Header=yes" | 6609 | ac_header_preproc=yes |
4946 | else | 6610 | else |
4947 | echo "$as_me: failed program was:" >&5 | 6611 | echo "$as_me: failed program was:" >&5 |
4948 | cat conftest.$ac_ext >&5 | 6612 | sed 's/^/| /' conftest.$ac_ext >&5 |
4949 | eval "$as_ac_Header=no" | 6613 | |
6614 | ac_header_preproc=no | ||
4950 | fi | 6615 | fi |
4951 | rm -f conftest.err conftest.$ac_ext | 6616 | rm -f conftest.err conftest.$ac_ext |
6617 | echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
6618 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
6619 | |||
6620 | # So? What about this header? | ||
6621 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
6622 | yes:no: ) | ||
6623 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
6624 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
6625 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
6626 | echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
6627 | ac_header_preproc=yes | ||
6628 | ;; | ||
6629 | no:yes:* ) | ||
6630 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
6631 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
6632 | { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
6633 | echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
6634 | { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
6635 | echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
6636 | { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
6637 | echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
6638 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
6639 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
6640 | { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
6641 | echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
6642 | ( | ||
6643 | cat <<\_ASBOX | ||
6644 | ## ------------------------------------------ ## | ||
6645 | ## Report this to the AC_PACKAGE_NAME lists. ## | ||
6646 | ## ------------------------------------------ ## | ||
6647 | _ASBOX | ||
6648 | ) | | ||
6649 | sed "s/^/$as_me: WARNING: /" >&2 | ||
6650 | ;; | ||
6651 | esac | ||
6652 | echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
6653 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | ||
6654 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
6655 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6656 | else | ||
6657 | eval "$as_ac_Header=\$ac_header_preproc" | ||
4952 | fi | 6658 | fi |
4953 | echo "$as_me:4953: result: `eval echo '${'$as_ac_Header'}'`" >&5 | 6659 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 |
4954 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | 6660 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 |
6661 | |||
6662 | fi | ||
4955 | if test `eval echo '${'$as_ac_Header'}'` = yes; then | 6663 | if test `eval echo '${'$as_ac_Header'}'` = yes; then |
4956 | cat >>confdefs.h <<EOF | 6664 | cat >>confdefs.h <<_ACEOF |
4957 | #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 6665 | #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
4958 | EOF | 6666 | _ACEOF |
4959 | 6667 | ||
4960 | fi | 6668 | fi |
6669 | |||
4961 | done | 6670 | done |
4962 | 6671 | ||
6672 | |||
4963 | # Checks for libraries. | 6673 | # Checks for libraries. |
4964 | echo "$as_me:4964: checking for yp_match" >&5 | 6674 | echo "$as_me:$LINENO: checking for yp_match" >&5 |
4965 | echo $ECHO_N "checking for yp_match... $ECHO_C" >&6 | 6675 | echo $ECHO_N "checking for yp_match... $ECHO_C" >&6 |
4966 | if test "${ac_cv_func_yp_match+set}" = set; then | 6676 | if test "${ac_cv_func_yp_match+set}" = set; then |
4967 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 6677 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
4968 | else | 6678 | else |
4969 | cat >conftest.$ac_ext <<_ACEOF | 6679 | cat >conftest.$ac_ext <<_ACEOF |
4970 | #line 4970 "configure" | 6680 | /* confdefs.h. */ |
4971 | #include "confdefs.h" | 6681 | _ACEOF |
6682 | cat confdefs.h >>conftest.$ac_ext | ||
6683 | cat >>conftest.$ac_ext <<_ACEOF | ||
6684 | /* end confdefs.h. */ | ||
6685 | /* Define yp_match to an innocuous variant, in case <limits.h> declares yp_match. | ||
6686 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
6687 | #define yp_match innocuous_yp_match | ||
6688 | |||
4972 | /* System header to define __stub macros and hopefully few prototypes, | 6689 | /* System header to define __stub macros and hopefully few prototypes, |
4973 | which can conflict with char yp_match (); below. */ | 6690 | which can conflict with char yp_match (); below. |
4974 | #include <assert.h> | 6691 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
6692 | <limits.h> exists even on freestanding compilers. */ | ||
6693 | |||
6694 | #ifdef __STDC__ | ||
6695 | # include <limits.h> | ||
6696 | #else | ||
6697 | # include <assert.h> | ||
6698 | #endif | ||
6699 | |||
6700 | #undef yp_match | ||
6701 | |||
4975 | /* Override any gcc2 internal prototype to avoid an error. */ | 6702 | /* Override any gcc2 internal prototype to avoid an error. */ |
4976 | #ifdef __cplusplus | 6703 | #ifdef __cplusplus |
4977 | extern "C" | 6704 | extern "C" |
6705 | { | ||
4978 | #endif | 6706 | #endif |
4979 | /* We use char because int might match the return type of a gcc2 | 6707 | /* We use char because int might match the return type of a gcc2 |
4980 | builtin and then its argument prototype would still apply. */ | 6708 | builtin and then its argument prototype would still apply. */ |
4981 | char yp_match (); | 6709 | char yp_match (); |
4982 | char (*f) (); | ||
4983 | |||
4984 | int | ||
4985 | main () | ||
4986 | { | ||
4987 | /* The GNU C library defines this for functions which it implements | 6710 | /* The GNU C library defines this for functions which it implements |
4988 | to always fail with ENOSYS. Some functions are actually named | 6711 | to always fail with ENOSYS. Some functions are actually named |
4989 | something starting with __ and the normal name is an alias. */ | 6712 | something starting with __ and the normal name is an alias. */ |
4990 | #if defined (__stub_yp_match) || defined (__stub___yp_match) | 6713 | #if defined (__stub_yp_match) || defined (__stub___yp_match) |
4991 | choke me | 6714 | choke me |
4992 | #else | 6715 | #else |
4993 | f = yp_match; | 6716 | char (*f) () = yp_match; |
6717 | #endif | ||
6718 | #ifdef __cplusplus | ||
6719 | } | ||
4994 | #endif | 6720 | #endif |
4995 | 6721 | ||
6722 | int | ||
6723 | main () | ||
6724 | { | ||
6725 | return f != yp_match; | ||
4996 | ; | 6726 | ; |
4997 | return 0; | 6727 | return 0; |
4998 | } | 6728 | } |
4999 | _ACEOF | 6729 | _ACEOF |
5000 | rm -f conftest.$ac_objext conftest$ac_exeext | 6730 | rm -f conftest.$ac_objext conftest$ac_exeext |
5001 | if { (eval echo "$as_me:5001: \"$ac_link\"") >&5 | 6731 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
5002 | (eval $ac_link) 2>&5 | 6732 | (eval $ac_link) 2>conftest.er1 |
5003 | ac_status=$? | 6733 | ac_status=$? |
5004 | echo "$as_me:5004: \$? = $ac_status" >&5 | 6734 | grep -v '^ *+' conftest.er1 >conftest.err |
6735 | rm -f conftest.er1 | ||
6736 | cat conftest.err >&5 | ||
6737 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5005 | (exit $ac_status); } && | 6738 | (exit $ac_status); } && |
5006 | { ac_try='test -s conftest$ac_exeext' | 6739 | { ac_try='test -z "$ac_c_werror_flag" |
5007 | { (eval echo "$as_me:5007: \"$ac_try\"") >&5 | 6740 | || test ! -s conftest.err' |
6741 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5008 | (eval $ac_try) 2>&5 | 6742 | (eval $ac_try) 2>&5 |
5009 | ac_status=$? | 6743 | ac_status=$? |
5010 | echo "$as_me:5010: \$? = $ac_status" >&5 | 6744 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
6745 | (exit $ac_status); }; } && | ||
6746 | { ac_try='test -s conftest$ac_exeext' | ||
6747 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6748 | (eval $ac_try) 2>&5 | ||
6749 | ac_status=$? | ||
6750 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5011 | (exit $ac_status); }; }; then | 6751 | (exit $ac_status); }; }; then |
5012 | ac_cv_func_yp_match=yes | 6752 | ac_cv_func_yp_match=yes |
5013 | else | 6753 | else |
5014 | echo "$as_me: failed program was:" >&5 | 6754 | echo "$as_me: failed program was:" >&5 |
5015 | cat conftest.$ac_ext >&5 | 6755 | sed 's/^/| /' conftest.$ac_ext >&5 |
6756 | |||
5016 | ac_cv_func_yp_match=no | 6757 | ac_cv_func_yp_match=no |
5017 | fi | 6758 | fi |
5018 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 6759 | rm -f conftest.err conftest.$ac_objext \ |
6760 | conftest$ac_exeext conftest.$ac_ext | ||
5019 | fi | 6761 | fi |
5020 | echo "$as_me:5020: result: $ac_cv_func_yp_match" >&5 | 6762 | echo "$as_me:$LINENO: result: $ac_cv_func_yp_match" >&5 |
5021 | echo "${ECHO_T}$ac_cv_func_yp_match" >&6 | 6763 | echo "${ECHO_T}$ac_cv_func_yp_match" >&6 |
5022 | if test $ac_cv_func_yp_match = yes; then | 6764 | if test $ac_cv_func_yp_match = yes; then |
5023 | : | 6765 | : |
5024 | else | 6766 | else |
5025 | 6767 | ||
5026 | echo "$as_me:5026: checking for yp_match in -lnsl" >&5 | 6768 | echo "$as_me:$LINENO: checking for yp_match in -lnsl" >&5 |
5027 | echo $ECHO_N "checking for yp_match in -lnsl... $ECHO_C" >&6 | 6769 | echo $ECHO_N "checking for yp_match in -lnsl... $ECHO_C" >&6 |
5028 | if test "${ac_cv_lib_nsl_yp_match+set}" = set; then | 6770 | if test "${ac_cv_lib_nsl_yp_match+set}" = set; then |
5029 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 6771 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -5031,8 +6773,11 @@ else | |||
5031 | ac_check_lib_save_LIBS=$LIBS | 6773 | ac_check_lib_save_LIBS=$LIBS |
5032 | LIBS="-lnsl $LIBS" | 6774 | LIBS="-lnsl $LIBS" |
5033 | cat >conftest.$ac_ext <<_ACEOF | 6775 | cat >conftest.$ac_ext <<_ACEOF |
5034 | #line 5034 "configure" | 6776 | /* confdefs.h. */ |
5035 | #include "confdefs.h" | 6777 | _ACEOF |
6778 | cat confdefs.h >>conftest.$ac_ext | ||
6779 | cat >>conftest.$ac_ext <<_ACEOF | ||
6780 | /* end confdefs.h. */ | ||
5036 | 6781 | ||
5037 | /* Override any gcc2 internal prototype to avoid an error. */ | 6782 | /* Override any gcc2 internal prototype to avoid an error. */ |
5038 | #ifdef __cplusplus | 6783 | #ifdef __cplusplus |
@@ -5050,32 +6795,44 @@ yp_match (); | |||
5050 | } | 6795 | } |
5051 | _ACEOF | 6796 | _ACEOF |
5052 | rm -f conftest.$ac_objext conftest$ac_exeext | 6797 | rm -f conftest.$ac_objext conftest$ac_exeext |
5053 | if { (eval echo "$as_me:5053: \"$ac_link\"") >&5 | 6798 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
5054 | (eval $ac_link) 2>&5 | 6799 | (eval $ac_link) 2>conftest.er1 |
5055 | ac_status=$? | 6800 | ac_status=$? |
5056 | echo "$as_me:5056: \$? = $ac_status" >&5 | 6801 | grep -v '^ *+' conftest.er1 >conftest.err |
6802 | rm -f conftest.er1 | ||
6803 | cat conftest.err >&5 | ||
6804 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5057 | (exit $ac_status); } && | 6805 | (exit $ac_status); } && |
5058 | { ac_try='test -s conftest$ac_exeext' | 6806 | { ac_try='test -z "$ac_c_werror_flag" |
5059 | { (eval echo "$as_me:5059: \"$ac_try\"") >&5 | 6807 | || test ! -s conftest.err' |
6808 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6809 | (eval $ac_try) 2>&5 | ||
6810 | ac_status=$? | ||
6811 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6812 | (exit $ac_status); }; } && | ||
6813 | { ac_try='test -s conftest$ac_exeext' | ||
6814 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5060 | (eval $ac_try) 2>&5 | 6815 | (eval $ac_try) 2>&5 |
5061 | ac_status=$? | 6816 | ac_status=$? |
5062 | echo "$as_me:5062: \$? = $ac_status" >&5 | 6817 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
5063 | (exit $ac_status); }; }; then | 6818 | (exit $ac_status); }; }; then |
5064 | ac_cv_lib_nsl_yp_match=yes | 6819 | ac_cv_lib_nsl_yp_match=yes |
5065 | else | 6820 | else |
5066 | echo "$as_me: failed program was:" >&5 | 6821 | echo "$as_me: failed program was:" >&5 |
5067 | cat conftest.$ac_ext >&5 | 6822 | sed 's/^/| /' conftest.$ac_ext >&5 |
6823 | |||
5068 | ac_cv_lib_nsl_yp_match=no | 6824 | ac_cv_lib_nsl_yp_match=no |
5069 | fi | 6825 | fi |
5070 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 6826 | rm -f conftest.err conftest.$ac_objext \ |
6827 | conftest$ac_exeext conftest.$ac_ext | ||
5071 | LIBS=$ac_check_lib_save_LIBS | 6828 | LIBS=$ac_check_lib_save_LIBS |
5072 | fi | 6829 | fi |
5073 | echo "$as_me:5073: result: $ac_cv_lib_nsl_yp_match" >&5 | 6830 | echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_yp_match" >&5 |
5074 | echo "${ECHO_T}$ac_cv_lib_nsl_yp_match" >&6 | 6831 | echo "${ECHO_T}$ac_cv_lib_nsl_yp_match" >&6 |
5075 | if test $ac_cv_lib_nsl_yp_match = yes; then | 6832 | if test $ac_cv_lib_nsl_yp_match = yes; then |
5076 | cat >>confdefs.h <<EOF | 6833 | cat >>confdefs.h <<_ACEOF |
5077 | #define HAVE_LIBNSL 1 | 6834 | #define HAVE_LIBNSL 1 |
5078 | EOF | 6835 | _ACEOF |
5079 | 6836 | ||
5080 | LIBS="-lnsl $LIBS" | 6837 | LIBS="-lnsl $LIBS" |
5081 | 6838 | ||
@@ -5083,69 +6840,101 @@ fi | |||
5083 | 6840 | ||
5084 | fi | 6841 | fi |
5085 | 6842 | ||
5086 | echo "$as_me:5086: checking for setsockopt" >&5 | 6843 | echo "$as_me:$LINENO: checking for setsockopt" >&5 |
5087 | echo $ECHO_N "checking for setsockopt... $ECHO_C" >&6 | 6844 | echo $ECHO_N "checking for setsockopt... $ECHO_C" >&6 |
5088 | if test "${ac_cv_func_setsockopt+set}" = set; then | 6845 | if test "${ac_cv_func_setsockopt+set}" = set; then |
5089 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 6846 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
5090 | else | 6847 | else |
5091 | cat >conftest.$ac_ext <<_ACEOF | 6848 | cat >conftest.$ac_ext <<_ACEOF |
5092 | #line 5092 "configure" | 6849 | /* confdefs.h. */ |
5093 | #include "confdefs.h" | 6850 | _ACEOF |
6851 | cat confdefs.h >>conftest.$ac_ext | ||
6852 | cat >>conftest.$ac_ext <<_ACEOF | ||
6853 | /* end confdefs.h. */ | ||
6854 | /* Define setsockopt to an innocuous variant, in case <limits.h> declares setsockopt. | ||
6855 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
6856 | #define setsockopt innocuous_setsockopt | ||
6857 | |||
5094 | /* System header to define __stub macros and hopefully few prototypes, | 6858 | /* System header to define __stub macros and hopefully few prototypes, |
5095 | which can conflict with char setsockopt (); below. */ | 6859 | which can conflict with char setsockopt (); below. |
5096 | #include <assert.h> | 6860 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
6861 | <limits.h> exists even on freestanding compilers. */ | ||
6862 | |||
6863 | #ifdef __STDC__ | ||
6864 | # include <limits.h> | ||
6865 | #else | ||
6866 | # include <assert.h> | ||
6867 | #endif | ||
6868 | |||
6869 | #undef setsockopt | ||
6870 | |||
5097 | /* Override any gcc2 internal prototype to avoid an error. */ | 6871 | /* Override any gcc2 internal prototype to avoid an error. */ |
5098 | #ifdef __cplusplus | 6872 | #ifdef __cplusplus |
5099 | extern "C" | 6873 | extern "C" |
6874 | { | ||
5100 | #endif | 6875 | #endif |
5101 | /* We use char because int might match the return type of a gcc2 | 6876 | /* We use char because int might match the return type of a gcc2 |
5102 | builtin and then its argument prototype would still apply. */ | 6877 | builtin and then its argument prototype would still apply. */ |
5103 | char setsockopt (); | 6878 | char setsockopt (); |
5104 | char (*f) (); | ||
5105 | |||
5106 | int | ||
5107 | main () | ||
5108 | { | ||
5109 | /* The GNU C library defines this for functions which it implements | 6879 | /* The GNU C library defines this for functions which it implements |
5110 | to always fail with ENOSYS. Some functions are actually named | 6880 | to always fail with ENOSYS. Some functions are actually named |
5111 | something starting with __ and the normal name is an alias. */ | 6881 | something starting with __ and the normal name is an alias. */ |
5112 | #if defined (__stub_setsockopt) || defined (__stub___setsockopt) | 6882 | #if defined (__stub_setsockopt) || defined (__stub___setsockopt) |
5113 | choke me | 6883 | choke me |
5114 | #else | 6884 | #else |
5115 | f = setsockopt; | 6885 | char (*f) () = setsockopt; |
6886 | #endif | ||
6887 | #ifdef __cplusplus | ||
6888 | } | ||
5116 | #endif | 6889 | #endif |
5117 | 6890 | ||
6891 | int | ||
6892 | main () | ||
6893 | { | ||
6894 | return f != setsockopt; | ||
5118 | ; | 6895 | ; |
5119 | return 0; | 6896 | return 0; |
5120 | } | 6897 | } |
5121 | _ACEOF | 6898 | _ACEOF |
5122 | rm -f conftest.$ac_objext conftest$ac_exeext | 6899 | rm -f conftest.$ac_objext conftest$ac_exeext |
5123 | if { (eval echo "$as_me:5123: \"$ac_link\"") >&5 | 6900 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
5124 | (eval $ac_link) 2>&5 | 6901 | (eval $ac_link) 2>conftest.er1 |
5125 | ac_status=$? | 6902 | ac_status=$? |
5126 | echo "$as_me:5126: \$? = $ac_status" >&5 | 6903 | grep -v '^ *+' conftest.er1 >conftest.err |
6904 | rm -f conftest.er1 | ||
6905 | cat conftest.err >&5 | ||
6906 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5127 | (exit $ac_status); } && | 6907 | (exit $ac_status); } && |
5128 | { ac_try='test -s conftest$ac_exeext' | 6908 | { ac_try='test -z "$ac_c_werror_flag" |
5129 | { (eval echo "$as_me:5129: \"$ac_try\"") >&5 | 6909 | || test ! -s conftest.err' |
6910 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5130 | (eval $ac_try) 2>&5 | 6911 | (eval $ac_try) 2>&5 |
5131 | ac_status=$? | 6912 | ac_status=$? |
5132 | echo "$as_me:5132: \$? = $ac_status" >&5 | 6913 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
6914 | (exit $ac_status); }; } && | ||
6915 | { ac_try='test -s conftest$ac_exeext' | ||
6916 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6917 | (eval $ac_try) 2>&5 | ||
6918 | ac_status=$? | ||
6919 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5133 | (exit $ac_status); }; }; then | 6920 | (exit $ac_status); }; }; then |
5134 | ac_cv_func_setsockopt=yes | 6921 | ac_cv_func_setsockopt=yes |
5135 | else | 6922 | else |
5136 | echo "$as_me: failed program was:" >&5 | 6923 | echo "$as_me: failed program was:" >&5 |
5137 | cat conftest.$ac_ext >&5 | 6924 | sed 's/^/| /' conftest.$ac_ext >&5 |
6925 | |||
5138 | ac_cv_func_setsockopt=no | 6926 | ac_cv_func_setsockopt=no |
5139 | fi | 6927 | fi |
5140 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 6928 | rm -f conftest.err conftest.$ac_objext \ |
6929 | conftest$ac_exeext conftest.$ac_ext | ||
5141 | fi | 6930 | fi |
5142 | echo "$as_me:5142: result: $ac_cv_func_setsockopt" >&5 | 6931 | echo "$as_me:$LINENO: result: $ac_cv_func_setsockopt" >&5 |
5143 | echo "${ECHO_T}$ac_cv_func_setsockopt" >&6 | 6932 | echo "${ECHO_T}$ac_cv_func_setsockopt" >&6 |
5144 | if test $ac_cv_func_setsockopt = yes; then | 6933 | if test $ac_cv_func_setsockopt = yes; then |
5145 | : | 6934 | : |
5146 | else | 6935 | else |
5147 | 6936 | ||
5148 | echo "$as_me:5148: checking for setsockopt in -lsocket" >&5 | 6937 | echo "$as_me:$LINENO: checking for setsockopt in -lsocket" >&5 |
5149 | echo $ECHO_N "checking for setsockopt in -lsocket... $ECHO_C" >&6 | 6938 | echo $ECHO_N "checking for setsockopt in -lsocket... $ECHO_C" >&6 |
5150 | if test "${ac_cv_lib_socket_setsockopt+set}" = set; then | 6939 | if test "${ac_cv_lib_socket_setsockopt+set}" = set; then |
5151 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 6940 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -5153,8 +6942,11 @@ else | |||
5153 | ac_check_lib_save_LIBS=$LIBS | 6942 | ac_check_lib_save_LIBS=$LIBS |
5154 | LIBS="-lsocket $LIBS" | 6943 | LIBS="-lsocket $LIBS" |
5155 | cat >conftest.$ac_ext <<_ACEOF | 6944 | cat >conftest.$ac_ext <<_ACEOF |
5156 | #line 5156 "configure" | 6945 | /* confdefs.h. */ |
5157 | #include "confdefs.h" | 6946 | _ACEOF |
6947 | cat confdefs.h >>conftest.$ac_ext | ||
6948 | cat >>conftest.$ac_ext <<_ACEOF | ||
6949 | /* end confdefs.h. */ | ||
5158 | 6950 | ||
5159 | /* Override any gcc2 internal prototype to avoid an error. */ | 6951 | /* Override any gcc2 internal prototype to avoid an error. */ |
5160 | #ifdef __cplusplus | 6952 | #ifdef __cplusplus |
@@ -5172,32 +6964,44 @@ setsockopt (); | |||
5172 | } | 6964 | } |
5173 | _ACEOF | 6965 | _ACEOF |
5174 | rm -f conftest.$ac_objext conftest$ac_exeext | 6966 | rm -f conftest.$ac_objext conftest$ac_exeext |
5175 | if { (eval echo "$as_me:5175: \"$ac_link\"") >&5 | 6967 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
5176 | (eval $ac_link) 2>&5 | 6968 | (eval $ac_link) 2>conftest.er1 |
5177 | ac_status=$? | 6969 | ac_status=$? |
5178 | echo "$as_me:5178: \$? = $ac_status" >&5 | 6970 | grep -v '^ *+' conftest.er1 >conftest.err |
6971 | rm -f conftest.er1 | ||
6972 | cat conftest.err >&5 | ||
6973 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5179 | (exit $ac_status); } && | 6974 | (exit $ac_status); } && |
5180 | { ac_try='test -s conftest$ac_exeext' | 6975 | { ac_try='test -z "$ac_c_werror_flag" |
5181 | { (eval echo "$as_me:5181: \"$ac_try\"") >&5 | 6976 | || test ! -s conftest.err' |
6977 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5182 | (eval $ac_try) 2>&5 | 6978 | (eval $ac_try) 2>&5 |
5183 | ac_status=$? | 6979 | ac_status=$? |
5184 | echo "$as_me:5184: \$? = $ac_status" >&5 | 6980 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
6981 | (exit $ac_status); }; } && | ||
6982 | { ac_try='test -s conftest$ac_exeext' | ||
6983 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6984 | (eval $ac_try) 2>&5 | ||
6985 | ac_status=$? | ||
6986 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5185 | (exit $ac_status); }; }; then | 6987 | (exit $ac_status); }; }; then |
5186 | ac_cv_lib_socket_setsockopt=yes | 6988 | ac_cv_lib_socket_setsockopt=yes |
5187 | else | 6989 | else |
5188 | echo "$as_me: failed program was:" >&5 | 6990 | echo "$as_me: failed program was:" >&5 |
5189 | cat conftest.$ac_ext >&5 | 6991 | sed 's/^/| /' conftest.$ac_ext >&5 |
6992 | |||
5190 | ac_cv_lib_socket_setsockopt=no | 6993 | ac_cv_lib_socket_setsockopt=no |
5191 | fi | 6994 | fi |
5192 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 6995 | rm -f conftest.err conftest.$ac_objext \ |
6996 | conftest$ac_exeext conftest.$ac_ext | ||
5193 | LIBS=$ac_check_lib_save_LIBS | 6997 | LIBS=$ac_check_lib_save_LIBS |
5194 | fi | 6998 | fi |
5195 | echo "$as_me:5195: result: $ac_cv_lib_socket_setsockopt" >&5 | 6999 | echo "$as_me:$LINENO: result: $ac_cv_lib_socket_setsockopt" >&5 |
5196 | echo "${ECHO_T}$ac_cv_lib_socket_setsockopt" >&6 | 7000 | echo "${ECHO_T}$ac_cv_lib_socket_setsockopt" >&6 |
5197 | if test $ac_cv_lib_socket_setsockopt = yes; then | 7001 | if test $ac_cv_lib_socket_setsockopt = yes; then |
5198 | cat >>confdefs.h <<EOF | 7002 | cat >>confdefs.h <<_ACEOF |
5199 | #define HAVE_LIBSOCKET 1 | 7003 | #define HAVE_LIBSOCKET 1 |
5200 | EOF | 7004 | _ACEOF |
5201 | 7005 | ||
5202 | LIBS="-lsocket $LIBS" | 7006 | LIBS="-lsocket $LIBS" |
5203 | 7007 | ||
@@ -5205,9 +7009,10 @@ fi | |||
5205 | 7009 | ||
5206 | fi | 7010 | fi |
5207 | 7011 | ||
7012 | |||
5208 | if test "x$with_tcp_wrappers" != "xno" ; then | 7013 | if test "x$with_tcp_wrappers" != "xno" ; then |
5209 | if test "x$do_sco3_extra_lib_check" = "xyes" ; then | 7014 | if test "x$do_sco3_extra_lib_check" = "xyes" ; then |
5210 | echo "$as_me:5210: checking for innetgr in -lrpc" >&5 | 7015 | echo "$as_me:$LINENO: checking for innetgr in -lrpc" >&5 |
5211 | echo $ECHO_N "checking for innetgr in -lrpc... $ECHO_C" >&6 | 7016 | echo $ECHO_N "checking for innetgr in -lrpc... $ECHO_C" >&6 |
5212 | if test "${ac_cv_lib_rpc_innetgr+set}" = set; then | 7017 | if test "${ac_cv_lib_rpc_innetgr+set}" = set; then |
5213 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 7018 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -5215,8 +7020,11 @@ else | |||
5215 | ac_check_lib_save_LIBS=$LIBS | 7020 | ac_check_lib_save_LIBS=$LIBS |
5216 | LIBS="-lrpc -lyp -lrpc $LIBS" | 7021 | LIBS="-lrpc -lyp -lrpc $LIBS" |
5217 | cat >conftest.$ac_ext <<_ACEOF | 7022 | cat >conftest.$ac_ext <<_ACEOF |
5218 | #line 5218 "configure" | 7023 | /* confdefs.h. */ |
5219 | #include "confdefs.h" | 7024 | _ACEOF |
7025 | cat confdefs.h >>conftest.$ac_ext | ||
7026 | cat >>conftest.$ac_ext <<_ACEOF | ||
7027 | /* end confdefs.h. */ | ||
5220 | 7028 | ||
5221 | /* Override any gcc2 internal prototype to avoid an error. */ | 7029 | /* Override any gcc2 internal prototype to avoid an error. */ |
5222 | #ifdef __cplusplus | 7030 | #ifdef __cplusplus |
@@ -5234,27 +7042,39 @@ innetgr (); | |||
5234 | } | 7042 | } |
5235 | _ACEOF | 7043 | _ACEOF |
5236 | rm -f conftest.$ac_objext conftest$ac_exeext | 7044 | rm -f conftest.$ac_objext conftest$ac_exeext |
5237 | if { (eval echo "$as_me:5237: \"$ac_link\"") >&5 | 7045 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
5238 | (eval $ac_link) 2>&5 | 7046 | (eval $ac_link) 2>conftest.er1 |
5239 | ac_status=$? | 7047 | ac_status=$? |
5240 | echo "$as_me:5240: \$? = $ac_status" >&5 | 7048 | grep -v '^ *+' conftest.er1 >conftest.err |
7049 | rm -f conftest.er1 | ||
7050 | cat conftest.err >&5 | ||
7051 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5241 | (exit $ac_status); } && | 7052 | (exit $ac_status); } && |
5242 | { ac_try='test -s conftest$ac_exeext' | 7053 | { ac_try='test -z "$ac_c_werror_flag" |
5243 | { (eval echo "$as_me:5243: \"$ac_try\"") >&5 | 7054 | || test ! -s conftest.err' |
7055 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5244 | (eval $ac_try) 2>&5 | 7056 | (eval $ac_try) 2>&5 |
5245 | ac_status=$? | 7057 | ac_status=$? |
5246 | echo "$as_me:5246: \$? = $ac_status" >&5 | 7058 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
7059 | (exit $ac_status); }; } && | ||
7060 | { ac_try='test -s conftest$ac_exeext' | ||
7061 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7062 | (eval $ac_try) 2>&5 | ||
7063 | ac_status=$? | ||
7064 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5247 | (exit $ac_status); }; }; then | 7065 | (exit $ac_status); }; }; then |
5248 | ac_cv_lib_rpc_innetgr=yes | 7066 | ac_cv_lib_rpc_innetgr=yes |
5249 | else | 7067 | else |
5250 | echo "$as_me: failed program was:" >&5 | 7068 | echo "$as_me: failed program was:" >&5 |
5251 | cat conftest.$ac_ext >&5 | 7069 | sed 's/^/| /' conftest.$ac_ext >&5 |
7070 | |||
5252 | ac_cv_lib_rpc_innetgr=no | 7071 | ac_cv_lib_rpc_innetgr=no |
5253 | fi | 7072 | fi |
5254 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 7073 | rm -f conftest.err conftest.$ac_objext \ |
7074 | conftest$ac_exeext conftest.$ac_ext | ||
5255 | LIBS=$ac_check_lib_save_LIBS | 7075 | LIBS=$ac_check_lib_save_LIBS |
5256 | fi | 7076 | fi |
5257 | echo "$as_me:5257: result: $ac_cv_lib_rpc_innetgr" >&5 | 7077 | echo "$as_me:$LINENO: result: $ac_cv_lib_rpc_innetgr" >&5 |
5258 | echo "${ECHO_T}$ac_cv_lib_rpc_innetgr" >&6 | 7078 | echo "${ECHO_T}$ac_cv_lib_rpc_innetgr" >&6 |
5259 | if test $ac_cv_lib_rpc_innetgr = yes; then | 7079 | if test $ac_cv_lib_rpc_innetgr = yes; then |
5260 | LIBS="-lrpc -lyp -lrpc $LIBS" | 7080 | LIBS="-lrpc -lyp -lrpc $LIBS" |
@@ -5263,95 +7083,184 @@ fi | |||
5263 | fi | 7083 | fi |
5264 | fi | 7084 | fi |
5265 | 7085 | ||
7086 | |||
5266 | for ac_func in dirname | 7087 | for ac_func in dirname |
5267 | do | 7088 | do |
5268 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | 7089 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
5269 | echo "$as_me:5269: checking for $ac_func" >&5 | 7090 | echo "$as_me:$LINENO: checking for $ac_func" >&5 |
5270 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | 7091 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 |
5271 | if eval "test \"\${$as_ac_var+set}\" = set"; then | 7092 | if eval "test \"\${$as_ac_var+set}\" = set"; then |
5272 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 7093 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
5273 | else | 7094 | else |
5274 | cat >conftest.$ac_ext <<_ACEOF | 7095 | cat >conftest.$ac_ext <<_ACEOF |
5275 | #line 5275 "configure" | 7096 | /* confdefs.h. */ |
5276 | #include "confdefs.h" | 7097 | _ACEOF |
7098 | cat confdefs.h >>conftest.$ac_ext | ||
7099 | cat >>conftest.$ac_ext <<_ACEOF | ||
7100 | /* end confdefs.h. */ | ||
7101 | /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
7102 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
7103 | #define $ac_func innocuous_$ac_func | ||
7104 | |||
5277 | /* System header to define __stub macros and hopefully few prototypes, | 7105 | /* System header to define __stub macros and hopefully few prototypes, |
5278 | which can conflict with char $ac_func (); below. */ | 7106 | which can conflict with char $ac_func (); below. |
5279 | #include <assert.h> | 7107 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
7108 | <limits.h> exists even on freestanding compilers. */ | ||
7109 | |||
7110 | #ifdef __STDC__ | ||
7111 | # include <limits.h> | ||
7112 | #else | ||
7113 | # include <assert.h> | ||
7114 | #endif | ||
7115 | |||
7116 | #undef $ac_func | ||
7117 | |||
5280 | /* Override any gcc2 internal prototype to avoid an error. */ | 7118 | /* Override any gcc2 internal prototype to avoid an error. */ |
5281 | #ifdef __cplusplus | 7119 | #ifdef __cplusplus |
5282 | extern "C" | 7120 | extern "C" |
7121 | { | ||
5283 | #endif | 7122 | #endif |
5284 | /* We use char because int might match the return type of a gcc2 | 7123 | /* We use char because int might match the return type of a gcc2 |
5285 | builtin and then its argument prototype would still apply. */ | 7124 | builtin and then its argument prototype would still apply. */ |
5286 | char $ac_func (); | 7125 | char $ac_func (); |
5287 | char (*f) (); | ||
5288 | |||
5289 | int | ||
5290 | main () | ||
5291 | { | ||
5292 | /* The GNU C library defines this for functions which it implements | 7126 | /* The GNU C library defines this for functions which it implements |
5293 | to always fail with ENOSYS. Some functions are actually named | 7127 | to always fail with ENOSYS. Some functions are actually named |
5294 | something starting with __ and the normal name is an alias. */ | 7128 | something starting with __ and the normal name is an alias. */ |
5295 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) | 7129 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) |
5296 | choke me | 7130 | choke me |
5297 | #else | 7131 | #else |
5298 | f = $ac_func; | 7132 | char (*f) () = $ac_func; |
7133 | #endif | ||
7134 | #ifdef __cplusplus | ||
7135 | } | ||
5299 | #endif | 7136 | #endif |
5300 | 7137 | ||
7138 | int | ||
7139 | main () | ||
7140 | { | ||
7141 | return f != $ac_func; | ||
5301 | ; | 7142 | ; |
5302 | return 0; | 7143 | return 0; |
5303 | } | 7144 | } |
5304 | _ACEOF | 7145 | _ACEOF |
5305 | rm -f conftest.$ac_objext conftest$ac_exeext | 7146 | rm -f conftest.$ac_objext conftest$ac_exeext |
5306 | if { (eval echo "$as_me:5306: \"$ac_link\"") >&5 | 7147 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
5307 | (eval $ac_link) 2>&5 | 7148 | (eval $ac_link) 2>conftest.er1 |
5308 | ac_status=$? | 7149 | ac_status=$? |
5309 | echo "$as_me:5309: \$? = $ac_status" >&5 | 7150 | grep -v '^ *+' conftest.er1 >conftest.err |
7151 | rm -f conftest.er1 | ||
7152 | cat conftest.err >&5 | ||
7153 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5310 | (exit $ac_status); } && | 7154 | (exit $ac_status); } && |
5311 | { ac_try='test -s conftest$ac_exeext' | 7155 | { ac_try='test -z "$ac_c_werror_flag" |
5312 | { (eval echo "$as_me:5312: \"$ac_try\"") >&5 | 7156 | || test ! -s conftest.err' |
7157 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5313 | (eval $ac_try) 2>&5 | 7158 | (eval $ac_try) 2>&5 |
5314 | ac_status=$? | 7159 | ac_status=$? |
5315 | echo "$as_me:5315: \$? = $ac_status" >&5 | 7160 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
7161 | (exit $ac_status); }; } && | ||
7162 | { ac_try='test -s conftest$ac_exeext' | ||
7163 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7164 | (eval $ac_try) 2>&5 | ||
7165 | ac_status=$? | ||
7166 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5316 | (exit $ac_status); }; }; then | 7167 | (exit $ac_status); }; }; then |
5317 | eval "$as_ac_var=yes" | 7168 | eval "$as_ac_var=yes" |
5318 | else | 7169 | else |
5319 | echo "$as_me: failed program was:" >&5 | 7170 | echo "$as_me: failed program was:" >&5 |
5320 | cat conftest.$ac_ext >&5 | 7171 | sed 's/^/| /' conftest.$ac_ext >&5 |
7172 | |||
5321 | eval "$as_ac_var=no" | 7173 | eval "$as_ac_var=no" |
5322 | fi | 7174 | fi |
5323 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 7175 | rm -f conftest.err conftest.$ac_objext \ |
7176 | conftest$ac_exeext conftest.$ac_ext | ||
5324 | fi | 7177 | fi |
5325 | echo "$as_me:5325: result: `eval echo '${'$as_ac_var'}'`" >&5 | 7178 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 |
5326 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | 7179 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 |
5327 | if test `eval echo '${'$as_ac_var'}'` = yes; then | 7180 | if test `eval echo '${'$as_ac_var'}'` = yes; then |
5328 | cat >>confdefs.h <<EOF | 7181 | cat >>confdefs.h <<_ACEOF |
5329 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 7182 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
5330 | EOF | 7183 | _ACEOF |
5331 | 7184 | ||
5332 | for ac_header in libgen.h | 7185 | for ac_header in libgen.h |
5333 | do | 7186 | do |
5334 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | 7187 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` |
5335 | echo "$as_me:5335: checking for $ac_header" >&5 | 7188 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
7189 | echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
5336 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | 7190 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 |
5337 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | 7191 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
5338 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 7192 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
7193 | fi | ||
7194 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
7195 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
5339 | else | 7196 | else |
5340 | cat >conftest.$ac_ext <<_ACEOF | 7197 | # Is the header compilable? |
5341 | #line 5341 "configure" | 7198 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 |
5342 | #include "confdefs.h" | 7199 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 |
7200 | cat >conftest.$ac_ext <<_ACEOF | ||
7201 | /* confdefs.h. */ | ||
7202 | _ACEOF | ||
7203 | cat confdefs.h >>conftest.$ac_ext | ||
7204 | cat >>conftest.$ac_ext <<_ACEOF | ||
7205 | /* end confdefs.h. */ | ||
7206 | $ac_includes_default | ||
7207 | #include <$ac_header> | ||
7208 | _ACEOF | ||
7209 | rm -f conftest.$ac_objext | ||
7210 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7211 | (eval $ac_compile) 2>conftest.er1 | ||
7212 | ac_status=$? | ||
7213 | grep -v '^ *+' conftest.er1 >conftest.err | ||
7214 | rm -f conftest.er1 | ||
7215 | cat conftest.err >&5 | ||
7216 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7217 | (exit $ac_status); } && | ||
7218 | { ac_try='test -z "$ac_c_werror_flag" | ||
7219 | || test ! -s conftest.err' | ||
7220 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7221 | (eval $ac_try) 2>&5 | ||
7222 | ac_status=$? | ||
7223 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7224 | (exit $ac_status); }; } && | ||
7225 | { ac_try='test -s conftest.$ac_objext' | ||
7226 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7227 | (eval $ac_try) 2>&5 | ||
7228 | ac_status=$? | ||
7229 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7230 | (exit $ac_status); }; }; then | ||
7231 | ac_header_compiler=yes | ||
7232 | else | ||
7233 | echo "$as_me: failed program was:" >&5 | ||
7234 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
7235 | |||
7236 | ac_header_compiler=no | ||
7237 | fi | ||
7238 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7239 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
7240 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
7241 | |||
7242 | # Is the header present? | ||
7243 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
7244 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
7245 | cat >conftest.$ac_ext <<_ACEOF | ||
7246 | /* confdefs.h. */ | ||
7247 | _ACEOF | ||
7248 | cat confdefs.h >>conftest.$ac_ext | ||
7249 | cat >>conftest.$ac_ext <<_ACEOF | ||
7250 | /* end confdefs.h. */ | ||
5343 | #include <$ac_header> | 7251 | #include <$ac_header> |
5344 | _ACEOF | 7252 | _ACEOF |
5345 | if { (eval echo "$as_me:5345: \"$ac_cpp conftest.$ac_ext\"") >&5 | 7253 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 |
5346 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | 7254 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
5347 | ac_status=$? | 7255 | ac_status=$? |
5348 | egrep -v '^ *\+' conftest.er1 >conftest.err | 7256 | grep -v '^ *+' conftest.er1 >conftest.err |
5349 | rm -f conftest.er1 | 7257 | rm -f conftest.er1 |
5350 | cat conftest.err >&5 | 7258 | cat conftest.err >&5 |
5351 | echo "$as_me:5351: \$? = $ac_status" >&5 | 7259 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
5352 | (exit $ac_status); } >/dev/null; then | 7260 | (exit $ac_status); } >/dev/null; then |
5353 | if test -s conftest.err; then | 7261 | if test -s conftest.err; then |
5354 | ac_cpp_err=$ac_c_preproc_warn_flag | 7262 | ac_cpp_err=$ac_c_preproc_warn_flag |
7263 | ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
5355 | else | 7264 | else |
5356 | ac_cpp_err= | 7265 | ac_cpp_err= |
5357 | fi | 7266 | fi |
@@ -5359,27 +7268,72 @@ else | |||
5359 | ac_cpp_err=yes | 7268 | ac_cpp_err=yes |
5360 | fi | 7269 | fi |
5361 | if test -z "$ac_cpp_err"; then | 7270 | if test -z "$ac_cpp_err"; then |
5362 | eval "$as_ac_Header=yes" | 7271 | ac_header_preproc=yes |
5363 | else | 7272 | else |
5364 | echo "$as_me: failed program was:" >&5 | 7273 | echo "$as_me: failed program was:" >&5 |
5365 | cat conftest.$ac_ext >&5 | 7274 | sed 's/^/| /' conftest.$ac_ext >&5 |
5366 | eval "$as_ac_Header=no" | 7275 | |
7276 | ac_header_preproc=no | ||
5367 | fi | 7277 | fi |
5368 | rm -f conftest.err conftest.$ac_ext | 7278 | rm -f conftest.err conftest.$ac_ext |
7279 | echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
7280 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
7281 | |||
7282 | # So? What about this header? | ||
7283 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
7284 | yes:no: ) | ||
7285 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
7286 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
7287 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
7288 | echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
7289 | ac_header_preproc=yes | ||
7290 | ;; | ||
7291 | no:yes:* ) | ||
7292 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
7293 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
7294 | { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
7295 | echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
7296 | { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
7297 | echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
7298 | { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
7299 | echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
7300 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
7301 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
7302 | { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
7303 | echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
7304 | ( | ||
7305 | cat <<\_ASBOX | ||
7306 | ## ------------------------------------------ ## | ||
7307 | ## Report this to the AC_PACKAGE_NAME lists. ## | ||
7308 | ## ------------------------------------------ ## | ||
7309 | _ASBOX | ||
7310 | ) | | ||
7311 | sed "s/^/$as_me: WARNING: /" >&2 | ||
7312 | ;; | ||
7313 | esac | ||
7314 | echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
7315 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | ||
7316 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
7317 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7318 | else | ||
7319 | eval "$as_ac_Header=\$ac_header_preproc" | ||
5369 | fi | 7320 | fi |
5370 | echo "$as_me:5370: result: `eval echo '${'$as_ac_Header'}'`" >&5 | 7321 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 |
5371 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | 7322 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 |
7323 | |||
7324 | fi | ||
5372 | if test `eval echo '${'$as_ac_Header'}'` = yes; then | 7325 | if test `eval echo '${'$as_ac_Header'}'` = yes; then |
5373 | cat >>confdefs.h <<EOF | 7326 | cat >>confdefs.h <<_ACEOF |
5374 | #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 7327 | #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
5375 | EOF | 7328 | _ACEOF |
5376 | 7329 | ||
5377 | fi | 7330 | fi |
7331 | |||
5378 | done | 7332 | done |
5379 | 7333 | ||
5380 | else | 7334 | else |
5381 | 7335 | ||
5382 | echo "$as_me:5382: checking for dirname in -lgen" >&5 | 7336 | echo "$as_me:$LINENO: checking for dirname in -lgen" >&5 |
5383 | echo $ECHO_N "checking for dirname in -lgen... $ECHO_C" >&6 | 7337 | echo $ECHO_N "checking for dirname in -lgen... $ECHO_C" >&6 |
5384 | if test "${ac_cv_lib_gen_dirname+set}" = set; then | 7338 | if test "${ac_cv_lib_gen_dirname+set}" = set; then |
5385 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 7339 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -5387,8 +7341,11 @@ else | |||
5387 | ac_check_lib_save_LIBS=$LIBS | 7341 | ac_check_lib_save_LIBS=$LIBS |
5388 | LIBS="-lgen $LIBS" | 7342 | LIBS="-lgen $LIBS" |
5389 | cat >conftest.$ac_ext <<_ACEOF | 7343 | cat >conftest.$ac_ext <<_ACEOF |
5390 | #line 5390 "configure" | 7344 | /* confdefs.h. */ |
5391 | #include "confdefs.h" | 7345 | _ACEOF |
7346 | cat confdefs.h >>conftest.$ac_ext | ||
7347 | cat >>conftest.$ac_ext <<_ACEOF | ||
7348 | /* end confdefs.h. */ | ||
5392 | 7349 | ||
5393 | /* Override any gcc2 internal prototype to avoid an error. */ | 7350 | /* Override any gcc2 internal prototype to avoid an error. */ |
5394 | #ifdef __cplusplus | 7351 | #ifdef __cplusplus |
@@ -5406,31 +7363,43 @@ dirname (); | |||
5406 | } | 7363 | } |
5407 | _ACEOF | 7364 | _ACEOF |
5408 | rm -f conftest.$ac_objext conftest$ac_exeext | 7365 | rm -f conftest.$ac_objext conftest$ac_exeext |
5409 | if { (eval echo "$as_me:5409: \"$ac_link\"") >&5 | 7366 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
5410 | (eval $ac_link) 2>&5 | 7367 | (eval $ac_link) 2>conftest.er1 |
5411 | ac_status=$? | 7368 | ac_status=$? |
5412 | echo "$as_me:5412: \$? = $ac_status" >&5 | 7369 | grep -v '^ *+' conftest.er1 >conftest.err |
7370 | rm -f conftest.er1 | ||
7371 | cat conftest.err >&5 | ||
7372 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5413 | (exit $ac_status); } && | 7373 | (exit $ac_status); } && |
5414 | { ac_try='test -s conftest$ac_exeext' | 7374 | { ac_try='test -z "$ac_c_werror_flag" |
5415 | { (eval echo "$as_me:5415: \"$ac_try\"") >&5 | 7375 | || test ! -s conftest.err' |
7376 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5416 | (eval $ac_try) 2>&5 | 7377 | (eval $ac_try) 2>&5 |
5417 | ac_status=$? | 7378 | ac_status=$? |
5418 | echo "$as_me:5418: \$? = $ac_status" >&5 | 7379 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
7380 | (exit $ac_status); }; } && | ||
7381 | { ac_try='test -s conftest$ac_exeext' | ||
7382 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7383 | (eval $ac_try) 2>&5 | ||
7384 | ac_status=$? | ||
7385 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5419 | (exit $ac_status); }; }; then | 7386 | (exit $ac_status); }; }; then |
5420 | ac_cv_lib_gen_dirname=yes | 7387 | ac_cv_lib_gen_dirname=yes |
5421 | else | 7388 | else |
5422 | echo "$as_me: failed program was:" >&5 | 7389 | echo "$as_me: failed program was:" >&5 |
5423 | cat conftest.$ac_ext >&5 | 7390 | sed 's/^/| /' conftest.$ac_ext >&5 |
7391 | |||
5424 | ac_cv_lib_gen_dirname=no | 7392 | ac_cv_lib_gen_dirname=no |
5425 | fi | 7393 | fi |
5426 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 7394 | rm -f conftest.err conftest.$ac_objext \ |
7395 | conftest$ac_exeext conftest.$ac_ext | ||
5427 | LIBS=$ac_check_lib_save_LIBS | 7396 | LIBS=$ac_check_lib_save_LIBS |
5428 | fi | 7397 | fi |
5429 | echo "$as_me:5429: result: $ac_cv_lib_gen_dirname" >&5 | 7398 | echo "$as_me:$LINENO: result: $ac_cv_lib_gen_dirname" >&5 |
5430 | echo "${ECHO_T}$ac_cv_lib_gen_dirname" >&6 | 7399 | echo "${ECHO_T}$ac_cv_lib_gen_dirname" >&6 |
5431 | if test $ac_cv_lib_gen_dirname = yes; then | 7400 | if test $ac_cv_lib_gen_dirname = yes; then |
5432 | 7401 | ||
5433 | echo "$as_me:5433: checking for broken dirname" >&5 | 7402 | echo "$as_me:$LINENO: checking for broken dirname" >&5 |
5434 | echo $ECHO_N "checking for broken dirname... $ECHO_C" >&6 | 7403 | echo $ECHO_N "checking for broken dirname... $ECHO_C" >&6 |
5435 | if test "${ac_cv_have_broken_dirname+set}" = set; then | 7404 | if test "${ac_cv_have_broken_dirname+set}" = set; then |
5436 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 7405 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -5439,13 +7408,18 @@ else | |||
5439 | save_LIBS="$LIBS" | 7408 | save_LIBS="$LIBS" |
5440 | LIBS="$LIBS -lgen" | 7409 | LIBS="$LIBS -lgen" |
5441 | if test "$cross_compiling" = yes; then | 7410 | if test "$cross_compiling" = yes; then |
5442 | { { echo "$as_me:5442: error: cannot run test program while cross compiling" >&5 | 7411 | { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
5443 | echo "$as_me: error: cannot run test program while cross compiling" >&2;} | 7412 | See \`config.log' for more details." >&5 |
7413 | echo "$as_me: error: cannot run test program while cross compiling | ||
7414 | See \`config.log' for more details." >&2;} | ||
5444 | { (exit 1); exit 1; }; } | 7415 | { (exit 1); exit 1; }; } |
5445 | else | 7416 | else |
5446 | cat >conftest.$ac_ext <<_ACEOF | 7417 | cat >conftest.$ac_ext <<_ACEOF |
5447 | #line 5447 "configure" | 7418 | /* confdefs.h. */ |
5448 | #include "confdefs.h" | 7419 | _ACEOF |
7420 | cat confdefs.h >>conftest.$ac_ext | ||
7421 | cat >>conftest.$ac_ext <<_ACEOF | ||
7422 | /* end confdefs.h. */ | ||
5449 | 7423 | ||
5450 | #include <libgen.h> | 7424 | #include <libgen.h> |
5451 | #include <string.h> | 7425 | #include <string.h> |
@@ -5464,60 +7438,119 @@ int main(int argc, char **argv) { | |||
5464 | 7438 | ||
5465 | _ACEOF | 7439 | _ACEOF |
5466 | rm -f conftest$ac_exeext | 7440 | rm -f conftest$ac_exeext |
5467 | if { (eval echo "$as_me:5467: \"$ac_link\"") >&5 | 7441 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
5468 | (eval $ac_link) 2>&5 | 7442 | (eval $ac_link) 2>&5 |
5469 | ac_status=$? | 7443 | ac_status=$? |
5470 | echo "$as_me:5470: \$? = $ac_status" >&5 | 7444 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
5471 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | 7445 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
5472 | { (eval echo "$as_me:5472: \"$ac_try\"") >&5 | 7446 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
5473 | (eval $ac_try) 2>&5 | 7447 | (eval $ac_try) 2>&5 |
5474 | ac_status=$? | 7448 | ac_status=$? |
5475 | echo "$as_me:5475: \$? = $ac_status" >&5 | 7449 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
5476 | (exit $ac_status); }; }; then | 7450 | (exit $ac_status); }; }; then |
5477 | ac_cv_have_broken_dirname="no" | 7451 | ac_cv_have_broken_dirname="no" |
5478 | else | 7452 | else |
5479 | echo "$as_me: program exited with status $ac_status" >&5 | 7453 | echo "$as_me: program exited with status $ac_status" >&5 |
5480 | echo "$as_me: failed program was:" >&5 | 7454 | echo "$as_me: failed program was:" >&5 |
5481 | cat conftest.$ac_ext >&5 | 7455 | sed 's/^/| /' conftest.$ac_ext >&5 |
7456 | |||
7457 | ( exit $ac_status ) | ||
5482 | ac_cv_have_broken_dirname="yes" | 7458 | ac_cv_have_broken_dirname="yes" |
5483 | 7459 | ||
5484 | fi | 7460 | fi |
5485 | rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | 7461 | rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext |
5486 | fi | 7462 | fi |
5487 | LIBS="$save_LIBS" | 7463 | LIBS="$save_LIBS" |
5488 | 7464 | ||
5489 | fi | 7465 | fi |
5490 | echo "$as_me:5490: result: $ac_cv_have_broken_dirname" >&5 | 7466 | echo "$as_me:$LINENO: result: $ac_cv_have_broken_dirname" >&5 |
5491 | echo "${ECHO_T}$ac_cv_have_broken_dirname" >&6 | 7467 | echo "${ECHO_T}$ac_cv_have_broken_dirname" >&6 |
5492 | if test "x$ac_cv_have_broken_dirname" = "xno" ; then | 7468 | if test "x$ac_cv_have_broken_dirname" = "xno" ; then |
5493 | LIBS="$LIBS -lgen" | 7469 | LIBS="$LIBS -lgen" |
5494 | cat >>confdefs.h <<\EOF | 7470 | cat >>confdefs.h <<\_ACEOF |
5495 | #define HAVE_DIRNAME 1 | 7471 | #define HAVE_DIRNAME 1 |
5496 | EOF | 7472 | _ACEOF |
7473 | |||
5497 | 7474 | ||
5498 | for ac_header in libgen.h | 7475 | for ac_header in libgen.h |
5499 | do | 7476 | do |
5500 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | 7477 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` |
5501 | echo "$as_me:5501: checking for $ac_header" >&5 | 7478 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
7479 | echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
5502 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | 7480 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 |
5503 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | 7481 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
5504 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 7482 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
7483 | fi | ||
7484 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
7485 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
5505 | else | 7486 | else |
5506 | cat >conftest.$ac_ext <<_ACEOF | 7487 | # Is the header compilable? |
5507 | #line 5507 "configure" | 7488 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 |
5508 | #include "confdefs.h" | 7489 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 |
7490 | cat >conftest.$ac_ext <<_ACEOF | ||
7491 | /* confdefs.h. */ | ||
7492 | _ACEOF | ||
7493 | cat confdefs.h >>conftest.$ac_ext | ||
7494 | cat >>conftest.$ac_ext <<_ACEOF | ||
7495 | /* end confdefs.h. */ | ||
7496 | $ac_includes_default | ||
5509 | #include <$ac_header> | 7497 | #include <$ac_header> |
5510 | _ACEOF | 7498 | _ACEOF |
5511 | if { (eval echo "$as_me:5511: \"$ac_cpp conftest.$ac_ext\"") >&5 | 7499 | rm -f conftest.$ac_objext |
7500 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
7501 | (eval $ac_compile) 2>conftest.er1 | ||
7502 | ac_status=$? | ||
7503 | grep -v '^ *+' conftest.er1 >conftest.err | ||
7504 | rm -f conftest.er1 | ||
7505 | cat conftest.err >&5 | ||
7506 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7507 | (exit $ac_status); } && | ||
7508 | { ac_try='test -z "$ac_c_werror_flag" | ||
7509 | || test ! -s conftest.err' | ||
7510 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7511 | (eval $ac_try) 2>&5 | ||
7512 | ac_status=$? | ||
7513 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7514 | (exit $ac_status); }; } && | ||
7515 | { ac_try='test -s conftest.$ac_objext' | ||
7516 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7517 | (eval $ac_try) 2>&5 | ||
7518 | ac_status=$? | ||
7519 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7520 | (exit $ac_status); }; }; then | ||
7521 | ac_header_compiler=yes | ||
7522 | else | ||
7523 | echo "$as_me: failed program was:" >&5 | ||
7524 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
7525 | |||
7526 | ac_header_compiler=no | ||
7527 | fi | ||
7528 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
7529 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
7530 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
7531 | |||
7532 | # Is the header present? | ||
7533 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
7534 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
7535 | cat >conftest.$ac_ext <<_ACEOF | ||
7536 | /* confdefs.h. */ | ||
7537 | _ACEOF | ||
7538 | cat confdefs.h >>conftest.$ac_ext | ||
7539 | cat >>conftest.$ac_ext <<_ACEOF | ||
7540 | /* end confdefs.h. */ | ||
7541 | #include <$ac_header> | ||
7542 | _ACEOF | ||
7543 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
5512 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | 7544 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
5513 | ac_status=$? | 7545 | ac_status=$? |
5514 | egrep -v '^ *\+' conftest.er1 >conftest.err | 7546 | grep -v '^ *+' conftest.er1 >conftest.err |
5515 | rm -f conftest.er1 | 7547 | rm -f conftest.er1 |
5516 | cat conftest.err >&5 | 7548 | cat conftest.err >&5 |
5517 | echo "$as_me:5517: \$? = $ac_status" >&5 | 7549 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
5518 | (exit $ac_status); } >/dev/null; then | 7550 | (exit $ac_status); } >/dev/null; then |
5519 | if test -s conftest.err; then | 7551 | if test -s conftest.err; then |
5520 | ac_cpp_err=$ac_c_preproc_warn_flag | 7552 | ac_cpp_err=$ac_c_preproc_warn_flag |
7553 | ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
5521 | else | 7554 | else |
5522 | ac_cpp_err= | 7555 | ac_cpp_err= |
5523 | fi | 7556 | fi |
@@ -5525,93 +7558,172 @@ else | |||
5525 | ac_cpp_err=yes | 7558 | ac_cpp_err=yes |
5526 | fi | 7559 | fi |
5527 | if test -z "$ac_cpp_err"; then | 7560 | if test -z "$ac_cpp_err"; then |
5528 | eval "$as_ac_Header=yes" | 7561 | ac_header_preproc=yes |
5529 | else | 7562 | else |
5530 | echo "$as_me: failed program was:" >&5 | 7563 | echo "$as_me: failed program was:" >&5 |
5531 | cat conftest.$ac_ext >&5 | 7564 | sed 's/^/| /' conftest.$ac_ext >&5 |
5532 | eval "$as_ac_Header=no" | 7565 | |
7566 | ac_header_preproc=no | ||
5533 | fi | 7567 | fi |
5534 | rm -f conftest.err conftest.$ac_ext | 7568 | rm -f conftest.err conftest.$ac_ext |
7569 | echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
7570 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
7571 | |||
7572 | # So? What about this header? | ||
7573 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
7574 | yes:no: ) | ||
7575 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
7576 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
7577 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
7578 | echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
7579 | ac_header_preproc=yes | ||
7580 | ;; | ||
7581 | no:yes:* ) | ||
7582 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
7583 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
7584 | { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
7585 | echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
7586 | { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
7587 | echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
7588 | { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
7589 | echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
7590 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
7591 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
7592 | { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
7593 | echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
7594 | ( | ||
7595 | cat <<\_ASBOX | ||
7596 | ## ------------------------------------------ ## | ||
7597 | ## Report this to the AC_PACKAGE_NAME lists. ## | ||
7598 | ## ------------------------------------------ ## | ||
7599 | _ASBOX | ||
7600 | ) | | ||
7601 | sed "s/^/$as_me: WARNING: /" >&2 | ||
7602 | ;; | ||
7603 | esac | ||
7604 | echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
7605 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | ||
7606 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
7607 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7608 | else | ||
7609 | eval "$as_ac_Header=\$ac_header_preproc" | ||
5535 | fi | 7610 | fi |
5536 | echo "$as_me:5536: result: `eval echo '${'$as_ac_Header'}'`" >&5 | 7611 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 |
5537 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | 7612 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 |
7613 | |||
7614 | fi | ||
5538 | if test `eval echo '${'$as_ac_Header'}'` = yes; then | 7615 | if test `eval echo '${'$as_ac_Header'}'` = yes; then |
5539 | cat >>confdefs.h <<EOF | 7616 | cat >>confdefs.h <<_ACEOF |
5540 | #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 7617 | #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
5541 | EOF | 7618 | _ACEOF |
5542 | 7619 | ||
5543 | fi | 7620 | fi |
7621 | |||
5544 | done | 7622 | done |
5545 | 7623 | ||
5546 | fi | 7624 | fi |
5547 | 7625 | ||
5548 | fi | 7626 | fi |
5549 | 7627 | ||
7628 | |||
5550 | fi | 7629 | fi |
5551 | done | 7630 | done |
5552 | 7631 | ||
5553 | echo "$as_me:5553: checking for getspnam" >&5 | 7632 | |
7633 | echo "$as_me:$LINENO: checking for getspnam" >&5 | ||
5554 | echo $ECHO_N "checking for getspnam... $ECHO_C" >&6 | 7634 | echo $ECHO_N "checking for getspnam... $ECHO_C" >&6 |
5555 | if test "${ac_cv_func_getspnam+set}" = set; then | 7635 | if test "${ac_cv_func_getspnam+set}" = set; then |
5556 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 7636 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
5557 | else | 7637 | else |
5558 | cat >conftest.$ac_ext <<_ACEOF | 7638 | cat >conftest.$ac_ext <<_ACEOF |
5559 | #line 5559 "configure" | 7639 | /* confdefs.h. */ |
5560 | #include "confdefs.h" | 7640 | _ACEOF |
7641 | cat confdefs.h >>conftest.$ac_ext | ||
7642 | cat >>conftest.$ac_ext <<_ACEOF | ||
7643 | /* end confdefs.h. */ | ||
7644 | /* Define getspnam to an innocuous variant, in case <limits.h> declares getspnam. | ||
7645 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
7646 | #define getspnam innocuous_getspnam | ||
7647 | |||
5561 | /* System header to define __stub macros and hopefully few prototypes, | 7648 | /* System header to define __stub macros and hopefully few prototypes, |
5562 | which can conflict with char getspnam (); below. */ | 7649 | which can conflict with char getspnam (); below. |
5563 | #include <assert.h> | 7650 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
7651 | <limits.h> exists even on freestanding compilers. */ | ||
7652 | |||
7653 | #ifdef __STDC__ | ||
7654 | # include <limits.h> | ||
7655 | #else | ||
7656 | # include <assert.h> | ||
7657 | #endif | ||
7658 | |||
7659 | #undef getspnam | ||
7660 | |||
5564 | /* Override any gcc2 internal prototype to avoid an error. */ | 7661 | /* Override any gcc2 internal prototype to avoid an error. */ |
5565 | #ifdef __cplusplus | 7662 | #ifdef __cplusplus |
5566 | extern "C" | 7663 | extern "C" |
7664 | { | ||
5567 | #endif | 7665 | #endif |
5568 | /* We use char because int might match the return type of a gcc2 | 7666 | /* We use char because int might match the return type of a gcc2 |
5569 | builtin and then its argument prototype would still apply. */ | 7667 | builtin and then its argument prototype would still apply. */ |
5570 | char getspnam (); | 7668 | char getspnam (); |
5571 | char (*f) (); | ||
5572 | |||
5573 | int | ||
5574 | main () | ||
5575 | { | ||
5576 | /* The GNU C library defines this for functions which it implements | 7669 | /* The GNU C library defines this for functions which it implements |
5577 | to always fail with ENOSYS. Some functions are actually named | 7670 | to always fail with ENOSYS. Some functions are actually named |
5578 | something starting with __ and the normal name is an alias. */ | 7671 | something starting with __ and the normal name is an alias. */ |
5579 | #if defined (__stub_getspnam) || defined (__stub___getspnam) | 7672 | #if defined (__stub_getspnam) || defined (__stub___getspnam) |
5580 | choke me | 7673 | choke me |
5581 | #else | 7674 | #else |
5582 | f = getspnam; | 7675 | char (*f) () = getspnam; |
7676 | #endif | ||
7677 | #ifdef __cplusplus | ||
7678 | } | ||
5583 | #endif | 7679 | #endif |
5584 | 7680 | ||
7681 | int | ||
7682 | main () | ||
7683 | { | ||
7684 | return f != getspnam; | ||
5585 | ; | 7685 | ; |
5586 | return 0; | 7686 | return 0; |
5587 | } | 7687 | } |
5588 | _ACEOF | 7688 | _ACEOF |
5589 | rm -f conftest.$ac_objext conftest$ac_exeext | 7689 | rm -f conftest.$ac_objext conftest$ac_exeext |
5590 | if { (eval echo "$as_me:5590: \"$ac_link\"") >&5 | 7690 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
5591 | (eval $ac_link) 2>&5 | 7691 | (eval $ac_link) 2>conftest.er1 |
5592 | ac_status=$? | 7692 | ac_status=$? |
5593 | echo "$as_me:5593: \$? = $ac_status" >&5 | 7693 | grep -v '^ *+' conftest.er1 >conftest.err |
7694 | rm -f conftest.er1 | ||
7695 | cat conftest.err >&5 | ||
7696 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5594 | (exit $ac_status); } && | 7697 | (exit $ac_status); } && |
5595 | { ac_try='test -s conftest$ac_exeext' | 7698 | { ac_try='test -z "$ac_c_werror_flag" |
5596 | { (eval echo "$as_me:5596: \"$ac_try\"") >&5 | 7699 | || test ! -s conftest.err' |
7700 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5597 | (eval $ac_try) 2>&5 | 7701 | (eval $ac_try) 2>&5 |
5598 | ac_status=$? | 7702 | ac_status=$? |
5599 | echo "$as_me:5599: \$? = $ac_status" >&5 | 7703 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
7704 | (exit $ac_status); }; } && | ||
7705 | { ac_try='test -s conftest$ac_exeext' | ||
7706 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7707 | (eval $ac_try) 2>&5 | ||
7708 | ac_status=$? | ||
7709 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5600 | (exit $ac_status); }; }; then | 7710 | (exit $ac_status); }; }; then |
5601 | ac_cv_func_getspnam=yes | 7711 | ac_cv_func_getspnam=yes |
5602 | else | 7712 | else |
5603 | echo "$as_me: failed program was:" >&5 | 7713 | echo "$as_me: failed program was:" >&5 |
5604 | cat conftest.$ac_ext >&5 | 7714 | sed 's/^/| /' conftest.$ac_ext >&5 |
7715 | |||
5605 | ac_cv_func_getspnam=no | 7716 | ac_cv_func_getspnam=no |
5606 | fi | 7717 | fi |
5607 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 7718 | rm -f conftest.err conftest.$ac_objext \ |
7719 | conftest$ac_exeext conftest.$ac_ext | ||
5608 | fi | 7720 | fi |
5609 | echo "$as_me:5609: result: $ac_cv_func_getspnam" >&5 | 7721 | echo "$as_me:$LINENO: result: $ac_cv_func_getspnam" >&5 |
5610 | echo "${ECHO_T}$ac_cv_func_getspnam" >&6 | 7722 | echo "${ECHO_T}$ac_cv_func_getspnam" >&6 |
5611 | if test $ac_cv_func_getspnam = yes; then | 7723 | if test $ac_cv_func_getspnam = yes; then |
5612 | : | 7724 | : |
5613 | else | 7725 | else |
5614 | echo "$as_me:5614: checking for getspnam in -lgen" >&5 | 7726 | echo "$as_me:$LINENO: checking for getspnam in -lgen" >&5 |
5615 | echo $ECHO_N "checking for getspnam in -lgen... $ECHO_C" >&6 | 7727 | echo $ECHO_N "checking for getspnam in -lgen... $ECHO_C" >&6 |
5616 | if test "${ac_cv_lib_gen_getspnam+set}" = set; then | 7728 | if test "${ac_cv_lib_gen_getspnam+set}" = set; then |
5617 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 7729 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -5619,8 +7731,11 @@ else | |||
5619 | ac_check_lib_save_LIBS=$LIBS | 7731 | ac_check_lib_save_LIBS=$LIBS |
5620 | LIBS="-lgen $LIBS" | 7732 | LIBS="-lgen $LIBS" |
5621 | cat >conftest.$ac_ext <<_ACEOF | 7733 | cat >conftest.$ac_ext <<_ACEOF |
5622 | #line 5622 "configure" | 7734 | /* confdefs.h. */ |
5623 | #include "confdefs.h" | 7735 | _ACEOF |
7736 | cat confdefs.h >>conftest.$ac_ext | ||
7737 | cat >>conftest.$ac_ext <<_ACEOF | ||
7738 | /* end confdefs.h. */ | ||
5624 | 7739 | ||
5625 | /* Override any gcc2 internal prototype to avoid an error. */ | 7740 | /* Override any gcc2 internal prototype to avoid an error. */ |
5626 | #ifdef __cplusplus | 7741 | #ifdef __cplusplus |
@@ -5638,27 +7753,39 @@ getspnam (); | |||
5638 | } | 7753 | } |
5639 | _ACEOF | 7754 | _ACEOF |
5640 | rm -f conftest.$ac_objext conftest$ac_exeext | 7755 | rm -f conftest.$ac_objext conftest$ac_exeext |
5641 | if { (eval echo "$as_me:5641: \"$ac_link\"") >&5 | 7756 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
5642 | (eval $ac_link) 2>&5 | 7757 | (eval $ac_link) 2>conftest.er1 |
5643 | ac_status=$? | 7758 | ac_status=$? |
5644 | echo "$as_me:5644: \$? = $ac_status" >&5 | 7759 | grep -v '^ *+' conftest.er1 >conftest.err |
7760 | rm -f conftest.er1 | ||
7761 | cat conftest.err >&5 | ||
7762 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5645 | (exit $ac_status); } && | 7763 | (exit $ac_status); } && |
5646 | { ac_try='test -s conftest$ac_exeext' | 7764 | { ac_try='test -z "$ac_c_werror_flag" |
5647 | { (eval echo "$as_me:5647: \"$ac_try\"") >&5 | 7765 | || test ! -s conftest.err' |
7766 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5648 | (eval $ac_try) 2>&5 | 7767 | (eval $ac_try) 2>&5 |
5649 | ac_status=$? | 7768 | ac_status=$? |
5650 | echo "$as_me:5650: \$? = $ac_status" >&5 | 7769 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
7770 | (exit $ac_status); }; } && | ||
7771 | { ac_try='test -s conftest$ac_exeext' | ||
7772 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7773 | (eval $ac_try) 2>&5 | ||
7774 | ac_status=$? | ||
7775 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5651 | (exit $ac_status); }; }; then | 7776 | (exit $ac_status); }; }; then |
5652 | ac_cv_lib_gen_getspnam=yes | 7777 | ac_cv_lib_gen_getspnam=yes |
5653 | else | 7778 | else |
5654 | echo "$as_me: failed program was:" >&5 | 7779 | echo "$as_me: failed program was:" >&5 |
5655 | cat conftest.$ac_ext >&5 | 7780 | sed 's/^/| /' conftest.$ac_ext >&5 |
7781 | |||
5656 | ac_cv_lib_gen_getspnam=no | 7782 | ac_cv_lib_gen_getspnam=no |
5657 | fi | 7783 | fi |
5658 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 7784 | rm -f conftest.err conftest.$ac_objext \ |
7785 | conftest$ac_exeext conftest.$ac_ext | ||
5659 | LIBS=$ac_check_lib_save_LIBS | 7786 | LIBS=$ac_check_lib_save_LIBS |
5660 | fi | 7787 | fi |
5661 | echo "$as_me:5661: result: $ac_cv_lib_gen_getspnam" >&5 | 7788 | echo "$as_me:$LINENO: result: $ac_cv_lib_gen_getspnam" >&5 |
5662 | echo "${ECHO_T}$ac_cv_lib_gen_getspnam" >&6 | 7789 | echo "${ECHO_T}$ac_cv_lib_gen_getspnam" >&6 |
5663 | if test $ac_cv_lib_gen_getspnam = yes; then | 7790 | if test $ac_cv_lib_gen_getspnam = yes; then |
5664 | LIBS="$LIBS -lgen" | 7791 | LIBS="$LIBS -lgen" |
@@ -5666,7 +7793,7 @@ fi | |||
5666 | 7793 | ||
5667 | fi | 7794 | fi |
5668 | 7795 | ||
5669 | echo "$as_me:5669: checking for library containing basename" >&5 | 7796 | echo "$as_me:$LINENO: checking for library containing basename" >&5 |
5670 | echo $ECHO_N "checking for library containing basename... $ECHO_C" >&6 | 7797 | echo $ECHO_N "checking for library containing basename... $ECHO_C" >&6 |
5671 | if test "${ac_cv_search_basename+set}" = set; then | 7798 | if test "${ac_cv_search_basename+set}" = set; then |
5672 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 7799 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -5674,8 +7801,11 @@ else | |||
5674 | ac_func_search_save_LIBS=$LIBS | 7801 | ac_func_search_save_LIBS=$LIBS |
5675 | ac_cv_search_basename=no | 7802 | ac_cv_search_basename=no |
5676 | cat >conftest.$ac_ext <<_ACEOF | 7803 | cat >conftest.$ac_ext <<_ACEOF |
5677 | #line 5677 "configure" | 7804 | /* confdefs.h. */ |
5678 | #include "confdefs.h" | 7805 | _ACEOF |
7806 | cat confdefs.h >>conftest.$ac_ext | ||
7807 | cat >>conftest.$ac_ext <<_ACEOF | ||
7808 | /* end confdefs.h. */ | ||
5679 | 7809 | ||
5680 | /* Override any gcc2 internal prototype to avoid an error. */ | 7810 | /* Override any gcc2 internal prototype to avoid an error. */ |
5681 | #ifdef __cplusplus | 7811 | #ifdef __cplusplus |
@@ -5693,29 +7823,44 @@ basename (); | |||
5693 | } | 7823 | } |
5694 | _ACEOF | 7824 | _ACEOF |
5695 | rm -f conftest.$ac_objext conftest$ac_exeext | 7825 | rm -f conftest.$ac_objext conftest$ac_exeext |
5696 | if { (eval echo "$as_me:5696: \"$ac_link\"") >&5 | 7826 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
5697 | (eval $ac_link) 2>&5 | 7827 | (eval $ac_link) 2>conftest.er1 |
5698 | ac_status=$? | 7828 | ac_status=$? |
5699 | echo "$as_me:5699: \$? = $ac_status" >&5 | 7829 | grep -v '^ *+' conftest.er1 >conftest.err |
7830 | rm -f conftest.er1 | ||
7831 | cat conftest.err >&5 | ||
7832 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5700 | (exit $ac_status); } && | 7833 | (exit $ac_status); } && |
5701 | { ac_try='test -s conftest$ac_exeext' | 7834 | { ac_try='test -z "$ac_c_werror_flag" |
5702 | { (eval echo "$as_me:5702: \"$ac_try\"") >&5 | 7835 | || test ! -s conftest.err' |
7836 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5703 | (eval $ac_try) 2>&5 | 7837 | (eval $ac_try) 2>&5 |
5704 | ac_status=$? | 7838 | ac_status=$? |
5705 | echo "$as_me:5705: \$? = $ac_status" >&5 | 7839 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
7840 | (exit $ac_status); }; } && | ||
7841 | { ac_try='test -s conftest$ac_exeext' | ||
7842 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7843 | (eval $ac_try) 2>&5 | ||
7844 | ac_status=$? | ||
7845 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5706 | (exit $ac_status); }; }; then | 7846 | (exit $ac_status); }; }; then |
5707 | ac_cv_search_basename="none required" | 7847 | ac_cv_search_basename="none required" |
5708 | else | 7848 | else |
5709 | echo "$as_me: failed program was:" >&5 | 7849 | echo "$as_me: failed program was:" >&5 |
5710 | cat conftest.$ac_ext >&5 | 7850 | sed 's/^/| /' conftest.$ac_ext >&5 |
7851 | |||
5711 | fi | 7852 | fi |
5712 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 7853 | rm -f conftest.err conftest.$ac_objext \ |
7854 | conftest$ac_exeext conftest.$ac_ext | ||
5713 | if test "$ac_cv_search_basename" = no; then | 7855 | if test "$ac_cv_search_basename" = no; then |
5714 | for ac_lib in gen; do | 7856 | for ac_lib in gen; do |
5715 | LIBS="-l$ac_lib $ac_func_search_save_LIBS" | 7857 | LIBS="-l$ac_lib $ac_func_search_save_LIBS" |
5716 | cat >conftest.$ac_ext <<_ACEOF | 7858 | cat >conftest.$ac_ext <<_ACEOF |
5717 | #line 5717 "configure" | 7859 | /* confdefs.h. */ |
5718 | #include "confdefs.h" | 7860 | _ACEOF |
7861 | cat confdefs.h >>conftest.$ac_ext | ||
7862 | cat >>conftest.$ac_ext <<_ACEOF | ||
7863 | /* end confdefs.h. */ | ||
5719 | 7864 | ||
5720 | /* Override any gcc2 internal prototype to avoid an error. */ | 7865 | /* Override any gcc2 internal prototype to avoid an error. */ |
5721 | #ifdef __cplusplus | 7866 | #ifdef __cplusplus |
@@ -5733,44 +7878,58 @@ basename (); | |||
5733 | } | 7878 | } |
5734 | _ACEOF | 7879 | _ACEOF |
5735 | rm -f conftest.$ac_objext conftest$ac_exeext | 7880 | rm -f conftest.$ac_objext conftest$ac_exeext |
5736 | if { (eval echo "$as_me:5736: \"$ac_link\"") >&5 | 7881 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
5737 | (eval $ac_link) 2>&5 | 7882 | (eval $ac_link) 2>conftest.er1 |
5738 | ac_status=$? | 7883 | ac_status=$? |
5739 | echo "$as_me:5739: \$? = $ac_status" >&5 | 7884 | grep -v '^ *+' conftest.er1 >conftest.err |
7885 | rm -f conftest.er1 | ||
7886 | cat conftest.err >&5 | ||
7887 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5740 | (exit $ac_status); } && | 7888 | (exit $ac_status); } && |
5741 | { ac_try='test -s conftest$ac_exeext' | 7889 | { ac_try='test -z "$ac_c_werror_flag" |
5742 | { (eval echo "$as_me:5742: \"$ac_try\"") >&5 | 7890 | || test ! -s conftest.err' |
7891 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5743 | (eval $ac_try) 2>&5 | 7892 | (eval $ac_try) 2>&5 |
5744 | ac_status=$? | 7893 | ac_status=$? |
5745 | echo "$as_me:5745: \$? = $ac_status" >&5 | 7894 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
7895 | (exit $ac_status); }; } && | ||
7896 | { ac_try='test -s conftest$ac_exeext' | ||
7897 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7898 | (eval $ac_try) 2>&5 | ||
7899 | ac_status=$? | ||
7900 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5746 | (exit $ac_status); }; }; then | 7901 | (exit $ac_status); }; }; then |
5747 | ac_cv_search_basename="-l$ac_lib" | 7902 | ac_cv_search_basename="-l$ac_lib" |
5748 | break | 7903 | break |
5749 | else | 7904 | else |
5750 | echo "$as_me: failed program was:" >&5 | 7905 | echo "$as_me: failed program was:" >&5 |
5751 | cat conftest.$ac_ext >&5 | 7906 | sed 's/^/| /' conftest.$ac_ext >&5 |
7907 | |||
5752 | fi | 7908 | fi |
5753 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 7909 | rm -f conftest.err conftest.$ac_objext \ |
7910 | conftest$ac_exeext conftest.$ac_ext | ||
5754 | done | 7911 | done |
5755 | fi | 7912 | fi |
5756 | LIBS=$ac_func_search_save_LIBS | 7913 | LIBS=$ac_func_search_save_LIBS |
5757 | fi | 7914 | fi |
5758 | echo "$as_me:5758: result: $ac_cv_search_basename" >&5 | 7915 | echo "$as_me:$LINENO: result: $ac_cv_search_basename" >&5 |
5759 | echo "${ECHO_T}$ac_cv_search_basename" >&6 | 7916 | echo "${ECHO_T}$ac_cv_search_basename" >&6 |
5760 | if test "$ac_cv_search_basename" != no; then | 7917 | if test "$ac_cv_search_basename" != no; then |
5761 | test "$ac_cv_search_basename" = "none required" || LIBS="$ac_cv_search_basename $LIBS" | 7918 | test "$ac_cv_search_basename" = "none required" || LIBS="$ac_cv_search_basename $LIBS" |
5762 | cat >>confdefs.h <<\EOF | 7919 | cat >>confdefs.h <<\_ACEOF |
5763 | #define HAVE_BASENAME 1 | 7920 | #define HAVE_BASENAME 1 |
5764 | EOF | 7921 | _ACEOF |
5765 | 7922 | ||
5766 | fi | 7923 | fi |
5767 | 7924 | ||
7925 | |||
7926 | |||
5768 | # Check whether --with-zlib or --without-zlib was given. | 7927 | # Check whether --with-zlib or --without-zlib was given. |
5769 | if test "${with_zlib+set}" = set; then | 7928 | if test "${with_zlib+set}" = set; then |
5770 | withval="$with_zlib" | 7929 | withval="$with_zlib" |
5771 | 7930 | ||
5772 | if test "x$withval" = "xno" ; then | 7931 | if test "x$withval" = "xno" ; then |
5773 | { { echo "$as_me:5773: error: *** zlib is required ***" >&5 | 7932 | { { echo "$as_me:$LINENO: error: *** zlib is required ***" >&5 |
5774 | echo "$as_me: error: *** zlib is required ***" >&2;} | 7933 | echo "$as_me: error: *** zlib is required ***" >&2;} |
5775 | { (exit 1); exit 1; }; } | 7934 | { (exit 1); exit 1; }; } |
5776 | fi | 7935 | fi |
@@ -5793,9 +7952,11 @@ echo "$as_me: error: *** zlib is required ***" >&2;} | |||
5793 | CPPFLAGS="-I${withval} ${CPPFLAGS}" | 7952 | CPPFLAGS="-I${withval} ${CPPFLAGS}" |
5794 | fi | 7953 | fi |
5795 | 7954 | ||
7955 | |||
5796 | fi; | 7956 | fi; |
5797 | 7957 | ||
5798 | echo "$as_me:5798: checking for deflate in -lz" >&5 | 7958 | |
7959 | echo "$as_me:$LINENO: checking for deflate in -lz" >&5 | ||
5799 | echo $ECHO_N "checking for deflate in -lz... $ECHO_C" >&6 | 7960 | echo $ECHO_N "checking for deflate in -lz... $ECHO_C" >&6 |
5800 | if test "${ac_cv_lib_z_deflate+set}" = set; then | 7961 | if test "${ac_cv_lib_z_deflate+set}" = set; then |
5801 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 7962 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -5803,8 +7964,11 @@ else | |||
5803 | ac_check_lib_save_LIBS=$LIBS | 7964 | ac_check_lib_save_LIBS=$LIBS |
5804 | LIBS="-lz $LIBS" | 7965 | LIBS="-lz $LIBS" |
5805 | cat >conftest.$ac_ext <<_ACEOF | 7966 | cat >conftest.$ac_ext <<_ACEOF |
5806 | #line 5806 "configure" | 7967 | /* confdefs.h. */ |
5807 | #include "confdefs.h" | 7968 | _ACEOF |
7969 | cat confdefs.h >>conftest.$ac_ext | ||
7970 | cat >>conftest.$ac_ext <<_ACEOF | ||
7971 | /* end confdefs.h. */ | ||
5808 | 7972 | ||
5809 | /* Override any gcc2 internal prototype to avoid an error. */ | 7973 | /* Override any gcc2 internal prototype to avoid an error. */ |
5810 | #ifdef __cplusplus | 7974 | #ifdef __cplusplus |
@@ -5822,32 +7986,44 @@ deflate (); | |||
5822 | } | 7986 | } |
5823 | _ACEOF | 7987 | _ACEOF |
5824 | rm -f conftest.$ac_objext conftest$ac_exeext | 7988 | rm -f conftest.$ac_objext conftest$ac_exeext |
5825 | if { (eval echo "$as_me:5825: \"$ac_link\"") >&5 | 7989 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
5826 | (eval $ac_link) 2>&5 | 7990 | (eval $ac_link) 2>conftest.er1 |
5827 | ac_status=$? | 7991 | ac_status=$? |
5828 | echo "$as_me:5828: \$? = $ac_status" >&5 | 7992 | grep -v '^ *+' conftest.er1 >conftest.err |
7993 | rm -f conftest.er1 | ||
7994 | cat conftest.err >&5 | ||
7995 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5829 | (exit $ac_status); } && | 7996 | (exit $ac_status); } && |
5830 | { ac_try='test -s conftest$ac_exeext' | 7997 | { ac_try='test -z "$ac_c_werror_flag" |
5831 | { (eval echo "$as_me:5831: \"$ac_try\"") >&5 | 7998 | || test ! -s conftest.err' |
7999 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5832 | (eval $ac_try) 2>&5 | 8000 | (eval $ac_try) 2>&5 |
5833 | ac_status=$? | 8001 | ac_status=$? |
5834 | echo "$as_me:5834: \$? = $ac_status" >&5 | 8002 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
8003 | (exit $ac_status); }; } && | ||
8004 | { ac_try='test -s conftest$ac_exeext' | ||
8005 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8006 | (eval $ac_try) 2>&5 | ||
8007 | ac_status=$? | ||
8008 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5835 | (exit $ac_status); }; }; then | 8009 | (exit $ac_status); }; }; then |
5836 | ac_cv_lib_z_deflate=yes | 8010 | ac_cv_lib_z_deflate=yes |
5837 | else | 8011 | else |
5838 | echo "$as_me: failed program was:" >&5 | 8012 | echo "$as_me: failed program was:" >&5 |
5839 | cat conftest.$ac_ext >&5 | 8013 | sed 's/^/| /' conftest.$ac_ext >&5 |
8014 | |||
5840 | ac_cv_lib_z_deflate=no | 8015 | ac_cv_lib_z_deflate=no |
5841 | fi | 8016 | fi |
5842 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 8017 | rm -f conftest.err conftest.$ac_objext \ |
8018 | conftest$ac_exeext conftest.$ac_ext | ||
5843 | LIBS=$ac_check_lib_save_LIBS | 8019 | LIBS=$ac_check_lib_save_LIBS |
5844 | fi | 8020 | fi |
5845 | echo "$as_me:5845: result: $ac_cv_lib_z_deflate" >&5 | 8021 | echo "$as_me:$LINENO: result: $ac_cv_lib_z_deflate" >&5 |
5846 | echo "${ECHO_T}$ac_cv_lib_z_deflate" >&6 | 8022 | echo "${ECHO_T}$ac_cv_lib_z_deflate" >&6 |
5847 | if test $ac_cv_lib_z_deflate = yes; then | 8023 | if test $ac_cv_lib_z_deflate = yes; then |
5848 | cat >>confdefs.h <<EOF | 8024 | cat >>confdefs.h <<_ACEOF |
5849 | #define HAVE_LIBZ 1 | 8025 | #define HAVE_LIBZ 1 |
5850 | EOF | 8026 | _ACEOF |
5851 | 8027 | ||
5852 | LIBS="-lz $LIBS" | 8028 | LIBS="-lz $LIBS" |
5853 | 8029 | ||
@@ -5864,8 +8040,11 @@ else | |||
5864 | CPPFLAGS="-I/usr/local/include ${saved_CPPFLAGS}" | 8040 | CPPFLAGS="-I/usr/local/include ${saved_CPPFLAGS}" |
5865 | LIBS="$LIBS -lz" | 8041 | LIBS="$LIBS -lz" |
5866 | cat >conftest.$ac_ext <<_ACEOF | 8042 | cat >conftest.$ac_ext <<_ACEOF |
5867 | #line 5867 "configure" | 8043 | /* confdefs.h. */ |
5868 | #include "confdefs.h" | 8044 | _ACEOF |
8045 | cat confdefs.h >>conftest.$ac_ext | ||
8046 | cat >>conftest.$ac_ext <<_ACEOF | ||
8047 | /* end confdefs.h. */ | ||
5869 | 8048 | ||
5870 | /* Override any gcc2 internal prototype to avoid an error. */ | 8049 | /* Override any gcc2 internal prototype to avoid an error. */ |
5871 | #ifdef __cplusplus | 8050 | #ifdef __cplusplus |
@@ -5883,54 +8062,124 @@ deflate (); | |||
5883 | } | 8062 | } |
5884 | _ACEOF | 8063 | _ACEOF |
5885 | rm -f conftest.$ac_objext conftest$ac_exeext | 8064 | rm -f conftest.$ac_objext conftest$ac_exeext |
5886 | if { (eval echo "$as_me:5886: \"$ac_link\"") >&5 | 8065 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
5887 | (eval $ac_link) 2>&5 | 8066 | (eval $ac_link) 2>conftest.er1 |
5888 | ac_status=$? | 8067 | ac_status=$? |
5889 | echo "$as_me:5889: \$? = $ac_status" >&5 | 8068 | grep -v '^ *+' conftest.er1 >conftest.err |
8069 | rm -f conftest.er1 | ||
8070 | cat conftest.err >&5 | ||
8071 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
5890 | (exit $ac_status); } && | 8072 | (exit $ac_status); } && |
5891 | { ac_try='test -s conftest$ac_exeext' | 8073 | { ac_try='test -z "$ac_c_werror_flag" |
5892 | { (eval echo "$as_me:5892: \"$ac_try\"") >&5 | 8074 | || test ! -s conftest.err' |
8075 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8076 | (eval $ac_try) 2>&5 | ||
8077 | ac_status=$? | ||
8078 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8079 | (exit $ac_status); }; } && | ||
8080 | { ac_try='test -s conftest$ac_exeext' | ||
8081 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
5893 | (eval $ac_try) 2>&5 | 8082 | (eval $ac_try) 2>&5 |
5894 | ac_status=$? | 8083 | ac_status=$? |
5895 | echo "$as_me:5895: \$? = $ac_status" >&5 | 8084 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
5896 | (exit $ac_status); }; }; then | 8085 | (exit $ac_status); }; }; then |
5897 | cat >>confdefs.h <<\EOF | 8086 | cat >>confdefs.h <<\_ACEOF |
5898 | #define HAVE_LIBZ 1 | 8087 | #define HAVE_LIBZ 1 |
5899 | EOF | 8088 | _ACEOF |
5900 | 8089 | ||
5901 | else | 8090 | else |
5902 | echo "$as_me: failed program was:" >&5 | 8091 | echo "$as_me: failed program was:" >&5 |
5903 | cat conftest.$ac_ext >&5 | 8092 | sed 's/^/| /' conftest.$ac_ext >&5 |
8093 | |||
5904 | 8094 | ||
5905 | { { echo "$as_me:5905: error: *** zlib missing - please install first or check config.log ***" >&5 | 8095 | { { echo "$as_me:$LINENO: error: *** zlib missing - please install first or check config.log ***" >&5 |
5906 | echo "$as_me: error: *** zlib missing - please install first or check config.log ***" >&2;} | 8096 | echo "$as_me: error: *** zlib missing - please install first or check config.log ***" >&2;} |
5907 | { (exit 1); exit 1; }; } | 8097 | { (exit 1); exit 1; }; } |
5908 | 8098 | ||
8099 | |||
5909 | fi | 8100 | fi |
5910 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 8101 | rm -f conftest.err conftest.$ac_objext \ |
8102 | conftest$ac_exeext conftest.$ac_ext | ||
8103 | |||
5911 | 8104 | ||
5912 | fi | 8105 | fi |
5913 | 8106 | ||
5914 | echo "$as_me:5914: checking for zlib.h" >&5 | 8107 | if test "${ac_cv_header_zlib_h+set}" = set; then |
8108 | echo "$as_me:$LINENO: checking for zlib.h" >&5 | ||
5915 | echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6 | 8109 | echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6 |
5916 | if test "${ac_cv_header_zlib_h+set}" = set; then | 8110 | if test "${ac_cv_header_zlib_h+set}" = set; then |
5917 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 8111 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
8112 | fi | ||
8113 | echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 | ||
8114 | echo "${ECHO_T}$ac_cv_header_zlib_h" >&6 | ||
5918 | else | 8115 | else |
5919 | cat >conftest.$ac_ext <<_ACEOF | 8116 | # Is the header compilable? |
5920 | #line 5920 "configure" | 8117 | echo "$as_me:$LINENO: checking zlib.h usability" >&5 |
5921 | #include "confdefs.h" | 8118 | echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6 |
8119 | cat >conftest.$ac_ext <<_ACEOF | ||
8120 | /* confdefs.h. */ | ||
8121 | _ACEOF | ||
8122 | cat confdefs.h >>conftest.$ac_ext | ||
8123 | cat >>conftest.$ac_ext <<_ACEOF | ||
8124 | /* end confdefs.h. */ | ||
8125 | $ac_includes_default | ||
5922 | #include <zlib.h> | 8126 | #include <zlib.h> |
5923 | _ACEOF | 8127 | _ACEOF |
5924 | if { (eval echo "$as_me:5924: \"$ac_cpp conftest.$ac_ext\"") >&5 | 8128 | rm -f conftest.$ac_objext |
8129 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
8130 | (eval $ac_compile) 2>conftest.er1 | ||
8131 | ac_status=$? | ||
8132 | grep -v '^ *+' conftest.er1 >conftest.err | ||
8133 | rm -f conftest.er1 | ||
8134 | cat conftest.err >&5 | ||
8135 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8136 | (exit $ac_status); } && | ||
8137 | { ac_try='test -z "$ac_c_werror_flag" | ||
8138 | || test ! -s conftest.err' | ||
8139 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8140 | (eval $ac_try) 2>&5 | ||
8141 | ac_status=$? | ||
8142 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8143 | (exit $ac_status); }; } && | ||
8144 | { ac_try='test -s conftest.$ac_objext' | ||
8145 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8146 | (eval $ac_try) 2>&5 | ||
8147 | ac_status=$? | ||
8148 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8149 | (exit $ac_status); }; }; then | ||
8150 | ac_header_compiler=yes | ||
8151 | else | ||
8152 | echo "$as_me: failed program was:" >&5 | ||
8153 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
8154 | |||
8155 | ac_header_compiler=no | ||
8156 | fi | ||
8157 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
8158 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
8159 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
8160 | |||
8161 | # Is the header present? | ||
8162 | echo "$as_me:$LINENO: checking zlib.h presence" >&5 | ||
8163 | echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6 | ||
8164 | cat >conftest.$ac_ext <<_ACEOF | ||
8165 | /* confdefs.h. */ | ||
8166 | _ACEOF | ||
8167 | cat confdefs.h >>conftest.$ac_ext | ||
8168 | cat >>conftest.$ac_ext <<_ACEOF | ||
8169 | /* end confdefs.h. */ | ||
8170 | #include <zlib.h> | ||
8171 | _ACEOF | ||
8172 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
5925 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | 8173 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
5926 | ac_status=$? | 8174 | ac_status=$? |
5927 | egrep -v '^ *\+' conftest.er1 >conftest.err | 8175 | grep -v '^ *+' conftest.er1 >conftest.err |
5928 | rm -f conftest.er1 | 8176 | rm -f conftest.er1 |
5929 | cat conftest.err >&5 | 8177 | cat conftest.err >&5 |
5930 | echo "$as_me:5930: \$? = $ac_status" >&5 | 8178 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
5931 | (exit $ac_status); } >/dev/null; then | 8179 | (exit $ac_status); } >/dev/null; then |
5932 | if test -s conftest.err; then | 8180 | if test -s conftest.err; then |
5933 | ac_cpp_err=$ac_c_preproc_warn_flag | 8181 | ac_cpp_err=$ac_c_preproc_warn_flag |
8182 | ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
5934 | else | 8183 | else |
5935 | ac_cpp_err= | 8184 | ac_cpp_err= |
5936 | fi | 8185 | fi |
@@ -5938,24 +8187,71 @@ else | |||
5938 | ac_cpp_err=yes | 8187 | ac_cpp_err=yes |
5939 | fi | 8188 | fi |
5940 | if test -z "$ac_cpp_err"; then | 8189 | if test -z "$ac_cpp_err"; then |
5941 | ac_cv_header_zlib_h=yes | 8190 | ac_header_preproc=yes |
5942 | else | 8191 | else |
5943 | echo "$as_me: failed program was:" >&5 | 8192 | echo "$as_me: failed program was:" >&5 |
5944 | cat conftest.$ac_ext >&5 | 8193 | sed 's/^/| /' conftest.$ac_ext >&5 |
5945 | ac_cv_header_zlib_h=no | 8194 | |
8195 | ac_header_preproc=no | ||
5946 | fi | 8196 | fi |
5947 | rm -f conftest.err conftest.$ac_ext | 8197 | rm -f conftest.err conftest.$ac_ext |
8198 | echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
8199 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
8200 | |||
8201 | # So? What about this header? | ||
8202 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
8203 | yes:no: ) | ||
8204 | { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
8205 | echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
8206 | { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5 | ||
8207 | echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;} | ||
8208 | ac_header_preproc=yes | ||
8209 | ;; | ||
8210 | no:yes:* ) | ||
8211 | { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5 | ||
8212 | echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;} | ||
8213 | { echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5 | ||
8214 | echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;} | ||
8215 | { echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5 | ||
8216 | echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;} | ||
8217 | { echo "$as_me:$LINENO: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&5 | ||
8218 | echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&2;} | ||
8219 | { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5 | ||
8220 | echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;} | ||
8221 | { echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5 | ||
8222 | echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;} | ||
8223 | ( | ||
8224 | cat <<\_ASBOX | ||
8225 | ## ------------------------------------------ ## | ||
8226 | ## Report this to the AC_PACKAGE_NAME lists. ## | ||
8227 | ## ------------------------------------------ ## | ||
8228 | _ASBOX | ||
8229 | ) | | ||
8230 | sed "s/^/$as_me: WARNING: /" >&2 | ||
8231 | ;; | ||
8232 | esac | ||
8233 | echo "$as_me:$LINENO: checking for zlib.h" >&5 | ||
8234 | echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6 | ||
8235 | if test "${ac_cv_header_zlib_h+set}" = set; then | ||
8236 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8237 | else | ||
8238 | ac_cv_header_zlib_h=$ac_header_preproc | ||
5948 | fi | 8239 | fi |
5949 | echo "$as_me:5949: result: $ac_cv_header_zlib_h" >&5 | 8240 | echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 |
5950 | echo "${ECHO_T}$ac_cv_header_zlib_h" >&6 | 8241 | echo "${ECHO_T}$ac_cv_header_zlib_h" >&6 |
8242 | |||
8243 | fi | ||
5951 | if test $ac_cv_header_zlib_h = yes; then | 8244 | if test $ac_cv_header_zlib_h = yes; then |
5952 | : | 8245 | : |
5953 | else | 8246 | else |
5954 | { { echo "$as_me:5954: error: *** zlib.h missing - please install first or check config.log ***" >&5 | 8247 | { { echo "$as_me:$LINENO: error: *** zlib.h missing - please install first or check config.log ***" >&5 |
5955 | echo "$as_me: error: *** zlib.h missing - please install first or check config.log ***" >&2;} | 8248 | echo "$as_me: error: *** zlib.h missing - please install first or check config.log ***" >&2;} |
5956 | { (exit 1); exit 1; }; } | 8249 | { (exit 1); exit 1; }; } |
5957 | fi | 8250 | fi |
5958 | 8251 | ||
8252 | |||
8253 | |||
8254 | |||
5959 | # Check whether --with-zlib-version-check or --without-zlib-version-check was given. | 8255 | # Check whether --with-zlib-version-check or --without-zlib-version-check was given. |
5960 | if test "${with_zlib_version_check+set}" = set; then | 8256 | if test "${with_zlib_version_check+set}" = set; then |
5961 | withval="$with_zlib_version_check" | 8257 | withval="$with_zlib_version_check" |
@@ -5963,18 +8259,24 @@ if test "${with_zlib_version_check+set}" = set; then | |||
5963 | zlib_check_nonfatal=1 | 8259 | zlib_check_nonfatal=1 |
5964 | fi | 8260 | fi |
5965 | 8261 | ||
8262 | |||
5966 | fi; | 8263 | fi; |
5967 | 8264 | ||
5968 | echo "$as_me:5968: checking for zlib 1.1.4 or greater" >&5 | 8265 | echo "$as_me:$LINENO: checking for zlib 1.1.4 or greater" >&5 |
5969 | echo $ECHO_N "checking for zlib 1.1.4 or greater... $ECHO_C" >&6 | 8266 | echo $ECHO_N "checking for zlib 1.1.4 or greater... $ECHO_C" >&6 |
5970 | if test "$cross_compiling" = yes; then | 8267 | if test "$cross_compiling" = yes; then |
5971 | { { echo "$as_me:5971: error: cannot run test program while cross compiling" >&5 | 8268 | { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
5972 | echo "$as_me: error: cannot run test program while cross compiling" >&2;} | 8269 | See \`config.log' for more details." >&5 |
8270 | echo "$as_me: error: cannot run test program while cross compiling | ||
8271 | See \`config.log' for more details." >&2;} | ||
5973 | { (exit 1); exit 1; }; } | 8272 | { (exit 1); exit 1; }; } |
5974 | else | 8273 | else |
5975 | cat >conftest.$ac_ext <<_ACEOF | 8274 | cat >conftest.$ac_ext <<_ACEOF |
5976 | #line 5976 "configure" | 8275 | /* confdefs.h. */ |
5977 | #include "confdefs.h" | 8276 | _ACEOF |
8277 | cat confdefs.h >>conftest.$ac_ext | ||
8278 | cat >>conftest.$ac_ext <<_ACEOF | ||
8279 | /* end confdefs.h. */ | ||
5978 | 8280 | ||
5979 | #include <zlib.h> | 8281 | #include <zlib.h> |
5980 | int main() | 8282 | int main() |
@@ -5990,26 +8292,28 @@ int main() | |||
5990 | 8292 | ||
5991 | _ACEOF | 8293 | _ACEOF |
5992 | rm -f conftest$ac_exeext | 8294 | rm -f conftest$ac_exeext |
5993 | if { (eval echo "$as_me:5993: \"$ac_link\"") >&5 | 8295 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
5994 | (eval $ac_link) 2>&5 | 8296 | (eval $ac_link) 2>&5 |
5995 | ac_status=$? | 8297 | ac_status=$? |
5996 | echo "$as_me:5996: \$? = $ac_status" >&5 | 8298 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
5997 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | 8299 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
5998 | { (eval echo "$as_me:5998: \"$ac_try\"") >&5 | 8300 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
5999 | (eval $ac_try) 2>&5 | 8301 | (eval $ac_try) 2>&5 |
6000 | ac_status=$? | 8302 | ac_status=$? |
6001 | echo "$as_me:6001: \$? = $ac_status" >&5 | 8303 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
6002 | (exit $ac_status); }; }; then | 8304 | (exit $ac_status); }; }; then |
6003 | echo "$as_me:6003: result: yes" >&5 | 8305 | echo "$as_me:$LINENO: result: yes" >&5 |
6004 | echo "${ECHO_T}yes" >&6 | 8306 | echo "${ECHO_T}yes" >&6 |
6005 | else | 8307 | else |
6006 | echo "$as_me: program exited with status $ac_status" >&5 | 8308 | echo "$as_me: program exited with status $ac_status" >&5 |
6007 | echo "$as_me: failed program was:" >&5 | 8309 | echo "$as_me: failed program was:" >&5 |
6008 | cat conftest.$ac_ext >&5 | 8310 | sed 's/^/| /' conftest.$ac_ext >&5 |
6009 | echo "$as_me:6009: result: no" >&5 | 8311 | |
8312 | ( exit $ac_status ) | ||
8313 | echo "$as_me:$LINENO: result: no" >&5 | ||
6010 | echo "${ECHO_T}no" >&6 | 8314 | echo "${ECHO_T}no" >&6 |
6011 | if test -z "$zlib_check_nonfatal" ; then | 8315 | if test -z "$zlib_check_nonfatal" ; then |
6012 | { { echo "$as_me:6012: error: *** zlib too old - check config.log *** | 8316 | { { echo "$as_me:$LINENO: error: *** zlib too old - check config.log *** |
6013 | Your reported zlib version has known security problems. It's possible your | 8317 | Your reported zlib version has known security problems. It's possible your |
6014 | vendor has fixed these problems without changing the version number. If you | 8318 | vendor has fixed these problems without changing the version number. If you |
6015 | are sure this is the case, you can disable the check by running | 8319 | are sure this is the case, you can disable the check by running |
@@ -6023,76 +8327,109 @@ are sure this is the case, you can disable the check by running | |||
6023 | If you are in doubt, upgrade zlib to version 1.1.4 or greater." >&2;} | 8327 | If you are in doubt, upgrade zlib to version 1.1.4 or greater." >&2;} |
6024 | { (exit 1); exit 1; }; } | 8328 | { (exit 1); exit 1; }; } |
6025 | else | 8329 | else |
6026 | { echo "$as_me:6026: WARNING: zlib version may have security problems" >&5 | 8330 | { echo "$as_me:$LINENO: WARNING: zlib version may have security problems" >&5 |
6027 | echo "$as_me: WARNING: zlib version may have security problems" >&2;} | 8331 | echo "$as_me: WARNING: zlib version may have security problems" >&2;} |
6028 | fi | 8332 | fi |
6029 | 8333 | ||
8334 | |||
6030 | fi | 8335 | fi |
6031 | rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | 8336 | rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext |
6032 | fi | 8337 | fi |
6033 | 8338 | ||
6034 | echo "$as_me:6034: checking for strcasecmp" >&5 | 8339 | echo "$as_me:$LINENO: checking for strcasecmp" >&5 |
6035 | echo $ECHO_N "checking for strcasecmp... $ECHO_C" >&6 | 8340 | echo $ECHO_N "checking for strcasecmp... $ECHO_C" >&6 |
6036 | if test "${ac_cv_func_strcasecmp+set}" = set; then | 8341 | if test "${ac_cv_func_strcasecmp+set}" = set; then |
6037 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 8342 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
6038 | else | 8343 | else |
6039 | cat >conftest.$ac_ext <<_ACEOF | 8344 | cat >conftest.$ac_ext <<_ACEOF |
6040 | #line 6040 "configure" | 8345 | /* confdefs.h. */ |
6041 | #include "confdefs.h" | 8346 | _ACEOF |
8347 | cat confdefs.h >>conftest.$ac_ext | ||
8348 | cat >>conftest.$ac_ext <<_ACEOF | ||
8349 | /* end confdefs.h. */ | ||
8350 | /* Define strcasecmp to an innocuous variant, in case <limits.h> declares strcasecmp. | ||
8351 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
8352 | #define strcasecmp innocuous_strcasecmp | ||
8353 | |||
6042 | /* System header to define __stub macros and hopefully few prototypes, | 8354 | /* System header to define __stub macros and hopefully few prototypes, |
6043 | which can conflict with char strcasecmp (); below. */ | 8355 | which can conflict with char strcasecmp (); below. |
6044 | #include <assert.h> | 8356 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
8357 | <limits.h> exists even on freestanding compilers. */ | ||
8358 | |||
8359 | #ifdef __STDC__ | ||
8360 | # include <limits.h> | ||
8361 | #else | ||
8362 | # include <assert.h> | ||
8363 | #endif | ||
8364 | |||
8365 | #undef strcasecmp | ||
8366 | |||
6045 | /* Override any gcc2 internal prototype to avoid an error. */ | 8367 | /* Override any gcc2 internal prototype to avoid an error. */ |
6046 | #ifdef __cplusplus | 8368 | #ifdef __cplusplus |
6047 | extern "C" | 8369 | extern "C" |
8370 | { | ||
6048 | #endif | 8371 | #endif |
6049 | /* We use char because int might match the return type of a gcc2 | 8372 | /* We use char because int might match the return type of a gcc2 |
6050 | builtin and then its argument prototype would still apply. */ | 8373 | builtin and then its argument prototype would still apply. */ |
6051 | char strcasecmp (); | 8374 | char strcasecmp (); |
6052 | char (*f) (); | ||
6053 | |||
6054 | int | ||
6055 | main () | ||
6056 | { | ||
6057 | /* The GNU C library defines this for functions which it implements | 8375 | /* The GNU C library defines this for functions which it implements |
6058 | to always fail with ENOSYS. Some functions are actually named | 8376 | to always fail with ENOSYS. Some functions are actually named |
6059 | something starting with __ and the normal name is an alias. */ | 8377 | something starting with __ and the normal name is an alias. */ |
6060 | #if defined (__stub_strcasecmp) || defined (__stub___strcasecmp) | 8378 | #if defined (__stub_strcasecmp) || defined (__stub___strcasecmp) |
6061 | choke me | 8379 | choke me |
6062 | #else | 8380 | #else |
6063 | f = strcasecmp; | 8381 | char (*f) () = strcasecmp; |
8382 | #endif | ||
8383 | #ifdef __cplusplus | ||
8384 | } | ||
6064 | #endif | 8385 | #endif |
6065 | 8386 | ||
8387 | int | ||
8388 | main () | ||
8389 | { | ||
8390 | return f != strcasecmp; | ||
6066 | ; | 8391 | ; |
6067 | return 0; | 8392 | return 0; |
6068 | } | 8393 | } |
6069 | _ACEOF | 8394 | _ACEOF |
6070 | rm -f conftest.$ac_objext conftest$ac_exeext | 8395 | rm -f conftest.$ac_objext conftest$ac_exeext |
6071 | if { (eval echo "$as_me:6071: \"$ac_link\"") >&5 | 8396 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
6072 | (eval $ac_link) 2>&5 | 8397 | (eval $ac_link) 2>conftest.er1 |
6073 | ac_status=$? | 8398 | ac_status=$? |
6074 | echo "$as_me:6074: \$? = $ac_status" >&5 | 8399 | grep -v '^ *+' conftest.er1 >conftest.err |
8400 | rm -f conftest.er1 | ||
8401 | cat conftest.err >&5 | ||
8402 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6075 | (exit $ac_status); } && | 8403 | (exit $ac_status); } && |
6076 | { ac_try='test -s conftest$ac_exeext' | 8404 | { ac_try='test -z "$ac_c_werror_flag" |
6077 | { (eval echo "$as_me:6077: \"$ac_try\"") >&5 | 8405 | || test ! -s conftest.err' |
8406 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6078 | (eval $ac_try) 2>&5 | 8407 | (eval $ac_try) 2>&5 |
6079 | ac_status=$? | 8408 | ac_status=$? |
6080 | echo "$as_me:6080: \$? = $ac_status" >&5 | 8409 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
8410 | (exit $ac_status); }; } && | ||
8411 | { ac_try='test -s conftest$ac_exeext' | ||
8412 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8413 | (eval $ac_try) 2>&5 | ||
8414 | ac_status=$? | ||
8415 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6081 | (exit $ac_status); }; }; then | 8416 | (exit $ac_status); }; }; then |
6082 | ac_cv_func_strcasecmp=yes | 8417 | ac_cv_func_strcasecmp=yes |
6083 | else | 8418 | else |
6084 | echo "$as_me: failed program was:" >&5 | 8419 | echo "$as_me: failed program was:" >&5 |
6085 | cat conftest.$ac_ext >&5 | 8420 | sed 's/^/| /' conftest.$ac_ext >&5 |
8421 | |||
6086 | ac_cv_func_strcasecmp=no | 8422 | ac_cv_func_strcasecmp=no |
6087 | fi | 8423 | fi |
6088 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 8424 | rm -f conftest.err conftest.$ac_objext \ |
8425 | conftest$ac_exeext conftest.$ac_ext | ||
6089 | fi | 8426 | fi |
6090 | echo "$as_me:6090: result: $ac_cv_func_strcasecmp" >&5 | 8427 | echo "$as_me:$LINENO: result: $ac_cv_func_strcasecmp" >&5 |
6091 | echo "${ECHO_T}$ac_cv_func_strcasecmp" >&6 | 8428 | echo "${ECHO_T}$ac_cv_func_strcasecmp" >&6 |
6092 | if test $ac_cv_func_strcasecmp = yes; then | 8429 | if test $ac_cv_func_strcasecmp = yes; then |
6093 | : | 8430 | : |
6094 | else | 8431 | else |
6095 | echo "$as_me:6095: checking for strcasecmp in -lresolv" >&5 | 8432 | echo "$as_me:$LINENO: checking for strcasecmp in -lresolv" >&5 |
6096 | echo $ECHO_N "checking for strcasecmp in -lresolv... $ECHO_C" >&6 | 8433 | echo $ECHO_N "checking for strcasecmp in -lresolv... $ECHO_C" >&6 |
6097 | if test "${ac_cv_lib_resolv_strcasecmp+set}" = set; then | 8434 | if test "${ac_cv_lib_resolv_strcasecmp+set}" = set; then |
6098 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 8435 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -6100,8 +8437,11 @@ else | |||
6100 | ac_check_lib_save_LIBS=$LIBS | 8437 | ac_check_lib_save_LIBS=$LIBS |
6101 | LIBS="-lresolv $LIBS" | 8438 | LIBS="-lresolv $LIBS" |
6102 | cat >conftest.$ac_ext <<_ACEOF | 8439 | cat >conftest.$ac_ext <<_ACEOF |
6103 | #line 6103 "configure" | 8440 | /* confdefs.h. */ |
6104 | #include "confdefs.h" | 8441 | _ACEOF |
8442 | cat confdefs.h >>conftest.$ac_ext | ||
8443 | cat >>conftest.$ac_ext <<_ACEOF | ||
8444 | /* end confdefs.h. */ | ||
6105 | 8445 | ||
6106 | /* Override any gcc2 internal prototype to avoid an error. */ | 8446 | /* Override any gcc2 internal prototype to avoid an error. */ |
6107 | #ifdef __cplusplus | 8447 | #ifdef __cplusplus |
@@ -6119,96 +8459,141 @@ strcasecmp (); | |||
6119 | } | 8459 | } |
6120 | _ACEOF | 8460 | _ACEOF |
6121 | rm -f conftest.$ac_objext conftest$ac_exeext | 8461 | rm -f conftest.$ac_objext conftest$ac_exeext |
6122 | if { (eval echo "$as_me:6122: \"$ac_link\"") >&5 | 8462 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
6123 | (eval $ac_link) 2>&5 | 8463 | (eval $ac_link) 2>conftest.er1 |
6124 | ac_status=$? | 8464 | ac_status=$? |
6125 | echo "$as_me:6125: \$? = $ac_status" >&5 | 8465 | grep -v '^ *+' conftest.er1 >conftest.err |
8466 | rm -f conftest.er1 | ||
8467 | cat conftest.err >&5 | ||
8468 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6126 | (exit $ac_status); } && | 8469 | (exit $ac_status); } && |
6127 | { ac_try='test -s conftest$ac_exeext' | 8470 | { ac_try='test -z "$ac_c_werror_flag" |
6128 | { (eval echo "$as_me:6128: \"$ac_try\"") >&5 | 8471 | || test ! -s conftest.err' |
8472 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6129 | (eval $ac_try) 2>&5 | 8473 | (eval $ac_try) 2>&5 |
6130 | ac_status=$? | 8474 | ac_status=$? |
6131 | echo "$as_me:6131: \$? = $ac_status" >&5 | 8475 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
8476 | (exit $ac_status); }; } && | ||
8477 | { ac_try='test -s conftest$ac_exeext' | ||
8478 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8479 | (eval $ac_try) 2>&5 | ||
8480 | ac_status=$? | ||
8481 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6132 | (exit $ac_status); }; }; then | 8482 | (exit $ac_status); }; }; then |
6133 | ac_cv_lib_resolv_strcasecmp=yes | 8483 | ac_cv_lib_resolv_strcasecmp=yes |
6134 | else | 8484 | else |
6135 | echo "$as_me: failed program was:" >&5 | 8485 | echo "$as_me: failed program was:" >&5 |
6136 | cat conftest.$ac_ext >&5 | 8486 | sed 's/^/| /' conftest.$ac_ext >&5 |
8487 | |||
6137 | ac_cv_lib_resolv_strcasecmp=no | 8488 | ac_cv_lib_resolv_strcasecmp=no |
6138 | fi | 8489 | fi |
6139 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 8490 | rm -f conftest.err conftest.$ac_objext \ |
8491 | conftest$ac_exeext conftest.$ac_ext | ||
6140 | LIBS=$ac_check_lib_save_LIBS | 8492 | LIBS=$ac_check_lib_save_LIBS |
6141 | fi | 8493 | fi |
6142 | echo "$as_me:6142: result: $ac_cv_lib_resolv_strcasecmp" >&5 | 8494 | echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_strcasecmp" >&5 |
6143 | echo "${ECHO_T}$ac_cv_lib_resolv_strcasecmp" >&6 | 8495 | echo "${ECHO_T}$ac_cv_lib_resolv_strcasecmp" >&6 |
6144 | if test $ac_cv_lib_resolv_strcasecmp = yes; then | 8496 | if test $ac_cv_lib_resolv_strcasecmp = yes; then |
6145 | LIBS="$LIBS -lresolv" | 8497 | LIBS="$LIBS -lresolv" |
6146 | fi | 8498 | fi |
6147 | 8499 | ||
8500 | |||
6148 | fi | 8501 | fi |
6149 | 8502 | ||
6150 | echo "$as_me:6150: checking for utimes" >&5 | 8503 | echo "$as_me:$LINENO: checking for utimes" >&5 |
6151 | echo $ECHO_N "checking for utimes... $ECHO_C" >&6 | 8504 | echo $ECHO_N "checking for utimes... $ECHO_C" >&6 |
6152 | if test "${ac_cv_func_utimes+set}" = set; then | 8505 | if test "${ac_cv_func_utimes+set}" = set; then |
6153 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 8506 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
6154 | else | 8507 | else |
6155 | cat >conftest.$ac_ext <<_ACEOF | 8508 | cat >conftest.$ac_ext <<_ACEOF |
6156 | #line 6156 "configure" | 8509 | /* confdefs.h. */ |
6157 | #include "confdefs.h" | 8510 | _ACEOF |
8511 | cat confdefs.h >>conftest.$ac_ext | ||
8512 | cat >>conftest.$ac_ext <<_ACEOF | ||
8513 | /* end confdefs.h. */ | ||
8514 | /* Define utimes to an innocuous variant, in case <limits.h> declares utimes. | ||
8515 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
8516 | #define utimes innocuous_utimes | ||
8517 | |||
6158 | /* System header to define __stub macros and hopefully few prototypes, | 8518 | /* System header to define __stub macros and hopefully few prototypes, |
6159 | which can conflict with char utimes (); below. */ | 8519 | which can conflict with char utimes (); below. |
6160 | #include <assert.h> | 8520 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
8521 | <limits.h> exists even on freestanding compilers. */ | ||
8522 | |||
8523 | #ifdef __STDC__ | ||
8524 | # include <limits.h> | ||
8525 | #else | ||
8526 | # include <assert.h> | ||
8527 | #endif | ||
8528 | |||
8529 | #undef utimes | ||
8530 | |||
6161 | /* Override any gcc2 internal prototype to avoid an error. */ | 8531 | /* Override any gcc2 internal prototype to avoid an error. */ |
6162 | #ifdef __cplusplus | 8532 | #ifdef __cplusplus |
6163 | extern "C" | 8533 | extern "C" |
8534 | { | ||
6164 | #endif | 8535 | #endif |
6165 | /* We use char because int might match the return type of a gcc2 | 8536 | /* We use char because int might match the return type of a gcc2 |
6166 | builtin and then its argument prototype would still apply. */ | 8537 | builtin and then its argument prototype would still apply. */ |
6167 | char utimes (); | 8538 | char utimes (); |
6168 | char (*f) (); | ||
6169 | |||
6170 | int | ||
6171 | main () | ||
6172 | { | ||
6173 | /* The GNU C library defines this for functions which it implements | 8539 | /* The GNU C library defines this for functions which it implements |
6174 | to always fail with ENOSYS. Some functions are actually named | 8540 | to always fail with ENOSYS. Some functions are actually named |
6175 | something starting with __ and the normal name is an alias. */ | 8541 | something starting with __ and the normal name is an alias. */ |
6176 | #if defined (__stub_utimes) || defined (__stub___utimes) | 8542 | #if defined (__stub_utimes) || defined (__stub___utimes) |
6177 | choke me | 8543 | choke me |
6178 | #else | 8544 | #else |
6179 | f = utimes; | 8545 | char (*f) () = utimes; |
8546 | #endif | ||
8547 | #ifdef __cplusplus | ||
8548 | } | ||
6180 | #endif | 8549 | #endif |
6181 | 8550 | ||
8551 | int | ||
8552 | main () | ||
8553 | { | ||
8554 | return f != utimes; | ||
6182 | ; | 8555 | ; |
6183 | return 0; | 8556 | return 0; |
6184 | } | 8557 | } |
6185 | _ACEOF | 8558 | _ACEOF |
6186 | rm -f conftest.$ac_objext conftest$ac_exeext | 8559 | rm -f conftest.$ac_objext conftest$ac_exeext |
6187 | if { (eval echo "$as_me:6187: \"$ac_link\"") >&5 | 8560 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
6188 | (eval $ac_link) 2>&5 | 8561 | (eval $ac_link) 2>conftest.er1 |
6189 | ac_status=$? | 8562 | ac_status=$? |
6190 | echo "$as_me:6190: \$? = $ac_status" >&5 | 8563 | grep -v '^ *+' conftest.er1 >conftest.err |
8564 | rm -f conftest.er1 | ||
8565 | cat conftest.err >&5 | ||
8566 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6191 | (exit $ac_status); } && | 8567 | (exit $ac_status); } && |
6192 | { ac_try='test -s conftest$ac_exeext' | 8568 | { ac_try='test -z "$ac_c_werror_flag" |
6193 | { (eval echo "$as_me:6193: \"$ac_try\"") >&5 | 8569 | || test ! -s conftest.err' |
8570 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6194 | (eval $ac_try) 2>&5 | 8571 | (eval $ac_try) 2>&5 |
6195 | ac_status=$? | 8572 | ac_status=$? |
6196 | echo "$as_me:6196: \$? = $ac_status" >&5 | 8573 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
8574 | (exit $ac_status); }; } && | ||
8575 | { ac_try='test -s conftest$ac_exeext' | ||
8576 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8577 | (eval $ac_try) 2>&5 | ||
8578 | ac_status=$? | ||
8579 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6197 | (exit $ac_status); }; }; then | 8580 | (exit $ac_status); }; }; then |
6198 | ac_cv_func_utimes=yes | 8581 | ac_cv_func_utimes=yes |
6199 | else | 8582 | else |
6200 | echo "$as_me: failed program was:" >&5 | 8583 | echo "$as_me: failed program was:" >&5 |
6201 | cat conftest.$ac_ext >&5 | 8584 | sed 's/^/| /' conftest.$ac_ext >&5 |
8585 | |||
6202 | ac_cv_func_utimes=no | 8586 | ac_cv_func_utimes=no |
6203 | fi | 8587 | fi |
6204 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 8588 | rm -f conftest.err conftest.$ac_objext \ |
8589 | conftest$ac_exeext conftest.$ac_ext | ||
6205 | fi | 8590 | fi |
6206 | echo "$as_me:6206: result: $ac_cv_func_utimes" >&5 | 8591 | echo "$as_me:$LINENO: result: $ac_cv_func_utimes" >&5 |
6207 | echo "${ECHO_T}$ac_cv_func_utimes" >&6 | 8592 | echo "${ECHO_T}$ac_cv_func_utimes" >&6 |
6208 | if test $ac_cv_func_utimes = yes; then | 8593 | if test $ac_cv_func_utimes = yes; then |
6209 | : | 8594 | : |
6210 | else | 8595 | else |
6211 | echo "$as_me:6211: checking for utimes in -lc89" >&5 | 8596 | echo "$as_me:$LINENO: checking for utimes in -lc89" >&5 |
6212 | echo $ECHO_N "checking for utimes in -lc89... $ECHO_C" >&6 | 8597 | echo $ECHO_N "checking for utimes in -lc89... $ECHO_C" >&6 |
6213 | if test "${ac_cv_lib_c89_utimes+set}" = set; then | 8598 | if test "${ac_cv_lib_c89_utimes+set}" = set; then |
6214 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 8599 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -6216,8 +8601,11 @@ else | |||
6216 | ac_check_lib_save_LIBS=$LIBS | 8601 | ac_check_lib_save_LIBS=$LIBS |
6217 | LIBS="-lc89 $LIBS" | 8602 | LIBS="-lc89 $LIBS" |
6218 | cat >conftest.$ac_ext <<_ACEOF | 8603 | cat >conftest.$ac_ext <<_ACEOF |
6219 | #line 6219 "configure" | 8604 | /* confdefs.h. */ |
6220 | #include "confdefs.h" | 8605 | _ACEOF |
8606 | cat confdefs.h >>conftest.$ac_ext | ||
8607 | cat >>conftest.$ac_ext <<_ACEOF | ||
8608 | /* end confdefs.h. */ | ||
6221 | 8609 | ||
6222 | /* Override any gcc2 internal prototype to avoid an error. */ | 8610 | /* Override any gcc2 internal prototype to avoid an error. */ |
6223 | #ifdef __cplusplus | 8611 | #ifdef __cplusplus |
@@ -6235,61 +8623,132 @@ utimes (); | |||
6235 | } | 8623 | } |
6236 | _ACEOF | 8624 | _ACEOF |
6237 | rm -f conftest.$ac_objext conftest$ac_exeext | 8625 | rm -f conftest.$ac_objext conftest$ac_exeext |
6238 | if { (eval echo "$as_me:6238: \"$ac_link\"") >&5 | 8626 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
6239 | (eval $ac_link) 2>&5 | 8627 | (eval $ac_link) 2>conftest.er1 |
6240 | ac_status=$? | 8628 | ac_status=$? |
6241 | echo "$as_me:6241: \$? = $ac_status" >&5 | 8629 | grep -v '^ *+' conftest.er1 >conftest.err |
8630 | rm -f conftest.er1 | ||
8631 | cat conftest.err >&5 | ||
8632 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6242 | (exit $ac_status); } && | 8633 | (exit $ac_status); } && |
6243 | { ac_try='test -s conftest$ac_exeext' | 8634 | { ac_try='test -z "$ac_c_werror_flag" |
6244 | { (eval echo "$as_me:6244: \"$ac_try\"") >&5 | 8635 | || test ! -s conftest.err' |
8636 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8637 | (eval $ac_try) 2>&5 | ||
8638 | ac_status=$? | ||
8639 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8640 | (exit $ac_status); }; } && | ||
8641 | { ac_try='test -s conftest$ac_exeext' | ||
8642 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6245 | (eval $ac_try) 2>&5 | 8643 | (eval $ac_try) 2>&5 |
6246 | ac_status=$? | 8644 | ac_status=$? |
6247 | echo "$as_me:6247: \$? = $ac_status" >&5 | 8645 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
6248 | (exit $ac_status); }; }; then | 8646 | (exit $ac_status); }; }; then |
6249 | ac_cv_lib_c89_utimes=yes | 8647 | ac_cv_lib_c89_utimes=yes |
6250 | else | 8648 | else |
6251 | echo "$as_me: failed program was:" >&5 | 8649 | echo "$as_me: failed program was:" >&5 |
6252 | cat conftest.$ac_ext >&5 | 8650 | sed 's/^/| /' conftest.$ac_ext >&5 |
8651 | |||
6253 | ac_cv_lib_c89_utimes=no | 8652 | ac_cv_lib_c89_utimes=no |
6254 | fi | 8653 | fi |
6255 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 8654 | rm -f conftest.err conftest.$ac_objext \ |
8655 | conftest$ac_exeext conftest.$ac_ext | ||
6256 | LIBS=$ac_check_lib_save_LIBS | 8656 | LIBS=$ac_check_lib_save_LIBS |
6257 | fi | 8657 | fi |
6258 | echo "$as_me:6258: result: $ac_cv_lib_c89_utimes" >&5 | 8658 | echo "$as_me:$LINENO: result: $ac_cv_lib_c89_utimes" >&5 |
6259 | echo "${ECHO_T}$ac_cv_lib_c89_utimes" >&6 | 8659 | echo "${ECHO_T}$ac_cv_lib_c89_utimes" >&6 |
6260 | if test $ac_cv_lib_c89_utimes = yes; then | 8660 | if test $ac_cv_lib_c89_utimes = yes; then |
6261 | cat >>confdefs.h <<\EOF | 8661 | cat >>confdefs.h <<\_ACEOF |
6262 | #define HAVE_UTIMES 1 | 8662 | #define HAVE_UTIMES 1 |
6263 | EOF | 8663 | _ACEOF |
6264 | 8664 | ||
6265 | LIBS="$LIBS -lc89" | 8665 | LIBS="$LIBS -lc89" |
6266 | fi | 8666 | fi |
6267 | 8667 | ||
8668 | |||
6268 | fi | 8669 | fi |
6269 | 8670 | ||
8671 | |||
8672 | |||
6270 | for ac_header in libutil.h | 8673 | for ac_header in libutil.h |
6271 | do | 8674 | do |
6272 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | 8675 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` |
6273 | echo "$as_me:6273: checking for $ac_header" >&5 | 8676 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
8677 | echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
6274 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | 8678 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 |
6275 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | 8679 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
6276 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 8680 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
8681 | fi | ||
8682 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
8683 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
6277 | else | 8684 | else |
6278 | cat >conftest.$ac_ext <<_ACEOF | 8685 | # Is the header compilable? |
6279 | #line 6279 "configure" | 8686 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 |
6280 | #include "confdefs.h" | 8687 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 |
8688 | cat >conftest.$ac_ext <<_ACEOF | ||
8689 | /* confdefs.h. */ | ||
8690 | _ACEOF | ||
8691 | cat confdefs.h >>conftest.$ac_ext | ||
8692 | cat >>conftest.$ac_ext <<_ACEOF | ||
8693 | /* end confdefs.h. */ | ||
8694 | $ac_includes_default | ||
6281 | #include <$ac_header> | 8695 | #include <$ac_header> |
6282 | _ACEOF | 8696 | _ACEOF |
6283 | if { (eval echo "$as_me:6283: \"$ac_cpp conftest.$ac_ext\"") >&5 | 8697 | rm -f conftest.$ac_objext |
8698 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
8699 | (eval $ac_compile) 2>conftest.er1 | ||
8700 | ac_status=$? | ||
8701 | grep -v '^ *+' conftest.er1 >conftest.err | ||
8702 | rm -f conftest.er1 | ||
8703 | cat conftest.err >&5 | ||
8704 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8705 | (exit $ac_status); } && | ||
8706 | { ac_try='test -z "$ac_c_werror_flag" | ||
8707 | || test ! -s conftest.err' | ||
8708 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8709 | (eval $ac_try) 2>&5 | ||
8710 | ac_status=$? | ||
8711 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8712 | (exit $ac_status); }; } && | ||
8713 | { ac_try='test -s conftest.$ac_objext' | ||
8714 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8715 | (eval $ac_try) 2>&5 | ||
8716 | ac_status=$? | ||
8717 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8718 | (exit $ac_status); }; }; then | ||
8719 | ac_header_compiler=yes | ||
8720 | else | ||
8721 | echo "$as_me: failed program was:" >&5 | ||
8722 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
8723 | |||
8724 | ac_header_compiler=no | ||
8725 | fi | ||
8726 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
8727 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
8728 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
8729 | |||
8730 | # Is the header present? | ||
8731 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
8732 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
8733 | cat >conftest.$ac_ext <<_ACEOF | ||
8734 | /* confdefs.h. */ | ||
8735 | _ACEOF | ||
8736 | cat confdefs.h >>conftest.$ac_ext | ||
8737 | cat >>conftest.$ac_ext <<_ACEOF | ||
8738 | /* end confdefs.h. */ | ||
8739 | #include <$ac_header> | ||
8740 | _ACEOF | ||
8741 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
6284 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | 8742 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
6285 | ac_status=$? | 8743 | ac_status=$? |
6286 | egrep -v '^ *\+' conftest.er1 >conftest.err | 8744 | grep -v '^ *+' conftest.er1 >conftest.err |
6287 | rm -f conftest.er1 | 8745 | rm -f conftest.er1 |
6288 | cat conftest.err >&5 | 8746 | cat conftest.err >&5 |
6289 | echo "$as_me:6289: \$? = $ac_status" >&5 | 8747 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
6290 | (exit $ac_status); } >/dev/null; then | 8748 | (exit $ac_status); } >/dev/null; then |
6291 | if test -s conftest.err; then | 8749 | if test -s conftest.err; then |
6292 | ac_cpp_err=$ac_c_preproc_warn_flag | 8750 | ac_cpp_err=$ac_c_preproc_warn_flag |
8751 | ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
6293 | else | 8752 | else |
6294 | ac_cpp_err= | 8753 | ac_cpp_err= |
6295 | fi | 8754 | fi |
@@ -6297,25 +8756,70 @@ else | |||
6297 | ac_cpp_err=yes | 8756 | ac_cpp_err=yes |
6298 | fi | 8757 | fi |
6299 | if test -z "$ac_cpp_err"; then | 8758 | if test -z "$ac_cpp_err"; then |
6300 | eval "$as_ac_Header=yes" | 8759 | ac_header_preproc=yes |
6301 | else | 8760 | else |
6302 | echo "$as_me: failed program was:" >&5 | 8761 | echo "$as_me: failed program was:" >&5 |
6303 | cat conftest.$ac_ext >&5 | 8762 | sed 's/^/| /' conftest.$ac_ext >&5 |
6304 | eval "$as_ac_Header=no" | 8763 | |
8764 | ac_header_preproc=no | ||
6305 | fi | 8765 | fi |
6306 | rm -f conftest.err conftest.$ac_ext | 8766 | rm -f conftest.err conftest.$ac_ext |
8767 | echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
8768 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
8769 | |||
8770 | # So? What about this header? | ||
8771 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
8772 | yes:no: ) | ||
8773 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
8774 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
8775 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
8776 | echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
8777 | ac_header_preproc=yes | ||
8778 | ;; | ||
8779 | no:yes:* ) | ||
8780 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
8781 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
8782 | { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
8783 | echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
8784 | { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
8785 | echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
8786 | { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
8787 | echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
8788 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
8789 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
8790 | { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
8791 | echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
8792 | ( | ||
8793 | cat <<\_ASBOX | ||
8794 | ## ------------------------------------------ ## | ||
8795 | ## Report this to the AC_PACKAGE_NAME lists. ## | ||
8796 | ## ------------------------------------------ ## | ||
8797 | _ASBOX | ||
8798 | ) | | ||
8799 | sed "s/^/$as_me: WARNING: /" >&2 | ||
8800 | ;; | ||
8801 | esac | ||
8802 | echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
8803 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | ||
8804 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
8805 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8806 | else | ||
8807 | eval "$as_ac_Header=\$ac_header_preproc" | ||
6307 | fi | 8808 | fi |
6308 | echo "$as_me:6308: result: `eval echo '${'$as_ac_Header'}'`" >&5 | 8809 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 |
6309 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | 8810 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 |
8811 | |||
8812 | fi | ||
6310 | if test `eval echo '${'$as_ac_Header'}'` = yes; then | 8813 | if test `eval echo '${'$as_ac_Header'}'` = yes; then |
6311 | cat >>confdefs.h <<EOF | 8814 | cat >>confdefs.h <<_ACEOF |
6312 | #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 8815 | #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
6313 | EOF | 8816 | _ACEOF |
6314 | 8817 | ||
6315 | fi | 8818 | fi |
8819 | |||
6316 | done | 8820 | done |
6317 | 8821 | ||
6318 | echo "$as_me:6318: checking for library containing login" >&5 | 8822 | echo "$as_me:$LINENO: checking for library containing login" >&5 |
6319 | echo $ECHO_N "checking for library containing login... $ECHO_C" >&6 | 8823 | echo $ECHO_N "checking for library containing login... $ECHO_C" >&6 |
6320 | if test "${ac_cv_search_login+set}" = set; then | 8824 | if test "${ac_cv_search_login+set}" = set; then |
6321 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 8825 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -6323,8 +8827,11 @@ else | |||
6323 | ac_func_search_save_LIBS=$LIBS | 8827 | ac_func_search_save_LIBS=$LIBS |
6324 | ac_cv_search_login=no | 8828 | ac_cv_search_login=no |
6325 | cat >conftest.$ac_ext <<_ACEOF | 8829 | cat >conftest.$ac_ext <<_ACEOF |
6326 | #line 6326 "configure" | 8830 | /* confdefs.h. */ |
6327 | #include "confdefs.h" | 8831 | _ACEOF |
8832 | cat confdefs.h >>conftest.$ac_ext | ||
8833 | cat >>conftest.$ac_ext <<_ACEOF | ||
8834 | /* end confdefs.h. */ | ||
6328 | 8835 | ||
6329 | /* Override any gcc2 internal prototype to avoid an error. */ | 8836 | /* Override any gcc2 internal prototype to avoid an error. */ |
6330 | #ifdef __cplusplus | 8837 | #ifdef __cplusplus |
@@ -6342,29 +8849,44 @@ login (); | |||
6342 | } | 8849 | } |
6343 | _ACEOF | 8850 | _ACEOF |
6344 | rm -f conftest.$ac_objext conftest$ac_exeext | 8851 | rm -f conftest.$ac_objext conftest$ac_exeext |
6345 | if { (eval echo "$as_me:6345: \"$ac_link\"") >&5 | 8852 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
6346 | (eval $ac_link) 2>&5 | 8853 | (eval $ac_link) 2>conftest.er1 |
6347 | ac_status=$? | 8854 | ac_status=$? |
6348 | echo "$as_me:6348: \$? = $ac_status" >&5 | 8855 | grep -v '^ *+' conftest.er1 >conftest.err |
8856 | rm -f conftest.er1 | ||
8857 | cat conftest.err >&5 | ||
8858 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6349 | (exit $ac_status); } && | 8859 | (exit $ac_status); } && |
6350 | { ac_try='test -s conftest$ac_exeext' | 8860 | { ac_try='test -z "$ac_c_werror_flag" |
6351 | { (eval echo "$as_me:6351: \"$ac_try\"") >&5 | 8861 | || test ! -s conftest.err' |
8862 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6352 | (eval $ac_try) 2>&5 | 8863 | (eval $ac_try) 2>&5 |
6353 | ac_status=$? | 8864 | ac_status=$? |
6354 | echo "$as_me:6354: \$? = $ac_status" >&5 | 8865 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
8866 | (exit $ac_status); }; } && | ||
8867 | { ac_try='test -s conftest$ac_exeext' | ||
8868 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8869 | (eval $ac_try) 2>&5 | ||
8870 | ac_status=$? | ||
8871 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6355 | (exit $ac_status); }; }; then | 8872 | (exit $ac_status); }; }; then |
6356 | ac_cv_search_login="none required" | 8873 | ac_cv_search_login="none required" |
6357 | else | 8874 | else |
6358 | echo "$as_me: failed program was:" >&5 | 8875 | echo "$as_me: failed program was:" >&5 |
6359 | cat conftest.$ac_ext >&5 | 8876 | sed 's/^/| /' conftest.$ac_ext >&5 |
8877 | |||
6360 | fi | 8878 | fi |
6361 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 8879 | rm -f conftest.err conftest.$ac_objext \ |
8880 | conftest$ac_exeext conftest.$ac_ext | ||
6362 | if test "$ac_cv_search_login" = no; then | 8881 | if test "$ac_cv_search_login" = no; then |
6363 | for ac_lib in util bsd; do | 8882 | for ac_lib in util bsd; do |
6364 | LIBS="-l$ac_lib $ac_func_search_save_LIBS" | 8883 | LIBS="-l$ac_lib $ac_func_search_save_LIBS" |
6365 | cat >conftest.$ac_ext <<_ACEOF | 8884 | cat >conftest.$ac_ext <<_ACEOF |
6366 | #line 6366 "configure" | 8885 | /* confdefs.h. */ |
6367 | #include "confdefs.h" | 8886 | _ACEOF |
8887 | cat confdefs.h >>conftest.$ac_ext | ||
8888 | cat >>conftest.$ac_ext <<_ACEOF | ||
8889 | /* end confdefs.h. */ | ||
6368 | 8890 | ||
6369 | /* Override any gcc2 internal prototype to avoid an error. */ | 8891 | /* Override any gcc2 internal prototype to avoid an error. */ |
6370 | #ifdef __cplusplus | 8892 | #ifdef __cplusplus |
@@ -6382,176 +8904,257 @@ login (); | |||
6382 | } | 8904 | } |
6383 | _ACEOF | 8905 | _ACEOF |
6384 | rm -f conftest.$ac_objext conftest$ac_exeext | 8906 | rm -f conftest.$ac_objext conftest$ac_exeext |
6385 | if { (eval echo "$as_me:6385: \"$ac_link\"") >&5 | 8907 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
6386 | (eval $ac_link) 2>&5 | 8908 | (eval $ac_link) 2>conftest.er1 |
6387 | ac_status=$? | 8909 | ac_status=$? |
6388 | echo "$as_me:6388: \$? = $ac_status" >&5 | 8910 | grep -v '^ *+' conftest.er1 >conftest.err |
8911 | rm -f conftest.er1 | ||
8912 | cat conftest.err >&5 | ||
8913 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6389 | (exit $ac_status); } && | 8914 | (exit $ac_status); } && |
6390 | { ac_try='test -s conftest$ac_exeext' | 8915 | { ac_try='test -z "$ac_c_werror_flag" |
6391 | { (eval echo "$as_me:6391: \"$ac_try\"") >&5 | 8916 | || test ! -s conftest.err' |
8917 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6392 | (eval $ac_try) 2>&5 | 8918 | (eval $ac_try) 2>&5 |
6393 | ac_status=$? | 8919 | ac_status=$? |
6394 | echo "$as_me:6394: \$? = $ac_status" >&5 | 8920 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
8921 | (exit $ac_status); }; } && | ||
8922 | { ac_try='test -s conftest$ac_exeext' | ||
8923 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8924 | (eval $ac_try) 2>&5 | ||
8925 | ac_status=$? | ||
8926 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6395 | (exit $ac_status); }; }; then | 8927 | (exit $ac_status); }; }; then |
6396 | ac_cv_search_login="-l$ac_lib" | 8928 | ac_cv_search_login="-l$ac_lib" |
6397 | break | 8929 | break |
6398 | else | 8930 | else |
6399 | echo "$as_me: failed program was:" >&5 | 8931 | echo "$as_me: failed program was:" >&5 |
6400 | cat conftest.$ac_ext >&5 | 8932 | sed 's/^/| /' conftest.$ac_ext >&5 |
8933 | |||
6401 | fi | 8934 | fi |
6402 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 8935 | rm -f conftest.err conftest.$ac_objext \ |
8936 | conftest$ac_exeext conftest.$ac_ext | ||
6403 | done | 8937 | done |
6404 | fi | 8938 | fi |
6405 | LIBS=$ac_func_search_save_LIBS | 8939 | LIBS=$ac_func_search_save_LIBS |
6406 | fi | 8940 | fi |
6407 | echo "$as_me:6407: result: $ac_cv_search_login" >&5 | 8941 | echo "$as_me:$LINENO: result: $ac_cv_search_login" >&5 |
6408 | echo "${ECHO_T}$ac_cv_search_login" >&6 | 8942 | echo "${ECHO_T}$ac_cv_search_login" >&6 |
6409 | if test "$ac_cv_search_login" != no; then | 8943 | if test "$ac_cv_search_login" != no; then |
6410 | test "$ac_cv_search_login" = "none required" || LIBS="$ac_cv_search_login $LIBS" | 8944 | test "$ac_cv_search_login" = "none required" || LIBS="$ac_cv_search_login $LIBS" |
6411 | cat >>confdefs.h <<\EOF | 8945 | cat >>confdefs.h <<\_ACEOF |
6412 | #define HAVE_LOGIN 1 | 8946 | #define HAVE_LOGIN 1 |
6413 | EOF | 8947 | _ACEOF |
6414 | 8948 | ||
6415 | fi | 8949 | fi |
6416 | 8950 | ||
8951 | |||
8952 | |||
8953 | |||
6417 | for ac_func in logout updwtmp logwtmp | 8954 | for ac_func in logout updwtmp logwtmp |
6418 | do | 8955 | do |
6419 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | 8956 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
6420 | echo "$as_me:6420: checking for $ac_func" >&5 | 8957 | echo "$as_me:$LINENO: checking for $ac_func" >&5 |
6421 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | 8958 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 |
6422 | if eval "test \"\${$as_ac_var+set}\" = set"; then | 8959 | if eval "test \"\${$as_ac_var+set}\" = set"; then |
6423 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 8960 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
6424 | else | 8961 | else |
6425 | cat >conftest.$ac_ext <<_ACEOF | 8962 | cat >conftest.$ac_ext <<_ACEOF |
6426 | #line 6426 "configure" | 8963 | /* confdefs.h. */ |
6427 | #include "confdefs.h" | 8964 | _ACEOF |
8965 | cat confdefs.h >>conftest.$ac_ext | ||
8966 | cat >>conftest.$ac_ext <<_ACEOF | ||
8967 | /* end confdefs.h. */ | ||
8968 | /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
8969 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
8970 | #define $ac_func innocuous_$ac_func | ||
8971 | |||
6428 | /* System header to define __stub macros and hopefully few prototypes, | 8972 | /* System header to define __stub macros and hopefully few prototypes, |
6429 | which can conflict with char $ac_func (); below. */ | 8973 | which can conflict with char $ac_func (); below. |
6430 | #include <assert.h> | 8974 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
8975 | <limits.h> exists even on freestanding compilers. */ | ||
8976 | |||
8977 | #ifdef __STDC__ | ||
8978 | # include <limits.h> | ||
8979 | #else | ||
8980 | # include <assert.h> | ||
8981 | #endif | ||
8982 | |||
8983 | #undef $ac_func | ||
8984 | |||
6431 | /* Override any gcc2 internal prototype to avoid an error. */ | 8985 | /* Override any gcc2 internal prototype to avoid an error. */ |
6432 | #ifdef __cplusplus | 8986 | #ifdef __cplusplus |
6433 | extern "C" | 8987 | extern "C" |
8988 | { | ||
6434 | #endif | 8989 | #endif |
6435 | /* We use char because int might match the return type of a gcc2 | 8990 | /* We use char because int might match the return type of a gcc2 |
6436 | builtin and then its argument prototype would still apply. */ | 8991 | builtin and then its argument prototype would still apply. */ |
6437 | char $ac_func (); | 8992 | char $ac_func (); |
6438 | char (*f) (); | ||
6439 | |||
6440 | int | ||
6441 | main () | ||
6442 | { | ||
6443 | /* The GNU C library defines this for functions which it implements | 8993 | /* The GNU C library defines this for functions which it implements |
6444 | to always fail with ENOSYS. Some functions are actually named | 8994 | to always fail with ENOSYS. Some functions are actually named |
6445 | something starting with __ and the normal name is an alias. */ | 8995 | something starting with __ and the normal name is an alias. */ |
6446 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) | 8996 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) |
6447 | choke me | 8997 | choke me |
6448 | #else | 8998 | #else |
6449 | f = $ac_func; | 8999 | char (*f) () = $ac_func; |
9000 | #endif | ||
9001 | #ifdef __cplusplus | ||
9002 | } | ||
6450 | #endif | 9003 | #endif |
6451 | 9004 | ||
9005 | int | ||
9006 | main () | ||
9007 | { | ||
9008 | return f != $ac_func; | ||
6452 | ; | 9009 | ; |
6453 | return 0; | 9010 | return 0; |
6454 | } | 9011 | } |
6455 | _ACEOF | 9012 | _ACEOF |
6456 | rm -f conftest.$ac_objext conftest$ac_exeext | 9013 | rm -f conftest.$ac_objext conftest$ac_exeext |
6457 | if { (eval echo "$as_me:6457: \"$ac_link\"") >&5 | 9014 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
6458 | (eval $ac_link) 2>&5 | 9015 | (eval $ac_link) 2>conftest.er1 |
6459 | ac_status=$? | 9016 | ac_status=$? |
6460 | echo "$as_me:6460: \$? = $ac_status" >&5 | 9017 | grep -v '^ *+' conftest.er1 >conftest.err |
9018 | rm -f conftest.er1 | ||
9019 | cat conftest.err >&5 | ||
9020 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6461 | (exit $ac_status); } && | 9021 | (exit $ac_status); } && |
6462 | { ac_try='test -s conftest$ac_exeext' | 9022 | { ac_try='test -z "$ac_c_werror_flag" |
6463 | { (eval echo "$as_me:6463: \"$ac_try\"") >&5 | 9023 | || test ! -s conftest.err' |
9024 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6464 | (eval $ac_try) 2>&5 | 9025 | (eval $ac_try) 2>&5 |
6465 | ac_status=$? | 9026 | ac_status=$? |
6466 | echo "$as_me:6466: \$? = $ac_status" >&5 | 9027 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
9028 | (exit $ac_status); }; } && | ||
9029 | { ac_try='test -s conftest$ac_exeext' | ||
9030 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
9031 | (eval $ac_try) 2>&5 | ||
9032 | ac_status=$? | ||
9033 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6467 | (exit $ac_status); }; }; then | 9034 | (exit $ac_status); }; }; then |
6468 | eval "$as_ac_var=yes" | 9035 | eval "$as_ac_var=yes" |
6469 | else | 9036 | else |
6470 | echo "$as_me: failed program was:" >&5 | 9037 | echo "$as_me: failed program was:" >&5 |
6471 | cat conftest.$ac_ext >&5 | 9038 | sed 's/^/| /' conftest.$ac_ext >&5 |
9039 | |||
6472 | eval "$as_ac_var=no" | 9040 | eval "$as_ac_var=no" |
6473 | fi | 9041 | fi |
6474 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 9042 | rm -f conftest.err conftest.$ac_objext \ |
9043 | conftest$ac_exeext conftest.$ac_ext | ||
6475 | fi | 9044 | fi |
6476 | echo "$as_me:6476: result: `eval echo '${'$as_ac_var'}'`" >&5 | 9045 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 |
6477 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | 9046 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 |
6478 | if test `eval echo '${'$as_ac_var'}'` = yes; then | 9047 | if test `eval echo '${'$as_ac_var'}'` = yes; then |
6479 | cat >>confdefs.h <<EOF | 9048 | cat >>confdefs.h <<_ACEOF |
6480 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 9049 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
6481 | EOF | 9050 | _ACEOF |
6482 | 9051 | ||
6483 | fi | 9052 | fi |
6484 | done | 9053 | done |
6485 | 9054 | ||
9055 | |||
9056 | |||
6486 | for ac_func in strftime | 9057 | for ac_func in strftime |
6487 | do | 9058 | do |
6488 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | 9059 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
6489 | echo "$as_me:6489: checking for $ac_func" >&5 | 9060 | echo "$as_me:$LINENO: checking for $ac_func" >&5 |
6490 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | 9061 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 |
6491 | if eval "test \"\${$as_ac_var+set}\" = set"; then | 9062 | if eval "test \"\${$as_ac_var+set}\" = set"; then |
6492 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 9063 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
6493 | else | 9064 | else |
6494 | cat >conftest.$ac_ext <<_ACEOF | 9065 | cat >conftest.$ac_ext <<_ACEOF |
6495 | #line 6495 "configure" | 9066 | /* confdefs.h. */ |
6496 | #include "confdefs.h" | 9067 | _ACEOF |
9068 | cat confdefs.h >>conftest.$ac_ext | ||
9069 | cat >>conftest.$ac_ext <<_ACEOF | ||
9070 | /* end confdefs.h. */ | ||
9071 | /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
9072 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
9073 | #define $ac_func innocuous_$ac_func | ||
9074 | |||
6497 | /* System header to define __stub macros and hopefully few prototypes, | 9075 | /* System header to define __stub macros and hopefully few prototypes, |
6498 | which can conflict with char $ac_func (); below. */ | 9076 | which can conflict with char $ac_func (); below. |
6499 | #include <assert.h> | 9077 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
9078 | <limits.h> exists even on freestanding compilers. */ | ||
9079 | |||
9080 | #ifdef __STDC__ | ||
9081 | # include <limits.h> | ||
9082 | #else | ||
9083 | # include <assert.h> | ||
9084 | #endif | ||
9085 | |||
9086 | #undef $ac_func | ||
9087 | |||
6500 | /* Override any gcc2 internal prototype to avoid an error. */ | 9088 | /* Override any gcc2 internal prototype to avoid an error. */ |
6501 | #ifdef __cplusplus | 9089 | #ifdef __cplusplus |
6502 | extern "C" | 9090 | extern "C" |
9091 | { | ||
6503 | #endif | 9092 | #endif |
6504 | /* We use char because int might match the return type of a gcc2 | 9093 | /* We use char because int might match the return type of a gcc2 |
6505 | builtin and then its argument prototype would still apply. */ | 9094 | builtin and then its argument prototype would still apply. */ |
6506 | char $ac_func (); | 9095 | char $ac_func (); |
6507 | char (*f) (); | ||
6508 | |||
6509 | int | ||
6510 | main () | ||
6511 | { | ||
6512 | /* The GNU C library defines this for functions which it implements | 9096 | /* The GNU C library defines this for functions which it implements |
6513 | to always fail with ENOSYS. Some functions are actually named | 9097 | to always fail with ENOSYS. Some functions are actually named |
6514 | something starting with __ and the normal name is an alias. */ | 9098 | something starting with __ and the normal name is an alias. */ |
6515 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) | 9099 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) |
6516 | choke me | 9100 | choke me |
6517 | #else | 9101 | #else |
6518 | f = $ac_func; | 9102 | char (*f) () = $ac_func; |
9103 | #endif | ||
9104 | #ifdef __cplusplus | ||
9105 | } | ||
6519 | #endif | 9106 | #endif |
6520 | 9107 | ||
9108 | int | ||
9109 | main () | ||
9110 | { | ||
9111 | return f != $ac_func; | ||
6521 | ; | 9112 | ; |
6522 | return 0; | 9113 | return 0; |
6523 | } | 9114 | } |
6524 | _ACEOF | 9115 | _ACEOF |
6525 | rm -f conftest.$ac_objext conftest$ac_exeext | 9116 | rm -f conftest.$ac_objext conftest$ac_exeext |
6526 | if { (eval echo "$as_me:6526: \"$ac_link\"") >&5 | 9117 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
6527 | (eval $ac_link) 2>&5 | 9118 | (eval $ac_link) 2>conftest.er1 |
6528 | ac_status=$? | 9119 | ac_status=$? |
6529 | echo "$as_me:6529: \$? = $ac_status" >&5 | 9120 | grep -v '^ *+' conftest.er1 >conftest.err |
9121 | rm -f conftest.er1 | ||
9122 | cat conftest.err >&5 | ||
9123 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6530 | (exit $ac_status); } && | 9124 | (exit $ac_status); } && |
6531 | { ac_try='test -s conftest$ac_exeext' | 9125 | { ac_try='test -z "$ac_c_werror_flag" |
6532 | { (eval echo "$as_me:6532: \"$ac_try\"") >&5 | 9126 | || test ! -s conftest.err' |
9127 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
9128 | (eval $ac_try) 2>&5 | ||
9129 | ac_status=$? | ||
9130 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9131 | (exit $ac_status); }; } && | ||
9132 | { ac_try='test -s conftest$ac_exeext' | ||
9133 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6533 | (eval $ac_try) 2>&5 | 9134 | (eval $ac_try) 2>&5 |
6534 | ac_status=$? | 9135 | ac_status=$? |
6535 | echo "$as_me:6535: \$? = $ac_status" >&5 | 9136 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
6536 | (exit $ac_status); }; }; then | 9137 | (exit $ac_status); }; }; then |
6537 | eval "$as_ac_var=yes" | 9138 | eval "$as_ac_var=yes" |
6538 | else | 9139 | else |
6539 | echo "$as_me: failed program was:" >&5 | 9140 | echo "$as_me: failed program was:" >&5 |
6540 | cat conftest.$ac_ext >&5 | 9141 | sed 's/^/| /' conftest.$ac_ext >&5 |
9142 | |||
6541 | eval "$as_ac_var=no" | 9143 | eval "$as_ac_var=no" |
6542 | fi | 9144 | fi |
6543 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 9145 | rm -f conftest.err conftest.$ac_objext \ |
9146 | conftest$ac_exeext conftest.$ac_ext | ||
6544 | fi | 9147 | fi |
6545 | echo "$as_me:6545: result: `eval echo '${'$as_ac_var'}'`" >&5 | 9148 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 |
6546 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | 9149 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 |
6547 | if test `eval echo '${'$as_ac_var'}'` = yes; then | 9150 | if test `eval echo '${'$as_ac_var'}'` = yes; then |
6548 | cat >>confdefs.h <<EOF | 9151 | cat >>confdefs.h <<_ACEOF |
6549 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 9152 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
6550 | EOF | 9153 | _ACEOF |
6551 | 9154 | ||
6552 | else | 9155 | else |
6553 | # strftime is in -lintl on SCO UNIX. | 9156 | # strftime is in -lintl on SCO UNIX. |
6554 | echo "$as_me:6554: checking for strftime in -lintl" >&5 | 9157 | echo "$as_me:$LINENO: checking for strftime in -lintl" >&5 |
6555 | echo $ECHO_N "checking for strftime in -lintl... $ECHO_C" >&6 | 9158 | echo $ECHO_N "checking for strftime in -lintl... $ECHO_C" >&6 |
6556 | if test "${ac_cv_lib_intl_strftime+set}" = set; then | 9159 | if test "${ac_cv_lib_intl_strftime+set}" = set; then |
6557 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 9160 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -6559,8 +9162,11 @@ else | |||
6559 | ac_check_lib_save_LIBS=$LIBS | 9162 | ac_check_lib_save_LIBS=$LIBS |
6560 | LIBS="-lintl $LIBS" | 9163 | LIBS="-lintl $LIBS" |
6561 | cat >conftest.$ac_ext <<_ACEOF | 9164 | cat >conftest.$ac_ext <<_ACEOF |
6562 | #line 6562 "configure" | 9165 | /* confdefs.h. */ |
6563 | #include "confdefs.h" | 9166 | _ACEOF |
9167 | cat confdefs.h >>conftest.$ac_ext | ||
9168 | cat >>conftest.$ac_ext <<_ACEOF | ||
9169 | /* end confdefs.h. */ | ||
6564 | 9170 | ||
6565 | /* Override any gcc2 internal prototype to avoid an error. */ | 9171 | /* Override any gcc2 internal prototype to avoid an error. */ |
6566 | #ifdef __cplusplus | 9172 | #ifdef __cplusplus |
@@ -6578,32 +9184,44 @@ strftime (); | |||
6578 | } | 9184 | } |
6579 | _ACEOF | 9185 | _ACEOF |
6580 | rm -f conftest.$ac_objext conftest$ac_exeext | 9186 | rm -f conftest.$ac_objext conftest$ac_exeext |
6581 | if { (eval echo "$as_me:6581: \"$ac_link\"") >&5 | 9187 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
6582 | (eval $ac_link) 2>&5 | 9188 | (eval $ac_link) 2>conftest.er1 |
6583 | ac_status=$? | 9189 | ac_status=$? |
6584 | echo "$as_me:6584: \$? = $ac_status" >&5 | 9190 | grep -v '^ *+' conftest.er1 >conftest.err |
9191 | rm -f conftest.er1 | ||
9192 | cat conftest.err >&5 | ||
9193 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6585 | (exit $ac_status); } && | 9194 | (exit $ac_status); } && |
6586 | { ac_try='test -s conftest$ac_exeext' | 9195 | { ac_try='test -z "$ac_c_werror_flag" |
6587 | { (eval echo "$as_me:6587: \"$ac_try\"") >&5 | 9196 | || test ! -s conftest.err' |
9197 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
9198 | (eval $ac_try) 2>&5 | ||
9199 | ac_status=$? | ||
9200 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9201 | (exit $ac_status); }; } && | ||
9202 | { ac_try='test -s conftest$ac_exeext' | ||
9203 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6588 | (eval $ac_try) 2>&5 | 9204 | (eval $ac_try) 2>&5 |
6589 | ac_status=$? | 9205 | ac_status=$? |
6590 | echo "$as_me:6590: \$? = $ac_status" >&5 | 9206 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
6591 | (exit $ac_status); }; }; then | 9207 | (exit $ac_status); }; }; then |
6592 | ac_cv_lib_intl_strftime=yes | 9208 | ac_cv_lib_intl_strftime=yes |
6593 | else | 9209 | else |
6594 | echo "$as_me: failed program was:" >&5 | 9210 | echo "$as_me: failed program was:" >&5 |
6595 | cat conftest.$ac_ext >&5 | 9211 | sed 's/^/| /' conftest.$ac_ext >&5 |
9212 | |||
6596 | ac_cv_lib_intl_strftime=no | 9213 | ac_cv_lib_intl_strftime=no |
6597 | fi | 9214 | fi |
6598 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 9215 | rm -f conftest.err conftest.$ac_objext \ |
9216 | conftest$ac_exeext conftest.$ac_ext | ||
6599 | LIBS=$ac_check_lib_save_LIBS | 9217 | LIBS=$ac_check_lib_save_LIBS |
6600 | fi | 9218 | fi |
6601 | echo "$as_me:6601: result: $ac_cv_lib_intl_strftime" >&5 | 9219 | echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5 |
6602 | echo "${ECHO_T}$ac_cv_lib_intl_strftime" >&6 | 9220 | echo "${ECHO_T}$ac_cv_lib_intl_strftime" >&6 |
6603 | if test $ac_cv_lib_intl_strftime = yes; then | 9221 | if test $ac_cv_lib_intl_strftime = yes; then |
6604 | cat >>confdefs.h <<\EOF | 9222 | cat >>confdefs.h <<\_ACEOF |
6605 | #define HAVE_STRFTIME 1 | 9223 | #define HAVE_STRFTIME 1 |
6606 | EOF | 9224 | _ACEOF |
6607 | 9225 | ||
6608 | LIBS="-lintl $LIBS" | 9226 | LIBS="-lintl $LIBS" |
6609 | fi | 9227 | fi |
@@ -6611,12 +9229,16 @@ fi | |||
6611 | fi | 9229 | fi |
6612 | done | 9230 | done |
6613 | 9231 | ||
9232 | |||
6614 | # Check for ALTDIRFUNC glob() extension | 9233 | # Check for ALTDIRFUNC glob() extension |
6615 | echo "$as_me:6615: checking for GLOB_ALTDIRFUNC support" >&5 | 9234 | echo "$as_me:$LINENO: checking for GLOB_ALTDIRFUNC support" >&5 |
6616 | echo $ECHO_N "checking for GLOB_ALTDIRFUNC support... $ECHO_C" >&6 | 9235 | echo $ECHO_N "checking for GLOB_ALTDIRFUNC support... $ECHO_C" >&6 |
6617 | cat >conftest.$ac_ext <<_ACEOF | 9236 | cat >conftest.$ac_ext <<_ACEOF |
6618 | #line 6618 "configure" | 9237 | /* confdefs.h. */ |
6619 | #include "confdefs.h" | 9238 | _ACEOF |
9239 | cat confdefs.h >>conftest.$ac_ext | ||
9240 | cat >>conftest.$ac_ext <<_ACEOF | ||
9241 | /* end confdefs.h. */ | ||
6620 | 9242 | ||
6621 | #include <glob.h> | 9243 | #include <glob.h> |
6622 | #ifdef GLOB_ALTDIRFUNC | 9244 | #ifdef GLOB_ALTDIRFUNC |
@@ -6625,62 +9247,74 @@ cat >conftest.$ac_ext <<_ACEOF | |||
6625 | 9247 | ||
6626 | _ACEOF | 9248 | _ACEOF |
6627 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | 9249 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | |
6628 | egrep "FOUNDIT" >/dev/null 2>&1; then | 9250 | $EGREP "FOUNDIT" >/dev/null 2>&1; then |
6629 | 9251 | ||
6630 | cat >>confdefs.h <<\EOF | 9252 | cat >>confdefs.h <<\_ACEOF |
6631 | #define GLOB_HAS_ALTDIRFUNC 1 | 9253 | #define GLOB_HAS_ALTDIRFUNC 1 |
6632 | EOF | 9254 | _ACEOF |
6633 | 9255 | ||
6634 | echo "$as_me:6634: result: yes" >&5 | 9256 | echo "$as_me:$LINENO: result: yes" >&5 |
6635 | echo "${ECHO_T}yes" >&6 | 9257 | echo "${ECHO_T}yes" >&6 |
6636 | 9258 | ||
6637 | else | 9259 | else |
6638 | 9260 | ||
6639 | echo "$as_me:6639: result: no" >&5 | 9261 | echo "$as_me:$LINENO: result: no" >&5 |
6640 | echo "${ECHO_T}no" >&6 | 9262 | echo "${ECHO_T}no" >&6 |
6641 | 9263 | ||
9264 | |||
6642 | fi | 9265 | fi |
6643 | rm -f conftest* | 9266 | rm -f conftest* |
6644 | 9267 | ||
9268 | |||
6645 | # Check for g.gl_matchc glob() extension | 9269 | # Check for g.gl_matchc glob() extension |
6646 | echo "$as_me:6646: checking for gl_matchc field in glob_t" >&5 | 9270 | echo "$as_me:$LINENO: checking for gl_matchc field in glob_t" >&5 |
6647 | echo $ECHO_N "checking for gl_matchc field in glob_t... $ECHO_C" >&6 | 9271 | echo $ECHO_N "checking for gl_matchc field in glob_t... $ECHO_C" >&6 |
6648 | cat >conftest.$ac_ext <<_ACEOF | 9272 | cat >conftest.$ac_ext <<_ACEOF |
6649 | #line 6649 "configure" | 9273 | /* confdefs.h. */ |
6650 | #include "confdefs.h" | 9274 | _ACEOF |
9275 | cat confdefs.h >>conftest.$ac_ext | ||
9276 | cat >>conftest.$ac_ext <<_ACEOF | ||
9277 | /* end confdefs.h. */ | ||
6651 | 9278 | ||
6652 | #include <glob.h> | 9279 | #include <glob.h> |
6653 | int main(void){glob_t g; g.gl_matchc = 1;} | 9280 | int main(void){glob_t g; g.gl_matchc = 1;} |
6654 | 9281 | ||
6655 | _ACEOF | 9282 | _ACEOF |
6656 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | 9283 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | |
6657 | egrep "FOUNDIT" >/dev/null 2>&1; then | 9284 | $EGREP "FOUNDIT" >/dev/null 2>&1; then |
6658 | 9285 | ||
6659 | cat >>confdefs.h <<\EOF | 9286 | cat >>confdefs.h <<\_ACEOF |
6660 | #define GLOB_HAS_GL_MATCHC 1 | 9287 | #define GLOB_HAS_GL_MATCHC 1 |
6661 | EOF | 9288 | _ACEOF |
6662 | 9289 | ||
6663 | echo "$as_me:6663: result: yes" >&5 | 9290 | echo "$as_me:$LINENO: result: yes" >&5 |
6664 | echo "${ECHO_T}yes" >&6 | 9291 | echo "${ECHO_T}yes" >&6 |
6665 | 9292 | ||
6666 | else | 9293 | else |
6667 | 9294 | ||
6668 | echo "$as_me:6668: result: no" >&5 | 9295 | echo "$as_me:$LINENO: result: no" >&5 |
6669 | echo "${ECHO_T}no" >&6 | 9296 | echo "${ECHO_T}no" >&6 |
6670 | 9297 | ||
9298 | |||
6671 | fi | 9299 | fi |
6672 | rm -f conftest* | 9300 | rm -f conftest* |
6673 | 9301 | ||
6674 | echo "$as_me:6674: checking whether struct dirent allocates space for d_name" >&5 | 9302 | |
9303 | echo "$as_me:$LINENO: checking whether struct dirent allocates space for d_name" >&5 | ||
6675 | echo $ECHO_N "checking whether struct dirent allocates space for d_name... $ECHO_C" >&6 | 9304 | echo $ECHO_N "checking whether struct dirent allocates space for d_name... $ECHO_C" >&6 |
6676 | if test "$cross_compiling" = yes; then | 9305 | if test "$cross_compiling" = yes; then |
6677 | { { echo "$as_me:6677: error: cannot run test program while cross compiling" >&5 | 9306 | { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
6678 | echo "$as_me: error: cannot run test program while cross compiling" >&2;} | 9307 | See \`config.log' for more details." >&5 |
9308 | echo "$as_me: error: cannot run test program while cross compiling | ||
9309 | See \`config.log' for more details." >&2;} | ||
6679 | { (exit 1); exit 1; }; } | 9310 | { (exit 1); exit 1; }; } |
6680 | else | 9311 | else |
6681 | cat >conftest.$ac_ext <<_ACEOF | 9312 | cat >conftest.$ac_ext <<_ACEOF |
6682 | #line 6682 "configure" | 9313 | /* confdefs.h. */ |
6683 | #include "confdefs.h" | 9314 | _ACEOF |
9315 | cat confdefs.h >>conftest.$ac_ext | ||
9316 | cat >>conftest.$ac_ext <<_ACEOF | ||
9317 | /* end confdefs.h. */ | ||
6684 | 9318 | ||
6685 | #include <sys/types.h> | 9319 | #include <sys/types.h> |
6686 | #include <dirent.h> | 9320 | #include <dirent.h> |
@@ -6688,31 +9322,49 @@ int main(void){struct dirent d;exit(sizeof(d.d_name)<=sizeof(char));} | |||
6688 | 9322 | ||
6689 | _ACEOF | 9323 | _ACEOF |
6690 | rm -f conftest$ac_exeext | 9324 | rm -f conftest$ac_exeext |
6691 | if { (eval echo "$as_me:6691: \"$ac_link\"") >&5 | 9325 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
6692 | (eval $ac_link) 2>&5 | 9326 | (eval $ac_link) 2>&5 |
6693 | ac_status=$? | 9327 | ac_status=$? |
6694 | echo "$as_me:6694: \$? = $ac_status" >&5 | 9328 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
6695 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | 9329 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
6696 | { (eval echo "$as_me:6696: \"$ac_try\"") >&5 | 9330 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
6697 | (eval $ac_try) 2>&5 | 9331 | (eval $ac_try) 2>&5 |
6698 | ac_status=$? | 9332 | ac_status=$? |
6699 | echo "$as_me:6699: \$? = $ac_status" >&5 | 9333 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
6700 | (exit $ac_status); }; }; then | 9334 | (exit $ac_status); }; }; then |
6701 | echo "$as_me:6701: result: yes" >&5 | 9335 | echo "$as_me:$LINENO: result: yes" >&5 |
6702 | echo "${ECHO_T}yes" >&6 | 9336 | echo "${ECHO_T}yes" >&6 |
6703 | else | 9337 | else |
6704 | echo "$as_me: program exited with status $ac_status" >&5 | 9338 | echo "$as_me: program exited with status $ac_status" >&5 |
6705 | echo "$as_me: failed program was:" >&5 | 9339 | echo "$as_me: failed program was:" >&5 |
6706 | cat conftest.$ac_ext >&5 | 9340 | sed 's/^/| /' conftest.$ac_ext >&5 |
9341 | |||
9342 | ( exit $ac_status ) | ||
6707 | 9343 | ||
6708 | echo "$as_me:6708: result: no" >&5 | 9344 | echo "$as_me:$LINENO: result: no" >&5 |
6709 | echo "${ECHO_T}no" >&6 | 9345 | echo "${ECHO_T}no" >&6 |
6710 | cat >>confdefs.h <<\EOF | 9346 | cat >>confdefs.h <<\_ACEOF |
6711 | #define BROKEN_ONE_BYTE_DIRENT_D_NAME 1 | 9347 | #define BROKEN_ONE_BYTE_DIRENT_D_NAME 1 |
6712 | EOF | 9348 | _ACEOF |
9349 | |||
9350 | |||
6713 | 9351 | ||
6714 | fi | 9352 | fi |
6715 | rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | 9353 | rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext |
9354 | fi | ||
9355 | |||
9356 | echo "$as_me:$LINENO: checking for /proc/pid/fd directory" >&5 | ||
9357 | echo $ECHO_N "checking for /proc/pid/fd directory... $ECHO_C" >&6 | ||
9358 | if test -d "/proc/$$/fd" ; then | ||
9359 | cat >>confdefs.h <<\_ACEOF | ||
9360 | #define HAVE_PROC_PID 1 | ||
9361 | _ACEOF | ||
9362 | |||
9363 | echo "$as_me:$LINENO: result: yes" >&5 | ||
9364 | echo "${ECHO_T}yes" >&6 | ||
9365 | else | ||
9366 | echo "$as_me:$LINENO: result: no" >&5 | ||
9367 | echo "${ECHO_T}no" >&6 | ||
6716 | fi | 9368 | fi |
6717 | 9369 | ||
6718 | # Check whether user wants S/Key support | 9370 | # Check whether user wants S/Key support |
@@ -6729,23 +9381,28 @@ if test "${with_skey+set}" = set; then | |||
6729 | LDFLAGS="$LDFLAGS -L${withval}/lib" | 9381 | LDFLAGS="$LDFLAGS -L${withval}/lib" |
6730 | fi | 9382 | fi |
6731 | 9383 | ||
6732 | cat >>confdefs.h <<\EOF | 9384 | cat >>confdefs.h <<\_ACEOF |
6733 | #define SKEY 1 | 9385 | #define SKEY 1 |
6734 | EOF | 9386 | _ACEOF |
6735 | 9387 | ||
6736 | LIBS="-lskey $LIBS" | 9388 | LIBS="-lskey $LIBS" |
6737 | SKEY_MSG="yes" | 9389 | SKEY_MSG="yes" |
6738 | 9390 | ||
6739 | echo "$as_me:6739: checking for s/key support" >&5 | 9391 | echo "$as_me:$LINENO: checking for s/key support" >&5 |
6740 | echo $ECHO_N "checking for s/key support... $ECHO_C" >&6 | 9392 | echo $ECHO_N "checking for s/key support... $ECHO_C" >&6 |
6741 | if test "$cross_compiling" = yes; then | 9393 | if test "$cross_compiling" = yes; then |
6742 | { { echo "$as_me:6742: error: cannot run test program while cross compiling" >&5 | 9394 | { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
6743 | echo "$as_me: error: cannot run test program while cross compiling" >&2;} | 9395 | See \`config.log' for more details." >&5 |
9396 | echo "$as_me: error: cannot run test program while cross compiling | ||
9397 | See \`config.log' for more details." >&2;} | ||
6744 | { (exit 1); exit 1; }; } | 9398 | { (exit 1); exit 1; }; } |
6745 | else | 9399 | else |
6746 | cat >conftest.$ac_ext <<_ACEOF | 9400 | cat >conftest.$ac_ext <<_ACEOF |
6747 | #line 6747 "configure" | 9401 | /* confdefs.h. */ |
6748 | #include "confdefs.h" | 9402 | _ACEOF |
9403 | cat confdefs.h >>conftest.$ac_ext | ||
9404 | cat >>conftest.$ac_ext <<_ACEOF | ||
9405 | /* end confdefs.h. */ | ||
6749 | 9406 | ||
6750 | #include <stdio.h> | 9407 | #include <stdio.h> |
6751 | #include <skey.h> | 9408 | #include <skey.h> |
@@ -6753,37 +9410,42 @@ int main() { char *ff = skey_keyinfo(""); ff=""; exit(0); } | |||
6753 | 9410 | ||
6754 | _ACEOF | 9411 | _ACEOF |
6755 | rm -f conftest$ac_exeext | 9412 | rm -f conftest$ac_exeext |
6756 | if { (eval echo "$as_me:6756: \"$ac_link\"") >&5 | 9413 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
6757 | (eval $ac_link) 2>&5 | 9414 | (eval $ac_link) 2>&5 |
6758 | ac_status=$? | 9415 | ac_status=$? |
6759 | echo "$as_me:6759: \$? = $ac_status" >&5 | 9416 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
6760 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | 9417 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
6761 | { (eval echo "$as_me:6761: \"$ac_try\"") >&5 | 9418 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
6762 | (eval $ac_try) 2>&5 | 9419 | (eval $ac_try) 2>&5 |
6763 | ac_status=$? | 9420 | ac_status=$? |
6764 | echo "$as_me:6764: \$? = $ac_status" >&5 | 9421 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
6765 | (exit $ac_status); }; }; then | 9422 | (exit $ac_status); }; }; then |
6766 | echo "$as_me:6766: result: yes" >&5 | 9423 | echo "$as_me:$LINENO: result: yes" >&5 |
6767 | echo "${ECHO_T}yes" >&6 | 9424 | echo "${ECHO_T}yes" >&6 |
6768 | else | 9425 | else |
6769 | echo "$as_me: program exited with status $ac_status" >&5 | 9426 | echo "$as_me: program exited with status $ac_status" >&5 |
6770 | echo "$as_me: failed program was:" >&5 | 9427 | echo "$as_me: failed program was:" >&5 |
6771 | cat conftest.$ac_ext >&5 | 9428 | sed 's/^/| /' conftest.$ac_ext >&5 |
9429 | |||
9430 | ( exit $ac_status ) | ||
6772 | 9431 | ||
6773 | echo "$as_me:6773: result: no" >&5 | 9432 | echo "$as_me:$LINENO: result: no" >&5 |
6774 | echo "${ECHO_T}no" >&6 | 9433 | echo "${ECHO_T}no" >&6 |
6775 | { { echo "$as_me:6775: error: ** Incomplete or missing s/key libraries." >&5 | 9434 | { { echo "$as_me:$LINENO: error: ** Incomplete or missing s/key libraries." >&5 |
6776 | echo "$as_me: error: ** Incomplete or missing s/key libraries." >&2;} | 9435 | echo "$as_me: error: ** Incomplete or missing s/key libraries." >&2;} |
6777 | { (exit 1); exit 1; }; } | 9436 | { (exit 1); exit 1; }; } |
6778 | 9437 | ||
6779 | fi | 9438 | fi |
6780 | rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | 9439 | rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext |
6781 | fi | 9440 | fi |
6782 | echo "$as_me:6782: checking if skeychallenge takes 4 arguments" >&5 | 9441 | echo "$as_me:$LINENO: checking if skeychallenge takes 4 arguments" >&5 |
6783 | echo $ECHO_N "checking if skeychallenge takes 4 arguments... $ECHO_C" >&6 | 9442 | echo $ECHO_N "checking if skeychallenge takes 4 arguments... $ECHO_C" >&6 |
6784 | cat >conftest.$ac_ext <<_ACEOF | 9443 | cat >conftest.$ac_ext <<_ACEOF |
6785 | #line 6785 "configure" | 9444 | /* confdefs.h. */ |
6786 | #include "confdefs.h" | 9445 | _ACEOF |
9446 | cat confdefs.h >>conftest.$ac_ext | ||
9447 | cat >>conftest.$ac_ext <<_ACEOF | ||
9448 | /* end confdefs.h. */ | ||
6787 | #include <stdio.h> | 9449 | #include <stdio.h> |
6788 | #include <skey.h> | 9450 | #include <skey.h> |
6789 | int | 9451 | int |
@@ -6795,33 +9457,45 @@ main () | |||
6795 | } | 9457 | } |
6796 | _ACEOF | 9458 | _ACEOF |
6797 | rm -f conftest.$ac_objext | 9459 | rm -f conftest.$ac_objext |
6798 | if { (eval echo "$as_me:6798: \"$ac_compile\"") >&5 | 9460 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
6799 | (eval $ac_compile) 2>&5 | 9461 | (eval $ac_compile) 2>conftest.er1 |
6800 | ac_status=$? | 9462 | ac_status=$? |
6801 | echo "$as_me:6801: \$? = $ac_status" >&5 | 9463 | grep -v '^ *+' conftest.er1 >conftest.err |
9464 | rm -f conftest.er1 | ||
9465 | cat conftest.err >&5 | ||
9466 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6802 | (exit $ac_status); } && | 9467 | (exit $ac_status); } && |
6803 | { ac_try='test -s conftest.$ac_objext' | 9468 | { ac_try='test -z "$ac_c_werror_flag" |
6804 | { (eval echo "$as_me:6804: \"$ac_try\"") >&5 | 9469 | || test ! -s conftest.err' |
9470 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6805 | (eval $ac_try) 2>&5 | 9471 | (eval $ac_try) 2>&5 |
6806 | ac_status=$? | 9472 | ac_status=$? |
6807 | echo "$as_me:6807: \$? = $ac_status" >&5 | 9473 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
9474 | (exit $ac_status); }; } && | ||
9475 | { ac_try='test -s conftest.$ac_objext' | ||
9476 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
9477 | (eval $ac_try) 2>&5 | ||
9478 | ac_status=$? | ||
9479 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6808 | (exit $ac_status); }; }; then | 9480 | (exit $ac_status); }; }; then |
6809 | echo "$as_me:6809: result: yes" >&5 | 9481 | echo "$as_me:$LINENO: result: yes" >&5 |
6810 | echo "${ECHO_T}yes" >&6 | 9482 | echo "${ECHO_T}yes" >&6 |
6811 | cat >>confdefs.h <<\EOF | 9483 | cat >>confdefs.h <<\_ACEOF |
6812 | #define SKEYCHALLENGE_4ARG 1 | 9484 | #define SKEYCHALLENGE_4ARG 1 |
6813 | EOF | 9485 | _ACEOF |
6814 | 9486 | ||
6815 | else | 9487 | else |
6816 | echo "$as_me: failed program was:" >&5 | 9488 | echo "$as_me: failed program was:" >&5 |
6817 | cat conftest.$ac_ext >&5 | 9489 | sed 's/^/| /' conftest.$ac_ext >&5 |
6818 | echo "$as_me:6818: result: no" >&5 | 9490 | |
9491 | echo "$as_me:$LINENO: result: no" >&5 | ||
6819 | echo "${ECHO_T}no" >&6 | 9492 | echo "${ECHO_T}no" >&6 |
6820 | 9493 | ||
6821 | fi | 9494 | fi |
6822 | rm -f conftest.$ac_objext conftest.$ac_ext | 9495 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
6823 | fi | 9496 | fi |
6824 | 9497 | ||
9498 | |||
6825 | fi; | 9499 | fi; |
6826 | 9500 | ||
6827 | # Check whether user wants TCP wrappers support | 9501 | # Check whether user wants TCP wrappers support |
@@ -6857,11 +9531,14 @@ if test "${with_tcp_wrappers+set}" = set; then | |||
6857 | fi | 9531 | fi |
6858 | LIBWRAP="-lwrap" | 9532 | LIBWRAP="-lwrap" |
6859 | LIBS="$LIBWRAP $LIBS" | 9533 | LIBS="$LIBWRAP $LIBS" |
6860 | echo "$as_me:6860: checking for libwrap" >&5 | 9534 | echo "$as_me:$LINENO: checking for libwrap" >&5 |
6861 | echo $ECHO_N "checking for libwrap... $ECHO_C" >&6 | 9535 | echo $ECHO_N "checking for libwrap... $ECHO_C" >&6 |
6862 | cat >conftest.$ac_ext <<_ACEOF | 9536 | cat >conftest.$ac_ext <<_ACEOF |
6863 | #line 6863 "configure" | 9537 | /* confdefs.h. */ |
6864 | #include "confdefs.h" | 9538 | _ACEOF |
9539 | cat confdefs.h >>conftest.$ac_ext | ||
9540 | cat >>conftest.$ac_ext <<_ACEOF | ||
9541 | /* end confdefs.h. */ | ||
6865 | 9542 | ||
6866 | #include <sys/types.h> | 9543 | #include <sys/types.h> |
6867 | #include <sys/socket.h> | 9544 | #include <sys/socket.h> |
@@ -6878,45 +9555,137 @@ hosts_access(0); | |||
6878 | } | 9555 | } |
6879 | _ACEOF | 9556 | _ACEOF |
6880 | rm -f conftest.$ac_objext conftest$ac_exeext | 9557 | rm -f conftest.$ac_objext conftest$ac_exeext |
6881 | if { (eval echo "$as_me:6881: \"$ac_link\"") >&5 | 9558 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
6882 | (eval $ac_link) 2>&5 | 9559 | (eval $ac_link) 2>conftest.er1 |
6883 | ac_status=$? | 9560 | ac_status=$? |
6884 | echo "$as_me:6884: \$? = $ac_status" >&5 | 9561 | grep -v '^ *+' conftest.er1 >conftest.err |
9562 | rm -f conftest.er1 | ||
9563 | cat conftest.err >&5 | ||
9564 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6885 | (exit $ac_status); } && | 9565 | (exit $ac_status); } && |
6886 | { ac_try='test -s conftest$ac_exeext' | 9566 | { ac_try='test -z "$ac_c_werror_flag" |
6887 | { (eval echo "$as_me:6887: \"$ac_try\"") >&5 | 9567 | || test ! -s conftest.err' |
9568 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6888 | (eval $ac_try) 2>&5 | 9569 | (eval $ac_try) 2>&5 |
6889 | ac_status=$? | 9570 | ac_status=$? |
6890 | echo "$as_me:6890: \$? = $ac_status" >&5 | 9571 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
9572 | (exit $ac_status); }; } && | ||
9573 | { ac_try='test -s conftest$ac_exeext' | ||
9574 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
9575 | (eval $ac_try) 2>&5 | ||
9576 | ac_status=$? | ||
9577 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6891 | (exit $ac_status); }; }; then | 9578 | (exit $ac_status); }; }; then |
6892 | 9579 | ||
6893 | echo "$as_me:6893: result: yes" >&5 | 9580 | echo "$as_me:$LINENO: result: yes" >&5 |
6894 | echo "${ECHO_T}yes" >&6 | 9581 | echo "${ECHO_T}yes" >&6 |
6895 | cat >>confdefs.h <<\EOF | 9582 | cat >>confdefs.h <<\_ACEOF |
6896 | #define LIBWRAP 1 | 9583 | #define LIBWRAP 1 |
6897 | EOF | 9584 | _ACEOF |
9585 | |||
6898 | 9586 | ||
6899 | TCPW_MSG="yes" | 9587 | TCPW_MSG="yes" |
6900 | 9588 | ||
6901 | else | 9589 | else |
6902 | echo "$as_me: failed program was:" >&5 | 9590 | echo "$as_me: failed program was:" >&5 |
6903 | cat conftest.$ac_ext >&5 | 9591 | sed 's/^/| /' conftest.$ac_ext >&5 |
9592 | |||
6904 | 9593 | ||
6905 | { { echo "$as_me:6905: error: *** libwrap missing" >&5 | 9594 | { { echo "$as_me:$LINENO: error: *** libwrap missing" >&5 |
6906 | echo "$as_me: error: *** libwrap missing" >&2;} | 9595 | echo "$as_me: error: *** libwrap missing" >&2;} |
6907 | { (exit 1); exit 1; }; } | 9596 | { (exit 1); exit 1; }; } |
6908 | 9597 | ||
9598 | |||
6909 | fi | 9599 | fi |
6910 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 9600 | rm -f conftest.err conftest.$ac_objext \ |
9601 | conftest$ac_exeext conftest.$ac_ext | ||
6911 | LIBS="$saved_LIBS" | 9602 | LIBS="$saved_LIBS" |
6912 | fi | 9603 | fi |
6913 | 9604 | ||
9605 | |||
6914 | fi; | 9606 | fi; |
6915 | 9607 | ||
9608 | |||
9609 | |||
9610 | |||
9611 | |||
9612 | |||
9613 | |||
9614 | |||
9615 | |||
9616 | |||
9617 | |||
9618 | |||
9619 | |||
9620 | |||
9621 | |||
9622 | |||
9623 | |||
9624 | |||
9625 | |||
9626 | |||
9627 | |||
9628 | |||
9629 | |||
9630 | |||
9631 | |||
9632 | |||
9633 | |||
9634 | |||
9635 | |||
9636 | |||
9637 | |||
9638 | |||
9639 | |||
9640 | |||
9641 | |||
9642 | |||
9643 | |||
9644 | |||
9645 | |||
9646 | |||
9647 | |||
9648 | |||
9649 | |||
9650 | |||
9651 | |||
9652 | |||
9653 | |||
9654 | |||
9655 | |||
9656 | |||
9657 | |||
9658 | |||
9659 | |||
9660 | |||
9661 | |||
9662 | |||
9663 | |||
9664 | |||
9665 | |||
9666 | |||
9667 | |||
9668 | |||
9669 | |||
9670 | |||
9671 | |||
9672 | |||
9673 | |||
9674 | |||
9675 | |||
9676 | |||
9677 | |||
9678 | |||
9679 | |||
9680 | |||
9681 | |||
9682 | |||
9683 | |||
9684 | |||
6916 | for ac_func in \ | 9685 | for ac_func in \ |
6917 | arc4random __b64_ntop b64_ntop __b64_pton b64_pton \ | 9686 | arc4random __b64_ntop b64_ntop __b64_pton b64_pton bcopy \ |
6918 | bcopy bindresvport_sa clock fchmod fchown freeaddrinfo futimes \ | 9687 | bindresvport_sa clock closefrom dirfd fchmod fchown freeaddrinfo \ |
6919 | getaddrinfo getcwd getgrouplist getnameinfo getopt \ | 9688 | futimes getaddrinfo getcwd getgrouplist getnameinfo getopt \ |
6920 | getpeereid _getpty getrlimit getttyent glob inet_aton \ | 9689 | getpeereid _getpty getrlimit getttyent glob inet_aton \ |
6921 | inet_ntoa inet_ntop innetgr login_getcapbool md5_crypt memmove \ | 9690 | inet_ntoa inet_ntop innetgr login_getcapbool md5_crypt memmove \ |
6922 | mkdtemp mmap ngetaddrinfo nsleep ogetaddrinfo openlog_r openpty \ | 9691 | mkdtemp mmap ngetaddrinfo nsleep ogetaddrinfo openlog_r openpty \ |
@@ -6929,147 +9698,215 @@ for ac_func in \ | |||
6929 | 9698 | ||
6930 | do | 9699 | do |
6931 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | 9700 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
6932 | echo "$as_me:6932: checking for $ac_func" >&5 | 9701 | echo "$as_me:$LINENO: checking for $ac_func" >&5 |
6933 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | 9702 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 |
6934 | if eval "test \"\${$as_ac_var+set}\" = set"; then | 9703 | if eval "test \"\${$as_ac_var+set}\" = set"; then |
6935 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 9704 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
6936 | else | 9705 | else |
6937 | cat >conftest.$ac_ext <<_ACEOF | 9706 | cat >conftest.$ac_ext <<_ACEOF |
6938 | #line 6938 "configure" | 9707 | /* confdefs.h. */ |
6939 | #include "confdefs.h" | 9708 | _ACEOF |
9709 | cat confdefs.h >>conftest.$ac_ext | ||
9710 | cat >>conftest.$ac_ext <<_ACEOF | ||
9711 | /* end confdefs.h. */ | ||
9712 | /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
9713 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
9714 | #define $ac_func innocuous_$ac_func | ||
9715 | |||
6940 | /* System header to define __stub macros and hopefully few prototypes, | 9716 | /* System header to define __stub macros and hopefully few prototypes, |
6941 | which can conflict with char $ac_func (); below. */ | 9717 | which can conflict with char $ac_func (); below. |
6942 | #include <assert.h> | 9718 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
9719 | <limits.h> exists even on freestanding compilers. */ | ||
9720 | |||
9721 | #ifdef __STDC__ | ||
9722 | # include <limits.h> | ||
9723 | #else | ||
9724 | # include <assert.h> | ||
9725 | #endif | ||
9726 | |||
9727 | #undef $ac_func | ||
9728 | |||
6943 | /* Override any gcc2 internal prototype to avoid an error. */ | 9729 | /* Override any gcc2 internal prototype to avoid an error. */ |
6944 | #ifdef __cplusplus | 9730 | #ifdef __cplusplus |
6945 | extern "C" | 9731 | extern "C" |
9732 | { | ||
6946 | #endif | 9733 | #endif |
6947 | /* We use char because int might match the return type of a gcc2 | 9734 | /* We use char because int might match the return type of a gcc2 |
6948 | builtin and then its argument prototype would still apply. */ | 9735 | builtin and then its argument prototype would still apply. */ |
6949 | char $ac_func (); | 9736 | char $ac_func (); |
6950 | char (*f) (); | ||
6951 | |||
6952 | int | ||
6953 | main () | ||
6954 | { | ||
6955 | /* The GNU C library defines this for functions which it implements | 9737 | /* The GNU C library defines this for functions which it implements |
6956 | to always fail with ENOSYS. Some functions are actually named | 9738 | to always fail with ENOSYS. Some functions are actually named |
6957 | something starting with __ and the normal name is an alias. */ | 9739 | something starting with __ and the normal name is an alias. */ |
6958 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) | 9740 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) |
6959 | choke me | 9741 | choke me |
6960 | #else | 9742 | #else |
6961 | f = $ac_func; | 9743 | char (*f) () = $ac_func; |
9744 | #endif | ||
9745 | #ifdef __cplusplus | ||
9746 | } | ||
6962 | #endif | 9747 | #endif |
6963 | 9748 | ||
9749 | int | ||
9750 | main () | ||
9751 | { | ||
9752 | return f != $ac_func; | ||
6964 | ; | 9753 | ; |
6965 | return 0; | 9754 | return 0; |
6966 | } | 9755 | } |
6967 | _ACEOF | 9756 | _ACEOF |
6968 | rm -f conftest.$ac_objext conftest$ac_exeext | 9757 | rm -f conftest.$ac_objext conftest$ac_exeext |
6969 | if { (eval echo "$as_me:6969: \"$ac_link\"") >&5 | 9758 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
6970 | (eval $ac_link) 2>&5 | 9759 | (eval $ac_link) 2>conftest.er1 |
6971 | ac_status=$? | 9760 | ac_status=$? |
6972 | echo "$as_me:6972: \$? = $ac_status" >&5 | 9761 | grep -v '^ *+' conftest.er1 >conftest.err |
9762 | rm -f conftest.er1 | ||
9763 | cat conftest.err >&5 | ||
9764 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6973 | (exit $ac_status); } && | 9765 | (exit $ac_status); } && |
6974 | { ac_try='test -s conftest$ac_exeext' | 9766 | { ac_try='test -z "$ac_c_werror_flag" |
6975 | { (eval echo "$as_me:6975: \"$ac_try\"") >&5 | 9767 | || test ! -s conftest.err' |
9768 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
6976 | (eval $ac_try) 2>&5 | 9769 | (eval $ac_try) 2>&5 |
6977 | ac_status=$? | 9770 | ac_status=$? |
6978 | echo "$as_me:6978: \$? = $ac_status" >&5 | 9771 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
9772 | (exit $ac_status); }; } && | ||
9773 | { ac_try='test -s conftest$ac_exeext' | ||
9774 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
9775 | (eval $ac_try) 2>&5 | ||
9776 | ac_status=$? | ||
9777 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
6979 | (exit $ac_status); }; }; then | 9778 | (exit $ac_status); }; }; then |
6980 | eval "$as_ac_var=yes" | 9779 | eval "$as_ac_var=yes" |
6981 | else | 9780 | else |
6982 | echo "$as_me: failed program was:" >&5 | 9781 | echo "$as_me: failed program was:" >&5 |
6983 | cat conftest.$ac_ext >&5 | 9782 | sed 's/^/| /' conftest.$ac_ext >&5 |
9783 | |||
6984 | eval "$as_ac_var=no" | 9784 | eval "$as_ac_var=no" |
6985 | fi | 9785 | fi |
6986 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 9786 | rm -f conftest.err conftest.$ac_objext \ |
9787 | conftest$ac_exeext conftest.$ac_ext | ||
6987 | fi | 9788 | fi |
6988 | echo "$as_me:6988: result: `eval echo '${'$as_ac_var'}'`" >&5 | 9789 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 |
6989 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | 9790 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 |
6990 | if test `eval echo '${'$as_ac_var'}'` = yes; then | 9791 | if test `eval echo '${'$as_ac_var'}'` = yes; then |
6991 | cat >>confdefs.h <<EOF | 9792 | cat >>confdefs.h <<_ACEOF |
6992 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 9793 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
6993 | EOF | 9794 | _ACEOF |
6994 | 9795 | ||
6995 | fi | 9796 | fi |
6996 | done | 9797 | done |
6997 | 9798 | ||
9799 | |||
6998 | # IRIX has a const char return value for gai_strerror() | 9800 | # IRIX has a const char return value for gai_strerror() |
6999 | 9801 | ||
7000 | for ac_func in gai_strerror | 9802 | for ac_func in gai_strerror |
7001 | do | 9803 | do |
7002 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | 9804 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
7003 | echo "$as_me:7003: checking for $ac_func" >&5 | 9805 | echo "$as_me:$LINENO: checking for $ac_func" >&5 |
7004 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | 9806 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 |
7005 | if eval "test \"\${$as_ac_var+set}\" = set"; then | 9807 | if eval "test \"\${$as_ac_var+set}\" = set"; then |
7006 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 9808 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
7007 | else | 9809 | else |
7008 | cat >conftest.$ac_ext <<_ACEOF | 9810 | cat >conftest.$ac_ext <<_ACEOF |
7009 | #line 7009 "configure" | 9811 | /* confdefs.h. */ |
7010 | #include "confdefs.h" | 9812 | _ACEOF |
9813 | cat confdefs.h >>conftest.$ac_ext | ||
9814 | cat >>conftest.$ac_ext <<_ACEOF | ||
9815 | /* end confdefs.h. */ | ||
9816 | /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
9817 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
9818 | #define $ac_func innocuous_$ac_func | ||
9819 | |||
7011 | /* System header to define __stub macros and hopefully few prototypes, | 9820 | /* System header to define __stub macros and hopefully few prototypes, |
7012 | which can conflict with char $ac_func (); below. */ | 9821 | which can conflict with char $ac_func (); below. |
7013 | #include <assert.h> | 9822 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
9823 | <limits.h> exists even on freestanding compilers. */ | ||
9824 | |||
9825 | #ifdef __STDC__ | ||
9826 | # include <limits.h> | ||
9827 | #else | ||
9828 | # include <assert.h> | ||
9829 | #endif | ||
9830 | |||
9831 | #undef $ac_func | ||
9832 | |||
7014 | /* Override any gcc2 internal prototype to avoid an error. */ | 9833 | /* Override any gcc2 internal prototype to avoid an error. */ |
7015 | #ifdef __cplusplus | 9834 | #ifdef __cplusplus |
7016 | extern "C" | 9835 | extern "C" |
9836 | { | ||
7017 | #endif | 9837 | #endif |
7018 | /* We use char because int might match the return type of a gcc2 | 9838 | /* We use char because int might match the return type of a gcc2 |
7019 | builtin and then its argument prototype would still apply. */ | 9839 | builtin and then its argument prototype would still apply. */ |
7020 | char $ac_func (); | 9840 | char $ac_func (); |
7021 | char (*f) (); | ||
7022 | |||
7023 | int | ||
7024 | main () | ||
7025 | { | ||
7026 | /* The GNU C library defines this for functions which it implements | 9841 | /* The GNU C library defines this for functions which it implements |
7027 | to always fail with ENOSYS. Some functions are actually named | 9842 | to always fail with ENOSYS. Some functions are actually named |
7028 | something starting with __ and the normal name is an alias. */ | 9843 | something starting with __ and the normal name is an alias. */ |
7029 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) | 9844 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) |
7030 | choke me | 9845 | choke me |
7031 | #else | 9846 | #else |
7032 | f = $ac_func; | 9847 | char (*f) () = $ac_func; |
9848 | #endif | ||
9849 | #ifdef __cplusplus | ||
9850 | } | ||
7033 | #endif | 9851 | #endif |
7034 | 9852 | ||
9853 | int | ||
9854 | main () | ||
9855 | { | ||
9856 | return f != $ac_func; | ||
7035 | ; | 9857 | ; |
7036 | return 0; | 9858 | return 0; |
7037 | } | 9859 | } |
7038 | _ACEOF | 9860 | _ACEOF |
7039 | rm -f conftest.$ac_objext conftest$ac_exeext | 9861 | rm -f conftest.$ac_objext conftest$ac_exeext |
7040 | if { (eval echo "$as_me:7040: \"$ac_link\"") >&5 | 9862 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
7041 | (eval $ac_link) 2>&5 | 9863 | (eval $ac_link) 2>conftest.er1 |
7042 | ac_status=$? | 9864 | ac_status=$? |
7043 | echo "$as_me:7043: \$? = $ac_status" >&5 | 9865 | grep -v '^ *+' conftest.er1 >conftest.err |
9866 | rm -f conftest.er1 | ||
9867 | cat conftest.err >&5 | ||
9868 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7044 | (exit $ac_status); } && | 9869 | (exit $ac_status); } && |
7045 | { ac_try='test -s conftest$ac_exeext' | 9870 | { ac_try='test -z "$ac_c_werror_flag" |
7046 | { (eval echo "$as_me:7046: \"$ac_try\"") >&5 | 9871 | || test ! -s conftest.err' |
9872 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7047 | (eval $ac_try) 2>&5 | 9873 | (eval $ac_try) 2>&5 |
7048 | ac_status=$? | 9874 | ac_status=$? |
7049 | echo "$as_me:7049: \$? = $ac_status" >&5 | 9875 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
9876 | (exit $ac_status); }; } && | ||
9877 | { ac_try='test -s conftest$ac_exeext' | ||
9878 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
9879 | (eval $ac_try) 2>&5 | ||
9880 | ac_status=$? | ||
9881 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7050 | (exit $ac_status); }; }; then | 9882 | (exit $ac_status); }; }; then |
7051 | eval "$as_ac_var=yes" | 9883 | eval "$as_ac_var=yes" |
7052 | else | 9884 | else |
7053 | echo "$as_me: failed program was:" >&5 | 9885 | echo "$as_me: failed program was:" >&5 |
7054 | cat conftest.$ac_ext >&5 | 9886 | sed 's/^/| /' conftest.$ac_ext >&5 |
9887 | |||
7055 | eval "$as_ac_var=no" | 9888 | eval "$as_ac_var=no" |
7056 | fi | 9889 | fi |
7057 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 9890 | rm -f conftest.err conftest.$ac_objext \ |
9891 | conftest$ac_exeext conftest.$ac_ext | ||
7058 | fi | 9892 | fi |
7059 | echo "$as_me:7059: result: `eval echo '${'$as_ac_var'}'`" >&5 | 9893 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 |
7060 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | 9894 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 |
7061 | if test `eval echo '${'$as_ac_var'}'` = yes; then | 9895 | if test `eval echo '${'$as_ac_var'}'` = yes; then |
7062 | cat >>confdefs.h <<EOF | 9896 | cat >>confdefs.h <<_ACEOF |
7063 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 9897 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
7064 | EOF | 9898 | _ACEOF |
7065 | 9899 | ||
7066 | cat >>confdefs.h <<\EOF | 9900 | cat >>confdefs.h <<\_ACEOF |
7067 | #define HAVE_GAI_STRERROR 1 | 9901 | #define HAVE_GAI_STRERROR 1 |
7068 | EOF | 9902 | _ACEOF |
7069 | 9903 | ||
7070 | cat >conftest.$ac_ext <<_ACEOF | 9904 | cat >conftest.$ac_ext <<_ACEOF |
7071 | #line 7071 "configure" | 9905 | /* confdefs.h. */ |
7072 | #include "confdefs.h" | 9906 | _ACEOF |
9907 | cat confdefs.h >>conftest.$ac_ext | ||
9908 | cat >>conftest.$ac_ext <<_ACEOF | ||
9909 | /* end confdefs.h. */ | ||
7073 | 9910 | ||
7074 | #include <sys/types.h> | 9911 | #include <sys/types.h> |
7075 | #include <sys/socket.h> | 9912 | #include <sys/socket.h> |
@@ -7088,31 +9925,44 @@ str = gai_strerror(0); | |||
7088 | } | 9925 | } |
7089 | _ACEOF | 9926 | _ACEOF |
7090 | rm -f conftest.$ac_objext | 9927 | rm -f conftest.$ac_objext |
7091 | if { (eval echo "$as_me:7091: \"$ac_compile\"") >&5 | 9928 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
7092 | (eval $ac_compile) 2>&5 | 9929 | (eval $ac_compile) 2>conftest.er1 |
7093 | ac_status=$? | 9930 | ac_status=$? |
7094 | echo "$as_me:7094: \$? = $ac_status" >&5 | 9931 | grep -v '^ *+' conftest.er1 >conftest.err |
9932 | rm -f conftest.er1 | ||
9933 | cat conftest.err >&5 | ||
9934 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7095 | (exit $ac_status); } && | 9935 | (exit $ac_status); } && |
7096 | { ac_try='test -s conftest.$ac_objext' | 9936 | { ac_try='test -z "$ac_c_werror_flag" |
7097 | { (eval echo "$as_me:7097: \"$ac_try\"") >&5 | 9937 | || test ! -s conftest.err' |
9938 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7098 | (eval $ac_try) 2>&5 | 9939 | (eval $ac_try) 2>&5 |
7099 | ac_status=$? | 9940 | ac_status=$? |
7100 | echo "$as_me:7100: \$? = $ac_status" >&5 | 9941 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
9942 | (exit $ac_status); }; } && | ||
9943 | { ac_try='test -s conftest.$ac_objext' | ||
9944 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
9945 | (eval $ac_try) 2>&5 | ||
9946 | ac_status=$? | ||
9947 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7101 | (exit $ac_status); }; }; then | 9948 | (exit $ac_status); }; }; then |
7102 | 9949 | ||
7103 | cat >>confdefs.h <<\EOF | 9950 | |
9951 | cat >>confdefs.h <<\_ACEOF | ||
7104 | #define HAVE_CONST_GAI_STRERROR_PROTO 1 | 9952 | #define HAVE_CONST_GAI_STRERROR_PROTO 1 |
7105 | EOF | 9953 | _ACEOF |
7106 | 9954 | ||
7107 | else | 9955 | else |
7108 | echo "$as_me: failed program was:" >&5 | 9956 | echo "$as_me: failed program was:" >&5 |
7109 | cat conftest.$ac_ext >&5 | 9957 | sed 's/^/| /' conftest.$ac_ext >&5 |
9958 | |||
7110 | fi | 9959 | fi |
7111 | rm -f conftest.$ac_objext conftest.$ac_ext | 9960 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
7112 | fi | 9961 | fi |
7113 | done | 9962 | done |
7114 | 9963 | ||
7115 | echo "$as_me:7115: checking for library containing nanosleep" >&5 | 9964 | |
9965 | echo "$as_me:$LINENO: checking for library containing nanosleep" >&5 | ||
7116 | echo $ECHO_N "checking for library containing nanosleep... $ECHO_C" >&6 | 9966 | echo $ECHO_N "checking for library containing nanosleep... $ECHO_C" >&6 |
7117 | if test "${ac_cv_search_nanosleep+set}" = set; then | 9967 | if test "${ac_cv_search_nanosleep+set}" = set; then |
7118 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 9968 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -7120,8 +9970,11 @@ else | |||
7120 | ac_func_search_save_LIBS=$LIBS | 9970 | ac_func_search_save_LIBS=$LIBS |
7121 | ac_cv_search_nanosleep=no | 9971 | ac_cv_search_nanosleep=no |
7122 | cat >conftest.$ac_ext <<_ACEOF | 9972 | cat >conftest.$ac_ext <<_ACEOF |
7123 | #line 7123 "configure" | 9973 | /* confdefs.h. */ |
7124 | #include "confdefs.h" | 9974 | _ACEOF |
9975 | cat confdefs.h >>conftest.$ac_ext | ||
9976 | cat >>conftest.$ac_ext <<_ACEOF | ||
9977 | /* end confdefs.h. */ | ||
7125 | 9978 | ||
7126 | /* Override any gcc2 internal prototype to avoid an error. */ | 9979 | /* Override any gcc2 internal prototype to avoid an error. */ |
7127 | #ifdef __cplusplus | 9980 | #ifdef __cplusplus |
@@ -7139,29 +9992,44 @@ nanosleep (); | |||
7139 | } | 9992 | } |
7140 | _ACEOF | 9993 | _ACEOF |
7141 | rm -f conftest.$ac_objext conftest$ac_exeext | 9994 | rm -f conftest.$ac_objext conftest$ac_exeext |
7142 | if { (eval echo "$as_me:7142: \"$ac_link\"") >&5 | 9995 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
7143 | (eval $ac_link) 2>&5 | 9996 | (eval $ac_link) 2>conftest.er1 |
7144 | ac_status=$? | 9997 | ac_status=$? |
7145 | echo "$as_me:7145: \$? = $ac_status" >&5 | 9998 | grep -v '^ *+' conftest.er1 >conftest.err |
9999 | rm -f conftest.er1 | ||
10000 | cat conftest.err >&5 | ||
10001 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7146 | (exit $ac_status); } && | 10002 | (exit $ac_status); } && |
7147 | { ac_try='test -s conftest$ac_exeext' | 10003 | { ac_try='test -z "$ac_c_werror_flag" |
7148 | { (eval echo "$as_me:7148: \"$ac_try\"") >&5 | 10004 | || test ! -s conftest.err' |
10005 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7149 | (eval $ac_try) 2>&5 | 10006 | (eval $ac_try) 2>&5 |
7150 | ac_status=$? | 10007 | ac_status=$? |
7151 | echo "$as_me:7151: \$? = $ac_status" >&5 | 10008 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
10009 | (exit $ac_status); }; } && | ||
10010 | { ac_try='test -s conftest$ac_exeext' | ||
10011 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10012 | (eval $ac_try) 2>&5 | ||
10013 | ac_status=$? | ||
10014 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7152 | (exit $ac_status); }; }; then | 10015 | (exit $ac_status); }; }; then |
7153 | ac_cv_search_nanosleep="none required" | 10016 | ac_cv_search_nanosleep="none required" |
7154 | else | 10017 | else |
7155 | echo "$as_me: failed program was:" >&5 | 10018 | echo "$as_me: failed program was:" >&5 |
7156 | cat conftest.$ac_ext >&5 | 10019 | sed 's/^/| /' conftest.$ac_ext >&5 |
10020 | |||
7157 | fi | 10021 | fi |
7158 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 10022 | rm -f conftest.err conftest.$ac_objext \ |
10023 | conftest$ac_exeext conftest.$ac_ext | ||
7159 | if test "$ac_cv_search_nanosleep" = no; then | 10024 | if test "$ac_cv_search_nanosleep" = no; then |
7160 | for ac_lib in rt posix4; do | 10025 | for ac_lib in rt posix4; do |
7161 | LIBS="-l$ac_lib $ac_func_search_save_LIBS" | 10026 | LIBS="-l$ac_lib $ac_func_search_save_LIBS" |
7162 | cat >conftest.$ac_ext <<_ACEOF | 10027 | cat >conftest.$ac_ext <<_ACEOF |
7163 | #line 7163 "configure" | 10028 | /* confdefs.h. */ |
7164 | #include "confdefs.h" | 10029 | _ACEOF |
10030 | cat confdefs.h >>conftest.$ac_ext | ||
10031 | cat >>conftest.$ac_ext <<_ACEOF | ||
10032 | /* end confdefs.h. */ | ||
7165 | 10033 | ||
7166 | /* Override any gcc2 internal prototype to avoid an error. */ | 10034 | /* Override any gcc2 internal prototype to avoid an error. */ |
7167 | #ifdef __cplusplus | 10035 | #ifdef __cplusplus |
@@ -7179,231 +10047,62 @@ nanosleep (); | |||
7179 | } | 10047 | } |
7180 | _ACEOF | 10048 | _ACEOF |
7181 | rm -f conftest.$ac_objext conftest$ac_exeext | 10049 | rm -f conftest.$ac_objext conftest$ac_exeext |
7182 | if { (eval echo "$as_me:7182: \"$ac_link\"") >&5 | 10050 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
7183 | (eval $ac_link) 2>&5 | 10051 | (eval $ac_link) 2>conftest.er1 |
7184 | ac_status=$? | 10052 | ac_status=$? |
7185 | echo "$as_me:7185: \$? = $ac_status" >&5 | 10053 | grep -v '^ *+' conftest.er1 >conftest.err |
10054 | rm -f conftest.er1 | ||
10055 | cat conftest.err >&5 | ||
10056 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7186 | (exit $ac_status); } && | 10057 | (exit $ac_status); } && |
7187 | { ac_try='test -s conftest$ac_exeext' | 10058 | { ac_try='test -z "$ac_c_werror_flag" |
7188 | { (eval echo "$as_me:7188: \"$ac_try\"") >&5 | 10059 | || test ! -s conftest.err' |
10060 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7189 | (eval $ac_try) 2>&5 | 10061 | (eval $ac_try) 2>&5 |
7190 | ac_status=$? | 10062 | ac_status=$? |
7191 | echo "$as_me:7191: \$? = $ac_status" >&5 | 10063 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
10064 | (exit $ac_status); }; } && | ||
10065 | { ac_try='test -s conftest$ac_exeext' | ||
10066 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10067 | (eval $ac_try) 2>&5 | ||
10068 | ac_status=$? | ||
10069 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7192 | (exit $ac_status); }; }; then | 10070 | (exit $ac_status); }; }; then |
7193 | ac_cv_search_nanosleep="-l$ac_lib" | 10071 | ac_cv_search_nanosleep="-l$ac_lib" |
7194 | break | 10072 | break |
7195 | else | 10073 | else |
7196 | echo "$as_me: failed program was:" >&5 | 10074 | echo "$as_me: failed program was:" >&5 |
7197 | cat conftest.$ac_ext >&5 | 10075 | sed 's/^/| /' conftest.$ac_ext >&5 |
10076 | |||
7198 | fi | 10077 | fi |
7199 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 10078 | rm -f conftest.err conftest.$ac_objext \ |
10079 | conftest$ac_exeext conftest.$ac_ext | ||
7200 | done | 10080 | done |
7201 | fi | 10081 | fi |
7202 | LIBS=$ac_func_search_save_LIBS | 10082 | LIBS=$ac_func_search_save_LIBS |
7203 | fi | 10083 | fi |
7204 | echo "$as_me:7204: result: $ac_cv_search_nanosleep" >&5 | 10084 | echo "$as_me:$LINENO: result: $ac_cv_search_nanosleep" >&5 |
7205 | echo "${ECHO_T}$ac_cv_search_nanosleep" >&6 | 10085 | echo "${ECHO_T}$ac_cv_search_nanosleep" >&6 |
7206 | if test "$ac_cv_search_nanosleep" != no; then | 10086 | if test "$ac_cv_search_nanosleep" != no; then |
7207 | test "$ac_cv_search_nanosleep" = "none required" || LIBS="$ac_cv_search_nanosleep $LIBS" | 10087 | test "$ac_cv_search_nanosleep" = "none required" || LIBS="$ac_cv_search_nanosleep $LIBS" |
7208 | cat >>confdefs.h <<\EOF | 10088 | cat >>confdefs.h <<\_ACEOF |
7209 | #define HAVE_NANOSLEEP 1 | 10089 | #define HAVE_NANOSLEEP 1 |
7210 | EOF | ||
7211 | |||
7212 | fi | ||
7213 | |||
7214 | echo "$as_me:7214: checking for ANSI C header files" >&5 | ||
7215 | echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 | ||
7216 | if test "${ac_cv_header_stdc+set}" = set; then | ||
7217 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7218 | else | ||
7219 | cat >conftest.$ac_ext <<_ACEOF | ||
7220 | #line 7220 "configure" | ||
7221 | #include "confdefs.h" | ||
7222 | #include <stdlib.h> | ||
7223 | #include <stdarg.h> | ||
7224 | #include <string.h> | ||
7225 | #include <float.h> | ||
7226 | |||
7227 | _ACEOF | ||
7228 | if { (eval echo "$as_me:7228: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
7229 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
7230 | ac_status=$? | ||
7231 | egrep -v '^ *\+' conftest.er1 >conftest.err | ||
7232 | rm -f conftest.er1 | ||
7233 | cat conftest.err >&5 | ||
7234 | echo "$as_me:7234: \$? = $ac_status" >&5 | ||
7235 | (exit $ac_status); } >/dev/null; then | ||
7236 | if test -s conftest.err; then | ||
7237 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
7238 | else | ||
7239 | ac_cpp_err= | ||
7240 | fi | ||
7241 | else | ||
7242 | ac_cpp_err=yes | ||
7243 | fi | ||
7244 | if test -z "$ac_cpp_err"; then | ||
7245 | ac_cv_header_stdc=yes | ||
7246 | else | ||
7247 | echo "$as_me: failed program was:" >&5 | ||
7248 | cat conftest.$ac_ext >&5 | ||
7249 | ac_cv_header_stdc=no | ||
7250 | fi | ||
7251 | rm -f conftest.err conftest.$ac_ext | ||
7252 | |||
7253 | if test $ac_cv_header_stdc = yes; then | ||
7254 | # SunOS 4.x string.h does not declare mem*, contrary to ANSI. | ||
7255 | cat >conftest.$ac_ext <<_ACEOF | ||
7256 | #line 7256 "configure" | ||
7257 | #include "confdefs.h" | ||
7258 | #include <string.h> | ||
7259 | |||
7260 | _ACEOF | ||
7261 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
7262 | egrep "memchr" >/dev/null 2>&1; then | ||
7263 | : | ||
7264 | else | ||
7265 | ac_cv_header_stdc=no | ||
7266 | fi | ||
7267 | rm -f conftest* | ||
7268 | |||
7269 | fi | ||
7270 | |||
7271 | if test $ac_cv_header_stdc = yes; then | ||
7272 | # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. | ||
7273 | cat >conftest.$ac_ext <<_ACEOF | ||
7274 | #line 7274 "configure" | ||
7275 | #include "confdefs.h" | ||
7276 | #include <stdlib.h> | ||
7277 | |||
7278 | _ACEOF | ||
7279 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
7280 | egrep "free" >/dev/null 2>&1; then | ||
7281 | : | ||
7282 | else | ||
7283 | ac_cv_header_stdc=no | ||
7284 | fi | ||
7285 | rm -f conftest* | ||
7286 | |||
7287 | fi | ||
7288 | |||
7289 | if test $ac_cv_header_stdc = yes; then | ||
7290 | # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. | ||
7291 | if test "$cross_compiling" = yes; then | ||
7292 | : | ||
7293 | else | ||
7294 | cat >conftest.$ac_ext <<_ACEOF | ||
7295 | #line 7295 "configure" | ||
7296 | #include "confdefs.h" | ||
7297 | #include <ctype.h> | ||
7298 | #if ((' ' & 0x0FF) == 0x020) | ||
7299 | # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') | ||
7300 | # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) | ||
7301 | #else | ||
7302 | # define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ | ||
7303 | || ('j' <= (c) && (c) <= 'r') \ | ||
7304 | || ('s' <= (c) && (c) <= 'z')) | ||
7305 | # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) | ||
7306 | #endif | ||
7307 | |||
7308 | #define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) | ||
7309 | int | ||
7310 | main () | ||
7311 | { | ||
7312 | int i; | ||
7313 | for (i = 0; i < 256; i++) | ||
7314 | if (XOR (islower (i), ISLOWER (i)) | ||
7315 | || toupper (i) != TOUPPER (i)) | ||
7316 | exit(2); | ||
7317 | exit (0); | ||
7318 | } | ||
7319 | _ACEOF | 10090 | _ACEOF |
7320 | rm -f conftest$ac_exeext | ||
7321 | if { (eval echo "$as_me:7321: \"$ac_link\"") >&5 | ||
7322 | (eval $ac_link) 2>&5 | ||
7323 | ac_status=$? | ||
7324 | echo "$as_me:7324: \$? = $ac_status" >&5 | ||
7325 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
7326 | { (eval echo "$as_me:7326: \"$ac_try\"") >&5 | ||
7327 | (eval $ac_try) 2>&5 | ||
7328 | ac_status=$? | ||
7329 | echo "$as_me:7329: \$? = $ac_status" >&5 | ||
7330 | (exit $ac_status); }; }; then | ||
7331 | : | ||
7332 | else | ||
7333 | echo "$as_me: program exited with status $ac_status" >&5 | ||
7334 | echo "$as_me: failed program was:" >&5 | ||
7335 | cat conftest.$ac_ext >&5 | ||
7336 | ac_cv_header_stdc=no | ||
7337 | fi | ||
7338 | rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
7339 | fi | ||
7340 | fi | ||
7341 | fi | ||
7342 | echo "$as_me:7342: result: $ac_cv_header_stdc" >&5 | ||
7343 | echo "${ECHO_T}$ac_cv_header_stdc" >&6 | ||
7344 | if test $ac_cv_header_stdc = yes; then | ||
7345 | |||
7346 | cat >>confdefs.h <<\EOF | ||
7347 | #define STDC_HEADERS 1 | ||
7348 | EOF | ||
7349 | 10091 | ||
7350 | fi | 10092 | fi |
7351 | 10093 | ||
7352 | # On IRIX 5.3, sys/types and inttypes.h are conflicting. | ||
7353 | 10094 | ||
7354 | for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ | 10095 | echo "$as_me:$LINENO: checking whether strsep is declared" >&5 |
7355 | inttypes.h stdint.h unistd.h | ||
7356 | do | ||
7357 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
7358 | echo "$as_me:7358: checking for $ac_header" >&5 | ||
7359 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | ||
7360 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
7361 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7362 | else | ||
7363 | cat >conftest.$ac_ext <<_ACEOF | ||
7364 | #line 7364 "configure" | ||
7365 | #include "confdefs.h" | ||
7366 | $ac_includes_default | ||
7367 | #include <$ac_header> | ||
7368 | _ACEOF | ||
7369 | rm -f conftest.$ac_objext | ||
7370 | if { (eval echo "$as_me:7370: \"$ac_compile\"") >&5 | ||
7371 | (eval $ac_compile) 2>&5 | ||
7372 | ac_status=$? | ||
7373 | echo "$as_me:7373: \$? = $ac_status" >&5 | ||
7374 | (exit $ac_status); } && | ||
7375 | { ac_try='test -s conftest.$ac_objext' | ||
7376 | { (eval echo "$as_me:7376: \"$ac_try\"") >&5 | ||
7377 | (eval $ac_try) 2>&5 | ||
7378 | ac_status=$? | ||
7379 | echo "$as_me:7379: \$? = $ac_status" >&5 | ||
7380 | (exit $ac_status); }; }; then | ||
7381 | eval "$as_ac_Header=yes" | ||
7382 | else | ||
7383 | echo "$as_me: failed program was:" >&5 | ||
7384 | cat conftest.$ac_ext >&5 | ||
7385 | eval "$as_ac_Header=no" | ||
7386 | fi | ||
7387 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
7388 | fi | ||
7389 | echo "$as_me:7389: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
7390 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
7391 | if test `eval echo '${'$as_ac_Header'}'` = yes; then | ||
7392 | cat >>confdefs.h <<EOF | ||
7393 | #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | ||
7394 | EOF | ||
7395 | |||
7396 | fi | ||
7397 | done | ||
7398 | |||
7399 | echo "$as_me:7399: checking whether strsep is declared" >&5 | ||
7400 | echo $ECHO_N "checking whether strsep is declared... $ECHO_C" >&6 | 10096 | echo $ECHO_N "checking whether strsep is declared... $ECHO_C" >&6 |
7401 | if test "${ac_cv_have_decl_strsep+set}" = set; then | 10097 | if test "${ac_cv_have_decl_strsep+set}" = set; then |
7402 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 10098 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
7403 | else | 10099 | else |
7404 | cat >conftest.$ac_ext <<_ACEOF | 10100 | cat >conftest.$ac_ext <<_ACEOF |
7405 | #line 7405 "configure" | 10101 | /* confdefs.h. */ |
7406 | #include "confdefs.h" | 10102 | _ACEOF |
10103 | cat confdefs.h >>conftest.$ac_ext | ||
10104 | cat >>conftest.$ac_ext <<_ACEOF | ||
10105 | /* end confdefs.h. */ | ||
7407 | $ac_includes_default | 10106 | $ac_includes_default |
7408 | int | 10107 | int |
7409 | main () | 10108 | main () |
@@ -7417,108 +10116,154 @@ main () | |||
7417 | } | 10116 | } |
7418 | _ACEOF | 10117 | _ACEOF |
7419 | rm -f conftest.$ac_objext | 10118 | rm -f conftest.$ac_objext |
7420 | if { (eval echo "$as_me:7420: \"$ac_compile\"") >&5 | 10119 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
7421 | (eval $ac_compile) 2>&5 | 10120 | (eval $ac_compile) 2>conftest.er1 |
7422 | ac_status=$? | 10121 | ac_status=$? |
7423 | echo "$as_me:7423: \$? = $ac_status" >&5 | 10122 | grep -v '^ *+' conftest.er1 >conftest.err |
10123 | rm -f conftest.er1 | ||
10124 | cat conftest.err >&5 | ||
10125 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7424 | (exit $ac_status); } && | 10126 | (exit $ac_status); } && |
7425 | { ac_try='test -s conftest.$ac_objext' | 10127 | { ac_try='test -z "$ac_c_werror_flag" |
7426 | { (eval echo "$as_me:7426: \"$ac_try\"") >&5 | 10128 | || test ! -s conftest.err' |
10129 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7427 | (eval $ac_try) 2>&5 | 10130 | (eval $ac_try) 2>&5 |
7428 | ac_status=$? | 10131 | ac_status=$? |
7429 | echo "$as_me:7429: \$? = $ac_status" >&5 | 10132 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
10133 | (exit $ac_status); }; } && | ||
10134 | { ac_try='test -s conftest.$ac_objext' | ||
10135 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10136 | (eval $ac_try) 2>&5 | ||
10137 | ac_status=$? | ||
10138 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7430 | (exit $ac_status); }; }; then | 10139 | (exit $ac_status); }; }; then |
7431 | ac_cv_have_decl_strsep=yes | 10140 | ac_cv_have_decl_strsep=yes |
7432 | else | 10141 | else |
7433 | echo "$as_me: failed program was:" >&5 | 10142 | echo "$as_me: failed program was:" >&5 |
7434 | cat conftest.$ac_ext >&5 | 10143 | sed 's/^/| /' conftest.$ac_ext >&5 |
10144 | |||
7435 | ac_cv_have_decl_strsep=no | 10145 | ac_cv_have_decl_strsep=no |
7436 | fi | 10146 | fi |
7437 | rm -f conftest.$ac_objext conftest.$ac_ext | 10147 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
7438 | fi | 10148 | fi |
7439 | echo "$as_me:7439: result: $ac_cv_have_decl_strsep" >&5 | 10149 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_strsep" >&5 |
7440 | echo "${ECHO_T}$ac_cv_have_decl_strsep" >&6 | 10150 | echo "${ECHO_T}$ac_cv_have_decl_strsep" >&6 |
7441 | if test $ac_cv_have_decl_strsep = yes; then | 10151 | if test $ac_cv_have_decl_strsep = yes; then |
7442 | 10152 | ||
7443 | for ac_func in strsep | 10153 | for ac_func in strsep |
7444 | do | 10154 | do |
7445 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | 10155 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
7446 | echo "$as_me:7446: checking for $ac_func" >&5 | 10156 | echo "$as_me:$LINENO: checking for $ac_func" >&5 |
7447 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | 10157 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 |
7448 | if eval "test \"\${$as_ac_var+set}\" = set"; then | 10158 | if eval "test \"\${$as_ac_var+set}\" = set"; then |
7449 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 10159 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
7450 | else | 10160 | else |
7451 | cat >conftest.$ac_ext <<_ACEOF | 10161 | cat >conftest.$ac_ext <<_ACEOF |
7452 | #line 7452 "configure" | 10162 | /* confdefs.h. */ |
7453 | #include "confdefs.h" | 10163 | _ACEOF |
10164 | cat confdefs.h >>conftest.$ac_ext | ||
10165 | cat >>conftest.$ac_ext <<_ACEOF | ||
10166 | /* end confdefs.h. */ | ||
10167 | /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
10168 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
10169 | #define $ac_func innocuous_$ac_func | ||
10170 | |||
7454 | /* System header to define __stub macros and hopefully few prototypes, | 10171 | /* System header to define __stub macros and hopefully few prototypes, |
7455 | which can conflict with char $ac_func (); below. */ | 10172 | which can conflict with char $ac_func (); below. |
7456 | #include <assert.h> | 10173 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
10174 | <limits.h> exists even on freestanding compilers. */ | ||
10175 | |||
10176 | #ifdef __STDC__ | ||
10177 | # include <limits.h> | ||
10178 | #else | ||
10179 | # include <assert.h> | ||
10180 | #endif | ||
10181 | |||
10182 | #undef $ac_func | ||
10183 | |||
7457 | /* Override any gcc2 internal prototype to avoid an error. */ | 10184 | /* Override any gcc2 internal prototype to avoid an error. */ |
7458 | #ifdef __cplusplus | 10185 | #ifdef __cplusplus |
7459 | extern "C" | 10186 | extern "C" |
10187 | { | ||
7460 | #endif | 10188 | #endif |
7461 | /* We use char because int might match the return type of a gcc2 | 10189 | /* We use char because int might match the return type of a gcc2 |
7462 | builtin and then its argument prototype would still apply. */ | 10190 | builtin and then its argument prototype would still apply. */ |
7463 | char $ac_func (); | 10191 | char $ac_func (); |
7464 | char (*f) (); | ||
7465 | |||
7466 | int | ||
7467 | main () | ||
7468 | { | ||
7469 | /* The GNU C library defines this for functions which it implements | 10192 | /* The GNU C library defines this for functions which it implements |
7470 | to always fail with ENOSYS. Some functions are actually named | 10193 | to always fail with ENOSYS. Some functions are actually named |
7471 | something starting with __ and the normal name is an alias. */ | 10194 | something starting with __ and the normal name is an alias. */ |
7472 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) | 10195 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) |
7473 | choke me | 10196 | choke me |
7474 | #else | 10197 | #else |
7475 | f = $ac_func; | 10198 | char (*f) () = $ac_func; |
10199 | #endif | ||
10200 | #ifdef __cplusplus | ||
10201 | } | ||
7476 | #endif | 10202 | #endif |
7477 | 10203 | ||
10204 | int | ||
10205 | main () | ||
10206 | { | ||
10207 | return f != $ac_func; | ||
7478 | ; | 10208 | ; |
7479 | return 0; | 10209 | return 0; |
7480 | } | 10210 | } |
7481 | _ACEOF | 10211 | _ACEOF |
7482 | rm -f conftest.$ac_objext conftest$ac_exeext | 10212 | rm -f conftest.$ac_objext conftest$ac_exeext |
7483 | if { (eval echo "$as_me:7483: \"$ac_link\"") >&5 | 10213 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
7484 | (eval $ac_link) 2>&5 | 10214 | (eval $ac_link) 2>conftest.er1 |
7485 | ac_status=$? | 10215 | ac_status=$? |
7486 | echo "$as_me:7486: \$? = $ac_status" >&5 | 10216 | grep -v '^ *+' conftest.er1 >conftest.err |
10217 | rm -f conftest.er1 | ||
10218 | cat conftest.err >&5 | ||
10219 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7487 | (exit $ac_status); } && | 10220 | (exit $ac_status); } && |
7488 | { ac_try='test -s conftest$ac_exeext' | 10221 | { ac_try='test -z "$ac_c_werror_flag" |
7489 | { (eval echo "$as_me:7489: \"$ac_try\"") >&5 | 10222 | || test ! -s conftest.err' |
10223 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10224 | (eval $ac_try) 2>&5 | ||
10225 | ac_status=$? | ||
10226 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10227 | (exit $ac_status); }; } && | ||
10228 | { ac_try='test -s conftest$ac_exeext' | ||
10229 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7490 | (eval $ac_try) 2>&5 | 10230 | (eval $ac_try) 2>&5 |
7491 | ac_status=$? | 10231 | ac_status=$? |
7492 | echo "$as_me:7492: \$? = $ac_status" >&5 | 10232 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
7493 | (exit $ac_status); }; }; then | 10233 | (exit $ac_status); }; }; then |
7494 | eval "$as_ac_var=yes" | 10234 | eval "$as_ac_var=yes" |
7495 | else | 10235 | else |
7496 | echo "$as_me: failed program was:" >&5 | 10236 | echo "$as_me: failed program was:" >&5 |
7497 | cat conftest.$ac_ext >&5 | 10237 | sed 's/^/| /' conftest.$ac_ext >&5 |
10238 | |||
7498 | eval "$as_ac_var=no" | 10239 | eval "$as_ac_var=no" |
7499 | fi | 10240 | fi |
7500 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 10241 | rm -f conftest.err conftest.$ac_objext \ |
10242 | conftest$ac_exeext conftest.$ac_ext | ||
7501 | fi | 10243 | fi |
7502 | echo "$as_me:7502: result: `eval echo '${'$as_ac_var'}'`" >&5 | 10244 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 |
7503 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | 10245 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 |
7504 | if test `eval echo '${'$as_ac_var'}'` = yes; then | 10246 | if test `eval echo '${'$as_ac_var'}'` = yes; then |
7505 | cat >>confdefs.h <<EOF | 10247 | cat >>confdefs.h <<_ACEOF |
7506 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 10248 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
7507 | EOF | 10249 | _ACEOF |
7508 | 10250 | ||
7509 | fi | 10251 | fi |
7510 | done | 10252 | done |
7511 | 10253 | ||
7512 | fi | 10254 | fi |
7513 | 10255 | ||
7514 | echo "$as_me:7514: checking whether getrusage is declared" >&5 | 10256 | echo "$as_me:$LINENO: checking whether getrusage is declared" >&5 |
7515 | echo $ECHO_N "checking whether getrusage is declared... $ECHO_C" >&6 | 10257 | echo $ECHO_N "checking whether getrusage is declared... $ECHO_C" >&6 |
7516 | if test "${ac_cv_have_decl_getrusage+set}" = set; then | 10258 | if test "${ac_cv_have_decl_getrusage+set}" = set; then |
7517 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 10259 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
7518 | else | 10260 | else |
7519 | cat >conftest.$ac_ext <<_ACEOF | 10261 | cat >conftest.$ac_ext <<_ACEOF |
7520 | #line 7520 "configure" | 10262 | /* confdefs.h. */ |
7521 | #include "confdefs.h" | 10263 | _ACEOF |
10264 | cat confdefs.h >>conftest.$ac_ext | ||
10265 | cat >>conftest.$ac_ext <<_ACEOF | ||
10266 | /* end confdefs.h. */ | ||
7522 | $ac_includes_default | 10267 | $ac_includes_default |
7523 | int | 10268 | int |
7524 | main () | 10269 | main () |
@@ -7532,110 +10277,158 @@ main () | |||
7532 | } | 10277 | } |
7533 | _ACEOF | 10278 | _ACEOF |
7534 | rm -f conftest.$ac_objext | 10279 | rm -f conftest.$ac_objext |
7535 | if { (eval echo "$as_me:7535: \"$ac_compile\"") >&5 | 10280 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
7536 | (eval $ac_compile) 2>&5 | 10281 | (eval $ac_compile) 2>conftest.er1 |
7537 | ac_status=$? | 10282 | ac_status=$? |
7538 | echo "$as_me:7538: \$? = $ac_status" >&5 | 10283 | grep -v '^ *+' conftest.er1 >conftest.err |
10284 | rm -f conftest.er1 | ||
10285 | cat conftest.err >&5 | ||
10286 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7539 | (exit $ac_status); } && | 10287 | (exit $ac_status); } && |
7540 | { ac_try='test -s conftest.$ac_objext' | 10288 | { ac_try='test -z "$ac_c_werror_flag" |
7541 | { (eval echo "$as_me:7541: \"$ac_try\"") >&5 | 10289 | || test ! -s conftest.err' |
10290 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7542 | (eval $ac_try) 2>&5 | 10291 | (eval $ac_try) 2>&5 |
7543 | ac_status=$? | 10292 | ac_status=$? |
7544 | echo "$as_me:7544: \$? = $ac_status" >&5 | 10293 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
10294 | (exit $ac_status); }; } && | ||
10295 | { ac_try='test -s conftest.$ac_objext' | ||
10296 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10297 | (eval $ac_try) 2>&5 | ||
10298 | ac_status=$? | ||
10299 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7545 | (exit $ac_status); }; }; then | 10300 | (exit $ac_status); }; }; then |
7546 | ac_cv_have_decl_getrusage=yes | 10301 | ac_cv_have_decl_getrusage=yes |
7547 | else | 10302 | else |
7548 | echo "$as_me: failed program was:" >&5 | 10303 | echo "$as_me: failed program was:" >&5 |
7549 | cat conftest.$ac_ext >&5 | 10304 | sed 's/^/| /' conftest.$ac_ext >&5 |
10305 | |||
7550 | ac_cv_have_decl_getrusage=no | 10306 | ac_cv_have_decl_getrusage=no |
7551 | fi | 10307 | fi |
7552 | rm -f conftest.$ac_objext conftest.$ac_ext | 10308 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
7553 | fi | 10309 | fi |
7554 | echo "$as_me:7554: result: $ac_cv_have_decl_getrusage" >&5 | 10310 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_getrusage" >&5 |
7555 | echo "${ECHO_T}$ac_cv_have_decl_getrusage" >&6 | 10311 | echo "${ECHO_T}$ac_cv_have_decl_getrusage" >&6 |
7556 | if test $ac_cv_have_decl_getrusage = yes; then | 10312 | if test $ac_cv_have_decl_getrusage = yes; then |
7557 | 10313 | ||
7558 | for ac_func in getrusage | 10314 | for ac_func in getrusage |
7559 | do | 10315 | do |
7560 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | 10316 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
7561 | echo "$as_me:7561: checking for $ac_func" >&5 | 10317 | echo "$as_me:$LINENO: checking for $ac_func" >&5 |
7562 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | 10318 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 |
7563 | if eval "test \"\${$as_ac_var+set}\" = set"; then | 10319 | if eval "test \"\${$as_ac_var+set}\" = set"; then |
7564 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 10320 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
7565 | else | 10321 | else |
7566 | cat >conftest.$ac_ext <<_ACEOF | 10322 | cat >conftest.$ac_ext <<_ACEOF |
7567 | #line 7567 "configure" | 10323 | /* confdefs.h. */ |
7568 | #include "confdefs.h" | 10324 | _ACEOF |
10325 | cat confdefs.h >>conftest.$ac_ext | ||
10326 | cat >>conftest.$ac_ext <<_ACEOF | ||
10327 | /* end confdefs.h. */ | ||
10328 | /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
10329 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
10330 | #define $ac_func innocuous_$ac_func | ||
10331 | |||
7569 | /* System header to define __stub macros and hopefully few prototypes, | 10332 | /* System header to define __stub macros and hopefully few prototypes, |
7570 | which can conflict with char $ac_func (); below. */ | 10333 | which can conflict with char $ac_func (); below. |
7571 | #include <assert.h> | 10334 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
10335 | <limits.h> exists even on freestanding compilers. */ | ||
10336 | |||
10337 | #ifdef __STDC__ | ||
10338 | # include <limits.h> | ||
10339 | #else | ||
10340 | # include <assert.h> | ||
10341 | #endif | ||
10342 | |||
10343 | #undef $ac_func | ||
10344 | |||
7572 | /* Override any gcc2 internal prototype to avoid an error. */ | 10345 | /* Override any gcc2 internal prototype to avoid an error. */ |
7573 | #ifdef __cplusplus | 10346 | #ifdef __cplusplus |
7574 | extern "C" | 10347 | extern "C" |
10348 | { | ||
7575 | #endif | 10349 | #endif |
7576 | /* We use char because int might match the return type of a gcc2 | 10350 | /* We use char because int might match the return type of a gcc2 |
7577 | builtin and then its argument prototype would still apply. */ | 10351 | builtin and then its argument prototype would still apply. */ |
7578 | char $ac_func (); | 10352 | char $ac_func (); |
7579 | char (*f) (); | ||
7580 | |||
7581 | int | ||
7582 | main () | ||
7583 | { | ||
7584 | /* The GNU C library defines this for functions which it implements | 10353 | /* The GNU C library defines this for functions which it implements |
7585 | to always fail with ENOSYS. Some functions are actually named | 10354 | to always fail with ENOSYS. Some functions are actually named |
7586 | something starting with __ and the normal name is an alias. */ | 10355 | something starting with __ and the normal name is an alias. */ |
7587 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) | 10356 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) |
7588 | choke me | 10357 | choke me |
7589 | #else | 10358 | #else |
7590 | f = $ac_func; | 10359 | char (*f) () = $ac_func; |
10360 | #endif | ||
10361 | #ifdef __cplusplus | ||
10362 | } | ||
7591 | #endif | 10363 | #endif |
7592 | 10364 | ||
10365 | int | ||
10366 | main () | ||
10367 | { | ||
10368 | return f != $ac_func; | ||
7593 | ; | 10369 | ; |
7594 | return 0; | 10370 | return 0; |
7595 | } | 10371 | } |
7596 | _ACEOF | 10372 | _ACEOF |
7597 | rm -f conftest.$ac_objext conftest$ac_exeext | 10373 | rm -f conftest.$ac_objext conftest$ac_exeext |
7598 | if { (eval echo "$as_me:7598: \"$ac_link\"") >&5 | 10374 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
7599 | (eval $ac_link) 2>&5 | 10375 | (eval $ac_link) 2>conftest.er1 |
7600 | ac_status=$? | 10376 | ac_status=$? |
7601 | echo "$as_me:7601: \$? = $ac_status" >&5 | 10377 | grep -v '^ *+' conftest.er1 >conftest.err |
10378 | rm -f conftest.er1 | ||
10379 | cat conftest.err >&5 | ||
10380 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7602 | (exit $ac_status); } && | 10381 | (exit $ac_status); } && |
7603 | { ac_try='test -s conftest$ac_exeext' | 10382 | { ac_try='test -z "$ac_c_werror_flag" |
7604 | { (eval echo "$as_me:7604: \"$ac_try\"") >&5 | 10383 | || test ! -s conftest.err' |
10384 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10385 | (eval $ac_try) 2>&5 | ||
10386 | ac_status=$? | ||
10387 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10388 | (exit $ac_status); }; } && | ||
10389 | { ac_try='test -s conftest$ac_exeext' | ||
10390 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7605 | (eval $ac_try) 2>&5 | 10391 | (eval $ac_try) 2>&5 |
7606 | ac_status=$? | 10392 | ac_status=$? |
7607 | echo "$as_me:7607: \$? = $ac_status" >&5 | 10393 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
7608 | (exit $ac_status); }; }; then | 10394 | (exit $ac_status); }; }; then |
7609 | eval "$as_ac_var=yes" | 10395 | eval "$as_ac_var=yes" |
7610 | else | 10396 | else |
7611 | echo "$as_me: failed program was:" >&5 | 10397 | echo "$as_me: failed program was:" >&5 |
7612 | cat conftest.$ac_ext >&5 | 10398 | sed 's/^/| /' conftest.$ac_ext >&5 |
10399 | |||
7613 | eval "$as_ac_var=no" | 10400 | eval "$as_ac_var=no" |
7614 | fi | 10401 | fi |
7615 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 10402 | rm -f conftest.err conftest.$ac_objext \ |
10403 | conftest$ac_exeext conftest.$ac_ext | ||
7616 | fi | 10404 | fi |
7617 | echo "$as_me:7617: result: `eval echo '${'$as_ac_var'}'`" >&5 | 10405 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 |
7618 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | 10406 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 |
7619 | if test `eval echo '${'$as_ac_var'}'` = yes; then | 10407 | if test `eval echo '${'$as_ac_var'}'` = yes; then |
7620 | cat >>confdefs.h <<EOF | 10408 | cat >>confdefs.h <<_ACEOF |
7621 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 10409 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
7622 | EOF | 10410 | _ACEOF |
7623 | 10411 | ||
7624 | fi | 10412 | fi |
7625 | done | 10413 | done |
7626 | 10414 | ||
7627 | fi | 10415 | fi |
7628 | 10416 | ||
7629 | echo "$as_me:7629: checking whether tcsendbreak is declared" >&5 | 10417 | |
10418 | echo "$as_me:$LINENO: checking whether tcsendbreak is declared" >&5 | ||
7630 | echo $ECHO_N "checking whether tcsendbreak is declared... $ECHO_C" >&6 | 10419 | echo $ECHO_N "checking whether tcsendbreak is declared... $ECHO_C" >&6 |
7631 | if test "${ac_cv_have_decl_tcsendbreak+set}" = set; then | 10420 | if test "${ac_cv_have_decl_tcsendbreak+set}" = set; then |
7632 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 10421 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
7633 | else | 10422 | else |
7634 | cat >conftest.$ac_ext <<_ACEOF | 10423 | cat >conftest.$ac_ext <<_ACEOF |
7635 | #line 7635 "configure" | 10424 | /* confdefs.h. */ |
7636 | #include "confdefs.h" | 10425 | _ACEOF |
10426 | cat confdefs.h >>conftest.$ac_ext | ||
10427 | cat >>conftest.$ac_ext <<_ACEOF | ||
10428 | /* end confdefs.h. */ | ||
7637 | #include <termios.h> | 10429 | #include <termios.h> |
7638 | 10430 | ||
10431 | |||
7639 | int | 10432 | int |
7640 | main () | 10433 | main () |
7641 | { | 10434 | { |
@@ -7648,181 +10441,337 @@ main () | |||
7648 | } | 10441 | } |
7649 | _ACEOF | 10442 | _ACEOF |
7650 | rm -f conftest.$ac_objext | 10443 | rm -f conftest.$ac_objext |
7651 | if { (eval echo "$as_me:7651: \"$ac_compile\"") >&5 | 10444 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
7652 | (eval $ac_compile) 2>&5 | 10445 | (eval $ac_compile) 2>conftest.er1 |
7653 | ac_status=$? | 10446 | ac_status=$? |
7654 | echo "$as_me:7654: \$? = $ac_status" >&5 | 10447 | grep -v '^ *+' conftest.er1 >conftest.err |
10448 | rm -f conftest.er1 | ||
10449 | cat conftest.err >&5 | ||
10450 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7655 | (exit $ac_status); } && | 10451 | (exit $ac_status); } && |
7656 | { ac_try='test -s conftest.$ac_objext' | 10452 | { ac_try='test -z "$ac_c_werror_flag" |
7657 | { (eval echo "$as_me:7657: \"$ac_try\"") >&5 | 10453 | || test ! -s conftest.err' |
10454 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10455 | (eval $ac_try) 2>&5 | ||
10456 | ac_status=$? | ||
10457 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10458 | (exit $ac_status); }; } && | ||
10459 | { ac_try='test -s conftest.$ac_objext' | ||
10460 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7658 | (eval $ac_try) 2>&5 | 10461 | (eval $ac_try) 2>&5 |
7659 | ac_status=$? | 10462 | ac_status=$? |
7660 | echo "$as_me:7660: \$? = $ac_status" >&5 | 10463 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
7661 | (exit $ac_status); }; }; then | 10464 | (exit $ac_status); }; }; then |
7662 | ac_cv_have_decl_tcsendbreak=yes | 10465 | ac_cv_have_decl_tcsendbreak=yes |
7663 | else | 10466 | else |
7664 | echo "$as_me: failed program was:" >&5 | 10467 | echo "$as_me: failed program was:" >&5 |
7665 | cat conftest.$ac_ext >&5 | 10468 | sed 's/^/| /' conftest.$ac_ext >&5 |
10469 | |||
7666 | ac_cv_have_decl_tcsendbreak=no | 10470 | ac_cv_have_decl_tcsendbreak=no |
7667 | fi | 10471 | fi |
7668 | rm -f conftest.$ac_objext conftest.$ac_ext | 10472 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
7669 | fi | 10473 | fi |
7670 | echo "$as_me:7670: result: $ac_cv_have_decl_tcsendbreak" >&5 | 10474 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_tcsendbreak" >&5 |
7671 | echo "${ECHO_T}$ac_cv_have_decl_tcsendbreak" >&6 | 10475 | echo "${ECHO_T}$ac_cv_have_decl_tcsendbreak" >&6 |
7672 | if test $ac_cv_have_decl_tcsendbreak = yes; then | 10476 | if test $ac_cv_have_decl_tcsendbreak = yes; then |
7673 | cat >>confdefs.h <<\EOF | 10477 | cat >>confdefs.h <<\_ACEOF |
7674 | #define HAVE_TCSENDBREAK 1 | 10478 | #define HAVE_TCSENDBREAK 1 |
7675 | EOF | 10479 | _ACEOF |
7676 | 10480 | ||
7677 | else | 10481 | else |
7678 | 10482 | ||
7679 | for ac_func in tcsendbreak | 10483 | for ac_func in tcsendbreak |
7680 | do | 10484 | do |
7681 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | 10485 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
7682 | echo "$as_me:7682: checking for $ac_func" >&5 | 10486 | echo "$as_me:$LINENO: checking for $ac_func" >&5 |
7683 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | 10487 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 |
7684 | if eval "test \"\${$as_ac_var+set}\" = set"; then | 10488 | if eval "test \"\${$as_ac_var+set}\" = set"; then |
7685 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 10489 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
7686 | else | 10490 | else |
7687 | cat >conftest.$ac_ext <<_ACEOF | 10491 | cat >conftest.$ac_ext <<_ACEOF |
7688 | #line 7688 "configure" | 10492 | /* confdefs.h. */ |
7689 | #include "confdefs.h" | 10493 | _ACEOF |
10494 | cat confdefs.h >>conftest.$ac_ext | ||
10495 | cat >>conftest.$ac_ext <<_ACEOF | ||
10496 | /* end confdefs.h. */ | ||
10497 | /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
10498 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
10499 | #define $ac_func innocuous_$ac_func | ||
10500 | |||
7690 | /* System header to define __stub macros and hopefully few prototypes, | 10501 | /* System header to define __stub macros and hopefully few prototypes, |
7691 | which can conflict with char $ac_func (); below. */ | 10502 | which can conflict with char $ac_func (); below. |
7692 | #include <assert.h> | 10503 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
10504 | <limits.h> exists even on freestanding compilers. */ | ||
10505 | |||
10506 | #ifdef __STDC__ | ||
10507 | # include <limits.h> | ||
10508 | #else | ||
10509 | # include <assert.h> | ||
10510 | #endif | ||
10511 | |||
10512 | #undef $ac_func | ||
10513 | |||
7693 | /* Override any gcc2 internal prototype to avoid an error. */ | 10514 | /* Override any gcc2 internal prototype to avoid an error. */ |
7694 | #ifdef __cplusplus | 10515 | #ifdef __cplusplus |
7695 | extern "C" | 10516 | extern "C" |
10517 | { | ||
7696 | #endif | 10518 | #endif |
7697 | /* We use char because int might match the return type of a gcc2 | 10519 | /* We use char because int might match the return type of a gcc2 |
7698 | builtin and then its argument prototype would still apply. */ | 10520 | builtin and then its argument prototype would still apply. */ |
7699 | char $ac_func (); | 10521 | char $ac_func (); |
7700 | char (*f) (); | ||
7701 | |||
7702 | int | ||
7703 | main () | ||
7704 | { | ||
7705 | /* The GNU C library defines this for functions which it implements | 10522 | /* The GNU C library defines this for functions which it implements |
7706 | to always fail with ENOSYS. Some functions are actually named | 10523 | to always fail with ENOSYS. Some functions are actually named |
7707 | something starting with __ and the normal name is an alias. */ | 10524 | something starting with __ and the normal name is an alias. */ |
7708 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) | 10525 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) |
7709 | choke me | 10526 | choke me |
7710 | #else | 10527 | #else |
7711 | f = $ac_func; | 10528 | char (*f) () = $ac_func; |
10529 | #endif | ||
10530 | #ifdef __cplusplus | ||
10531 | } | ||
7712 | #endif | 10532 | #endif |
7713 | 10533 | ||
10534 | int | ||
10535 | main () | ||
10536 | { | ||
10537 | return f != $ac_func; | ||
7714 | ; | 10538 | ; |
7715 | return 0; | 10539 | return 0; |
7716 | } | 10540 | } |
7717 | _ACEOF | 10541 | _ACEOF |
7718 | rm -f conftest.$ac_objext conftest$ac_exeext | 10542 | rm -f conftest.$ac_objext conftest$ac_exeext |
7719 | if { (eval echo "$as_me:7719: \"$ac_link\"") >&5 | 10543 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
7720 | (eval $ac_link) 2>&5 | 10544 | (eval $ac_link) 2>conftest.er1 |
7721 | ac_status=$? | 10545 | ac_status=$? |
7722 | echo "$as_me:7722: \$? = $ac_status" >&5 | 10546 | grep -v '^ *+' conftest.er1 >conftest.err |
10547 | rm -f conftest.er1 | ||
10548 | cat conftest.err >&5 | ||
10549 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7723 | (exit $ac_status); } && | 10550 | (exit $ac_status); } && |
7724 | { ac_try='test -s conftest$ac_exeext' | 10551 | { ac_try='test -z "$ac_c_werror_flag" |
7725 | { (eval echo "$as_me:7725: \"$ac_try\"") >&5 | 10552 | || test ! -s conftest.err' |
10553 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10554 | (eval $ac_try) 2>&5 | ||
10555 | ac_status=$? | ||
10556 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10557 | (exit $ac_status); }; } && | ||
10558 | { ac_try='test -s conftest$ac_exeext' | ||
10559 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7726 | (eval $ac_try) 2>&5 | 10560 | (eval $ac_try) 2>&5 |
7727 | ac_status=$? | 10561 | ac_status=$? |
7728 | echo "$as_me:7728: \$? = $ac_status" >&5 | 10562 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
7729 | (exit $ac_status); }; }; then | 10563 | (exit $ac_status); }; }; then |
7730 | eval "$as_ac_var=yes" | 10564 | eval "$as_ac_var=yes" |
7731 | else | 10565 | else |
7732 | echo "$as_me: failed program was:" >&5 | 10566 | echo "$as_me: failed program was:" >&5 |
7733 | cat conftest.$ac_ext >&5 | 10567 | sed 's/^/| /' conftest.$ac_ext >&5 |
10568 | |||
7734 | eval "$as_ac_var=no" | 10569 | eval "$as_ac_var=no" |
7735 | fi | 10570 | fi |
7736 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 10571 | rm -f conftest.err conftest.$ac_objext \ |
10572 | conftest$ac_exeext conftest.$ac_ext | ||
7737 | fi | 10573 | fi |
7738 | echo "$as_me:7738: result: `eval echo '${'$as_ac_var'}'`" >&5 | 10574 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 |
7739 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | 10575 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 |
7740 | if test `eval echo '${'$as_ac_var'}'` = yes; then | 10576 | if test `eval echo '${'$as_ac_var'}'` = yes; then |
7741 | cat >>confdefs.h <<EOF | 10577 | cat >>confdefs.h <<_ACEOF |
7742 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 10578 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
7743 | EOF | 10579 | _ACEOF |
7744 | 10580 | ||
7745 | fi | 10581 | fi |
7746 | done | 10582 | done |
7747 | 10583 | ||
7748 | fi | 10584 | fi |
7749 | 10585 | ||
10586 | |||
10587 | echo "$as_me:$LINENO: checking whether h_errno is declared" >&5 | ||
10588 | echo $ECHO_N "checking whether h_errno is declared... $ECHO_C" >&6 | ||
10589 | if test "${ac_cv_have_decl_h_errno+set}" = set; then | ||
10590 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
10591 | else | ||
10592 | cat >conftest.$ac_ext <<_ACEOF | ||
10593 | /* confdefs.h. */ | ||
10594 | _ACEOF | ||
10595 | cat confdefs.h >>conftest.$ac_ext | ||
10596 | cat >>conftest.$ac_ext <<_ACEOF | ||
10597 | /* end confdefs.h. */ | ||
10598 | #include <netdb.h> | ||
10599 | |||
10600 | int | ||
10601 | main () | ||
10602 | { | ||
10603 | #ifndef h_errno | ||
10604 | char *p = (char *) h_errno; | ||
10605 | #endif | ||
10606 | |||
10607 | ; | ||
10608 | return 0; | ||
10609 | } | ||
10610 | _ACEOF | ||
10611 | rm -f conftest.$ac_objext | ||
10612 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
10613 | (eval $ac_compile) 2>conftest.er1 | ||
10614 | ac_status=$? | ||
10615 | grep -v '^ *+' conftest.er1 >conftest.err | ||
10616 | rm -f conftest.er1 | ||
10617 | cat conftest.err >&5 | ||
10618 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10619 | (exit $ac_status); } && | ||
10620 | { ac_try='test -z "$ac_c_werror_flag" | ||
10621 | || test ! -s conftest.err' | ||
10622 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10623 | (eval $ac_try) 2>&5 | ||
10624 | ac_status=$? | ||
10625 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10626 | (exit $ac_status); }; } && | ||
10627 | { ac_try='test -s conftest.$ac_objext' | ||
10628 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10629 | (eval $ac_try) 2>&5 | ||
10630 | ac_status=$? | ||
10631 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10632 | (exit $ac_status); }; }; then | ||
10633 | ac_cv_have_decl_h_errno=yes | ||
10634 | else | ||
10635 | echo "$as_me: failed program was:" >&5 | ||
10636 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
10637 | |||
10638 | ac_cv_have_decl_h_errno=no | ||
10639 | fi | ||
10640 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
10641 | fi | ||
10642 | echo "$as_me:$LINENO: result: $ac_cv_have_decl_h_errno" >&5 | ||
10643 | echo "${ECHO_T}$ac_cv_have_decl_h_errno" >&6 | ||
10644 | if test $ac_cv_have_decl_h_errno = yes; then | ||
10645 | |||
10646 | cat >>confdefs.h <<_ACEOF | ||
10647 | #define HAVE_DECL_H_ERRNO 1 | ||
10648 | _ACEOF | ||
10649 | |||
10650 | |||
10651 | else | ||
10652 | cat >>confdefs.h <<_ACEOF | ||
10653 | #define HAVE_DECL_H_ERRNO 0 | ||
10654 | _ACEOF | ||
10655 | |||
10656 | |||
10657 | fi | ||
10658 | |||
10659 | |||
10660 | |||
10661 | |||
7750 | for ac_func in setresuid | 10662 | for ac_func in setresuid |
7751 | do | 10663 | do |
7752 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | 10664 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
7753 | echo "$as_me:7753: checking for $ac_func" >&5 | 10665 | echo "$as_me:$LINENO: checking for $ac_func" >&5 |
7754 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | 10666 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 |
7755 | if eval "test \"\${$as_ac_var+set}\" = set"; then | 10667 | if eval "test \"\${$as_ac_var+set}\" = set"; then |
7756 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 10668 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
7757 | else | 10669 | else |
7758 | cat >conftest.$ac_ext <<_ACEOF | 10670 | cat >conftest.$ac_ext <<_ACEOF |
7759 | #line 7759 "configure" | 10671 | /* confdefs.h. */ |
7760 | #include "confdefs.h" | 10672 | _ACEOF |
10673 | cat confdefs.h >>conftest.$ac_ext | ||
10674 | cat >>conftest.$ac_ext <<_ACEOF | ||
10675 | /* end confdefs.h. */ | ||
10676 | /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
10677 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
10678 | #define $ac_func innocuous_$ac_func | ||
10679 | |||
7761 | /* System header to define __stub macros and hopefully few prototypes, | 10680 | /* System header to define __stub macros and hopefully few prototypes, |
7762 | which can conflict with char $ac_func (); below. */ | 10681 | which can conflict with char $ac_func (); below. |
7763 | #include <assert.h> | 10682 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
10683 | <limits.h> exists even on freestanding compilers. */ | ||
10684 | |||
10685 | #ifdef __STDC__ | ||
10686 | # include <limits.h> | ||
10687 | #else | ||
10688 | # include <assert.h> | ||
10689 | #endif | ||
10690 | |||
10691 | #undef $ac_func | ||
10692 | |||
7764 | /* Override any gcc2 internal prototype to avoid an error. */ | 10693 | /* Override any gcc2 internal prototype to avoid an error. */ |
7765 | #ifdef __cplusplus | 10694 | #ifdef __cplusplus |
7766 | extern "C" | 10695 | extern "C" |
10696 | { | ||
7767 | #endif | 10697 | #endif |
7768 | /* We use char because int might match the return type of a gcc2 | 10698 | /* We use char because int might match the return type of a gcc2 |
7769 | builtin and then its argument prototype would still apply. */ | 10699 | builtin and then its argument prototype would still apply. */ |
7770 | char $ac_func (); | 10700 | char $ac_func (); |
7771 | char (*f) (); | ||
7772 | |||
7773 | int | ||
7774 | main () | ||
7775 | { | ||
7776 | /* The GNU C library defines this for functions which it implements | 10701 | /* The GNU C library defines this for functions which it implements |
7777 | to always fail with ENOSYS. Some functions are actually named | 10702 | to always fail with ENOSYS. Some functions are actually named |
7778 | something starting with __ and the normal name is an alias. */ | 10703 | something starting with __ and the normal name is an alias. */ |
7779 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) | 10704 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) |
7780 | choke me | 10705 | choke me |
7781 | #else | 10706 | #else |
7782 | f = $ac_func; | 10707 | char (*f) () = $ac_func; |
10708 | #endif | ||
10709 | #ifdef __cplusplus | ||
10710 | } | ||
7783 | #endif | 10711 | #endif |
7784 | 10712 | ||
10713 | int | ||
10714 | main () | ||
10715 | { | ||
10716 | return f != $ac_func; | ||
7785 | ; | 10717 | ; |
7786 | return 0; | 10718 | return 0; |
7787 | } | 10719 | } |
7788 | _ACEOF | 10720 | _ACEOF |
7789 | rm -f conftest.$ac_objext conftest$ac_exeext | 10721 | rm -f conftest.$ac_objext conftest$ac_exeext |
7790 | if { (eval echo "$as_me:7790: \"$ac_link\"") >&5 | 10722 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
7791 | (eval $ac_link) 2>&5 | 10723 | (eval $ac_link) 2>conftest.er1 |
7792 | ac_status=$? | 10724 | ac_status=$? |
7793 | echo "$as_me:7793: \$? = $ac_status" >&5 | 10725 | grep -v '^ *+' conftest.er1 >conftest.err |
10726 | rm -f conftest.er1 | ||
10727 | cat conftest.err >&5 | ||
10728 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7794 | (exit $ac_status); } && | 10729 | (exit $ac_status); } && |
7795 | { ac_try='test -s conftest$ac_exeext' | 10730 | { ac_try='test -z "$ac_c_werror_flag" |
7796 | { (eval echo "$as_me:7796: \"$ac_try\"") >&5 | 10731 | || test ! -s conftest.err' |
10732 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10733 | (eval $ac_try) 2>&5 | ||
10734 | ac_status=$? | ||
10735 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10736 | (exit $ac_status); }; } && | ||
10737 | { ac_try='test -s conftest$ac_exeext' | ||
10738 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7797 | (eval $ac_try) 2>&5 | 10739 | (eval $ac_try) 2>&5 |
7798 | ac_status=$? | 10740 | ac_status=$? |
7799 | echo "$as_me:7799: \$? = $ac_status" >&5 | 10741 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
7800 | (exit $ac_status); }; }; then | 10742 | (exit $ac_status); }; }; then |
7801 | eval "$as_ac_var=yes" | 10743 | eval "$as_ac_var=yes" |
7802 | else | 10744 | else |
7803 | echo "$as_me: failed program was:" >&5 | 10745 | echo "$as_me: failed program was:" >&5 |
7804 | cat conftest.$ac_ext >&5 | 10746 | sed 's/^/| /' conftest.$ac_ext >&5 |
10747 | |||
7805 | eval "$as_ac_var=no" | 10748 | eval "$as_ac_var=no" |
7806 | fi | 10749 | fi |
7807 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 10750 | rm -f conftest.err conftest.$ac_objext \ |
10751 | conftest$ac_exeext conftest.$ac_ext | ||
7808 | fi | 10752 | fi |
7809 | echo "$as_me:7809: result: `eval echo '${'$as_ac_var'}'`" >&5 | 10753 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 |
7810 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | 10754 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 |
7811 | if test `eval echo '${'$as_ac_var'}'` = yes; then | 10755 | if test `eval echo '${'$as_ac_var'}'` = yes; then |
7812 | cat >>confdefs.h <<EOF | 10756 | cat >>confdefs.h <<_ACEOF |
7813 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 10757 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
7814 | EOF | 10758 | _ACEOF |
7815 | 10759 | ||
7816 | echo "$as_me:7816: checking if setresuid seems to work" >&5 | 10760 | echo "$as_me:$LINENO: checking if setresuid seems to work" >&5 |
7817 | echo $ECHO_N "checking if setresuid seems to work... $ECHO_C" >&6 | 10761 | echo $ECHO_N "checking if setresuid seems to work... $ECHO_C" >&6 |
7818 | if test "$cross_compiling" = yes; then | 10762 | if test "$cross_compiling" = yes; then |
7819 | { { echo "$as_me:7819: error: cannot run test program while cross compiling" >&5 | 10763 | { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
7820 | echo "$as_me: error: cannot run test program while cross compiling" >&2;} | 10764 | See \`config.log' for more details." >&5 |
10765 | echo "$as_me: error: cannot run test program while cross compiling | ||
10766 | See \`config.log' for more details." >&2;} | ||
7821 | { (exit 1); exit 1; }; } | 10767 | { (exit 1); exit 1; }; } |
7822 | else | 10768 | else |
7823 | cat >conftest.$ac_ext <<_ACEOF | 10769 | cat >conftest.$ac_ext <<_ACEOF |
7824 | #line 7824 "configure" | 10770 | /* confdefs.h. */ |
7825 | #include "confdefs.h" | 10771 | _ACEOF |
10772 | cat confdefs.h >>conftest.$ac_ext | ||
10773 | cat >>conftest.$ac_ext <<_ACEOF | ||
10774 | /* end confdefs.h. */ | ||
7826 | 10775 | ||
7827 | #include <stdlib.h> | 10776 | #include <stdlib.h> |
7828 | #include <errno.h> | 10777 | #include <errno.h> |
@@ -7830,112 +10779,153 @@ int main(){errno=0; setresuid(0,0,0); if (errno==ENOSYS) exit(1); else exit(0);} | |||
7830 | 10779 | ||
7831 | _ACEOF | 10780 | _ACEOF |
7832 | rm -f conftest$ac_exeext | 10781 | rm -f conftest$ac_exeext |
7833 | if { (eval echo "$as_me:7833: \"$ac_link\"") >&5 | 10782 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
7834 | (eval $ac_link) 2>&5 | 10783 | (eval $ac_link) 2>&5 |
7835 | ac_status=$? | 10784 | ac_status=$? |
7836 | echo "$as_me:7836: \$? = $ac_status" >&5 | 10785 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
7837 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | 10786 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
7838 | { (eval echo "$as_me:7838: \"$ac_try\"") >&5 | 10787 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
7839 | (eval $ac_try) 2>&5 | 10788 | (eval $ac_try) 2>&5 |
7840 | ac_status=$? | 10789 | ac_status=$? |
7841 | echo "$as_me:7841: \$? = $ac_status" >&5 | 10790 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
7842 | (exit $ac_status); }; }; then | 10791 | (exit $ac_status); }; }; then |
7843 | echo "$as_me:7843: result: yes" >&5 | 10792 | echo "$as_me:$LINENO: result: yes" >&5 |
7844 | echo "${ECHO_T}yes" >&6 | 10793 | echo "${ECHO_T}yes" >&6 |
7845 | else | 10794 | else |
7846 | echo "$as_me: program exited with status $ac_status" >&5 | 10795 | echo "$as_me: program exited with status $ac_status" >&5 |
7847 | echo "$as_me: failed program was:" >&5 | 10796 | echo "$as_me: failed program was:" >&5 |
7848 | cat conftest.$ac_ext >&5 | 10797 | sed 's/^/| /' conftest.$ac_ext >&5 |
7849 | cat >>confdefs.h <<\EOF | 10798 | |
10799 | ( exit $ac_status ) | ||
10800 | cat >>confdefs.h <<\_ACEOF | ||
7850 | #define BROKEN_SETRESUID 1 | 10801 | #define BROKEN_SETRESUID 1 |
7851 | EOF | 10802 | _ACEOF |
7852 | 10803 | ||
7853 | echo "$as_me:7853: result: not implemented" >&5 | 10804 | echo "$as_me:$LINENO: result: not implemented" >&5 |
7854 | echo "${ECHO_T}not implemented" >&6 | 10805 | echo "${ECHO_T}not implemented" >&6 |
7855 | 10806 | ||
7856 | fi | 10807 | fi |
7857 | rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | 10808 | rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext |
7858 | fi | 10809 | fi |
7859 | 10810 | ||
7860 | fi | 10811 | fi |
7861 | done | 10812 | done |
7862 | 10813 | ||
10814 | |||
10815 | |||
7863 | for ac_func in setresgid | 10816 | for ac_func in setresgid |
7864 | do | 10817 | do |
7865 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | 10818 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
7866 | echo "$as_me:7866: checking for $ac_func" >&5 | 10819 | echo "$as_me:$LINENO: checking for $ac_func" >&5 |
7867 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | 10820 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 |
7868 | if eval "test \"\${$as_ac_var+set}\" = set"; then | 10821 | if eval "test \"\${$as_ac_var+set}\" = set"; then |
7869 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 10822 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
7870 | else | 10823 | else |
7871 | cat >conftest.$ac_ext <<_ACEOF | 10824 | cat >conftest.$ac_ext <<_ACEOF |
7872 | #line 7872 "configure" | 10825 | /* confdefs.h. */ |
7873 | #include "confdefs.h" | 10826 | _ACEOF |
10827 | cat confdefs.h >>conftest.$ac_ext | ||
10828 | cat >>conftest.$ac_ext <<_ACEOF | ||
10829 | /* end confdefs.h. */ | ||
10830 | /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
10831 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
10832 | #define $ac_func innocuous_$ac_func | ||
10833 | |||
7874 | /* System header to define __stub macros and hopefully few prototypes, | 10834 | /* System header to define __stub macros and hopefully few prototypes, |
7875 | which can conflict with char $ac_func (); below. */ | 10835 | which can conflict with char $ac_func (); below. |
7876 | #include <assert.h> | 10836 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
10837 | <limits.h> exists even on freestanding compilers. */ | ||
10838 | |||
10839 | #ifdef __STDC__ | ||
10840 | # include <limits.h> | ||
10841 | #else | ||
10842 | # include <assert.h> | ||
10843 | #endif | ||
10844 | |||
10845 | #undef $ac_func | ||
10846 | |||
7877 | /* Override any gcc2 internal prototype to avoid an error. */ | 10847 | /* Override any gcc2 internal prototype to avoid an error. */ |
7878 | #ifdef __cplusplus | 10848 | #ifdef __cplusplus |
7879 | extern "C" | 10849 | extern "C" |
10850 | { | ||
7880 | #endif | 10851 | #endif |
7881 | /* We use char because int might match the return type of a gcc2 | 10852 | /* We use char because int might match the return type of a gcc2 |
7882 | builtin and then its argument prototype would still apply. */ | 10853 | builtin and then its argument prototype would still apply. */ |
7883 | char $ac_func (); | 10854 | char $ac_func (); |
7884 | char (*f) (); | ||
7885 | |||
7886 | int | ||
7887 | main () | ||
7888 | { | ||
7889 | /* The GNU C library defines this for functions which it implements | 10855 | /* The GNU C library defines this for functions which it implements |
7890 | to always fail with ENOSYS. Some functions are actually named | 10856 | to always fail with ENOSYS. Some functions are actually named |
7891 | something starting with __ and the normal name is an alias. */ | 10857 | something starting with __ and the normal name is an alias. */ |
7892 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) | 10858 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) |
7893 | choke me | 10859 | choke me |
7894 | #else | 10860 | #else |
7895 | f = $ac_func; | 10861 | char (*f) () = $ac_func; |
10862 | #endif | ||
10863 | #ifdef __cplusplus | ||
10864 | } | ||
7896 | #endif | 10865 | #endif |
7897 | 10866 | ||
10867 | int | ||
10868 | main () | ||
10869 | { | ||
10870 | return f != $ac_func; | ||
7898 | ; | 10871 | ; |
7899 | return 0; | 10872 | return 0; |
7900 | } | 10873 | } |
7901 | _ACEOF | 10874 | _ACEOF |
7902 | rm -f conftest.$ac_objext conftest$ac_exeext | 10875 | rm -f conftest.$ac_objext conftest$ac_exeext |
7903 | if { (eval echo "$as_me:7903: \"$ac_link\"") >&5 | 10876 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
7904 | (eval $ac_link) 2>&5 | 10877 | (eval $ac_link) 2>conftest.er1 |
7905 | ac_status=$? | 10878 | ac_status=$? |
7906 | echo "$as_me:7906: \$? = $ac_status" >&5 | 10879 | grep -v '^ *+' conftest.er1 >conftest.err |
10880 | rm -f conftest.er1 | ||
10881 | cat conftest.err >&5 | ||
10882 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7907 | (exit $ac_status); } && | 10883 | (exit $ac_status); } && |
7908 | { ac_try='test -s conftest$ac_exeext' | 10884 | { ac_try='test -z "$ac_c_werror_flag" |
7909 | { (eval echo "$as_me:7909: \"$ac_try\"") >&5 | 10885 | || test ! -s conftest.err' |
10886 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
7910 | (eval $ac_try) 2>&5 | 10887 | (eval $ac_try) 2>&5 |
7911 | ac_status=$? | 10888 | ac_status=$? |
7912 | echo "$as_me:7912: \$? = $ac_status" >&5 | 10889 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
10890 | (exit $ac_status); }; } && | ||
10891 | { ac_try='test -s conftest$ac_exeext' | ||
10892 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10893 | (eval $ac_try) 2>&5 | ||
10894 | ac_status=$? | ||
10895 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
7913 | (exit $ac_status); }; }; then | 10896 | (exit $ac_status); }; }; then |
7914 | eval "$as_ac_var=yes" | 10897 | eval "$as_ac_var=yes" |
7915 | else | 10898 | else |
7916 | echo "$as_me: failed program was:" >&5 | 10899 | echo "$as_me: failed program was:" >&5 |
7917 | cat conftest.$ac_ext >&5 | 10900 | sed 's/^/| /' conftest.$ac_ext >&5 |
10901 | |||
7918 | eval "$as_ac_var=no" | 10902 | eval "$as_ac_var=no" |
7919 | fi | 10903 | fi |
7920 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 10904 | rm -f conftest.err conftest.$ac_objext \ |
10905 | conftest$ac_exeext conftest.$ac_ext | ||
7921 | fi | 10906 | fi |
7922 | echo "$as_me:7922: result: `eval echo '${'$as_ac_var'}'`" >&5 | 10907 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 |
7923 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | 10908 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 |
7924 | if test `eval echo '${'$as_ac_var'}'` = yes; then | 10909 | if test `eval echo '${'$as_ac_var'}'` = yes; then |
7925 | cat >>confdefs.h <<EOF | 10910 | cat >>confdefs.h <<_ACEOF |
7926 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 10911 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
7927 | EOF | 10912 | _ACEOF |
7928 | 10913 | ||
7929 | echo "$as_me:7929: checking if setresgid seems to work" >&5 | 10914 | echo "$as_me:$LINENO: checking if setresgid seems to work" >&5 |
7930 | echo $ECHO_N "checking if setresgid seems to work... $ECHO_C" >&6 | 10915 | echo $ECHO_N "checking if setresgid seems to work... $ECHO_C" >&6 |
7931 | if test "$cross_compiling" = yes; then | 10916 | if test "$cross_compiling" = yes; then |
7932 | { { echo "$as_me:7932: error: cannot run test program while cross compiling" >&5 | 10917 | { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
7933 | echo "$as_me: error: cannot run test program while cross compiling" >&2;} | 10918 | See \`config.log' for more details." >&5 |
10919 | echo "$as_me: error: cannot run test program while cross compiling | ||
10920 | See \`config.log' for more details." >&2;} | ||
7934 | { (exit 1); exit 1; }; } | 10921 | { (exit 1); exit 1; }; } |
7935 | else | 10922 | else |
7936 | cat >conftest.$ac_ext <<_ACEOF | 10923 | cat >conftest.$ac_ext <<_ACEOF |
7937 | #line 7937 "configure" | 10924 | /* confdefs.h. */ |
7938 | #include "confdefs.h" | 10925 | _ACEOF |
10926 | cat confdefs.h >>conftest.$ac_ext | ||
10927 | cat >>conftest.$ac_ext <<_ACEOF | ||
10928 | /* end confdefs.h. */ | ||
7939 | 10929 | ||
7940 | #include <stdlib.h> | 10930 | #include <stdlib.h> |
7941 | #include <errno.h> | 10931 | #include <errno.h> |
@@ -7943,446 +10933,658 @@ int main(){errno=0; setresgid(0,0,0); if (errno==ENOSYS) exit(1); else exit(0);} | |||
7943 | 10933 | ||
7944 | _ACEOF | 10934 | _ACEOF |
7945 | rm -f conftest$ac_exeext | 10935 | rm -f conftest$ac_exeext |
7946 | if { (eval echo "$as_me:7946: \"$ac_link\"") >&5 | 10936 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
7947 | (eval $ac_link) 2>&5 | 10937 | (eval $ac_link) 2>&5 |
7948 | ac_status=$? | 10938 | ac_status=$? |
7949 | echo "$as_me:7949: \$? = $ac_status" >&5 | 10939 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
7950 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | 10940 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
7951 | { (eval echo "$as_me:7951: \"$ac_try\"") >&5 | 10941 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
7952 | (eval $ac_try) 2>&5 | 10942 | (eval $ac_try) 2>&5 |
7953 | ac_status=$? | 10943 | ac_status=$? |
7954 | echo "$as_me:7954: \$? = $ac_status" >&5 | 10944 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
7955 | (exit $ac_status); }; }; then | 10945 | (exit $ac_status); }; }; then |
7956 | echo "$as_me:7956: result: yes" >&5 | 10946 | echo "$as_me:$LINENO: result: yes" >&5 |
7957 | echo "${ECHO_T}yes" >&6 | 10947 | echo "${ECHO_T}yes" >&6 |
7958 | else | 10948 | else |
7959 | echo "$as_me: program exited with status $ac_status" >&5 | 10949 | echo "$as_me: program exited with status $ac_status" >&5 |
7960 | echo "$as_me: failed program was:" >&5 | 10950 | echo "$as_me: failed program was:" >&5 |
7961 | cat conftest.$ac_ext >&5 | 10951 | sed 's/^/| /' conftest.$ac_ext >&5 |
7962 | cat >>confdefs.h <<\EOF | 10952 | |
10953 | ( exit $ac_status ) | ||
10954 | cat >>confdefs.h <<\_ACEOF | ||
7963 | #define BROKEN_SETRESGID 1 | 10955 | #define BROKEN_SETRESGID 1 |
7964 | EOF | 10956 | _ACEOF |
7965 | 10957 | ||
7966 | echo "$as_me:7966: result: not implemented" >&5 | 10958 | echo "$as_me:$LINENO: result: not implemented" >&5 |
7967 | echo "${ECHO_T}not implemented" >&6 | 10959 | echo "${ECHO_T}not implemented" >&6 |
7968 | 10960 | ||
7969 | fi | 10961 | fi |
7970 | rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | 10962 | rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext |
7971 | fi | 10963 | fi |
7972 | 10964 | ||
7973 | fi | 10965 | fi |
7974 | done | 10966 | done |
7975 | 10967 | ||
10968 | |||
10969 | |||
10970 | |||
7976 | for ac_func in gettimeofday time | 10971 | for ac_func in gettimeofday time |
7977 | do | 10972 | do |
7978 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | 10973 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
7979 | echo "$as_me:7979: checking for $ac_func" >&5 | 10974 | echo "$as_me:$LINENO: checking for $ac_func" >&5 |
7980 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | 10975 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 |
7981 | if eval "test \"\${$as_ac_var+set}\" = set"; then | 10976 | if eval "test \"\${$as_ac_var+set}\" = set"; then |
7982 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 10977 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
7983 | else | 10978 | else |
7984 | cat >conftest.$ac_ext <<_ACEOF | 10979 | cat >conftest.$ac_ext <<_ACEOF |
7985 | #line 7985 "configure" | 10980 | /* confdefs.h. */ |
7986 | #include "confdefs.h" | 10981 | _ACEOF |
10982 | cat confdefs.h >>conftest.$ac_ext | ||
10983 | cat >>conftest.$ac_ext <<_ACEOF | ||
10984 | /* end confdefs.h. */ | ||
10985 | /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
10986 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
10987 | #define $ac_func innocuous_$ac_func | ||
10988 | |||
7987 | /* System header to define __stub macros and hopefully few prototypes, | 10989 | /* System header to define __stub macros and hopefully few prototypes, |
7988 | which can conflict with char $ac_func (); below. */ | 10990 | which can conflict with char $ac_func (); below. |
7989 | #include <assert.h> | 10991 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
10992 | <limits.h> exists even on freestanding compilers. */ | ||
10993 | |||
10994 | #ifdef __STDC__ | ||
10995 | # include <limits.h> | ||
10996 | #else | ||
10997 | # include <assert.h> | ||
10998 | #endif | ||
10999 | |||
11000 | #undef $ac_func | ||
11001 | |||
7990 | /* Override any gcc2 internal prototype to avoid an error. */ | 11002 | /* Override any gcc2 internal prototype to avoid an error. */ |
7991 | #ifdef __cplusplus | 11003 | #ifdef __cplusplus |
7992 | extern "C" | 11004 | extern "C" |
11005 | { | ||
7993 | #endif | 11006 | #endif |
7994 | /* We use char because int might match the return type of a gcc2 | 11007 | /* We use char because int might match the return type of a gcc2 |
7995 | builtin and then its argument prototype would still apply. */ | 11008 | builtin and then its argument prototype would still apply. */ |
7996 | char $ac_func (); | 11009 | char $ac_func (); |
7997 | char (*f) (); | ||
7998 | |||
7999 | int | ||
8000 | main () | ||
8001 | { | ||
8002 | /* The GNU C library defines this for functions which it implements | 11010 | /* The GNU C library defines this for functions which it implements |
8003 | to always fail with ENOSYS. Some functions are actually named | 11011 | to always fail with ENOSYS. Some functions are actually named |
8004 | something starting with __ and the normal name is an alias. */ | 11012 | something starting with __ and the normal name is an alias. */ |
8005 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) | 11013 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) |
8006 | choke me | 11014 | choke me |
8007 | #else | 11015 | #else |
8008 | f = $ac_func; | 11016 | char (*f) () = $ac_func; |
11017 | #endif | ||
11018 | #ifdef __cplusplus | ||
11019 | } | ||
8009 | #endif | 11020 | #endif |
8010 | 11021 | ||
11022 | int | ||
11023 | main () | ||
11024 | { | ||
11025 | return f != $ac_func; | ||
8011 | ; | 11026 | ; |
8012 | return 0; | 11027 | return 0; |
8013 | } | 11028 | } |
8014 | _ACEOF | 11029 | _ACEOF |
8015 | rm -f conftest.$ac_objext conftest$ac_exeext | 11030 | rm -f conftest.$ac_objext conftest$ac_exeext |
8016 | if { (eval echo "$as_me:8016: \"$ac_link\"") >&5 | 11031 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
8017 | (eval $ac_link) 2>&5 | 11032 | (eval $ac_link) 2>conftest.er1 |
8018 | ac_status=$? | 11033 | ac_status=$? |
8019 | echo "$as_me:8019: \$? = $ac_status" >&5 | 11034 | grep -v '^ *+' conftest.er1 >conftest.err |
11035 | rm -f conftest.er1 | ||
11036 | cat conftest.err >&5 | ||
11037 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8020 | (exit $ac_status); } && | 11038 | (exit $ac_status); } && |
8021 | { ac_try='test -s conftest$ac_exeext' | 11039 | { ac_try='test -z "$ac_c_werror_flag" |
8022 | { (eval echo "$as_me:8022: \"$ac_try\"") >&5 | 11040 | || test ! -s conftest.err' |
11041 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8023 | (eval $ac_try) 2>&5 | 11042 | (eval $ac_try) 2>&5 |
8024 | ac_status=$? | 11043 | ac_status=$? |
8025 | echo "$as_me:8025: \$? = $ac_status" >&5 | 11044 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
11045 | (exit $ac_status); }; } && | ||
11046 | { ac_try='test -s conftest$ac_exeext' | ||
11047 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11048 | (eval $ac_try) 2>&5 | ||
11049 | ac_status=$? | ||
11050 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8026 | (exit $ac_status); }; }; then | 11051 | (exit $ac_status); }; }; then |
8027 | eval "$as_ac_var=yes" | 11052 | eval "$as_ac_var=yes" |
8028 | else | 11053 | else |
8029 | echo "$as_me: failed program was:" >&5 | 11054 | echo "$as_me: failed program was:" >&5 |
8030 | cat conftest.$ac_ext >&5 | 11055 | sed 's/^/| /' conftest.$ac_ext >&5 |
11056 | |||
8031 | eval "$as_ac_var=no" | 11057 | eval "$as_ac_var=no" |
8032 | fi | 11058 | fi |
8033 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 11059 | rm -f conftest.err conftest.$ac_objext \ |
11060 | conftest$ac_exeext conftest.$ac_ext | ||
8034 | fi | 11061 | fi |
8035 | echo "$as_me:8035: result: `eval echo '${'$as_ac_var'}'`" >&5 | 11062 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 |
8036 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | 11063 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 |
8037 | if test `eval echo '${'$as_ac_var'}'` = yes; then | 11064 | if test `eval echo '${'$as_ac_var'}'` = yes; then |
8038 | cat >>confdefs.h <<EOF | 11065 | cat >>confdefs.h <<_ACEOF |
8039 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 11066 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
8040 | EOF | 11067 | _ACEOF |
8041 | 11068 | ||
8042 | fi | 11069 | fi |
8043 | done | 11070 | done |
8044 | 11071 | ||
11072 | |||
11073 | |||
11074 | |||
11075 | |||
11076 | |||
11077 | |||
8045 | for ac_func in endutent getutent getutid getutline pututline setutent | 11078 | for ac_func in endutent getutent getutid getutline pututline setutent |
8046 | do | 11079 | do |
8047 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | 11080 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
8048 | echo "$as_me:8048: checking for $ac_func" >&5 | 11081 | echo "$as_me:$LINENO: checking for $ac_func" >&5 |
8049 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | 11082 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 |
8050 | if eval "test \"\${$as_ac_var+set}\" = set"; then | 11083 | if eval "test \"\${$as_ac_var+set}\" = set"; then |
8051 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 11084 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
8052 | else | 11085 | else |
8053 | cat >conftest.$ac_ext <<_ACEOF | 11086 | cat >conftest.$ac_ext <<_ACEOF |
8054 | #line 8054 "configure" | 11087 | /* confdefs.h. */ |
8055 | #include "confdefs.h" | 11088 | _ACEOF |
11089 | cat confdefs.h >>conftest.$ac_ext | ||
11090 | cat >>conftest.$ac_ext <<_ACEOF | ||
11091 | /* end confdefs.h. */ | ||
11092 | /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
11093 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
11094 | #define $ac_func innocuous_$ac_func | ||
11095 | |||
8056 | /* System header to define __stub macros and hopefully few prototypes, | 11096 | /* System header to define __stub macros and hopefully few prototypes, |
8057 | which can conflict with char $ac_func (); below. */ | 11097 | which can conflict with char $ac_func (); below. |
8058 | #include <assert.h> | 11098 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
11099 | <limits.h> exists even on freestanding compilers. */ | ||
11100 | |||
11101 | #ifdef __STDC__ | ||
11102 | # include <limits.h> | ||
11103 | #else | ||
11104 | # include <assert.h> | ||
11105 | #endif | ||
11106 | |||
11107 | #undef $ac_func | ||
11108 | |||
8059 | /* Override any gcc2 internal prototype to avoid an error. */ | 11109 | /* Override any gcc2 internal prototype to avoid an error. */ |
8060 | #ifdef __cplusplus | 11110 | #ifdef __cplusplus |
8061 | extern "C" | 11111 | extern "C" |
11112 | { | ||
8062 | #endif | 11113 | #endif |
8063 | /* We use char because int might match the return type of a gcc2 | 11114 | /* We use char because int might match the return type of a gcc2 |
8064 | builtin and then its argument prototype would still apply. */ | 11115 | builtin and then its argument prototype would still apply. */ |
8065 | char $ac_func (); | 11116 | char $ac_func (); |
8066 | char (*f) (); | ||
8067 | |||
8068 | int | ||
8069 | main () | ||
8070 | { | ||
8071 | /* The GNU C library defines this for functions which it implements | 11117 | /* The GNU C library defines this for functions which it implements |
8072 | to always fail with ENOSYS. Some functions are actually named | 11118 | to always fail with ENOSYS. Some functions are actually named |
8073 | something starting with __ and the normal name is an alias. */ | 11119 | something starting with __ and the normal name is an alias. */ |
8074 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) | 11120 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) |
8075 | choke me | 11121 | choke me |
8076 | #else | 11122 | #else |
8077 | f = $ac_func; | 11123 | char (*f) () = $ac_func; |
11124 | #endif | ||
11125 | #ifdef __cplusplus | ||
11126 | } | ||
8078 | #endif | 11127 | #endif |
8079 | 11128 | ||
11129 | int | ||
11130 | main () | ||
11131 | { | ||
11132 | return f != $ac_func; | ||
8080 | ; | 11133 | ; |
8081 | return 0; | 11134 | return 0; |
8082 | } | 11135 | } |
8083 | _ACEOF | 11136 | _ACEOF |
8084 | rm -f conftest.$ac_objext conftest$ac_exeext | 11137 | rm -f conftest.$ac_objext conftest$ac_exeext |
8085 | if { (eval echo "$as_me:8085: \"$ac_link\"") >&5 | 11138 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
8086 | (eval $ac_link) 2>&5 | 11139 | (eval $ac_link) 2>conftest.er1 |
8087 | ac_status=$? | 11140 | ac_status=$? |
8088 | echo "$as_me:8088: \$? = $ac_status" >&5 | 11141 | grep -v '^ *+' conftest.er1 >conftest.err |
11142 | rm -f conftest.er1 | ||
11143 | cat conftest.err >&5 | ||
11144 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8089 | (exit $ac_status); } && | 11145 | (exit $ac_status); } && |
8090 | { ac_try='test -s conftest$ac_exeext' | 11146 | { ac_try='test -z "$ac_c_werror_flag" |
8091 | { (eval echo "$as_me:8091: \"$ac_try\"") >&5 | 11147 | || test ! -s conftest.err' |
11148 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11149 | (eval $ac_try) 2>&5 | ||
11150 | ac_status=$? | ||
11151 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11152 | (exit $ac_status); }; } && | ||
11153 | { ac_try='test -s conftest$ac_exeext' | ||
11154 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8092 | (eval $ac_try) 2>&5 | 11155 | (eval $ac_try) 2>&5 |
8093 | ac_status=$? | 11156 | ac_status=$? |
8094 | echo "$as_me:8094: \$? = $ac_status" >&5 | 11157 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
8095 | (exit $ac_status); }; }; then | 11158 | (exit $ac_status); }; }; then |
8096 | eval "$as_ac_var=yes" | 11159 | eval "$as_ac_var=yes" |
8097 | else | 11160 | else |
8098 | echo "$as_me: failed program was:" >&5 | 11161 | echo "$as_me: failed program was:" >&5 |
8099 | cat conftest.$ac_ext >&5 | 11162 | sed 's/^/| /' conftest.$ac_ext >&5 |
11163 | |||
8100 | eval "$as_ac_var=no" | 11164 | eval "$as_ac_var=no" |
8101 | fi | 11165 | fi |
8102 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 11166 | rm -f conftest.err conftest.$ac_objext \ |
11167 | conftest$ac_exeext conftest.$ac_ext | ||
8103 | fi | 11168 | fi |
8104 | echo "$as_me:8104: result: `eval echo '${'$as_ac_var'}'`" >&5 | 11169 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 |
8105 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | 11170 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 |
8106 | if test `eval echo '${'$as_ac_var'}'` = yes; then | 11171 | if test `eval echo '${'$as_ac_var'}'` = yes; then |
8107 | cat >>confdefs.h <<EOF | 11172 | cat >>confdefs.h <<_ACEOF |
8108 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 11173 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
8109 | EOF | 11174 | _ACEOF |
8110 | 11175 | ||
8111 | fi | 11176 | fi |
8112 | done | 11177 | done |
8113 | 11178 | ||
11179 | |||
8114 | for ac_func in utmpname | 11180 | for ac_func in utmpname |
8115 | do | 11181 | do |
8116 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | 11182 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
8117 | echo "$as_me:8117: checking for $ac_func" >&5 | 11183 | echo "$as_me:$LINENO: checking for $ac_func" >&5 |
8118 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | 11184 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 |
8119 | if eval "test \"\${$as_ac_var+set}\" = set"; then | 11185 | if eval "test \"\${$as_ac_var+set}\" = set"; then |
8120 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 11186 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
8121 | else | 11187 | else |
8122 | cat >conftest.$ac_ext <<_ACEOF | 11188 | cat >conftest.$ac_ext <<_ACEOF |
8123 | #line 8123 "configure" | 11189 | /* confdefs.h. */ |
8124 | #include "confdefs.h" | 11190 | _ACEOF |
11191 | cat confdefs.h >>conftest.$ac_ext | ||
11192 | cat >>conftest.$ac_ext <<_ACEOF | ||
11193 | /* end confdefs.h. */ | ||
11194 | /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
11195 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
11196 | #define $ac_func innocuous_$ac_func | ||
11197 | |||
8125 | /* System header to define __stub macros and hopefully few prototypes, | 11198 | /* System header to define __stub macros and hopefully few prototypes, |
8126 | which can conflict with char $ac_func (); below. */ | 11199 | which can conflict with char $ac_func (); below. |
8127 | #include <assert.h> | 11200 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
11201 | <limits.h> exists even on freestanding compilers. */ | ||
11202 | |||
11203 | #ifdef __STDC__ | ||
11204 | # include <limits.h> | ||
11205 | #else | ||
11206 | # include <assert.h> | ||
11207 | #endif | ||
11208 | |||
11209 | #undef $ac_func | ||
11210 | |||
8128 | /* Override any gcc2 internal prototype to avoid an error. */ | 11211 | /* Override any gcc2 internal prototype to avoid an error. */ |
8129 | #ifdef __cplusplus | 11212 | #ifdef __cplusplus |
8130 | extern "C" | 11213 | extern "C" |
11214 | { | ||
8131 | #endif | 11215 | #endif |
8132 | /* We use char because int might match the return type of a gcc2 | 11216 | /* We use char because int might match the return type of a gcc2 |
8133 | builtin and then its argument prototype would still apply. */ | 11217 | builtin and then its argument prototype would still apply. */ |
8134 | char $ac_func (); | 11218 | char $ac_func (); |
8135 | char (*f) (); | ||
8136 | |||
8137 | int | ||
8138 | main () | ||
8139 | { | ||
8140 | /* The GNU C library defines this for functions which it implements | 11219 | /* The GNU C library defines this for functions which it implements |
8141 | to always fail with ENOSYS. Some functions are actually named | 11220 | to always fail with ENOSYS. Some functions are actually named |
8142 | something starting with __ and the normal name is an alias. */ | 11221 | something starting with __ and the normal name is an alias. */ |
8143 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) | 11222 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) |
8144 | choke me | 11223 | choke me |
8145 | #else | 11224 | #else |
8146 | f = $ac_func; | 11225 | char (*f) () = $ac_func; |
11226 | #endif | ||
11227 | #ifdef __cplusplus | ||
11228 | } | ||
8147 | #endif | 11229 | #endif |
8148 | 11230 | ||
11231 | int | ||
11232 | main () | ||
11233 | { | ||
11234 | return f != $ac_func; | ||
8149 | ; | 11235 | ; |
8150 | return 0; | 11236 | return 0; |
8151 | } | 11237 | } |
8152 | _ACEOF | 11238 | _ACEOF |
8153 | rm -f conftest.$ac_objext conftest$ac_exeext | 11239 | rm -f conftest.$ac_objext conftest$ac_exeext |
8154 | if { (eval echo "$as_me:8154: \"$ac_link\"") >&5 | 11240 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
8155 | (eval $ac_link) 2>&5 | 11241 | (eval $ac_link) 2>conftest.er1 |
8156 | ac_status=$? | 11242 | ac_status=$? |
8157 | echo "$as_me:8157: \$? = $ac_status" >&5 | 11243 | grep -v '^ *+' conftest.er1 >conftest.err |
11244 | rm -f conftest.er1 | ||
11245 | cat conftest.err >&5 | ||
11246 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8158 | (exit $ac_status); } && | 11247 | (exit $ac_status); } && |
8159 | { ac_try='test -s conftest$ac_exeext' | 11248 | { ac_try='test -z "$ac_c_werror_flag" |
8160 | { (eval echo "$as_me:8160: \"$ac_try\"") >&5 | 11249 | || test ! -s conftest.err' |
11250 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8161 | (eval $ac_try) 2>&5 | 11251 | (eval $ac_try) 2>&5 |
8162 | ac_status=$? | 11252 | ac_status=$? |
8163 | echo "$as_me:8163: \$? = $ac_status" >&5 | 11253 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
11254 | (exit $ac_status); }; } && | ||
11255 | { ac_try='test -s conftest$ac_exeext' | ||
11256 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11257 | (eval $ac_try) 2>&5 | ||
11258 | ac_status=$? | ||
11259 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8164 | (exit $ac_status); }; }; then | 11260 | (exit $ac_status); }; }; then |
8165 | eval "$as_ac_var=yes" | 11261 | eval "$as_ac_var=yes" |
8166 | else | 11262 | else |
8167 | echo "$as_me: failed program was:" >&5 | 11263 | echo "$as_me: failed program was:" >&5 |
8168 | cat conftest.$ac_ext >&5 | 11264 | sed 's/^/| /' conftest.$ac_ext >&5 |
11265 | |||
8169 | eval "$as_ac_var=no" | 11266 | eval "$as_ac_var=no" |
8170 | fi | 11267 | fi |
8171 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 11268 | rm -f conftest.err conftest.$ac_objext \ |
11269 | conftest$ac_exeext conftest.$ac_ext | ||
8172 | fi | 11270 | fi |
8173 | echo "$as_me:8173: result: `eval echo '${'$as_ac_var'}'`" >&5 | 11271 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 |
8174 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | 11272 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 |
8175 | if test `eval echo '${'$as_ac_var'}'` = yes; then | 11273 | if test `eval echo '${'$as_ac_var'}'` = yes; then |
8176 | cat >>confdefs.h <<EOF | 11274 | cat >>confdefs.h <<_ACEOF |
8177 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 11275 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
8178 | EOF | 11276 | _ACEOF |
8179 | 11277 | ||
8180 | fi | 11278 | fi |
8181 | done | 11279 | done |
8182 | 11280 | ||
11281 | |||
11282 | |||
11283 | |||
11284 | |||
11285 | |||
8183 | for ac_func in endutxent getutxent getutxid getutxline pututxline | 11286 | for ac_func in endutxent getutxent getutxid getutxline pututxline |
8184 | do | 11287 | do |
8185 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | 11288 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
8186 | echo "$as_me:8186: checking for $ac_func" >&5 | 11289 | echo "$as_me:$LINENO: checking for $ac_func" >&5 |
8187 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | 11290 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 |
8188 | if eval "test \"\${$as_ac_var+set}\" = set"; then | 11291 | if eval "test \"\${$as_ac_var+set}\" = set"; then |
8189 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 11292 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
8190 | else | 11293 | else |
8191 | cat >conftest.$ac_ext <<_ACEOF | 11294 | cat >conftest.$ac_ext <<_ACEOF |
8192 | #line 8192 "configure" | 11295 | /* confdefs.h. */ |
8193 | #include "confdefs.h" | 11296 | _ACEOF |
11297 | cat confdefs.h >>conftest.$ac_ext | ||
11298 | cat >>conftest.$ac_ext <<_ACEOF | ||
11299 | /* end confdefs.h. */ | ||
11300 | /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
11301 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
11302 | #define $ac_func innocuous_$ac_func | ||
11303 | |||
8194 | /* System header to define __stub macros and hopefully few prototypes, | 11304 | /* System header to define __stub macros and hopefully few prototypes, |
8195 | which can conflict with char $ac_func (); below. */ | 11305 | which can conflict with char $ac_func (); below. |
8196 | #include <assert.h> | 11306 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
11307 | <limits.h> exists even on freestanding compilers. */ | ||
11308 | |||
11309 | #ifdef __STDC__ | ||
11310 | # include <limits.h> | ||
11311 | #else | ||
11312 | # include <assert.h> | ||
11313 | #endif | ||
11314 | |||
11315 | #undef $ac_func | ||
11316 | |||
8197 | /* Override any gcc2 internal prototype to avoid an error. */ | 11317 | /* Override any gcc2 internal prototype to avoid an error. */ |
8198 | #ifdef __cplusplus | 11318 | #ifdef __cplusplus |
8199 | extern "C" | 11319 | extern "C" |
11320 | { | ||
8200 | #endif | 11321 | #endif |
8201 | /* We use char because int might match the return type of a gcc2 | 11322 | /* We use char because int might match the return type of a gcc2 |
8202 | builtin and then its argument prototype would still apply. */ | 11323 | builtin and then its argument prototype would still apply. */ |
8203 | char $ac_func (); | 11324 | char $ac_func (); |
8204 | char (*f) (); | ||
8205 | |||
8206 | int | ||
8207 | main () | ||
8208 | { | ||
8209 | /* The GNU C library defines this for functions which it implements | 11325 | /* The GNU C library defines this for functions which it implements |
8210 | to always fail with ENOSYS. Some functions are actually named | 11326 | to always fail with ENOSYS. Some functions are actually named |
8211 | something starting with __ and the normal name is an alias. */ | 11327 | something starting with __ and the normal name is an alias. */ |
8212 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) | 11328 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) |
8213 | choke me | 11329 | choke me |
8214 | #else | 11330 | #else |
8215 | f = $ac_func; | 11331 | char (*f) () = $ac_func; |
11332 | #endif | ||
11333 | #ifdef __cplusplus | ||
11334 | } | ||
8216 | #endif | 11335 | #endif |
8217 | 11336 | ||
11337 | int | ||
11338 | main () | ||
11339 | { | ||
11340 | return f != $ac_func; | ||
8218 | ; | 11341 | ; |
8219 | return 0; | 11342 | return 0; |
8220 | } | 11343 | } |
8221 | _ACEOF | 11344 | _ACEOF |
8222 | rm -f conftest.$ac_objext conftest$ac_exeext | 11345 | rm -f conftest.$ac_objext conftest$ac_exeext |
8223 | if { (eval echo "$as_me:8223: \"$ac_link\"") >&5 | 11346 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
8224 | (eval $ac_link) 2>&5 | 11347 | (eval $ac_link) 2>conftest.er1 |
8225 | ac_status=$? | 11348 | ac_status=$? |
8226 | echo "$as_me:8226: \$? = $ac_status" >&5 | 11349 | grep -v '^ *+' conftest.er1 >conftest.err |
11350 | rm -f conftest.er1 | ||
11351 | cat conftest.err >&5 | ||
11352 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8227 | (exit $ac_status); } && | 11353 | (exit $ac_status); } && |
8228 | { ac_try='test -s conftest$ac_exeext' | 11354 | { ac_try='test -z "$ac_c_werror_flag" |
8229 | { (eval echo "$as_me:8229: \"$ac_try\"") >&5 | 11355 | || test ! -s conftest.err' |
11356 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11357 | (eval $ac_try) 2>&5 | ||
11358 | ac_status=$? | ||
11359 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11360 | (exit $ac_status); }; } && | ||
11361 | { ac_try='test -s conftest$ac_exeext' | ||
11362 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8230 | (eval $ac_try) 2>&5 | 11363 | (eval $ac_try) 2>&5 |
8231 | ac_status=$? | 11364 | ac_status=$? |
8232 | echo "$as_me:8232: \$? = $ac_status" >&5 | 11365 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
8233 | (exit $ac_status); }; }; then | 11366 | (exit $ac_status); }; }; then |
8234 | eval "$as_ac_var=yes" | 11367 | eval "$as_ac_var=yes" |
8235 | else | 11368 | else |
8236 | echo "$as_me: failed program was:" >&5 | 11369 | echo "$as_me: failed program was:" >&5 |
8237 | cat conftest.$ac_ext >&5 | 11370 | sed 's/^/| /' conftest.$ac_ext >&5 |
11371 | |||
8238 | eval "$as_ac_var=no" | 11372 | eval "$as_ac_var=no" |
8239 | fi | 11373 | fi |
8240 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 11374 | rm -f conftest.err conftest.$ac_objext \ |
11375 | conftest$ac_exeext conftest.$ac_ext | ||
8241 | fi | 11376 | fi |
8242 | echo "$as_me:8242: result: `eval echo '${'$as_ac_var'}'`" >&5 | 11377 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 |
8243 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | 11378 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 |
8244 | if test `eval echo '${'$as_ac_var'}'` = yes; then | 11379 | if test `eval echo '${'$as_ac_var'}'` = yes; then |
8245 | cat >>confdefs.h <<EOF | 11380 | cat >>confdefs.h <<_ACEOF |
8246 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 11381 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
8247 | EOF | 11382 | _ACEOF |
8248 | 11383 | ||
8249 | fi | 11384 | fi |
8250 | done | 11385 | done |
8251 | 11386 | ||
11387 | |||
11388 | |||
8252 | for ac_func in setutxent utmpxname | 11389 | for ac_func in setutxent utmpxname |
8253 | do | 11390 | do |
8254 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | 11391 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
8255 | echo "$as_me:8255: checking for $ac_func" >&5 | 11392 | echo "$as_me:$LINENO: checking for $ac_func" >&5 |
8256 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | 11393 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 |
8257 | if eval "test \"\${$as_ac_var+set}\" = set"; then | 11394 | if eval "test \"\${$as_ac_var+set}\" = set"; then |
8258 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 11395 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
8259 | else | 11396 | else |
8260 | cat >conftest.$ac_ext <<_ACEOF | 11397 | cat >conftest.$ac_ext <<_ACEOF |
8261 | #line 8261 "configure" | 11398 | /* confdefs.h. */ |
8262 | #include "confdefs.h" | 11399 | _ACEOF |
11400 | cat confdefs.h >>conftest.$ac_ext | ||
11401 | cat >>conftest.$ac_ext <<_ACEOF | ||
11402 | /* end confdefs.h. */ | ||
11403 | /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
11404 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
11405 | #define $ac_func innocuous_$ac_func | ||
11406 | |||
8263 | /* System header to define __stub macros and hopefully few prototypes, | 11407 | /* System header to define __stub macros and hopefully few prototypes, |
8264 | which can conflict with char $ac_func (); below. */ | 11408 | which can conflict with char $ac_func (); below. |
8265 | #include <assert.h> | 11409 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
11410 | <limits.h> exists even on freestanding compilers. */ | ||
11411 | |||
11412 | #ifdef __STDC__ | ||
11413 | # include <limits.h> | ||
11414 | #else | ||
11415 | # include <assert.h> | ||
11416 | #endif | ||
11417 | |||
11418 | #undef $ac_func | ||
11419 | |||
8266 | /* Override any gcc2 internal prototype to avoid an error. */ | 11420 | /* Override any gcc2 internal prototype to avoid an error. */ |
8267 | #ifdef __cplusplus | 11421 | #ifdef __cplusplus |
8268 | extern "C" | 11422 | extern "C" |
11423 | { | ||
8269 | #endif | 11424 | #endif |
8270 | /* We use char because int might match the return type of a gcc2 | 11425 | /* We use char because int might match the return type of a gcc2 |
8271 | builtin and then its argument prototype would still apply. */ | 11426 | builtin and then its argument prototype would still apply. */ |
8272 | char $ac_func (); | 11427 | char $ac_func (); |
8273 | char (*f) (); | ||
8274 | |||
8275 | int | ||
8276 | main () | ||
8277 | { | ||
8278 | /* The GNU C library defines this for functions which it implements | 11428 | /* The GNU C library defines this for functions which it implements |
8279 | to always fail with ENOSYS. Some functions are actually named | 11429 | to always fail with ENOSYS. Some functions are actually named |
8280 | something starting with __ and the normal name is an alias. */ | 11430 | something starting with __ and the normal name is an alias. */ |
8281 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) | 11431 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) |
8282 | choke me | 11432 | choke me |
8283 | #else | 11433 | #else |
8284 | f = $ac_func; | 11434 | char (*f) () = $ac_func; |
11435 | #endif | ||
11436 | #ifdef __cplusplus | ||
11437 | } | ||
8285 | #endif | 11438 | #endif |
8286 | 11439 | ||
11440 | int | ||
11441 | main () | ||
11442 | { | ||
11443 | return f != $ac_func; | ||
8287 | ; | 11444 | ; |
8288 | return 0; | 11445 | return 0; |
8289 | } | 11446 | } |
8290 | _ACEOF | 11447 | _ACEOF |
8291 | rm -f conftest.$ac_objext conftest$ac_exeext | 11448 | rm -f conftest.$ac_objext conftest$ac_exeext |
8292 | if { (eval echo "$as_me:8292: \"$ac_link\"") >&5 | 11449 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
8293 | (eval $ac_link) 2>&5 | 11450 | (eval $ac_link) 2>conftest.er1 |
8294 | ac_status=$? | 11451 | ac_status=$? |
8295 | echo "$as_me:8295: \$? = $ac_status" >&5 | 11452 | grep -v '^ *+' conftest.er1 >conftest.err |
11453 | rm -f conftest.er1 | ||
11454 | cat conftest.err >&5 | ||
11455 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8296 | (exit $ac_status); } && | 11456 | (exit $ac_status); } && |
8297 | { ac_try='test -s conftest$ac_exeext' | 11457 | { ac_try='test -z "$ac_c_werror_flag" |
8298 | { (eval echo "$as_me:8298: \"$ac_try\"") >&5 | 11458 | || test ! -s conftest.err' |
11459 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8299 | (eval $ac_try) 2>&5 | 11460 | (eval $ac_try) 2>&5 |
8300 | ac_status=$? | 11461 | ac_status=$? |
8301 | echo "$as_me:8301: \$? = $ac_status" >&5 | 11462 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
11463 | (exit $ac_status); }; } && | ||
11464 | { ac_try='test -s conftest$ac_exeext' | ||
11465 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11466 | (eval $ac_try) 2>&5 | ||
11467 | ac_status=$? | ||
11468 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8302 | (exit $ac_status); }; }; then | 11469 | (exit $ac_status); }; }; then |
8303 | eval "$as_ac_var=yes" | 11470 | eval "$as_ac_var=yes" |
8304 | else | 11471 | else |
8305 | echo "$as_me: failed program was:" >&5 | 11472 | echo "$as_me: failed program was:" >&5 |
8306 | cat conftest.$ac_ext >&5 | 11473 | sed 's/^/| /' conftest.$ac_ext >&5 |
11474 | |||
8307 | eval "$as_ac_var=no" | 11475 | eval "$as_ac_var=no" |
8308 | fi | 11476 | fi |
8309 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 11477 | rm -f conftest.err conftest.$ac_objext \ |
11478 | conftest$ac_exeext conftest.$ac_ext | ||
8310 | fi | 11479 | fi |
8311 | echo "$as_me:8311: result: `eval echo '${'$as_ac_var'}'`" >&5 | 11480 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 |
8312 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | 11481 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 |
8313 | if test `eval echo '${'$as_ac_var'}'` = yes; then | 11482 | if test `eval echo '${'$as_ac_var'}'` = yes; then |
8314 | cat >>confdefs.h <<EOF | 11483 | cat >>confdefs.h <<_ACEOF |
8315 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 11484 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
8316 | EOF | 11485 | _ACEOF |
8317 | 11486 | ||
8318 | fi | 11487 | fi |
8319 | done | 11488 | done |
8320 | 11489 | ||
8321 | echo "$as_me:8321: checking for daemon" >&5 | 11490 | |
11491 | echo "$as_me:$LINENO: checking for daemon" >&5 | ||
8322 | echo $ECHO_N "checking for daemon... $ECHO_C" >&6 | 11492 | echo $ECHO_N "checking for daemon... $ECHO_C" >&6 |
8323 | if test "${ac_cv_func_daemon+set}" = set; then | 11493 | if test "${ac_cv_func_daemon+set}" = set; then |
8324 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 11494 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
8325 | else | 11495 | else |
8326 | cat >conftest.$ac_ext <<_ACEOF | 11496 | cat >conftest.$ac_ext <<_ACEOF |
8327 | #line 8327 "configure" | 11497 | /* confdefs.h. */ |
8328 | #include "confdefs.h" | 11498 | _ACEOF |
11499 | cat confdefs.h >>conftest.$ac_ext | ||
11500 | cat >>conftest.$ac_ext <<_ACEOF | ||
11501 | /* end confdefs.h. */ | ||
11502 | /* Define daemon to an innocuous variant, in case <limits.h> declares daemon. | ||
11503 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
11504 | #define daemon innocuous_daemon | ||
11505 | |||
8329 | /* System header to define __stub macros and hopefully few prototypes, | 11506 | /* System header to define __stub macros and hopefully few prototypes, |
8330 | which can conflict with char daemon (); below. */ | 11507 | which can conflict with char daemon (); below. |
8331 | #include <assert.h> | 11508 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
11509 | <limits.h> exists even on freestanding compilers. */ | ||
11510 | |||
11511 | #ifdef __STDC__ | ||
11512 | # include <limits.h> | ||
11513 | #else | ||
11514 | # include <assert.h> | ||
11515 | #endif | ||
11516 | |||
11517 | #undef daemon | ||
11518 | |||
8332 | /* Override any gcc2 internal prototype to avoid an error. */ | 11519 | /* Override any gcc2 internal prototype to avoid an error. */ |
8333 | #ifdef __cplusplus | 11520 | #ifdef __cplusplus |
8334 | extern "C" | 11521 | extern "C" |
11522 | { | ||
8335 | #endif | 11523 | #endif |
8336 | /* We use char because int might match the return type of a gcc2 | 11524 | /* We use char because int might match the return type of a gcc2 |
8337 | builtin and then its argument prototype would still apply. */ | 11525 | builtin and then its argument prototype would still apply. */ |
8338 | char daemon (); | 11526 | char daemon (); |
8339 | char (*f) (); | ||
8340 | |||
8341 | int | ||
8342 | main () | ||
8343 | { | ||
8344 | /* The GNU C library defines this for functions which it implements | 11527 | /* The GNU C library defines this for functions which it implements |
8345 | to always fail with ENOSYS. Some functions are actually named | 11528 | to always fail with ENOSYS. Some functions are actually named |
8346 | something starting with __ and the normal name is an alias. */ | 11529 | something starting with __ and the normal name is an alias. */ |
8347 | #if defined (__stub_daemon) || defined (__stub___daemon) | 11530 | #if defined (__stub_daemon) || defined (__stub___daemon) |
8348 | choke me | 11531 | choke me |
8349 | #else | 11532 | #else |
8350 | f = daemon; | 11533 | char (*f) () = daemon; |
11534 | #endif | ||
11535 | #ifdef __cplusplus | ||
11536 | } | ||
8351 | #endif | 11537 | #endif |
8352 | 11538 | ||
11539 | int | ||
11540 | main () | ||
11541 | { | ||
11542 | return f != daemon; | ||
8353 | ; | 11543 | ; |
8354 | return 0; | 11544 | return 0; |
8355 | } | 11545 | } |
8356 | _ACEOF | 11546 | _ACEOF |
8357 | rm -f conftest.$ac_objext conftest$ac_exeext | 11547 | rm -f conftest.$ac_objext conftest$ac_exeext |
8358 | if { (eval echo "$as_me:8358: \"$ac_link\"") >&5 | 11548 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
8359 | (eval $ac_link) 2>&5 | 11549 | (eval $ac_link) 2>conftest.er1 |
8360 | ac_status=$? | 11550 | ac_status=$? |
8361 | echo "$as_me:8361: \$? = $ac_status" >&5 | 11551 | grep -v '^ *+' conftest.er1 >conftest.err |
11552 | rm -f conftest.er1 | ||
11553 | cat conftest.err >&5 | ||
11554 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8362 | (exit $ac_status); } && | 11555 | (exit $ac_status); } && |
8363 | { ac_try='test -s conftest$ac_exeext' | 11556 | { ac_try='test -z "$ac_c_werror_flag" |
8364 | { (eval echo "$as_me:8364: \"$ac_try\"") >&5 | 11557 | || test ! -s conftest.err' |
11558 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11559 | (eval $ac_try) 2>&5 | ||
11560 | ac_status=$? | ||
11561 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11562 | (exit $ac_status); }; } && | ||
11563 | { ac_try='test -s conftest$ac_exeext' | ||
11564 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8365 | (eval $ac_try) 2>&5 | 11565 | (eval $ac_try) 2>&5 |
8366 | ac_status=$? | 11566 | ac_status=$? |
8367 | echo "$as_me:8367: \$? = $ac_status" >&5 | 11567 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
8368 | (exit $ac_status); }; }; then | 11568 | (exit $ac_status); }; }; then |
8369 | ac_cv_func_daemon=yes | 11569 | ac_cv_func_daemon=yes |
8370 | else | 11570 | else |
8371 | echo "$as_me: failed program was:" >&5 | 11571 | echo "$as_me: failed program was:" >&5 |
8372 | cat conftest.$ac_ext >&5 | 11572 | sed 's/^/| /' conftest.$ac_ext >&5 |
11573 | |||
8373 | ac_cv_func_daemon=no | 11574 | ac_cv_func_daemon=no |
8374 | fi | 11575 | fi |
8375 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 11576 | rm -f conftest.err conftest.$ac_objext \ |
11577 | conftest$ac_exeext conftest.$ac_ext | ||
8376 | fi | 11578 | fi |
8377 | echo "$as_me:8377: result: $ac_cv_func_daemon" >&5 | 11579 | echo "$as_me:$LINENO: result: $ac_cv_func_daemon" >&5 |
8378 | echo "${ECHO_T}$ac_cv_func_daemon" >&6 | 11580 | echo "${ECHO_T}$ac_cv_func_daemon" >&6 |
8379 | if test $ac_cv_func_daemon = yes; then | 11581 | if test $ac_cv_func_daemon = yes; then |
8380 | cat >>confdefs.h <<\EOF | 11582 | cat >>confdefs.h <<\_ACEOF |
8381 | #define HAVE_DAEMON 1 | 11583 | #define HAVE_DAEMON 1 |
8382 | EOF | 11584 | _ACEOF |
8383 | 11585 | ||
8384 | else | 11586 | else |
8385 | echo "$as_me:8385: checking for daemon in -lbsd" >&5 | 11587 | echo "$as_me:$LINENO: checking for daemon in -lbsd" >&5 |
8386 | echo $ECHO_N "checking for daemon in -lbsd... $ECHO_C" >&6 | 11588 | echo $ECHO_N "checking for daemon in -lbsd... $ECHO_C" >&6 |
8387 | if test "${ac_cv_lib_bsd_daemon+set}" = set; then | 11589 | if test "${ac_cv_lib_bsd_daemon+set}" = set; then |
8388 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 11590 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -8390,8 +11592,11 @@ else | |||
8390 | ac_check_lib_save_LIBS=$LIBS | 11592 | ac_check_lib_save_LIBS=$LIBS |
8391 | LIBS="-lbsd $LIBS" | 11593 | LIBS="-lbsd $LIBS" |
8392 | cat >conftest.$ac_ext <<_ACEOF | 11594 | cat >conftest.$ac_ext <<_ACEOF |
8393 | #line 8393 "configure" | 11595 | /* confdefs.h. */ |
8394 | #include "confdefs.h" | 11596 | _ACEOF |
11597 | cat confdefs.h >>conftest.$ac_ext | ||
11598 | cat >>conftest.$ac_ext <<_ACEOF | ||
11599 | /* end confdefs.h. */ | ||
8395 | 11600 | ||
8396 | /* Override any gcc2 internal prototype to avoid an error. */ | 11601 | /* Override any gcc2 internal prototype to avoid an error. */ |
8397 | #ifdef __cplusplus | 11602 | #ifdef __cplusplus |
@@ -8409,102 +11614,148 @@ daemon (); | |||
8409 | } | 11614 | } |
8410 | _ACEOF | 11615 | _ACEOF |
8411 | rm -f conftest.$ac_objext conftest$ac_exeext | 11616 | rm -f conftest.$ac_objext conftest$ac_exeext |
8412 | if { (eval echo "$as_me:8412: \"$ac_link\"") >&5 | 11617 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
8413 | (eval $ac_link) 2>&5 | 11618 | (eval $ac_link) 2>conftest.er1 |
8414 | ac_status=$? | 11619 | ac_status=$? |
8415 | echo "$as_me:8415: \$? = $ac_status" >&5 | 11620 | grep -v '^ *+' conftest.er1 >conftest.err |
11621 | rm -f conftest.er1 | ||
11622 | cat conftest.err >&5 | ||
11623 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8416 | (exit $ac_status); } && | 11624 | (exit $ac_status); } && |
8417 | { ac_try='test -s conftest$ac_exeext' | 11625 | { ac_try='test -z "$ac_c_werror_flag" |
8418 | { (eval echo "$as_me:8418: \"$ac_try\"") >&5 | 11626 | || test ! -s conftest.err' |
11627 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8419 | (eval $ac_try) 2>&5 | 11628 | (eval $ac_try) 2>&5 |
8420 | ac_status=$? | 11629 | ac_status=$? |
8421 | echo "$as_me:8421: \$? = $ac_status" >&5 | 11630 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
11631 | (exit $ac_status); }; } && | ||
11632 | { ac_try='test -s conftest$ac_exeext' | ||
11633 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11634 | (eval $ac_try) 2>&5 | ||
11635 | ac_status=$? | ||
11636 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8422 | (exit $ac_status); }; }; then | 11637 | (exit $ac_status); }; }; then |
8423 | ac_cv_lib_bsd_daemon=yes | 11638 | ac_cv_lib_bsd_daemon=yes |
8424 | else | 11639 | else |
8425 | echo "$as_me: failed program was:" >&5 | 11640 | echo "$as_me: failed program was:" >&5 |
8426 | cat conftest.$ac_ext >&5 | 11641 | sed 's/^/| /' conftest.$ac_ext >&5 |
11642 | |||
8427 | ac_cv_lib_bsd_daemon=no | 11643 | ac_cv_lib_bsd_daemon=no |
8428 | fi | 11644 | fi |
8429 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 11645 | rm -f conftest.err conftest.$ac_objext \ |
11646 | conftest$ac_exeext conftest.$ac_ext | ||
8430 | LIBS=$ac_check_lib_save_LIBS | 11647 | LIBS=$ac_check_lib_save_LIBS |
8431 | fi | 11648 | fi |
8432 | echo "$as_me:8432: result: $ac_cv_lib_bsd_daemon" >&5 | 11649 | echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_daemon" >&5 |
8433 | echo "${ECHO_T}$ac_cv_lib_bsd_daemon" >&6 | 11650 | echo "${ECHO_T}$ac_cv_lib_bsd_daemon" >&6 |
8434 | if test $ac_cv_lib_bsd_daemon = yes; then | 11651 | if test $ac_cv_lib_bsd_daemon = yes; then |
8435 | LIBS="$LIBS -lbsd"; cat >>confdefs.h <<\EOF | 11652 | LIBS="$LIBS -lbsd"; cat >>confdefs.h <<\_ACEOF |
8436 | #define HAVE_DAEMON 1 | 11653 | #define HAVE_DAEMON 1 |
8437 | EOF | 11654 | _ACEOF |
8438 | 11655 | ||
8439 | fi | 11656 | fi |
8440 | 11657 | ||
11658 | |||
8441 | fi | 11659 | fi |
8442 | 11660 | ||
8443 | echo "$as_me:8443: checking for getpagesize" >&5 | 11661 | |
11662 | echo "$as_me:$LINENO: checking for getpagesize" >&5 | ||
8444 | echo $ECHO_N "checking for getpagesize... $ECHO_C" >&6 | 11663 | echo $ECHO_N "checking for getpagesize... $ECHO_C" >&6 |
8445 | if test "${ac_cv_func_getpagesize+set}" = set; then | 11664 | if test "${ac_cv_func_getpagesize+set}" = set; then |
8446 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 11665 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
8447 | else | 11666 | else |
8448 | cat >conftest.$ac_ext <<_ACEOF | 11667 | cat >conftest.$ac_ext <<_ACEOF |
8449 | #line 8449 "configure" | 11668 | /* confdefs.h. */ |
8450 | #include "confdefs.h" | 11669 | _ACEOF |
11670 | cat confdefs.h >>conftest.$ac_ext | ||
11671 | cat >>conftest.$ac_ext <<_ACEOF | ||
11672 | /* end confdefs.h. */ | ||
11673 | /* Define getpagesize to an innocuous variant, in case <limits.h> declares getpagesize. | ||
11674 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
11675 | #define getpagesize innocuous_getpagesize | ||
11676 | |||
8451 | /* System header to define __stub macros and hopefully few prototypes, | 11677 | /* System header to define __stub macros and hopefully few prototypes, |
8452 | which can conflict with char getpagesize (); below. */ | 11678 | which can conflict with char getpagesize (); below. |
8453 | #include <assert.h> | 11679 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
11680 | <limits.h> exists even on freestanding compilers. */ | ||
11681 | |||
11682 | #ifdef __STDC__ | ||
11683 | # include <limits.h> | ||
11684 | #else | ||
11685 | # include <assert.h> | ||
11686 | #endif | ||
11687 | |||
11688 | #undef getpagesize | ||
11689 | |||
8454 | /* Override any gcc2 internal prototype to avoid an error. */ | 11690 | /* Override any gcc2 internal prototype to avoid an error. */ |
8455 | #ifdef __cplusplus | 11691 | #ifdef __cplusplus |
8456 | extern "C" | 11692 | extern "C" |
11693 | { | ||
8457 | #endif | 11694 | #endif |
8458 | /* We use char because int might match the return type of a gcc2 | 11695 | /* We use char because int might match the return type of a gcc2 |
8459 | builtin and then its argument prototype would still apply. */ | 11696 | builtin and then its argument prototype would still apply. */ |
8460 | char getpagesize (); | 11697 | char getpagesize (); |
8461 | char (*f) (); | ||
8462 | |||
8463 | int | ||
8464 | main () | ||
8465 | { | ||
8466 | /* The GNU C library defines this for functions which it implements | 11698 | /* The GNU C library defines this for functions which it implements |
8467 | to always fail with ENOSYS. Some functions are actually named | 11699 | to always fail with ENOSYS. Some functions are actually named |
8468 | something starting with __ and the normal name is an alias. */ | 11700 | something starting with __ and the normal name is an alias. */ |
8469 | #if defined (__stub_getpagesize) || defined (__stub___getpagesize) | 11701 | #if defined (__stub_getpagesize) || defined (__stub___getpagesize) |
8470 | choke me | 11702 | choke me |
8471 | #else | 11703 | #else |
8472 | f = getpagesize; | 11704 | char (*f) () = getpagesize; |
11705 | #endif | ||
11706 | #ifdef __cplusplus | ||
11707 | } | ||
8473 | #endif | 11708 | #endif |
8474 | 11709 | ||
11710 | int | ||
11711 | main () | ||
11712 | { | ||
11713 | return f != getpagesize; | ||
8475 | ; | 11714 | ; |
8476 | return 0; | 11715 | return 0; |
8477 | } | 11716 | } |
8478 | _ACEOF | 11717 | _ACEOF |
8479 | rm -f conftest.$ac_objext conftest$ac_exeext | 11718 | rm -f conftest.$ac_objext conftest$ac_exeext |
8480 | if { (eval echo "$as_me:8480: \"$ac_link\"") >&5 | 11719 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
8481 | (eval $ac_link) 2>&5 | 11720 | (eval $ac_link) 2>conftest.er1 |
8482 | ac_status=$? | 11721 | ac_status=$? |
8483 | echo "$as_me:8483: \$? = $ac_status" >&5 | 11722 | grep -v '^ *+' conftest.er1 >conftest.err |
11723 | rm -f conftest.er1 | ||
11724 | cat conftest.err >&5 | ||
11725 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8484 | (exit $ac_status); } && | 11726 | (exit $ac_status); } && |
8485 | { ac_try='test -s conftest$ac_exeext' | 11727 | { ac_try='test -z "$ac_c_werror_flag" |
8486 | { (eval echo "$as_me:8486: \"$ac_try\"") >&5 | 11728 | || test ! -s conftest.err' |
11729 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8487 | (eval $ac_try) 2>&5 | 11730 | (eval $ac_try) 2>&5 |
8488 | ac_status=$? | 11731 | ac_status=$? |
8489 | echo "$as_me:8489: \$? = $ac_status" >&5 | 11732 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
11733 | (exit $ac_status); }; } && | ||
11734 | { ac_try='test -s conftest$ac_exeext' | ||
11735 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11736 | (eval $ac_try) 2>&5 | ||
11737 | ac_status=$? | ||
11738 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8490 | (exit $ac_status); }; }; then | 11739 | (exit $ac_status); }; }; then |
8491 | ac_cv_func_getpagesize=yes | 11740 | ac_cv_func_getpagesize=yes |
8492 | else | 11741 | else |
8493 | echo "$as_me: failed program was:" >&5 | 11742 | echo "$as_me: failed program was:" >&5 |
8494 | cat conftest.$ac_ext >&5 | 11743 | sed 's/^/| /' conftest.$ac_ext >&5 |
11744 | |||
8495 | ac_cv_func_getpagesize=no | 11745 | ac_cv_func_getpagesize=no |
8496 | fi | 11746 | fi |
8497 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 11747 | rm -f conftest.err conftest.$ac_objext \ |
11748 | conftest$ac_exeext conftest.$ac_ext | ||
8498 | fi | 11749 | fi |
8499 | echo "$as_me:8499: result: $ac_cv_func_getpagesize" >&5 | 11750 | echo "$as_me:$LINENO: result: $ac_cv_func_getpagesize" >&5 |
8500 | echo "${ECHO_T}$ac_cv_func_getpagesize" >&6 | 11751 | echo "${ECHO_T}$ac_cv_func_getpagesize" >&6 |
8501 | if test $ac_cv_func_getpagesize = yes; then | 11752 | if test $ac_cv_func_getpagesize = yes; then |
8502 | cat >>confdefs.h <<\EOF | 11753 | cat >>confdefs.h <<\_ACEOF |
8503 | #define HAVE_GETPAGESIZE 1 | 11754 | #define HAVE_GETPAGESIZE 1 |
8504 | EOF | 11755 | _ACEOF |
8505 | 11756 | ||
8506 | else | 11757 | else |
8507 | echo "$as_me:8507: checking for getpagesize in -lucb" >&5 | 11758 | echo "$as_me:$LINENO: checking for getpagesize in -lucb" >&5 |
8508 | echo $ECHO_N "checking for getpagesize in -lucb... $ECHO_C" >&6 | 11759 | echo $ECHO_N "checking for getpagesize in -lucb... $ECHO_C" >&6 |
8509 | if test "${ac_cv_lib_ucb_getpagesize+set}" = set; then | 11760 | if test "${ac_cv_lib_ucb_getpagesize+set}" = set; then |
8510 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 11761 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -8512,8 +11763,11 @@ else | |||
8512 | ac_check_lib_save_LIBS=$LIBS | 11763 | ac_check_lib_save_LIBS=$LIBS |
8513 | LIBS="-lucb $LIBS" | 11764 | LIBS="-lucb $LIBS" |
8514 | cat >conftest.$ac_ext <<_ACEOF | 11765 | cat >conftest.$ac_ext <<_ACEOF |
8515 | #line 8515 "configure" | 11766 | /* confdefs.h. */ |
8516 | #include "confdefs.h" | 11767 | _ACEOF |
11768 | cat confdefs.h >>conftest.$ac_ext | ||
11769 | cat >>conftest.$ac_ext <<_ACEOF | ||
11770 | /* end confdefs.h. */ | ||
8517 | 11771 | ||
8518 | /* Override any gcc2 internal prototype to avoid an error. */ | 11772 | /* Override any gcc2 internal prototype to avoid an error. */ |
8519 | #ifdef __cplusplus | 11773 | #ifdef __cplusplus |
@@ -8531,101 +11785,185 @@ getpagesize (); | |||
8531 | } | 11785 | } |
8532 | _ACEOF | 11786 | _ACEOF |
8533 | rm -f conftest.$ac_objext conftest$ac_exeext | 11787 | rm -f conftest.$ac_objext conftest$ac_exeext |
8534 | if { (eval echo "$as_me:8534: \"$ac_link\"") >&5 | 11788 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
8535 | (eval $ac_link) 2>&5 | 11789 | (eval $ac_link) 2>conftest.er1 |
8536 | ac_status=$? | 11790 | ac_status=$? |
8537 | echo "$as_me:8537: \$? = $ac_status" >&5 | 11791 | grep -v '^ *+' conftest.er1 >conftest.err |
11792 | rm -f conftest.er1 | ||
11793 | cat conftest.err >&5 | ||
11794 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8538 | (exit $ac_status); } && | 11795 | (exit $ac_status); } && |
8539 | { ac_try='test -s conftest$ac_exeext' | 11796 | { ac_try='test -z "$ac_c_werror_flag" |
8540 | { (eval echo "$as_me:8540: \"$ac_try\"") >&5 | 11797 | || test ! -s conftest.err' |
11798 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11799 | (eval $ac_try) 2>&5 | ||
11800 | ac_status=$? | ||
11801 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11802 | (exit $ac_status); }; } && | ||
11803 | { ac_try='test -s conftest$ac_exeext' | ||
11804 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8541 | (eval $ac_try) 2>&5 | 11805 | (eval $ac_try) 2>&5 |
8542 | ac_status=$? | 11806 | ac_status=$? |
8543 | echo "$as_me:8543: \$? = $ac_status" >&5 | 11807 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
8544 | (exit $ac_status); }; }; then | 11808 | (exit $ac_status); }; }; then |
8545 | ac_cv_lib_ucb_getpagesize=yes | 11809 | ac_cv_lib_ucb_getpagesize=yes |
8546 | else | 11810 | else |
8547 | echo "$as_me: failed program was:" >&5 | 11811 | echo "$as_me: failed program was:" >&5 |
8548 | cat conftest.$ac_ext >&5 | 11812 | sed 's/^/| /' conftest.$ac_ext >&5 |
11813 | |||
8549 | ac_cv_lib_ucb_getpagesize=no | 11814 | ac_cv_lib_ucb_getpagesize=no |
8550 | fi | 11815 | fi |
8551 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 11816 | rm -f conftest.err conftest.$ac_objext \ |
11817 | conftest$ac_exeext conftest.$ac_ext | ||
8552 | LIBS=$ac_check_lib_save_LIBS | 11818 | LIBS=$ac_check_lib_save_LIBS |
8553 | fi | 11819 | fi |
8554 | echo "$as_me:8554: result: $ac_cv_lib_ucb_getpagesize" >&5 | 11820 | echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_getpagesize" >&5 |
8555 | echo "${ECHO_T}$ac_cv_lib_ucb_getpagesize" >&6 | 11821 | echo "${ECHO_T}$ac_cv_lib_ucb_getpagesize" >&6 |
8556 | if test $ac_cv_lib_ucb_getpagesize = yes; then | 11822 | if test $ac_cv_lib_ucb_getpagesize = yes; then |
8557 | LIBS="$LIBS -lucb"; cat >>confdefs.h <<\EOF | 11823 | LIBS="$LIBS -lucb"; cat >>confdefs.h <<\_ACEOF |
8558 | #define HAVE_GETPAGESIZE 1 | 11824 | #define HAVE_GETPAGESIZE 1 |
8559 | EOF | 11825 | _ACEOF |
8560 | 11826 | ||
8561 | fi | 11827 | fi |
8562 | 11828 | ||
11829 | |||
8563 | fi | 11830 | fi |
8564 | 11831 | ||
11832 | |||
8565 | # Check for broken snprintf | 11833 | # Check for broken snprintf |
8566 | if test "x$ac_cv_func_snprintf" = "xyes" ; then | 11834 | if test "x$ac_cv_func_snprintf" = "xyes" ; then |
8567 | echo "$as_me:8567: checking whether snprintf correctly terminates long strings" >&5 | 11835 | echo "$as_me:$LINENO: checking whether snprintf correctly terminates long strings" >&5 |
8568 | echo $ECHO_N "checking whether snprintf correctly terminates long strings... $ECHO_C" >&6 | 11836 | echo $ECHO_N "checking whether snprintf correctly terminates long strings... $ECHO_C" >&6 |
8569 | if test "$cross_compiling" = yes; then | 11837 | if test "$cross_compiling" = yes; then |
8570 | { { echo "$as_me:8570: error: cannot run test program while cross compiling" >&5 | 11838 | { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
8571 | echo "$as_me: error: cannot run test program while cross compiling" >&2;} | 11839 | See \`config.log' for more details." >&5 |
11840 | echo "$as_me: error: cannot run test program while cross compiling | ||
11841 | See \`config.log' for more details." >&2;} | ||
8572 | { (exit 1); exit 1; }; } | 11842 | { (exit 1); exit 1; }; } |
8573 | else | 11843 | else |
8574 | cat >conftest.$ac_ext <<_ACEOF | 11844 | cat >conftest.$ac_ext <<_ACEOF |
8575 | #line 8575 "configure" | 11845 | /* confdefs.h. */ |
8576 | #include "confdefs.h" | 11846 | _ACEOF |
11847 | cat confdefs.h >>conftest.$ac_ext | ||
11848 | cat >>conftest.$ac_ext <<_ACEOF | ||
11849 | /* end confdefs.h. */ | ||
8577 | 11850 | ||
8578 | #include <stdio.h> | 11851 | #include <stdio.h> |
8579 | int main(void){char b[5];snprintf(b,5,"123456789");exit(b[4]!='\0');} | 11852 | int main(void){char b[5];snprintf(b,5,"123456789");exit(b[4]!='\0');} |
8580 | 11853 | ||
8581 | _ACEOF | 11854 | _ACEOF |
8582 | rm -f conftest$ac_exeext | 11855 | rm -f conftest$ac_exeext |
8583 | if { (eval echo "$as_me:8583: \"$ac_link\"") >&5 | 11856 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
8584 | (eval $ac_link) 2>&5 | 11857 | (eval $ac_link) 2>&5 |
8585 | ac_status=$? | 11858 | ac_status=$? |
8586 | echo "$as_me:8586: \$? = $ac_status" >&5 | 11859 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
8587 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | 11860 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
8588 | { (eval echo "$as_me:8588: \"$ac_try\"") >&5 | 11861 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
8589 | (eval $ac_try) 2>&5 | 11862 | (eval $ac_try) 2>&5 |
8590 | ac_status=$? | 11863 | ac_status=$? |
8591 | echo "$as_me:8591: \$? = $ac_status" >&5 | 11864 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
8592 | (exit $ac_status); }; }; then | 11865 | (exit $ac_status); }; }; then |
8593 | echo "$as_me:8593: result: yes" >&5 | 11866 | echo "$as_me:$LINENO: result: yes" >&5 |
8594 | echo "${ECHO_T}yes" >&6 | 11867 | echo "${ECHO_T}yes" >&6 |
8595 | else | 11868 | else |
8596 | echo "$as_me: program exited with status $ac_status" >&5 | 11869 | echo "$as_me: program exited with status $ac_status" >&5 |
8597 | echo "$as_me: failed program was:" >&5 | 11870 | echo "$as_me: failed program was:" >&5 |
8598 | cat conftest.$ac_ext >&5 | 11871 | sed 's/^/| /' conftest.$ac_ext >&5 |
11872 | |||
11873 | ( exit $ac_status ) | ||
8599 | 11874 | ||
8600 | echo "$as_me:8600: result: no" >&5 | 11875 | echo "$as_me:$LINENO: result: no" >&5 |
8601 | echo "${ECHO_T}no" >&6 | 11876 | echo "${ECHO_T}no" >&6 |
8602 | cat >>confdefs.h <<\EOF | 11877 | cat >>confdefs.h <<\_ACEOF |
8603 | #define BROKEN_SNPRINTF 1 | 11878 | #define BROKEN_SNPRINTF 1 |
8604 | EOF | 11879 | _ACEOF |
8605 | 11880 | ||
8606 | { echo "$as_me:8606: WARNING: ****** Your snprintf() function is broken, complain to your vendor" >&5 | 11881 | { echo "$as_me:$LINENO: WARNING: ****** Your snprintf() function is broken, complain to your vendor" >&5 |
8607 | echo "$as_me: WARNING: ****** Your snprintf() function is broken, complain to your vendor" >&2;} | 11882 | echo "$as_me: WARNING: ****** Your snprintf() function is broken, complain to your vendor" >&2;} |
8608 | 11883 | ||
11884 | |||
11885 | fi | ||
11886 | rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
8609 | fi | 11887 | fi |
8610 | rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
8611 | fi | 11888 | fi |
11889 | |||
11890 | # Check for missing getpeereid (or equiv) support | ||
11891 | NO_PEERCHECK="" | ||
11892 | if test "x$ac_cv_func_getpeereid" != "xyes" ; then | ||
11893 | echo "$as_me:$LINENO: checking whether system supports SO_PEERCRED getsockopt" >&5 | ||
11894 | echo $ECHO_N "checking whether system supports SO_PEERCRED getsockopt... $ECHO_C" >&6 | ||
11895 | cat >conftest.$ac_ext <<_ACEOF | ||
11896 | /* confdefs.h. */ | ||
11897 | _ACEOF | ||
11898 | cat confdefs.h >>conftest.$ac_ext | ||
11899 | cat >>conftest.$ac_ext <<_ACEOF | ||
11900 | /* end confdefs.h. */ | ||
11901 | #include <sys/types.h> | ||
11902 | #include <sys/socket.h> | ||
11903 | int | ||
11904 | main () | ||
11905 | { | ||
11906 | int i = SO_PEERCRED; | ||
11907 | ; | ||
11908 | return 0; | ||
11909 | } | ||
11910 | _ACEOF | ||
11911 | rm -f conftest.$ac_objext | ||
11912 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
11913 | (eval $ac_compile) 2>conftest.er1 | ||
11914 | ac_status=$? | ||
11915 | grep -v '^ *+' conftest.er1 >conftest.err | ||
11916 | rm -f conftest.er1 | ||
11917 | cat conftest.err >&5 | ||
11918 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11919 | (exit $ac_status); } && | ||
11920 | { ac_try='test -z "$ac_c_werror_flag" | ||
11921 | || test ! -s conftest.err' | ||
11922 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11923 | (eval $ac_try) 2>&5 | ||
11924 | ac_status=$? | ||
11925 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11926 | (exit $ac_status); }; } && | ||
11927 | { ac_try='test -s conftest.$ac_objext' | ||
11928 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11929 | (eval $ac_try) 2>&5 | ||
11930 | ac_status=$? | ||
11931 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11932 | (exit $ac_status); }; }; then | ||
11933 | echo "$as_me:$LINENO: result: yes" >&5 | ||
11934 | echo "${ECHO_T}yes" >&6 | ||
11935 | else | ||
11936 | echo "$as_me: failed program was:" >&5 | ||
11937 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
11938 | |||
11939 | echo "$as_me:$LINENO: result: no" >&5 | ||
11940 | echo "${ECHO_T}no" >&6 | ||
11941 | NO_PEERCHECK=1 | ||
11942 | |||
11943 | fi | ||
11944 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
8612 | fi | 11945 | fi |
8613 | 11946 | ||
8614 | if test "x$ac_cv_func_mkdtemp" = "xyes" ; then | 11947 | if test "x$ac_cv_func_mkdtemp" = "xyes" ; then |
8615 | echo "$as_me:8615: checking for (overly) strict mkstemp" >&5 | 11948 | echo "$as_me:$LINENO: checking for (overly) strict mkstemp" >&5 |
8616 | echo $ECHO_N "checking for (overly) strict mkstemp... $ECHO_C" >&6 | 11949 | echo $ECHO_N "checking for (overly) strict mkstemp... $ECHO_C" >&6 |
8617 | if test "$cross_compiling" = yes; then | 11950 | if test "$cross_compiling" = yes; then |
8618 | 11951 | ||
8619 | echo "$as_me:8619: result: yes" >&5 | 11952 | echo "$as_me:$LINENO: result: yes" >&5 |
8620 | echo "${ECHO_T}yes" >&6 | 11953 | echo "${ECHO_T}yes" >&6 |
8621 | cat >>confdefs.h <<\EOF | 11954 | cat >>confdefs.h <<\_ACEOF |
8622 | #define HAVE_STRICT_MKSTEMP 1 | 11955 | #define HAVE_STRICT_MKSTEMP 1 |
8623 | EOF | 11956 | _ACEOF |
11957 | |||
11958 | |||
8624 | 11959 | ||
8625 | else | 11960 | else |
8626 | cat >conftest.$ac_ext <<_ACEOF | 11961 | cat >conftest.$ac_ext <<_ACEOF |
8627 | #line 8627 "configure" | 11962 | /* confdefs.h. */ |
8628 | #include "confdefs.h" | 11963 | _ACEOF |
11964 | cat confdefs.h >>conftest.$ac_ext | ||
11965 | cat >>conftest.$ac_ext <<_ACEOF | ||
11966 | /* end confdefs.h. */ | ||
8629 | 11967 | ||
8630 | #include <stdlib.h> | 11968 | #include <stdlib.h> |
8631 | main() { char template[]="conftest.mkstemp-test"; | 11969 | main() { char template[]="conftest.mkstemp-test"; |
@@ -8636,47 +11974,55 @@ unlink(template); exit(0); | |||
8636 | 11974 | ||
8637 | _ACEOF | 11975 | _ACEOF |
8638 | rm -f conftest$ac_exeext | 11976 | rm -f conftest$ac_exeext |
8639 | if { (eval echo "$as_me:8639: \"$ac_link\"") >&5 | 11977 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
8640 | (eval $ac_link) 2>&5 | 11978 | (eval $ac_link) 2>&5 |
8641 | ac_status=$? | 11979 | ac_status=$? |
8642 | echo "$as_me:8642: \$? = $ac_status" >&5 | 11980 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
8643 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | 11981 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
8644 | { (eval echo "$as_me:8644: \"$ac_try\"") >&5 | 11982 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
8645 | (eval $ac_try) 2>&5 | 11983 | (eval $ac_try) 2>&5 |
8646 | ac_status=$? | 11984 | ac_status=$? |
8647 | echo "$as_me:8647: \$? = $ac_status" >&5 | 11985 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
8648 | (exit $ac_status); }; }; then | 11986 | (exit $ac_status); }; }; then |
8649 | 11987 | ||
8650 | echo "$as_me:8650: result: no" >&5 | 11988 | echo "$as_me:$LINENO: result: no" >&5 |
8651 | echo "${ECHO_T}no" >&6 | 11989 | echo "${ECHO_T}no" >&6 |
8652 | 11990 | ||
8653 | else | 11991 | else |
8654 | echo "$as_me: program exited with status $ac_status" >&5 | 11992 | echo "$as_me: program exited with status $ac_status" >&5 |
8655 | echo "$as_me: failed program was:" >&5 | 11993 | echo "$as_me: failed program was:" >&5 |
8656 | cat conftest.$ac_ext >&5 | 11994 | sed 's/^/| /' conftest.$ac_ext >&5 |
8657 | 11995 | ||
8658 | echo "$as_me:8658: result: yes" >&5 | 11996 | ( exit $ac_status ) |
11997 | |||
11998 | echo "$as_me:$LINENO: result: yes" >&5 | ||
8659 | echo "${ECHO_T}yes" >&6 | 11999 | echo "${ECHO_T}yes" >&6 |
8660 | cat >>confdefs.h <<\EOF | 12000 | cat >>confdefs.h <<\_ACEOF |
8661 | #define HAVE_STRICT_MKSTEMP 1 | 12001 | #define HAVE_STRICT_MKSTEMP 1 |
8662 | EOF | 12002 | _ACEOF |
12003 | |||
8663 | 12004 | ||
8664 | fi | 12005 | fi |
8665 | rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | 12006 | rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext |
8666 | fi | 12007 | fi |
8667 | fi | 12008 | fi |
8668 | 12009 | ||
8669 | if test ! -z "$check_for_openpty_ctty_bug"; then | 12010 | if test ! -z "$check_for_openpty_ctty_bug"; then |
8670 | echo "$as_me:8670: checking if openpty correctly handles controlling tty" >&5 | 12011 | echo "$as_me:$LINENO: checking if openpty correctly handles controlling tty" >&5 |
8671 | echo $ECHO_N "checking if openpty correctly handles controlling tty... $ECHO_C" >&6 | 12012 | echo $ECHO_N "checking if openpty correctly handles controlling tty... $ECHO_C" >&6 |
8672 | if test "$cross_compiling" = yes; then | 12013 | if test "$cross_compiling" = yes; then |
8673 | { { echo "$as_me:8673: error: cannot run test program while cross compiling" >&5 | 12014 | { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
8674 | echo "$as_me: error: cannot run test program while cross compiling" >&2;} | 12015 | See \`config.log' for more details." >&5 |
12016 | echo "$as_me: error: cannot run test program while cross compiling | ||
12017 | See \`config.log' for more details." >&2;} | ||
8675 | { (exit 1); exit 1; }; } | 12018 | { (exit 1); exit 1; }; } |
8676 | else | 12019 | else |
8677 | cat >conftest.$ac_ext <<_ACEOF | 12020 | cat >conftest.$ac_ext <<_ACEOF |
8678 | #line 8678 "configure" | 12021 | /* confdefs.h. */ |
8679 | #include "confdefs.h" | 12022 | _ACEOF |
12023 | cat confdefs.h >>conftest.$ac_ext | ||
12024 | cat >>conftest.$ac_ext <<_ACEOF | ||
12025 | /* end confdefs.h. */ | ||
8680 | 12026 | ||
8681 | #include <stdio.h> | 12027 | #include <stdio.h> |
8682 | #include <sys/fcntl.h> | 12028 | #include <sys/fcntl.h> |
@@ -8712,47 +12058,56 @@ main() | |||
8712 | 12058 | ||
8713 | _ACEOF | 12059 | _ACEOF |
8714 | rm -f conftest$ac_exeext | 12060 | rm -f conftest$ac_exeext |
8715 | if { (eval echo "$as_me:8715: \"$ac_link\"") >&5 | 12061 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
8716 | (eval $ac_link) 2>&5 | 12062 | (eval $ac_link) 2>&5 |
8717 | ac_status=$? | 12063 | ac_status=$? |
8718 | echo "$as_me:8718: \$? = $ac_status" >&5 | 12064 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
8719 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | 12065 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
8720 | { (eval echo "$as_me:8720: \"$ac_try\"") >&5 | 12066 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
8721 | (eval $ac_try) 2>&5 | 12067 | (eval $ac_try) 2>&5 |
8722 | ac_status=$? | 12068 | ac_status=$? |
8723 | echo "$as_me:8723: \$? = $ac_status" >&5 | 12069 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
8724 | (exit $ac_status); }; }; then | 12070 | (exit $ac_status); }; }; then |
8725 | 12071 | ||
8726 | echo "$as_me:8726: result: yes" >&5 | 12072 | echo "$as_me:$LINENO: result: yes" >&5 |
8727 | echo "${ECHO_T}yes" >&6 | 12073 | echo "${ECHO_T}yes" >&6 |
8728 | 12074 | ||
8729 | else | 12075 | else |
8730 | echo "$as_me: program exited with status $ac_status" >&5 | 12076 | echo "$as_me: program exited with status $ac_status" >&5 |
8731 | echo "$as_me: failed program was:" >&5 | 12077 | echo "$as_me: failed program was:" >&5 |
8732 | cat conftest.$ac_ext >&5 | 12078 | sed 's/^/| /' conftest.$ac_ext >&5 |
12079 | |||
12080 | ( exit $ac_status ) | ||
8733 | 12081 | ||
8734 | echo "$as_me:8734: result: no" >&5 | 12082 | echo "$as_me:$LINENO: result: no" >&5 |
8735 | echo "${ECHO_T}no" >&6 | 12083 | echo "${ECHO_T}no" >&6 |
8736 | cat >>confdefs.h <<\EOF | 12084 | cat >>confdefs.h <<\_ACEOF |
8737 | #define SSHD_ACQUIRES_CTTY 1 | 12085 | #define SSHD_ACQUIRES_CTTY 1 |
8738 | EOF | 12086 | _ACEOF |
12087 | |||
12088 | |||
8739 | 12089 | ||
8740 | fi | 12090 | fi |
8741 | rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | 12091 | rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext |
8742 | fi | 12092 | fi |
8743 | fi | 12093 | fi |
8744 | 12094 | ||
8745 | if test "x$ac_cv_func_getaddrinfo" = "xyes" -a "x$check_for_hpux_broken_getaddrinfo" = "x1"; then | 12095 | if test "x$ac_cv_func_getaddrinfo" = "xyes" -a "x$check_for_hpux_broken_getaddrinfo" = "x1"; then |
8746 | echo "$as_me:8746: checking if getaddrinfo seems to work" >&5 | 12096 | echo "$as_me:$LINENO: checking if getaddrinfo seems to work" >&5 |
8747 | echo $ECHO_N "checking if getaddrinfo seems to work... $ECHO_C" >&6 | 12097 | echo $ECHO_N "checking if getaddrinfo seems to work... $ECHO_C" >&6 |
8748 | if test "$cross_compiling" = yes; then | 12098 | if test "$cross_compiling" = yes; then |
8749 | { { echo "$as_me:8749: error: cannot run test program while cross compiling" >&5 | 12099 | { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
8750 | echo "$as_me: error: cannot run test program while cross compiling" >&2;} | 12100 | See \`config.log' for more details." >&5 |
12101 | echo "$as_me: error: cannot run test program while cross compiling | ||
12102 | See \`config.log' for more details." >&2;} | ||
8751 | { (exit 1); exit 1; }; } | 12103 | { (exit 1); exit 1; }; } |
8752 | else | 12104 | else |
8753 | cat >conftest.$ac_ext <<_ACEOF | 12105 | cat >conftest.$ac_ext <<_ACEOF |
8754 | #line 8754 "configure" | 12106 | /* confdefs.h. */ |
8755 | #include "confdefs.h" | 12107 | _ACEOF |
12108 | cat confdefs.h >>conftest.$ac_ext | ||
12109 | cat >>conftest.$ac_ext <<_ACEOF | ||
12110 | /* end confdefs.h. */ | ||
8756 | 12111 | ||
8757 | #include <stdio.h> | 12112 | #include <stdio.h> |
8758 | #include <sys/socket.h> | 12113 | #include <sys/socket.h> |
@@ -8810,45 +12165,52 @@ main(void) | |||
8810 | 12165 | ||
8811 | _ACEOF | 12166 | _ACEOF |
8812 | rm -f conftest$ac_exeext | 12167 | rm -f conftest$ac_exeext |
8813 | if { (eval echo "$as_me:8813: \"$ac_link\"") >&5 | 12168 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
8814 | (eval $ac_link) 2>&5 | 12169 | (eval $ac_link) 2>&5 |
8815 | ac_status=$? | 12170 | ac_status=$? |
8816 | echo "$as_me:8816: \$? = $ac_status" >&5 | 12171 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
8817 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | 12172 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
8818 | { (eval echo "$as_me:8818: \"$ac_try\"") >&5 | 12173 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
8819 | (eval $ac_try) 2>&5 | 12174 | (eval $ac_try) 2>&5 |
8820 | ac_status=$? | 12175 | ac_status=$? |
8821 | echo "$as_me:8821: \$? = $ac_status" >&5 | 12176 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
8822 | (exit $ac_status); }; }; then | 12177 | (exit $ac_status); }; }; then |
8823 | 12178 | ||
8824 | echo "$as_me:8824: result: yes" >&5 | 12179 | echo "$as_me:$LINENO: result: yes" >&5 |
8825 | echo "${ECHO_T}yes" >&6 | 12180 | echo "${ECHO_T}yes" >&6 |
8826 | 12181 | ||
8827 | else | 12182 | else |
8828 | echo "$as_me: program exited with status $ac_status" >&5 | 12183 | echo "$as_me: program exited with status $ac_status" >&5 |
8829 | echo "$as_me: failed program was:" >&5 | 12184 | echo "$as_me: failed program was:" >&5 |
8830 | cat conftest.$ac_ext >&5 | 12185 | sed 's/^/| /' conftest.$ac_ext >&5 |
8831 | 12186 | ||
8832 | echo "$as_me:8832: result: no" >&5 | 12187 | ( exit $ac_status ) |
12188 | |||
12189 | echo "$as_me:$LINENO: result: no" >&5 | ||
8833 | echo "${ECHO_T}no" >&6 | 12190 | echo "${ECHO_T}no" >&6 |
8834 | cat >>confdefs.h <<\EOF | 12191 | cat >>confdefs.h <<\_ACEOF |
8835 | #define BROKEN_GETADDRINFO 1 | 12192 | #define BROKEN_GETADDRINFO 1 |
8836 | EOF | 12193 | _ACEOF |
12194 | |||
12195 | |||
8837 | 12196 | ||
8838 | fi | 12197 | fi |
8839 | rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | 12198 | rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext |
8840 | fi | 12199 | fi |
8841 | fi | 12200 | fi |
8842 | 12201 | ||
8843 | echo "$as_me:8843: checking whether getpgrp takes no argument" >&5 | 12202 | echo "$as_me:$LINENO: checking whether getpgrp requires zero arguments" >&5 |
8844 | echo $ECHO_N "checking whether getpgrp takes no argument... $ECHO_C" >&6 | 12203 | echo $ECHO_N "checking whether getpgrp requires zero arguments... $ECHO_C" >&6 |
8845 | if test "${ac_cv_func_getpgrp_void+set}" = set; then | 12204 | if test "${ac_cv_func_getpgrp_void+set}" = set; then |
8846 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 12205 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
8847 | else | 12206 | else |
8848 | # Use it with a single arg. | 12207 | # Use it with a single arg. |
8849 | cat >conftest.$ac_ext <<_ACEOF | 12208 | cat >conftest.$ac_ext <<_ACEOF |
8850 | #line 8850 "configure" | 12209 | /* confdefs.h. */ |
8851 | #include "confdefs.h" | 12210 | _ACEOF |
12211 | cat confdefs.h >>conftest.$ac_ext | ||
12212 | cat >>conftest.$ac_ext <<_ACEOF | ||
12213 | /* end confdefs.h. */ | ||
8852 | $ac_includes_default | 12214 | $ac_includes_default |
8853 | int | 12215 | int |
8854 | main () | 12216 | main () |
@@ -8859,152 +12221,48 @@ getpgrp (0); | |||
8859 | } | 12221 | } |
8860 | _ACEOF | 12222 | _ACEOF |
8861 | rm -f conftest.$ac_objext | 12223 | rm -f conftest.$ac_objext |
8862 | if { (eval echo "$as_me:8862: \"$ac_compile\"") >&5 | 12224 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
8863 | (eval $ac_compile) 2>&5 | 12225 | (eval $ac_compile) 2>conftest.er1 |
8864 | ac_status=$? | 12226 | ac_status=$? |
8865 | echo "$as_me:8865: \$? = $ac_status" >&5 | 12227 | grep -v '^ *+' conftest.er1 >conftest.err |
12228 | rm -f conftest.er1 | ||
12229 | cat conftest.err >&5 | ||
12230 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
8866 | (exit $ac_status); } && | 12231 | (exit $ac_status); } && |
8867 | { ac_try='test -s conftest.$ac_objext' | 12232 | { ac_try='test -z "$ac_c_werror_flag" |
8868 | { (eval echo "$as_me:8868: \"$ac_try\"") >&5 | 12233 | || test ! -s conftest.err' |
12234 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
8869 | (eval $ac_try) 2>&5 | 12235 | (eval $ac_try) 2>&5 |
8870 | ac_status=$? | 12236 | ac_status=$? |
8871 | echo "$as_me:8871: \$? = $ac_status" >&5 | 12237 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
8872 | (exit $ac_status); }; }; then | 12238 | (exit $ac_status); }; } && |
8873 | ac_func_getpgrp_1=yes | 12239 | { ac_try='test -s conftest.$ac_objext' |
8874 | else | 12240 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
8875 | echo "$as_me: failed program was:" >&5 | ||
8876 | cat conftest.$ac_ext >&5 | ||
8877 | ac_func_getpgrp_1=no | ||
8878 | fi | ||
8879 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
8880 | # Use it with no arg. | ||
8881 | cat >conftest.$ac_ext <<_ACEOF | ||
8882 | #line 8882 "configure" | ||
8883 | #include "confdefs.h" | ||
8884 | $ac_includes_default | ||
8885 | int | ||
8886 | main () | ||
8887 | { | ||
8888 | getpgrp (); | ||
8889 | ; | ||
8890 | return 0; | ||
8891 | } | ||
8892 | _ACEOF | ||
8893 | rm -f conftest.$ac_objext | ||
8894 | if { (eval echo "$as_me:8894: \"$ac_compile\"") >&5 | ||
8895 | (eval $ac_compile) 2>&5 | ||
8896 | ac_status=$? | ||
8897 | echo "$as_me:8897: \$? = $ac_status" >&5 | ||
8898 | (exit $ac_status); } && | ||
8899 | { ac_try='test -s conftest.$ac_objext' | ||
8900 | { (eval echo "$as_me:8900: \"$ac_try\"") >&5 | ||
8901 | (eval $ac_try) 2>&5 | 12241 | (eval $ac_try) 2>&5 |
8902 | ac_status=$? | 12242 | ac_status=$? |
8903 | echo "$as_me:8903: \$? = $ac_status" >&5 | 12243 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
8904 | (exit $ac_status); }; }; then | 12244 | (exit $ac_status); }; }; then |
8905 | ac_func_getpgrp_0=yes | 12245 | ac_cv_func_getpgrp_void=no |
8906 | else | 12246 | else |
8907 | echo "$as_me: failed program was:" >&5 | 12247 | echo "$as_me: failed program was:" >&5 |
8908 | cat conftest.$ac_ext >&5 | 12248 | sed 's/^/| /' conftest.$ac_ext >&5 |
8909 | ac_func_getpgrp_0=no | ||
8910 | fi | ||
8911 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
8912 | # If both static checks agree, we are done. | ||
8913 | case $ac_func_getpgrp_0:$ac_func_getpgrp_1 in | ||
8914 | yes:no) ac_cv_func_getpgrp_void=yes;; | ||
8915 | no:yes) ac_cv_func_getpgrp_void=false;; | ||
8916 | *) if test "$cross_compiling" = yes; then | ||
8917 | { { echo "$as_me:8917: error: cannot check getpgrp if cross compiling" >&5 | ||
8918 | echo "$as_me: error: cannot check getpgrp if cross compiling" >&2;} | ||
8919 | { (exit 1); exit 1; }; } | ||
8920 | else | ||
8921 | cat >conftest.$ac_ext <<_ACEOF | ||
8922 | #line 8922 "configure" | ||
8923 | #include "confdefs.h" | ||
8924 | $ac_includes_default | ||
8925 | |||
8926 | /* | ||
8927 | * If this system has a BSD-style getpgrp(), | ||
8928 | * which takes a pid argument, exit unsuccessfully. | ||
8929 | * | ||
8930 | * Snarfed from Chet Ramey's bash pgrp.c test program | ||
8931 | */ | ||
8932 | 12249 | ||
8933 | int pid; | 12250 | ac_cv_func_getpgrp_void=yes |
8934 | int pg1, pg2, pg3, pg4; | ||
8935 | int ng, np, s, child; | ||
8936 | |||
8937 | int | ||
8938 | main () | ||
8939 | { | ||
8940 | pid = getpid (); | ||
8941 | pg1 = getpgrp (0); | ||
8942 | pg2 = getpgrp (); | ||
8943 | pg3 = getpgrp (pid); | ||
8944 | pg4 = getpgrp (1); | ||
8945 | |||
8946 | /* If all of these values are the same, it's pretty sure that we're | ||
8947 | on a system that ignores getpgrp's first argument. */ | ||
8948 | if (pg2 == pg4 && pg1 == pg3 && pg2 == pg3) | ||
8949 | exit (0); | ||
8950 | |||
8951 | child = fork (); | ||
8952 | if (child < 0) | ||
8953 | exit(1); | ||
8954 | else if (child == 0) | ||
8955 | { | ||
8956 | np = getpid (); | ||
8957 | /* If this is Sys V, this will not work; pgrp will be set to np | ||
8958 | because setpgrp just changes a pgrp to be the same as the | ||
8959 | pid. */ | ||
8960 | setpgrp (np, pg1); | ||
8961 | ng = getpgrp (0); /* Same result for Sys V and BSD */ | ||
8962 | if (ng == pg1) | ||
8963 | exit (1); | ||
8964 | else | ||
8965 | exit (0); | ||
8966 | } | ||
8967 | else | ||
8968 | { | ||
8969 | wait (&s); | ||
8970 | exit (s>>8); | ||
8971 | } | ||
8972 | } | ||
8973 | |||
8974 | _ACEOF | ||
8975 | rm -f conftest$ac_exeext | ||
8976 | if { (eval echo "$as_me:8976: \"$ac_link\"") >&5 | ||
8977 | (eval $ac_link) 2>&5 | ||
8978 | ac_status=$? | ||
8979 | echo "$as_me:8979: \$? = $ac_status" >&5 | ||
8980 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
8981 | { (eval echo "$as_me:8981: \"$ac_try\"") >&5 | ||
8982 | (eval $ac_try) 2>&5 | ||
8983 | ac_status=$? | ||
8984 | echo "$as_me:8984: \$? = $ac_status" >&5 | ||
8985 | (exit $ac_status); }; }; then | ||
8986 | ac_cv_func_getpgrp_void=yes | ||
8987 | else | ||
8988 | echo "$as_me: program exited with status $ac_status" >&5 | ||
8989 | echo "$as_me: failed program was:" >&5 | ||
8990 | cat conftest.$ac_ext >&5 | ||
8991 | ac_cv_func_getpgrp_void=no | ||
8992 | fi | 12251 | fi |
8993 | rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | 12252 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
8994 | fi;; | ||
8995 | esac # $ac_func_getpgrp_0:$ac_func_getpgrp_1 | ||
8996 | 12253 | ||
8997 | fi | 12254 | fi |
8998 | echo "$as_me:8998: result: $ac_cv_func_getpgrp_void" >&5 | 12255 | echo "$as_me:$LINENO: result: $ac_cv_func_getpgrp_void" >&5 |
8999 | echo "${ECHO_T}$ac_cv_func_getpgrp_void" >&6 | 12256 | echo "${ECHO_T}$ac_cv_func_getpgrp_void" >&6 |
9000 | if test $ac_cv_func_getpgrp_void = yes; then | 12257 | if test $ac_cv_func_getpgrp_void = yes; then |
9001 | 12258 | ||
9002 | cat >>confdefs.h <<\EOF | 12259 | cat >>confdefs.h <<\_ACEOF |
9003 | #define GETPGRP_VOID 1 | 12260 | #define GETPGRP_VOID 1 |
9004 | EOF | 12261 | _ACEOF |
9005 | 12262 | ||
9006 | fi | 12263 | fi |
9007 | 12264 | ||
12265 | |||
9008 | # Check for PAM libs | 12266 | # Check for PAM libs |
9009 | PAM_MSG="no" | 12267 | PAM_MSG="no" |
9010 | 12268 | ||
@@ -9015,12 +12273,13 @@ if test "${with_pam+set}" = set; then | |||
9015 | if test "x$withval" != "xno" ; then | 12273 | if test "x$withval" != "xno" ; then |
9016 | if test "x$ac_cv_header_security_pam_appl_h" != "xyes" && \ | 12274 | if test "x$ac_cv_header_security_pam_appl_h" != "xyes" && \ |
9017 | test "x$ac_cv_header_pam_pam_appl_h" != "xyes" ; then | 12275 | test "x$ac_cv_header_pam_pam_appl_h" != "xyes" ; then |
9018 | { { echo "$as_me:9018: error: PAM headers not found" >&5 | 12276 | { { echo "$as_me:$LINENO: error: PAM headers not found" >&5 |
9019 | echo "$as_me: error: PAM headers not found" >&2;} | 12277 | echo "$as_me: error: PAM headers not found" >&2;} |
9020 | { (exit 1); exit 1; }; } | 12278 | { (exit 1); exit 1; }; } |
9021 | fi | 12279 | fi |
9022 | 12280 | ||
9023 | echo "$as_me:9023: checking for dlopen in -ldl" >&5 | 12281 | |
12282 | echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 | ||
9024 | echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 | 12283 | echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 |
9025 | if test "${ac_cv_lib_dl_dlopen+set}" = set; then | 12284 | if test "${ac_cv_lib_dl_dlopen+set}" = set; then |
9026 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 12285 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -9028,8 +12287,11 @@ else | |||
9028 | ac_check_lib_save_LIBS=$LIBS | 12287 | ac_check_lib_save_LIBS=$LIBS |
9029 | LIBS="-ldl $LIBS" | 12288 | LIBS="-ldl $LIBS" |
9030 | cat >conftest.$ac_ext <<_ACEOF | 12289 | cat >conftest.$ac_ext <<_ACEOF |
9031 | #line 9031 "configure" | 12290 | /* confdefs.h. */ |
9032 | #include "confdefs.h" | 12291 | _ACEOF |
12292 | cat confdefs.h >>conftest.$ac_ext | ||
12293 | cat >>conftest.$ac_ext <<_ACEOF | ||
12294 | /* end confdefs.h. */ | ||
9033 | 12295 | ||
9034 | /* Override any gcc2 internal prototype to avoid an error. */ | 12296 | /* Override any gcc2 internal prototype to avoid an error. */ |
9035 | #ifdef __cplusplus | 12297 | #ifdef __cplusplus |
@@ -9047,38 +12309,51 @@ dlopen (); | |||
9047 | } | 12309 | } |
9048 | _ACEOF | 12310 | _ACEOF |
9049 | rm -f conftest.$ac_objext conftest$ac_exeext | 12311 | rm -f conftest.$ac_objext conftest$ac_exeext |
9050 | if { (eval echo "$as_me:9050: \"$ac_link\"") >&5 | 12312 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
9051 | (eval $ac_link) 2>&5 | 12313 | (eval $ac_link) 2>conftest.er1 |
9052 | ac_status=$? | 12314 | ac_status=$? |
9053 | echo "$as_me:9053: \$? = $ac_status" >&5 | 12315 | grep -v '^ *+' conftest.er1 >conftest.err |
12316 | rm -f conftest.er1 | ||
12317 | cat conftest.err >&5 | ||
12318 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9054 | (exit $ac_status); } && | 12319 | (exit $ac_status); } && |
9055 | { ac_try='test -s conftest$ac_exeext' | 12320 | { ac_try='test -z "$ac_c_werror_flag" |
9056 | { (eval echo "$as_me:9056: \"$ac_try\"") >&5 | 12321 | || test ! -s conftest.err' |
12322 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
9057 | (eval $ac_try) 2>&5 | 12323 | (eval $ac_try) 2>&5 |
9058 | ac_status=$? | 12324 | ac_status=$? |
9059 | echo "$as_me:9059: \$? = $ac_status" >&5 | 12325 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
12326 | (exit $ac_status); }; } && | ||
12327 | { ac_try='test -s conftest$ac_exeext' | ||
12328 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12329 | (eval $ac_try) 2>&5 | ||
12330 | ac_status=$? | ||
12331 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9060 | (exit $ac_status); }; }; then | 12332 | (exit $ac_status); }; }; then |
9061 | ac_cv_lib_dl_dlopen=yes | 12333 | ac_cv_lib_dl_dlopen=yes |
9062 | else | 12334 | else |
9063 | echo "$as_me: failed program was:" >&5 | 12335 | echo "$as_me: failed program was:" >&5 |
9064 | cat conftest.$ac_ext >&5 | 12336 | sed 's/^/| /' conftest.$ac_ext >&5 |
12337 | |||
9065 | ac_cv_lib_dl_dlopen=no | 12338 | ac_cv_lib_dl_dlopen=no |
9066 | fi | 12339 | fi |
9067 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 12340 | rm -f conftest.err conftest.$ac_objext \ |
12341 | conftest$ac_exeext conftest.$ac_ext | ||
9068 | LIBS=$ac_check_lib_save_LIBS | 12342 | LIBS=$ac_check_lib_save_LIBS |
9069 | fi | 12343 | fi |
9070 | echo "$as_me:9070: result: $ac_cv_lib_dl_dlopen" >&5 | 12344 | echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 |
9071 | echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 | 12345 | echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 |
9072 | if test $ac_cv_lib_dl_dlopen = yes; then | 12346 | if test $ac_cv_lib_dl_dlopen = yes; then |
9073 | cat >>confdefs.h <<EOF | 12347 | cat >>confdefs.h <<_ACEOF |
9074 | #define HAVE_LIBDL 1 | 12348 | #define HAVE_LIBDL 1 |
9075 | EOF | 12349 | _ACEOF |
9076 | 12350 | ||
9077 | LIBS="-ldl $LIBS" | 12351 | LIBS="-ldl $LIBS" |
9078 | 12352 | ||
9079 | fi | 12353 | fi |
9080 | 12354 | ||
9081 | echo "$as_me:9081: checking for pam_set_item in -lpam" >&5 | 12355 | |
12356 | echo "$as_me:$LINENO: checking for pam_set_item in -lpam" >&5 | ||
9082 | echo $ECHO_N "checking for pam_set_item in -lpam... $ECHO_C" >&6 | 12357 | echo $ECHO_N "checking for pam_set_item in -lpam... $ECHO_C" >&6 |
9083 | if test "${ac_cv_lib_pam_pam_set_item+set}" = set; then | 12358 | if test "${ac_cv_lib_pam_pam_set_item+set}" = set; then |
9084 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 12359 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -9086,8 +12361,11 @@ else | |||
9086 | ac_check_lib_save_LIBS=$LIBS | 12361 | ac_check_lib_save_LIBS=$LIBS |
9087 | LIBS="-lpam $LIBS" | 12362 | LIBS="-lpam $LIBS" |
9088 | cat >conftest.$ac_ext <<_ACEOF | 12363 | cat >conftest.$ac_ext <<_ACEOF |
9089 | #line 9089 "configure" | 12364 | /* confdefs.h. */ |
9090 | #include "confdefs.h" | 12365 | _ACEOF |
12366 | cat confdefs.h >>conftest.$ac_ext | ||
12367 | cat >>conftest.$ac_ext <<_ACEOF | ||
12368 | /* end confdefs.h. */ | ||
9091 | 12369 | ||
9092 | /* Override any gcc2 internal prototype to avoid an error. */ | 12370 | /* Override any gcc2 internal prototype to avoid an error. */ |
9093 | #ifdef __cplusplus | 12371 | #ifdef __cplusplus |
@@ -9105,184 +12383,263 @@ pam_set_item (); | |||
9105 | } | 12383 | } |
9106 | _ACEOF | 12384 | _ACEOF |
9107 | rm -f conftest.$ac_objext conftest$ac_exeext | 12385 | rm -f conftest.$ac_objext conftest$ac_exeext |
9108 | if { (eval echo "$as_me:9108: \"$ac_link\"") >&5 | 12386 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
9109 | (eval $ac_link) 2>&5 | 12387 | (eval $ac_link) 2>conftest.er1 |
9110 | ac_status=$? | 12388 | ac_status=$? |
9111 | echo "$as_me:9111: \$? = $ac_status" >&5 | 12389 | grep -v '^ *+' conftest.er1 >conftest.err |
12390 | rm -f conftest.er1 | ||
12391 | cat conftest.err >&5 | ||
12392 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9112 | (exit $ac_status); } && | 12393 | (exit $ac_status); } && |
9113 | { ac_try='test -s conftest$ac_exeext' | 12394 | { ac_try='test -z "$ac_c_werror_flag" |
9114 | { (eval echo "$as_me:9114: \"$ac_try\"") >&5 | 12395 | || test ! -s conftest.err' |
12396 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
9115 | (eval $ac_try) 2>&5 | 12397 | (eval $ac_try) 2>&5 |
9116 | ac_status=$? | 12398 | ac_status=$? |
9117 | echo "$as_me:9117: \$? = $ac_status" >&5 | 12399 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
12400 | (exit $ac_status); }; } && | ||
12401 | { ac_try='test -s conftest$ac_exeext' | ||
12402 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12403 | (eval $ac_try) 2>&5 | ||
12404 | ac_status=$? | ||
12405 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9118 | (exit $ac_status); }; }; then | 12406 | (exit $ac_status); }; }; then |
9119 | ac_cv_lib_pam_pam_set_item=yes | 12407 | ac_cv_lib_pam_pam_set_item=yes |
9120 | else | 12408 | else |
9121 | echo "$as_me: failed program was:" >&5 | 12409 | echo "$as_me: failed program was:" >&5 |
9122 | cat conftest.$ac_ext >&5 | 12410 | sed 's/^/| /' conftest.$ac_ext >&5 |
12411 | |||
9123 | ac_cv_lib_pam_pam_set_item=no | 12412 | ac_cv_lib_pam_pam_set_item=no |
9124 | fi | 12413 | fi |
9125 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 12414 | rm -f conftest.err conftest.$ac_objext \ |
12415 | conftest$ac_exeext conftest.$ac_ext | ||
9126 | LIBS=$ac_check_lib_save_LIBS | 12416 | LIBS=$ac_check_lib_save_LIBS |
9127 | fi | 12417 | fi |
9128 | echo "$as_me:9128: result: $ac_cv_lib_pam_pam_set_item" >&5 | 12418 | echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_set_item" >&5 |
9129 | echo "${ECHO_T}$ac_cv_lib_pam_pam_set_item" >&6 | 12419 | echo "${ECHO_T}$ac_cv_lib_pam_pam_set_item" >&6 |
9130 | if test $ac_cv_lib_pam_pam_set_item = yes; then | 12420 | if test $ac_cv_lib_pam_pam_set_item = yes; then |
9131 | cat >>confdefs.h <<EOF | 12421 | cat >>confdefs.h <<_ACEOF |
9132 | #define HAVE_LIBPAM 1 | 12422 | #define HAVE_LIBPAM 1 |
9133 | EOF | 12423 | _ACEOF |
9134 | 12424 | ||
9135 | LIBS="-lpam $LIBS" | 12425 | LIBS="-lpam $LIBS" |
9136 | 12426 | ||
9137 | else | 12427 | else |
9138 | { { echo "$as_me:9138: error: *** libpam missing" >&5 | 12428 | { { echo "$as_me:$LINENO: error: *** libpam missing" >&5 |
9139 | echo "$as_me: error: *** libpam missing" >&2;} | 12429 | echo "$as_me: error: *** libpam missing" >&2;} |
9140 | { (exit 1); exit 1; }; } | 12430 | { (exit 1); exit 1; }; } |
9141 | fi | 12431 | fi |
9142 | 12432 | ||
12433 | |||
9143 | for ac_func in pam_getenvlist | 12434 | for ac_func in pam_getenvlist |
9144 | do | 12435 | do |
9145 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | 12436 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
9146 | echo "$as_me:9146: checking for $ac_func" >&5 | 12437 | echo "$as_me:$LINENO: checking for $ac_func" >&5 |
9147 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | 12438 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 |
9148 | if eval "test \"\${$as_ac_var+set}\" = set"; then | 12439 | if eval "test \"\${$as_ac_var+set}\" = set"; then |
9149 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 12440 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
9150 | else | 12441 | else |
9151 | cat >conftest.$ac_ext <<_ACEOF | 12442 | cat >conftest.$ac_ext <<_ACEOF |
9152 | #line 9152 "configure" | 12443 | /* confdefs.h. */ |
9153 | #include "confdefs.h" | 12444 | _ACEOF |
12445 | cat confdefs.h >>conftest.$ac_ext | ||
12446 | cat >>conftest.$ac_ext <<_ACEOF | ||
12447 | /* end confdefs.h. */ | ||
12448 | /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
12449 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
12450 | #define $ac_func innocuous_$ac_func | ||
12451 | |||
9154 | /* System header to define __stub macros and hopefully few prototypes, | 12452 | /* System header to define __stub macros and hopefully few prototypes, |
9155 | which can conflict with char $ac_func (); below. */ | 12453 | which can conflict with char $ac_func (); below. |
9156 | #include <assert.h> | 12454 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
12455 | <limits.h> exists even on freestanding compilers. */ | ||
12456 | |||
12457 | #ifdef __STDC__ | ||
12458 | # include <limits.h> | ||
12459 | #else | ||
12460 | # include <assert.h> | ||
12461 | #endif | ||
12462 | |||
12463 | #undef $ac_func | ||
12464 | |||
9157 | /* Override any gcc2 internal prototype to avoid an error. */ | 12465 | /* Override any gcc2 internal prototype to avoid an error. */ |
9158 | #ifdef __cplusplus | 12466 | #ifdef __cplusplus |
9159 | extern "C" | 12467 | extern "C" |
12468 | { | ||
9160 | #endif | 12469 | #endif |
9161 | /* We use char because int might match the return type of a gcc2 | 12470 | /* We use char because int might match the return type of a gcc2 |
9162 | builtin and then its argument prototype would still apply. */ | 12471 | builtin and then its argument prototype would still apply. */ |
9163 | char $ac_func (); | 12472 | char $ac_func (); |
9164 | char (*f) (); | ||
9165 | |||
9166 | int | ||
9167 | main () | ||
9168 | { | ||
9169 | /* The GNU C library defines this for functions which it implements | 12473 | /* The GNU C library defines this for functions which it implements |
9170 | to always fail with ENOSYS. Some functions are actually named | 12474 | to always fail with ENOSYS. Some functions are actually named |
9171 | something starting with __ and the normal name is an alias. */ | 12475 | something starting with __ and the normal name is an alias. */ |
9172 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) | 12476 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) |
9173 | choke me | 12477 | choke me |
9174 | #else | 12478 | #else |
9175 | f = $ac_func; | 12479 | char (*f) () = $ac_func; |
12480 | #endif | ||
12481 | #ifdef __cplusplus | ||
12482 | } | ||
9176 | #endif | 12483 | #endif |
9177 | 12484 | ||
12485 | int | ||
12486 | main () | ||
12487 | { | ||
12488 | return f != $ac_func; | ||
9178 | ; | 12489 | ; |
9179 | return 0; | 12490 | return 0; |
9180 | } | 12491 | } |
9181 | _ACEOF | 12492 | _ACEOF |
9182 | rm -f conftest.$ac_objext conftest$ac_exeext | 12493 | rm -f conftest.$ac_objext conftest$ac_exeext |
9183 | if { (eval echo "$as_me:9183: \"$ac_link\"") >&5 | 12494 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
9184 | (eval $ac_link) 2>&5 | 12495 | (eval $ac_link) 2>conftest.er1 |
9185 | ac_status=$? | 12496 | ac_status=$? |
9186 | echo "$as_me:9186: \$? = $ac_status" >&5 | 12497 | grep -v '^ *+' conftest.er1 >conftest.err |
12498 | rm -f conftest.er1 | ||
12499 | cat conftest.err >&5 | ||
12500 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9187 | (exit $ac_status); } && | 12501 | (exit $ac_status); } && |
9188 | { ac_try='test -s conftest$ac_exeext' | 12502 | { ac_try='test -z "$ac_c_werror_flag" |
9189 | { (eval echo "$as_me:9189: \"$ac_try\"") >&5 | 12503 | || test ! -s conftest.err' |
12504 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
9190 | (eval $ac_try) 2>&5 | 12505 | (eval $ac_try) 2>&5 |
9191 | ac_status=$? | 12506 | ac_status=$? |
9192 | echo "$as_me:9192: \$? = $ac_status" >&5 | 12507 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
12508 | (exit $ac_status); }; } && | ||
12509 | { ac_try='test -s conftest$ac_exeext' | ||
12510 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12511 | (eval $ac_try) 2>&5 | ||
12512 | ac_status=$? | ||
12513 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9193 | (exit $ac_status); }; }; then | 12514 | (exit $ac_status); }; }; then |
9194 | eval "$as_ac_var=yes" | 12515 | eval "$as_ac_var=yes" |
9195 | else | 12516 | else |
9196 | echo "$as_me: failed program was:" >&5 | 12517 | echo "$as_me: failed program was:" >&5 |
9197 | cat conftest.$ac_ext >&5 | 12518 | sed 's/^/| /' conftest.$ac_ext >&5 |
12519 | |||
9198 | eval "$as_ac_var=no" | 12520 | eval "$as_ac_var=no" |
9199 | fi | 12521 | fi |
9200 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 12522 | rm -f conftest.err conftest.$ac_objext \ |
12523 | conftest$ac_exeext conftest.$ac_ext | ||
9201 | fi | 12524 | fi |
9202 | echo "$as_me:9202: result: `eval echo '${'$as_ac_var'}'`" >&5 | 12525 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 |
9203 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | 12526 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 |
9204 | if test `eval echo '${'$as_ac_var'}'` = yes; then | 12527 | if test `eval echo '${'$as_ac_var'}'` = yes; then |
9205 | cat >>confdefs.h <<EOF | 12528 | cat >>confdefs.h <<_ACEOF |
9206 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 12529 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
9207 | EOF | 12530 | _ACEOF |
9208 | 12531 | ||
9209 | fi | 12532 | fi |
9210 | done | 12533 | done |
9211 | 12534 | ||
12535 | |||
9212 | for ac_func in pam_putenv | 12536 | for ac_func in pam_putenv |
9213 | do | 12537 | do |
9214 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | 12538 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
9215 | echo "$as_me:9215: checking for $ac_func" >&5 | 12539 | echo "$as_me:$LINENO: checking for $ac_func" >&5 |
9216 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | 12540 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 |
9217 | if eval "test \"\${$as_ac_var+set}\" = set"; then | 12541 | if eval "test \"\${$as_ac_var+set}\" = set"; then |
9218 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 12542 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
9219 | else | 12543 | else |
9220 | cat >conftest.$ac_ext <<_ACEOF | 12544 | cat >conftest.$ac_ext <<_ACEOF |
9221 | #line 9221 "configure" | 12545 | /* confdefs.h. */ |
9222 | #include "confdefs.h" | 12546 | _ACEOF |
12547 | cat confdefs.h >>conftest.$ac_ext | ||
12548 | cat >>conftest.$ac_ext <<_ACEOF | ||
12549 | /* end confdefs.h. */ | ||
12550 | /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
12551 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
12552 | #define $ac_func innocuous_$ac_func | ||
12553 | |||
9223 | /* System header to define __stub macros and hopefully few prototypes, | 12554 | /* System header to define __stub macros and hopefully few prototypes, |
9224 | which can conflict with char $ac_func (); below. */ | 12555 | which can conflict with char $ac_func (); below. |
9225 | #include <assert.h> | 12556 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
12557 | <limits.h> exists even on freestanding compilers. */ | ||
12558 | |||
12559 | #ifdef __STDC__ | ||
12560 | # include <limits.h> | ||
12561 | #else | ||
12562 | # include <assert.h> | ||
12563 | #endif | ||
12564 | |||
12565 | #undef $ac_func | ||
12566 | |||
9226 | /* Override any gcc2 internal prototype to avoid an error. */ | 12567 | /* Override any gcc2 internal prototype to avoid an error. */ |
9227 | #ifdef __cplusplus | 12568 | #ifdef __cplusplus |
9228 | extern "C" | 12569 | extern "C" |
12570 | { | ||
9229 | #endif | 12571 | #endif |
9230 | /* We use char because int might match the return type of a gcc2 | 12572 | /* We use char because int might match the return type of a gcc2 |
9231 | builtin and then its argument prototype would still apply. */ | 12573 | builtin and then its argument prototype would still apply. */ |
9232 | char $ac_func (); | 12574 | char $ac_func (); |
9233 | char (*f) (); | ||
9234 | |||
9235 | int | ||
9236 | main () | ||
9237 | { | ||
9238 | /* The GNU C library defines this for functions which it implements | 12575 | /* The GNU C library defines this for functions which it implements |
9239 | to always fail with ENOSYS. Some functions are actually named | 12576 | to always fail with ENOSYS. Some functions are actually named |
9240 | something starting with __ and the normal name is an alias. */ | 12577 | something starting with __ and the normal name is an alias. */ |
9241 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) | 12578 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) |
9242 | choke me | 12579 | choke me |
9243 | #else | 12580 | #else |
9244 | f = $ac_func; | 12581 | char (*f) () = $ac_func; |
12582 | #endif | ||
12583 | #ifdef __cplusplus | ||
12584 | } | ||
9245 | #endif | 12585 | #endif |
9246 | 12586 | ||
12587 | int | ||
12588 | main () | ||
12589 | { | ||
12590 | return f != $ac_func; | ||
9247 | ; | 12591 | ; |
9248 | return 0; | 12592 | return 0; |
9249 | } | 12593 | } |
9250 | _ACEOF | 12594 | _ACEOF |
9251 | rm -f conftest.$ac_objext conftest$ac_exeext | 12595 | rm -f conftest.$ac_objext conftest$ac_exeext |
9252 | if { (eval echo "$as_me:9252: \"$ac_link\"") >&5 | 12596 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
9253 | (eval $ac_link) 2>&5 | 12597 | (eval $ac_link) 2>conftest.er1 |
9254 | ac_status=$? | 12598 | ac_status=$? |
9255 | echo "$as_me:9255: \$? = $ac_status" >&5 | 12599 | grep -v '^ *+' conftest.er1 >conftest.err |
12600 | rm -f conftest.er1 | ||
12601 | cat conftest.err >&5 | ||
12602 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9256 | (exit $ac_status); } && | 12603 | (exit $ac_status); } && |
9257 | { ac_try='test -s conftest$ac_exeext' | 12604 | { ac_try='test -z "$ac_c_werror_flag" |
9258 | { (eval echo "$as_me:9258: \"$ac_try\"") >&5 | 12605 | || test ! -s conftest.err' |
12606 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
9259 | (eval $ac_try) 2>&5 | 12607 | (eval $ac_try) 2>&5 |
9260 | ac_status=$? | 12608 | ac_status=$? |
9261 | echo "$as_me:9261: \$? = $ac_status" >&5 | 12609 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
12610 | (exit $ac_status); }; } && | ||
12611 | { ac_try='test -s conftest$ac_exeext' | ||
12612 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12613 | (eval $ac_try) 2>&5 | ||
12614 | ac_status=$? | ||
12615 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9262 | (exit $ac_status); }; }; then | 12616 | (exit $ac_status); }; }; then |
9263 | eval "$as_ac_var=yes" | 12617 | eval "$as_ac_var=yes" |
9264 | else | 12618 | else |
9265 | echo "$as_me: failed program was:" >&5 | 12619 | echo "$as_me: failed program was:" >&5 |
9266 | cat conftest.$ac_ext >&5 | 12620 | sed 's/^/| /' conftest.$ac_ext >&5 |
12621 | |||
9267 | eval "$as_ac_var=no" | 12622 | eval "$as_ac_var=no" |
9268 | fi | 12623 | fi |
9269 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 12624 | rm -f conftest.err conftest.$ac_objext \ |
12625 | conftest$ac_exeext conftest.$ac_ext | ||
9270 | fi | 12626 | fi |
9271 | echo "$as_me:9271: result: `eval echo '${'$as_ac_var'}'`" >&5 | 12627 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 |
9272 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | 12628 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 |
9273 | if test `eval echo '${'$as_ac_var'}'` = yes; then | 12629 | if test `eval echo '${'$as_ac_var'}'` = yes; then |
9274 | cat >>confdefs.h <<EOF | 12630 | cat >>confdefs.h <<_ACEOF |
9275 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 12631 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
9276 | EOF | 12632 | _ACEOF |
9277 | 12633 | ||
9278 | fi | 12634 | fi |
9279 | done | 12635 | done |
9280 | 12636 | ||
12637 | |||
9281 | PAM_MSG="yes" | 12638 | PAM_MSG="yes" |
9282 | 12639 | ||
9283 | cat >>confdefs.h <<\EOF | 12640 | cat >>confdefs.h <<\_ACEOF |
9284 | #define USE_PAM 1 | 12641 | #define USE_PAM 1 |
9285 | EOF | 12642 | _ACEOF |
9286 | 12643 | ||
9287 | if test $ac_cv_lib_dl_dlopen = yes; then | 12644 | if test $ac_cv_lib_dl_dlopen = yes; then |
9288 | LIBPAM="-lpam -ldl" | 12645 | LIBPAM="-lpam -ldl" |
@@ -9292,16 +12649,20 @@ EOF | |||
9292 | 12649 | ||
9293 | fi | 12650 | fi |
9294 | 12651 | ||
12652 | |||
9295 | fi; | 12653 | fi; |
9296 | 12654 | ||
9297 | # Check for older PAM | 12655 | # Check for older PAM |
9298 | if test "x$PAM_MSG" = "xyes" ; then | 12656 | if test "x$PAM_MSG" = "xyes" ; then |
9299 | # Check PAM strerror arguments (old PAM) | 12657 | # Check PAM strerror arguments (old PAM) |
9300 | echo "$as_me:9300: checking whether pam_strerror takes only one argument" >&5 | 12658 | echo "$as_me:$LINENO: checking whether pam_strerror takes only one argument" >&5 |
9301 | echo $ECHO_N "checking whether pam_strerror takes only one argument... $ECHO_C" >&6 | 12659 | echo $ECHO_N "checking whether pam_strerror takes only one argument... $ECHO_C" >&6 |
9302 | cat >conftest.$ac_ext <<_ACEOF | 12660 | cat >conftest.$ac_ext <<_ACEOF |
9303 | #line 9303 "configure" | 12661 | /* confdefs.h. */ |
9304 | #include "confdefs.h" | 12662 | _ACEOF |
12663 | cat confdefs.h >>conftest.$ac_ext | ||
12664 | cat >>conftest.$ac_ext <<_ACEOF | ||
12665 | /* end confdefs.h. */ | ||
9305 | 12666 | ||
9306 | #include <stdlib.h> | 12667 | #include <stdlib.h> |
9307 | #if defined(HAVE_SECURITY_PAM_APPL_H) | 12668 | #if defined(HAVE_SECURITY_PAM_APPL_H) |
@@ -9319,33 +12680,45 @@ main () | |||
9319 | } | 12680 | } |
9320 | _ACEOF | 12681 | _ACEOF |
9321 | rm -f conftest.$ac_objext | 12682 | rm -f conftest.$ac_objext |
9322 | if { (eval echo "$as_me:9322: \"$ac_compile\"") >&5 | 12683 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
9323 | (eval $ac_compile) 2>&5 | 12684 | (eval $ac_compile) 2>conftest.er1 |
9324 | ac_status=$? | 12685 | ac_status=$? |
9325 | echo "$as_me:9325: \$? = $ac_status" >&5 | 12686 | grep -v '^ *+' conftest.er1 >conftest.err |
12687 | rm -f conftest.er1 | ||
12688 | cat conftest.err >&5 | ||
12689 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9326 | (exit $ac_status); } && | 12690 | (exit $ac_status); } && |
9327 | { ac_try='test -s conftest.$ac_objext' | 12691 | { ac_try='test -z "$ac_c_werror_flag" |
9328 | { (eval echo "$as_me:9328: \"$ac_try\"") >&5 | 12692 | || test ! -s conftest.err' |
12693 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
9329 | (eval $ac_try) 2>&5 | 12694 | (eval $ac_try) 2>&5 |
9330 | ac_status=$? | 12695 | ac_status=$? |
9331 | echo "$as_me:9331: \$? = $ac_status" >&5 | 12696 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
12697 | (exit $ac_status); }; } && | ||
12698 | { ac_try='test -s conftest.$ac_objext' | ||
12699 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12700 | (eval $ac_try) 2>&5 | ||
12701 | ac_status=$? | ||
12702 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9332 | (exit $ac_status); }; }; then | 12703 | (exit $ac_status); }; }; then |
9333 | echo "$as_me:9333: result: no" >&5 | 12704 | echo "$as_me:$LINENO: result: no" >&5 |
9334 | echo "${ECHO_T}no" >&6 | 12705 | echo "${ECHO_T}no" >&6 |
9335 | else | 12706 | else |
9336 | echo "$as_me: failed program was:" >&5 | 12707 | echo "$as_me: failed program was:" >&5 |
9337 | cat conftest.$ac_ext >&5 | 12708 | sed 's/^/| /' conftest.$ac_ext >&5 |
12709 | |||
9338 | 12710 | ||
9339 | cat >>confdefs.h <<\EOF | 12711 | cat >>confdefs.h <<\_ACEOF |
9340 | #define HAVE_OLD_PAM 1 | 12712 | #define HAVE_OLD_PAM 1 |
9341 | EOF | 12713 | _ACEOF |
9342 | 12714 | ||
9343 | echo "$as_me:9343: result: yes" >&5 | 12715 | echo "$as_me:$LINENO: result: yes" >&5 |
9344 | echo "${ECHO_T}yes" >&6 | 12716 | echo "${ECHO_T}yes" >&6 |
9345 | PAM_MSG="yes (old library)" | 12717 | PAM_MSG="yes (old library)" |
9346 | 12718 | ||
12719 | |||
9347 | fi | 12720 | fi |
9348 | rm -f conftest.$ac_objext conftest.$ac_ext | 12721 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
9349 | fi | 12722 | fi |
9350 | 12723 | ||
9351 | # Search for OpenSSL | 12724 | # Search for OpenSSL |
@@ -9377,11 +12750,15 @@ if test "${with_ssl_dir+set}" = set; then | |||
9377 | fi | 12750 | fi |
9378 | fi | 12751 | fi |
9379 | 12752 | ||
12753 | |||
9380 | fi; | 12754 | fi; |
9381 | LIBS="-lcrypto $LIBS" | 12755 | LIBS="-lcrypto $LIBS" |
9382 | cat >conftest.$ac_ext <<_ACEOF | 12756 | cat >conftest.$ac_ext <<_ACEOF |
9383 | #line 9383 "configure" | 12757 | /* confdefs.h. */ |
9384 | #include "confdefs.h" | 12758 | _ACEOF |
12759 | cat confdefs.h >>conftest.$ac_ext | ||
12760 | cat >>conftest.$ac_ext <<_ACEOF | ||
12761 | /* end confdefs.h. */ | ||
9385 | 12762 | ||
9386 | /* Override any gcc2 internal prototype to avoid an error. */ | 12763 | /* Override any gcc2 internal prototype to avoid an error. */ |
9387 | #ifdef __cplusplus | 12764 | #ifdef __cplusplus |
@@ -9399,24 +12776,35 @@ RAND_add (); | |||
9399 | } | 12776 | } |
9400 | _ACEOF | 12777 | _ACEOF |
9401 | rm -f conftest.$ac_objext conftest$ac_exeext | 12778 | rm -f conftest.$ac_objext conftest$ac_exeext |
9402 | if { (eval echo "$as_me:9402: \"$ac_link\"") >&5 | 12779 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
9403 | (eval $ac_link) 2>&5 | 12780 | (eval $ac_link) 2>conftest.er1 |
9404 | ac_status=$? | 12781 | ac_status=$? |
9405 | echo "$as_me:9405: \$? = $ac_status" >&5 | 12782 | grep -v '^ *+' conftest.er1 >conftest.err |
12783 | rm -f conftest.er1 | ||
12784 | cat conftest.err >&5 | ||
12785 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9406 | (exit $ac_status); } && | 12786 | (exit $ac_status); } && |
9407 | { ac_try='test -s conftest$ac_exeext' | 12787 | { ac_try='test -z "$ac_c_werror_flag" |
9408 | { (eval echo "$as_me:9408: \"$ac_try\"") >&5 | 12788 | || test ! -s conftest.err' |
12789 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12790 | (eval $ac_try) 2>&5 | ||
12791 | ac_status=$? | ||
12792 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12793 | (exit $ac_status); }; } && | ||
12794 | { ac_try='test -s conftest$ac_exeext' | ||
12795 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
9409 | (eval $ac_try) 2>&5 | 12796 | (eval $ac_try) 2>&5 |
9410 | ac_status=$? | 12797 | ac_status=$? |
9411 | echo "$as_me:9411: \$? = $ac_status" >&5 | 12798 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
9412 | (exit $ac_status); }; }; then | 12799 | (exit $ac_status); }; }; then |
9413 | cat >>confdefs.h <<\EOF | 12800 | cat >>confdefs.h <<\_ACEOF |
9414 | #define HAVE_OPENSSL 1 | 12801 | #define HAVE_OPENSSL 1 |
9415 | EOF | 12802 | _ACEOF |
9416 | 12803 | ||
9417 | else | 12804 | else |
9418 | echo "$as_me: failed program was:" >&5 | 12805 | echo "$as_me: failed program was:" >&5 |
9419 | cat conftest.$ac_ext >&5 | 12806 | sed 's/^/| /' conftest.$ac_ext >&5 |
12807 | |||
9420 | 12808 | ||
9421 | if test -n "${need_dash_r}"; then | 12809 | if test -n "${need_dash_r}"; then |
9422 | LDFLAGS="-L/usr/local/ssl/lib -R/usr/local/ssl/lib ${saved_LDFLAGS}" | 12810 | LDFLAGS="-L/usr/local/ssl/lib -R/usr/local/ssl/lib ${saved_LDFLAGS}" |
@@ -9425,8 +12813,11 @@ cat conftest.$ac_ext >&5 | |||
9425 | fi | 12813 | fi |
9426 | CPPFLAGS="-I/usr/local/ssl/include ${saved_CPPFLAGS}" | 12814 | CPPFLAGS="-I/usr/local/ssl/include ${saved_CPPFLAGS}" |
9427 | cat >conftest.$ac_ext <<_ACEOF | 12815 | cat >conftest.$ac_ext <<_ACEOF |
9428 | #line 9428 "configure" | 12816 | /* confdefs.h. */ |
9429 | #include "confdefs.h" | 12817 | _ACEOF |
12818 | cat confdefs.h >>conftest.$ac_ext | ||
12819 | cat >>conftest.$ac_ext <<_ACEOF | ||
12820 | /* end confdefs.h. */ | ||
9430 | 12821 | ||
9431 | /* Override any gcc2 internal prototype to avoid an error. */ | 12822 | /* Override any gcc2 internal prototype to avoid an error. */ |
9432 | #ifdef __cplusplus | 12823 | #ifdef __cplusplus |
@@ -9444,46 +12835,66 @@ RAND_add (); | |||
9444 | } | 12835 | } |
9445 | _ACEOF | 12836 | _ACEOF |
9446 | rm -f conftest.$ac_objext conftest$ac_exeext | 12837 | rm -f conftest.$ac_objext conftest$ac_exeext |
9447 | if { (eval echo "$as_me:9447: \"$ac_link\"") >&5 | 12838 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
9448 | (eval $ac_link) 2>&5 | 12839 | (eval $ac_link) 2>conftest.er1 |
9449 | ac_status=$? | 12840 | ac_status=$? |
9450 | echo "$as_me:9450: \$? = $ac_status" >&5 | 12841 | grep -v '^ *+' conftest.er1 >conftest.err |
12842 | rm -f conftest.er1 | ||
12843 | cat conftest.err >&5 | ||
12844 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9451 | (exit $ac_status); } && | 12845 | (exit $ac_status); } && |
9452 | { ac_try='test -s conftest$ac_exeext' | 12846 | { ac_try='test -z "$ac_c_werror_flag" |
9453 | { (eval echo "$as_me:9453: \"$ac_try\"") >&5 | 12847 | || test ! -s conftest.err' |
12848 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
9454 | (eval $ac_try) 2>&5 | 12849 | (eval $ac_try) 2>&5 |
9455 | ac_status=$? | 12850 | ac_status=$? |
9456 | echo "$as_me:9456: \$? = $ac_status" >&5 | 12851 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
12852 | (exit $ac_status); }; } && | ||
12853 | { ac_try='test -s conftest$ac_exeext' | ||
12854 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12855 | (eval $ac_try) 2>&5 | ||
12856 | ac_status=$? | ||
12857 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9457 | (exit $ac_status); }; }; then | 12858 | (exit $ac_status); }; }; then |
9458 | cat >>confdefs.h <<\EOF | 12859 | cat >>confdefs.h <<\_ACEOF |
9459 | #define HAVE_OPENSSL 1 | 12860 | #define HAVE_OPENSSL 1 |
9460 | EOF | 12861 | _ACEOF |
9461 | 12862 | ||
9462 | else | 12863 | else |
9463 | echo "$as_me: failed program was:" >&5 | 12864 | echo "$as_me: failed program was:" >&5 |
9464 | cat conftest.$ac_ext >&5 | 12865 | sed 's/^/| /' conftest.$ac_ext >&5 |
9465 | 12866 | ||
9466 | { { echo "$as_me:9466: error: *** Can't find recent OpenSSL libcrypto (see config.log for details) ***" >&5 | 12867 | |
12868 | { { echo "$as_me:$LINENO: error: *** Can't find recent OpenSSL libcrypto (see config.log for details) ***" >&5 | ||
9467 | echo "$as_me: error: *** Can't find recent OpenSSL libcrypto (see config.log for details) ***" >&2;} | 12869 | echo "$as_me: error: *** Can't find recent OpenSSL libcrypto (see config.log for details) ***" >&2;} |
9468 | { (exit 1); exit 1; }; } | 12870 | { (exit 1); exit 1; }; } |
9469 | 12871 | ||
12872 | |||
9470 | fi | 12873 | fi |
9471 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 12874 | rm -f conftest.err conftest.$ac_objext \ |
12875 | conftest$ac_exeext conftest.$ac_ext | ||
12876 | |||
9472 | 12877 | ||
9473 | fi | 12878 | fi |
9474 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 12879 | rm -f conftest.err conftest.$ac_objext \ |
12880 | conftest$ac_exeext conftest.$ac_ext | ||
9475 | 12881 | ||
9476 | # Determine OpenSSL header version | 12882 | # Determine OpenSSL header version |
9477 | echo "$as_me:9477: checking OpenSSL header version" >&5 | 12883 | echo "$as_me:$LINENO: checking OpenSSL header version" >&5 |
9478 | echo $ECHO_N "checking OpenSSL header version... $ECHO_C" >&6 | 12884 | echo $ECHO_N "checking OpenSSL header version... $ECHO_C" >&6 |
9479 | if test "$cross_compiling" = yes; then | 12885 | if test "$cross_compiling" = yes; then |
9480 | { { echo "$as_me:9480: error: cannot run test program while cross compiling" >&5 | 12886 | { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
9481 | echo "$as_me: error: cannot run test program while cross compiling" >&2;} | 12887 | See \`config.log' for more details." >&5 |
12888 | echo "$as_me: error: cannot run test program while cross compiling | ||
12889 | See \`config.log' for more details." >&2;} | ||
9482 | { (exit 1); exit 1; }; } | 12890 | { (exit 1); exit 1; }; } |
9483 | else | 12891 | else |
9484 | cat >conftest.$ac_ext <<_ACEOF | 12892 | cat >conftest.$ac_ext <<_ACEOF |
9485 | #line 9485 "configure" | 12893 | /* confdefs.h. */ |
9486 | #include "confdefs.h" | 12894 | _ACEOF |
12895 | cat confdefs.h >>conftest.$ac_ext | ||
12896 | cat >>conftest.$ac_ext <<_ACEOF | ||
12897 | /* end confdefs.h. */ | ||
9487 | 12898 | ||
9488 | #include <stdio.h> | 12899 | #include <stdio.h> |
9489 | #include <string.h> | 12900 | #include <string.h> |
@@ -9505,47 +12916,55 @@ int main(void) { | |||
9505 | 12916 | ||
9506 | _ACEOF | 12917 | _ACEOF |
9507 | rm -f conftest$ac_exeext | 12918 | rm -f conftest$ac_exeext |
9508 | if { (eval echo "$as_me:9508: \"$ac_link\"") >&5 | 12919 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
9509 | (eval $ac_link) 2>&5 | 12920 | (eval $ac_link) 2>&5 |
9510 | ac_status=$? | 12921 | ac_status=$? |
9511 | echo "$as_me:9511: \$? = $ac_status" >&5 | 12922 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
9512 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | 12923 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
9513 | { (eval echo "$as_me:9513: \"$ac_try\"") >&5 | 12924 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
9514 | (eval $ac_try) 2>&5 | 12925 | (eval $ac_try) 2>&5 |
9515 | ac_status=$? | 12926 | ac_status=$? |
9516 | echo "$as_me:9516: \$? = $ac_status" >&5 | 12927 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
9517 | (exit $ac_status); }; }; then | 12928 | (exit $ac_status); }; }; then |
9518 | 12929 | ||
9519 | ssl_header_ver=`cat conftest.sslincver` | 12930 | ssl_header_ver=`cat conftest.sslincver` |
9520 | echo "$as_me:9520: result: $ssl_header_ver" >&5 | 12931 | echo "$as_me:$LINENO: result: $ssl_header_ver" >&5 |
9521 | echo "${ECHO_T}$ssl_header_ver" >&6 | 12932 | echo "${ECHO_T}$ssl_header_ver" >&6 |
9522 | 12933 | ||
9523 | else | 12934 | else |
9524 | echo "$as_me: program exited with status $ac_status" >&5 | 12935 | echo "$as_me: program exited with status $ac_status" >&5 |
9525 | echo "$as_me: failed program was:" >&5 | 12936 | echo "$as_me: failed program was:" >&5 |
9526 | cat conftest.$ac_ext >&5 | 12937 | sed 's/^/| /' conftest.$ac_ext >&5 |
9527 | 12938 | ||
9528 | echo "$as_me:9528: result: not found" >&5 | 12939 | ( exit $ac_status ) |
12940 | |||
12941 | echo "$as_me:$LINENO: result: not found" >&5 | ||
9529 | echo "${ECHO_T}not found" >&6 | 12942 | echo "${ECHO_T}not found" >&6 |
9530 | { { echo "$as_me:9530: error: OpenSSL version header not found." >&5 | 12943 | { { echo "$as_me:$LINENO: error: OpenSSL version header not found." >&5 |
9531 | echo "$as_me: error: OpenSSL version header not found." >&2;} | 12944 | echo "$as_me: error: OpenSSL version header not found." >&2;} |
9532 | { (exit 1); exit 1; }; } | 12945 | { (exit 1); exit 1; }; } |
9533 | 12946 | ||
12947 | |||
9534 | fi | 12948 | fi |
9535 | rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | 12949 | rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext |
9536 | fi | 12950 | fi |
9537 | 12951 | ||
9538 | # Determine OpenSSL library version | 12952 | # Determine OpenSSL library version |
9539 | echo "$as_me:9539: checking OpenSSL library version" >&5 | 12953 | echo "$as_me:$LINENO: checking OpenSSL library version" >&5 |
9540 | echo $ECHO_N "checking OpenSSL library version... $ECHO_C" >&6 | 12954 | echo $ECHO_N "checking OpenSSL library version... $ECHO_C" >&6 |
9541 | if test "$cross_compiling" = yes; then | 12955 | if test "$cross_compiling" = yes; then |
9542 | { { echo "$as_me:9542: error: cannot run test program while cross compiling" >&5 | 12956 | { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
9543 | echo "$as_me: error: cannot run test program while cross compiling" >&2;} | 12957 | See \`config.log' for more details." >&5 |
12958 | echo "$as_me: error: cannot run test program while cross compiling | ||
12959 | See \`config.log' for more details." >&2;} | ||
9544 | { (exit 1); exit 1; }; } | 12960 | { (exit 1); exit 1; }; } |
9545 | else | 12961 | else |
9546 | cat >conftest.$ac_ext <<_ACEOF | 12962 | cat >conftest.$ac_ext <<_ACEOF |
9547 | #line 9547 "configure" | 12963 | /* confdefs.h. */ |
9548 | #include "confdefs.h" | 12964 | _ACEOF |
12965 | cat confdefs.h >>conftest.$ac_ext | ||
12966 | cat >>conftest.$ac_ext <<_ACEOF | ||
12967 | /* end confdefs.h. */ | ||
9549 | 12968 | ||
9550 | #include <stdio.h> | 12969 | #include <stdio.h> |
9551 | #include <string.h> | 12970 | #include <string.h> |
@@ -9568,47 +12987,55 @@ int main(void) { | |||
9568 | 12987 | ||
9569 | _ACEOF | 12988 | _ACEOF |
9570 | rm -f conftest$ac_exeext | 12989 | rm -f conftest$ac_exeext |
9571 | if { (eval echo "$as_me:9571: \"$ac_link\"") >&5 | 12990 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
9572 | (eval $ac_link) 2>&5 | 12991 | (eval $ac_link) 2>&5 |
9573 | ac_status=$? | 12992 | ac_status=$? |
9574 | echo "$as_me:9574: \$? = $ac_status" >&5 | 12993 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
9575 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | 12994 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
9576 | { (eval echo "$as_me:9576: \"$ac_try\"") >&5 | 12995 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
9577 | (eval $ac_try) 2>&5 | 12996 | (eval $ac_try) 2>&5 |
9578 | ac_status=$? | 12997 | ac_status=$? |
9579 | echo "$as_me:9579: \$? = $ac_status" >&5 | 12998 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
9580 | (exit $ac_status); }; }; then | 12999 | (exit $ac_status); }; }; then |
9581 | 13000 | ||
9582 | ssl_library_ver=`cat conftest.ssllibver` | 13001 | ssl_library_ver=`cat conftest.ssllibver` |
9583 | echo "$as_me:9583: result: $ssl_library_ver" >&5 | 13002 | echo "$as_me:$LINENO: result: $ssl_library_ver" >&5 |
9584 | echo "${ECHO_T}$ssl_library_ver" >&6 | 13003 | echo "${ECHO_T}$ssl_library_ver" >&6 |
9585 | 13004 | ||
9586 | else | 13005 | else |
9587 | echo "$as_me: program exited with status $ac_status" >&5 | 13006 | echo "$as_me: program exited with status $ac_status" >&5 |
9588 | echo "$as_me: failed program was:" >&5 | 13007 | echo "$as_me: failed program was:" >&5 |
9589 | cat conftest.$ac_ext >&5 | 13008 | sed 's/^/| /' conftest.$ac_ext >&5 |
13009 | |||
13010 | ( exit $ac_status ) | ||
9590 | 13011 | ||
9591 | echo "$as_me:9591: result: not found" >&5 | 13012 | echo "$as_me:$LINENO: result: not found" >&5 |
9592 | echo "${ECHO_T}not found" >&6 | 13013 | echo "${ECHO_T}not found" >&6 |
9593 | { { echo "$as_me:9593: error: OpenSSL library not found." >&5 | 13014 | { { echo "$as_me:$LINENO: error: OpenSSL library not found." >&5 |
9594 | echo "$as_me: error: OpenSSL library not found." >&2;} | 13015 | echo "$as_me: error: OpenSSL library not found." >&2;} |
9595 | { (exit 1); exit 1; }; } | 13016 | { (exit 1); exit 1; }; } |
9596 | 13017 | ||
13018 | |||
9597 | fi | 13019 | fi |
9598 | rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | 13020 | rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext |
9599 | fi | 13021 | fi |
9600 | 13022 | ||
9601 | # Sanity check OpenSSL headers | 13023 | # Sanity check OpenSSL headers |
9602 | echo "$as_me:9602: checking whether OpenSSL's headers match the library" >&5 | 13024 | echo "$as_me:$LINENO: checking whether OpenSSL's headers match the library" >&5 |
9603 | echo $ECHO_N "checking whether OpenSSL's headers match the library... $ECHO_C" >&6 | 13025 | echo $ECHO_N "checking whether OpenSSL's headers match the library... $ECHO_C" >&6 |
9604 | if test "$cross_compiling" = yes; then | 13026 | if test "$cross_compiling" = yes; then |
9605 | { { echo "$as_me:9605: error: cannot run test program while cross compiling" >&5 | 13027 | { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
9606 | echo "$as_me: error: cannot run test program while cross compiling" >&2;} | 13028 | See \`config.log' for more details." >&5 |
13029 | echo "$as_me: error: cannot run test program while cross compiling | ||
13030 | See \`config.log' for more details." >&2;} | ||
9607 | { (exit 1); exit 1; }; } | 13031 | { (exit 1); exit 1; }; } |
9608 | else | 13032 | else |
9609 | cat >conftest.$ac_ext <<_ACEOF | 13033 | cat >conftest.$ac_ext <<_ACEOF |
9610 | #line 9610 "configure" | 13034 | /* confdefs.h. */ |
9611 | #include "confdefs.h" | 13035 | _ACEOF |
13036 | cat confdefs.h >>conftest.$ac_ext | ||
13037 | cat >>conftest.$ac_ext <<_ACEOF | ||
13038 | /* end confdefs.h. */ | ||
9612 | 13039 | ||
9613 | #include <string.h> | 13040 | #include <string.h> |
9614 | #include <openssl/opensslv.h> | 13041 | #include <openssl/opensslv.h> |
@@ -9616,28 +13043,30 @@ int main(void) { exit(SSLeay() == OPENSSL_VERSION_NUMBER ? 0 : 1); } | |||
9616 | 13043 | ||
9617 | _ACEOF | 13044 | _ACEOF |
9618 | rm -f conftest$ac_exeext | 13045 | rm -f conftest$ac_exeext |
9619 | if { (eval echo "$as_me:9619: \"$ac_link\"") >&5 | 13046 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
9620 | (eval $ac_link) 2>&5 | 13047 | (eval $ac_link) 2>&5 |
9621 | ac_status=$? | 13048 | ac_status=$? |
9622 | echo "$as_me:9622: \$? = $ac_status" >&5 | 13049 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
9623 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | 13050 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
9624 | { (eval echo "$as_me:9624: \"$ac_try\"") >&5 | 13051 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
9625 | (eval $ac_try) 2>&5 | 13052 | (eval $ac_try) 2>&5 |
9626 | ac_status=$? | 13053 | ac_status=$? |
9627 | echo "$as_me:9627: \$? = $ac_status" >&5 | 13054 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
9628 | (exit $ac_status); }; }; then | 13055 | (exit $ac_status); }; }; then |
9629 | 13056 | ||
9630 | echo "$as_me:9630: result: yes" >&5 | 13057 | echo "$as_me:$LINENO: result: yes" >&5 |
9631 | echo "${ECHO_T}yes" >&6 | 13058 | echo "${ECHO_T}yes" >&6 |
9632 | 13059 | ||
9633 | else | 13060 | else |
9634 | echo "$as_me: program exited with status $ac_status" >&5 | 13061 | echo "$as_me: program exited with status $ac_status" >&5 |
9635 | echo "$as_me: failed program was:" >&5 | 13062 | echo "$as_me: failed program was:" >&5 |
9636 | cat conftest.$ac_ext >&5 | 13063 | sed 's/^/| /' conftest.$ac_ext >&5 |
13064 | |||
13065 | ( exit $ac_status ) | ||
9637 | 13066 | ||
9638 | echo "$as_me:9638: result: no" >&5 | 13067 | echo "$as_me:$LINENO: result: no" >&5 |
9639 | echo "${ECHO_T}no" >&6 | 13068 | echo "${ECHO_T}no" >&6 |
9640 | { { echo "$as_me:9640: error: Your OpenSSL headers do not match your library. | 13069 | { { echo "$as_me:$LINENO: error: Your OpenSSL headers do not match your library. |
9641 | Check config.log for details. | 13070 | Check config.log for details. |
9642 | Also see contrib/findssl.sh for help identifying header/library mismatches." >&5 | 13071 | Also see contrib/findssl.sh for help identifying header/library mismatches." >&5 |
9643 | echo "$as_me: error: Your OpenSSL headers do not match your library. | 13072 | echo "$as_me: error: Your OpenSSL headers do not match your library. |
@@ -9645,15 +13074,16 @@ Check config.log for details. | |||
9645 | Also see contrib/findssl.sh for help identifying header/library mismatches." >&2;} | 13074 | Also see contrib/findssl.sh for help identifying header/library mismatches." >&2;} |
9646 | { (exit 1); exit 1; }; } | 13075 | { (exit 1); exit 1; }; } |
9647 | 13076 | ||
13077 | |||
9648 | fi | 13078 | fi |
9649 | rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | 13079 | rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext |
9650 | fi | 13080 | fi |
9651 | 13081 | ||
9652 | # Some systems want crypt() from libcrypt, *not* the version in OpenSSL, | 13082 | # Some systems want crypt() from libcrypt, *not* the version in OpenSSL, |
9653 | # because the system crypt() is more featureful. | 13083 | # because the system crypt() is more featureful. |
9654 | if test "x$check_for_libcrypt_before" = "x1"; then | 13084 | if test "x$check_for_libcrypt_before" = "x1"; then |
9655 | 13085 | ||
9656 | echo "$as_me:9656: checking for crypt in -lcrypt" >&5 | 13086 | echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5 |
9657 | echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6 | 13087 | echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6 |
9658 | if test "${ac_cv_lib_crypt_crypt+set}" = set; then | 13088 | if test "${ac_cv_lib_crypt_crypt+set}" = set; then |
9659 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 13089 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -9661,8 +13091,11 @@ else | |||
9661 | ac_check_lib_save_LIBS=$LIBS | 13091 | ac_check_lib_save_LIBS=$LIBS |
9662 | LIBS="-lcrypt $LIBS" | 13092 | LIBS="-lcrypt $LIBS" |
9663 | cat >conftest.$ac_ext <<_ACEOF | 13093 | cat >conftest.$ac_ext <<_ACEOF |
9664 | #line 9664 "configure" | 13094 | /* confdefs.h. */ |
9665 | #include "confdefs.h" | 13095 | _ACEOF |
13096 | cat confdefs.h >>conftest.$ac_ext | ||
13097 | cat >>conftest.$ac_ext <<_ACEOF | ||
13098 | /* end confdefs.h. */ | ||
9666 | 13099 | ||
9667 | /* Override any gcc2 internal prototype to avoid an error. */ | 13100 | /* Override any gcc2 internal prototype to avoid an error. */ |
9668 | #ifdef __cplusplus | 13101 | #ifdef __cplusplus |
@@ -9680,32 +13113,44 @@ crypt (); | |||
9680 | } | 13113 | } |
9681 | _ACEOF | 13114 | _ACEOF |
9682 | rm -f conftest.$ac_objext conftest$ac_exeext | 13115 | rm -f conftest.$ac_objext conftest$ac_exeext |
9683 | if { (eval echo "$as_me:9683: \"$ac_link\"") >&5 | 13116 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
9684 | (eval $ac_link) 2>&5 | 13117 | (eval $ac_link) 2>conftest.er1 |
9685 | ac_status=$? | 13118 | ac_status=$? |
9686 | echo "$as_me:9686: \$? = $ac_status" >&5 | 13119 | grep -v '^ *+' conftest.er1 >conftest.err |
13120 | rm -f conftest.er1 | ||
13121 | cat conftest.err >&5 | ||
13122 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9687 | (exit $ac_status); } && | 13123 | (exit $ac_status); } && |
9688 | { ac_try='test -s conftest$ac_exeext' | 13124 | { ac_try='test -z "$ac_c_werror_flag" |
9689 | { (eval echo "$as_me:9689: \"$ac_try\"") >&5 | 13125 | || test ! -s conftest.err' |
13126 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
9690 | (eval $ac_try) 2>&5 | 13127 | (eval $ac_try) 2>&5 |
9691 | ac_status=$? | 13128 | ac_status=$? |
9692 | echo "$as_me:9692: \$? = $ac_status" >&5 | 13129 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
13130 | (exit $ac_status); }; } && | ||
13131 | { ac_try='test -s conftest$ac_exeext' | ||
13132 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
13133 | (eval $ac_try) 2>&5 | ||
13134 | ac_status=$? | ||
13135 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9693 | (exit $ac_status); }; }; then | 13136 | (exit $ac_status); }; }; then |
9694 | ac_cv_lib_crypt_crypt=yes | 13137 | ac_cv_lib_crypt_crypt=yes |
9695 | else | 13138 | else |
9696 | echo "$as_me: failed program was:" >&5 | 13139 | echo "$as_me: failed program was:" >&5 |
9697 | cat conftest.$ac_ext >&5 | 13140 | sed 's/^/| /' conftest.$ac_ext >&5 |
13141 | |||
9698 | ac_cv_lib_crypt_crypt=no | 13142 | ac_cv_lib_crypt_crypt=no |
9699 | fi | 13143 | fi |
9700 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 13144 | rm -f conftest.err conftest.$ac_objext \ |
13145 | conftest$ac_exeext conftest.$ac_ext | ||
9701 | LIBS=$ac_check_lib_save_LIBS | 13146 | LIBS=$ac_check_lib_save_LIBS |
9702 | fi | 13147 | fi |
9703 | echo "$as_me:9703: result: $ac_cv_lib_crypt_crypt" >&5 | 13148 | echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5 |
9704 | echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6 | 13149 | echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6 |
9705 | if test $ac_cv_lib_crypt_crypt = yes; then | 13150 | if test $ac_cv_lib_crypt_crypt = yes; then |
9706 | cat >>confdefs.h <<EOF | 13151 | cat >>confdefs.h <<_ACEOF |
9707 | #define HAVE_LIBCRYPT 1 | 13152 | #define HAVE_LIBCRYPT 1 |
9708 | EOF | 13153 | _ACEOF |
9709 | 13154 | ||
9710 | LIBS="-lcrypt $LIBS" | 13155 | LIBS="-lcrypt $LIBS" |
9711 | 13156 | ||
@@ -9716,7 +13161,7 @@ fi | |||
9716 | # Some Linux systems (Slackware) need crypt() from libcrypt, *not* the | 13161 | # Some Linux systems (Slackware) need crypt() from libcrypt, *not* the |
9717 | # version in OpenSSL. | 13162 | # version in OpenSSL. |
9718 | if test "x$check_for_libcrypt_later" = "x1"; then | 13163 | if test "x$check_for_libcrypt_later" = "x1"; then |
9719 | echo "$as_me:9719: checking for crypt in -lcrypt" >&5 | 13164 | echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5 |
9720 | echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6 | 13165 | echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6 |
9721 | if test "${ac_cv_lib_crypt_crypt+set}" = set; then | 13166 | if test "${ac_cv_lib_crypt_crypt+set}" = set; then |
9722 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 13167 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -9724,8 +13169,11 @@ else | |||
9724 | ac_check_lib_save_LIBS=$LIBS | 13169 | ac_check_lib_save_LIBS=$LIBS |
9725 | LIBS="-lcrypt $LIBS" | 13170 | LIBS="-lcrypt $LIBS" |
9726 | cat >conftest.$ac_ext <<_ACEOF | 13171 | cat >conftest.$ac_ext <<_ACEOF |
9727 | #line 9727 "configure" | 13172 | /* confdefs.h. */ |
9728 | #include "confdefs.h" | 13173 | _ACEOF |
13174 | cat confdefs.h >>conftest.$ac_ext | ||
13175 | cat >>conftest.$ac_ext <<_ACEOF | ||
13176 | /* end confdefs.h. */ | ||
9729 | 13177 | ||
9730 | /* Override any gcc2 internal prototype to avoid an error. */ | 13178 | /* Override any gcc2 internal prototype to avoid an error. */ |
9731 | #ifdef __cplusplus | 13179 | #ifdef __cplusplus |
@@ -9743,27 +13191,39 @@ crypt (); | |||
9743 | } | 13191 | } |
9744 | _ACEOF | 13192 | _ACEOF |
9745 | rm -f conftest.$ac_objext conftest$ac_exeext | 13193 | rm -f conftest.$ac_objext conftest$ac_exeext |
9746 | if { (eval echo "$as_me:9746: \"$ac_link\"") >&5 | 13194 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
9747 | (eval $ac_link) 2>&5 | 13195 | (eval $ac_link) 2>conftest.er1 |
9748 | ac_status=$? | 13196 | ac_status=$? |
9749 | echo "$as_me:9749: \$? = $ac_status" >&5 | 13197 | grep -v '^ *+' conftest.er1 >conftest.err |
13198 | rm -f conftest.er1 | ||
13199 | cat conftest.err >&5 | ||
13200 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9750 | (exit $ac_status); } && | 13201 | (exit $ac_status); } && |
9751 | { ac_try='test -s conftest$ac_exeext' | 13202 | { ac_try='test -z "$ac_c_werror_flag" |
9752 | { (eval echo "$as_me:9752: \"$ac_try\"") >&5 | 13203 | || test ! -s conftest.err' |
13204 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
9753 | (eval $ac_try) 2>&5 | 13205 | (eval $ac_try) 2>&5 |
9754 | ac_status=$? | 13206 | ac_status=$? |
9755 | echo "$as_me:9755: \$? = $ac_status" >&5 | 13207 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
13208 | (exit $ac_status); }; } && | ||
13209 | { ac_try='test -s conftest$ac_exeext' | ||
13210 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
13211 | (eval $ac_try) 2>&5 | ||
13212 | ac_status=$? | ||
13213 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
9756 | (exit $ac_status); }; }; then | 13214 | (exit $ac_status); }; }; then |
9757 | ac_cv_lib_crypt_crypt=yes | 13215 | ac_cv_lib_crypt_crypt=yes |
9758 | else | 13216 | else |
9759 | echo "$as_me: failed program was:" >&5 | 13217 | echo "$as_me: failed program was:" >&5 |
9760 | cat conftest.$ac_ext >&5 | 13218 | sed 's/^/| /' conftest.$ac_ext >&5 |
13219 | |||
9761 | ac_cv_lib_crypt_crypt=no | 13220 | ac_cv_lib_crypt_crypt=no |
9762 | fi | 13221 | fi |
9763 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 13222 | rm -f conftest.err conftest.$ac_objext \ |
13223 | conftest$ac_exeext conftest.$ac_ext | ||
9764 | LIBS=$ac_check_lib_save_LIBS | 13224 | LIBS=$ac_check_lib_save_LIBS |
9765 | fi | 13225 | fi |
9766 | echo "$as_me:9766: result: $ac_cv_lib_crypt_crypt" >&5 | 13226 | echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5 |
9767 | echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6 | 13227 | echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6 |
9768 | if test $ac_cv_lib_crypt_crypt = yes; then | 13228 | if test $ac_cv_lib_crypt_crypt = yes; then |
9769 | LIBS="$LIBS -lcrypt" | 13229 | LIBS="$LIBS -lcrypt" |
@@ -9771,19 +13231,25 @@ fi | |||
9771 | 13231 | ||
9772 | fi | 13232 | fi |
9773 | 13233 | ||
13234 | |||
9774 | ### Configure cryptographic random number support | 13235 | ### Configure cryptographic random number support |
9775 | 13236 | ||
9776 | # Check wheter OpenSSL seeds itself | 13237 | # Check wheter OpenSSL seeds itself |
9777 | echo "$as_me:9777: checking whether OpenSSL's PRNG is internally seeded" >&5 | 13238 | echo "$as_me:$LINENO: checking whether OpenSSL's PRNG is internally seeded" >&5 |
9778 | echo $ECHO_N "checking whether OpenSSL's PRNG is internally seeded... $ECHO_C" >&6 | 13239 | echo $ECHO_N "checking whether OpenSSL's PRNG is internally seeded... $ECHO_C" >&6 |
9779 | if test "$cross_compiling" = yes; then | 13240 | if test "$cross_compiling" = yes; then |
9780 | { { echo "$as_me:9780: error: cannot run test program while cross compiling" >&5 | 13241 | { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
9781 | echo "$as_me: error: cannot run test program while cross compiling" >&2;} | 13242 | See \`config.log' for more details." >&5 |
13243 | echo "$as_me: error: cannot run test program while cross compiling | ||
13244 | See \`config.log' for more details." >&2;} | ||
9782 | { (exit 1); exit 1; }; } | 13245 | { (exit 1); exit 1; }; } |
9783 | else | 13246 | else |
9784 | cat >conftest.$ac_ext <<_ACEOF | 13247 | cat >conftest.$ac_ext <<_ACEOF |
9785 | #line 9785 "configure" | 13248 | /* confdefs.h. */ |
9786 | #include "confdefs.h" | 13249 | _ACEOF |
13250 | cat confdefs.h >>conftest.$ac_ext | ||
13251 | cat >>conftest.$ac_ext <<_ACEOF | ||
13252 | /* end confdefs.h. */ | ||
9787 | 13253 | ||
9788 | #include <string.h> | 13254 | #include <string.h> |
9789 | #include <openssl/rand.h> | 13255 | #include <openssl/rand.h> |
@@ -9791,36 +13257,40 @@ int main(void) { exit(RAND_status() == 1 ? 0 : 1); } | |||
9791 | 13257 | ||
9792 | _ACEOF | 13258 | _ACEOF |
9793 | rm -f conftest$ac_exeext | 13259 | rm -f conftest$ac_exeext |
9794 | if { (eval echo "$as_me:9794: \"$ac_link\"") >&5 | 13260 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
9795 | (eval $ac_link) 2>&5 | 13261 | (eval $ac_link) 2>&5 |
9796 | ac_status=$? | 13262 | ac_status=$? |
9797 | echo "$as_me:9797: \$? = $ac_status" >&5 | 13263 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
9798 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | 13264 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
9799 | { (eval echo "$as_me:9799: \"$ac_try\"") >&5 | 13265 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
9800 | (eval $ac_try) 2>&5 | 13266 | (eval $ac_try) 2>&5 |
9801 | ac_status=$? | 13267 | ac_status=$? |
9802 | echo "$as_me:9802: \$? = $ac_status" >&5 | 13268 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
9803 | (exit $ac_status); }; }; then | 13269 | (exit $ac_status); }; }; then |
9804 | 13270 | ||
9805 | OPENSSL_SEEDS_ITSELF=yes | 13271 | OPENSSL_SEEDS_ITSELF=yes |
9806 | echo "$as_me:9806: result: yes" >&5 | 13272 | echo "$as_me:$LINENO: result: yes" >&5 |
9807 | echo "${ECHO_T}yes" >&6 | 13273 | echo "${ECHO_T}yes" >&6 |
9808 | 13274 | ||
9809 | else | 13275 | else |
9810 | echo "$as_me: program exited with status $ac_status" >&5 | 13276 | echo "$as_me: program exited with status $ac_status" >&5 |
9811 | echo "$as_me: failed program was:" >&5 | 13277 | echo "$as_me: failed program was:" >&5 |
9812 | cat conftest.$ac_ext >&5 | 13278 | sed 's/^/| /' conftest.$ac_ext >&5 |
13279 | |||
13280 | ( exit $ac_status ) | ||
9813 | 13281 | ||
9814 | echo "$as_me:9814: result: no" >&5 | 13282 | echo "$as_me:$LINENO: result: no" >&5 |
9815 | echo "${ECHO_T}no" >&6 | 13283 | echo "${ECHO_T}no" >&6 |
9816 | # Default to use of the rand helper if OpenSSL doesn't | 13284 | # Default to use of the rand helper if OpenSSL doesn't |
9817 | # seed itself | 13285 | # seed itself |
9818 | USE_RAND_HELPER=yes | 13286 | USE_RAND_HELPER=yes |
9819 | 13287 | ||
13288 | |||
9820 | fi | 13289 | fi |
9821 | rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | 13290 | rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext |
9822 | fi | 13291 | fi |
9823 | 13292 | ||
13293 | |||
9824 | # Do we want to force the use of the rand helper? | 13294 | # Do we want to force the use of the rand helper? |
9825 | 13295 | ||
9826 | # Check whether --with-rand-helper or --without-rand-helper was given. | 13296 | # Check whether --with-rand-helper or --without-rand-helper was given. |
@@ -9831,7 +13301,7 @@ if test "${with_rand_helper+set}" = set; then | |||
9831 | # Force use of OpenSSL's internal RNG, even if | 13301 | # Force use of OpenSSL's internal RNG, even if |
9832 | # the previous test showed it to be unseeded. | 13302 | # the previous test showed it to be unseeded. |
9833 | if test -z "$OPENSSL_SEEDS_ITSELF" ; then | 13303 | if test -z "$OPENSSL_SEEDS_ITSELF" ; then |
9834 | { echo "$as_me:9834: WARNING: *** Forcing use of OpenSSL's non-self-seeding PRNG" >&5 | 13304 | { echo "$as_me:$LINENO: WARNING: *** Forcing use of OpenSSL's non-self-seeding PRNG" >&5 |
9835 | echo "$as_me: WARNING: *** Forcing use of OpenSSL's non-self-seeding PRNG" >&2;} | 13305 | echo "$as_me: WARNING: *** Forcing use of OpenSSL's non-self-seeding PRNG" >&2;} |
9836 | OPENSSL_SEEDS_ITSELF=yes | 13306 | OPENSSL_SEEDS_ITSELF=yes |
9837 | USE_RAND_HELPER="" | 13307 | USE_RAND_HELPER="" |
@@ -9845,9 +13315,9 @@ fi; | |||
9845 | # Which randomness source do we use? | 13315 | # Which randomness source do we use? |
9846 | if test ! -z "$OPENSSL_SEEDS_ITSELF" -a -z "$USE_RAND_HELPER" ; then | 13316 | if test ! -z "$OPENSSL_SEEDS_ITSELF" -a -z "$USE_RAND_HELPER" ; then |
9847 | # OpenSSL only | 13317 | # OpenSSL only |
9848 | cat >>confdefs.h <<\EOF | 13318 | cat >>confdefs.h <<\_ACEOF |
9849 | #define OPENSSL_PRNG_ONLY 1 | 13319 | #define OPENSSL_PRNG_ONLY 1 |
9850 | EOF | 13320 | _ACEOF |
9851 | 13321 | ||
9852 | RAND_MSG="OpenSSL internal ONLY" | 13322 | RAND_MSG="OpenSSL internal ONLY" |
9853 | INSTALL_SSH_RAND_HELPER="" | 13323 | INSTALL_SSH_RAND_HELPER="" |
@@ -9857,6 +13327,7 @@ elif test ! -z "$USE_RAND_HELPER" ; then | |||
9857 | INSTALL_SSH_RAND_HELPER="yes" | 13327 | INSTALL_SSH_RAND_HELPER="yes" |
9858 | fi | 13328 | fi |
9859 | 13329 | ||
13330 | |||
9860 | ### Configuration of ssh-rand-helper | 13331 | ### Configuration of ssh-rand-helper |
9861 | 13332 | ||
9862 | # PRNGD TCP socket | 13333 | # PRNGD TCP socket |
@@ -9872,19 +13343,20 @@ if test "${with_prngd_port+set}" = set; then | |||
9872 | [0-9]*) | 13343 | [0-9]*) |
9873 | ;; | 13344 | ;; |
9874 | *) | 13345 | *) |
9875 | { { echo "$as_me:9875: error: You must specify a numeric port number for --with-prngd-port" >&5 | 13346 | { { echo "$as_me:$LINENO: error: You must specify a numeric port number for --with-prngd-port" >&5 |
9876 | echo "$as_me: error: You must specify a numeric port number for --with-prngd-port" >&2;} | 13347 | echo "$as_me: error: You must specify a numeric port number for --with-prngd-port" >&2;} |
9877 | { (exit 1); exit 1; }; } | 13348 | { (exit 1); exit 1; }; } |
9878 | ;; | 13349 | ;; |
9879 | esac | 13350 | esac |
9880 | if test ! -z "$withval" ; then | 13351 | if test ! -z "$withval" ; then |
9881 | PRNGD_PORT="$withval" | 13352 | PRNGD_PORT="$withval" |
9882 | cat >>confdefs.h <<EOF | 13353 | cat >>confdefs.h <<_ACEOF |
9883 | #define PRNGD_PORT $PRNGD_PORT | 13354 | #define PRNGD_PORT $PRNGD_PORT |
9884 | EOF | 13355 | _ACEOF |
9885 | 13356 | ||
9886 | fi | 13357 | fi |
9887 | 13358 | ||
13359 | |||
9888 | fi; | 13360 | fi; |
9889 | 13361 | ||
9890 | # PRNGD Unix domain socket | 13362 | # PRNGD Unix domain socket |
@@ -9903,7 +13375,7 @@ if test "${with_prngd_socket+set}" = set; then | |||
9903 | /*) | 13375 | /*) |
9904 | ;; | 13376 | ;; |
9905 | *) | 13377 | *) |
9906 | { { echo "$as_me:9906: error: You must specify an absolute path to the entropy socket" >&5 | 13378 | { { echo "$as_me:$LINENO: error: You must specify an absolute path to the entropy socket" >&5 |
9907 | echo "$as_me: error: You must specify an absolute path to the entropy socket" >&2;} | 13379 | echo "$as_me: error: You must specify an absolute path to the entropy socket" >&2;} |
9908 | { (exit 1); exit 1; }; } | 13380 | { (exit 1); exit 1; }; } |
9909 | ;; | 13381 | ;; |
@@ -9911,18 +13383,18 @@ echo "$as_me: error: You must specify an absolute path to the entropy socket" >& | |||
9911 | 13383 | ||
9912 | if test ! -z "$withval" ; then | 13384 | if test ! -z "$withval" ; then |
9913 | if test ! -z "$PRNGD_PORT" ; then | 13385 | if test ! -z "$PRNGD_PORT" ; then |
9914 | { { echo "$as_me:9914: error: You may not specify both a PRNGD/EGD port and socket" >&5 | 13386 | { { echo "$as_me:$LINENO: error: You may not specify both a PRNGD/EGD port and socket" >&5 |
9915 | echo "$as_me: error: You may not specify both a PRNGD/EGD port and socket" >&2;} | 13387 | echo "$as_me: error: You may not specify both a PRNGD/EGD port and socket" >&2;} |
9916 | { (exit 1); exit 1; }; } | 13388 | { (exit 1); exit 1; }; } |
9917 | fi | 13389 | fi |
9918 | if test ! -r "$withval" ; then | 13390 | if test ! -r "$withval" ; then |
9919 | { echo "$as_me:9919: WARNING: Entropy socket is not readable" >&5 | 13391 | { echo "$as_me:$LINENO: WARNING: Entropy socket is not readable" >&5 |
9920 | echo "$as_me: WARNING: Entropy socket is not readable" >&2;} | 13392 | echo "$as_me: WARNING: Entropy socket is not readable" >&2;} |
9921 | fi | 13393 | fi |
9922 | PRNGD_SOCKET="$withval" | 13394 | PRNGD_SOCKET="$withval" |
9923 | cat >>confdefs.h <<EOF | 13395 | cat >>confdefs.h <<_ACEOF |
9924 | #define PRNGD_SOCKET "$PRNGD_SOCKET" | 13396 | #define PRNGD_SOCKET "$PRNGD_SOCKET" |
9925 | EOF | 13397 | _ACEOF |
9926 | 13398 | ||
9927 | fi | 13399 | fi |
9928 | 13400 | ||
@@ -9930,28 +13402,29 @@ else | |||
9930 | 13402 | ||
9931 | # Check for existing socket only if we don't have a random device already | 13403 | # Check for existing socket only if we don't have a random device already |
9932 | if test "$USE_RAND_HELPER" = yes ; then | 13404 | if test "$USE_RAND_HELPER" = yes ; then |
9933 | echo "$as_me:9933: checking for PRNGD/EGD socket" >&5 | 13405 | echo "$as_me:$LINENO: checking for PRNGD/EGD socket" >&5 |
9934 | echo $ECHO_N "checking for PRNGD/EGD socket... $ECHO_C" >&6 | 13406 | echo $ECHO_N "checking for PRNGD/EGD socket... $ECHO_C" >&6 |
9935 | # Insert other locations here | 13407 | # Insert other locations here |
9936 | for sock in /var/run/egd-pool /dev/egd-pool /etc/entropy; do | 13408 | for sock in /var/run/egd-pool /dev/egd-pool /etc/entropy; do |
9937 | if test -r $sock && $TEST_MINUS_S_SH -c "test -S $sock -o -p $sock" ; then | 13409 | if test -r $sock && $TEST_MINUS_S_SH -c "test -S $sock -o -p $sock" ; then |
9938 | PRNGD_SOCKET="$sock" | 13410 | PRNGD_SOCKET="$sock" |
9939 | cat >>confdefs.h <<EOF | 13411 | cat >>confdefs.h <<_ACEOF |
9940 | #define PRNGD_SOCKET "$PRNGD_SOCKET" | 13412 | #define PRNGD_SOCKET "$PRNGD_SOCKET" |
9941 | EOF | 13413 | _ACEOF |
9942 | 13414 | ||
9943 | break; | 13415 | break; |
9944 | fi | 13416 | fi |
9945 | done | 13417 | done |
9946 | if test ! -z "$PRNGD_SOCKET" ; then | 13418 | if test ! -z "$PRNGD_SOCKET" ; then |
9947 | echo "$as_me:9947: result: $PRNGD_SOCKET" >&5 | 13419 | echo "$as_me:$LINENO: result: $PRNGD_SOCKET" >&5 |
9948 | echo "${ECHO_T}$PRNGD_SOCKET" >&6 | 13420 | echo "${ECHO_T}$PRNGD_SOCKET" >&6 |
9949 | else | 13421 | else |
9950 | echo "$as_me:9950: result: not found" >&5 | 13422 | echo "$as_me:$LINENO: result: not found" >&5 |
9951 | echo "${ECHO_T}not found" >&6 | 13423 | echo "${ECHO_T}not found" >&6 |
9952 | fi | 13424 | fi |
9953 | fi | 13425 | fi |
9954 | 13426 | ||
13427 | |||
9955 | fi; | 13428 | fi; |
9956 | 13429 | ||
9957 | # Change default command timeout for hashing entropy source | 13430 | # Change default command timeout for hashing entropy source |
@@ -9965,10 +13438,12 @@ if test "${with_entropy_timeout+set}" = set; then | |||
9965 | entropy_timeout=$withval | 13438 | entropy_timeout=$withval |
9966 | fi | 13439 | fi |
9967 | 13440 | ||
13441 | |||
9968 | fi; | 13442 | fi; |
9969 | cat >>confdefs.h <<EOF | 13443 | cat >>confdefs.h <<_ACEOF |
9970 | #define ENTROPY_TIMEOUT_MSEC $entropy_timeout | 13444 | #define ENTROPY_TIMEOUT_MSEC $entropy_timeout |
9971 | EOF | 13445 | _ACEOF |
13446 | |||
9972 | 13447 | ||
9973 | SSH_PRIVSEP_USER=sshd | 13448 | SSH_PRIVSEP_USER=sshd |
9974 | 13449 | ||
@@ -9980,10 +13455,13 @@ if test "${with_privsep_user+set}" = set; then | |||
9980 | SSH_PRIVSEP_USER=$withval | 13455 | SSH_PRIVSEP_USER=$withval |
9981 | fi | 13456 | fi |
9982 | 13457 | ||
13458 | |||
9983 | fi; | 13459 | fi; |
9984 | cat >>confdefs.h <<EOF | 13460 | cat >>confdefs.h <<_ACEOF |
9985 | #define SSH_PRIVSEP_USER "$SSH_PRIVSEP_USER" | 13461 | #define SSH_PRIVSEP_USER "$SSH_PRIVSEP_USER" |
9986 | EOF | 13462 | _ACEOF |
13463 | |||
13464 | |||
9987 | 13465 | ||
9988 | # We do this little dance with the search path to insure | 13466 | # We do this little dance with the search path to insure |
9989 | # that programs that we select for use by installed programs | 13467 | # that programs that we select for use by installed programs |
@@ -10003,7 +13481,7 @@ PATH=$PATH:/etc:$OPATH | |||
10003 | 13481 | ||
10004 | # Extract the first word of "ls", so it can be a program name with args. | 13482 | # Extract the first word of "ls", so it can be a program name with args. |
10005 | set dummy ls; ac_word=$2 | 13483 | set dummy ls; ac_word=$2 |
10006 | echo "$as_me:10006: checking for $ac_word" >&5 | 13484 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
10007 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 13485 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
10008 | if test "${ac_cv_path_PROG_LS+set}" = set; then | 13486 | if test "${ac_cv_path_PROG_LS+set}" = set; then |
10009 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 13487 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -10013,16 +13491,18 @@ else | |||
10013 | ac_cv_path_PROG_LS="$PROG_LS" # Let the user override the test with a path. | 13491 | ac_cv_path_PROG_LS="$PROG_LS" # Let the user override the test with a path. |
10014 | ;; | 13492 | ;; |
10015 | *) | 13493 | *) |
10016 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 13494 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
10017 | ac_dummy="$PATH" | 13495 | for as_dir in $PATH |
10018 | for ac_dir in $ac_dummy; do | 13496 | do |
10019 | IFS=$ac_save_IFS | 13497 | IFS=$as_save_IFS |
10020 | test -z "$ac_dir" && ac_dir=. | 13498 | test -z "$as_dir" && as_dir=. |
10021 | if $as_executable_p "$ac_dir/$ac_word"; then | 13499 | for ac_exec_ext in '' $ac_executable_extensions; do |
10022 | ac_cv_path_PROG_LS="$ac_dir/$ac_word" | 13500 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
10023 | echo "$as_me:10023: found $ac_dir/$ac_word" >&5 | 13501 | ac_cv_path_PROG_LS="$as_dir/$ac_word$ac_exec_ext" |
10024 | break | 13502 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
10025 | fi | 13503 | break 2 |
13504 | fi | ||
13505 | done | ||
10026 | done | 13506 | done |
10027 | 13507 | ||
10028 | ;; | 13508 | ;; |
@@ -10031,10 +13511,10 @@ fi | |||
10031 | PROG_LS=$ac_cv_path_PROG_LS | 13511 | PROG_LS=$ac_cv_path_PROG_LS |
10032 | 13512 | ||
10033 | if test -n "$PROG_LS"; then | 13513 | if test -n "$PROG_LS"; then |
10034 | echo "$as_me:10034: result: $PROG_LS" >&5 | 13514 | echo "$as_me:$LINENO: result: $PROG_LS" >&5 |
10035 | echo "${ECHO_T}$PROG_LS" >&6 | 13515 | echo "${ECHO_T}$PROG_LS" >&6 |
10036 | else | 13516 | else |
10037 | echo "$as_me:10037: result: no" >&5 | 13517 | echo "$as_me:$LINENO: result: no" >&5 |
10038 | echo "${ECHO_T}no" >&6 | 13518 | echo "${ECHO_T}no" >&6 |
10039 | fi | 13519 | fi |
10040 | 13520 | ||
@@ -10042,9 +13522,11 @@ fi | |||
10042 | PROG_LS="undef" | 13522 | PROG_LS="undef" |
10043 | fi | 13523 | fi |
10044 | 13524 | ||
13525 | |||
13526 | |||
10045 | # Extract the first word of "netstat", so it can be a program name with args. | 13527 | # Extract the first word of "netstat", so it can be a program name with args. |
10046 | set dummy netstat; ac_word=$2 | 13528 | set dummy netstat; ac_word=$2 |
10047 | echo "$as_me:10047: checking for $ac_word" >&5 | 13529 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
10048 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 13530 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
10049 | if test "${ac_cv_path_PROG_NETSTAT+set}" = set; then | 13531 | if test "${ac_cv_path_PROG_NETSTAT+set}" = set; then |
10050 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 13532 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -10054,16 +13536,18 @@ else | |||
10054 | ac_cv_path_PROG_NETSTAT="$PROG_NETSTAT" # Let the user override the test with a path. | 13536 | ac_cv_path_PROG_NETSTAT="$PROG_NETSTAT" # Let the user override the test with a path. |
10055 | ;; | 13537 | ;; |
10056 | *) | 13538 | *) |
10057 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 13539 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
10058 | ac_dummy="$PATH" | 13540 | for as_dir in $PATH |
10059 | for ac_dir in $ac_dummy; do | 13541 | do |
10060 | IFS=$ac_save_IFS | 13542 | IFS=$as_save_IFS |
10061 | test -z "$ac_dir" && ac_dir=. | 13543 | test -z "$as_dir" && as_dir=. |
10062 | if $as_executable_p "$ac_dir/$ac_word"; then | 13544 | for ac_exec_ext in '' $ac_executable_extensions; do |
10063 | ac_cv_path_PROG_NETSTAT="$ac_dir/$ac_word" | 13545 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
10064 | echo "$as_me:10064: found $ac_dir/$ac_word" >&5 | 13546 | ac_cv_path_PROG_NETSTAT="$as_dir/$ac_word$ac_exec_ext" |
10065 | break | 13547 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
10066 | fi | 13548 | break 2 |
13549 | fi | ||
13550 | done | ||
10067 | done | 13551 | done |
10068 | 13552 | ||
10069 | ;; | 13553 | ;; |
@@ -10072,10 +13556,10 @@ fi | |||
10072 | PROG_NETSTAT=$ac_cv_path_PROG_NETSTAT | 13556 | PROG_NETSTAT=$ac_cv_path_PROG_NETSTAT |
10073 | 13557 | ||
10074 | if test -n "$PROG_NETSTAT"; then | 13558 | if test -n "$PROG_NETSTAT"; then |
10075 | echo "$as_me:10075: result: $PROG_NETSTAT" >&5 | 13559 | echo "$as_me:$LINENO: result: $PROG_NETSTAT" >&5 |
10076 | echo "${ECHO_T}$PROG_NETSTAT" >&6 | 13560 | echo "${ECHO_T}$PROG_NETSTAT" >&6 |
10077 | else | 13561 | else |
10078 | echo "$as_me:10078: result: no" >&5 | 13562 | echo "$as_me:$LINENO: result: no" >&5 |
10079 | echo "${ECHO_T}no" >&6 | 13563 | echo "${ECHO_T}no" >&6 |
10080 | fi | 13564 | fi |
10081 | 13565 | ||
@@ -10083,9 +13567,11 @@ fi | |||
10083 | PROG_NETSTAT="undef" | 13567 | PROG_NETSTAT="undef" |
10084 | fi | 13568 | fi |
10085 | 13569 | ||
13570 | |||
13571 | |||
10086 | # Extract the first word of "arp", so it can be a program name with args. | 13572 | # Extract the first word of "arp", so it can be a program name with args. |
10087 | set dummy arp; ac_word=$2 | 13573 | set dummy arp; ac_word=$2 |
10088 | echo "$as_me:10088: checking for $ac_word" >&5 | 13574 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
10089 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 13575 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
10090 | if test "${ac_cv_path_PROG_ARP+set}" = set; then | 13576 | if test "${ac_cv_path_PROG_ARP+set}" = set; then |
10091 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 13577 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -10095,16 +13581,18 @@ else | |||
10095 | ac_cv_path_PROG_ARP="$PROG_ARP" # Let the user override the test with a path. | 13581 | ac_cv_path_PROG_ARP="$PROG_ARP" # Let the user override the test with a path. |
10096 | ;; | 13582 | ;; |
10097 | *) | 13583 | *) |
10098 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 13584 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
10099 | ac_dummy="$PATH" | 13585 | for as_dir in $PATH |
10100 | for ac_dir in $ac_dummy; do | 13586 | do |
10101 | IFS=$ac_save_IFS | 13587 | IFS=$as_save_IFS |
10102 | test -z "$ac_dir" && ac_dir=. | 13588 | test -z "$as_dir" && as_dir=. |
10103 | if $as_executable_p "$ac_dir/$ac_word"; then | 13589 | for ac_exec_ext in '' $ac_executable_extensions; do |
10104 | ac_cv_path_PROG_ARP="$ac_dir/$ac_word" | 13590 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
10105 | echo "$as_me:10105: found $ac_dir/$ac_word" >&5 | 13591 | ac_cv_path_PROG_ARP="$as_dir/$ac_word$ac_exec_ext" |
10106 | break | 13592 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
10107 | fi | 13593 | break 2 |
13594 | fi | ||
13595 | done | ||
10108 | done | 13596 | done |
10109 | 13597 | ||
10110 | ;; | 13598 | ;; |
@@ -10113,10 +13601,10 @@ fi | |||
10113 | PROG_ARP=$ac_cv_path_PROG_ARP | 13601 | PROG_ARP=$ac_cv_path_PROG_ARP |
10114 | 13602 | ||
10115 | if test -n "$PROG_ARP"; then | 13603 | if test -n "$PROG_ARP"; then |
10116 | echo "$as_me:10116: result: $PROG_ARP" >&5 | 13604 | echo "$as_me:$LINENO: result: $PROG_ARP" >&5 |
10117 | echo "${ECHO_T}$PROG_ARP" >&6 | 13605 | echo "${ECHO_T}$PROG_ARP" >&6 |
10118 | else | 13606 | else |
10119 | echo "$as_me:10119: result: no" >&5 | 13607 | echo "$as_me:$LINENO: result: no" >&5 |
10120 | echo "${ECHO_T}no" >&6 | 13608 | echo "${ECHO_T}no" >&6 |
10121 | fi | 13609 | fi |
10122 | 13610 | ||
@@ -10124,9 +13612,11 @@ fi | |||
10124 | PROG_ARP="undef" | 13612 | PROG_ARP="undef" |
10125 | fi | 13613 | fi |
10126 | 13614 | ||
13615 | |||
13616 | |||
10127 | # Extract the first word of "ifconfig", so it can be a program name with args. | 13617 | # Extract the first word of "ifconfig", so it can be a program name with args. |
10128 | set dummy ifconfig; ac_word=$2 | 13618 | set dummy ifconfig; ac_word=$2 |
10129 | echo "$as_me:10129: checking for $ac_word" >&5 | 13619 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
10130 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 13620 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
10131 | if test "${ac_cv_path_PROG_IFCONFIG+set}" = set; then | 13621 | if test "${ac_cv_path_PROG_IFCONFIG+set}" = set; then |
10132 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 13622 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -10136,16 +13626,18 @@ else | |||
10136 | ac_cv_path_PROG_IFCONFIG="$PROG_IFCONFIG" # Let the user override the test with a path. | 13626 | ac_cv_path_PROG_IFCONFIG="$PROG_IFCONFIG" # Let the user override the test with a path. |
10137 | ;; | 13627 | ;; |
10138 | *) | 13628 | *) |
10139 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 13629 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
10140 | ac_dummy="$PATH" | 13630 | for as_dir in $PATH |
10141 | for ac_dir in $ac_dummy; do | 13631 | do |
10142 | IFS=$ac_save_IFS | 13632 | IFS=$as_save_IFS |
10143 | test -z "$ac_dir" && ac_dir=. | 13633 | test -z "$as_dir" && as_dir=. |
10144 | if $as_executable_p "$ac_dir/$ac_word"; then | 13634 | for ac_exec_ext in '' $ac_executable_extensions; do |
10145 | ac_cv_path_PROG_IFCONFIG="$ac_dir/$ac_word" | 13635 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
10146 | echo "$as_me:10146: found $ac_dir/$ac_word" >&5 | 13636 | ac_cv_path_PROG_IFCONFIG="$as_dir/$ac_word$ac_exec_ext" |
10147 | break | 13637 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
10148 | fi | 13638 | break 2 |
13639 | fi | ||
13640 | done | ||
10149 | done | 13641 | done |
10150 | 13642 | ||
10151 | ;; | 13643 | ;; |
@@ -10154,10 +13646,10 @@ fi | |||
10154 | PROG_IFCONFIG=$ac_cv_path_PROG_IFCONFIG | 13646 | PROG_IFCONFIG=$ac_cv_path_PROG_IFCONFIG |
10155 | 13647 | ||
10156 | if test -n "$PROG_IFCONFIG"; then | 13648 | if test -n "$PROG_IFCONFIG"; then |
10157 | echo "$as_me:10157: result: $PROG_IFCONFIG" >&5 | 13649 | echo "$as_me:$LINENO: result: $PROG_IFCONFIG" >&5 |
10158 | echo "${ECHO_T}$PROG_IFCONFIG" >&6 | 13650 | echo "${ECHO_T}$PROG_IFCONFIG" >&6 |
10159 | else | 13651 | else |
10160 | echo "$as_me:10160: result: no" >&5 | 13652 | echo "$as_me:$LINENO: result: no" >&5 |
10161 | echo "${ECHO_T}no" >&6 | 13653 | echo "${ECHO_T}no" >&6 |
10162 | fi | 13654 | fi |
10163 | 13655 | ||
@@ -10165,9 +13657,11 @@ fi | |||
10165 | PROG_IFCONFIG="undef" | 13657 | PROG_IFCONFIG="undef" |
10166 | fi | 13658 | fi |
10167 | 13659 | ||
13660 | |||
13661 | |||
10168 | # Extract the first word of "jstat", so it can be a program name with args. | 13662 | # Extract the first word of "jstat", so it can be a program name with args. |
10169 | set dummy jstat; ac_word=$2 | 13663 | set dummy jstat; ac_word=$2 |
10170 | echo "$as_me:10170: checking for $ac_word" >&5 | 13664 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
10171 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 13665 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
10172 | if test "${ac_cv_path_PROG_JSTAT+set}" = set; then | 13666 | if test "${ac_cv_path_PROG_JSTAT+set}" = set; then |
10173 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 13667 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -10177,16 +13671,18 @@ else | |||
10177 | ac_cv_path_PROG_JSTAT="$PROG_JSTAT" # Let the user override the test with a path. | 13671 | ac_cv_path_PROG_JSTAT="$PROG_JSTAT" # Let the user override the test with a path. |
10178 | ;; | 13672 | ;; |
10179 | *) | 13673 | *) |
10180 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 13674 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
10181 | ac_dummy="$PATH" | 13675 | for as_dir in $PATH |
10182 | for ac_dir in $ac_dummy; do | 13676 | do |
10183 | IFS=$ac_save_IFS | 13677 | IFS=$as_save_IFS |
10184 | test -z "$ac_dir" && ac_dir=. | 13678 | test -z "$as_dir" && as_dir=. |
10185 | if $as_executable_p "$ac_dir/$ac_word"; then | 13679 | for ac_exec_ext in '' $ac_executable_extensions; do |
10186 | ac_cv_path_PROG_JSTAT="$ac_dir/$ac_word" | 13680 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
10187 | echo "$as_me:10187: found $ac_dir/$ac_word" >&5 | 13681 | ac_cv_path_PROG_JSTAT="$as_dir/$ac_word$ac_exec_ext" |
10188 | break | 13682 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
10189 | fi | 13683 | break 2 |
13684 | fi | ||
13685 | done | ||
10190 | done | 13686 | done |
10191 | 13687 | ||
10192 | ;; | 13688 | ;; |
@@ -10195,10 +13691,10 @@ fi | |||
10195 | PROG_JSTAT=$ac_cv_path_PROG_JSTAT | 13691 | PROG_JSTAT=$ac_cv_path_PROG_JSTAT |
10196 | 13692 | ||
10197 | if test -n "$PROG_JSTAT"; then | 13693 | if test -n "$PROG_JSTAT"; then |
10198 | echo "$as_me:10198: result: $PROG_JSTAT" >&5 | 13694 | echo "$as_me:$LINENO: result: $PROG_JSTAT" >&5 |
10199 | echo "${ECHO_T}$PROG_JSTAT" >&6 | 13695 | echo "${ECHO_T}$PROG_JSTAT" >&6 |
10200 | else | 13696 | else |
10201 | echo "$as_me:10201: result: no" >&5 | 13697 | echo "$as_me:$LINENO: result: no" >&5 |
10202 | echo "${ECHO_T}no" >&6 | 13698 | echo "${ECHO_T}no" >&6 |
10203 | fi | 13699 | fi |
10204 | 13700 | ||
@@ -10206,9 +13702,11 @@ fi | |||
10206 | PROG_JSTAT="undef" | 13702 | PROG_JSTAT="undef" |
10207 | fi | 13703 | fi |
10208 | 13704 | ||
13705 | |||
13706 | |||
10209 | # Extract the first word of "ps", so it can be a program name with args. | 13707 | # Extract the first word of "ps", so it can be a program name with args. |
10210 | set dummy ps; ac_word=$2 | 13708 | set dummy ps; ac_word=$2 |
10211 | echo "$as_me:10211: checking for $ac_word" >&5 | 13709 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
10212 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 13710 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
10213 | if test "${ac_cv_path_PROG_PS+set}" = set; then | 13711 | if test "${ac_cv_path_PROG_PS+set}" = set; then |
10214 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 13712 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -10218,16 +13716,18 @@ else | |||
10218 | ac_cv_path_PROG_PS="$PROG_PS" # Let the user override the test with a path. | 13716 | ac_cv_path_PROG_PS="$PROG_PS" # Let the user override the test with a path. |
10219 | ;; | 13717 | ;; |
10220 | *) | 13718 | *) |
10221 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 13719 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
10222 | ac_dummy="$PATH" | 13720 | for as_dir in $PATH |
10223 | for ac_dir in $ac_dummy; do | 13721 | do |
10224 | IFS=$ac_save_IFS | 13722 | IFS=$as_save_IFS |
10225 | test -z "$ac_dir" && ac_dir=. | 13723 | test -z "$as_dir" && as_dir=. |
10226 | if $as_executable_p "$ac_dir/$ac_word"; then | 13724 | for ac_exec_ext in '' $ac_executable_extensions; do |
10227 | ac_cv_path_PROG_PS="$ac_dir/$ac_word" | 13725 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
10228 | echo "$as_me:10228: found $ac_dir/$ac_word" >&5 | 13726 | ac_cv_path_PROG_PS="$as_dir/$ac_word$ac_exec_ext" |
10229 | break | 13727 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
10230 | fi | 13728 | break 2 |
13729 | fi | ||
13730 | done | ||
10231 | done | 13731 | done |
10232 | 13732 | ||
10233 | ;; | 13733 | ;; |
@@ -10236,10 +13736,10 @@ fi | |||
10236 | PROG_PS=$ac_cv_path_PROG_PS | 13736 | PROG_PS=$ac_cv_path_PROG_PS |
10237 | 13737 | ||
10238 | if test -n "$PROG_PS"; then | 13738 | if test -n "$PROG_PS"; then |
10239 | echo "$as_me:10239: result: $PROG_PS" >&5 | 13739 | echo "$as_me:$LINENO: result: $PROG_PS" >&5 |
10240 | echo "${ECHO_T}$PROG_PS" >&6 | 13740 | echo "${ECHO_T}$PROG_PS" >&6 |
10241 | else | 13741 | else |
10242 | echo "$as_me:10242: result: no" >&5 | 13742 | echo "$as_me:$LINENO: result: no" >&5 |
10243 | echo "${ECHO_T}no" >&6 | 13743 | echo "${ECHO_T}no" >&6 |
10244 | fi | 13744 | fi |
10245 | 13745 | ||
@@ -10247,9 +13747,11 @@ fi | |||
10247 | PROG_PS="undef" | 13747 | PROG_PS="undef" |
10248 | fi | 13748 | fi |
10249 | 13749 | ||
13750 | |||
13751 | |||
10250 | # Extract the first word of "sar", so it can be a program name with args. | 13752 | # Extract the first word of "sar", so it can be a program name with args. |
10251 | set dummy sar; ac_word=$2 | 13753 | set dummy sar; ac_word=$2 |
10252 | echo "$as_me:10252: checking for $ac_word" >&5 | 13754 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
10253 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 13755 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
10254 | if test "${ac_cv_path_PROG_SAR+set}" = set; then | 13756 | if test "${ac_cv_path_PROG_SAR+set}" = set; then |
10255 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 13757 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -10259,16 +13761,18 @@ else | |||
10259 | ac_cv_path_PROG_SAR="$PROG_SAR" # Let the user override the test with a path. | 13761 | ac_cv_path_PROG_SAR="$PROG_SAR" # Let the user override the test with a path. |
10260 | ;; | 13762 | ;; |
10261 | *) | 13763 | *) |
10262 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 13764 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
10263 | ac_dummy="$PATH" | 13765 | for as_dir in $PATH |
10264 | for ac_dir in $ac_dummy; do | 13766 | do |
10265 | IFS=$ac_save_IFS | 13767 | IFS=$as_save_IFS |
10266 | test -z "$ac_dir" && ac_dir=. | 13768 | test -z "$as_dir" && as_dir=. |
10267 | if $as_executable_p "$ac_dir/$ac_word"; then | 13769 | for ac_exec_ext in '' $ac_executable_extensions; do |
10268 | ac_cv_path_PROG_SAR="$ac_dir/$ac_word" | 13770 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
10269 | echo "$as_me:10269: found $ac_dir/$ac_word" >&5 | 13771 | ac_cv_path_PROG_SAR="$as_dir/$ac_word$ac_exec_ext" |
10270 | break | 13772 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
10271 | fi | 13773 | break 2 |
13774 | fi | ||
13775 | done | ||
10272 | done | 13776 | done |
10273 | 13777 | ||
10274 | ;; | 13778 | ;; |
@@ -10277,10 +13781,10 @@ fi | |||
10277 | PROG_SAR=$ac_cv_path_PROG_SAR | 13781 | PROG_SAR=$ac_cv_path_PROG_SAR |
10278 | 13782 | ||
10279 | if test -n "$PROG_SAR"; then | 13783 | if test -n "$PROG_SAR"; then |
10280 | echo "$as_me:10280: result: $PROG_SAR" >&5 | 13784 | echo "$as_me:$LINENO: result: $PROG_SAR" >&5 |
10281 | echo "${ECHO_T}$PROG_SAR" >&6 | 13785 | echo "${ECHO_T}$PROG_SAR" >&6 |
10282 | else | 13786 | else |
10283 | echo "$as_me:10283: result: no" >&5 | 13787 | echo "$as_me:$LINENO: result: no" >&5 |
10284 | echo "${ECHO_T}no" >&6 | 13788 | echo "${ECHO_T}no" >&6 |
10285 | fi | 13789 | fi |
10286 | 13790 | ||
@@ -10288,9 +13792,11 @@ fi | |||
10288 | PROG_SAR="undef" | 13792 | PROG_SAR="undef" |
10289 | fi | 13793 | fi |
10290 | 13794 | ||
13795 | |||
13796 | |||
10291 | # Extract the first word of "w", so it can be a program name with args. | 13797 | # Extract the first word of "w", so it can be a program name with args. |
10292 | set dummy w; ac_word=$2 | 13798 | set dummy w; ac_word=$2 |
10293 | echo "$as_me:10293: checking for $ac_word" >&5 | 13799 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
10294 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 13800 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
10295 | if test "${ac_cv_path_PROG_W+set}" = set; then | 13801 | if test "${ac_cv_path_PROG_W+set}" = set; then |
10296 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 13802 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -10300,16 +13806,18 @@ else | |||
10300 | ac_cv_path_PROG_W="$PROG_W" # Let the user override the test with a path. | 13806 | ac_cv_path_PROG_W="$PROG_W" # Let the user override the test with a path. |
10301 | ;; | 13807 | ;; |
10302 | *) | 13808 | *) |
10303 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 13809 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
10304 | ac_dummy="$PATH" | 13810 | for as_dir in $PATH |
10305 | for ac_dir in $ac_dummy; do | 13811 | do |
10306 | IFS=$ac_save_IFS | 13812 | IFS=$as_save_IFS |
10307 | test -z "$ac_dir" && ac_dir=. | 13813 | test -z "$as_dir" && as_dir=. |
10308 | if $as_executable_p "$ac_dir/$ac_word"; then | 13814 | for ac_exec_ext in '' $ac_executable_extensions; do |
10309 | ac_cv_path_PROG_W="$ac_dir/$ac_word" | 13815 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
10310 | echo "$as_me:10310: found $ac_dir/$ac_word" >&5 | 13816 | ac_cv_path_PROG_W="$as_dir/$ac_word$ac_exec_ext" |
10311 | break | 13817 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
10312 | fi | 13818 | break 2 |
13819 | fi | ||
13820 | done | ||
10313 | done | 13821 | done |
10314 | 13822 | ||
10315 | ;; | 13823 | ;; |
@@ -10318,10 +13826,10 @@ fi | |||
10318 | PROG_W=$ac_cv_path_PROG_W | 13826 | PROG_W=$ac_cv_path_PROG_W |
10319 | 13827 | ||
10320 | if test -n "$PROG_W"; then | 13828 | if test -n "$PROG_W"; then |
10321 | echo "$as_me:10321: result: $PROG_W" >&5 | 13829 | echo "$as_me:$LINENO: result: $PROG_W" >&5 |
10322 | echo "${ECHO_T}$PROG_W" >&6 | 13830 | echo "${ECHO_T}$PROG_W" >&6 |
10323 | else | 13831 | else |
10324 | echo "$as_me:10324: result: no" >&5 | 13832 | echo "$as_me:$LINENO: result: no" >&5 |
10325 | echo "${ECHO_T}no" >&6 | 13833 | echo "${ECHO_T}no" >&6 |
10326 | fi | 13834 | fi |
10327 | 13835 | ||
@@ -10329,9 +13837,11 @@ fi | |||
10329 | PROG_W="undef" | 13837 | PROG_W="undef" |
10330 | fi | 13838 | fi |
10331 | 13839 | ||
13840 | |||
13841 | |||
10332 | # Extract the first word of "who", so it can be a program name with args. | 13842 | # Extract the first word of "who", so it can be a program name with args. |
10333 | set dummy who; ac_word=$2 | 13843 | set dummy who; ac_word=$2 |
10334 | echo "$as_me:10334: checking for $ac_word" >&5 | 13844 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
10335 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 13845 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
10336 | if test "${ac_cv_path_PROG_WHO+set}" = set; then | 13846 | if test "${ac_cv_path_PROG_WHO+set}" = set; then |
10337 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 13847 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -10341,16 +13851,18 @@ else | |||
10341 | ac_cv_path_PROG_WHO="$PROG_WHO" # Let the user override the test with a path. | 13851 | ac_cv_path_PROG_WHO="$PROG_WHO" # Let the user override the test with a path. |
10342 | ;; | 13852 | ;; |
10343 | *) | 13853 | *) |
10344 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 13854 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
10345 | ac_dummy="$PATH" | 13855 | for as_dir in $PATH |
10346 | for ac_dir in $ac_dummy; do | 13856 | do |
10347 | IFS=$ac_save_IFS | 13857 | IFS=$as_save_IFS |
10348 | test -z "$ac_dir" && ac_dir=. | 13858 | test -z "$as_dir" && as_dir=. |
10349 | if $as_executable_p "$ac_dir/$ac_word"; then | 13859 | for ac_exec_ext in '' $ac_executable_extensions; do |
10350 | ac_cv_path_PROG_WHO="$ac_dir/$ac_word" | 13860 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
10351 | echo "$as_me:10351: found $ac_dir/$ac_word" >&5 | 13861 | ac_cv_path_PROG_WHO="$as_dir/$ac_word$ac_exec_ext" |
10352 | break | 13862 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
10353 | fi | 13863 | break 2 |
13864 | fi | ||
13865 | done | ||
10354 | done | 13866 | done |
10355 | 13867 | ||
10356 | ;; | 13868 | ;; |
@@ -10359,10 +13871,10 @@ fi | |||
10359 | PROG_WHO=$ac_cv_path_PROG_WHO | 13871 | PROG_WHO=$ac_cv_path_PROG_WHO |
10360 | 13872 | ||
10361 | if test -n "$PROG_WHO"; then | 13873 | if test -n "$PROG_WHO"; then |
10362 | echo "$as_me:10362: result: $PROG_WHO" >&5 | 13874 | echo "$as_me:$LINENO: result: $PROG_WHO" >&5 |
10363 | echo "${ECHO_T}$PROG_WHO" >&6 | 13875 | echo "${ECHO_T}$PROG_WHO" >&6 |
10364 | else | 13876 | else |
10365 | echo "$as_me:10365: result: no" >&5 | 13877 | echo "$as_me:$LINENO: result: no" >&5 |
10366 | echo "${ECHO_T}no" >&6 | 13878 | echo "${ECHO_T}no" >&6 |
10367 | fi | 13879 | fi |
10368 | 13880 | ||
@@ -10370,9 +13882,11 @@ fi | |||
10370 | PROG_WHO="undef" | 13882 | PROG_WHO="undef" |
10371 | fi | 13883 | fi |
10372 | 13884 | ||
13885 | |||
13886 | |||
10373 | # Extract the first word of "last", so it can be a program name with args. | 13887 | # Extract the first word of "last", so it can be a program name with args. |
10374 | set dummy last; ac_word=$2 | 13888 | set dummy last; ac_word=$2 |
10375 | echo "$as_me:10375: checking for $ac_word" >&5 | 13889 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
10376 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 13890 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
10377 | if test "${ac_cv_path_PROG_LAST+set}" = set; then | 13891 | if test "${ac_cv_path_PROG_LAST+set}" = set; then |
10378 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 13892 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -10382,16 +13896,18 @@ else | |||
10382 | ac_cv_path_PROG_LAST="$PROG_LAST" # Let the user override the test with a path. | 13896 | ac_cv_path_PROG_LAST="$PROG_LAST" # Let the user override the test with a path. |
10383 | ;; | 13897 | ;; |
10384 | *) | 13898 | *) |
10385 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 13899 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
10386 | ac_dummy="$PATH" | 13900 | for as_dir in $PATH |
10387 | for ac_dir in $ac_dummy; do | 13901 | do |
10388 | IFS=$ac_save_IFS | 13902 | IFS=$as_save_IFS |
10389 | test -z "$ac_dir" && ac_dir=. | 13903 | test -z "$as_dir" && as_dir=. |
10390 | if $as_executable_p "$ac_dir/$ac_word"; then | 13904 | for ac_exec_ext in '' $ac_executable_extensions; do |
10391 | ac_cv_path_PROG_LAST="$ac_dir/$ac_word" | 13905 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
10392 | echo "$as_me:10392: found $ac_dir/$ac_word" >&5 | 13906 | ac_cv_path_PROG_LAST="$as_dir/$ac_word$ac_exec_ext" |
10393 | break | 13907 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
10394 | fi | 13908 | break 2 |
13909 | fi | ||
13910 | done | ||
10395 | done | 13911 | done |
10396 | 13912 | ||
10397 | ;; | 13913 | ;; |
@@ -10400,10 +13916,10 @@ fi | |||
10400 | PROG_LAST=$ac_cv_path_PROG_LAST | 13916 | PROG_LAST=$ac_cv_path_PROG_LAST |
10401 | 13917 | ||
10402 | if test -n "$PROG_LAST"; then | 13918 | if test -n "$PROG_LAST"; then |
10403 | echo "$as_me:10403: result: $PROG_LAST" >&5 | 13919 | echo "$as_me:$LINENO: result: $PROG_LAST" >&5 |
10404 | echo "${ECHO_T}$PROG_LAST" >&6 | 13920 | echo "${ECHO_T}$PROG_LAST" >&6 |
10405 | else | 13921 | else |
10406 | echo "$as_me:10406: result: no" >&5 | 13922 | echo "$as_me:$LINENO: result: no" >&5 |
10407 | echo "${ECHO_T}no" >&6 | 13923 | echo "${ECHO_T}no" >&6 |
10408 | fi | 13924 | fi |
10409 | 13925 | ||
@@ -10411,9 +13927,11 @@ fi | |||
10411 | PROG_LAST="undef" | 13927 | PROG_LAST="undef" |
10412 | fi | 13928 | fi |
10413 | 13929 | ||
13930 | |||
13931 | |||
10414 | # Extract the first word of "lastlog", so it can be a program name with args. | 13932 | # Extract the first word of "lastlog", so it can be a program name with args. |
10415 | set dummy lastlog; ac_word=$2 | 13933 | set dummy lastlog; ac_word=$2 |
10416 | echo "$as_me:10416: checking for $ac_word" >&5 | 13934 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
10417 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 13935 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
10418 | if test "${ac_cv_path_PROG_LASTLOG+set}" = set; then | 13936 | if test "${ac_cv_path_PROG_LASTLOG+set}" = set; then |
10419 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 13937 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -10423,16 +13941,18 @@ else | |||
10423 | ac_cv_path_PROG_LASTLOG="$PROG_LASTLOG" # Let the user override the test with a path. | 13941 | ac_cv_path_PROG_LASTLOG="$PROG_LASTLOG" # Let the user override the test with a path. |
10424 | ;; | 13942 | ;; |
10425 | *) | 13943 | *) |
10426 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 13944 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
10427 | ac_dummy="$PATH" | 13945 | for as_dir in $PATH |
10428 | for ac_dir in $ac_dummy; do | 13946 | do |
10429 | IFS=$ac_save_IFS | 13947 | IFS=$as_save_IFS |
10430 | test -z "$ac_dir" && ac_dir=. | 13948 | test -z "$as_dir" && as_dir=. |
10431 | if $as_executable_p "$ac_dir/$ac_word"; then | 13949 | for ac_exec_ext in '' $ac_executable_extensions; do |
10432 | ac_cv_path_PROG_LASTLOG="$ac_dir/$ac_word" | 13950 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
10433 | echo "$as_me:10433: found $ac_dir/$ac_word" >&5 | 13951 | ac_cv_path_PROG_LASTLOG="$as_dir/$ac_word$ac_exec_ext" |
10434 | break | 13952 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
10435 | fi | 13953 | break 2 |
13954 | fi | ||
13955 | done | ||
10436 | done | 13956 | done |
10437 | 13957 | ||
10438 | ;; | 13958 | ;; |
@@ -10441,10 +13961,10 @@ fi | |||
10441 | PROG_LASTLOG=$ac_cv_path_PROG_LASTLOG | 13961 | PROG_LASTLOG=$ac_cv_path_PROG_LASTLOG |
10442 | 13962 | ||
10443 | if test -n "$PROG_LASTLOG"; then | 13963 | if test -n "$PROG_LASTLOG"; then |
10444 | echo "$as_me:10444: result: $PROG_LASTLOG" >&5 | 13964 | echo "$as_me:$LINENO: result: $PROG_LASTLOG" >&5 |
10445 | echo "${ECHO_T}$PROG_LASTLOG" >&6 | 13965 | echo "${ECHO_T}$PROG_LASTLOG" >&6 |
10446 | else | 13966 | else |
10447 | echo "$as_me:10447: result: no" >&5 | 13967 | echo "$as_me:$LINENO: result: no" >&5 |
10448 | echo "${ECHO_T}no" >&6 | 13968 | echo "${ECHO_T}no" >&6 |
10449 | fi | 13969 | fi |
10450 | 13970 | ||
@@ -10452,9 +13972,11 @@ fi | |||
10452 | PROG_LASTLOG="undef" | 13972 | PROG_LASTLOG="undef" |
10453 | fi | 13973 | fi |
10454 | 13974 | ||
13975 | |||
13976 | |||
10455 | # Extract the first word of "df", so it can be a program name with args. | 13977 | # Extract the first word of "df", so it can be a program name with args. |
10456 | set dummy df; ac_word=$2 | 13978 | set dummy df; ac_word=$2 |
10457 | echo "$as_me:10457: checking for $ac_word" >&5 | 13979 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
10458 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 13980 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
10459 | if test "${ac_cv_path_PROG_DF+set}" = set; then | 13981 | if test "${ac_cv_path_PROG_DF+set}" = set; then |
10460 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 13982 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -10464,16 +13986,18 @@ else | |||
10464 | ac_cv_path_PROG_DF="$PROG_DF" # Let the user override the test with a path. | 13986 | ac_cv_path_PROG_DF="$PROG_DF" # Let the user override the test with a path. |
10465 | ;; | 13987 | ;; |
10466 | *) | 13988 | *) |
10467 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 13989 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
10468 | ac_dummy="$PATH" | 13990 | for as_dir in $PATH |
10469 | for ac_dir in $ac_dummy; do | 13991 | do |
10470 | IFS=$ac_save_IFS | 13992 | IFS=$as_save_IFS |
10471 | test -z "$ac_dir" && ac_dir=. | 13993 | test -z "$as_dir" && as_dir=. |
10472 | if $as_executable_p "$ac_dir/$ac_word"; then | 13994 | for ac_exec_ext in '' $ac_executable_extensions; do |
10473 | ac_cv_path_PROG_DF="$ac_dir/$ac_word" | 13995 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
10474 | echo "$as_me:10474: found $ac_dir/$ac_word" >&5 | 13996 | ac_cv_path_PROG_DF="$as_dir/$ac_word$ac_exec_ext" |
10475 | break | 13997 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
10476 | fi | 13998 | break 2 |
13999 | fi | ||
14000 | done | ||
10477 | done | 14001 | done |
10478 | 14002 | ||
10479 | ;; | 14003 | ;; |
@@ -10482,10 +14006,10 @@ fi | |||
10482 | PROG_DF=$ac_cv_path_PROG_DF | 14006 | PROG_DF=$ac_cv_path_PROG_DF |
10483 | 14007 | ||
10484 | if test -n "$PROG_DF"; then | 14008 | if test -n "$PROG_DF"; then |
10485 | echo "$as_me:10485: result: $PROG_DF" >&5 | 14009 | echo "$as_me:$LINENO: result: $PROG_DF" >&5 |
10486 | echo "${ECHO_T}$PROG_DF" >&6 | 14010 | echo "${ECHO_T}$PROG_DF" >&6 |
10487 | else | 14011 | else |
10488 | echo "$as_me:10488: result: no" >&5 | 14012 | echo "$as_me:$LINENO: result: no" >&5 |
10489 | echo "${ECHO_T}no" >&6 | 14013 | echo "${ECHO_T}no" >&6 |
10490 | fi | 14014 | fi |
10491 | 14015 | ||
@@ -10493,9 +14017,11 @@ fi | |||
10493 | PROG_DF="undef" | 14017 | PROG_DF="undef" |
10494 | fi | 14018 | fi |
10495 | 14019 | ||
14020 | |||
14021 | |||
10496 | # Extract the first word of "vmstat", so it can be a program name with args. | 14022 | # Extract the first word of "vmstat", so it can be a program name with args. |
10497 | set dummy vmstat; ac_word=$2 | 14023 | set dummy vmstat; ac_word=$2 |
10498 | echo "$as_me:10498: checking for $ac_word" >&5 | 14024 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
10499 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 14025 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
10500 | if test "${ac_cv_path_PROG_VMSTAT+set}" = set; then | 14026 | if test "${ac_cv_path_PROG_VMSTAT+set}" = set; then |
10501 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 14027 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -10505,16 +14031,18 @@ else | |||
10505 | ac_cv_path_PROG_VMSTAT="$PROG_VMSTAT" # Let the user override the test with a path. | 14031 | ac_cv_path_PROG_VMSTAT="$PROG_VMSTAT" # Let the user override the test with a path. |
10506 | ;; | 14032 | ;; |
10507 | *) | 14033 | *) |
10508 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 14034 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
10509 | ac_dummy="$PATH" | 14035 | for as_dir in $PATH |
10510 | for ac_dir in $ac_dummy; do | 14036 | do |
10511 | IFS=$ac_save_IFS | 14037 | IFS=$as_save_IFS |
10512 | test -z "$ac_dir" && ac_dir=. | 14038 | test -z "$as_dir" && as_dir=. |
10513 | if $as_executable_p "$ac_dir/$ac_word"; then | 14039 | for ac_exec_ext in '' $ac_executable_extensions; do |
10514 | ac_cv_path_PROG_VMSTAT="$ac_dir/$ac_word" | 14040 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
10515 | echo "$as_me:10515: found $ac_dir/$ac_word" >&5 | 14041 | ac_cv_path_PROG_VMSTAT="$as_dir/$ac_word$ac_exec_ext" |
10516 | break | 14042 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
10517 | fi | 14043 | break 2 |
14044 | fi | ||
14045 | done | ||
10518 | done | 14046 | done |
10519 | 14047 | ||
10520 | ;; | 14048 | ;; |
@@ -10523,10 +14051,10 @@ fi | |||
10523 | PROG_VMSTAT=$ac_cv_path_PROG_VMSTAT | 14051 | PROG_VMSTAT=$ac_cv_path_PROG_VMSTAT |
10524 | 14052 | ||
10525 | if test -n "$PROG_VMSTAT"; then | 14053 | if test -n "$PROG_VMSTAT"; then |
10526 | echo "$as_me:10526: result: $PROG_VMSTAT" >&5 | 14054 | echo "$as_me:$LINENO: result: $PROG_VMSTAT" >&5 |
10527 | echo "${ECHO_T}$PROG_VMSTAT" >&6 | 14055 | echo "${ECHO_T}$PROG_VMSTAT" >&6 |
10528 | else | 14056 | else |
10529 | echo "$as_me:10529: result: no" >&5 | 14057 | echo "$as_me:$LINENO: result: no" >&5 |
10530 | echo "${ECHO_T}no" >&6 | 14058 | echo "${ECHO_T}no" >&6 |
10531 | fi | 14059 | fi |
10532 | 14060 | ||
@@ -10534,9 +14062,11 @@ fi | |||
10534 | PROG_VMSTAT="undef" | 14062 | PROG_VMSTAT="undef" |
10535 | fi | 14063 | fi |
10536 | 14064 | ||
14065 | |||
14066 | |||
10537 | # Extract the first word of "uptime", so it can be a program name with args. | 14067 | # Extract the first word of "uptime", so it can be a program name with args. |
10538 | set dummy uptime; ac_word=$2 | 14068 | set dummy uptime; ac_word=$2 |
10539 | echo "$as_me:10539: checking for $ac_word" >&5 | 14069 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
10540 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 14070 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
10541 | if test "${ac_cv_path_PROG_UPTIME+set}" = set; then | 14071 | if test "${ac_cv_path_PROG_UPTIME+set}" = set; then |
10542 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 14072 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -10546,16 +14076,18 @@ else | |||
10546 | ac_cv_path_PROG_UPTIME="$PROG_UPTIME" # Let the user override the test with a path. | 14076 | ac_cv_path_PROG_UPTIME="$PROG_UPTIME" # Let the user override the test with a path. |
10547 | ;; | 14077 | ;; |
10548 | *) | 14078 | *) |
10549 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 14079 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
10550 | ac_dummy="$PATH" | 14080 | for as_dir in $PATH |
10551 | for ac_dir in $ac_dummy; do | 14081 | do |
10552 | IFS=$ac_save_IFS | 14082 | IFS=$as_save_IFS |
10553 | test -z "$ac_dir" && ac_dir=. | 14083 | test -z "$as_dir" && as_dir=. |
10554 | if $as_executable_p "$ac_dir/$ac_word"; then | 14084 | for ac_exec_ext in '' $ac_executable_extensions; do |
10555 | ac_cv_path_PROG_UPTIME="$ac_dir/$ac_word" | 14085 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
10556 | echo "$as_me:10556: found $ac_dir/$ac_word" >&5 | 14086 | ac_cv_path_PROG_UPTIME="$as_dir/$ac_word$ac_exec_ext" |
10557 | break | 14087 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
10558 | fi | 14088 | break 2 |
14089 | fi | ||
14090 | done | ||
10559 | done | 14091 | done |
10560 | 14092 | ||
10561 | ;; | 14093 | ;; |
@@ -10564,10 +14096,10 @@ fi | |||
10564 | PROG_UPTIME=$ac_cv_path_PROG_UPTIME | 14096 | PROG_UPTIME=$ac_cv_path_PROG_UPTIME |
10565 | 14097 | ||
10566 | if test -n "$PROG_UPTIME"; then | 14098 | if test -n "$PROG_UPTIME"; then |
10567 | echo "$as_me:10567: result: $PROG_UPTIME" >&5 | 14099 | echo "$as_me:$LINENO: result: $PROG_UPTIME" >&5 |
10568 | echo "${ECHO_T}$PROG_UPTIME" >&6 | 14100 | echo "${ECHO_T}$PROG_UPTIME" >&6 |
10569 | else | 14101 | else |
10570 | echo "$as_me:10570: result: no" >&5 | 14102 | echo "$as_me:$LINENO: result: no" >&5 |
10571 | echo "${ECHO_T}no" >&6 | 14103 | echo "${ECHO_T}no" >&6 |
10572 | fi | 14104 | fi |
10573 | 14105 | ||
@@ -10575,9 +14107,11 @@ fi | |||
10575 | PROG_UPTIME="undef" | 14107 | PROG_UPTIME="undef" |
10576 | fi | 14108 | fi |
10577 | 14109 | ||
14110 | |||
14111 | |||
10578 | # Extract the first word of "ipcs", so it can be a program name with args. | 14112 | # Extract the first word of "ipcs", so it can be a program name with args. |
10579 | set dummy ipcs; ac_word=$2 | 14113 | set dummy ipcs; ac_word=$2 |
10580 | echo "$as_me:10580: checking for $ac_word" >&5 | 14114 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
10581 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 14115 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
10582 | if test "${ac_cv_path_PROG_IPCS+set}" = set; then | 14116 | if test "${ac_cv_path_PROG_IPCS+set}" = set; then |
10583 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 14117 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -10587,16 +14121,18 @@ else | |||
10587 | ac_cv_path_PROG_IPCS="$PROG_IPCS" # Let the user override the test with a path. | 14121 | ac_cv_path_PROG_IPCS="$PROG_IPCS" # Let the user override the test with a path. |
10588 | ;; | 14122 | ;; |
10589 | *) | 14123 | *) |
10590 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 14124 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
10591 | ac_dummy="$PATH" | 14125 | for as_dir in $PATH |
10592 | for ac_dir in $ac_dummy; do | 14126 | do |
10593 | IFS=$ac_save_IFS | 14127 | IFS=$as_save_IFS |
10594 | test -z "$ac_dir" && ac_dir=. | 14128 | test -z "$as_dir" && as_dir=. |
10595 | if $as_executable_p "$ac_dir/$ac_word"; then | 14129 | for ac_exec_ext in '' $ac_executable_extensions; do |
10596 | ac_cv_path_PROG_IPCS="$ac_dir/$ac_word" | 14130 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
10597 | echo "$as_me:10597: found $ac_dir/$ac_word" >&5 | 14131 | ac_cv_path_PROG_IPCS="$as_dir/$ac_word$ac_exec_ext" |
10598 | break | 14132 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
10599 | fi | 14133 | break 2 |
14134 | fi | ||
14135 | done | ||
10600 | done | 14136 | done |
10601 | 14137 | ||
10602 | ;; | 14138 | ;; |
@@ -10605,10 +14141,10 @@ fi | |||
10605 | PROG_IPCS=$ac_cv_path_PROG_IPCS | 14141 | PROG_IPCS=$ac_cv_path_PROG_IPCS |
10606 | 14142 | ||
10607 | if test -n "$PROG_IPCS"; then | 14143 | if test -n "$PROG_IPCS"; then |
10608 | echo "$as_me:10608: result: $PROG_IPCS" >&5 | 14144 | echo "$as_me:$LINENO: result: $PROG_IPCS" >&5 |
10609 | echo "${ECHO_T}$PROG_IPCS" >&6 | 14145 | echo "${ECHO_T}$PROG_IPCS" >&6 |
10610 | else | 14146 | else |
10611 | echo "$as_me:10611: result: no" >&5 | 14147 | echo "$as_me:$LINENO: result: no" >&5 |
10612 | echo "${ECHO_T}no" >&6 | 14148 | echo "${ECHO_T}no" >&6 |
10613 | fi | 14149 | fi |
10614 | 14150 | ||
@@ -10616,9 +14152,11 @@ fi | |||
10616 | PROG_IPCS="undef" | 14152 | PROG_IPCS="undef" |
10617 | fi | 14153 | fi |
10618 | 14154 | ||
14155 | |||
14156 | |||
10619 | # Extract the first word of "tail", so it can be a program name with args. | 14157 | # Extract the first word of "tail", so it can be a program name with args. |
10620 | set dummy tail; ac_word=$2 | 14158 | set dummy tail; ac_word=$2 |
10621 | echo "$as_me:10621: checking for $ac_word" >&5 | 14159 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
10622 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 14160 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
10623 | if test "${ac_cv_path_PROG_TAIL+set}" = set; then | 14161 | if test "${ac_cv_path_PROG_TAIL+set}" = set; then |
10624 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 14162 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -10628,16 +14166,18 @@ else | |||
10628 | ac_cv_path_PROG_TAIL="$PROG_TAIL" # Let the user override the test with a path. | 14166 | ac_cv_path_PROG_TAIL="$PROG_TAIL" # Let the user override the test with a path. |
10629 | ;; | 14167 | ;; |
10630 | *) | 14168 | *) |
10631 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 14169 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
10632 | ac_dummy="$PATH" | 14170 | for as_dir in $PATH |
10633 | for ac_dir in $ac_dummy; do | 14171 | do |
10634 | IFS=$ac_save_IFS | 14172 | IFS=$as_save_IFS |
10635 | test -z "$ac_dir" && ac_dir=. | 14173 | test -z "$as_dir" && as_dir=. |
10636 | if $as_executable_p "$ac_dir/$ac_word"; then | 14174 | for ac_exec_ext in '' $ac_executable_extensions; do |
10637 | ac_cv_path_PROG_TAIL="$ac_dir/$ac_word" | 14175 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
10638 | echo "$as_me:10638: found $ac_dir/$ac_word" >&5 | 14176 | ac_cv_path_PROG_TAIL="$as_dir/$ac_word$ac_exec_ext" |
10639 | break | 14177 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
10640 | fi | 14178 | break 2 |
14179 | fi | ||
14180 | done | ||
10641 | done | 14181 | done |
10642 | 14182 | ||
10643 | ;; | 14183 | ;; |
@@ -10646,10 +14186,10 @@ fi | |||
10646 | PROG_TAIL=$ac_cv_path_PROG_TAIL | 14186 | PROG_TAIL=$ac_cv_path_PROG_TAIL |
10647 | 14187 | ||
10648 | if test -n "$PROG_TAIL"; then | 14188 | if test -n "$PROG_TAIL"; then |
10649 | echo "$as_me:10649: result: $PROG_TAIL" >&5 | 14189 | echo "$as_me:$LINENO: result: $PROG_TAIL" >&5 |
10650 | echo "${ECHO_T}$PROG_TAIL" >&6 | 14190 | echo "${ECHO_T}$PROG_TAIL" >&6 |
10651 | else | 14191 | else |
10652 | echo "$as_me:10652: result: no" >&5 | 14192 | echo "$as_me:$LINENO: result: no" >&5 |
10653 | echo "${ECHO_T}no" >&6 | 14193 | echo "${ECHO_T}no" >&6 |
10654 | fi | 14194 | fi |
10655 | 14195 | ||
@@ -10657,6 +14197,7 @@ fi | |||
10657 | PROG_TAIL="undef" | 14197 | PROG_TAIL="undef" |
10658 | fi | 14198 | fi |
10659 | 14199 | ||
14200 | |||
10660 | # restore PATH | 14201 | # restore PATH |
10661 | PATH=$OPATH | 14202 | PATH=$OPATH |
10662 | 14203 | ||
@@ -10674,20 +14215,25 @@ if test ! -z "$INSTALL_SSH_RAND_HELPER" ; then | |||
10674 | fi | 14215 | fi |
10675 | fi | 14216 | fi |
10676 | 14217 | ||
14218 | |||
14219 | |||
10677 | # Cheap hack to ensure NEWS-OS libraries are arranged right. | 14220 | # Cheap hack to ensure NEWS-OS libraries are arranged right. |
10678 | if test ! -z "$SONY" ; then | 14221 | if test ! -z "$SONY" ; then |
10679 | LIBS="$LIBS -liberty"; | 14222 | LIBS="$LIBS -liberty"; |
10680 | fi | 14223 | fi |
10681 | 14224 | ||
10682 | # Checks for data types | 14225 | # Checks for data types |
10683 | echo "$as_me:10683: checking for char" >&5 | 14226 | echo "$as_me:$LINENO: checking for char" >&5 |
10684 | echo $ECHO_N "checking for char... $ECHO_C" >&6 | 14227 | echo $ECHO_N "checking for char... $ECHO_C" >&6 |
10685 | if test "${ac_cv_type_char+set}" = set; then | 14228 | if test "${ac_cv_type_char+set}" = set; then |
10686 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 14229 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
10687 | else | 14230 | else |
10688 | cat >conftest.$ac_ext <<_ACEOF | 14231 | cat >conftest.$ac_ext <<_ACEOF |
10689 | #line 10689 "configure" | 14232 | /* confdefs.h. */ |
10690 | #include "confdefs.h" | 14233 | _ACEOF |
14234 | cat confdefs.h >>conftest.$ac_ext | ||
14235 | cat >>conftest.$ac_ext <<_ACEOF | ||
14236 | /* end confdefs.h. */ | ||
10691 | $ac_includes_default | 14237 | $ac_includes_default |
10692 | int | 14238 | int |
10693 | main () | 14239 | main () |
@@ -10701,209 +14247,382 @@ if (sizeof (char)) | |||
10701 | } | 14247 | } |
10702 | _ACEOF | 14248 | _ACEOF |
10703 | rm -f conftest.$ac_objext | 14249 | rm -f conftest.$ac_objext |
10704 | if { (eval echo "$as_me:10704: \"$ac_compile\"") >&5 | 14250 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
10705 | (eval $ac_compile) 2>&5 | 14251 | (eval $ac_compile) 2>conftest.er1 |
10706 | ac_status=$? | 14252 | ac_status=$? |
10707 | echo "$as_me:10707: \$? = $ac_status" >&5 | 14253 | grep -v '^ *+' conftest.er1 >conftest.err |
14254 | rm -f conftest.er1 | ||
14255 | cat conftest.err >&5 | ||
14256 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10708 | (exit $ac_status); } && | 14257 | (exit $ac_status); } && |
10709 | { ac_try='test -s conftest.$ac_objext' | 14258 | { ac_try='test -z "$ac_c_werror_flag" |
10710 | { (eval echo "$as_me:10710: \"$ac_try\"") >&5 | 14259 | || test ! -s conftest.err' |
14260 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14261 | (eval $ac_try) 2>&5 | ||
14262 | ac_status=$? | ||
14263 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14264 | (exit $ac_status); }; } && | ||
14265 | { ac_try='test -s conftest.$ac_objext' | ||
14266 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10711 | (eval $ac_try) 2>&5 | 14267 | (eval $ac_try) 2>&5 |
10712 | ac_status=$? | 14268 | ac_status=$? |
10713 | echo "$as_me:10713: \$? = $ac_status" >&5 | 14269 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
10714 | (exit $ac_status); }; }; then | 14270 | (exit $ac_status); }; }; then |
10715 | ac_cv_type_char=yes | 14271 | ac_cv_type_char=yes |
10716 | else | 14272 | else |
10717 | echo "$as_me: failed program was:" >&5 | 14273 | echo "$as_me: failed program was:" >&5 |
10718 | cat conftest.$ac_ext >&5 | 14274 | sed 's/^/| /' conftest.$ac_ext >&5 |
14275 | |||
10719 | ac_cv_type_char=no | 14276 | ac_cv_type_char=no |
10720 | fi | 14277 | fi |
10721 | rm -f conftest.$ac_objext conftest.$ac_ext | 14278 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
10722 | fi | 14279 | fi |
10723 | echo "$as_me:10723: result: $ac_cv_type_char" >&5 | 14280 | echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5 |
10724 | echo "${ECHO_T}$ac_cv_type_char" >&6 | 14281 | echo "${ECHO_T}$ac_cv_type_char" >&6 |
10725 | 14282 | ||
10726 | echo "$as_me:10726: checking size of char" >&5 | 14283 | echo "$as_me:$LINENO: checking size of char" >&5 |
10727 | echo $ECHO_N "checking size of char... $ECHO_C" >&6 | 14284 | echo $ECHO_N "checking size of char... $ECHO_C" >&6 |
10728 | if test "${ac_cv_sizeof_char+set}" = set; then | 14285 | if test "${ac_cv_sizeof_char+set}" = set; then |
10729 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 14286 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
10730 | else | 14287 | else |
10731 | if test "$ac_cv_type_char" = yes; then | 14288 | if test "$ac_cv_type_char" = yes; then |
14289 | # The cast to unsigned long works around a bug in the HP C Compiler | ||
14290 | # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects | ||
14291 | # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. | ||
14292 | # This bug is HP SR number 8606223364. | ||
10732 | if test "$cross_compiling" = yes; then | 14293 | if test "$cross_compiling" = yes; then |
10733 | # Depending upon the size, compute the lo and hi bounds. | 14294 | # Depending upon the size, compute the lo and hi bounds. |
10734 | cat >conftest.$ac_ext <<_ACEOF | 14295 | cat >conftest.$ac_ext <<_ACEOF |
10735 | #line 10735 "configure" | 14296 | /* confdefs.h. */ |
10736 | #include "confdefs.h" | 14297 | _ACEOF |
14298 | cat confdefs.h >>conftest.$ac_ext | ||
14299 | cat >>conftest.$ac_ext <<_ACEOF | ||
14300 | /* end confdefs.h. */ | ||
10737 | $ac_includes_default | 14301 | $ac_includes_default |
10738 | int | 14302 | int |
10739 | main () | 14303 | main () |
10740 | { | 14304 | { |
10741 | int _array_ [1 - 2 * !((sizeof (char)) >= 0)] | 14305 | static int test_array [1 - 2 * !(((long) (sizeof (char))) >= 0)]; |
14306 | test_array [0] = 0 | ||
14307 | |||
10742 | ; | 14308 | ; |
10743 | return 0; | 14309 | return 0; |
10744 | } | 14310 | } |
10745 | _ACEOF | 14311 | _ACEOF |
10746 | rm -f conftest.$ac_objext | 14312 | rm -f conftest.$ac_objext |
10747 | if { (eval echo "$as_me:10747: \"$ac_compile\"") >&5 | 14313 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
10748 | (eval $ac_compile) 2>&5 | 14314 | (eval $ac_compile) 2>conftest.er1 |
10749 | ac_status=$? | 14315 | ac_status=$? |
10750 | echo "$as_me:10750: \$? = $ac_status" >&5 | 14316 | grep -v '^ *+' conftest.er1 >conftest.err |
14317 | rm -f conftest.er1 | ||
14318 | cat conftest.err >&5 | ||
14319 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10751 | (exit $ac_status); } && | 14320 | (exit $ac_status); } && |
10752 | { ac_try='test -s conftest.$ac_objext' | 14321 | { ac_try='test -z "$ac_c_werror_flag" |
10753 | { (eval echo "$as_me:10753: \"$ac_try\"") >&5 | 14322 | || test ! -s conftest.err' |
14323 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10754 | (eval $ac_try) 2>&5 | 14324 | (eval $ac_try) 2>&5 |
10755 | ac_status=$? | 14325 | ac_status=$? |
10756 | echo "$as_me:10756: \$? = $ac_status" >&5 | 14326 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
14327 | (exit $ac_status); }; } && | ||
14328 | { ac_try='test -s conftest.$ac_objext' | ||
14329 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14330 | (eval $ac_try) 2>&5 | ||
14331 | ac_status=$? | ||
14332 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10757 | (exit $ac_status); }; }; then | 14333 | (exit $ac_status); }; }; then |
10758 | ac_lo=0 ac_mid=0 | 14334 | ac_lo=0 ac_mid=0 |
10759 | while :; do | 14335 | while :; do |
10760 | cat >conftest.$ac_ext <<_ACEOF | 14336 | cat >conftest.$ac_ext <<_ACEOF |
10761 | #line 10761 "configure" | 14337 | /* confdefs.h. */ |
10762 | #include "confdefs.h" | 14338 | _ACEOF |
14339 | cat confdefs.h >>conftest.$ac_ext | ||
14340 | cat >>conftest.$ac_ext <<_ACEOF | ||
14341 | /* end confdefs.h. */ | ||
10763 | $ac_includes_default | 14342 | $ac_includes_default |
10764 | int | 14343 | int |
10765 | main () | 14344 | main () |
10766 | { | 14345 | { |
10767 | int _array_ [1 - 2 * !((sizeof (char)) <= $ac_mid)] | 14346 | static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)]; |
14347 | test_array [0] = 0 | ||
14348 | |||
10768 | ; | 14349 | ; |
10769 | return 0; | 14350 | return 0; |
10770 | } | 14351 | } |
10771 | _ACEOF | 14352 | _ACEOF |
10772 | rm -f conftest.$ac_objext | 14353 | rm -f conftest.$ac_objext |
10773 | if { (eval echo "$as_me:10773: \"$ac_compile\"") >&5 | 14354 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
10774 | (eval $ac_compile) 2>&5 | 14355 | (eval $ac_compile) 2>conftest.er1 |
10775 | ac_status=$? | 14356 | ac_status=$? |
10776 | echo "$as_me:10776: \$? = $ac_status" >&5 | 14357 | grep -v '^ *+' conftest.er1 >conftest.err |
14358 | rm -f conftest.er1 | ||
14359 | cat conftest.err >&5 | ||
14360 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10777 | (exit $ac_status); } && | 14361 | (exit $ac_status); } && |
10778 | { ac_try='test -s conftest.$ac_objext' | 14362 | { ac_try='test -z "$ac_c_werror_flag" |
10779 | { (eval echo "$as_me:10779: \"$ac_try\"") >&5 | 14363 | || test ! -s conftest.err' |
14364 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10780 | (eval $ac_try) 2>&5 | 14365 | (eval $ac_try) 2>&5 |
10781 | ac_status=$? | 14366 | ac_status=$? |
10782 | echo "$as_me:10782: \$? = $ac_status" >&5 | 14367 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
14368 | (exit $ac_status); }; } && | ||
14369 | { ac_try='test -s conftest.$ac_objext' | ||
14370 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14371 | (eval $ac_try) 2>&5 | ||
14372 | ac_status=$? | ||
14373 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10783 | (exit $ac_status); }; }; then | 14374 | (exit $ac_status); }; }; then |
10784 | ac_hi=$ac_mid; break | 14375 | ac_hi=$ac_mid; break |
10785 | else | 14376 | else |
10786 | echo "$as_me: failed program was:" >&5 | 14377 | echo "$as_me: failed program was:" >&5 |
10787 | cat conftest.$ac_ext >&5 | 14378 | sed 's/^/| /' conftest.$ac_ext >&5 |
10788 | ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` | 14379 | |
14380 | ac_lo=`expr $ac_mid + 1` | ||
14381 | if test $ac_lo -le $ac_mid; then | ||
14382 | ac_lo= ac_hi= | ||
14383 | break | ||
14384 | fi | ||
14385 | ac_mid=`expr 2 '*' $ac_mid + 1` | ||
10789 | fi | 14386 | fi |
10790 | rm -f conftest.$ac_objext conftest.$ac_ext | 14387 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
10791 | done | 14388 | done |
10792 | else | 14389 | else |
10793 | echo "$as_me: failed program was:" >&5 | 14390 | echo "$as_me: failed program was:" >&5 |
10794 | cat conftest.$ac_ext >&5 | 14391 | sed 's/^/| /' conftest.$ac_ext >&5 |
10795 | ac_hi=-1 ac_mid=-1 | 14392 | |
14393 | cat >conftest.$ac_ext <<_ACEOF | ||
14394 | /* confdefs.h. */ | ||
14395 | _ACEOF | ||
14396 | cat confdefs.h >>conftest.$ac_ext | ||
14397 | cat >>conftest.$ac_ext <<_ACEOF | ||
14398 | /* end confdefs.h. */ | ||
14399 | $ac_includes_default | ||
14400 | int | ||
14401 | main () | ||
14402 | { | ||
14403 | static int test_array [1 - 2 * !(((long) (sizeof (char))) < 0)]; | ||
14404 | test_array [0] = 0 | ||
14405 | |||
14406 | ; | ||
14407 | return 0; | ||
14408 | } | ||
14409 | _ACEOF | ||
14410 | rm -f conftest.$ac_objext | ||
14411 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
14412 | (eval $ac_compile) 2>conftest.er1 | ||
14413 | ac_status=$? | ||
14414 | grep -v '^ *+' conftest.er1 >conftest.err | ||
14415 | rm -f conftest.er1 | ||
14416 | cat conftest.err >&5 | ||
14417 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14418 | (exit $ac_status); } && | ||
14419 | { ac_try='test -z "$ac_c_werror_flag" | ||
14420 | || test ! -s conftest.err' | ||
14421 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14422 | (eval $ac_try) 2>&5 | ||
14423 | ac_status=$? | ||
14424 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14425 | (exit $ac_status); }; } && | ||
14426 | { ac_try='test -s conftest.$ac_objext' | ||
14427 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14428 | (eval $ac_try) 2>&5 | ||
14429 | ac_status=$? | ||
14430 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14431 | (exit $ac_status); }; }; then | ||
14432 | ac_hi=-1 ac_mid=-1 | ||
10796 | while :; do | 14433 | while :; do |
10797 | cat >conftest.$ac_ext <<_ACEOF | 14434 | cat >conftest.$ac_ext <<_ACEOF |
10798 | #line 10798 "configure" | 14435 | /* confdefs.h. */ |
10799 | #include "confdefs.h" | 14436 | _ACEOF |
14437 | cat confdefs.h >>conftest.$ac_ext | ||
14438 | cat >>conftest.$ac_ext <<_ACEOF | ||
14439 | /* end confdefs.h. */ | ||
10800 | $ac_includes_default | 14440 | $ac_includes_default |
10801 | int | 14441 | int |
10802 | main () | 14442 | main () |
10803 | { | 14443 | { |
10804 | int _array_ [1 - 2 * !((sizeof (char)) >= $ac_mid)] | 14444 | static int test_array [1 - 2 * !(((long) (sizeof (char))) >= $ac_mid)]; |
14445 | test_array [0] = 0 | ||
14446 | |||
10805 | ; | 14447 | ; |
10806 | return 0; | 14448 | return 0; |
10807 | } | 14449 | } |
10808 | _ACEOF | 14450 | _ACEOF |
10809 | rm -f conftest.$ac_objext | 14451 | rm -f conftest.$ac_objext |
10810 | if { (eval echo "$as_me:10810: \"$ac_compile\"") >&5 | 14452 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
10811 | (eval $ac_compile) 2>&5 | 14453 | (eval $ac_compile) 2>conftest.er1 |
10812 | ac_status=$? | 14454 | ac_status=$? |
10813 | echo "$as_me:10813: \$? = $ac_status" >&5 | 14455 | grep -v '^ *+' conftest.er1 >conftest.err |
14456 | rm -f conftest.er1 | ||
14457 | cat conftest.err >&5 | ||
14458 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10814 | (exit $ac_status); } && | 14459 | (exit $ac_status); } && |
10815 | { ac_try='test -s conftest.$ac_objext' | 14460 | { ac_try='test -z "$ac_c_werror_flag" |
10816 | { (eval echo "$as_me:10816: \"$ac_try\"") >&5 | 14461 | || test ! -s conftest.err' |
14462 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14463 | (eval $ac_try) 2>&5 | ||
14464 | ac_status=$? | ||
14465 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14466 | (exit $ac_status); }; } && | ||
14467 | { ac_try='test -s conftest.$ac_objext' | ||
14468 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10817 | (eval $ac_try) 2>&5 | 14469 | (eval $ac_try) 2>&5 |
10818 | ac_status=$? | 14470 | ac_status=$? |
10819 | echo "$as_me:10819: \$? = $ac_status" >&5 | 14471 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
10820 | (exit $ac_status); }; }; then | 14472 | (exit $ac_status); }; }; then |
10821 | ac_lo=$ac_mid; break | 14473 | ac_lo=$ac_mid; break |
10822 | else | 14474 | else |
10823 | echo "$as_me: failed program was:" >&5 | 14475 | echo "$as_me: failed program was:" >&5 |
10824 | cat conftest.$ac_ext >&5 | 14476 | sed 's/^/| /' conftest.$ac_ext >&5 |
10825 | ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` | 14477 | |
14478 | ac_hi=`expr '(' $ac_mid ')' - 1` | ||
14479 | if test $ac_mid -le $ac_hi; then | ||
14480 | ac_lo= ac_hi= | ||
14481 | break | ||
14482 | fi | ||
14483 | ac_mid=`expr 2 '*' $ac_mid` | ||
10826 | fi | 14484 | fi |
10827 | rm -f conftest.$ac_objext conftest.$ac_ext | 14485 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
10828 | done | 14486 | done |
14487 | else | ||
14488 | echo "$as_me: failed program was:" >&5 | ||
14489 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
14490 | |||
14491 | ac_lo= ac_hi= | ||
14492 | fi | ||
14493 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
10829 | fi | 14494 | fi |
10830 | rm -f conftest.$ac_objext conftest.$ac_ext | 14495 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
10831 | # Binary search between lo and hi bounds. | 14496 | # Binary search between lo and hi bounds. |
10832 | while test "x$ac_lo" != "x$ac_hi"; do | 14497 | while test "x$ac_lo" != "x$ac_hi"; do |
10833 | ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` | 14498 | ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` |
10834 | cat >conftest.$ac_ext <<_ACEOF | 14499 | cat >conftest.$ac_ext <<_ACEOF |
10835 | #line 10835 "configure" | 14500 | /* confdefs.h. */ |
10836 | #include "confdefs.h" | 14501 | _ACEOF |
14502 | cat confdefs.h >>conftest.$ac_ext | ||
14503 | cat >>conftest.$ac_ext <<_ACEOF | ||
14504 | /* end confdefs.h. */ | ||
10837 | $ac_includes_default | 14505 | $ac_includes_default |
10838 | int | 14506 | int |
10839 | main () | 14507 | main () |
10840 | { | 14508 | { |
10841 | int _array_ [1 - 2 * !((sizeof (char)) <= $ac_mid)] | 14509 | static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)]; |
14510 | test_array [0] = 0 | ||
14511 | |||
10842 | ; | 14512 | ; |
10843 | return 0; | 14513 | return 0; |
10844 | } | 14514 | } |
10845 | _ACEOF | 14515 | _ACEOF |
10846 | rm -f conftest.$ac_objext | 14516 | rm -f conftest.$ac_objext |
10847 | if { (eval echo "$as_me:10847: \"$ac_compile\"") >&5 | 14517 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
10848 | (eval $ac_compile) 2>&5 | 14518 | (eval $ac_compile) 2>conftest.er1 |
10849 | ac_status=$? | 14519 | ac_status=$? |
10850 | echo "$as_me:10850: \$? = $ac_status" >&5 | 14520 | grep -v '^ *+' conftest.er1 >conftest.err |
14521 | rm -f conftest.er1 | ||
14522 | cat conftest.err >&5 | ||
14523 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10851 | (exit $ac_status); } && | 14524 | (exit $ac_status); } && |
10852 | { ac_try='test -s conftest.$ac_objext' | 14525 | { ac_try='test -z "$ac_c_werror_flag" |
10853 | { (eval echo "$as_me:10853: \"$ac_try\"") >&5 | 14526 | || test ! -s conftest.err' |
14527 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10854 | (eval $ac_try) 2>&5 | 14528 | (eval $ac_try) 2>&5 |
10855 | ac_status=$? | 14529 | ac_status=$? |
10856 | echo "$as_me:10856: \$? = $ac_status" >&5 | 14530 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
14531 | (exit $ac_status); }; } && | ||
14532 | { ac_try='test -s conftest.$ac_objext' | ||
14533 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14534 | (eval $ac_try) 2>&5 | ||
14535 | ac_status=$? | ||
14536 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10857 | (exit $ac_status); }; }; then | 14537 | (exit $ac_status); }; }; then |
10858 | ac_hi=$ac_mid | 14538 | ac_hi=$ac_mid |
10859 | else | 14539 | else |
10860 | echo "$as_me: failed program was:" >&5 | 14540 | echo "$as_me: failed program was:" >&5 |
10861 | cat conftest.$ac_ext >&5 | 14541 | sed 's/^/| /' conftest.$ac_ext >&5 |
10862 | ac_lo=`expr $ac_mid + 1` | 14542 | |
14543 | ac_lo=`expr '(' $ac_mid ')' + 1` | ||
10863 | fi | 14544 | fi |
10864 | rm -f conftest.$ac_objext conftest.$ac_ext | 14545 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
10865 | done | 14546 | done |
10866 | ac_cv_sizeof_char=$ac_lo | 14547 | case $ac_lo in |
14548 | ?*) ac_cv_sizeof_char=$ac_lo;; | ||
14549 | '') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77 | ||
14550 | See \`config.log' for more details." >&5 | ||
14551 | echo "$as_me: error: cannot compute sizeof (char), 77 | ||
14552 | See \`config.log' for more details." >&2;} | ||
14553 | { (exit 1); exit 1; }; } ;; | ||
14554 | esac | ||
10867 | else | 14555 | else |
10868 | if test "$cross_compiling" = yes; then | 14556 | if test "$cross_compiling" = yes; then |
10869 | { { echo "$as_me:10869: error: cannot run test program while cross compiling" >&5 | 14557 | { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
10870 | echo "$as_me: error: cannot run test program while cross compiling" >&2;} | 14558 | See \`config.log' for more details." >&5 |
14559 | echo "$as_me: error: cannot run test program while cross compiling | ||
14560 | See \`config.log' for more details." >&2;} | ||
10871 | { (exit 1); exit 1; }; } | 14561 | { (exit 1); exit 1; }; } |
10872 | else | 14562 | else |
10873 | cat >conftest.$ac_ext <<_ACEOF | 14563 | cat >conftest.$ac_ext <<_ACEOF |
10874 | #line 10874 "configure" | 14564 | /* confdefs.h. */ |
10875 | #include "confdefs.h" | 14565 | _ACEOF |
14566 | cat confdefs.h >>conftest.$ac_ext | ||
14567 | cat >>conftest.$ac_ext <<_ACEOF | ||
14568 | /* end confdefs.h. */ | ||
10876 | $ac_includes_default | 14569 | $ac_includes_default |
14570 | long longval () { return (long) (sizeof (char)); } | ||
14571 | unsigned long ulongval () { return (long) (sizeof (char)); } | ||
14572 | #include <stdio.h> | ||
14573 | #include <stdlib.h> | ||
10877 | int | 14574 | int |
10878 | main () | 14575 | main () |
10879 | { | 14576 | { |
10880 | FILE *f = fopen ("conftest.val", "w"); | 14577 | |
10881 | if (!f) | 14578 | FILE *f = fopen ("conftest.val", "w"); |
10882 | exit (1); | 14579 | if (! f) |
10883 | fprintf (f, "%d", (sizeof (char))); | 14580 | exit (1); |
10884 | fclose (f); | 14581 | if (((long) (sizeof (char))) < 0) |
14582 | { | ||
14583 | long i = longval (); | ||
14584 | if (i != ((long) (sizeof (char)))) | ||
14585 | exit (1); | ||
14586 | fprintf (f, "%ld\n", i); | ||
14587 | } | ||
14588 | else | ||
14589 | { | ||
14590 | unsigned long i = ulongval (); | ||
14591 | if (i != ((long) (sizeof (char)))) | ||
14592 | exit (1); | ||
14593 | fprintf (f, "%lu\n", i); | ||
14594 | } | ||
14595 | exit (ferror (f) || fclose (f) != 0); | ||
14596 | |||
10885 | ; | 14597 | ; |
10886 | return 0; | 14598 | return 0; |
10887 | } | 14599 | } |
10888 | _ACEOF | 14600 | _ACEOF |
10889 | rm -f conftest$ac_exeext | 14601 | rm -f conftest$ac_exeext |
10890 | if { (eval echo "$as_me:10890: \"$ac_link\"") >&5 | 14602 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
10891 | (eval $ac_link) 2>&5 | 14603 | (eval $ac_link) 2>&5 |
10892 | ac_status=$? | 14604 | ac_status=$? |
10893 | echo "$as_me:10893: \$? = $ac_status" >&5 | 14605 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
10894 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | 14606 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
10895 | { (eval echo "$as_me:10895: \"$ac_try\"") >&5 | 14607 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
10896 | (eval $ac_try) 2>&5 | 14608 | (eval $ac_try) 2>&5 |
10897 | ac_status=$? | 14609 | ac_status=$? |
10898 | echo "$as_me:10898: \$? = $ac_status" >&5 | 14610 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
10899 | (exit $ac_status); }; }; then | 14611 | (exit $ac_status); }; }; then |
10900 | ac_cv_sizeof_char=`cat conftest.val` | 14612 | ac_cv_sizeof_char=`cat conftest.val` |
10901 | else | 14613 | else |
10902 | echo "$as_me: program exited with status $ac_status" >&5 | 14614 | echo "$as_me: program exited with status $ac_status" >&5 |
10903 | echo "$as_me: failed program was:" >&5 | 14615 | echo "$as_me: failed program was:" >&5 |
10904 | cat conftest.$ac_ext >&5 | 14616 | sed 's/^/| /' conftest.$ac_ext >&5 |
14617 | |||
14618 | ( exit $ac_status ) | ||
14619 | { { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77 | ||
14620 | See \`config.log' for more details." >&5 | ||
14621 | echo "$as_me: error: cannot compute sizeof (char), 77 | ||
14622 | See \`config.log' for more details." >&2;} | ||
14623 | { (exit 1); exit 1; }; } | ||
10905 | fi | 14624 | fi |
10906 | rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | 14625 | rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext |
10907 | fi | 14626 | fi |
10908 | fi | 14627 | fi |
10909 | rm -f conftest.val | 14628 | rm -f conftest.val |
@@ -10911,20 +14630,24 @@ else | |||
10911 | ac_cv_sizeof_char=0 | 14630 | ac_cv_sizeof_char=0 |
10912 | fi | 14631 | fi |
10913 | fi | 14632 | fi |
10914 | echo "$as_me:10914: result: $ac_cv_sizeof_char" >&5 | 14633 | echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5 |
10915 | echo "${ECHO_T}$ac_cv_sizeof_char" >&6 | 14634 | echo "${ECHO_T}$ac_cv_sizeof_char" >&6 |
10916 | cat >>confdefs.h <<EOF | 14635 | cat >>confdefs.h <<_ACEOF |
10917 | #define SIZEOF_CHAR $ac_cv_sizeof_char | 14636 | #define SIZEOF_CHAR $ac_cv_sizeof_char |
10918 | EOF | 14637 | _ACEOF |
14638 | |||
10919 | 14639 | ||
10920 | echo "$as_me:10920: checking for short int" >&5 | 14640 | echo "$as_me:$LINENO: checking for short int" >&5 |
10921 | echo $ECHO_N "checking for short int... $ECHO_C" >&6 | 14641 | echo $ECHO_N "checking for short int... $ECHO_C" >&6 |
10922 | if test "${ac_cv_type_short_int+set}" = set; then | 14642 | if test "${ac_cv_type_short_int+set}" = set; then |
10923 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 14643 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
10924 | else | 14644 | else |
10925 | cat >conftest.$ac_ext <<_ACEOF | 14645 | cat >conftest.$ac_ext <<_ACEOF |
10926 | #line 10926 "configure" | 14646 | /* confdefs.h. */ |
10927 | #include "confdefs.h" | 14647 | _ACEOF |
14648 | cat confdefs.h >>conftest.$ac_ext | ||
14649 | cat >>conftest.$ac_ext <<_ACEOF | ||
14650 | /* end confdefs.h. */ | ||
10928 | $ac_includes_default | 14651 | $ac_includes_default |
10929 | int | 14652 | int |
10930 | main () | 14653 | main () |
@@ -10938,209 +14661,382 @@ if (sizeof (short int)) | |||
10938 | } | 14661 | } |
10939 | _ACEOF | 14662 | _ACEOF |
10940 | rm -f conftest.$ac_objext | 14663 | rm -f conftest.$ac_objext |
10941 | if { (eval echo "$as_me:10941: \"$ac_compile\"") >&5 | 14664 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
10942 | (eval $ac_compile) 2>&5 | 14665 | (eval $ac_compile) 2>conftest.er1 |
10943 | ac_status=$? | 14666 | ac_status=$? |
10944 | echo "$as_me:10944: \$? = $ac_status" >&5 | 14667 | grep -v '^ *+' conftest.er1 >conftest.err |
14668 | rm -f conftest.er1 | ||
14669 | cat conftest.err >&5 | ||
14670 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10945 | (exit $ac_status); } && | 14671 | (exit $ac_status); } && |
10946 | { ac_try='test -s conftest.$ac_objext' | 14672 | { ac_try='test -z "$ac_c_werror_flag" |
10947 | { (eval echo "$as_me:10947: \"$ac_try\"") >&5 | 14673 | || test ! -s conftest.err' |
14674 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10948 | (eval $ac_try) 2>&5 | 14675 | (eval $ac_try) 2>&5 |
10949 | ac_status=$? | 14676 | ac_status=$? |
10950 | echo "$as_me:10950: \$? = $ac_status" >&5 | 14677 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
14678 | (exit $ac_status); }; } && | ||
14679 | { ac_try='test -s conftest.$ac_objext' | ||
14680 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14681 | (eval $ac_try) 2>&5 | ||
14682 | ac_status=$? | ||
14683 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10951 | (exit $ac_status); }; }; then | 14684 | (exit $ac_status); }; }; then |
10952 | ac_cv_type_short_int=yes | 14685 | ac_cv_type_short_int=yes |
10953 | else | 14686 | else |
10954 | echo "$as_me: failed program was:" >&5 | 14687 | echo "$as_me: failed program was:" >&5 |
10955 | cat conftest.$ac_ext >&5 | 14688 | sed 's/^/| /' conftest.$ac_ext >&5 |
14689 | |||
10956 | ac_cv_type_short_int=no | 14690 | ac_cv_type_short_int=no |
10957 | fi | 14691 | fi |
10958 | rm -f conftest.$ac_objext conftest.$ac_ext | 14692 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
10959 | fi | 14693 | fi |
10960 | echo "$as_me:10960: result: $ac_cv_type_short_int" >&5 | 14694 | echo "$as_me:$LINENO: result: $ac_cv_type_short_int" >&5 |
10961 | echo "${ECHO_T}$ac_cv_type_short_int" >&6 | 14695 | echo "${ECHO_T}$ac_cv_type_short_int" >&6 |
10962 | 14696 | ||
10963 | echo "$as_me:10963: checking size of short int" >&5 | 14697 | echo "$as_me:$LINENO: checking size of short int" >&5 |
10964 | echo $ECHO_N "checking size of short int... $ECHO_C" >&6 | 14698 | echo $ECHO_N "checking size of short int... $ECHO_C" >&6 |
10965 | if test "${ac_cv_sizeof_short_int+set}" = set; then | 14699 | if test "${ac_cv_sizeof_short_int+set}" = set; then |
10966 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 14700 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
10967 | else | 14701 | else |
10968 | if test "$ac_cv_type_short_int" = yes; then | 14702 | if test "$ac_cv_type_short_int" = yes; then |
14703 | # The cast to unsigned long works around a bug in the HP C Compiler | ||
14704 | # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects | ||
14705 | # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. | ||
14706 | # This bug is HP SR number 8606223364. | ||
10969 | if test "$cross_compiling" = yes; then | 14707 | if test "$cross_compiling" = yes; then |
10970 | # Depending upon the size, compute the lo and hi bounds. | 14708 | # Depending upon the size, compute the lo and hi bounds. |
10971 | cat >conftest.$ac_ext <<_ACEOF | 14709 | cat >conftest.$ac_ext <<_ACEOF |
10972 | #line 10972 "configure" | 14710 | /* confdefs.h. */ |
10973 | #include "confdefs.h" | 14711 | _ACEOF |
14712 | cat confdefs.h >>conftest.$ac_ext | ||
14713 | cat >>conftest.$ac_ext <<_ACEOF | ||
14714 | /* end confdefs.h. */ | ||
10974 | $ac_includes_default | 14715 | $ac_includes_default |
10975 | int | 14716 | int |
10976 | main () | 14717 | main () |
10977 | { | 14718 | { |
10978 | int _array_ [1 - 2 * !((sizeof (short int)) >= 0)] | 14719 | static int test_array [1 - 2 * !(((long) (sizeof (short int))) >= 0)]; |
14720 | test_array [0] = 0 | ||
14721 | |||
10979 | ; | 14722 | ; |
10980 | return 0; | 14723 | return 0; |
10981 | } | 14724 | } |
10982 | _ACEOF | 14725 | _ACEOF |
10983 | rm -f conftest.$ac_objext | 14726 | rm -f conftest.$ac_objext |
10984 | if { (eval echo "$as_me:10984: \"$ac_compile\"") >&5 | 14727 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
10985 | (eval $ac_compile) 2>&5 | 14728 | (eval $ac_compile) 2>conftest.er1 |
10986 | ac_status=$? | 14729 | ac_status=$? |
10987 | echo "$as_me:10987: \$? = $ac_status" >&5 | 14730 | grep -v '^ *+' conftest.er1 >conftest.err |
14731 | rm -f conftest.er1 | ||
14732 | cat conftest.err >&5 | ||
14733 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10988 | (exit $ac_status); } && | 14734 | (exit $ac_status); } && |
10989 | { ac_try='test -s conftest.$ac_objext' | 14735 | { ac_try='test -z "$ac_c_werror_flag" |
10990 | { (eval echo "$as_me:10990: \"$ac_try\"") >&5 | 14736 | || test ! -s conftest.err' |
14737 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
10991 | (eval $ac_try) 2>&5 | 14738 | (eval $ac_try) 2>&5 |
10992 | ac_status=$? | 14739 | ac_status=$? |
10993 | echo "$as_me:10993: \$? = $ac_status" >&5 | 14740 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
14741 | (exit $ac_status); }; } && | ||
14742 | { ac_try='test -s conftest.$ac_objext' | ||
14743 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14744 | (eval $ac_try) 2>&5 | ||
14745 | ac_status=$? | ||
14746 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
10994 | (exit $ac_status); }; }; then | 14747 | (exit $ac_status); }; }; then |
10995 | ac_lo=0 ac_mid=0 | 14748 | ac_lo=0 ac_mid=0 |
10996 | while :; do | 14749 | while :; do |
10997 | cat >conftest.$ac_ext <<_ACEOF | 14750 | cat >conftest.$ac_ext <<_ACEOF |
10998 | #line 10998 "configure" | 14751 | /* confdefs.h. */ |
10999 | #include "confdefs.h" | 14752 | _ACEOF |
14753 | cat confdefs.h >>conftest.$ac_ext | ||
14754 | cat >>conftest.$ac_ext <<_ACEOF | ||
14755 | /* end confdefs.h. */ | ||
11000 | $ac_includes_default | 14756 | $ac_includes_default |
11001 | int | 14757 | int |
11002 | main () | 14758 | main () |
11003 | { | 14759 | { |
11004 | int _array_ [1 - 2 * !((sizeof (short int)) <= $ac_mid)] | 14760 | static int test_array [1 - 2 * !(((long) (sizeof (short int))) <= $ac_mid)]; |
14761 | test_array [0] = 0 | ||
14762 | |||
11005 | ; | 14763 | ; |
11006 | return 0; | 14764 | return 0; |
11007 | } | 14765 | } |
11008 | _ACEOF | 14766 | _ACEOF |
11009 | rm -f conftest.$ac_objext | 14767 | rm -f conftest.$ac_objext |
11010 | if { (eval echo "$as_me:11010: \"$ac_compile\"") >&5 | 14768 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
11011 | (eval $ac_compile) 2>&5 | 14769 | (eval $ac_compile) 2>conftest.er1 |
11012 | ac_status=$? | 14770 | ac_status=$? |
11013 | echo "$as_me:11013: \$? = $ac_status" >&5 | 14771 | grep -v '^ *+' conftest.er1 >conftest.err |
14772 | rm -f conftest.er1 | ||
14773 | cat conftest.err >&5 | ||
14774 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11014 | (exit $ac_status); } && | 14775 | (exit $ac_status); } && |
11015 | { ac_try='test -s conftest.$ac_objext' | 14776 | { ac_try='test -z "$ac_c_werror_flag" |
11016 | { (eval echo "$as_me:11016: \"$ac_try\"") >&5 | 14777 | || test ! -s conftest.err' |
14778 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14779 | (eval $ac_try) 2>&5 | ||
14780 | ac_status=$? | ||
14781 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14782 | (exit $ac_status); }; } && | ||
14783 | { ac_try='test -s conftest.$ac_objext' | ||
14784 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11017 | (eval $ac_try) 2>&5 | 14785 | (eval $ac_try) 2>&5 |
11018 | ac_status=$? | 14786 | ac_status=$? |
11019 | echo "$as_me:11019: \$? = $ac_status" >&5 | 14787 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
11020 | (exit $ac_status); }; }; then | 14788 | (exit $ac_status); }; }; then |
11021 | ac_hi=$ac_mid; break | 14789 | ac_hi=$ac_mid; break |
11022 | else | 14790 | else |
11023 | echo "$as_me: failed program was:" >&5 | 14791 | echo "$as_me: failed program was:" >&5 |
11024 | cat conftest.$ac_ext >&5 | 14792 | sed 's/^/| /' conftest.$ac_ext >&5 |
11025 | ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` | 14793 | |
14794 | ac_lo=`expr $ac_mid + 1` | ||
14795 | if test $ac_lo -le $ac_mid; then | ||
14796 | ac_lo= ac_hi= | ||
14797 | break | ||
14798 | fi | ||
14799 | ac_mid=`expr 2 '*' $ac_mid + 1` | ||
11026 | fi | 14800 | fi |
11027 | rm -f conftest.$ac_objext conftest.$ac_ext | 14801 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
11028 | done | 14802 | done |
11029 | else | 14803 | else |
11030 | echo "$as_me: failed program was:" >&5 | 14804 | echo "$as_me: failed program was:" >&5 |
11031 | cat conftest.$ac_ext >&5 | 14805 | sed 's/^/| /' conftest.$ac_ext >&5 |
11032 | ac_hi=-1 ac_mid=-1 | 14806 | |
14807 | cat >conftest.$ac_ext <<_ACEOF | ||
14808 | /* confdefs.h. */ | ||
14809 | _ACEOF | ||
14810 | cat confdefs.h >>conftest.$ac_ext | ||
14811 | cat >>conftest.$ac_ext <<_ACEOF | ||
14812 | /* end confdefs.h. */ | ||
14813 | $ac_includes_default | ||
14814 | int | ||
14815 | main () | ||
14816 | { | ||
14817 | static int test_array [1 - 2 * !(((long) (sizeof (short int))) < 0)]; | ||
14818 | test_array [0] = 0 | ||
14819 | |||
14820 | ; | ||
14821 | return 0; | ||
14822 | } | ||
14823 | _ACEOF | ||
14824 | rm -f conftest.$ac_objext | ||
14825 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
14826 | (eval $ac_compile) 2>conftest.er1 | ||
14827 | ac_status=$? | ||
14828 | grep -v '^ *+' conftest.er1 >conftest.err | ||
14829 | rm -f conftest.er1 | ||
14830 | cat conftest.err >&5 | ||
14831 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14832 | (exit $ac_status); } && | ||
14833 | { ac_try='test -z "$ac_c_werror_flag" | ||
14834 | || test ! -s conftest.err' | ||
14835 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14836 | (eval $ac_try) 2>&5 | ||
14837 | ac_status=$? | ||
14838 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14839 | (exit $ac_status); }; } && | ||
14840 | { ac_try='test -s conftest.$ac_objext' | ||
14841 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14842 | (eval $ac_try) 2>&5 | ||
14843 | ac_status=$? | ||
14844 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14845 | (exit $ac_status); }; }; then | ||
14846 | ac_hi=-1 ac_mid=-1 | ||
11033 | while :; do | 14847 | while :; do |
11034 | cat >conftest.$ac_ext <<_ACEOF | 14848 | cat >conftest.$ac_ext <<_ACEOF |
11035 | #line 11035 "configure" | 14849 | /* confdefs.h. */ |
11036 | #include "confdefs.h" | 14850 | _ACEOF |
14851 | cat confdefs.h >>conftest.$ac_ext | ||
14852 | cat >>conftest.$ac_ext <<_ACEOF | ||
14853 | /* end confdefs.h. */ | ||
11037 | $ac_includes_default | 14854 | $ac_includes_default |
11038 | int | 14855 | int |
11039 | main () | 14856 | main () |
11040 | { | 14857 | { |
11041 | int _array_ [1 - 2 * !((sizeof (short int)) >= $ac_mid)] | 14858 | static int test_array [1 - 2 * !(((long) (sizeof (short int))) >= $ac_mid)]; |
14859 | test_array [0] = 0 | ||
14860 | |||
11042 | ; | 14861 | ; |
11043 | return 0; | 14862 | return 0; |
11044 | } | 14863 | } |
11045 | _ACEOF | 14864 | _ACEOF |
11046 | rm -f conftest.$ac_objext | 14865 | rm -f conftest.$ac_objext |
11047 | if { (eval echo "$as_me:11047: \"$ac_compile\"") >&5 | 14866 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
11048 | (eval $ac_compile) 2>&5 | 14867 | (eval $ac_compile) 2>conftest.er1 |
11049 | ac_status=$? | 14868 | ac_status=$? |
11050 | echo "$as_me:11050: \$? = $ac_status" >&5 | 14869 | grep -v '^ *+' conftest.er1 >conftest.err |
14870 | rm -f conftest.er1 | ||
14871 | cat conftest.err >&5 | ||
14872 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11051 | (exit $ac_status); } && | 14873 | (exit $ac_status); } && |
11052 | { ac_try='test -s conftest.$ac_objext' | 14874 | { ac_try='test -z "$ac_c_werror_flag" |
11053 | { (eval echo "$as_me:11053: \"$ac_try\"") >&5 | 14875 | || test ! -s conftest.err' |
14876 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14877 | (eval $ac_try) 2>&5 | ||
14878 | ac_status=$? | ||
14879 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14880 | (exit $ac_status); }; } && | ||
14881 | { ac_try='test -s conftest.$ac_objext' | ||
14882 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11054 | (eval $ac_try) 2>&5 | 14883 | (eval $ac_try) 2>&5 |
11055 | ac_status=$? | 14884 | ac_status=$? |
11056 | echo "$as_me:11056: \$? = $ac_status" >&5 | 14885 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
11057 | (exit $ac_status); }; }; then | 14886 | (exit $ac_status); }; }; then |
11058 | ac_lo=$ac_mid; break | 14887 | ac_lo=$ac_mid; break |
11059 | else | 14888 | else |
11060 | echo "$as_me: failed program was:" >&5 | 14889 | echo "$as_me: failed program was:" >&5 |
11061 | cat conftest.$ac_ext >&5 | 14890 | sed 's/^/| /' conftest.$ac_ext >&5 |
11062 | ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` | 14891 | |
14892 | ac_hi=`expr '(' $ac_mid ')' - 1` | ||
14893 | if test $ac_mid -le $ac_hi; then | ||
14894 | ac_lo= ac_hi= | ||
14895 | break | ||
14896 | fi | ||
14897 | ac_mid=`expr 2 '*' $ac_mid` | ||
11063 | fi | 14898 | fi |
11064 | rm -f conftest.$ac_objext conftest.$ac_ext | 14899 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
11065 | done | 14900 | done |
14901 | else | ||
14902 | echo "$as_me: failed program was:" >&5 | ||
14903 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
14904 | |||
14905 | ac_lo= ac_hi= | ||
11066 | fi | 14906 | fi |
11067 | rm -f conftest.$ac_objext conftest.$ac_ext | 14907 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
14908 | fi | ||
14909 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11068 | # Binary search between lo and hi bounds. | 14910 | # Binary search between lo and hi bounds. |
11069 | while test "x$ac_lo" != "x$ac_hi"; do | 14911 | while test "x$ac_lo" != "x$ac_hi"; do |
11070 | ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` | 14912 | ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` |
11071 | cat >conftest.$ac_ext <<_ACEOF | 14913 | cat >conftest.$ac_ext <<_ACEOF |
11072 | #line 11072 "configure" | 14914 | /* confdefs.h. */ |
11073 | #include "confdefs.h" | 14915 | _ACEOF |
14916 | cat confdefs.h >>conftest.$ac_ext | ||
14917 | cat >>conftest.$ac_ext <<_ACEOF | ||
14918 | /* end confdefs.h. */ | ||
11074 | $ac_includes_default | 14919 | $ac_includes_default |
11075 | int | 14920 | int |
11076 | main () | 14921 | main () |
11077 | { | 14922 | { |
11078 | int _array_ [1 - 2 * !((sizeof (short int)) <= $ac_mid)] | 14923 | static int test_array [1 - 2 * !(((long) (sizeof (short int))) <= $ac_mid)]; |
14924 | test_array [0] = 0 | ||
14925 | |||
11079 | ; | 14926 | ; |
11080 | return 0; | 14927 | return 0; |
11081 | } | 14928 | } |
11082 | _ACEOF | 14929 | _ACEOF |
11083 | rm -f conftest.$ac_objext | 14930 | rm -f conftest.$ac_objext |
11084 | if { (eval echo "$as_me:11084: \"$ac_compile\"") >&5 | 14931 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
11085 | (eval $ac_compile) 2>&5 | 14932 | (eval $ac_compile) 2>conftest.er1 |
11086 | ac_status=$? | 14933 | ac_status=$? |
11087 | echo "$as_me:11087: \$? = $ac_status" >&5 | 14934 | grep -v '^ *+' conftest.er1 >conftest.err |
14935 | rm -f conftest.er1 | ||
14936 | cat conftest.err >&5 | ||
14937 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11088 | (exit $ac_status); } && | 14938 | (exit $ac_status); } && |
11089 | { ac_try='test -s conftest.$ac_objext' | 14939 | { ac_try='test -z "$ac_c_werror_flag" |
11090 | { (eval echo "$as_me:11090: \"$ac_try\"") >&5 | 14940 | || test ! -s conftest.err' |
14941 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11091 | (eval $ac_try) 2>&5 | 14942 | (eval $ac_try) 2>&5 |
11092 | ac_status=$? | 14943 | ac_status=$? |
11093 | echo "$as_me:11093: \$? = $ac_status" >&5 | 14944 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
14945 | (exit $ac_status); }; } && | ||
14946 | { ac_try='test -s conftest.$ac_objext' | ||
14947 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14948 | (eval $ac_try) 2>&5 | ||
14949 | ac_status=$? | ||
14950 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11094 | (exit $ac_status); }; }; then | 14951 | (exit $ac_status); }; }; then |
11095 | ac_hi=$ac_mid | 14952 | ac_hi=$ac_mid |
11096 | else | 14953 | else |
11097 | echo "$as_me: failed program was:" >&5 | 14954 | echo "$as_me: failed program was:" >&5 |
11098 | cat conftest.$ac_ext >&5 | 14955 | sed 's/^/| /' conftest.$ac_ext >&5 |
11099 | ac_lo=`expr $ac_mid + 1` | 14956 | |
14957 | ac_lo=`expr '(' $ac_mid ')' + 1` | ||
11100 | fi | 14958 | fi |
11101 | rm -f conftest.$ac_objext conftest.$ac_ext | 14959 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
11102 | done | 14960 | done |
11103 | ac_cv_sizeof_short_int=$ac_lo | 14961 | case $ac_lo in |
14962 | ?*) ac_cv_sizeof_short_int=$ac_lo;; | ||
14963 | '') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short int), 77 | ||
14964 | See \`config.log' for more details." >&5 | ||
14965 | echo "$as_me: error: cannot compute sizeof (short int), 77 | ||
14966 | See \`config.log' for more details." >&2;} | ||
14967 | { (exit 1); exit 1; }; } ;; | ||
14968 | esac | ||
11104 | else | 14969 | else |
11105 | if test "$cross_compiling" = yes; then | 14970 | if test "$cross_compiling" = yes; then |
11106 | { { echo "$as_me:11106: error: cannot run test program while cross compiling" >&5 | 14971 | { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
11107 | echo "$as_me: error: cannot run test program while cross compiling" >&2;} | 14972 | See \`config.log' for more details." >&5 |
14973 | echo "$as_me: error: cannot run test program while cross compiling | ||
14974 | See \`config.log' for more details." >&2;} | ||
11108 | { (exit 1); exit 1; }; } | 14975 | { (exit 1); exit 1; }; } |
11109 | else | 14976 | else |
11110 | cat >conftest.$ac_ext <<_ACEOF | 14977 | cat >conftest.$ac_ext <<_ACEOF |
11111 | #line 11111 "configure" | 14978 | /* confdefs.h. */ |
11112 | #include "confdefs.h" | 14979 | _ACEOF |
14980 | cat confdefs.h >>conftest.$ac_ext | ||
14981 | cat >>conftest.$ac_ext <<_ACEOF | ||
14982 | /* end confdefs.h. */ | ||
11113 | $ac_includes_default | 14983 | $ac_includes_default |
14984 | long longval () { return (long) (sizeof (short int)); } | ||
14985 | unsigned long ulongval () { return (long) (sizeof (short int)); } | ||
14986 | #include <stdio.h> | ||
14987 | #include <stdlib.h> | ||
11114 | int | 14988 | int |
11115 | main () | 14989 | main () |
11116 | { | 14990 | { |
11117 | FILE *f = fopen ("conftest.val", "w"); | 14991 | |
11118 | if (!f) | 14992 | FILE *f = fopen ("conftest.val", "w"); |
11119 | exit (1); | 14993 | if (! f) |
11120 | fprintf (f, "%d", (sizeof (short int))); | 14994 | exit (1); |
11121 | fclose (f); | 14995 | if (((long) (sizeof (short int))) < 0) |
14996 | { | ||
14997 | long i = longval (); | ||
14998 | if (i != ((long) (sizeof (short int)))) | ||
14999 | exit (1); | ||
15000 | fprintf (f, "%ld\n", i); | ||
15001 | } | ||
15002 | else | ||
15003 | { | ||
15004 | unsigned long i = ulongval (); | ||
15005 | if (i != ((long) (sizeof (short int)))) | ||
15006 | exit (1); | ||
15007 | fprintf (f, "%lu\n", i); | ||
15008 | } | ||
15009 | exit (ferror (f) || fclose (f) != 0); | ||
15010 | |||
11122 | ; | 15011 | ; |
11123 | return 0; | 15012 | return 0; |
11124 | } | 15013 | } |
11125 | _ACEOF | 15014 | _ACEOF |
11126 | rm -f conftest$ac_exeext | 15015 | rm -f conftest$ac_exeext |
11127 | if { (eval echo "$as_me:11127: \"$ac_link\"") >&5 | 15016 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
11128 | (eval $ac_link) 2>&5 | 15017 | (eval $ac_link) 2>&5 |
11129 | ac_status=$? | 15018 | ac_status=$? |
11130 | echo "$as_me:11130: \$? = $ac_status" >&5 | 15019 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
11131 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | 15020 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
11132 | { (eval echo "$as_me:11132: \"$ac_try\"") >&5 | 15021 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
11133 | (eval $ac_try) 2>&5 | 15022 | (eval $ac_try) 2>&5 |
11134 | ac_status=$? | 15023 | ac_status=$? |
11135 | echo "$as_me:11135: \$? = $ac_status" >&5 | 15024 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
11136 | (exit $ac_status); }; }; then | 15025 | (exit $ac_status); }; }; then |
11137 | ac_cv_sizeof_short_int=`cat conftest.val` | 15026 | ac_cv_sizeof_short_int=`cat conftest.val` |
11138 | else | 15027 | else |
11139 | echo "$as_me: program exited with status $ac_status" >&5 | 15028 | echo "$as_me: program exited with status $ac_status" >&5 |
11140 | echo "$as_me: failed program was:" >&5 | 15029 | echo "$as_me: failed program was:" >&5 |
11141 | cat conftest.$ac_ext >&5 | 15030 | sed 's/^/| /' conftest.$ac_ext >&5 |
15031 | |||
15032 | ( exit $ac_status ) | ||
15033 | { { echo "$as_me:$LINENO: error: cannot compute sizeof (short int), 77 | ||
15034 | See \`config.log' for more details." >&5 | ||
15035 | echo "$as_me: error: cannot compute sizeof (short int), 77 | ||
15036 | See \`config.log' for more details." >&2;} | ||
15037 | { (exit 1); exit 1; }; } | ||
11142 | fi | 15038 | fi |
11143 | rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | 15039 | rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext |
11144 | fi | 15040 | fi |
11145 | fi | 15041 | fi |
11146 | rm -f conftest.val | 15042 | rm -f conftest.val |
@@ -11148,20 +15044,24 @@ else | |||
11148 | ac_cv_sizeof_short_int=0 | 15044 | ac_cv_sizeof_short_int=0 |
11149 | fi | 15045 | fi |
11150 | fi | 15046 | fi |
11151 | echo "$as_me:11151: result: $ac_cv_sizeof_short_int" >&5 | 15047 | echo "$as_me:$LINENO: result: $ac_cv_sizeof_short_int" >&5 |
11152 | echo "${ECHO_T}$ac_cv_sizeof_short_int" >&6 | 15048 | echo "${ECHO_T}$ac_cv_sizeof_short_int" >&6 |
11153 | cat >>confdefs.h <<EOF | 15049 | cat >>confdefs.h <<_ACEOF |
11154 | #define SIZEOF_SHORT_INT $ac_cv_sizeof_short_int | 15050 | #define SIZEOF_SHORT_INT $ac_cv_sizeof_short_int |
11155 | EOF | 15051 | _ACEOF |
11156 | 15052 | ||
11157 | echo "$as_me:11157: checking for int" >&5 | 15053 | |
15054 | echo "$as_me:$LINENO: checking for int" >&5 | ||
11158 | echo $ECHO_N "checking for int... $ECHO_C" >&6 | 15055 | echo $ECHO_N "checking for int... $ECHO_C" >&6 |
11159 | if test "${ac_cv_type_int+set}" = set; then | 15056 | if test "${ac_cv_type_int+set}" = set; then |
11160 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 15057 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
11161 | else | 15058 | else |
11162 | cat >conftest.$ac_ext <<_ACEOF | 15059 | cat >conftest.$ac_ext <<_ACEOF |
11163 | #line 11163 "configure" | 15060 | /* confdefs.h. */ |
11164 | #include "confdefs.h" | 15061 | _ACEOF |
15062 | cat confdefs.h >>conftest.$ac_ext | ||
15063 | cat >>conftest.$ac_ext <<_ACEOF | ||
15064 | /* end confdefs.h. */ | ||
11165 | $ac_includes_default | 15065 | $ac_includes_default |
11166 | int | 15066 | int |
11167 | main () | 15067 | main () |
@@ -11175,209 +15075,382 @@ if (sizeof (int)) | |||
11175 | } | 15075 | } |
11176 | _ACEOF | 15076 | _ACEOF |
11177 | rm -f conftest.$ac_objext | 15077 | rm -f conftest.$ac_objext |
11178 | if { (eval echo "$as_me:11178: \"$ac_compile\"") >&5 | 15078 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
11179 | (eval $ac_compile) 2>&5 | 15079 | (eval $ac_compile) 2>conftest.er1 |
11180 | ac_status=$? | 15080 | ac_status=$? |
11181 | echo "$as_me:11181: \$? = $ac_status" >&5 | 15081 | grep -v '^ *+' conftest.er1 >conftest.err |
15082 | rm -f conftest.er1 | ||
15083 | cat conftest.err >&5 | ||
15084 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11182 | (exit $ac_status); } && | 15085 | (exit $ac_status); } && |
11183 | { ac_try='test -s conftest.$ac_objext' | 15086 | { ac_try='test -z "$ac_c_werror_flag" |
11184 | { (eval echo "$as_me:11184: \"$ac_try\"") >&5 | 15087 | || test ! -s conftest.err' |
15088 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11185 | (eval $ac_try) 2>&5 | 15089 | (eval $ac_try) 2>&5 |
11186 | ac_status=$? | 15090 | ac_status=$? |
11187 | echo "$as_me:11187: \$? = $ac_status" >&5 | 15091 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15092 | (exit $ac_status); }; } && | ||
15093 | { ac_try='test -s conftest.$ac_objext' | ||
15094 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15095 | (eval $ac_try) 2>&5 | ||
15096 | ac_status=$? | ||
15097 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11188 | (exit $ac_status); }; }; then | 15098 | (exit $ac_status); }; }; then |
11189 | ac_cv_type_int=yes | 15099 | ac_cv_type_int=yes |
11190 | else | 15100 | else |
11191 | echo "$as_me: failed program was:" >&5 | 15101 | echo "$as_me: failed program was:" >&5 |
11192 | cat conftest.$ac_ext >&5 | 15102 | sed 's/^/| /' conftest.$ac_ext >&5 |
15103 | |||
11193 | ac_cv_type_int=no | 15104 | ac_cv_type_int=no |
11194 | fi | 15105 | fi |
11195 | rm -f conftest.$ac_objext conftest.$ac_ext | 15106 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
11196 | fi | 15107 | fi |
11197 | echo "$as_me:11197: result: $ac_cv_type_int" >&5 | 15108 | echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5 |
11198 | echo "${ECHO_T}$ac_cv_type_int" >&6 | 15109 | echo "${ECHO_T}$ac_cv_type_int" >&6 |
11199 | 15110 | ||
11200 | echo "$as_me:11200: checking size of int" >&5 | 15111 | echo "$as_me:$LINENO: checking size of int" >&5 |
11201 | echo $ECHO_N "checking size of int... $ECHO_C" >&6 | 15112 | echo $ECHO_N "checking size of int... $ECHO_C" >&6 |
11202 | if test "${ac_cv_sizeof_int+set}" = set; then | 15113 | if test "${ac_cv_sizeof_int+set}" = set; then |
11203 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 15114 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
11204 | else | 15115 | else |
11205 | if test "$ac_cv_type_int" = yes; then | 15116 | if test "$ac_cv_type_int" = yes; then |
15117 | # The cast to unsigned long works around a bug in the HP C Compiler | ||
15118 | # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects | ||
15119 | # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. | ||
15120 | # This bug is HP SR number 8606223364. | ||
11206 | if test "$cross_compiling" = yes; then | 15121 | if test "$cross_compiling" = yes; then |
11207 | # Depending upon the size, compute the lo and hi bounds. | 15122 | # Depending upon the size, compute the lo and hi bounds. |
11208 | cat >conftest.$ac_ext <<_ACEOF | 15123 | cat >conftest.$ac_ext <<_ACEOF |
11209 | #line 11209 "configure" | 15124 | /* confdefs.h. */ |
11210 | #include "confdefs.h" | 15125 | _ACEOF |
15126 | cat confdefs.h >>conftest.$ac_ext | ||
15127 | cat >>conftest.$ac_ext <<_ACEOF | ||
15128 | /* end confdefs.h. */ | ||
11211 | $ac_includes_default | 15129 | $ac_includes_default |
11212 | int | 15130 | int |
11213 | main () | 15131 | main () |
11214 | { | 15132 | { |
11215 | int _array_ [1 - 2 * !((sizeof (int)) >= 0)] | 15133 | static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)]; |
15134 | test_array [0] = 0 | ||
15135 | |||
11216 | ; | 15136 | ; |
11217 | return 0; | 15137 | return 0; |
11218 | } | 15138 | } |
11219 | _ACEOF | 15139 | _ACEOF |
11220 | rm -f conftest.$ac_objext | 15140 | rm -f conftest.$ac_objext |
11221 | if { (eval echo "$as_me:11221: \"$ac_compile\"") >&5 | 15141 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
11222 | (eval $ac_compile) 2>&5 | 15142 | (eval $ac_compile) 2>conftest.er1 |
11223 | ac_status=$? | 15143 | ac_status=$? |
11224 | echo "$as_me:11224: \$? = $ac_status" >&5 | 15144 | grep -v '^ *+' conftest.er1 >conftest.err |
15145 | rm -f conftest.er1 | ||
15146 | cat conftest.err >&5 | ||
15147 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11225 | (exit $ac_status); } && | 15148 | (exit $ac_status); } && |
11226 | { ac_try='test -s conftest.$ac_objext' | 15149 | { ac_try='test -z "$ac_c_werror_flag" |
11227 | { (eval echo "$as_me:11227: \"$ac_try\"") >&5 | 15150 | || test ! -s conftest.err' |
15151 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11228 | (eval $ac_try) 2>&5 | 15152 | (eval $ac_try) 2>&5 |
11229 | ac_status=$? | 15153 | ac_status=$? |
11230 | echo "$as_me:11230: \$? = $ac_status" >&5 | 15154 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15155 | (exit $ac_status); }; } && | ||
15156 | { ac_try='test -s conftest.$ac_objext' | ||
15157 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15158 | (eval $ac_try) 2>&5 | ||
15159 | ac_status=$? | ||
15160 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11231 | (exit $ac_status); }; }; then | 15161 | (exit $ac_status); }; }; then |
11232 | ac_lo=0 ac_mid=0 | 15162 | ac_lo=0 ac_mid=0 |
11233 | while :; do | 15163 | while :; do |
11234 | cat >conftest.$ac_ext <<_ACEOF | 15164 | cat >conftest.$ac_ext <<_ACEOF |
11235 | #line 11235 "configure" | 15165 | /* confdefs.h. */ |
11236 | #include "confdefs.h" | 15166 | _ACEOF |
15167 | cat confdefs.h >>conftest.$ac_ext | ||
15168 | cat >>conftest.$ac_ext <<_ACEOF | ||
15169 | /* end confdefs.h. */ | ||
11237 | $ac_includes_default | 15170 | $ac_includes_default |
11238 | int | 15171 | int |
11239 | main () | 15172 | main () |
11240 | { | 15173 | { |
11241 | int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)] | 15174 | static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; |
15175 | test_array [0] = 0 | ||
15176 | |||
11242 | ; | 15177 | ; |
11243 | return 0; | 15178 | return 0; |
11244 | } | 15179 | } |
11245 | _ACEOF | 15180 | _ACEOF |
11246 | rm -f conftest.$ac_objext | 15181 | rm -f conftest.$ac_objext |
11247 | if { (eval echo "$as_me:11247: \"$ac_compile\"") >&5 | 15182 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
11248 | (eval $ac_compile) 2>&5 | 15183 | (eval $ac_compile) 2>conftest.er1 |
11249 | ac_status=$? | 15184 | ac_status=$? |
11250 | echo "$as_me:11250: \$? = $ac_status" >&5 | 15185 | grep -v '^ *+' conftest.er1 >conftest.err |
15186 | rm -f conftest.er1 | ||
15187 | cat conftest.err >&5 | ||
15188 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11251 | (exit $ac_status); } && | 15189 | (exit $ac_status); } && |
11252 | { ac_try='test -s conftest.$ac_objext' | 15190 | { ac_try='test -z "$ac_c_werror_flag" |
11253 | { (eval echo "$as_me:11253: \"$ac_try\"") >&5 | 15191 | || test ! -s conftest.err' |
15192 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15193 | (eval $ac_try) 2>&5 | ||
15194 | ac_status=$? | ||
15195 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15196 | (exit $ac_status); }; } && | ||
15197 | { ac_try='test -s conftest.$ac_objext' | ||
15198 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11254 | (eval $ac_try) 2>&5 | 15199 | (eval $ac_try) 2>&5 |
11255 | ac_status=$? | 15200 | ac_status=$? |
11256 | echo "$as_me:11256: \$? = $ac_status" >&5 | 15201 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
11257 | (exit $ac_status); }; }; then | 15202 | (exit $ac_status); }; }; then |
11258 | ac_hi=$ac_mid; break | 15203 | ac_hi=$ac_mid; break |
11259 | else | 15204 | else |
11260 | echo "$as_me: failed program was:" >&5 | 15205 | echo "$as_me: failed program was:" >&5 |
11261 | cat conftest.$ac_ext >&5 | 15206 | sed 's/^/| /' conftest.$ac_ext >&5 |
11262 | ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` | 15207 | |
15208 | ac_lo=`expr $ac_mid + 1` | ||
15209 | if test $ac_lo -le $ac_mid; then | ||
15210 | ac_lo= ac_hi= | ||
15211 | break | ||
15212 | fi | ||
15213 | ac_mid=`expr 2 '*' $ac_mid + 1` | ||
11263 | fi | 15214 | fi |
11264 | rm -f conftest.$ac_objext conftest.$ac_ext | 15215 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
11265 | done | 15216 | done |
11266 | else | 15217 | else |
11267 | echo "$as_me: failed program was:" >&5 | 15218 | echo "$as_me: failed program was:" >&5 |
11268 | cat conftest.$ac_ext >&5 | 15219 | sed 's/^/| /' conftest.$ac_ext >&5 |
11269 | ac_hi=-1 ac_mid=-1 | 15220 | |
15221 | cat >conftest.$ac_ext <<_ACEOF | ||
15222 | /* confdefs.h. */ | ||
15223 | _ACEOF | ||
15224 | cat confdefs.h >>conftest.$ac_ext | ||
15225 | cat >>conftest.$ac_ext <<_ACEOF | ||
15226 | /* end confdefs.h. */ | ||
15227 | $ac_includes_default | ||
15228 | int | ||
15229 | main () | ||
15230 | { | ||
15231 | static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)]; | ||
15232 | test_array [0] = 0 | ||
15233 | |||
15234 | ; | ||
15235 | return 0; | ||
15236 | } | ||
15237 | _ACEOF | ||
15238 | rm -f conftest.$ac_objext | ||
15239 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
15240 | (eval $ac_compile) 2>conftest.er1 | ||
15241 | ac_status=$? | ||
15242 | grep -v '^ *+' conftest.er1 >conftest.err | ||
15243 | rm -f conftest.er1 | ||
15244 | cat conftest.err >&5 | ||
15245 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15246 | (exit $ac_status); } && | ||
15247 | { ac_try='test -z "$ac_c_werror_flag" | ||
15248 | || test ! -s conftest.err' | ||
15249 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15250 | (eval $ac_try) 2>&5 | ||
15251 | ac_status=$? | ||
15252 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15253 | (exit $ac_status); }; } && | ||
15254 | { ac_try='test -s conftest.$ac_objext' | ||
15255 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15256 | (eval $ac_try) 2>&5 | ||
15257 | ac_status=$? | ||
15258 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15259 | (exit $ac_status); }; }; then | ||
15260 | ac_hi=-1 ac_mid=-1 | ||
11270 | while :; do | 15261 | while :; do |
11271 | cat >conftest.$ac_ext <<_ACEOF | 15262 | cat >conftest.$ac_ext <<_ACEOF |
11272 | #line 11272 "configure" | 15263 | /* confdefs.h. */ |
11273 | #include "confdefs.h" | 15264 | _ACEOF |
15265 | cat confdefs.h >>conftest.$ac_ext | ||
15266 | cat >>conftest.$ac_ext <<_ACEOF | ||
15267 | /* end confdefs.h. */ | ||
11274 | $ac_includes_default | 15268 | $ac_includes_default |
11275 | int | 15269 | int |
11276 | main () | 15270 | main () |
11277 | { | 15271 | { |
11278 | int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)] | 15272 | static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)]; |
15273 | test_array [0] = 0 | ||
15274 | |||
11279 | ; | 15275 | ; |
11280 | return 0; | 15276 | return 0; |
11281 | } | 15277 | } |
11282 | _ACEOF | 15278 | _ACEOF |
11283 | rm -f conftest.$ac_objext | 15279 | rm -f conftest.$ac_objext |
11284 | if { (eval echo "$as_me:11284: \"$ac_compile\"") >&5 | 15280 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
11285 | (eval $ac_compile) 2>&5 | 15281 | (eval $ac_compile) 2>conftest.er1 |
11286 | ac_status=$? | 15282 | ac_status=$? |
11287 | echo "$as_me:11287: \$? = $ac_status" >&5 | 15283 | grep -v '^ *+' conftest.er1 >conftest.err |
15284 | rm -f conftest.er1 | ||
15285 | cat conftest.err >&5 | ||
15286 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11288 | (exit $ac_status); } && | 15287 | (exit $ac_status); } && |
11289 | { ac_try='test -s conftest.$ac_objext' | 15288 | { ac_try='test -z "$ac_c_werror_flag" |
11290 | { (eval echo "$as_me:11290: \"$ac_try\"") >&5 | 15289 | || test ! -s conftest.err' |
15290 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11291 | (eval $ac_try) 2>&5 | 15291 | (eval $ac_try) 2>&5 |
11292 | ac_status=$? | 15292 | ac_status=$? |
11293 | echo "$as_me:11293: \$? = $ac_status" >&5 | 15293 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15294 | (exit $ac_status); }; } && | ||
15295 | { ac_try='test -s conftest.$ac_objext' | ||
15296 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15297 | (eval $ac_try) 2>&5 | ||
15298 | ac_status=$? | ||
15299 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11294 | (exit $ac_status); }; }; then | 15300 | (exit $ac_status); }; }; then |
11295 | ac_lo=$ac_mid; break | 15301 | ac_lo=$ac_mid; break |
11296 | else | 15302 | else |
11297 | echo "$as_me: failed program was:" >&5 | 15303 | echo "$as_me: failed program was:" >&5 |
11298 | cat conftest.$ac_ext >&5 | 15304 | sed 's/^/| /' conftest.$ac_ext >&5 |
11299 | ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` | 15305 | |
15306 | ac_hi=`expr '(' $ac_mid ')' - 1` | ||
15307 | if test $ac_mid -le $ac_hi; then | ||
15308 | ac_lo= ac_hi= | ||
15309 | break | ||
15310 | fi | ||
15311 | ac_mid=`expr 2 '*' $ac_mid` | ||
11300 | fi | 15312 | fi |
11301 | rm -f conftest.$ac_objext conftest.$ac_ext | 15313 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
11302 | done | 15314 | done |
15315 | else | ||
15316 | echo "$as_me: failed program was:" >&5 | ||
15317 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
15318 | |||
15319 | ac_lo= ac_hi= | ||
15320 | fi | ||
15321 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11303 | fi | 15322 | fi |
11304 | rm -f conftest.$ac_objext conftest.$ac_ext | 15323 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
11305 | # Binary search between lo and hi bounds. | 15324 | # Binary search between lo and hi bounds. |
11306 | while test "x$ac_lo" != "x$ac_hi"; do | 15325 | while test "x$ac_lo" != "x$ac_hi"; do |
11307 | ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` | 15326 | ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` |
11308 | cat >conftest.$ac_ext <<_ACEOF | 15327 | cat >conftest.$ac_ext <<_ACEOF |
11309 | #line 11309 "configure" | 15328 | /* confdefs.h. */ |
11310 | #include "confdefs.h" | 15329 | _ACEOF |
15330 | cat confdefs.h >>conftest.$ac_ext | ||
15331 | cat >>conftest.$ac_ext <<_ACEOF | ||
15332 | /* end confdefs.h. */ | ||
11311 | $ac_includes_default | 15333 | $ac_includes_default |
11312 | int | 15334 | int |
11313 | main () | 15335 | main () |
11314 | { | 15336 | { |
11315 | int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)] | 15337 | static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; |
15338 | test_array [0] = 0 | ||
15339 | |||
11316 | ; | 15340 | ; |
11317 | return 0; | 15341 | return 0; |
11318 | } | 15342 | } |
11319 | _ACEOF | 15343 | _ACEOF |
11320 | rm -f conftest.$ac_objext | 15344 | rm -f conftest.$ac_objext |
11321 | if { (eval echo "$as_me:11321: \"$ac_compile\"") >&5 | 15345 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
11322 | (eval $ac_compile) 2>&5 | 15346 | (eval $ac_compile) 2>conftest.er1 |
11323 | ac_status=$? | 15347 | ac_status=$? |
11324 | echo "$as_me:11324: \$? = $ac_status" >&5 | 15348 | grep -v '^ *+' conftest.er1 >conftest.err |
15349 | rm -f conftest.er1 | ||
15350 | cat conftest.err >&5 | ||
15351 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11325 | (exit $ac_status); } && | 15352 | (exit $ac_status); } && |
11326 | { ac_try='test -s conftest.$ac_objext' | 15353 | { ac_try='test -z "$ac_c_werror_flag" |
11327 | { (eval echo "$as_me:11327: \"$ac_try\"") >&5 | 15354 | || test ! -s conftest.err' |
15355 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15356 | (eval $ac_try) 2>&5 | ||
15357 | ac_status=$? | ||
15358 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15359 | (exit $ac_status); }; } && | ||
15360 | { ac_try='test -s conftest.$ac_objext' | ||
15361 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11328 | (eval $ac_try) 2>&5 | 15362 | (eval $ac_try) 2>&5 |
11329 | ac_status=$? | 15363 | ac_status=$? |
11330 | echo "$as_me:11330: \$? = $ac_status" >&5 | 15364 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
11331 | (exit $ac_status); }; }; then | 15365 | (exit $ac_status); }; }; then |
11332 | ac_hi=$ac_mid | 15366 | ac_hi=$ac_mid |
11333 | else | 15367 | else |
11334 | echo "$as_me: failed program was:" >&5 | 15368 | echo "$as_me: failed program was:" >&5 |
11335 | cat conftest.$ac_ext >&5 | 15369 | sed 's/^/| /' conftest.$ac_ext >&5 |
11336 | ac_lo=`expr $ac_mid + 1` | 15370 | |
15371 | ac_lo=`expr '(' $ac_mid ')' + 1` | ||
11337 | fi | 15372 | fi |
11338 | rm -f conftest.$ac_objext conftest.$ac_ext | 15373 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
11339 | done | 15374 | done |
11340 | ac_cv_sizeof_int=$ac_lo | 15375 | case $ac_lo in |
15376 | ?*) ac_cv_sizeof_int=$ac_lo;; | ||
15377 | '') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 | ||
15378 | See \`config.log' for more details." >&5 | ||
15379 | echo "$as_me: error: cannot compute sizeof (int), 77 | ||
15380 | See \`config.log' for more details." >&2;} | ||
15381 | { (exit 1); exit 1; }; } ;; | ||
15382 | esac | ||
11341 | else | 15383 | else |
11342 | if test "$cross_compiling" = yes; then | 15384 | if test "$cross_compiling" = yes; then |
11343 | { { echo "$as_me:11343: error: cannot run test program while cross compiling" >&5 | 15385 | { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
11344 | echo "$as_me: error: cannot run test program while cross compiling" >&2;} | 15386 | See \`config.log' for more details." >&5 |
15387 | echo "$as_me: error: cannot run test program while cross compiling | ||
15388 | See \`config.log' for more details." >&2;} | ||
11345 | { (exit 1); exit 1; }; } | 15389 | { (exit 1); exit 1; }; } |
11346 | else | 15390 | else |
11347 | cat >conftest.$ac_ext <<_ACEOF | 15391 | cat >conftest.$ac_ext <<_ACEOF |
11348 | #line 11348 "configure" | 15392 | /* confdefs.h. */ |
11349 | #include "confdefs.h" | 15393 | _ACEOF |
15394 | cat confdefs.h >>conftest.$ac_ext | ||
15395 | cat >>conftest.$ac_ext <<_ACEOF | ||
15396 | /* end confdefs.h. */ | ||
11350 | $ac_includes_default | 15397 | $ac_includes_default |
15398 | long longval () { return (long) (sizeof (int)); } | ||
15399 | unsigned long ulongval () { return (long) (sizeof (int)); } | ||
15400 | #include <stdio.h> | ||
15401 | #include <stdlib.h> | ||
11351 | int | 15402 | int |
11352 | main () | 15403 | main () |
11353 | { | 15404 | { |
11354 | FILE *f = fopen ("conftest.val", "w"); | 15405 | |
11355 | if (!f) | 15406 | FILE *f = fopen ("conftest.val", "w"); |
11356 | exit (1); | 15407 | if (! f) |
11357 | fprintf (f, "%d", (sizeof (int))); | 15408 | exit (1); |
11358 | fclose (f); | 15409 | if (((long) (sizeof (int))) < 0) |
15410 | { | ||
15411 | long i = longval (); | ||
15412 | if (i != ((long) (sizeof (int)))) | ||
15413 | exit (1); | ||
15414 | fprintf (f, "%ld\n", i); | ||
15415 | } | ||
15416 | else | ||
15417 | { | ||
15418 | unsigned long i = ulongval (); | ||
15419 | if (i != ((long) (sizeof (int)))) | ||
15420 | exit (1); | ||
15421 | fprintf (f, "%lu\n", i); | ||
15422 | } | ||
15423 | exit (ferror (f) || fclose (f) != 0); | ||
15424 | |||
11359 | ; | 15425 | ; |
11360 | return 0; | 15426 | return 0; |
11361 | } | 15427 | } |
11362 | _ACEOF | 15428 | _ACEOF |
11363 | rm -f conftest$ac_exeext | 15429 | rm -f conftest$ac_exeext |
11364 | if { (eval echo "$as_me:11364: \"$ac_link\"") >&5 | 15430 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
11365 | (eval $ac_link) 2>&5 | 15431 | (eval $ac_link) 2>&5 |
11366 | ac_status=$? | 15432 | ac_status=$? |
11367 | echo "$as_me:11367: \$? = $ac_status" >&5 | 15433 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
11368 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | 15434 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
11369 | { (eval echo "$as_me:11369: \"$ac_try\"") >&5 | 15435 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
11370 | (eval $ac_try) 2>&5 | 15436 | (eval $ac_try) 2>&5 |
11371 | ac_status=$? | 15437 | ac_status=$? |
11372 | echo "$as_me:11372: \$? = $ac_status" >&5 | 15438 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
11373 | (exit $ac_status); }; }; then | 15439 | (exit $ac_status); }; }; then |
11374 | ac_cv_sizeof_int=`cat conftest.val` | 15440 | ac_cv_sizeof_int=`cat conftest.val` |
11375 | else | 15441 | else |
11376 | echo "$as_me: program exited with status $ac_status" >&5 | 15442 | echo "$as_me: program exited with status $ac_status" >&5 |
11377 | echo "$as_me: failed program was:" >&5 | 15443 | echo "$as_me: failed program was:" >&5 |
11378 | cat conftest.$ac_ext >&5 | 15444 | sed 's/^/| /' conftest.$ac_ext >&5 |
15445 | |||
15446 | ( exit $ac_status ) | ||
15447 | { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 | ||
15448 | See \`config.log' for more details." >&5 | ||
15449 | echo "$as_me: error: cannot compute sizeof (int), 77 | ||
15450 | See \`config.log' for more details." >&2;} | ||
15451 | { (exit 1); exit 1; }; } | ||
11379 | fi | 15452 | fi |
11380 | rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | 15453 | rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext |
11381 | fi | 15454 | fi |
11382 | fi | 15455 | fi |
11383 | rm -f conftest.val | 15456 | rm -f conftest.val |
@@ -11385,20 +15458,24 @@ else | |||
11385 | ac_cv_sizeof_int=0 | 15458 | ac_cv_sizeof_int=0 |
11386 | fi | 15459 | fi |
11387 | fi | 15460 | fi |
11388 | echo "$as_me:11388: result: $ac_cv_sizeof_int" >&5 | 15461 | echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 |
11389 | echo "${ECHO_T}$ac_cv_sizeof_int" >&6 | 15462 | echo "${ECHO_T}$ac_cv_sizeof_int" >&6 |
11390 | cat >>confdefs.h <<EOF | 15463 | cat >>confdefs.h <<_ACEOF |
11391 | #define SIZEOF_INT $ac_cv_sizeof_int | 15464 | #define SIZEOF_INT $ac_cv_sizeof_int |
11392 | EOF | 15465 | _ACEOF |
15466 | |||
11393 | 15467 | ||
11394 | echo "$as_me:11394: checking for long int" >&5 | 15468 | echo "$as_me:$LINENO: checking for long int" >&5 |
11395 | echo $ECHO_N "checking for long int... $ECHO_C" >&6 | 15469 | echo $ECHO_N "checking for long int... $ECHO_C" >&6 |
11396 | if test "${ac_cv_type_long_int+set}" = set; then | 15470 | if test "${ac_cv_type_long_int+set}" = set; then |
11397 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 15471 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
11398 | else | 15472 | else |
11399 | cat >conftest.$ac_ext <<_ACEOF | 15473 | cat >conftest.$ac_ext <<_ACEOF |
11400 | #line 11400 "configure" | 15474 | /* confdefs.h. */ |
11401 | #include "confdefs.h" | 15475 | _ACEOF |
15476 | cat confdefs.h >>conftest.$ac_ext | ||
15477 | cat >>conftest.$ac_ext <<_ACEOF | ||
15478 | /* end confdefs.h. */ | ||
11402 | $ac_includes_default | 15479 | $ac_includes_default |
11403 | int | 15480 | int |
11404 | main () | 15481 | main () |
@@ -11412,209 +15489,382 @@ if (sizeof (long int)) | |||
11412 | } | 15489 | } |
11413 | _ACEOF | 15490 | _ACEOF |
11414 | rm -f conftest.$ac_objext | 15491 | rm -f conftest.$ac_objext |
11415 | if { (eval echo "$as_me:11415: \"$ac_compile\"") >&5 | 15492 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
11416 | (eval $ac_compile) 2>&5 | 15493 | (eval $ac_compile) 2>conftest.er1 |
11417 | ac_status=$? | 15494 | ac_status=$? |
11418 | echo "$as_me:11418: \$? = $ac_status" >&5 | 15495 | grep -v '^ *+' conftest.er1 >conftest.err |
15496 | rm -f conftest.er1 | ||
15497 | cat conftest.err >&5 | ||
15498 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11419 | (exit $ac_status); } && | 15499 | (exit $ac_status); } && |
11420 | { ac_try='test -s conftest.$ac_objext' | 15500 | { ac_try='test -z "$ac_c_werror_flag" |
11421 | { (eval echo "$as_me:11421: \"$ac_try\"") >&5 | 15501 | || test ! -s conftest.err' |
15502 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11422 | (eval $ac_try) 2>&5 | 15503 | (eval $ac_try) 2>&5 |
11423 | ac_status=$? | 15504 | ac_status=$? |
11424 | echo "$as_me:11424: \$? = $ac_status" >&5 | 15505 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15506 | (exit $ac_status); }; } && | ||
15507 | { ac_try='test -s conftest.$ac_objext' | ||
15508 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15509 | (eval $ac_try) 2>&5 | ||
15510 | ac_status=$? | ||
15511 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11425 | (exit $ac_status); }; }; then | 15512 | (exit $ac_status); }; }; then |
11426 | ac_cv_type_long_int=yes | 15513 | ac_cv_type_long_int=yes |
11427 | else | 15514 | else |
11428 | echo "$as_me: failed program was:" >&5 | 15515 | echo "$as_me: failed program was:" >&5 |
11429 | cat conftest.$ac_ext >&5 | 15516 | sed 's/^/| /' conftest.$ac_ext >&5 |
15517 | |||
11430 | ac_cv_type_long_int=no | 15518 | ac_cv_type_long_int=no |
11431 | fi | 15519 | fi |
11432 | rm -f conftest.$ac_objext conftest.$ac_ext | 15520 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
11433 | fi | 15521 | fi |
11434 | echo "$as_me:11434: result: $ac_cv_type_long_int" >&5 | 15522 | echo "$as_me:$LINENO: result: $ac_cv_type_long_int" >&5 |
11435 | echo "${ECHO_T}$ac_cv_type_long_int" >&6 | 15523 | echo "${ECHO_T}$ac_cv_type_long_int" >&6 |
11436 | 15524 | ||
11437 | echo "$as_me:11437: checking size of long int" >&5 | 15525 | echo "$as_me:$LINENO: checking size of long int" >&5 |
11438 | echo $ECHO_N "checking size of long int... $ECHO_C" >&6 | 15526 | echo $ECHO_N "checking size of long int... $ECHO_C" >&6 |
11439 | if test "${ac_cv_sizeof_long_int+set}" = set; then | 15527 | if test "${ac_cv_sizeof_long_int+set}" = set; then |
11440 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 15528 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
11441 | else | 15529 | else |
11442 | if test "$ac_cv_type_long_int" = yes; then | 15530 | if test "$ac_cv_type_long_int" = yes; then |
15531 | # The cast to unsigned long works around a bug in the HP C Compiler | ||
15532 | # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects | ||
15533 | # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. | ||
15534 | # This bug is HP SR number 8606223364. | ||
11443 | if test "$cross_compiling" = yes; then | 15535 | if test "$cross_compiling" = yes; then |
11444 | # Depending upon the size, compute the lo and hi bounds. | 15536 | # Depending upon the size, compute the lo and hi bounds. |
11445 | cat >conftest.$ac_ext <<_ACEOF | 15537 | cat >conftest.$ac_ext <<_ACEOF |
11446 | #line 11446 "configure" | 15538 | /* confdefs.h. */ |
11447 | #include "confdefs.h" | 15539 | _ACEOF |
15540 | cat confdefs.h >>conftest.$ac_ext | ||
15541 | cat >>conftest.$ac_ext <<_ACEOF | ||
15542 | /* end confdefs.h. */ | ||
11448 | $ac_includes_default | 15543 | $ac_includes_default |
11449 | int | 15544 | int |
11450 | main () | 15545 | main () |
11451 | { | 15546 | { |
11452 | int _array_ [1 - 2 * !((sizeof (long int)) >= 0)] | 15547 | static int test_array [1 - 2 * !(((long) (sizeof (long int))) >= 0)]; |
15548 | test_array [0] = 0 | ||
15549 | |||
11453 | ; | 15550 | ; |
11454 | return 0; | 15551 | return 0; |
11455 | } | 15552 | } |
11456 | _ACEOF | 15553 | _ACEOF |
11457 | rm -f conftest.$ac_objext | 15554 | rm -f conftest.$ac_objext |
11458 | if { (eval echo "$as_me:11458: \"$ac_compile\"") >&5 | 15555 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
11459 | (eval $ac_compile) 2>&5 | 15556 | (eval $ac_compile) 2>conftest.er1 |
11460 | ac_status=$? | 15557 | ac_status=$? |
11461 | echo "$as_me:11461: \$? = $ac_status" >&5 | 15558 | grep -v '^ *+' conftest.er1 >conftest.err |
15559 | rm -f conftest.er1 | ||
15560 | cat conftest.err >&5 | ||
15561 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11462 | (exit $ac_status); } && | 15562 | (exit $ac_status); } && |
11463 | { ac_try='test -s conftest.$ac_objext' | 15563 | { ac_try='test -z "$ac_c_werror_flag" |
11464 | { (eval echo "$as_me:11464: \"$ac_try\"") >&5 | 15564 | || test ! -s conftest.err' |
15565 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15566 | (eval $ac_try) 2>&5 | ||
15567 | ac_status=$? | ||
15568 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15569 | (exit $ac_status); }; } && | ||
15570 | { ac_try='test -s conftest.$ac_objext' | ||
15571 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11465 | (eval $ac_try) 2>&5 | 15572 | (eval $ac_try) 2>&5 |
11466 | ac_status=$? | 15573 | ac_status=$? |
11467 | echo "$as_me:11467: \$? = $ac_status" >&5 | 15574 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
11468 | (exit $ac_status); }; }; then | 15575 | (exit $ac_status); }; }; then |
11469 | ac_lo=0 ac_mid=0 | 15576 | ac_lo=0 ac_mid=0 |
11470 | while :; do | 15577 | while :; do |
11471 | cat >conftest.$ac_ext <<_ACEOF | 15578 | cat >conftest.$ac_ext <<_ACEOF |
11472 | #line 11472 "configure" | 15579 | /* confdefs.h. */ |
11473 | #include "confdefs.h" | 15580 | _ACEOF |
15581 | cat confdefs.h >>conftest.$ac_ext | ||
15582 | cat >>conftest.$ac_ext <<_ACEOF | ||
15583 | /* end confdefs.h. */ | ||
11474 | $ac_includes_default | 15584 | $ac_includes_default |
11475 | int | 15585 | int |
11476 | main () | 15586 | main () |
11477 | { | 15587 | { |
11478 | int _array_ [1 - 2 * !((sizeof (long int)) <= $ac_mid)] | 15588 | static int test_array [1 - 2 * !(((long) (sizeof (long int))) <= $ac_mid)]; |
15589 | test_array [0] = 0 | ||
15590 | |||
11479 | ; | 15591 | ; |
11480 | return 0; | 15592 | return 0; |
11481 | } | 15593 | } |
11482 | _ACEOF | 15594 | _ACEOF |
11483 | rm -f conftest.$ac_objext | 15595 | rm -f conftest.$ac_objext |
11484 | if { (eval echo "$as_me:11484: \"$ac_compile\"") >&5 | 15596 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
11485 | (eval $ac_compile) 2>&5 | 15597 | (eval $ac_compile) 2>conftest.er1 |
11486 | ac_status=$? | 15598 | ac_status=$? |
11487 | echo "$as_me:11487: \$? = $ac_status" >&5 | 15599 | grep -v '^ *+' conftest.er1 >conftest.err |
15600 | rm -f conftest.er1 | ||
15601 | cat conftest.err >&5 | ||
15602 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11488 | (exit $ac_status); } && | 15603 | (exit $ac_status); } && |
11489 | { ac_try='test -s conftest.$ac_objext' | 15604 | { ac_try='test -z "$ac_c_werror_flag" |
11490 | { (eval echo "$as_me:11490: \"$ac_try\"") >&5 | 15605 | || test ! -s conftest.err' |
15606 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15607 | (eval $ac_try) 2>&5 | ||
15608 | ac_status=$? | ||
15609 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15610 | (exit $ac_status); }; } && | ||
15611 | { ac_try='test -s conftest.$ac_objext' | ||
15612 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11491 | (eval $ac_try) 2>&5 | 15613 | (eval $ac_try) 2>&5 |
11492 | ac_status=$? | 15614 | ac_status=$? |
11493 | echo "$as_me:11493: \$? = $ac_status" >&5 | 15615 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
11494 | (exit $ac_status); }; }; then | 15616 | (exit $ac_status); }; }; then |
11495 | ac_hi=$ac_mid; break | 15617 | ac_hi=$ac_mid; break |
11496 | else | 15618 | else |
11497 | echo "$as_me: failed program was:" >&5 | 15619 | echo "$as_me: failed program was:" >&5 |
11498 | cat conftest.$ac_ext >&5 | 15620 | sed 's/^/| /' conftest.$ac_ext >&5 |
11499 | ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` | 15621 | |
15622 | ac_lo=`expr $ac_mid + 1` | ||
15623 | if test $ac_lo -le $ac_mid; then | ||
15624 | ac_lo= ac_hi= | ||
15625 | break | ||
15626 | fi | ||
15627 | ac_mid=`expr 2 '*' $ac_mid + 1` | ||
11500 | fi | 15628 | fi |
11501 | rm -f conftest.$ac_objext conftest.$ac_ext | 15629 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
11502 | done | 15630 | done |
11503 | else | 15631 | else |
11504 | echo "$as_me: failed program was:" >&5 | 15632 | echo "$as_me: failed program was:" >&5 |
11505 | cat conftest.$ac_ext >&5 | 15633 | sed 's/^/| /' conftest.$ac_ext >&5 |
11506 | ac_hi=-1 ac_mid=-1 | 15634 | |
15635 | cat >conftest.$ac_ext <<_ACEOF | ||
15636 | /* confdefs.h. */ | ||
15637 | _ACEOF | ||
15638 | cat confdefs.h >>conftest.$ac_ext | ||
15639 | cat >>conftest.$ac_ext <<_ACEOF | ||
15640 | /* end confdefs.h. */ | ||
15641 | $ac_includes_default | ||
15642 | int | ||
15643 | main () | ||
15644 | { | ||
15645 | static int test_array [1 - 2 * !(((long) (sizeof (long int))) < 0)]; | ||
15646 | test_array [0] = 0 | ||
15647 | |||
15648 | ; | ||
15649 | return 0; | ||
15650 | } | ||
15651 | _ACEOF | ||
15652 | rm -f conftest.$ac_objext | ||
15653 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
15654 | (eval $ac_compile) 2>conftest.er1 | ||
15655 | ac_status=$? | ||
15656 | grep -v '^ *+' conftest.er1 >conftest.err | ||
15657 | rm -f conftest.er1 | ||
15658 | cat conftest.err >&5 | ||
15659 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15660 | (exit $ac_status); } && | ||
15661 | { ac_try='test -z "$ac_c_werror_flag" | ||
15662 | || test ! -s conftest.err' | ||
15663 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15664 | (eval $ac_try) 2>&5 | ||
15665 | ac_status=$? | ||
15666 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15667 | (exit $ac_status); }; } && | ||
15668 | { ac_try='test -s conftest.$ac_objext' | ||
15669 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15670 | (eval $ac_try) 2>&5 | ||
15671 | ac_status=$? | ||
15672 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15673 | (exit $ac_status); }; }; then | ||
15674 | ac_hi=-1 ac_mid=-1 | ||
11507 | while :; do | 15675 | while :; do |
11508 | cat >conftest.$ac_ext <<_ACEOF | 15676 | cat >conftest.$ac_ext <<_ACEOF |
11509 | #line 11509 "configure" | 15677 | /* confdefs.h. */ |
11510 | #include "confdefs.h" | 15678 | _ACEOF |
15679 | cat confdefs.h >>conftest.$ac_ext | ||
15680 | cat >>conftest.$ac_ext <<_ACEOF | ||
15681 | /* end confdefs.h. */ | ||
11511 | $ac_includes_default | 15682 | $ac_includes_default |
11512 | int | 15683 | int |
11513 | main () | 15684 | main () |
11514 | { | 15685 | { |
11515 | int _array_ [1 - 2 * !((sizeof (long int)) >= $ac_mid)] | 15686 | static int test_array [1 - 2 * !(((long) (sizeof (long int))) >= $ac_mid)]; |
15687 | test_array [0] = 0 | ||
15688 | |||
11516 | ; | 15689 | ; |
11517 | return 0; | 15690 | return 0; |
11518 | } | 15691 | } |
11519 | _ACEOF | 15692 | _ACEOF |
11520 | rm -f conftest.$ac_objext | 15693 | rm -f conftest.$ac_objext |
11521 | if { (eval echo "$as_me:11521: \"$ac_compile\"") >&5 | 15694 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
11522 | (eval $ac_compile) 2>&5 | 15695 | (eval $ac_compile) 2>conftest.er1 |
11523 | ac_status=$? | 15696 | ac_status=$? |
11524 | echo "$as_me:11524: \$? = $ac_status" >&5 | 15697 | grep -v '^ *+' conftest.er1 >conftest.err |
15698 | rm -f conftest.er1 | ||
15699 | cat conftest.err >&5 | ||
15700 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11525 | (exit $ac_status); } && | 15701 | (exit $ac_status); } && |
11526 | { ac_try='test -s conftest.$ac_objext' | 15702 | { ac_try='test -z "$ac_c_werror_flag" |
11527 | { (eval echo "$as_me:11527: \"$ac_try\"") >&5 | 15703 | || test ! -s conftest.err' |
15704 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11528 | (eval $ac_try) 2>&5 | 15705 | (eval $ac_try) 2>&5 |
11529 | ac_status=$? | 15706 | ac_status=$? |
11530 | echo "$as_me:11530: \$? = $ac_status" >&5 | 15707 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15708 | (exit $ac_status); }; } && | ||
15709 | { ac_try='test -s conftest.$ac_objext' | ||
15710 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15711 | (eval $ac_try) 2>&5 | ||
15712 | ac_status=$? | ||
15713 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11531 | (exit $ac_status); }; }; then | 15714 | (exit $ac_status); }; }; then |
11532 | ac_lo=$ac_mid; break | 15715 | ac_lo=$ac_mid; break |
11533 | else | 15716 | else |
11534 | echo "$as_me: failed program was:" >&5 | 15717 | echo "$as_me: failed program was:" >&5 |
11535 | cat conftest.$ac_ext >&5 | 15718 | sed 's/^/| /' conftest.$ac_ext >&5 |
11536 | ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` | 15719 | |
15720 | ac_hi=`expr '(' $ac_mid ')' - 1` | ||
15721 | if test $ac_mid -le $ac_hi; then | ||
15722 | ac_lo= ac_hi= | ||
15723 | break | ||
15724 | fi | ||
15725 | ac_mid=`expr 2 '*' $ac_mid` | ||
11537 | fi | 15726 | fi |
11538 | rm -f conftest.$ac_objext conftest.$ac_ext | 15727 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
11539 | done | 15728 | done |
15729 | else | ||
15730 | echo "$as_me: failed program was:" >&5 | ||
15731 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
15732 | |||
15733 | ac_lo= ac_hi= | ||
15734 | fi | ||
15735 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11540 | fi | 15736 | fi |
11541 | rm -f conftest.$ac_objext conftest.$ac_ext | 15737 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
11542 | # Binary search between lo and hi bounds. | 15738 | # Binary search between lo and hi bounds. |
11543 | while test "x$ac_lo" != "x$ac_hi"; do | 15739 | while test "x$ac_lo" != "x$ac_hi"; do |
11544 | ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` | 15740 | ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` |
11545 | cat >conftest.$ac_ext <<_ACEOF | 15741 | cat >conftest.$ac_ext <<_ACEOF |
11546 | #line 11546 "configure" | 15742 | /* confdefs.h. */ |
11547 | #include "confdefs.h" | 15743 | _ACEOF |
15744 | cat confdefs.h >>conftest.$ac_ext | ||
15745 | cat >>conftest.$ac_ext <<_ACEOF | ||
15746 | /* end confdefs.h. */ | ||
11548 | $ac_includes_default | 15747 | $ac_includes_default |
11549 | int | 15748 | int |
11550 | main () | 15749 | main () |
11551 | { | 15750 | { |
11552 | int _array_ [1 - 2 * !((sizeof (long int)) <= $ac_mid)] | 15751 | static int test_array [1 - 2 * !(((long) (sizeof (long int))) <= $ac_mid)]; |
15752 | test_array [0] = 0 | ||
15753 | |||
11553 | ; | 15754 | ; |
11554 | return 0; | 15755 | return 0; |
11555 | } | 15756 | } |
11556 | _ACEOF | 15757 | _ACEOF |
11557 | rm -f conftest.$ac_objext | 15758 | rm -f conftest.$ac_objext |
11558 | if { (eval echo "$as_me:11558: \"$ac_compile\"") >&5 | 15759 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
11559 | (eval $ac_compile) 2>&5 | 15760 | (eval $ac_compile) 2>conftest.er1 |
11560 | ac_status=$? | 15761 | ac_status=$? |
11561 | echo "$as_me:11561: \$? = $ac_status" >&5 | 15762 | grep -v '^ *+' conftest.er1 >conftest.err |
15763 | rm -f conftest.er1 | ||
15764 | cat conftest.err >&5 | ||
15765 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11562 | (exit $ac_status); } && | 15766 | (exit $ac_status); } && |
11563 | { ac_try='test -s conftest.$ac_objext' | 15767 | { ac_try='test -z "$ac_c_werror_flag" |
11564 | { (eval echo "$as_me:11564: \"$ac_try\"") >&5 | 15768 | || test ! -s conftest.err' |
15769 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15770 | (eval $ac_try) 2>&5 | ||
15771 | ac_status=$? | ||
15772 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15773 | (exit $ac_status); }; } && | ||
15774 | { ac_try='test -s conftest.$ac_objext' | ||
15775 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11565 | (eval $ac_try) 2>&5 | 15776 | (eval $ac_try) 2>&5 |
11566 | ac_status=$? | 15777 | ac_status=$? |
11567 | echo "$as_me:11567: \$? = $ac_status" >&5 | 15778 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
11568 | (exit $ac_status); }; }; then | 15779 | (exit $ac_status); }; }; then |
11569 | ac_hi=$ac_mid | 15780 | ac_hi=$ac_mid |
11570 | else | 15781 | else |
11571 | echo "$as_me: failed program was:" >&5 | 15782 | echo "$as_me: failed program was:" >&5 |
11572 | cat conftest.$ac_ext >&5 | 15783 | sed 's/^/| /' conftest.$ac_ext >&5 |
11573 | ac_lo=`expr $ac_mid + 1` | 15784 | |
15785 | ac_lo=`expr '(' $ac_mid ')' + 1` | ||
11574 | fi | 15786 | fi |
11575 | rm -f conftest.$ac_objext conftest.$ac_ext | 15787 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
11576 | done | 15788 | done |
11577 | ac_cv_sizeof_long_int=$ac_lo | 15789 | case $ac_lo in |
15790 | ?*) ac_cv_sizeof_long_int=$ac_lo;; | ||
15791 | '') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long int), 77 | ||
15792 | See \`config.log' for more details." >&5 | ||
15793 | echo "$as_me: error: cannot compute sizeof (long int), 77 | ||
15794 | See \`config.log' for more details." >&2;} | ||
15795 | { (exit 1); exit 1; }; } ;; | ||
15796 | esac | ||
11578 | else | 15797 | else |
11579 | if test "$cross_compiling" = yes; then | 15798 | if test "$cross_compiling" = yes; then |
11580 | { { echo "$as_me:11580: error: cannot run test program while cross compiling" >&5 | 15799 | { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
11581 | echo "$as_me: error: cannot run test program while cross compiling" >&2;} | 15800 | See \`config.log' for more details." >&5 |
15801 | echo "$as_me: error: cannot run test program while cross compiling | ||
15802 | See \`config.log' for more details." >&2;} | ||
11582 | { (exit 1); exit 1; }; } | 15803 | { (exit 1); exit 1; }; } |
11583 | else | 15804 | else |
11584 | cat >conftest.$ac_ext <<_ACEOF | 15805 | cat >conftest.$ac_ext <<_ACEOF |
11585 | #line 11585 "configure" | 15806 | /* confdefs.h. */ |
11586 | #include "confdefs.h" | 15807 | _ACEOF |
15808 | cat confdefs.h >>conftest.$ac_ext | ||
15809 | cat >>conftest.$ac_ext <<_ACEOF | ||
15810 | /* end confdefs.h. */ | ||
11587 | $ac_includes_default | 15811 | $ac_includes_default |
15812 | long longval () { return (long) (sizeof (long int)); } | ||
15813 | unsigned long ulongval () { return (long) (sizeof (long int)); } | ||
15814 | #include <stdio.h> | ||
15815 | #include <stdlib.h> | ||
11588 | int | 15816 | int |
11589 | main () | 15817 | main () |
11590 | { | 15818 | { |
11591 | FILE *f = fopen ("conftest.val", "w"); | 15819 | |
11592 | if (!f) | 15820 | FILE *f = fopen ("conftest.val", "w"); |
11593 | exit (1); | 15821 | if (! f) |
11594 | fprintf (f, "%d", (sizeof (long int))); | 15822 | exit (1); |
11595 | fclose (f); | 15823 | if (((long) (sizeof (long int))) < 0) |
15824 | { | ||
15825 | long i = longval (); | ||
15826 | if (i != ((long) (sizeof (long int)))) | ||
15827 | exit (1); | ||
15828 | fprintf (f, "%ld\n", i); | ||
15829 | } | ||
15830 | else | ||
15831 | { | ||
15832 | unsigned long i = ulongval (); | ||
15833 | if (i != ((long) (sizeof (long int)))) | ||
15834 | exit (1); | ||
15835 | fprintf (f, "%lu\n", i); | ||
15836 | } | ||
15837 | exit (ferror (f) || fclose (f) != 0); | ||
15838 | |||
11596 | ; | 15839 | ; |
11597 | return 0; | 15840 | return 0; |
11598 | } | 15841 | } |
11599 | _ACEOF | 15842 | _ACEOF |
11600 | rm -f conftest$ac_exeext | 15843 | rm -f conftest$ac_exeext |
11601 | if { (eval echo "$as_me:11601: \"$ac_link\"") >&5 | 15844 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
11602 | (eval $ac_link) 2>&5 | 15845 | (eval $ac_link) 2>&5 |
11603 | ac_status=$? | 15846 | ac_status=$? |
11604 | echo "$as_me:11604: \$? = $ac_status" >&5 | 15847 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
11605 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | 15848 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
11606 | { (eval echo "$as_me:11606: \"$ac_try\"") >&5 | 15849 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
11607 | (eval $ac_try) 2>&5 | 15850 | (eval $ac_try) 2>&5 |
11608 | ac_status=$? | 15851 | ac_status=$? |
11609 | echo "$as_me:11609: \$? = $ac_status" >&5 | 15852 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
11610 | (exit $ac_status); }; }; then | 15853 | (exit $ac_status); }; }; then |
11611 | ac_cv_sizeof_long_int=`cat conftest.val` | 15854 | ac_cv_sizeof_long_int=`cat conftest.val` |
11612 | else | 15855 | else |
11613 | echo "$as_me: program exited with status $ac_status" >&5 | 15856 | echo "$as_me: program exited with status $ac_status" >&5 |
11614 | echo "$as_me: failed program was:" >&5 | 15857 | echo "$as_me: failed program was:" >&5 |
11615 | cat conftest.$ac_ext >&5 | 15858 | sed 's/^/| /' conftest.$ac_ext >&5 |
15859 | |||
15860 | ( exit $ac_status ) | ||
15861 | { { echo "$as_me:$LINENO: error: cannot compute sizeof (long int), 77 | ||
15862 | See \`config.log' for more details." >&5 | ||
15863 | echo "$as_me: error: cannot compute sizeof (long int), 77 | ||
15864 | See \`config.log' for more details." >&2;} | ||
15865 | { (exit 1); exit 1; }; } | ||
11616 | fi | 15866 | fi |
11617 | rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | 15867 | rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext |
11618 | fi | 15868 | fi |
11619 | fi | 15869 | fi |
11620 | rm -f conftest.val | 15870 | rm -f conftest.val |
@@ -11622,20 +15872,24 @@ else | |||
11622 | ac_cv_sizeof_long_int=0 | 15872 | ac_cv_sizeof_long_int=0 |
11623 | fi | 15873 | fi |
11624 | fi | 15874 | fi |
11625 | echo "$as_me:11625: result: $ac_cv_sizeof_long_int" >&5 | 15875 | echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_int" >&5 |
11626 | echo "${ECHO_T}$ac_cv_sizeof_long_int" >&6 | 15876 | echo "${ECHO_T}$ac_cv_sizeof_long_int" >&6 |
11627 | cat >>confdefs.h <<EOF | 15877 | cat >>confdefs.h <<_ACEOF |
11628 | #define SIZEOF_LONG_INT $ac_cv_sizeof_long_int | 15878 | #define SIZEOF_LONG_INT $ac_cv_sizeof_long_int |
11629 | EOF | 15879 | _ACEOF |
11630 | 15880 | ||
11631 | echo "$as_me:11631: checking for long long int" >&5 | 15881 | |
15882 | echo "$as_me:$LINENO: checking for long long int" >&5 | ||
11632 | echo $ECHO_N "checking for long long int... $ECHO_C" >&6 | 15883 | echo $ECHO_N "checking for long long int... $ECHO_C" >&6 |
11633 | if test "${ac_cv_type_long_long_int+set}" = set; then | 15884 | if test "${ac_cv_type_long_long_int+set}" = set; then |
11634 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 15885 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
11635 | else | 15886 | else |
11636 | cat >conftest.$ac_ext <<_ACEOF | 15887 | cat >conftest.$ac_ext <<_ACEOF |
11637 | #line 11637 "configure" | 15888 | /* confdefs.h. */ |
11638 | #include "confdefs.h" | 15889 | _ACEOF |
15890 | cat confdefs.h >>conftest.$ac_ext | ||
15891 | cat >>conftest.$ac_ext <<_ACEOF | ||
15892 | /* end confdefs.h. */ | ||
11639 | $ac_includes_default | 15893 | $ac_includes_default |
11640 | int | 15894 | int |
11641 | main () | 15895 | main () |
@@ -11649,209 +15903,382 @@ if (sizeof (long long int)) | |||
11649 | } | 15903 | } |
11650 | _ACEOF | 15904 | _ACEOF |
11651 | rm -f conftest.$ac_objext | 15905 | rm -f conftest.$ac_objext |
11652 | if { (eval echo "$as_me:11652: \"$ac_compile\"") >&5 | 15906 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
11653 | (eval $ac_compile) 2>&5 | 15907 | (eval $ac_compile) 2>conftest.er1 |
11654 | ac_status=$? | 15908 | ac_status=$? |
11655 | echo "$as_me:11655: \$? = $ac_status" >&5 | 15909 | grep -v '^ *+' conftest.er1 >conftest.err |
15910 | rm -f conftest.er1 | ||
15911 | cat conftest.err >&5 | ||
15912 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11656 | (exit $ac_status); } && | 15913 | (exit $ac_status); } && |
11657 | { ac_try='test -s conftest.$ac_objext' | 15914 | { ac_try='test -z "$ac_c_werror_flag" |
11658 | { (eval echo "$as_me:11658: \"$ac_try\"") >&5 | 15915 | || test ! -s conftest.err' |
15916 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15917 | (eval $ac_try) 2>&5 | ||
15918 | ac_status=$? | ||
15919 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15920 | (exit $ac_status); }; } && | ||
15921 | { ac_try='test -s conftest.$ac_objext' | ||
15922 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11659 | (eval $ac_try) 2>&5 | 15923 | (eval $ac_try) 2>&5 |
11660 | ac_status=$? | 15924 | ac_status=$? |
11661 | echo "$as_me:11661: \$? = $ac_status" >&5 | 15925 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
11662 | (exit $ac_status); }; }; then | 15926 | (exit $ac_status); }; }; then |
11663 | ac_cv_type_long_long_int=yes | 15927 | ac_cv_type_long_long_int=yes |
11664 | else | 15928 | else |
11665 | echo "$as_me: failed program was:" >&5 | 15929 | echo "$as_me: failed program was:" >&5 |
11666 | cat conftest.$ac_ext >&5 | 15930 | sed 's/^/| /' conftest.$ac_ext >&5 |
15931 | |||
11667 | ac_cv_type_long_long_int=no | 15932 | ac_cv_type_long_long_int=no |
11668 | fi | 15933 | fi |
11669 | rm -f conftest.$ac_objext conftest.$ac_ext | 15934 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
11670 | fi | 15935 | fi |
11671 | echo "$as_me:11671: result: $ac_cv_type_long_long_int" >&5 | 15936 | echo "$as_me:$LINENO: result: $ac_cv_type_long_long_int" >&5 |
11672 | echo "${ECHO_T}$ac_cv_type_long_long_int" >&6 | 15937 | echo "${ECHO_T}$ac_cv_type_long_long_int" >&6 |
11673 | 15938 | ||
11674 | echo "$as_me:11674: checking size of long long int" >&5 | 15939 | echo "$as_me:$LINENO: checking size of long long int" >&5 |
11675 | echo $ECHO_N "checking size of long long int... $ECHO_C" >&6 | 15940 | echo $ECHO_N "checking size of long long int... $ECHO_C" >&6 |
11676 | if test "${ac_cv_sizeof_long_long_int+set}" = set; then | 15941 | if test "${ac_cv_sizeof_long_long_int+set}" = set; then |
11677 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 15942 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
11678 | else | 15943 | else |
11679 | if test "$ac_cv_type_long_long_int" = yes; then | 15944 | if test "$ac_cv_type_long_long_int" = yes; then |
15945 | # The cast to unsigned long works around a bug in the HP C Compiler | ||
15946 | # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects | ||
15947 | # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. | ||
15948 | # This bug is HP SR number 8606223364. | ||
11680 | if test "$cross_compiling" = yes; then | 15949 | if test "$cross_compiling" = yes; then |
11681 | # Depending upon the size, compute the lo and hi bounds. | 15950 | # Depending upon the size, compute the lo and hi bounds. |
11682 | cat >conftest.$ac_ext <<_ACEOF | 15951 | cat >conftest.$ac_ext <<_ACEOF |
11683 | #line 11683 "configure" | 15952 | /* confdefs.h. */ |
11684 | #include "confdefs.h" | 15953 | _ACEOF |
15954 | cat confdefs.h >>conftest.$ac_ext | ||
15955 | cat >>conftest.$ac_ext <<_ACEOF | ||
15956 | /* end confdefs.h. */ | ||
11685 | $ac_includes_default | 15957 | $ac_includes_default |
11686 | int | 15958 | int |
11687 | main () | 15959 | main () |
11688 | { | 15960 | { |
11689 | int _array_ [1 - 2 * !((sizeof (long long int)) >= 0)] | 15961 | static int test_array [1 - 2 * !(((long) (sizeof (long long int))) >= 0)]; |
15962 | test_array [0] = 0 | ||
15963 | |||
11690 | ; | 15964 | ; |
11691 | return 0; | 15965 | return 0; |
11692 | } | 15966 | } |
11693 | _ACEOF | 15967 | _ACEOF |
11694 | rm -f conftest.$ac_objext | 15968 | rm -f conftest.$ac_objext |
11695 | if { (eval echo "$as_me:11695: \"$ac_compile\"") >&5 | 15969 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
11696 | (eval $ac_compile) 2>&5 | 15970 | (eval $ac_compile) 2>conftest.er1 |
11697 | ac_status=$? | 15971 | ac_status=$? |
11698 | echo "$as_me:11698: \$? = $ac_status" >&5 | 15972 | grep -v '^ *+' conftest.er1 >conftest.err |
15973 | rm -f conftest.er1 | ||
15974 | cat conftest.err >&5 | ||
15975 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11699 | (exit $ac_status); } && | 15976 | (exit $ac_status); } && |
11700 | { ac_try='test -s conftest.$ac_objext' | 15977 | { ac_try='test -z "$ac_c_werror_flag" |
11701 | { (eval echo "$as_me:11701: \"$ac_try\"") >&5 | 15978 | || test ! -s conftest.err' |
15979 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15980 | (eval $ac_try) 2>&5 | ||
15981 | ac_status=$? | ||
15982 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15983 | (exit $ac_status); }; } && | ||
15984 | { ac_try='test -s conftest.$ac_objext' | ||
15985 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11702 | (eval $ac_try) 2>&5 | 15986 | (eval $ac_try) 2>&5 |
11703 | ac_status=$? | 15987 | ac_status=$? |
11704 | echo "$as_me:11704: \$? = $ac_status" >&5 | 15988 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
11705 | (exit $ac_status); }; }; then | 15989 | (exit $ac_status); }; }; then |
11706 | ac_lo=0 ac_mid=0 | 15990 | ac_lo=0 ac_mid=0 |
11707 | while :; do | 15991 | while :; do |
11708 | cat >conftest.$ac_ext <<_ACEOF | 15992 | cat >conftest.$ac_ext <<_ACEOF |
11709 | #line 11709 "configure" | 15993 | /* confdefs.h. */ |
11710 | #include "confdefs.h" | 15994 | _ACEOF |
15995 | cat confdefs.h >>conftest.$ac_ext | ||
15996 | cat >>conftest.$ac_ext <<_ACEOF | ||
15997 | /* end confdefs.h. */ | ||
11711 | $ac_includes_default | 15998 | $ac_includes_default |
11712 | int | 15999 | int |
11713 | main () | 16000 | main () |
11714 | { | 16001 | { |
11715 | int _array_ [1 - 2 * !((sizeof (long long int)) <= $ac_mid)] | 16002 | static int test_array [1 - 2 * !(((long) (sizeof (long long int))) <= $ac_mid)]; |
16003 | test_array [0] = 0 | ||
16004 | |||
11716 | ; | 16005 | ; |
11717 | return 0; | 16006 | return 0; |
11718 | } | 16007 | } |
11719 | _ACEOF | 16008 | _ACEOF |
11720 | rm -f conftest.$ac_objext | 16009 | rm -f conftest.$ac_objext |
11721 | if { (eval echo "$as_me:11721: \"$ac_compile\"") >&5 | 16010 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
11722 | (eval $ac_compile) 2>&5 | 16011 | (eval $ac_compile) 2>conftest.er1 |
11723 | ac_status=$? | 16012 | ac_status=$? |
11724 | echo "$as_me:11724: \$? = $ac_status" >&5 | 16013 | grep -v '^ *+' conftest.er1 >conftest.err |
16014 | rm -f conftest.er1 | ||
16015 | cat conftest.err >&5 | ||
16016 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11725 | (exit $ac_status); } && | 16017 | (exit $ac_status); } && |
11726 | { ac_try='test -s conftest.$ac_objext' | 16018 | { ac_try='test -z "$ac_c_werror_flag" |
11727 | { (eval echo "$as_me:11727: \"$ac_try\"") >&5 | 16019 | || test ! -s conftest.err' |
16020 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11728 | (eval $ac_try) 2>&5 | 16021 | (eval $ac_try) 2>&5 |
11729 | ac_status=$? | 16022 | ac_status=$? |
11730 | echo "$as_me:11730: \$? = $ac_status" >&5 | 16023 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
16024 | (exit $ac_status); }; } && | ||
16025 | { ac_try='test -s conftest.$ac_objext' | ||
16026 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16027 | (eval $ac_try) 2>&5 | ||
16028 | ac_status=$? | ||
16029 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11731 | (exit $ac_status); }; }; then | 16030 | (exit $ac_status); }; }; then |
11732 | ac_hi=$ac_mid; break | 16031 | ac_hi=$ac_mid; break |
11733 | else | 16032 | else |
11734 | echo "$as_me: failed program was:" >&5 | 16033 | echo "$as_me: failed program was:" >&5 |
11735 | cat conftest.$ac_ext >&5 | 16034 | sed 's/^/| /' conftest.$ac_ext >&5 |
11736 | ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` | 16035 | |
16036 | ac_lo=`expr $ac_mid + 1` | ||
16037 | if test $ac_lo -le $ac_mid; then | ||
16038 | ac_lo= ac_hi= | ||
16039 | break | ||
16040 | fi | ||
16041 | ac_mid=`expr 2 '*' $ac_mid + 1` | ||
11737 | fi | 16042 | fi |
11738 | rm -f conftest.$ac_objext conftest.$ac_ext | 16043 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
11739 | done | 16044 | done |
11740 | else | 16045 | else |
11741 | echo "$as_me: failed program was:" >&5 | 16046 | echo "$as_me: failed program was:" >&5 |
11742 | cat conftest.$ac_ext >&5 | 16047 | sed 's/^/| /' conftest.$ac_ext >&5 |
11743 | ac_hi=-1 ac_mid=-1 | 16048 | |
16049 | cat >conftest.$ac_ext <<_ACEOF | ||
16050 | /* confdefs.h. */ | ||
16051 | _ACEOF | ||
16052 | cat confdefs.h >>conftest.$ac_ext | ||
16053 | cat >>conftest.$ac_ext <<_ACEOF | ||
16054 | /* end confdefs.h. */ | ||
16055 | $ac_includes_default | ||
16056 | int | ||
16057 | main () | ||
16058 | { | ||
16059 | static int test_array [1 - 2 * !(((long) (sizeof (long long int))) < 0)]; | ||
16060 | test_array [0] = 0 | ||
16061 | |||
16062 | ; | ||
16063 | return 0; | ||
16064 | } | ||
16065 | _ACEOF | ||
16066 | rm -f conftest.$ac_objext | ||
16067 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
16068 | (eval $ac_compile) 2>conftest.er1 | ||
16069 | ac_status=$? | ||
16070 | grep -v '^ *+' conftest.er1 >conftest.err | ||
16071 | rm -f conftest.er1 | ||
16072 | cat conftest.err >&5 | ||
16073 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16074 | (exit $ac_status); } && | ||
16075 | { ac_try='test -z "$ac_c_werror_flag" | ||
16076 | || test ! -s conftest.err' | ||
16077 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16078 | (eval $ac_try) 2>&5 | ||
16079 | ac_status=$? | ||
16080 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16081 | (exit $ac_status); }; } && | ||
16082 | { ac_try='test -s conftest.$ac_objext' | ||
16083 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16084 | (eval $ac_try) 2>&5 | ||
16085 | ac_status=$? | ||
16086 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16087 | (exit $ac_status); }; }; then | ||
16088 | ac_hi=-1 ac_mid=-1 | ||
11744 | while :; do | 16089 | while :; do |
11745 | cat >conftest.$ac_ext <<_ACEOF | 16090 | cat >conftest.$ac_ext <<_ACEOF |
11746 | #line 11746 "configure" | 16091 | /* confdefs.h. */ |
11747 | #include "confdefs.h" | 16092 | _ACEOF |
16093 | cat confdefs.h >>conftest.$ac_ext | ||
16094 | cat >>conftest.$ac_ext <<_ACEOF | ||
16095 | /* end confdefs.h. */ | ||
11748 | $ac_includes_default | 16096 | $ac_includes_default |
11749 | int | 16097 | int |
11750 | main () | 16098 | main () |
11751 | { | 16099 | { |
11752 | int _array_ [1 - 2 * !((sizeof (long long int)) >= $ac_mid)] | 16100 | static int test_array [1 - 2 * !(((long) (sizeof (long long int))) >= $ac_mid)]; |
16101 | test_array [0] = 0 | ||
16102 | |||
11753 | ; | 16103 | ; |
11754 | return 0; | 16104 | return 0; |
11755 | } | 16105 | } |
11756 | _ACEOF | 16106 | _ACEOF |
11757 | rm -f conftest.$ac_objext | 16107 | rm -f conftest.$ac_objext |
11758 | if { (eval echo "$as_me:11758: \"$ac_compile\"") >&5 | 16108 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
11759 | (eval $ac_compile) 2>&5 | 16109 | (eval $ac_compile) 2>conftest.er1 |
11760 | ac_status=$? | 16110 | ac_status=$? |
11761 | echo "$as_me:11761: \$? = $ac_status" >&5 | 16111 | grep -v '^ *+' conftest.er1 >conftest.err |
16112 | rm -f conftest.er1 | ||
16113 | cat conftest.err >&5 | ||
16114 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11762 | (exit $ac_status); } && | 16115 | (exit $ac_status); } && |
11763 | { ac_try='test -s conftest.$ac_objext' | 16116 | { ac_try='test -z "$ac_c_werror_flag" |
11764 | { (eval echo "$as_me:11764: \"$ac_try\"") >&5 | 16117 | || test ! -s conftest.err' |
16118 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16119 | (eval $ac_try) 2>&5 | ||
16120 | ac_status=$? | ||
16121 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16122 | (exit $ac_status); }; } && | ||
16123 | { ac_try='test -s conftest.$ac_objext' | ||
16124 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11765 | (eval $ac_try) 2>&5 | 16125 | (eval $ac_try) 2>&5 |
11766 | ac_status=$? | 16126 | ac_status=$? |
11767 | echo "$as_me:11767: \$? = $ac_status" >&5 | 16127 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
11768 | (exit $ac_status); }; }; then | 16128 | (exit $ac_status); }; }; then |
11769 | ac_lo=$ac_mid; break | 16129 | ac_lo=$ac_mid; break |
11770 | else | 16130 | else |
11771 | echo "$as_me: failed program was:" >&5 | 16131 | echo "$as_me: failed program was:" >&5 |
11772 | cat conftest.$ac_ext >&5 | 16132 | sed 's/^/| /' conftest.$ac_ext >&5 |
11773 | ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` | 16133 | |
16134 | ac_hi=`expr '(' $ac_mid ')' - 1` | ||
16135 | if test $ac_mid -le $ac_hi; then | ||
16136 | ac_lo= ac_hi= | ||
16137 | break | ||
16138 | fi | ||
16139 | ac_mid=`expr 2 '*' $ac_mid` | ||
11774 | fi | 16140 | fi |
11775 | rm -f conftest.$ac_objext conftest.$ac_ext | 16141 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
11776 | done | 16142 | done |
16143 | else | ||
16144 | echo "$as_me: failed program was:" >&5 | ||
16145 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
16146 | |||
16147 | ac_lo= ac_hi= | ||
11777 | fi | 16148 | fi |
11778 | rm -f conftest.$ac_objext conftest.$ac_ext | 16149 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
16150 | fi | ||
16151 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
11779 | # Binary search between lo and hi bounds. | 16152 | # Binary search between lo and hi bounds. |
11780 | while test "x$ac_lo" != "x$ac_hi"; do | 16153 | while test "x$ac_lo" != "x$ac_hi"; do |
11781 | ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` | 16154 | ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` |
11782 | cat >conftest.$ac_ext <<_ACEOF | 16155 | cat >conftest.$ac_ext <<_ACEOF |
11783 | #line 11783 "configure" | 16156 | /* confdefs.h. */ |
11784 | #include "confdefs.h" | 16157 | _ACEOF |
16158 | cat confdefs.h >>conftest.$ac_ext | ||
16159 | cat >>conftest.$ac_ext <<_ACEOF | ||
16160 | /* end confdefs.h. */ | ||
11785 | $ac_includes_default | 16161 | $ac_includes_default |
11786 | int | 16162 | int |
11787 | main () | 16163 | main () |
11788 | { | 16164 | { |
11789 | int _array_ [1 - 2 * !((sizeof (long long int)) <= $ac_mid)] | 16165 | static int test_array [1 - 2 * !(((long) (sizeof (long long int))) <= $ac_mid)]; |
16166 | test_array [0] = 0 | ||
16167 | |||
11790 | ; | 16168 | ; |
11791 | return 0; | 16169 | return 0; |
11792 | } | 16170 | } |
11793 | _ACEOF | 16171 | _ACEOF |
11794 | rm -f conftest.$ac_objext | 16172 | rm -f conftest.$ac_objext |
11795 | if { (eval echo "$as_me:11795: \"$ac_compile\"") >&5 | 16173 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
11796 | (eval $ac_compile) 2>&5 | 16174 | (eval $ac_compile) 2>conftest.er1 |
11797 | ac_status=$? | 16175 | ac_status=$? |
11798 | echo "$as_me:11798: \$? = $ac_status" >&5 | 16176 | grep -v '^ *+' conftest.er1 >conftest.err |
16177 | rm -f conftest.er1 | ||
16178 | cat conftest.err >&5 | ||
16179 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11799 | (exit $ac_status); } && | 16180 | (exit $ac_status); } && |
11800 | { ac_try='test -s conftest.$ac_objext' | 16181 | { ac_try='test -z "$ac_c_werror_flag" |
11801 | { (eval echo "$as_me:11801: \"$ac_try\"") >&5 | 16182 | || test ! -s conftest.err' |
16183 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16184 | (eval $ac_try) 2>&5 | ||
16185 | ac_status=$? | ||
16186 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16187 | (exit $ac_status); }; } && | ||
16188 | { ac_try='test -s conftest.$ac_objext' | ||
16189 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11802 | (eval $ac_try) 2>&5 | 16190 | (eval $ac_try) 2>&5 |
11803 | ac_status=$? | 16191 | ac_status=$? |
11804 | echo "$as_me:11804: \$? = $ac_status" >&5 | 16192 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
11805 | (exit $ac_status); }; }; then | 16193 | (exit $ac_status); }; }; then |
11806 | ac_hi=$ac_mid | 16194 | ac_hi=$ac_mid |
11807 | else | 16195 | else |
11808 | echo "$as_me: failed program was:" >&5 | 16196 | echo "$as_me: failed program was:" >&5 |
11809 | cat conftest.$ac_ext >&5 | 16197 | sed 's/^/| /' conftest.$ac_ext >&5 |
11810 | ac_lo=`expr $ac_mid + 1` | 16198 | |
16199 | ac_lo=`expr '(' $ac_mid ')' + 1` | ||
11811 | fi | 16200 | fi |
11812 | rm -f conftest.$ac_objext conftest.$ac_ext | 16201 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
11813 | done | 16202 | done |
11814 | ac_cv_sizeof_long_long_int=$ac_lo | 16203 | case $ac_lo in |
16204 | ?*) ac_cv_sizeof_long_long_int=$ac_lo;; | ||
16205 | '') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long int), 77 | ||
16206 | See \`config.log' for more details." >&5 | ||
16207 | echo "$as_me: error: cannot compute sizeof (long long int), 77 | ||
16208 | See \`config.log' for more details." >&2;} | ||
16209 | { (exit 1); exit 1; }; } ;; | ||
16210 | esac | ||
11815 | else | 16211 | else |
11816 | if test "$cross_compiling" = yes; then | 16212 | if test "$cross_compiling" = yes; then |
11817 | { { echo "$as_me:11817: error: cannot run test program while cross compiling" >&5 | 16213 | { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
11818 | echo "$as_me: error: cannot run test program while cross compiling" >&2;} | 16214 | See \`config.log' for more details." >&5 |
16215 | echo "$as_me: error: cannot run test program while cross compiling | ||
16216 | See \`config.log' for more details." >&2;} | ||
11819 | { (exit 1); exit 1; }; } | 16217 | { (exit 1); exit 1; }; } |
11820 | else | 16218 | else |
11821 | cat >conftest.$ac_ext <<_ACEOF | 16219 | cat >conftest.$ac_ext <<_ACEOF |
11822 | #line 11822 "configure" | 16220 | /* confdefs.h. */ |
11823 | #include "confdefs.h" | 16221 | _ACEOF |
16222 | cat confdefs.h >>conftest.$ac_ext | ||
16223 | cat >>conftest.$ac_ext <<_ACEOF | ||
16224 | /* end confdefs.h. */ | ||
11824 | $ac_includes_default | 16225 | $ac_includes_default |
16226 | long longval () { return (long) (sizeof (long long int)); } | ||
16227 | unsigned long ulongval () { return (long) (sizeof (long long int)); } | ||
16228 | #include <stdio.h> | ||
16229 | #include <stdlib.h> | ||
11825 | int | 16230 | int |
11826 | main () | 16231 | main () |
11827 | { | 16232 | { |
11828 | FILE *f = fopen ("conftest.val", "w"); | 16233 | |
11829 | if (!f) | 16234 | FILE *f = fopen ("conftest.val", "w"); |
11830 | exit (1); | 16235 | if (! f) |
11831 | fprintf (f, "%d", (sizeof (long long int))); | 16236 | exit (1); |
11832 | fclose (f); | 16237 | if (((long) (sizeof (long long int))) < 0) |
16238 | { | ||
16239 | long i = longval (); | ||
16240 | if (i != ((long) (sizeof (long long int)))) | ||
16241 | exit (1); | ||
16242 | fprintf (f, "%ld\n", i); | ||
16243 | } | ||
16244 | else | ||
16245 | { | ||
16246 | unsigned long i = ulongval (); | ||
16247 | if (i != ((long) (sizeof (long long int)))) | ||
16248 | exit (1); | ||
16249 | fprintf (f, "%lu\n", i); | ||
16250 | } | ||
16251 | exit (ferror (f) || fclose (f) != 0); | ||
16252 | |||
11833 | ; | 16253 | ; |
11834 | return 0; | 16254 | return 0; |
11835 | } | 16255 | } |
11836 | _ACEOF | 16256 | _ACEOF |
11837 | rm -f conftest$ac_exeext | 16257 | rm -f conftest$ac_exeext |
11838 | if { (eval echo "$as_me:11838: \"$ac_link\"") >&5 | 16258 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
11839 | (eval $ac_link) 2>&5 | 16259 | (eval $ac_link) 2>&5 |
11840 | ac_status=$? | 16260 | ac_status=$? |
11841 | echo "$as_me:11841: \$? = $ac_status" >&5 | 16261 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
11842 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | 16262 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
11843 | { (eval echo "$as_me:11843: \"$ac_try\"") >&5 | 16263 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
11844 | (eval $ac_try) 2>&5 | 16264 | (eval $ac_try) 2>&5 |
11845 | ac_status=$? | 16265 | ac_status=$? |
11846 | echo "$as_me:11846: \$? = $ac_status" >&5 | 16266 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
11847 | (exit $ac_status); }; }; then | 16267 | (exit $ac_status); }; }; then |
11848 | ac_cv_sizeof_long_long_int=`cat conftest.val` | 16268 | ac_cv_sizeof_long_long_int=`cat conftest.val` |
11849 | else | 16269 | else |
11850 | echo "$as_me: program exited with status $ac_status" >&5 | 16270 | echo "$as_me: program exited with status $ac_status" >&5 |
11851 | echo "$as_me: failed program was:" >&5 | 16271 | echo "$as_me: failed program was:" >&5 |
11852 | cat conftest.$ac_ext >&5 | 16272 | sed 's/^/| /' conftest.$ac_ext >&5 |
16273 | |||
16274 | ( exit $ac_status ) | ||
16275 | { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long int), 77 | ||
16276 | See \`config.log' for more details." >&5 | ||
16277 | echo "$as_me: error: cannot compute sizeof (long long int), 77 | ||
16278 | See \`config.log' for more details." >&2;} | ||
16279 | { (exit 1); exit 1; }; } | ||
11853 | fi | 16280 | fi |
11854 | rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | 16281 | rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext |
11855 | fi | 16282 | fi |
11856 | fi | 16283 | fi |
11857 | rm -f conftest.val | 16284 | rm -f conftest.val |
@@ -11859,11 +16286,13 @@ else | |||
11859 | ac_cv_sizeof_long_long_int=0 | 16286 | ac_cv_sizeof_long_long_int=0 |
11860 | fi | 16287 | fi |
11861 | fi | 16288 | fi |
11862 | echo "$as_me:11862: result: $ac_cv_sizeof_long_long_int" >&5 | 16289 | echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long_int" >&5 |
11863 | echo "${ECHO_T}$ac_cv_sizeof_long_long_int" >&6 | 16290 | echo "${ECHO_T}$ac_cv_sizeof_long_long_int" >&6 |
11864 | cat >>confdefs.h <<EOF | 16291 | cat >>confdefs.h <<_ACEOF |
11865 | #define SIZEOF_LONG_LONG_INT $ac_cv_sizeof_long_long_int | 16292 | #define SIZEOF_LONG_LONG_INT $ac_cv_sizeof_long_long_int |
11866 | EOF | 16293 | _ACEOF |
16294 | |||
16295 | |||
11867 | 16296 | ||
11868 | # Sanity check long long for some platforms (AIX) | 16297 | # Sanity check long long for some platforms (AIX) |
11869 | if test "x$ac_cv_sizeof_long_long_int" = "x4" ; then | 16298 | if test "x$ac_cv_sizeof_long_long_int" = "x4" ; then |
@@ -11871,15 +16300,18 @@ if test "x$ac_cv_sizeof_long_long_int" = "x4" ; then | |||
11871 | fi | 16300 | fi |
11872 | 16301 | ||
11873 | # More checks for data types | 16302 | # More checks for data types |
11874 | echo "$as_me:11874: checking for u_int type" >&5 | 16303 | echo "$as_me:$LINENO: checking for u_int type" >&5 |
11875 | echo $ECHO_N "checking for u_int type... $ECHO_C" >&6 | 16304 | echo $ECHO_N "checking for u_int type... $ECHO_C" >&6 |
11876 | if test "${ac_cv_have_u_int+set}" = set; then | 16305 | if test "${ac_cv_have_u_int+set}" = set; then |
11877 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 16306 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
11878 | else | 16307 | else |
11879 | 16308 | ||
11880 | cat >conftest.$ac_ext <<_ACEOF | 16309 | cat >conftest.$ac_ext <<_ACEOF |
11881 | #line 11881 "configure" | 16310 | /* confdefs.h. */ |
11882 | #include "confdefs.h" | 16311 | _ACEOF |
16312 | cat confdefs.h >>conftest.$ac_ext | ||
16313 | cat >>conftest.$ac_ext <<_ACEOF | ||
16314 | /* end confdefs.h. */ | ||
11883 | #include <sys/types.h> | 16315 | #include <sys/types.h> |
11884 | int | 16316 | int |
11885 | main () | 16317 | main () |
@@ -11890,46 +16322,60 @@ main () | |||
11890 | } | 16322 | } |
11891 | _ACEOF | 16323 | _ACEOF |
11892 | rm -f conftest.$ac_objext | 16324 | rm -f conftest.$ac_objext |
11893 | if { (eval echo "$as_me:11893: \"$ac_compile\"") >&5 | 16325 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
11894 | (eval $ac_compile) 2>&5 | 16326 | (eval $ac_compile) 2>conftest.er1 |
11895 | ac_status=$? | 16327 | ac_status=$? |
11896 | echo "$as_me:11896: \$? = $ac_status" >&5 | 16328 | grep -v '^ *+' conftest.er1 >conftest.err |
16329 | rm -f conftest.er1 | ||
16330 | cat conftest.err >&5 | ||
16331 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11897 | (exit $ac_status); } && | 16332 | (exit $ac_status); } && |
11898 | { ac_try='test -s conftest.$ac_objext' | 16333 | { ac_try='test -z "$ac_c_werror_flag" |
11899 | { (eval echo "$as_me:11899: \"$ac_try\"") >&5 | 16334 | || test ! -s conftest.err' |
16335 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11900 | (eval $ac_try) 2>&5 | 16336 | (eval $ac_try) 2>&5 |
11901 | ac_status=$? | 16337 | ac_status=$? |
11902 | echo "$as_me:11902: \$? = $ac_status" >&5 | 16338 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
16339 | (exit $ac_status); }; } && | ||
16340 | { ac_try='test -s conftest.$ac_objext' | ||
16341 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16342 | (eval $ac_try) 2>&5 | ||
16343 | ac_status=$? | ||
16344 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11903 | (exit $ac_status); }; }; then | 16345 | (exit $ac_status); }; }; then |
11904 | ac_cv_have_u_int="yes" | 16346 | ac_cv_have_u_int="yes" |
11905 | else | 16347 | else |
11906 | echo "$as_me: failed program was:" >&5 | 16348 | echo "$as_me: failed program was:" >&5 |
11907 | cat conftest.$ac_ext >&5 | 16349 | sed 's/^/| /' conftest.$ac_ext >&5 |
16350 | |||
11908 | ac_cv_have_u_int="no" | 16351 | ac_cv_have_u_int="no" |
11909 | 16352 | ||
11910 | fi | 16353 | fi |
11911 | rm -f conftest.$ac_objext conftest.$ac_ext | 16354 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
11912 | 16355 | ||
11913 | fi | 16356 | fi |
11914 | echo "$as_me:11914: result: $ac_cv_have_u_int" >&5 | 16357 | echo "$as_me:$LINENO: result: $ac_cv_have_u_int" >&5 |
11915 | echo "${ECHO_T}$ac_cv_have_u_int" >&6 | 16358 | echo "${ECHO_T}$ac_cv_have_u_int" >&6 |
11916 | if test "x$ac_cv_have_u_int" = "xyes" ; then | 16359 | if test "x$ac_cv_have_u_int" = "xyes" ; then |
11917 | cat >>confdefs.h <<\EOF | 16360 | cat >>confdefs.h <<\_ACEOF |
11918 | #define HAVE_U_INT 1 | 16361 | #define HAVE_U_INT 1 |
11919 | EOF | 16362 | _ACEOF |
11920 | 16363 | ||
11921 | have_u_int=1 | 16364 | have_u_int=1 |
11922 | fi | 16365 | fi |
11923 | 16366 | ||
11924 | echo "$as_me:11924: checking for intXX_t types" >&5 | 16367 | echo "$as_me:$LINENO: checking for intXX_t types" >&5 |
11925 | echo $ECHO_N "checking for intXX_t types... $ECHO_C" >&6 | 16368 | echo $ECHO_N "checking for intXX_t types... $ECHO_C" >&6 |
11926 | if test "${ac_cv_have_intxx_t+set}" = set; then | 16369 | if test "${ac_cv_have_intxx_t+set}" = set; then |
11927 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 16370 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
11928 | else | 16371 | else |
11929 | 16372 | ||
11930 | cat >conftest.$ac_ext <<_ACEOF | 16373 | cat >conftest.$ac_ext <<_ACEOF |
11931 | #line 11931 "configure" | 16374 | /* confdefs.h. */ |
11932 | #include "confdefs.h" | 16375 | _ACEOF |
16376 | cat confdefs.h >>conftest.$ac_ext | ||
16377 | cat >>conftest.$ac_ext <<_ACEOF | ||
16378 | /* end confdefs.h. */ | ||
11933 | #include <sys/types.h> | 16379 | #include <sys/types.h> |
11934 | int | 16380 | int |
11935 | main () | 16381 | main () |
@@ -11940,33 +16386,44 @@ main () | |||
11940 | } | 16386 | } |
11941 | _ACEOF | 16387 | _ACEOF |
11942 | rm -f conftest.$ac_objext | 16388 | rm -f conftest.$ac_objext |
11943 | if { (eval echo "$as_me:11943: \"$ac_compile\"") >&5 | 16389 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
11944 | (eval $ac_compile) 2>&5 | 16390 | (eval $ac_compile) 2>conftest.er1 |
11945 | ac_status=$? | 16391 | ac_status=$? |
11946 | echo "$as_me:11946: \$? = $ac_status" >&5 | 16392 | grep -v '^ *+' conftest.er1 >conftest.err |
16393 | rm -f conftest.er1 | ||
16394 | cat conftest.err >&5 | ||
16395 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11947 | (exit $ac_status); } && | 16396 | (exit $ac_status); } && |
11948 | { ac_try='test -s conftest.$ac_objext' | 16397 | { ac_try='test -z "$ac_c_werror_flag" |
11949 | { (eval echo "$as_me:11949: \"$ac_try\"") >&5 | 16398 | || test ! -s conftest.err' |
16399 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11950 | (eval $ac_try) 2>&5 | 16400 | (eval $ac_try) 2>&5 |
11951 | ac_status=$? | 16401 | ac_status=$? |
11952 | echo "$as_me:11952: \$? = $ac_status" >&5 | 16402 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
16403 | (exit $ac_status); }; } && | ||
16404 | { ac_try='test -s conftest.$ac_objext' | ||
16405 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16406 | (eval $ac_try) 2>&5 | ||
16407 | ac_status=$? | ||
16408 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11953 | (exit $ac_status); }; }; then | 16409 | (exit $ac_status); }; }; then |
11954 | ac_cv_have_intxx_t="yes" | 16410 | ac_cv_have_intxx_t="yes" |
11955 | else | 16411 | else |
11956 | echo "$as_me: failed program was:" >&5 | 16412 | echo "$as_me: failed program was:" >&5 |
11957 | cat conftest.$ac_ext >&5 | 16413 | sed 's/^/| /' conftest.$ac_ext >&5 |
16414 | |||
11958 | ac_cv_have_intxx_t="no" | 16415 | ac_cv_have_intxx_t="no" |
11959 | 16416 | ||
11960 | fi | 16417 | fi |
11961 | rm -f conftest.$ac_objext conftest.$ac_ext | 16418 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
11962 | 16419 | ||
11963 | fi | 16420 | fi |
11964 | echo "$as_me:11964: result: $ac_cv_have_intxx_t" >&5 | 16421 | echo "$as_me:$LINENO: result: $ac_cv_have_intxx_t" >&5 |
11965 | echo "${ECHO_T}$ac_cv_have_intxx_t" >&6 | 16422 | echo "${ECHO_T}$ac_cv_have_intxx_t" >&6 |
11966 | if test "x$ac_cv_have_intxx_t" = "xyes" ; then | 16423 | if test "x$ac_cv_have_intxx_t" = "xyes" ; then |
11967 | cat >>confdefs.h <<\EOF | 16424 | cat >>confdefs.h <<\_ACEOF |
11968 | #define HAVE_INTXX_T 1 | 16425 | #define HAVE_INTXX_T 1 |
11969 | EOF | 16426 | _ACEOF |
11970 | 16427 | ||
11971 | have_intxx_t=1 | 16428 | have_intxx_t=1 |
11972 | fi | 16429 | fi |
@@ -11974,11 +16431,14 @@ fi | |||
11974 | if (test -z "$have_intxx_t" && \ | 16431 | if (test -z "$have_intxx_t" && \ |
11975 | test "x$ac_cv_header_stdint_h" = "xyes") | 16432 | test "x$ac_cv_header_stdint_h" = "xyes") |
11976 | then | 16433 | then |
11977 | echo "$as_me:11977: checking for intXX_t types in stdint.h" >&5 | 16434 | echo "$as_me:$LINENO: checking for intXX_t types in stdint.h" >&5 |
11978 | echo $ECHO_N "checking for intXX_t types in stdint.h... $ECHO_C" >&6 | 16435 | echo $ECHO_N "checking for intXX_t types in stdint.h... $ECHO_C" >&6 |
11979 | cat >conftest.$ac_ext <<_ACEOF | 16436 | cat >conftest.$ac_ext <<_ACEOF |
11980 | #line 11980 "configure" | 16437 | /* confdefs.h. */ |
11981 | #include "confdefs.h" | 16438 | _ACEOF |
16439 | cat confdefs.h >>conftest.$ac_ext | ||
16440 | cat >>conftest.$ac_ext <<_ACEOF | ||
16441 | /* end confdefs.h. */ | ||
11982 | #include <stdint.h> | 16442 | #include <stdint.h> |
11983 | int | 16443 | int |
11984 | main () | 16444 | main () |
@@ -11989,44 +16449,58 @@ main () | |||
11989 | } | 16449 | } |
11990 | _ACEOF | 16450 | _ACEOF |
11991 | rm -f conftest.$ac_objext | 16451 | rm -f conftest.$ac_objext |
11992 | if { (eval echo "$as_me:11992: \"$ac_compile\"") >&5 | 16452 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
11993 | (eval $ac_compile) 2>&5 | 16453 | (eval $ac_compile) 2>conftest.er1 |
11994 | ac_status=$? | 16454 | ac_status=$? |
11995 | echo "$as_me:11995: \$? = $ac_status" >&5 | 16455 | grep -v '^ *+' conftest.er1 >conftest.err |
16456 | rm -f conftest.er1 | ||
16457 | cat conftest.err >&5 | ||
16458 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
11996 | (exit $ac_status); } && | 16459 | (exit $ac_status); } && |
11997 | { ac_try='test -s conftest.$ac_objext' | 16460 | { ac_try='test -z "$ac_c_werror_flag" |
11998 | { (eval echo "$as_me:11998: \"$ac_try\"") >&5 | 16461 | || test ! -s conftest.err' |
16462 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
11999 | (eval $ac_try) 2>&5 | 16463 | (eval $ac_try) 2>&5 |
12000 | ac_status=$? | 16464 | ac_status=$? |
12001 | echo "$as_me:12001: \$? = $ac_status" >&5 | 16465 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
16466 | (exit $ac_status); }; } && | ||
16467 | { ac_try='test -s conftest.$ac_objext' | ||
16468 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16469 | (eval $ac_try) 2>&5 | ||
16470 | ac_status=$? | ||
16471 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12002 | (exit $ac_status); }; }; then | 16472 | (exit $ac_status); }; }; then |
12003 | 16473 | ||
12004 | cat >>confdefs.h <<\EOF | 16474 | cat >>confdefs.h <<\_ACEOF |
12005 | #define HAVE_INTXX_T 1 | 16475 | #define HAVE_INTXX_T 1 |
12006 | EOF | 16476 | _ACEOF |
12007 | 16477 | ||
12008 | echo "$as_me:12008: result: yes" >&5 | 16478 | echo "$as_me:$LINENO: result: yes" >&5 |
12009 | echo "${ECHO_T}yes" >&6 | 16479 | echo "${ECHO_T}yes" >&6 |
12010 | 16480 | ||
12011 | else | 16481 | else |
12012 | echo "$as_me: failed program was:" >&5 | 16482 | echo "$as_me: failed program was:" >&5 |
12013 | cat conftest.$ac_ext >&5 | 16483 | sed 's/^/| /' conftest.$ac_ext >&5 |
12014 | echo "$as_me:12014: result: no" >&5 | 16484 | |
16485 | echo "$as_me:$LINENO: result: no" >&5 | ||
12015 | echo "${ECHO_T}no" >&6 | 16486 | echo "${ECHO_T}no" >&6 |
12016 | 16487 | ||
12017 | fi | 16488 | fi |
12018 | rm -f conftest.$ac_objext conftest.$ac_ext | 16489 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
12019 | fi | 16490 | fi |
12020 | 16491 | ||
12021 | echo "$as_me:12021: checking for int64_t type" >&5 | 16492 | echo "$as_me:$LINENO: checking for int64_t type" >&5 |
12022 | echo $ECHO_N "checking for int64_t type... $ECHO_C" >&6 | 16493 | echo $ECHO_N "checking for int64_t type... $ECHO_C" >&6 |
12023 | if test "${ac_cv_have_int64_t+set}" = set; then | 16494 | if test "${ac_cv_have_int64_t+set}" = set; then |
12024 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 16495 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
12025 | else | 16496 | else |
12026 | 16497 | ||
12027 | cat >conftest.$ac_ext <<_ACEOF | 16498 | cat >conftest.$ac_ext <<_ACEOF |
12028 | #line 12028 "configure" | 16499 | /* confdefs.h. */ |
12029 | #include "confdefs.h" | 16500 | _ACEOF |
16501 | cat confdefs.h >>conftest.$ac_ext | ||
16502 | cat >>conftest.$ac_ext <<_ACEOF | ||
16503 | /* end confdefs.h. */ | ||
12030 | 16504 | ||
12031 | #include <sys/types.h> | 16505 | #include <sys/types.h> |
12032 | #ifdef HAVE_STDINT_H | 16506 | #ifdef HAVE_STDINT_H |
@@ -12046,45 +16520,59 @@ main () | |||
12046 | } | 16520 | } |
12047 | _ACEOF | 16521 | _ACEOF |
12048 | rm -f conftest.$ac_objext | 16522 | rm -f conftest.$ac_objext |
12049 | if { (eval echo "$as_me:12049: \"$ac_compile\"") >&5 | 16523 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
12050 | (eval $ac_compile) 2>&5 | 16524 | (eval $ac_compile) 2>conftest.er1 |
12051 | ac_status=$? | 16525 | ac_status=$? |
12052 | echo "$as_me:12052: \$? = $ac_status" >&5 | 16526 | grep -v '^ *+' conftest.er1 >conftest.err |
16527 | rm -f conftest.er1 | ||
16528 | cat conftest.err >&5 | ||
16529 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12053 | (exit $ac_status); } && | 16530 | (exit $ac_status); } && |
12054 | { ac_try='test -s conftest.$ac_objext' | 16531 | { ac_try='test -z "$ac_c_werror_flag" |
12055 | { (eval echo "$as_me:12055: \"$ac_try\"") >&5 | 16532 | || test ! -s conftest.err' |
16533 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12056 | (eval $ac_try) 2>&5 | 16534 | (eval $ac_try) 2>&5 |
12057 | ac_status=$? | 16535 | ac_status=$? |
12058 | echo "$as_me:12058: \$? = $ac_status" >&5 | 16536 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
16537 | (exit $ac_status); }; } && | ||
16538 | { ac_try='test -s conftest.$ac_objext' | ||
16539 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16540 | (eval $ac_try) 2>&5 | ||
16541 | ac_status=$? | ||
16542 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12059 | (exit $ac_status); }; }; then | 16543 | (exit $ac_status); }; }; then |
12060 | ac_cv_have_int64_t="yes" | 16544 | ac_cv_have_int64_t="yes" |
12061 | else | 16545 | else |
12062 | echo "$as_me: failed program was:" >&5 | 16546 | echo "$as_me: failed program was:" >&5 |
12063 | cat conftest.$ac_ext >&5 | 16547 | sed 's/^/| /' conftest.$ac_ext >&5 |
16548 | |||
12064 | ac_cv_have_int64_t="no" | 16549 | ac_cv_have_int64_t="no" |
12065 | 16550 | ||
12066 | fi | 16551 | fi |
12067 | rm -f conftest.$ac_objext conftest.$ac_ext | 16552 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
12068 | 16553 | ||
12069 | fi | 16554 | fi |
12070 | echo "$as_me:12070: result: $ac_cv_have_int64_t" >&5 | 16555 | echo "$as_me:$LINENO: result: $ac_cv_have_int64_t" >&5 |
12071 | echo "${ECHO_T}$ac_cv_have_int64_t" >&6 | 16556 | echo "${ECHO_T}$ac_cv_have_int64_t" >&6 |
12072 | if test "x$ac_cv_have_int64_t" = "xyes" ; then | 16557 | if test "x$ac_cv_have_int64_t" = "xyes" ; then |
12073 | cat >>confdefs.h <<\EOF | 16558 | cat >>confdefs.h <<\_ACEOF |
12074 | #define HAVE_INT64_T 1 | 16559 | #define HAVE_INT64_T 1 |
12075 | EOF | 16560 | _ACEOF |
12076 | 16561 | ||
12077 | fi | 16562 | fi |
12078 | 16563 | ||
12079 | echo "$as_me:12079: checking for u_intXX_t types" >&5 | 16564 | echo "$as_me:$LINENO: checking for u_intXX_t types" >&5 |
12080 | echo $ECHO_N "checking for u_intXX_t types... $ECHO_C" >&6 | 16565 | echo $ECHO_N "checking for u_intXX_t types... $ECHO_C" >&6 |
12081 | if test "${ac_cv_have_u_intxx_t+set}" = set; then | 16566 | if test "${ac_cv_have_u_intxx_t+set}" = set; then |
12082 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 16567 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
12083 | else | 16568 | else |
12084 | 16569 | ||
12085 | cat >conftest.$ac_ext <<_ACEOF | 16570 | cat >conftest.$ac_ext <<_ACEOF |
12086 | #line 12086 "configure" | 16571 | /* confdefs.h. */ |
12087 | #include "confdefs.h" | 16572 | _ACEOF |
16573 | cat confdefs.h >>conftest.$ac_ext | ||
16574 | cat >>conftest.$ac_ext <<_ACEOF | ||
16575 | /* end confdefs.h. */ | ||
12088 | #include <sys/types.h> | 16576 | #include <sys/types.h> |
12089 | int | 16577 | int |
12090 | main () | 16578 | main () |
@@ -12095,43 +16583,57 @@ main () | |||
12095 | } | 16583 | } |
12096 | _ACEOF | 16584 | _ACEOF |
12097 | rm -f conftest.$ac_objext | 16585 | rm -f conftest.$ac_objext |
12098 | if { (eval echo "$as_me:12098: \"$ac_compile\"") >&5 | 16586 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
12099 | (eval $ac_compile) 2>&5 | 16587 | (eval $ac_compile) 2>conftest.er1 |
12100 | ac_status=$? | 16588 | ac_status=$? |
12101 | echo "$as_me:12101: \$? = $ac_status" >&5 | 16589 | grep -v '^ *+' conftest.er1 >conftest.err |
16590 | rm -f conftest.er1 | ||
16591 | cat conftest.err >&5 | ||
16592 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12102 | (exit $ac_status); } && | 16593 | (exit $ac_status); } && |
12103 | { ac_try='test -s conftest.$ac_objext' | 16594 | { ac_try='test -z "$ac_c_werror_flag" |
12104 | { (eval echo "$as_me:12104: \"$ac_try\"") >&5 | 16595 | || test ! -s conftest.err' |
16596 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16597 | (eval $ac_try) 2>&5 | ||
16598 | ac_status=$? | ||
16599 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16600 | (exit $ac_status); }; } && | ||
16601 | { ac_try='test -s conftest.$ac_objext' | ||
16602 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12105 | (eval $ac_try) 2>&5 | 16603 | (eval $ac_try) 2>&5 |
12106 | ac_status=$? | 16604 | ac_status=$? |
12107 | echo "$as_me:12107: \$? = $ac_status" >&5 | 16605 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
12108 | (exit $ac_status); }; }; then | 16606 | (exit $ac_status); }; }; then |
12109 | ac_cv_have_u_intxx_t="yes" | 16607 | ac_cv_have_u_intxx_t="yes" |
12110 | else | 16608 | else |
12111 | echo "$as_me: failed program was:" >&5 | 16609 | echo "$as_me: failed program was:" >&5 |
12112 | cat conftest.$ac_ext >&5 | 16610 | sed 's/^/| /' conftest.$ac_ext >&5 |
16611 | |||
12113 | ac_cv_have_u_intxx_t="no" | 16612 | ac_cv_have_u_intxx_t="no" |
12114 | 16613 | ||
12115 | fi | 16614 | fi |
12116 | rm -f conftest.$ac_objext conftest.$ac_ext | 16615 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
12117 | 16616 | ||
12118 | fi | 16617 | fi |
12119 | echo "$as_me:12119: result: $ac_cv_have_u_intxx_t" >&5 | 16618 | echo "$as_me:$LINENO: result: $ac_cv_have_u_intxx_t" >&5 |
12120 | echo "${ECHO_T}$ac_cv_have_u_intxx_t" >&6 | 16619 | echo "${ECHO_T}$ac_cv_have_u_intxx_t" >&6 |
12121 | if test "x$ac_cv_have_u_intxx_t" = "xyes" ; then | 16620 | if test "x$ac_cv_have_u_intxx_t" = "xyes" ; then |
12122 | cat >>confdefs.h <<\EOF | 16621 | cat >>confdefs.h <<\_ACEOF |
12123 | #define HAVE_U_INTXX_T 1 | 16622 | #define HAVE_U_INTXX_T 1 |
12124 | EOF | 16623 | _ACEOF |
12125 | 16624 | ||
12126 | have_u_intxx_t=1 | 16625 | have_u_intxx_t=1 |
12127 | fi | 16626 | fi |
12128 | 16627 | ||
12129 | if test -z "$have_u_intxx_t" ; then | 16628 | if test -z "$have_u_intxx_t" ; then |
12130 | echo "$as_me:12130: checking for u_intXX_t types in sys/socket.h" >&5 | 16629 | echo "$as_me:$LINENO: checking for u_intXX_t types in sys/socket.h" >&5 |
12131 | echo $ECHO_N "checking for u_intXX_t types in sys/socket.h... $ECHO_C" >&6 | 16630 | echo $ECHO_N "checking for u_intXX_t types in sys/socket.h... $ECHO_C" >&6 |
12132 | cat >conftest.$ac_ext <<_ACEOF | 16631 | cat >conftest.$ac_ext <<_ACEOF |
12133 | #line 12133 "configure" | 16632 | /* confdefs.h. */ |
12134 | #include "confdefs.h" | 16633 | _ACEOF |
16634 | cat confdefs.h >>conftest.$ac_ext | ||
16635 | cat >>conftest.$ac_ext <<_ACEOF | ||
16636 | /* end confdefs.h. */ | ||
12135 | #include <sys/socket.h> | 16637 | #include <sys/socket.h> |
12136 | int | 16638 | int |
12137 | main () | 16639 | main () |
@@ -12142,44 +16644,58 @@ main () | |||
12142 | } | 16644 | } |
12143 | _ACEOF | 16645 | _ACEOF |
12144 | rm -f conftest.$ac_objext | 16646 | rm -f conftest.$ac_objext |
12145 | if { (eval echo "$as_me:12145: \"$ac_compile\"") >&5 | 16647 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
12146 | (eval $ac_compile) 2>&5 | 16648 | (eval $ac_compile) 2>conftest.er1 |
12147 | ac_status=$? | 16649 | ac_status=$? |
12148 | echo "$as_me:12148: \$? = $ac_status" >&5 | 16650 | grep -v '^ *+' conftest.er1 >conftest.err |
16651 | rm -f conftest.er1 | ||
16652 | cat conftest.err >&5 | ||
16653 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12149 | (exit $ac_status); } && | 16654 | (exit $ac_status); } && |
12150 | { ac_try='test -s conftest.$ac_objext' | 16655 | { ac_try='test -z "$ac_c_werror_flag" |
12151 | { (eval echo "$as_me:12151: \"$ac_try\"") >&5 | 16656 | || test ! -s conftest.err' |
16657 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12152 | (eval $ac_try) 2>&5 | 16658 | (eval $ac_try) 2>&5 |
12153 | ac_status=$? | 16659 | ac_status=$? |
12154 | echo "$as_me:12154: \$? = $ac_status" >&5 | 16660 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
16661 | (exit $ac_status); }; } && | ||
16662 | { ac_try='test -s conftest.$ac_objext' | ||
16663 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16664 | (eval $ac_try) 2>&5 | ||
16665 | ac_status=$? | ||
16666 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12155 | (exit $ac_status); }; }; then | 16667 | (exit $ac_status); }; }; then |
12156 | 16668 | ||
12157 | cat >>confdefs.h <<\EOF | 16669 | cat >>confdefs.h <<\_ACEOF |
12158 | #define HAVE_U_INTXX_T 1 | 16670 | #define HAVE_U_INTXX_T 1 |
12159 | EOF | 16671 | _ACEOF |
12160 | 16672 | ||
12161 | echo "$as_me:12161: result: yes" >&5 | 16673 | echo "$as_me:$LINENO: result: yes" >&5 |
12162 | echo "${ECHO_T}yes" >&6 | 16674 | echo "${ECHO_T}yes" >&6 |
12163 | 16675 | ||
12164 | else | 16676 | else |
12165 | echo "$as_me: failed program was:" >&5 | 16677 | echo "$as_me: failed program was:" >&5 |
12166 | cat conftest.$ac_ext >&5 | 16678 | sed 's/^/| /' conftest.$ac_ext >&5 |
12167 | echo "$as_me:12167: result: no" >&5 | 16679 | |
16680 | echo "$as_me:$LINENO: result: no" >&5 | ||
12168 | echo "${ECHO_T}no" >&6 | 16681 | echo "${ECHO_T}no" >&6 |
12169 | 16682 | ||
12170 | fi | 16683 | fi |
12171 | rm -f conftest.$ac_objext conftest.$ac_ext | 16684 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
12172 | fi | 16685 | fi |
12173 | 16686 | ||
12174 | echo "$as_me:12174: checking for u_int64_t types" >&5 | 16687 | echo "$as_me:$LINENO: checking for u_int64_t types" >&5 |
12175 | echo $ECHO_N "checking for u_int64_t types... $ECHO_C" >&6 | 16688 | echo $ECHO_N "checking for u_int64_t types... $ECHO_C" >&6 |
12176 | if test "${ac_cv_have_u_int64_t+set}" = set; then | 16689 | if test "${ac_cv_have_u_int64_t+set}" = set; then |
12177 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 16690 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
12178 | else | 16691 | else |
12179 | 16692 | ||
12180 | cat >conftest.$ac_ext <<_ACEOF | 16693 | cat >conftest.$ac_ext <<_ACEOF |
12181 | #line 12181 "configure" | 16694 | /* confdefs.h. */ |
12182 | #include "confdefs.h" | 16695 | _ACEOF |
16696 | cat confdefs.h >>conftest.$ac_ext | ||
16697 | cat >>conftest.$ac_ext <<_ACEOF | ||
16698 | /* end confdefs.h. */ | ||
12183 | #include <sys/types.h> | 16699 | #include <sys/types.h> |
12184 | int | 16700 | int |
12185 | main () | 16701 | main () |
@@ -12190,43 +16706,57 @@ main () | |||
12190 | } | 16706 | } |
12191 | _ACEOF | 16707 | _ACEOF |
12192 | rm -f conftest.$ac_objext | 16708 | rm -f conftest.$ac_objext |
12193 | if { (eval echo "$as_me:12193: \"$ac_compile\"") >&5 | 16709 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
12194 | (eval $ac_compile) 2>&5 | 16710 | (eval $ac_compile) 2>conftest.er1 |
12195 | ac_status=$? | 16711 | ac_status=$? |
12196 | echo "$as_me:12196: \$? = $ac_status" >&5 | 16712 | grep -v '^ *+' conftest.er1 >conftest.err |
16713 | rm -f conftest.er1 | ||
16714 | cat conftest.err >&5 | ||
16715 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12197 | (exit $ac_status); } && | 16716 | (exit $ac_status); } && |
12198 | { ac_try='test -s conftest.$ac_objext' | 16717 | { ac_try='test -z "$ac_c_werror_flag" |
12199 | { (eval echo "$as_me:12199: \"$ac_try\"") >&5 | 16718 | || test ! -s conftest.err' |
16719 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12200 | (eval $ac_try) 2>&5 | 16720 | (eval $ac_try) 2>&5 |
12201 | ac_status=$? | 16721 | ac_status=$? |
12202 | echo "$as_me:12202: \$? = $ac_status" >&5 | 16722 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
16723 | (exit $ac_status); }; } && | ||
16724 | { ac_try='test -s conftest.$ac_objext' | ||
16725 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16726 | (eval $ac_try) 2>&5 | ||
16727 | ac_status=$? | ||
16728 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12203 | (exit $ac_status); }; }; then | 16729 | (exit $ac_status); }; }; then |
12204 | ac_cv_have_u_int64_t="yes" | 16730 | ac_cv_have_u_int64_t="yes" |
12205 | else | 16731 | else |
12206 | echo "$as_me: failed program was:" >&5 | 16732 | echo "$as_me: failed program was:" >&5 |
12207 | cat conftest.$ac_ext >&5 | 16733 | sed 's/^/| /' conftest.$ac_ext >&5 |
16734 | |||
12208 | ac_cv_have_u_int64_t="no" | 16735 | ac_cv_have_u_int64_t="no" |
12209 | 16736 | ||
12210 | fi | 16737 | fi |
12211 | rm -f conftest.$ac_objext conftest.$ac_ext | 16738 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
12212 | 16739 | ||
12213 | fi | 16740 | fi |
12214 | echo "$as_me:12214: result: $ac_cv_have_u_int64_t" >&5 | 16741 | echo "$as_me:$LINENO: result: $ac_cv_have_u_int64_t" >&5 |
12215 | echo "${ECHO_T}$ac_cv_have_u_int64_t" >&6 | 16742 | echo "${ECHO_T}$ac_cv_have_u_int64_t" >&6 |
12216 | if test "x$ac_cv_have_u_int64_t" = "xyes" ; then | 16743 | if test "x$ac_cv_have_u_int64_t" = "xyes" ; then |
12217 | cat >>confdefs.h <<\EOF | 16744 | cat >>confdefs.h <<\_ACEOF |
12218 | #define HAVE_U_INT64_T 1 | 16745 | #define HAVE_U_INT64_T 1 |
12219 | EOF | 16746 | _ACEOF |
12220 | 16747 | ||
12221 | have_u_int64_t=1 | 16748 | have_u_int64_t=1 |
12222 | fi | 16749 | fi |
12223 | 16750 | ||
12224 | if test -z "$have_u_int64_t" ; then | 16751 | if test -z "$have_u_int64_t" ; then |
12225 | echo "$as_me:12225: checking for u_int64_t type in sys/bitypes.h" >&5 | 16752 | echo "$as_me:$LINENO: checking for u_int64_t type in sys/bitypes.h" >&5 |
12226 | echo $ECHO_N "checking for u_int64_t type in sys/bitypes.h... $ECHO_C" >&6 | 16753 | echo $ECHO_N "checking for u_int64_t type in sys/bitypes.h... $ECHO_C" >&6 |
12227 | cat >conftest.$ac_ext <<_ACEOF | 16754 | cat >conftest.$ac_ext <<_ACEOF |
12228 | #line 12228 "configure" | 16755 | /* confdefs.h. */ |
12229 | #include "confdefs.h" | 16756 | _ACEOF |
16757 | cat confdefs.h >>conftest.$ac_ext | ||
16758 | cat >>conftest.$ac_ext <<_ACEOF | ||
16759 | /* end confdefs.h. */ | ||
12230 | #include <sys/bitypes.h> | 16760 | #include <sys/bitypes.h> |
12231 | int | 16761 | int |
12232 | main () | 16762 | main () |
@@ -12237,45 +16767,59 @@ main () | |||
12237 | } | 16767 | } |
12238 | _ACEOF | 16768 | _ACEOF |
12239 | rm -f conftest.$ac_objext | 16769 | rm -f conftest.$ac_objext |
12240 | if { (eval echo "$as_me:12240: \"$ac_compile\"") >&5 | 16770 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
12241 | (eval $ac_compile) 2>&5 | 16771 | (eval $ac_compile) 2>conftest.er1 |
12242 | ac_status=$? | 16772 | ac_status=$? |
12243 | echo "$as_me:12243: \$? = $ac_status" >&5 | 16773 | grep -v '^ *+' conftest.er1 >conftest.err |
16774 | rm -f conftest.er1 | ||
16775 | cat conftest.err >&5 | ||
16776 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12244 | (exit $ac_status); } && | 16777 | (exit $ac_status); } && |
12245 | { ac_try='test -s conftest.$ac_objext' | 16778 | { ac_try='test -z "$ac_c_werror_flag" |
12246 | { (eval echo "$as_me:12246: \"$ac_try\"") >&5 | 16779 | || test ! -s conftest.err' |
16780 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12247 | (eval $ac_try) 2>&5 | 16781 | (eval $ac_try) 2>&5 |
12248 | ac_status=$? | 16782 | ac_status=$? |
12249 | echo "$as_me:12249: \$? = $ac_status" >&5 | 16783 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
16784 | (exit $ac_status); }; } && | ||
16785 | { ac_try='test -s conftest.$ac_objext' | ||
16786 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16787 | (eval $ac_try) 2>&5 | ||
16788 | ac_status=$? | ||
16789 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12250 | (exit $ac_status); }; }; then | 16790 | (exit $ac_status); }; }; then |
12251 | 16791 | ||
12252 | cat >>confdefs.h <<\EOF | 16792 | cat >>confdefs.h <<\_ACEOF |
12253 | #define HAVE_U_INT64_T 1 | 16793 | #define HAVE_U_INT64_T 1 |
12254 | EOF | 16794 | _ACEOF |
12255 | 16795 | ||
12256 | echo "$as_me:12256: result: yes" >&5 | 16796 | echo "$as_me:$LINENO: result: yes" >&5 |
12257 | echo "${ECHO_T}yes" >&6 | 16797 | echo "${ECHO_T}yes" >&6 |
12258 | 16798 | ||
12259 | else | 16799 | else |
12260 | echo "$as_me: failed program was:" >&5 | 16800 | echo "$as_me: failed program was:" >&5 |
12261 | cat conftest.$ac_ext >&5 | 16801 | sed 's/^/| /' conftest.$ac_ext >&5 |
12262 | echo "$as_me:12262: result: no" >&5 | 16802 | |
16803 | echo "$as_me:$LINENO: result: no" >&5 | ||
12263 | echo "${ECHO_T}no" >&6 | 16804 | echo "${ECHO_T}no" >&6 |
12264 | 16805 | ||
12265 | fi | 16806 | fi |
12266 | rm -f conftest.$ac_objext conftest.$ac_ext | 16807 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
12267 | fi | 16808 | fi |
12268 | 16809 | ||
12269 | if test -z "$have_u_intxx_t" ; then | 16810 | if test -z "$have_u_intxx_t" ; then |
12270 | echo "$as_me:12270: checking for uintXX_t types" >&5 | 16811 | echo "$as_me:$LINENO: checking for uintXX_t types" >&5 |
12271 | echo $ECHO_N "checking for uintXX_t types... $ECHO_C" >&6 | 16812 | echo $ECHO_N "checking for uintXX_t types... $ECHO_C" >&6 |
12272 | if test "${ac_cv_have_uintxx_t+set}" = set; then | 16813 | if test "${ac_cv_have_uintxx_t+set}" = set; then |
12273 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 16814 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
12274 | else | 16815 | else |
12275 | 16816 | ||
12276 | cat >conftest.$ac_ext <<_ACEOF | 16817 | cat >conftest.$ac_ext <<_ACEOF |
12277 | #line 12277 "configure" | 16818 | /* confdefs.h. */ |
12278 | #include "confdefs.h" | 16819 | _ACEOF |
16820 | cat confdefs.h >>conftest.$ac_ext | ||
16821 | cat >>conftest.$ac_ext <<_ACEOF | ||
16822 | /* end confdefs.h. */ | ||
12279 | 16823 | ||
12280 | #include <sys/types.h> | 16824 | #include <sys/types.h> |
12281 | 16825 | ||
@@ -12288,43 +16832,57 @@ main () | |||
12288 | } | 16832 | } |
12289 | _ACEOF | 16833 | _ACEOF |
12290 | rm -f conftest.$ac_objext | 16834 | rm -f conftest.$ac_objext |
12291 | if { (eval echo "$as_me:12291: \"$ac_compile\"") >&5 | 16835 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
12292 | (eval $ac_compile) 2>&5 | 16836 | (eval $ac_compile) 2>conftest.er1 |
12293 | ac_status=$? | 16837 | ac_status=$? |
12294 | echo "$as_me:12294: \$? = $ac_status" >&5 | 16838 | grep -v '^ *+' conftest.er1 >conftest.err |
16839 | rm -f conftest.er1 | ||
16840 | cat conftest.err >&5 | ||
16841 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12295 | (exit $ac_status); } && | 16842 | (exit $ac_status); } && |
12296 | { ac_try='test -s conftest.$ac_objext' | 16843 | { ac_try='test -z "$ac_c_werror_flag" |
12297 | { (eval echo "$as_me:12297: \"$ac_try\"") >&5 | 16844 | || test ! -s conftest.err' |
16845 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16846 | (eval $ac_try) 2>&5 | ||
16847 | ac_status=$? | ||
16848 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16849 | (exit $ac_status); }; } && | ||
16850 | { ac_try='test -s conftest.$ac_objext' | ||
16851 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12298 | (eval $ac_try) 2>&5 | 16852 | (eval $ac_try) 2>&5 |
12299 | ac_status=$? | 16853 | ac_status=$? |
12300 | echo "$as_me:12300: \$? = $ac_status" >&5 | 16854 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
12301 | (exit $ac_status); }; }; then | 16855 | (exit $ac_status); }; }; then |
12302 | ac_cv_have_uintxx_t="yes" | 16856 | ac_cv_have_uintxx_t="yes" |
12303 | else | 16857 | else |
12304 | echo "$as_me: failed program was:" >&5 | 16858 | echo "$as_me: failed program was:" >&5 |
12305 | cat conftest.$ac_ext >&5 | 16859 | sed 's/^/| /' conftest.$ac_ext >&5 |
16860 | |||
12306 | ac_cv_have_uintxx_t="no" | 16861 | ac_cv_have_uintxx_t="no" |
12307 | 16862 | ||
12308 | fi | 16863 | fi |
12309 | rm -f conftest.$ac_objext conftest.$ac_ext | 16864 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
12310 | 16865 | ||
12311 | fi | 16866 | fi |
12312 | echo "$as_me:12312: result: $ac_cv_have_uintxx_t" >&5 | 16867 | echo "$as_me:$LINENO: result: $ac_cv_have_uintxx_t" >&5 |
12313 | echo "${ECHO_T}$ac_cv_have_uintxx_t" >&6 | 16868 | echo "${ECHO_T}$ac_cv_have_uintxx_t" >&6 |
12314 | if test "x$ac_cv_have_uintxx_t" = "xyes" ; then | 16869 | if test "x$ac_cv_have_uintxx_t" = "xyes" ; then |
12315 | cat >>confdefs.h <<\EOF | 16870 | cat >>confdefs.h <<\_ACEOF |
12316 | #define HAVE_UINTXX_T 1 | 16871 | #define HAVE_UINTXX_T 1 |
12317 | EOF | 16872 | _ACEOF |
12318 | 16873 | ||
12319 | fi | 16874 | fi |
12320 | fi | 16875 | fi |
12321 | 16876 | ||
12322 | if test -z "$have_uintxx_t" ; then | 16877 | if test -z "$have_uintxx_t" ; then |
12323 | echo "$as_me:12323: checking for uintXX_t types in stdint.h" >&5 | 16878 | echo "$as_me:$LINENO: checking for uintXX_t types in stdint.h" >&5 |
12324 | echo $ECHO_N "checking for uintXX_t types in stdint.h... $ECHO_C" >&6 | 16879 | echo $ECHO_N "checking for uintXX_t types in stdint.h... $ECHO_C" >&6 |
12325 | cat >conftest.$ac_ext <<_ACEOF | 16880 | cat >conftest.$ac_ext <<_ACEOF |
12326 | #line 12326 "configure" | 16881 | /* confdefs.h. */ |
12327 | #include "confdefs.h" | 16882 | _ACEOF |
16883 | cat confdefs.h >>conftest.$ac_ext | ||
16884 | cat >>conftest.$ac_ext <<_ACEOF | ||
16885 | /* end confdefs.h. */ | ||
12328 | #include <stdint.h> | 16886 | #include <stdint.h> |
12329 | int | 16887 | int |
12330 | main () | 16888 | main () |
@@ -12335,43 +16893,57 @@ main () | |||
12335 | } | 16893 | } |
12336 | _ACEOF | 16894 | _ACEOF |
12337 | rm -f conftest.$ac_objext | 16895 | rm -f conftest.$ac_objext |
12338 | if { (eval echo "$as_me:12338: \"$ac_compile\"") >&5 | 16896 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
12339 | (eval $ac_compile) 2>&5 | 16897 | (eval $ac_compile) 2>conftest.er1 |
12340 | ac_status=$? | 16898 | ac_status=$? |
12341 | echo "$as_me:12341: \$? = $ac_status" >&5 | 16899 | grep -v '^ *+' conftest.er1 >conftest.err |
16900 | rm -f conftest.er1 | ||
16901 | cat conftest.err >&5 | ||
16902 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12342 | (exit $ac_status); } && | 16903 | (exit $ac_status); } && |
12343 | { ac_try='test -s conftest.$ac_objext' | 16904 | { ac_try='test -z "$ac_c_werror_flag" |
12344 | { (eval echo "$as_me:12344: \"$ac_try\"") >&5 | 16905 | || test ! -s conftest.err' |
16906 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16907 | (eval $ac_try) 2>&5 | ||
16908 | ac_status=$? | ||
16909 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16910 | (exit $ac_status); }; } && | ||
16911 | { ac_try='test -s conftest.$ac_objext' | ||
16912 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12345 | (eval $ac_try) 2>&5 | 16913 | (eval $ac_try) 2>&5 |
12346 | ac_status=$? | 16914 | ac_status=$? |
12347 | echo "$as_me:12347: \$? = $ac_status" >&5 | 16915 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
12348 | (exit $ac_status); }; }; then | 16916 | (exit $ac_status); }; }; then |
12349 | 16917 | ||
12350 | cat >>confdefs.h <<\EOF | 16918 | cat >>confdefs.h <<\_ACEOF |
12351 | #define HAVE_UINTXX_T 1 | 16919 | #define HAVE_UINTXX_T 1 |
12352 | EOF | 16920 | _ACEOF |
12353 | 16921 | ||
12354 | echo "$as_me:12354: result: yes" >&5 | 16922 | echo "$as_me:$LINENO: result: yes" >&5 |
12355 | echo "${ECHO_T}yes" >&6 | 16923 | echo "${ECHO_T}yes" >&6 |
12356 | 16924 | ||
12357 | else | 16925 | else |
12358 | echo "$as_me: failed program was:" >&5 | 16926 | echo "$as_me: failed program was:" >&5 |
12359 | cat conftest.$ac_ext >&5 | 16927 | sed 's/^/| /' conftest.$ac_ext >&5 |
12360 | echo "$as_me:12360: result: no" >&5 | 16928 | |
16929 | echo "$as_me:$LINENO: result: no" >&5 | ||
12361 | echo "${ECHO_T}no" >&6 | 16930 | echo "${ECHO_T}no" >&6 |
12362 | 16931 | ||
12363 | fi | 16932 | fi |
12364 | rm -f conftest.$ac_objext conftest.$ac_ext | 16933 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
12365 | fi | 16934 | fi |
12366 | 16935 | ||
12367 | if (test -z "$have_u_intxx_t" || test -z "$have_intxx_t" && \ | 16936 | if (test -z "$have_u_intxx_t" || test -z "$have_intxx_t" && \ |
12368 | test "x$ac_cv_header_sys_bitypes_h" = "xyes") | 16937 | test "x$ac_cv_header_sys_bitypes_h" = "xyes") |
12369 | then | 16938 | then |
12370 | echo "$as_me:12370: checking for intXX_t and u_intXX_t types in sys/bitypes.h" >&5 | 16939 | echo "$as_me:$LINENO: checking for intXX_t and u_intXX_t types in sys/bitypes.h" >&5 |
12371 | echo $ECHO_N "checking for intXX_t and u_intXX_t types in sys/bitypes.h... $ECHO_C" >&6 | 16940 | echo $ECHO_N "checking for intXX_t and u_intXX_t types in sys/bitypes.h... $ECHO_C" >&6 |
12372 | cat >conftest.$ac_ext <<_ACEOF | 16941 | cat >conftest.$ac_ext <<_ACEOF |
12373 | #line 12373 "configure" | 16942 | /* confdefs.h. */ |
12374 | #include "confdefs.h" | 16943 | _ACEOF |
16944 | cat confdefs.h >>conftest.$ac_ext | ||
16945 | cat >>conftest.$ac_ext <<_ACEOF | ||
16946 | /* end confdefs.h. */ | ||
12375 | 16947 | ||
12376 | #include <sys/bitypes.h> | 16948 | #include <sys/bitypes.h> |
12377 | 16949 | ||
@@ -12388,48 +16960,63 @@ main () | |||
12388 | } | 16960 | } |
12389 | _ACEOF | 16961 | _ACEOF |
12390 | rm -f conftest.$ac_objext | 16962 | rm -f conftest.$ac_objext |
12391 | if { (eval echo "$as_me:12391: \"$ac_compile\"") >&5 | 16963 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
12392 | (eval $ac_compile) 2>&5 | 16964 | (eval $ac_compile) 2>conftest.er1 |
12393 | ac_status=$? | 16965 | ac_status=$? |
12394 | echo "$as_me:12394: \$? = $ac_status" >&5 | 16966 | grep -v '^ *+' conftest.er1 >conftest.err |
16967 | rm -f conftest.er1 | ||
16968 | cat conftest.err >&5 | ||
16969 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12395 | (exit $ac_status); } && | 16970 | (exit $ac_status); } && |
12396 | { ac_try='test -s conftest.$ac_objext' | 16971 | { ac_try='test -z "$ac_c_werror_flag" |
12397 | { (eval echo "$as_me:12397: \"$ac_try\"") >&5 | 16972 | || test ! -s conftest.err' |
16973 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12398 | (eval $ac_try) 2>&5 | 16974 | (eval $ac_try) 2>&5 |
12399 | ac_status=$? | 16975 | ac_status=$? |
12400 | echo "$as_me:12400: \$? = $ac_status" >&5 | 16976 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
16977 | (exit $ac_status); }; } && | ||
16978 | { ac_try='test -s conftest.$ac_objext' | ||
16979 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16980 | (eval $ac_try) 2>&5 | ||
16981 | ac_status=$? | ||
16982 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12401 | (exit $ac_status); }; }; then | 16983 | (exit $ac_status); }; }; then |
12402 | 16984 | ||
12403 | cat >>confdefs.h <<\EOF | 16985 | cat >>confdefs.h <<\_ACEOF |
12404 | #define HAVE_U_INTXX_T 1 | 16986 | #define HAVE_U_INTXX_T 1 |
12405 | EOF | 16987 | _ACEOF |
12406 | 16988 | ||
12407 | cat >>confdefs.h <<\EOF | 16989 | cat >>confdefs.h <<\_ACEOF |
12408 | #define HAVE_INTXX_T 1 | 16990 | #define HAVE_INTXX_T 1 |
12409 | EOF | 16991 | _ACEOF |
12410 | 16992 | ||
12411 | echo "$as_me:12411: result: yes" >&5 | 16993 | echo "$as_me:$LINENO: result: yes" >&5 |
12412 | echo "${ECHO_T}yes" >&6 | 16994 | echo "${ECHO_T}yes" >&6 |
12413 | 16995 | ||
12414 | else | 16996 | else |
12415 | echo "$as_me: failed program was:" >&5 | 16997 | echo "$as_me: failed program was:" >&5 |
12416 | cat conftest.$ac_ext >&5 | 16998 | sed 's/^/| /' conftest.$ac_ext >&5 |
12417 | echo "$as_me:12417: result: no" >&5 | 16999 | |
17000 | echo "$as_me:$LINENO: result: no" >&5 | ||
12418 | echo "${ECHO_T}no" >&6 | 17001 | echo "${ECHO_T}no" >&6 |
12419 | 17002 | ||
12420 | fi | 17003 | fi |
12421 | rm -f conftest.$ac_objext conftest.$ac_ext | 17004 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
12422 | fi | 17005 | fi |
12423 | 17006 | ||
12424 | echo "$as_me:12424: checking for u_char" >&5 | 17007 | |
17008 | echo "$as_me:$LINENO: checking for u_char" >&5 | ||
12425 | echo $ECHO_N "checking for u_char... $ECHO_C" >&6 | 17009 | echo $ECHO_N "checking for u_char... $ECHO_C" >&6 |
12426 | if test "${ac_cv_have_u_char+set}" = set; then | 17010 | if test "${ac_cv_have_u_char+set}" = set; then |
12427 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 17011 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
12428 | else | 17012 | else |
12429 | 17013 | ||
12430 | cat >conftest.$ac_ext <<_ACEOF | 17014 | cat >conftest.$ac_ext <<_ACEOF |
12431 | #line 12431 "configure" | 17015 | /* confdefs.h. */ |
12432 | #include "confdefs.h" | 17016 | _ACEOF |
17017 | cat confdefs.h >>conftest.$ac_ext | ||
17018 | cat >>conftest.$ac_ext <<_ACEOF | ||
17019 | /* end confdefs.h. */ | ||
12433 | 17020 | ||
12434 | #include <sys/types.h> | 17021 | #include <sys/types.h> |
12435 | 17022 | ||
@@ -12442,44 +17029,59 @@ main () | |||
12442 | } | 17029 | } |
12443 | _ACEOF | 17030 | _ACEOF |
12444 | rm -f conftest.$ac_objext | 17031 | rm -f conftest.$ac_objext |
12445 | if { (eval echo "$as_me:12445: \"$ac_compile\"") >&5 | 17032 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
12446 | (eval $ac_compile) 2>&5 | 17033 | (eval $ac_compile) 2>conftest.er1 |
12447 | ac_status=$? | 17034 | ac_status=$? |
12448 | echo "$as_me:12448: \$? = $ac_status" >&5 | 17035 | grep -v '^ *+' conftest.er1 >conftest.err |
17036 | rm -f conftest.er1 | ||
17037 | cat conftest.err >&5 | ||
17038 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12449 | (exit $ac_status); } && | 17039 | (exit $ac_status); } && |
12450 | { ac_try='test -s conftest.$ac_objext' | 17040 | { ac_try='test -z "$ac_c_werror_flag" |
12451 | { (eval echo "$as_me:12451: \"$ac_try\"") >&5 | 17041 | || test ! -s conftest.err' |
17042 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12452 | (eval $ac_try) 2>&5 | 17043 | (eval $ac_try) 2>&5 |
12453 | ac_status=$? | 17044 | ac_status=$? |
12454 | echo "$as_me:12454: \$? = $ac_status" >&5 | 17045 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
17046 | (exit $ac_status); }; } && | ||
17047 | { ac_try='test -s conftest.$ac_objext' | ||
17048 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17049 | (eval $ac_try) 2>&5 | ||
17050 | ac_status=$? | ||
17051 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12455 | (exit $ac_status); }; }; then | 17052 | (exit $ac_status); }; }; then |
12456 | ac_cv_have_u_char="yes" | 17053 | ac_cv_have_u_char="yes" |
12457 | else | 17054 | else |
12458 | echo "$as_me: failed program was:" >&5 | 17055 | echo "$as_me: failed program was:" >&5 |
12459 | cat conftest.$ac_ext >&5 | 17056 | sed 's/^/| /' conftest.$ac_ext >&5 |
17057 | |||
12460 | ac_cv_have_u_char="no" | 17058 | ac_cv_have_u_char="no" |
12461 | 17059 | ||
12462 | fi | 17060 | fi |
12463 | rm -f conftest.$ac_objext conftest.$ac_ext | 17061 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
12464 | 17062 | ||
12465 | fi | 17063 | fi |
12466 | echo "$as_me:12466: result: $ac_cv_have_u_char" >&5 | 17064 | echo "$as_me:$LINENO: result: $ac_cv_have_u_char" >&5 |
12467 | echo "${ECHO_T}$ac_cv_have_u_char" >&6 | 17065 | echo "${ECHO_T}$ac_cv_have_u_char" >&6 |
12468 | if test "x$ac_cv_have_u_char" = "xyes" ; then | 17066 | if test "x$ac_cv_have_u_char" = "xyes" ; then |
12469 | cat >>confdefs.h <<\EOF | 17067 | cat >>confdefs.h <<\_ACEOF |
12470 | #define HAVE_U_CHAR 1 | 17068 | #define HAVE_U_CHAR 1 |
12471 | EOF | 17069 | _ACEOF |
12472 | 17070 | ||
12473 | fi | 17071 | fi |
12474 | 17072 | ||
12475 | echo "$as_me:12475: checking for socklen_t" >&5 | 17073 | |
17074 | echo "$as_me:$LINENO: checking for socklen_t" >&5 | ||
12476 | echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6 | 17075 | echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6 |
12477 | if test "${ac_cv_type_socklen_t+set}" = set; then | 17076 | if test "${ac_cv_type_socklen_t+set}" = set; then |
12478 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 17077 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
12479 | else | 17078 | else |
12480 | cat >conftest.$ac_ext <<_ACEOF | 17079 | cat >conftest.$ac_ext <<_ACEOF |
12481 | #line 12481 "configure" | 17080 | /* confdefs.h. */ |
12482 | #include "confdefs.h" | 17081 | _ACEOF |
17082 | cat confdefs.h >>conftest.$ac_ext | ||
17083 | cat >>conftest.$ac_ext <<_ACEOF | ||
17084 | /* end confdefs.h. */ | ||
12483 | #include <sys/types.h> | 17085 | #include <sys/types.h> |
12484 | #include <sys/socket.h> | 17086 | #include <sys/socket.h> |
12485 | 17087 | ||
@@ -12495,32 +17097,43 @@ if (sizeof (socklen_t)) | |||
12495 | } | 17097 | } |
12496 | _ACEOF | 17098 | _ACEOF |
12497 | rm -f conftest.$ac_objext | 17099 | rm -f conftest.$ac_objext |
12498 | if { (eval echo "$as_me:12498: \"$ac_compile\"") >&5 | 17100 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
12499 | (eval $ac_compile) 2>&5 | 17101 | (eval $ac_compile) 2>conftest.er1 |
12500 | ac_status=$? | 17102 | ac_status=$? |
12501 | echo "$as_me:12501: \$? = $ac_status" >&5 | 17103 | grep -v '^ *+' conftest.er1 >conftest.err |
17104 | rm -f conftest.er1 | ||
17105 | cat conftest.err >&5 | ||
17106 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12502 | (exit $ac_status); } && | 17107 | (exit $ac_status); } && |
12503 | { ac_try='test -s conftest.$ac_objext' | 17108 | { ac_try='test -z "$ac_c_werror_flag" |
12504 | { (eval echo "$as_me:12504: \"$ac_try\"") >&5 | 17109 | || test ! -s conftest.err' |
17110 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12505 | (eval $ac_try) 2>&5 | 17111 | (eval $ac_try) 2>&5 |
12506 | ac_status=$? | 17112 | ac_status=$? |
12507 | echo "$as_me:12507: \$? = $ac_status" >&5 | 17113 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
17114 | (exit $ac_status); }; } && | ||
17115 | { ac_try='test -s conftest.$ac_objext' | ||
17116 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17117 | (eval $ac_try) 2>&5 | ||
17118 | ac_status=$? | ||
17119 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12508 | (exit $ac_status); }; }; then | 17120 | (exit $ac_status); }; }; then |
12509 | ac_cv_type_socklen_t=yes | 17121 | ac_cv_type_socklen_t=yes |
12510 | else | 17122 | else |
12511 | echo "$as_me: failed program was:" >&5 | 17123 | echo "$as_me: failed program was:" >&5 |
12512 | cat conftest.$ac_ext >&5 | 17124 | sed 's/^/| /' conftest.$ac_ext >&5 |
17125 | |||
12513 | ac_cv_type_socklen_t=no | 17126 | ac_cv_type_socklen_t=no |
12514 | fi | 17127 | fi |
12515 | rm -f conftest.$ac_objext conftest.$ac_ext | 17128 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
12516 | fi | 17129 | fi |
12517 | echo "$as_me:12517: result: $ac_cv_type_socklen_t" >&5 | 17130 | echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5 |
12518 | echo "${ECHO_T}$ac_cv_type_socklen_t" >&6 | 17131 | echo "${ECHO_T}$ac_cv_type_socklen_t" >&6 |
12519 | if test $ac_cv_type_socklen_t = yes; then | 17132 | if test $ac_cv_type_socklen_t = yes; then |
12520 | : | 17133 | : |
12521 | else | 17134 | else |
12522 | 17135 | ||
12523 | echo "$as_me:12523: checking for socklen_t equivalent" >&5 | 17136 | echo "$as_me:$LINENO: checking for socklen_t equivalent" >&5 |
12524 | echo $ECHO_N "checking for socklen_t equivalent... $ECHO_C" >&6 | 17137 | echo $ECHO_N "checking for socklen_t equivalent... $ECHO_C" >&6 |
12525 | if test "${curl_cv_socklen_t_equiv+set}" = set; then | 17138 | if test "${curl_cv_socklen_t_equiv+set}" = set; then |
12526 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 17139 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -12532,8 +17145,11 @@ else | |||
12532 | for arg2 in "struct sockaddr" void; do | 17145 | for arg2 in "struct sockaddr" void; do |
12533 | for t in int size_t unsigned long "unsigned long"; do | 17146 | for t in int size_t unsigned long "unsigned long"; do |
12534 | cat >conftest.$ac_ext <<_ACEOF | 17147 | cat >conftest.$ac_ext <<_ACEOF |
12535 | #line 12535 "configure" | 17148 | /* confdefs.h. */ |
12536 | #include "confdefs.h" | 17149 | _ACEOF |
17150 | cat confdefs.h >>conftest.$ac_ext | ||
17151 | cat >>conftest.$ac_ext <<_ACEOF | ||
17152 | /* end confdefs.h. */ | ||
12537 | 17153 | ||
12538 | #include <sys/types.h> | 17154 | #include <sys/types.h> |
12539 | #include <sys/socket.h> | 17155 | #include <sys/socket.h> |
@@ -12552,16 +17168,26 @@ main () | |||
12552 | } | 17168 | } |
12553 | _ACEOF | 17169 | _ACEOF |
12554 | rm -f conftest.$ac_objext | 17170 | rm -f conftest.$ac_objext |
12555 | if { (eval echo "$as_me:12555: \"$ac_compile\"") >&5 | 17171 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
12556 | (eval $ac_compile) 2>&5 | 17172 | (eval $ac_compile) 2>conftest.er1 |
12557 | ac_status=$? | 17173 | ac_status=$? |
12558 | echo "$as_me:12558: \$? = $ac_status" >&5 | 17174 | grep -v '^ *+' conftest.er1 >conftest.err |
17175 | rm -f conftest.er1 | ||
17176 | cat conftest.err >&5 | ||
17177 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12559 | (exit $ac_status); } && | 17178 | (exit $ac_status); } && |
12560 | { ac_try='test -s conftest.$ac_objext' | 17179 | { ac_try='test -z "$ac_c_werror_flag" |
12561 | { (eval echo "$as_me:12561: \"$ac_try\"") >&5 | 17180 | || test ! -s conftest.err' |
17181 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17182 | (eval $ac_try) 2>&5 | ||
17183 | ac_status=$? | ||
17184 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17185 | (exit $ac_status); }; } && | ||
17186 | { ac_try='test -s conftest.$ac_objext' | ||
17187 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12562 | (eval $ac_try) 2>&5 | 17188 | (eval $ac_try) 2>&5 |
12563 | ac_status=$? | 17189 | ac_status=$? |
12564 | echo "$as_me:12564: \$? = $ac_status" >&5 | 17190 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
12565 | (exit $ac_status); }; }; then | 17191 | (exit $ac_status); }; }; then |
12566 | 17192 | ||
12567 | curl_cv_socklen_t_equiv="$t" | 17193 | curl_cv_socklen_t_equiv="$t" |
@@ -12569,37 +17195,43 @@ if { (eval echo "$as_me:12555: \"$ac_compile\"") >&5 | |||
12569 | 17195 | ||
12570 | else | 17196 | else |
12571 | echo "$as_me: failed program was:" >&5 | 17197 | echo "$as_me: failed program was:" >&5 |
12572 | cat conftest.$ac_ext >&5 | 17198 | sed 's/^/| /' conftest.$ac_ext >&5 |
17199 | |||
12573 | fi | 17200 | fi |
12574 | rm -f conftest.$ac_objext conftest.$ac_ext | 17201 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
12575 | done | 17202 | done |
12576 | done | 17203 | done |
12577 | 17204 | ||
12578 | if test "x$curl_cv_socklen_t_equiv" = x; then | 17205 | if test "x$curl_cv_socklen_t_equiv" = x; then |
12579 | { { echo "$as_me:12579: error: Cannot find a type to use in place of socklen_t" >&5 | 17206 | { { echo "$as_me:$LINENO: error: Cannot find a type to use in place of socklen_t" >&5 |
12580 | echo "$as_me: error: Cannot find a type to use in place of socklen_t" >&2;} | 17207 | echo "$as_me: error: Cannot find a type to use in place of socklen_t" >&2;} |
12581 | { (exit 1); exit 1; }; } | 17208 | { (exit 1); exit 1; }; } |
12582 | fi | 17209 | fi |
12583 | 17210 | ||
12584 | fi | 17211 | fi |
12585 | 17212 | ||
12586 | echo "$as_me:12586: result: $curl_cv_socklen_t_equiv" >&5 | 17213 | echo "$as_me:$LINENO: result: $curl_cv_socklen_t_equiv" >&5 |
12587 | echo "${ECHO_T}$curl_cv_socklen_t_equiv" >&6 | 17214 | echo "${ECHO_T}$curl_cv_socklen_t_equiv" >&6 |
12588 | 17215 | ||
12589 | cat >>confdefs.h <<EOF | 17216 | cat >>confdefs.h <<_ACEOF |
12590 | #define socklen_t $curl_cv_socklen_t_equiv | 17217 | #define socklen_t $curl_cv_socklen_t_equiv |
12591 | EOF | 17218 | _ACEOF |
12592 | 17219 | ||
12593 | fi | 17220 | fi |
12594 | 17221 | ||
12595 | echo "$as_me:12595: checking for sig_atomic_t" >&5 | 17222 | |
17223 | |||
17224 | echo "$as_me:$LINENO: checking for sig_atomic_t" >&5 | ||
12596 | echo $ECHO_N "checking for sig_atomic_t... $ECHO_C" >&6 | 17225 | echo $ECHO_N "checking for sig_atomic_t... $ECHO_C" >&6 |
12597 | if test "${ac_cv_type_sig_atomic_t+set}" = set; then | 17226 | if test "${ac_cv_type_sig_atomic_t+set}" = set; then |
12598 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 17227 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
12599 | else | 17228 | else |
12600 | cat >conftest.$ac_ext <<_ACEOF | 17229 | cat >conftest.$ac_ext <<_ACEOF |
12601 | #line 12601 "configure" | 17230 | /* confdefs.h. */ |
12602 | #include "confdefs.h" | 17231 | _ACEOF |
17232 | cat confdefs.h >>conftest.$ac_ext | ||
17233 | cat >>conftest.$ac_ext <<_ACEOF | ||
17234 | /* end confdefs.h. */ | ||
12603 | #include <signal.h> | 17235 | #include <signal.h> |
12604 | 17236 | ||
12605 | int | 17237 | int |
@@ -12614,44 +17246,60 @@ if (sizeof (sig_atomic_t)) | |||
12614 | } | 17246 | } |
12615 | _ACEOF | 17247 | _ACEOF |
12616 | rm -f conftest.$ac_objext | 17248 | rm -f conftest.$ac_objext |
12617 | if { (eval echo "$as_me:12617: \"$ac_compile\"") >&5 | 17249 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
12618 | (eval $ac_compile) 2>&5 | 17250 | (eval $ac_compile) 2>conftest.er1 |
12619 | ac_status=$? | 17251 | ac_status=$? |
12620 | echo "$as_me:12620: \$? = $ac_status" >&5 | 17252 | grep -v '^ *+' conftest.er1 >conftest.err |
17253 | rm -f conftest.er1 | ||
17254 | cat conftest.err >&5 | ||
17255 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12621 | (exit $ac_status); } && | 17256 | (exit $ac_status); } && |
12622 | { ac_try='test -s conftest.$ac_objext' | 17257 | { ac_try='test -z "$ac_c_werror_flag" |
12623 | { (eval echo "$as_me:12623: \"$ac_try\"") >&5 | 17258 | || test ! -s conftest.err' |
17259 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12624 | (eval $ac_try) 2>&5 | 17260 | (eval $ac_try) 2>&5 |
12625 | ac_status=$? | 17261 | ac_status=$? |
12626 | echo "$as_me:12626: \$? = $ac_status" >&5 | 17262 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
17263 | (exit $ac_status); }; } && | ||
17264 | { ac_try='test -s conftest.$ac_objext' | ||
17265 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17266 | (eval $ac_try) 2>&5 | ||
17267 | ac_status=$? | ||
17268 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12627 | (exit $ac_status); }; }; then | 17269 | (exit $ac_status); }; }; then |
12628 | ac_cv_type_sig_atomic_t=yes | 17270 | ac_cv_type_sig_atomic_t=yes |
12629 | else | 17271 | else |
12630 | echo "$as_me: failed program was:" >&5 | 17272 | echo "$as_me: failed program was:" >&5 |
12631 | cat conftest.$ac_ext >&5 | 17273 | sed 's/^/| /' conftest.$ac_ext >&5 |
17274 | |||
12632 | ac_cv_type_sig_atomic_t=no | 17275 | ac_cv_type_sig_atomic_t=no |
12633 | fi | 17276 | fi |
12634 | rm -f conftest.$ac_objext conftest.$ac_ext | 17277 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
12635 | fi | 17278 | fi |
12636 | echo "$as_me:12636: result: $ac_cv_type_sig_atomic_t" >&5 | 17279 | echo "$as_me:$LINENO: result: $ac_cv_type_sig_atomic_t" >&5 |
12637 | echo "${ECHO_T}$ac_cv_type_sig_atomic_t" >&6 | 17280 | echo "${ECHO_T}$ac_cv_type_sig_atomic_t" >&6 |
12638 | if test $ac_cv_type_sig_atomic_t = yes; then | 17281 | if test $ac_cv_type_sig_atomic_t = yes; then |
12639 | 17282 | ||
12640 | cat >>confdefs.h <<EOF | 17283 | cat >>confdefs.h <<_ACEOF |
12641 | #define HAVE_SIG_ATOMIC_T 1 | 17284 | #define HAVE_SIG_ATOMIC_T 1 |
12642 | EOF | 17285 | _ACEOF |
17286 | |||
12643 | 17287 | ||
12644 | fi | 17288 | fi |
12645 | 17289 | ||
12646 | echo "$as_me:12646: checking for size_t" >&5 | 17290 | |
17291 | echo "$as_me:$LINENO: checking for size_t" >&5 | ||
12647 | echo $ECHO_N "checking for size_t... $ECHO_C" >&6 | 17292 | echo $ECHO_N "checking for size_t... $ECHO_C" >&6 |
12648 | if test "${ac_cv_have_size_t+set}" = set; then | 17293 | if test "${ac_cv_have_size_t+set}" = set; then |
12649 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 17294 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
12650 | else | 17295 | else |
12651 | 17296 | ||
12652 | cat >conftest.$ac_ext <<_ACEOF | 17297 | cat >conftest.$ac_ext <<_ACEOF |
12653 | #line 12653 "configure" | 17298 | /* confdefs.h. */ |
12654 | #include "confdefs.h" | 17299 | _ACEOF |
17300 | cat confdefs.h >>conftest.$ac_ext | ||
17301 | cat >>conftest.$ac_ext <<_ACEOF | ||
17302 | /* end confdefs.h. */ | ||
12655 | 17303 | ||
12656 | #include <sys/types.h> | 17304 | #include <sys/types.h> |
12657 | 17305 | ||
@@ -12664,45 +17312,59 @@ main () | |||
12664 | } | 17312 | } |
12665 | _ACEOF | 17313 | _ACEOF |
12666 | rm -f conftest.$ac_objext | 17314 | rm -f conftest.$ac_objext |
12667 | if { (eval echo "$as_me:12667: \"$ac_compile\"") >&5 | 17315 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
12668 | (eval $ac_compile) 2>&5 | 17316 | (eval $ac_compile) 2>conftest.er1 |
12669 | ac_status=$? | 17317 | ac_status=$? |
12670 | echo "$as_me:12670: \$? = $ac_status" >&5 | 17318 | grep -v '^ *+' conftest.er1 >conftest.err |
17319 | rm -f conftest.er1 | ||
17320 | cat conftest.err >&5 | ||
17321 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12671 | (exit $ac_status); } && | 17322 | (exit $ac_status); } && |
12672 | { ac_try='test -s conftest.$ac_objext' | 17323 | { ac_try='test -z "$ac_c_werror_flag" |
12673 | { (eval echo "$as_me:12673: \"$ac_try\"") >&5 | 17324 | || test ! -s conftest.err' |
17325 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12674 | (eval $ac_try) 2>&5 | 17326 | (eval $ac_try) 2>&5 |
12675 | ac_status=$? | 17327 | ac_status=$? |
12676 | echo "$as_me:12676: \$? = $ac_status" >&5 | 17328 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
17329 | (exit $ac_status); }; } && | ||
17330 | { ac_try='test -s conftest.$ac_objext' | ||
17331 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17332 | (eval $ac_try) 2>&5 | ||
17333 | ac_status=$? | ||
17334 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12677 | (exit $ac_status); }; }; then | 17335 | (exit $ac_status); }; }; then |
12678 | ac_cv_have_size_t="yes" | 17336 | ac_cv_have_size_t="yes" |
12679 | else | 17337 | else |
12680 | echo "$as_me: failed program was:" >&5 | 17338 | echo "$as_me: failed program was:" >&5 |
12681 | cat conftest.$ac_ext >&5 | 17339 | sed 's/^/| /' conftest.$ac_ext >&5 |
17340 | |||
12682 | ac_cv_have_size_t="no" | 17341 | ac_cv_have_size_t="no" |
12683 | 17342 | ||
12684 | fi | 17343 | fi |
12685 | rm -f conftest.$ac_objext conftest.$ac_ext | 17344 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
12686 | 17345 | ||
12687 | fi | 17346 | fi |
12688 | echo "$as_me:12688: result: $ac_cv_have_size_t" >&5 | 17347 | echo "$as_me:$LINENO: result: $ac_cv_have_size_t" >&5 |
12689 | echo "${ECHO_T}$ac_cv_have_size_t" >&6 | 17348 | echo "${ECHO_T}$ac_cv_have_size_t" >&6 |
12690 | if test "x$ac_cv_have_size_t" = "xyes" ; then | 17349 | if test "x$ac_cv_have_size_t" = "xyes" ; then |
12691 | cat >>confdefs.h <<\EOF | 17350 | cat >>confdefs.h <<\_ACEOF |
12692 | #define HAVE_SIZE_T 1 | 17351 | #define HAVE_SIZE_T 1 |
12693 | EOF | 17352 | _ACEOF |
12694 | 17353 | ||
12695 | fi | 17354 | fi |
12696 | 17355 | ||
12697 | echo "$as_me:12697: checking for ssize_t" >&5 | 17356 | echo "$as_me:$LINENO: checking for ssize_t" >&5 |
12698 | echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6 | 17357 | echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6 |
12699 | if test "${ac_cv_have_ssize_t+set}" = set; then | 17358 | if test "${ac_cv_have_ssize_t+set}" = set; then |
12700 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 17359 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
12701 | else | 17360 | else |
12702 | 17361 | ||
12703 | cat >conftest.$ac_ext <<_ACEOF | 17362 | cat >conftest.$ac_ext <<_ACEOF |
12704 | #line 12704 "configure" | 17363 | /* confdefs.h. */ |
12705 | #include "confdefs.h" | 17364 | _ACEOF |
17365 | cat confdefs.h >>conftest.$ac_ext | ||
17366 | cat >>conftest.$ac_ext <<_ACEOF | ||
17367 | /* end confdefs.h. */ | ||
12706 | 17368 | ||
12707 | #include <sys/types.h> | 17369 | #include <sys/types.h> |
12708 | 17370 | ||
@@ -12715,45 +17377,59 @@ main () | |||
12715 | } | 17377 | } |
12716 | _ACEOF | 17378 | _ACEOF |
12717 | rm -f conftest.$ac_objext | 17379 | rm -f conftest.$ac_objext |
12718 | if { (eval echo "$as_me:12718: \"$ac_compile\"") >&5 | 17380 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
12719 | (eval $ac_compile) 2>&5 | 17381 | (eval $ac_compile) 2>conftest.er1 |
12720 | ac_status=$? | 17382 | ac_status=$? |
12721 | echo "$as_me:12721: \$? = $ac_status" >&5 | 17383 | grep -v '^ *+' conftest.er1 >conftest.err |
17384 | rm -f conftest.er1 | ||
17385 | cat conftest.err >&5 | ||
17386 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12722 | (exit $ac_status); } && | 17387 | (exit $ac_status); } && |
12723 | { ac_try='test -s conftest.$ac_objext' | 17388 | { ac_try='test -z "$ac_c_werror_flag" |
12724 | { (eval echo "$as_me:12724: \"$ac_try\"") >&5 | 17389 | || test ! -s conftest.err' |
17390 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12725 | (eval $ac_try) 2>&5 | 17391 | (eval $ac_try) 2>&5 |
12726 | ac_status=$? | 17392 | ac_status=$? |
12727 | echo "$as_me:12727: \$? = $ac_status" >&5 | 17393 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
17394 | (exit $ac_status); }; } && | ||
17395 | { ac_try='test -s conftest.$ac_objext' | ||
17396 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17397 | (eval $ac_try) 2>&5 | ||
17398 | ac_status=$? | ||
17399 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12728 | (exit $ac_status); }; }; then | 17400 | (exit $ac_status); }; }; then |
12729 | ac_cv_have_ssize_t="yes" | 17401 | ac_cv_have_ssize_t="yes" |
12730 | else | 17402 | else |
12731 | echo "$as_me: failed program was:" >&5 | 17403 | echo "$as_me: failed program was:" >&5 |
12732 | cat conftest.$ac_ext >&5 | 17404 | sed 's/^/| /' conftest.$ac_ext >&5 |
17405 | |||
12733 | ac_cv_have_ssize_t="no" | 17406 | ac_cv_have_ssize_t="no" |
12734 | 17407 | ||
12735 | fi | 17408 | fi |
12736 | rm -f conftest.$ac_objext conftest.$ac_ext | 17409 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
12737 | 17410 | ||
12738 | fi | 17411 | fi |
12739 | echo "$as_me:12739: result: $ac_cv_have_ssize_t" >&5 | 17412 | echo "$as_me:$LINENO: result: $ac_cv_have_ssize_t" >&5 |
12740 | echo "${ECHO_T}$ac_cv_have_ssize_t" >&6 | 17413 | echo "${ECHO_T}$ac_cv_have_ssize_t" >&6 |
12741 | if test "x$ac_cv_have_ssize_t" = "xyes" ; then | 17414 | if test "x$ac_cv_have_ssize_t" = "xyes" ; then |
12742 | cat >>confdefs.h <<\EOF | 17415 | cat >>confdefs.h <<\_ACEOF |
12743 | #define HAVE_SSIZE_T 1 | 17416 | #define HAVE_SSIZE_T 1 |
12744 | EOF | 17417 | _ACEOF |
12745 | 17418 | ||
12746 | fi | 17419 | fi |
12747 | 17420 | ||
12748 | echo "$as_me:12748: checking for clock_t" >&5 | 17421 | echo "$as_me:$LINENO: checking for clock_t" >&5 |
12749 | echo $ECHO_N "checking for clock_t... $ECHO_C" >&6 | 17422 | echo $ECHO_N "checking for clock_t... $ECHO_C" >&6 |
12750 | if test "${ac_cv_have_clock_t+set}" = set; then | 17423 | if test "${ac_cv_have_clock_t+set}" = set; then |
12751 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 17424 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
12752 | else | 17425 | else |
12753 | 17426 | ||
12754 | cat >conftest.$ac_ext <<_ACEOF | 17427 | cat >conftest.$ac_ext <<_ACEOF |
12755 | #line 12755 "configure" | 17428 | /* confdefs.h. */ |
12756 | #include "confdefs.h" | 17429 | _ACEOF |
17430 | cat confdefs.h >>conftest.$ac_ext | ||
17431 | cat >>conftest.$ac_ext <<_ACEOF | ||
17432 | /* end confdefs.h. */ | ||
12757 | 17433 | ||
12758 | #include <time.h> | 17434 | #include <time.h> |
12759 | 17435 | ||
@@ -12766,45 +17442,59 @@ main () | |||
12766 | } | 17442 | } |
12767 | _ACEOF | 17443 | _ACEOF |
12768 | rm -f conftest.$ac_objext | 17444 | rm -f conftest.$ac_objext |
12769 | if { (eval echo "$as_me:12769: \"$ac_compile\"") >&5 | 17445 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
12770 | (eval $ac_compile) 2>&5 | 17446 | (eval $ac_compile) 2>conftest.er1 |
12771 | ac_status=$? | 17447 | ac_status=$? |
12772 | echo "$as_me:12772: \$? = $ac_status" >&5 | 17448 | grep -v '^ *+' conftest.er1 >conftest.err |
17449 | rm -f conftest.er1 | ||
17450 | cat conftest.err >&5 | ||
17451 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12773 | (exit $ac_status); } && | 17452 | (exit $ac_status); } && |
12774 | { ac_try='test -s conftest.$ac_objext' | 17453 | { ac_try='test -z "$ac_c_werror_flag" |
12775 | { (eval echo "$as_me:12775: \"$ac_try\"") >&5 | 17454 | || test ! -s conftest.err' |
17455 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17456 | (eval $ac_try) 2>&5 | ||
17457 | ac_status=$? | ||
17458 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17459 | (exit $ac_status); }; } && | ||
17460 | { ac_try='test -s conftest.$ac_objext' | ||
17461 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12776 | (eval $ac_try) 2>&5 | 17462 | (eval $ac_try) 2>&5 |
12777 | ac_status=$? | 17463 | ac_status=$? |
12778 | echo "$as_me:12778: \$? = $ac_status" >&5 | 17464 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
12779 | (exit $ac_status); }; }; then | 17465 | (exit $ac_status); }; }; then |
12780 | ac_cv_have_clock_t="yes" | 17466 | ac_cv_have_clock_t="yes" |
12781 | else | 17467 | else |
12782 | echo "$as_me: failed program was:" >&5 | 17468 | echo "$as_me: failed program was:" >&5 |
12783 | cat conftest.$ac_ext >&5 | 17469 | sed 's/^/| /' conftest.$ac_ext >&5 |
17470 | |||
12784 | ac_cv_have_clock_t="no" | 17471 | ac_cv_have_clock_t="no" |
12785 | 17472 | ||
12786 | fi | 17473 | fi |
12787 | rm -f conftest.$ac_objext conftest.$ac_ext | 17474 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
12788 | 17475 | ||
12789 | fi | 17476 | fi |
12790 | echo "$as_me:12790: result: $ac_cv_have_clock_t" >&5 | 17477 | echo "$as_me:$LINENO: result: $ac_cv_have_clock_t" >&5 |
12791 | echo "${ECHO_T}$ac_cv_have_clock_t" >&6 | 17478 | echo "${ECHO_T}$ac_cv_have_clock_t" >&6 |
12792 | if test "x$ac_cv_have_clock_t" = "xyes" ; then | 17479 | if test "x$ac_cv_have_clock_t" = "xyes" ; then |
12793 | cat >>confdefs.h <<\EOF | 17480 | cat >>confdefs.h <<\_ACEOF |
12794 | #define HAVE_CLOCK_T 1 | 17481 | #define HAVE_CLOCK_T 1 |
12795 | EOF | 17482 | _ACEOF |
12796 | 17483 | ||
12797 | fi | 17484 | fi |
12798 | 17485 | ||
12799 | echo "$as_me:12799: checking for sa_family_t" >&5 | 17486 | echo "$as_me:$LINENO: checking for sa_family_t" >&5 |
12800 | echo $ECHO_N "checking for sa_family_t... $ECHO_C" >&6 | 17487 | echo $ECHO_N "checking for sa_family_t... $ECHO_C" >&6 |
12801 | if test "${ac_cv_have_sa_family_t+set}" = set; then | 17488 | if test "${ac_cv_have_sa_family_t+set}" = set; then |
12802 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 17489 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
12803 | else | 17490 | else |
12804 | 17491 | ||
12805 | cat >conftest.$ac_ext <<_ACEOF | 17492 | cat >conftest.$ac_ext <<_ACEOF |
12806 | #line 12806 "configure" | 17493 | /* confdefs.h. */ |
12807 | #include "confdefs.h" | 17494 | _ACEOF |
17495 | cat confdefs.h >>conftest.$ac_ext | ||
17496 | cat >>conftest.$ac_ext <<_ACEOF | ||
17497 | /* end confdefs.h. */ | ||
12808 | 17498 | ||
12809 | #include <sys/types.h> | 17499 | #include <sys/types.h> |
12810 | #include <sys/socket.h> | 17500 | #include <sys/socket.h> |
@@ -12818,24 +17508,38 @@ main () | |||
12818 | } | 17508 | } |
12819 | _ACEOF | 17509 | _ACEOF |
12820 | rm -f conftest.$ac_objext | 17510 | rm -f conftest.$ac_objext |
12821 | if { (eval echo "$as_me:12821: \"$ac_compile\"") >&5 | 17511 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
12822 | (eval $ac_compile) 2>&5 | 17512 | (eval $ac_compile) 2>conftest.er1 |
12823 | ac_status=$? | 17513 | ac_status=$? |
12824 | echo "$as_me:12824: \$? = $ac_status" >&5 | 17514 | grep -v '^ *+' conftest.er1 >conftest.err |
17515 | rm -f conftest.er1 | ||
17516 | cat conftest.err >&5 | ||
17517 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12825 | (exit $ac_status); } && | 17518 | (exit $ac_status); } && |
12826 | { ac_try='test -s conftest.$ac_objext' | 17519 | { ac_try='test -z "$ac_c_werror_flag" |
12827 | { (eval echo "$as_me:12827: \"$ac_try\"") >&5 | 17520 | || test ! -s conftest.err' |
17521 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12828 | (eval $ac_try) 2>&5 | 17522 | (eval $ac_try) 2>&5 |
12829 | ac_status=$? | 17523 | ac_status=$? |
12830 | echo "$as_me:12830: \$? = $ac_status" >&5 | 17524 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
17525 | (exit $ac_status); }; } && | ||
17526 | { ac_try='test -s conftest.$ac_objext' | ||
17527 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17528 | (eval $ac_try) 2>&5 | ||
17529 | ac_status=$? | ||
17530 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12831 | (exit $ac_status); }; }; then | 17531 | (exit $ac_status); }; }; then |
12832 | ac_cv_have_sa_family_t="yes" | 17532 | ac_cv_have_sa_family_t="yes" |
12833 | else | 17533 | else |
12834 | echo "$as_me: failed program was:" >&5 | 17534 | echo "$as_me: failed program was:" >&5 |
12835 | cat conftest.$ac_ext >&5 | 17535 | sed 's/^/| /' conftest.$ac_ext >&5 |
17536 | |||
12836 | cat >conftest.$ac_ext <<_ACEOF | 17537 | cat >conftest.$ac_ext <<_ACEOF |
12837 | #line 12837 "configure" | 17538 | /* confdefs.h. */ |
12838 | #include "confdefs.h" | 17539 | _ACEOF |
17540 | cat confdefs.h >>conftest.$ac_ext | ||
17541 | cat >>conftest.$ac_ext <<_ACEOF | ||
17542 | /* end confdefs.h. */ | ||
12839 | 17543 | ||
12840 | #include <sys/types.h> | 17544 | #include <sys/types.h> |
12841 | #include <sys/socket.h> | 17545 | #include <sys/socket.h> |
@@ -12850,48 +17554,62 @@ main () | |||
12850 | } | 17554 | } |
12851 | _ACEOF | 17555 | _ACEOF |
12852 | rm -f conftest.$ac_objext | 17556 | rm -f conftest.$ac_objext |
12853 | if { (eval echo "$as_me:12853: \"$ac_compile\"") >&5 | 17557 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
12854 | (eval $ac_compile) 2>&5 | 17558 | (eval $ac_compile) 2>conftest.er1 |
12855 | ac_status=$? | 17559 | ac_status=$? |
12856 | echo "$as_me:12856: \$? = $ac_status" >&5 | 17560 | grep -v '^ *+' conftest.er1 >conftest.err |
17561 | rm -f conftest.er1 | ||
17562 | cat conftest.err >&5 | ||
17563 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12857 | (exit $ac_status); } && | 17564 | (exit $ac_status); } && |
12858 | { ac_try='test -s conftest.$ac_objext' | 17565 | { ac_try='test -z "$ac_c_werror_flag" |
12859 | { (eval echo "$as_me:12859: \"$ac_try\"") >&5 | 17566 | || test ! -s conftest.err' |
17567 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12860 | (eval $ac_try) 2>&5 | 17568 | (eval $ac_try) 2>&5 |
12861 | ac_status=$? | 17569 | ac_status=$? |
12862 | echo "$as_me:12862: \$? = $ac_status" >&5 | 17570 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
17571 | (exit $ac_status); }; } && | ||
17572 | { ac_try='test -s conftest.$ac_objext' | ||
17573 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17574 | (eval $ac_try) 2>&5 | ||
17575 | ac_status=$? | ||
17576 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12863 | (exit $ac_status); }; }; then | 17577 | (exit $ac_status); }; }; then |
12864 | ac_cv_have_sa_family_t="yes" | 17578 | ac_cv_have_sa_family_t="yes" |
12865 | else | 17579 | else |
12866 | echo "$as_me: failed program was:" >&5 | 17580 | echo "$as_me: failed program was:" >&5 |
12867 | cat conftest.$ac_ext >&5 | 17581 | sed 's/^/| /' conftest.$ac_ext >&5 |
17582 | |||
12868 | ac_cv_have_sa_family_t="no" | 17583 | ac_cv_have_sa_family_t="no" |
12869 | 17584 | ||
12870 | fi | 17585 | fi |
12871 | rm -f conftest.$ac_objext conftest.$ac_ext | 17586 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
12872 | 17587 | ||
12873 | fi | 17588 | fi |
12874 | rm -f conftest.$ac_objext conftest.$ac_ext | 17589 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
12875 | 17590 | ||
12876 | fi | 17591 | fi |
12877 | echo "$as_me:12877: result: $ac_cv_have_sa_family_t" >&5 | 17592 | echo "$as_me:$LINENO: result: $ac_cv_have_sa_family_t" >&5 |
12878 | echo "${ECHO_T}$ac_cv_have_sa_family_t" >&6 | 17593 | echo "${ECHO_T}$ac_cv_have_sa_family_t" >&6 |
12879 | if test "x$ac_cv_have_sa_family_t" = "xyes" ; then | 17594 | if test "x$ac_cv_have_sa_family_t" = "xyes" ; then |
12880 | cat >>confdefs.h <<\EOF | 17595 | cat >>confdefs.h <<\_ACEOF |
12881 | #define HAVE_SA_FAMILY_T 1 | 17596 | #define HAVE_SA_FAMILY_T 1 |
12882 | EOF | 17597 | _ACEOF |
12883 | 17598 | ||
12884 | fi | 17599 | fi |
12885 | 17600 | ||
12886 | echo "$as_me:12886: checking for pid_t" >&5 | 17601 | echo "$as_me:$LINENO: checking for pid_t" >&5 |
12887 | echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 | 17602 | echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 |
12888 | if test "${ac_cv_have_pid_t+set}" = set; then | 17603 | if test "${ac_cv_have_pid_t+set}" = set; then |
12889 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 17604 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
12890 | else | 17605 | else |
12891 | 17606 | ||
12892 | cat >conftest.$ac_ext <<_ACEOF | 17607 | cat >conftest.$ac_ext <<_ACEOF |
12893 | #line 12893 "configure" | 17608 | /* confdefs.h. */ |
12894 | #include "confdefs.h" | 17609 | _ACEOF |
17610 | cat confdefs.h >>conftest.$ac_ext | ||
17611 | cat >>conftest.$ac_ext <<_ACEOF | ||
17612 | /* end confdefs.h. */ | ||
12895 | 17613 | ||
12896 | #include <sys/types.h> | 17614 | #include <sys/types.h> |
12897 | 17615 | ||
@@ -12904,45 +17622,59 @@ main () | |||
12904 | } | 17622 | } |
12905 | _ACEOF | 17623 | _ACEOF |
12906 | rm -f conftest.$ac_objext | 17624 | rm -f conftest.$ac_objext |
12907 | if { (eval echo "$as_me:12907: \"$ac_compile\"") >&5 | 17625 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
12908 | (eval $ac_compile) 2>&5 | 17626 | (eval $ac_compile) 2>conftest.er1 |
12909 | ac_status=$? | 17627 | ac_status=$? |
12910 | echo "$as_me:12910: \$? = $ac_status" >&5 | 17628 | grep -v '^ *+' conftest.er1 >conftest.err |
17629 | rm -f conftest.er1 | ||
17630 | cat conftest.err >&5 | ||
17631 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12911 | (exit $ac_status); } && | 17632 | (exit $ac_status); } && |
12912 | { ac_try='test -s conftest.$ac_objext' | 17633 | { ac_try='test -z "$ac_c_werror_flag" |
12913 | { (eval echo "$as_me:12913: \"$ac_try\"") >&5 | 17634 | || test ! -s conftest.err' |
17635 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17636 | (eval $ac_try) 2>&5 | ||
17637 | ac_status=$? | ||
17638 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17639 | (exit $ac_status); }; } && | ||
17640 | { ac_try='test -s conftest.$ac_objext' | ||
17641 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12914 | (eval $ac_try) 2>&5 | 17642 | (eval $ac_try) 2>&5 |
12915 | ac_status=$? | 17643 | ac_status=$? |
12916 | echo "$as_me:12916: \$? = $ac_status" >&5 | 17644 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
12917 | (exit $ac_status); }; }; then | 17645 | (exit $ac_status); }; }; then |
12918 | ac_cv_have_pid_t="yes" | 17646 | ac_cv_have_pid_t="yes" |
12919 | else | 17647 | else |
12920 | echo "$as_me: failed program was:" >&5 | 17648 | echo "$as_me: failed program was:" >&5 |
12921 | cat conftest.$ac_ext >&5 | 17649 | sed 's/^/| /' conftest.$ac_ext >&5 |
17650 | |||
12922 | ac_cv_have_pid_t="no" | 17651 | ac_cv_have_pid_t="no" |
12923 | 17652 | ||
12924 | fi | 17653 | fi |
12925 | rm -f conftest.$ac_objext conftest.$ac_ext | 17654 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
12926 | 17655 | ||
12927 | fi | 17656 | fi |
12928 | echo "$as_me:12928: result: $ac_cv_have_pid_t" >&5 | 17657 | echo "$as_me:$LINENO: result: $ac_cv_have_pid_t" >&5 |
12929 | echo "${ECHO_T}$ac_cv_have_pid_t" >&6 | 17658 | echo "${ECHO_T}$ac_cv_have_pid_t" >&6 |
12930 | if test "x$ac_cv_have_pid_t" = "xyes" ; then | 17659 | if test "x$ac_cv_have_pid_t" = "xyes" ; then |
12931 | cat >>confdefs.h <<\EOF | 17660 | cat >>confdefs.h <<\_ACEOF |
12932 | #define HAVE_PID_T 1 | 17661 | #define HAVE_PID_T 1 |
12933 | EOF | 17662 | _ACEOF |
12934 | 17663 | ||
12935 | fi | 17664 | fi |
12936 | 17665 | ||
12937 | echo "$as_me:12937: checking for mode_t" >&5 | 17666 | echo "$as_me:$LINENO: checking for mode_t" >&5 |
12938 | echo $ECHO_N "checking for mode_t... $ECHO_C" >&6 | 17667 | echo $ECHO_N "checking for mode_t... $ECHO_C" >&6 |
12939 | if test "${ac_cv_have_mode_t+set}" = set; then | 17668 | if test "${ac_cv_have_mode_t+set}" = set; then |
12940 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 17669 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
12941 | else | 17670 | else |
12942 | 17671 | ||
12943 | cat >conftest.$ac_ext <<_ACEOF | 17672 | cat >conftest.$ac_ext <<_ACEOF |
12944 | #line 12944 "configure" | 17673 | /* confdefs.h. */ |
12945 | #include "confdefs.h" | 17674 | _ACEOF |
17675 | cat confdefs.h >>conftest.$ac_ext | ||
17676 | cat >>conftest.$ac_ext <<_ACEOF | ||
17677 | /* end confdefs.h. */ | ||
12946 | 17678 | ||
12947 | #include <sys/types.h> | 17679 | #include <sys/types.h> |
12948 | 17680 | ||
@@ -12955,45 +17687,60 @@ main () | |||
12955 | } | 17687 | } |
12956 | _ACEOF | 17688 | _ACEOF |
12957 | rm -f conftest.$ac_objext | 17689 | rm -f conftest.$ac_objext |
12958 | if { (eval echo "$as_me:12958: \"$ac_compile\"") >&5 | 17690 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
12959 | (eval $ac_compile) 2>&5 | 17691 | (eval $ac_compile) 2>conftest.er1 |
12960 | ac_status=$? | 17692 | ac_status=$? |
12961 | echo "$as_me:12961: \$? = $ac_status" >&5 | 17693 | grep -v '^ *+' conftest.er1 >conftest.err |
17694 | rm -f conftest.er1 | ||
17695 | cat conftest.err >&5 | ||
17696 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
12962 | (exit $ac_status); } && | 17697 | (exit $ac_status); } && |
12963 | { ac_try='test -s conftest.$ac_objext' | 17698 | { ac_try='test -z "$ac_c_werror_flag" |
12964 | { (eval echo "$as_me:12964: \"$ac_try\"") >&5 | 17699 | || test ! -s conftest.err' |
17700 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17701 | (eval $ac_try) 2>&5 | ||
17702 | ac_status=$? | ||
17703 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17704 | (exit $ac_status); }; } && | ||
17705 | { ac_try='test -s conftest.$ac_objext' | ||
17706 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
12965 | (eval $ac_try) 2>&5 | 17707 | (eval $ac_try) 2>&5 |
12966 | ac_status=$? | 17708 | ac_status=$? |
12967 | echo "$as_me:12967: \$? = $ac_status" >&5 | 17709 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
12968 | (exit $ac_status); }; }; then | 17710 | (exit $ac_status); }; }; then |
12969 | ac_cv_have_mode_t="yes" | 17711 | ac_cv_have_mode_t="yes" |
12970 | else | 17712 | else |
12971 | echo "$as_me: failed program was:" >&5 | 17713 | echo "$as_me: failed program was:" >&5 |
12972 | cat conftest.$ac_ext >&5 | 17714 | sed 's/^/| /' conftest.$ac_ext >&5 |
17715 | |||
12973 | ac_cv_have_mode_t="no" | 17716 | ac_cv_have_mode_t="no" |
12974 | 17717 | ||
12975 | fi | 17718 | fi |
12976 | rm -f conftest.$ac_objext conftest.$ac_ext | 17719 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
12977 | 17720 | ||
12978 | fi | 17721 | fi |
12979 | echo "$as_me:12979: result: $ac_cv_have_mode_t" >&5 | 17722 | echo "$as_me:$LINENO: result: $ac_cv_have_mode_t" >&5 |
12980 | echo "${ECHO_T}$ac_cv_have_mode_t" >&6 | 17723 | echo "${ECHO_T}$ac_cv_have_mode_t" >&6 |
12981 | if test "x$ac_cv_have_mode_t" = "xyes" ; then | 17724 | if test "x$ac_cv_have_mode_t" = "xyes" ; then |
12982 | cat >>confdefs.h <<\EOF | 17725 | cat >>confdefs.h <<\_ACEOF |
12983 | #define HAVE_MODE_T 1 | 17726 | #define HAVE_MODE_T 1 |
12984 | EOF | 17727 | _ACEOF |
12985 | 17728 | ||
12986 | fi | 17729 | fi |
12987 | 17730 | ||
12988 | echo "$as_me:12988: checking for struct sockaddr_storage" >&5 | 17731 | |
17732 | echo "$as_me:$LINENO: checking for struct sockaddr_storage" >&5 | ||
12989 | echo $ECHO_N "checking for struct sockaddr_storage... $ECHO_C" >&6 | 17733 | echo $ECHO_N "checking for struct sockaddr_storage... $ECHO_C" >&6 |
12990 | if test "${ac_cv_have_struct_sockaddr_storage+set}" = set; then | 17734 | if test "${ac_cv_have_struct_sockaddr_storage+set}" = set; then |
12991 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 17735 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
12992 | else | 17736 | else |
12993 | 17737 | ||
12994 | cat >conftest.$ac_ext <<_ACEOF | 17738 | cat >conftest.$ac_ext <<_ACEOF |
12995 | #line 12995 "configure" | 17739 | /* confdefs.h. */ |
12996 | #include "confdefs.h" | 17740 | _ACEOF |
17741 | cat confdefs.h >>conftest.$ac_ext | ||
17742 | cat >>conftest.$ac_ext <<_ACEOF | ||
17743 | /* end confdefs.h. */ | ||
12997 | 17744 | ||
12998 | #include <sys/types.h> | 17745 | #include <sys/types.h> |
12999 | #include <sys/socket.h> | 17746 | #include <sys/socket.h> |
@@ -13007,45 +17754,59 @@ main () | |||
13007 | } | 17754 | } |
13008 | _ACEOF | 17755 | _ACEOF |
13009 | rm -f conftest.$ac_objext | 17756 | rm -f conftest.$ac_objext |
13010 | if { (eval echo "$as_me:13010: \"$ac_compile\"") >&5 | 17757 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
13011 | (eval $ac_compile) 2>&5 | 17758 | (eval $ac_compile) 2>conftest.er1 |
13012 | ac_status=$? | 17759 | ac_status=$? |
13013 | echo "$as_me:13013: \$? = $ac_status" >&5 | 17760 | grep -v '^ *+' conftest.er1 >conftest.err |
17761 | rm -f conftest.er1 | ||
17762 | cat conftest.err >&5 | ||
17763 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13014 | (exit $ac_status); } && | 17764 | (exit $ac_status); } && |
13015 | { ac_try='test -s conftest.$ac_objext' | 17765 | { ac_try='test -z "$ac_c_werror_flag" |
13016 | { (eval echo "$as_me:13016: \"$ac_try\"") >&5 | 17766 | || test ! -s conftest.err' |
17767 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17768 | (eval $ac_try) 2>&5 | ||
17769 | ac_status=$? | ||
17770 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17771 | (exit $ac_status); }; } && | ||
17772 | { ac_try='test -s conftest.$ac_objext' | ||
17773 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
13017 | (eval $ac_try) 2>&5 | 17774 | (eval $ac_try) 2>&5 |
13018 | ac_status=$? | 17775 | ac_status=$? |
13019 | echo "$as_me:13019: \$? = $ac_status" >&5 | 17776 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
13020 | (exit $ac_status); }; }; then | 17777 | (exit $ac_status); }; }; then |
13021 | ac_cv_have_struct_sockaddr_storage="yes" | 17778 | ac_cv_have_struct_sockaddr_storage="yes" |
13022 | else | 17779 | else |
13023 | echo "$as_me: failed program was:" >&5 | 17780 | echo "$as_me: failed program was:" >&5 |
13024 | cat conftest.$ac_ext >&5 | 17781 | sed 's/^/| /' conftest.$ac_ext >&5 |
17782 | |||
13025 | ac_cv_have_struct_sockaddr_storage="no" | 17783 | ac_cv_have_struct_sockaddr_storage="no" |
13026 | 17784 | ||
13027 | fi | 17785 | fi |
13028 | rm -f conftest.$ac_objext conftest.$ac_ext | 17786 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
13029 | 17787 | ||
13030 | fi | 17788 | fi |
13031 | echo "$as_me:13031: result: $ac_cv_have_struct_sockaddr_storage" >&5 | 17789 | echo "$as_me:$LINENO: result: $ac_cv_have_struct_sockaddr_storage" >&5 |
13032 | echo "${ECHO_T}$ac_cv_have_struct_sockaddr_storage" >&6 | 17790 | echo "${ECHO_T}$ac_cv_have_struct_sockaddr_storage" >&6 |
13033 | if test "x$ac_cv_have_struct_sockaddr_storage" = "xyes" ; then | 17791 | if test "x$ac_cv_have_struct_sockaddr_storage" = "xyes" ; then |
13034 | cat >>confdefs.h <<\EOF | 17792 | cat >>confdefs.h <<\_ACEOF |
13035 | #define HAVE_STRUCT_SOCKADDR_STORAGE 1 | 17793 | #define HAVE_STRUCT_SOCKADDR_STORAGE 1 |
13036 | EOF | 17794 | _ACEOF |
13037 | 17795 | ||
13038 | fi | 17796 | fi |
13039 | 17797 | ||
13040 | echo "$as_me:13040: checking for struct sockaddr_in6" >&5 | 17798 | echo "$as_me:$LINENO: checking for struct sockaddr_in6" >&5 |
13041 | echo $ECHO_N "checking for struct sockaddr_in6... $ECHO_C" >&6 | 17799 | echo $ECHO_N "checking for struct sockaddr_in6... $ECHO_C" >&6 |
13042 | if test "${ac_cv_have_struct_sockaddr_in6+set}" = set; then | 17800 | if test "${ac_cv_have_struct_sockaddr_in6+set}" = set; then |
13043 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 17801 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
13044 | else | 17802 | else |
13045 | 17803 | ||
13046 | cat >conftest.$ac_ext <<_ACEOF | 17804 | cat >conftest.$ac_ext <<_ACEOF |
13047 | #line 13047 "configure" | 17805 | /* confdefs.h. */ |
13048 | #include "confdefs.h" | 17806 | _ACEOF |
17807 | cat confdefs.h >>conftest.$ac_ext | ||
17808 | cat >>conftest.$ac_ext <<_ACEOF | ||
17809 | /* end confdefs.h. */ | ||
13049 | 17810 | ||
13050 | #include <sys/types.h> | 17811 | #include <sys/types.h> |
13051 | #include <netinet/in.h> | 17812 | #include <netinet/in.h> |
@@ -13059,45 +17820,59 @@ main () | |||
13059 | } | 17820 | } |
13060 | _ACEOF | 17821 | _ACEOF |
13061 | rm -f conftest.$ac_objext | 17822 | rm -f conftest.$ac_objext |
13062 | if { (eval echo "$as_me:13062: \"$ac_compile\"") >&5 | 17823 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
13063 | (eval $ac_compile) 2>&5 | 17824 | (eval $ac_compile) 2>conftest.er1 |
13064 | ac_status=$? | 17825 | ac_status=$? |
13065 | echo "$as_me:13065: \$? = $ac_status" >&5 | 17826 | grep -v '^ *+' conftest.er1 >conftest.err |
17827 | rm -f conftest.er1 | ||
17828 | cat conftest.err >&5 | ||
17829 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13066 | (exit $ac_status); } && | 17830 | (exit $ac_status); } && |
13067 | { ac_try='test -s conftest.$ac_objext' | 17831 | { ac_try='test -z "$ac_c_werror_flag" |
13068 | { (eval echo "$as_me:13068: \"$ac_try\"") >&5 | 17832 | || test ! -s conftest.err' |
17833 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
13069 | (eval $ac_try) 2>&5 | 17834 | (eval $ac_try) 2>&5 |
13070 | ac_status=$? | 17835 | ac_status=$? |
13071 | echo "$as_me:13071: \$? = $ac_status" >&5 | 17836 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
17837 | (exit $ac_status); }; } && | ||
17838 | { ac_try='test -s conftest.$ac_objext' | ||
17839 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17840 | (eval $ac_try) 2>&5 | ||
17841 | ac_status=$? | ||
17842 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13072 | (exit $ac_status); }; }; then | 17843 | (exit $ac_status); }; }; then |
13073 | ac_cv_have_struct_sockaddr_in6="yes" | 17844 | ac_cv_have_struct_sockaddr_in6="yes" |
13074 | else | 17845 | else |
13075 | echo "$as_me: failed program was:" >&5 | 17846 | echo "$as_me: failed program was:" >&5 |
13076 | cat conftest.$ac_ext >&5 | 17847 | sed 's/^/| /' conftest.$ac_ext >&5 |
17848 | |||
13077 | ac_cv_have_struct_sockaddr_in6="no" | 17849 | ac_cv_have_struct_sockaddr_in6="no" |
13078 | 17850 | ||
13079 | fi | 17851 | fi |
13080 | rm -f conftest.$ac_objext conftest.$ac_ext | 17852 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
13081 | 17853 | ||
13082 | fi | 17854 | fi |
13083 | echo "$as_me:13083: result: $ac_cv_have_struct_sockaddr_in6" >&5 | 17855 | echo "$as_me:$LINENO: result: $ac_cv_have_struct_sockaddr_in6" >&5 |
13084 | echo "${ECHO_T}$ac_cv_have_struct_sockaddr_in6" >&6 | 17856 | echo "${ECHO_T}$ac_cv_have_struct_sockaddr_in6" >&6 |
13085 | if test "x$ac_cv_have_struct_sockaddr_in6" = "xyes" ; then | 17857 | if test "x$ac_cv_have_struct_sockaddr_in6" = "xyes" ; then |
13086 | cat >>confdefs.h <<\EOF | 17858 | cat >>confdefs.h <<\_ACEOF |
13087 | #define HAVE_STRUCT_SOCKADDR_IN6 1 | 17859 | #define HAVE_STRUCT_SOCKADDR_IN6 1 |
13088 | EOF | 17860 | _ACEOF |
13089 | 17861 | ||
13090 | fi | 17862 | fi |
13091 | 17863 | ||
13092 | echo "$as_me:13092: checking for struct in6_addr" >&5 | 17864 | echo "$as_me:$LINENO: checking for struct in6_addr" >&5 |
13093 | echo $ECHO_N "checking for struct in6_addr... $ECHO_C" >&6 | 17865 | echo $ECHO_N "checking for struct in6_addr... $ECHO_C" >&6 |
13094 | if test "${ac_cv_have_struct_in6_addr+set}" = set; then | 17866 | if test "${ac_cv_have_struct_in6_addr+set}" = set; then |
13095 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 17867 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
13096 | else | 17868 | else |
13097 | 17869 | ||
13098 | cat >conftest.$ac_ext <<_ACEOF | 17870 | cat >conftest.$ac_ext <<_ACEOF |
13099 | #line 13099 "configure" | 17871 | /* confdefs.h. */ |
13100 | #include "confdefs.h" | 17872 | _ACEOF |
17873 | cat confdefs.h >>conftest.$ac_ext | ||
17874 | cat >>conftest.$ac_ext <<_ACEOF | ||
17875 | /* end confdefs.h. */ | ||
13101 | 17876 | ||
13102 | #include <sys/types.h> | 17877 | #include <sys/types.h> |
13103 | #include <netinet/in.h> | 17878 | #include <netinet/in.h> |
@@ -13111,45 +17886,59 @@ main () | |||
13111 | } | 17886 | } |
13112 | _ACEOF | 17887 | _ACEOF |
13113 | rm -f conftest.$ac_objext | 17888 | rm -f conftest.$ac_objext |
13114 | if { (eval echo "$as_me:13114: \"$ac_compile\"") >&5 | 17889 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
13115 | (eval $ac_compile) 2>&5 | 17890 | (eval $ac_compile) 2>conftest.er1 |
13116 | ac_status=$? | 17891 | ac_status=$? |
13117 | echo "$as_me:13117: \$? = $ac_status" >&5 | 17892 | grep -v '^ *+' conftest.er1 >conftest.err |
17893 | rm -f conftest.er1 | ||
17894 | cat conftest.err >&5 | ||
17895 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13118 | (exit $ac_status); } && | 17896 | (exit $ac_status); } && |
13119 | { ac_try='test -s conftest.$ac_objext' | 17897 | { ac_try='test -z "$ac_c_werror_flag" |
13120 | { (eval echo "$as_me:13120: \"$ac_try\"") >&5 | 17898 | || test ! -s conftest.err' |
17899 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17900 | (eval $ac_try) 2>&5 | ||
17901 | ac_status=$? | ||
17902 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17903 | (exit $ac_status); }; } && | ||
17904 | { ac_try='test -s conftest.$ac_objext' | ||
17905 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
13121 | (eval $ac_try) 2>&5 | 17906 | (eval $ac_try) 2>&5 |
13122 | ac_status=$? | 17907 | ac_status=$? |
13123 | echo "$as_me:13123: \$? = $ac_status" >&5 | 17908 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
13124 | (exit $ac_status); }; }; then | 17909 | (exit $ac_status); }; }; then |
13125 | ac_cv_have_struct_in6_addr="yes" | 17910 | ac_cv_have_struct_in6_addr="yes" |
13126 | else | 17911 | else |
13127 | echo "$as_me: failed program was:" >&5 | 17912 | echo "$as_me: failed program was:" >&5 |
13128 | cat conftest.$ac_ext >&5 | 17913 | sed 's/^/| /' conftest.$ac_ext >&5 |
17914 | |||
13129 | ac_cv_have_struct_in6_addr="no" | 17915 | ac_cv_have_struct_in6_addr="no" |
13130 | 17916 | ||
13131 | fi | 17917 | fi |
13132 | rm -f conftest.$ac_objext conftest.$ac_ext | 17918 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
13133 | 17919 | ||
13134 | fi | 17920 | fi |
13135 | echo "$as_me:13135: result: $ac_cv_have_struct_in6_addr" >&5 | 17921 | echo "$as_me:$LINENO: result: $ac_cv_have_struct_in6_addr" >&5 |
13136 | echo "${ECHO_T}$ac_cv_have_struct_in6_addr" >&6 | 17922 | echo "${ECHO_T}$ac_cv_have_struct_in6_addr" >&6 |
13137 | if test "x$ac_cv_have_struct_in6_addr" = "xyes" ; then | 17923 | if test "x$ac_cv_have_struct_in6_addr" = "xyes" ; then |
13138 | cat >>confdefs.h <<\EOF | 17924 | cat >>confdefs.h <<\_ACEOF |
13139 | #define HAVE_STRUCT_IN6_ADDR 1 | 17925 | #define HAVE_STRUCT_IN6_ADDR 1 |
13140 | EOF | 17926 | _ACEOF |
13141 | 17927 | ||
13142 | fi | 17928 | fi |
13143 | 17929 | ||
13144 | echo "$as_me:13144: checking for struct addrinfo" >&5 | 17930 | echo "$as_me:$LINENO: checking for struct addrinfo" >&5 |
13145 | echo $ECHO_N "checking for struct addrinfo... $ECHO_C" >&6 | 17931 | echo $ECHO_N "checking for struct addrinfo... $ECHO_C" >&6 |
13146 | if test "${ac_cv_have_struct_addrinfo+set}" = set; then | 17932 | if test "${ac_cv_have_struct_addrinfo+set}" = set; then |
13147 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 17933 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
13148 | else | 17934 | else |
13149 | 17935 | ||
13150 | cat >conftest.$ac_ext <<_ACEOF | 17936 | cat >conftest.$ac_ext <<_ACEOF |
13151 | #line 13151 "configure" | 17937 | /* confdefs.h. */ |
13152 | #include "confdefs.h" | 17938 | _ACEOF |
17939 | cat confdefs.h >>conftest.$ac_ext | ||
17940 | cat >>conftest.$ac_ext <<_ACEOF | ||
17941 | /* end confdefs.h. */ | ||
13153 | 17942 | ||
13154 | #include <sys/types.h> | 17943 | #include <sys/types.h> |
13155 | #include <sys/socket.h> | 17944 | #include <sys/socket.h> |
@@ -13164,45 +17953,59 @@ main () | |||
13164 | } | 17953 | } |
13165 | _ACEOF | 17954 | _ACEOF |
13166 | rm -f conftest.$ac_objext | 17955 | rm -f conftest.$ac_objext |
13167 | if { (eval echo "$as_me:13167: \"$ac_compile\"") >&5 | 17956 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
13168 | (eval $ac_compile) 2>&5 | 17957 | (eval $ac_compile) 2>conftest.er1 |
13169 | ac_status=$? | 17958 | ac_status=$? |
13170 | echo "$as_me:13170: \$? = $ac_status" >&5 | 17959 | grep -v '^ *+' conftest.er1 >conftest.err |
17960 | rm -f conftest.er1 | ||
17961 | cat conftest.err >&5 | ||
17962 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13171 | (exit $ac_status); } && | 17963 | (exit $ac_status); } && |
13172 | { ac_try='test -s conftest.$ac_objext' | 17964 | { ac_try='test -z "$ac_c_werror_flag" |
13173 | { (eval echo "$as_me:13173: \"$ac_try\"") >&5 | 17965 | || test ! -s conftest.err' |
17966 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
13174 | (eval $ac_try) 2>&5 | 17967 | (eval $ac_try) 2>&5 |
13175 | ac_status=$? | 17968 | ac_status=$? |
13176 | echo "$as_me:13176: \$? = $ac_status" >&5 | 17969 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
17970 | (exit $ac_status); }; } && | ||
17971 | { ac_try='test -s conftest.$ac_objext' | ||
17972 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17973 | (eval $ac_try) 2>&5 | ||
17974 | ac_status=$? | ||
17975 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13177 | (exit $ac_status); }; }; then | 17976 | (exit $ac_status); }; }; then |
13178 | ac_cv_have_struct_addrinfo="yes" | 17977 | ac_cv_have_struct_addrinfo="yes" |
13179 | else | 17978 | else |
13180 | echo "$as_me: failed program was:" >&5 | 17979 | echo "$as_me: failed program was:" >&5 |
13181 | cat conftest.$ac_ext >&5 | 17980 | sed 's/^/| /' conftest.$ac_ext >&5 |
17981 | |||
13182 | ac_cv_have_struct_addrinfo="no" | 17982 | ac_cv_have_struct_addrinfo="no" |
13183 | 17983 | ||
13184 | fi | 17984 | fi |
13185 | rm -f conftest.$ac_objext conftest.$ac_ext | 17985 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
13186 | 17986 | ||
13187 | fi | 17987 | fi |
13188 | echo "$as_me:13188: result: $ac_cv_have_struct_addrinfo" >&5 | 17988 | echo "$as_me:$LINENO: result: $ac_cv_have_struct_addrinfo" >&5 |
13189 | echo "${ECHO_T}$ac_cv_have_struct_addrinfo" >&6 | 17989 | echo "${ECHO_T}$ac_cv_have_struct_addrinfo" >&6 |
13190 | if test "x$ac_cv_have_struct_addrinfo" = "xyes" ; then | 17990 | if test "x$ac_cv_have_struct_addrinfo" = "xyes" ; then |
13191 | cat >>confdefs.h <<\EOF | 17991 | cat >>confdefs.h <<\_ACEOF |
13192 | #define HAVE_STRUCT_ADDRINFO 1 | 17992 | #define HAVE_STRUCT_ADDRINFO 1 |
13193 | EOF | 17993 | _ACEOF |
13194 | 17994 | ||
13195 | fi | 17995 | fi |
13196 | 17996 | ||
13197 | echo "$as_me:13197: checking for struct timeval" >&5 | 17997 | echo "$as_me:$LINENO: checking for struct timeval" >&5 |
13198 | echo $ECHO_N "checking for struct timeval... $ECHO_C" >&6 | 17998 | echo $ECHO_N "checking for struct timeval... $ECHO_C" >&6 |
13199 | if test "${ac_cv_have_struct_timeval+set}" = set; then | 17999 | if test "${ac_cv_have_struct_timeval+set}" = set; then |
13200 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 18000 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
13201 | else | 18001 | else |
13202 | 18002 | ||
13203 | cat >conftest.$ac_ext <<_ACEOF | 18003 | cat >conftest.$ac_ext <<_ACEOF |
13204 | #line 13204 "configure" | 18004 | /* confdefs.h. */ |
13205 | #include "confdefs.h" | 18005 | _ACEOF |
18006 | cat confdefs.h >>conftest.$ac_ext | ||
18007 | cat >>conftest.$ac_ext <<_ACEOF | ||
18008 | /* end confdefs.h. */ | ||
13206 | #include <sys/time.h> | 18009 | #include <sys/time.h> |
13207 | int | 18010 | int |
13208 | main () | 18011 | main () |
@@ -13213,45 +18016,59 @@ main () | |||
13213 | } | 18016 | } |
13214 | _ACEOF | 18017 | _ACEOF |
13215 | rm -f conftest.$ac_objext | 18018 | rm -f conftest.$ac_objext |
13216 | if { (eval echo "$as_me:13216: \"$ac_compile\"") >&5 | 18019 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
13217 | (eval $ac_compile) 2>&5 | 18020 | (eval $ac_compile) 2>conftest.er1 |
13218 | ac_status=$? | 18021 | ac_status=$? |
13219 | echo "$as_me:13219: \$? = $ac_status" >&5 | 18022 | grep -v '^ *+' conftest.er1 >conftest.err |
18023 | rm -f conftest.er1 | ||
18024 | cat conftest.err >&5 | ||
18025 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13220 | (exit $ac_status); } && | 18026 | (exit $ac_status); } && |
13221 | { ac_try='test -s conftest.$ac_objext' | 18027 | { ac_try='test -z "$ac_c_werror_flag" |
13222 | { (eval echo "$as_me:13222: \"$ac_try\"") >&5 | 18028 | || test ! -s conftest.err' |
18029 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
18030 | (eval $ac_try) 2>&5 | ||
18031 | ac_status=$? | ||
18032 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18033 | (exit $ac_status); }; } && | ||
18034 | { ac_try='test -s conftest.$ac_objext' | ||
18035 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
13223 | (eval $ac_try) 2>&5 | 18036 | (eval $ac_try) 2>&5 |
13224 | ac_status=$? | 18037 | ac_status=$? |
13225 | echo "$as_me:13225: \$? = $ac_status" >&5 | 18038 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
13226 | (exit $ac_status); }; }; then | 18039 | (exit $ac_status); }; }; then |
13227 | ac_cv_have_struct_timeval="yes" | 18040 | ac_cv_have_struct_timeval="yes" |
13228 | else | 18041 | else |
13229 | echo "$as_me: failed program was:" >&5 | 18042 | echo "$as_me: failed program was:" >&5 |
13230 | cat conftest.$ac_ext >&5 | 18043 | sed 's/^/| /' conftest.$ac_ext >&5 |
18044 | |||
13231 | ac_cv_have_struct_timeval="no" | 18045 | ac_cv_have_struct_timeval="no" |
13232 | 18046 | ||
13233 | fi | 18047 | fi |
13234 | rm -f conftest.$ac_objext conftest.$ac_ext | 18048 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
13235 | 18049 | ||
13236 | fi | 18050 | fi |
13237 | echo "$as_me:13237: result: $ac_cv_have_struct_timeval" >&5 | 18051 | echo "$as_me:$LINENO: result: $ac_cv_have_struct_timeval" >&5 |
13238 | echo "${ECHO_T}$ac_cv_have_struct_timeval" >&6 | 18052 | echo "${ECHO_T}$ac_cv_have_struct_timeval" >&6 |
13239 | if test "x$ac_cv_have_struct_timeval" = "xyes" ; then | 18053 | if test "x$ac_cv_have_struct_timeval" = "xyes" ; then |
13240 | cat >>confdefs.h <<\EOF | 18054 | cat >>confdefs.h <<\_ACEOF |
13241 | #define HAVE_STRUCT_TIMEVAL 1 | 18055 | #define HAVE_STRUCT_TIMEVAL 1 |
13242 | EOF | 18056 | _ACEOF |
13243 | 18057 | ||
13244 | have_struct_timeval=1 | 18058 | have_struct_timeval=1 |
13245 | fi | 18059 | fi |
13246 | 18060 | ||
13247 | echo "$as_me:13247: checking for struct timespec" >&5 | 18061 | echo "$as_me:$LINENO: checking for struct timespec" >&5 |
13248 | echo $ECHO_N "checking for struct timespec... $ECHO_C" >&6 | 18062 | echo $ECHO_N "checking for struct timespec... $ECHO_C" >&6 |
13249 | if test "${ac_cv_type_struct_timespec+set}" = set; then | 18063 | if test "${ac_cv_type_struct_timespec+set}" = set; then |
13250 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 18064 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
13251 | else | 18065 | else |
13252 | cat >conftest.$ac_ext <<_ACEOF | 18066 | cat >conftest.$ac_ext <<_ACEOF |
13253 | #line 13253 "configure" | 18067 | /* confdefs.h. */ |
13254 | #include "confdefs.h" | 18068 | _ACEOF |
18069 | cat confdefs.h >>conftest.$ac_ext | ||
18070 | cat >>conftest.$ac_ext <<_ACEOF | ||
18071 | /* end confdefs.h. */ | ||
13255 | $ac_includes_default | 18072 | $ac_includes_default |
13256 | int | 18073 | int |
13257 | main () | 18074 | main () |
@@ -13265,35 +18082,48 @@ if (sizeof (struct timespec)) | |||
13265 | } | 18082 | } |
13266 | _ACEOF | 18083 | _ACEOF |
13267 | rm -f conftest.$ac_objext | 18084 | rm -f conftest.$ac_objext |
13268 | if { (eval echo "$as_me:13268: \"$ac_compile\"") >&5 | 18085 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
13269 | (eval $ac_compile) 2>&5 | 18086 | (eval $ac_compile) 2>conftest.er1 |
13270 | ac_status=$? | 18087 | ac_status=$? |
13271 | echo "$as_me:13271: \$? = $ac_status" >&5 | 18088 | grep -v '^ *+' conftest.er1 >conftest.err |
18089 | rm -f conftest.er1 | ||
18090 | cat conftest.err >&5 | ||
18091 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13272 | (exit $ac_status); } && | 18092 | (exit $ac_status); } && |
13273 | { ac_try='test -s conftest.$ac_objext' | 18093 | { ac_try='test -z "$ac_c_werror_flag" |
13274 | { (eval echo "$as_me:13274: \"$ac_try\"") >&5 | 18094 | || test ! -s conftest.err' |
18095 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
13275 | (eval $ac_try) 2>&5 | 18096 | (eval $ac_try) 2>&5 |
13276 | ac_status=$? | 18097 | ac_status=$? |
13277 | echo "$as_me:13277: \$? = $ac_status" >&5 | 18098 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
18099 | (exit $ac_status); }; } && | ||
18100 | { ac_try='test -s conftest.$ac_objext' | ||
18101 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
18102 | (eval $ac_try) 2>&5 | ||
18103 | ac_status=$? | ||
18104 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
13278 | (exit $ac_status); }; }; then | 18105 | (exit $ac_status); }; }; then |
13279 | ac_cv_type_struct_timespec=yes | 18106 | ac_cv_type_struct_timespec=yes |
13280 | else | 18107 | else |
13281 | echo "$as_me: failed program was:" >&5 | 18108 | echo "$as_me: failed program was:" >&5 |
13282 | cat conftest.$ac_ext >&5 | 18109 | sed 's/^/| /' conftest.$ac_ext >&5 |
18110 | |||
13283 | ac_cv_type_struct_timespec=no | 18111 | ac_cv_type_struct_timespec=no |
13284 | fi | 18112 | fi |
13285 | rm -f conftest.$ac_objext conftest.$ac_ext | 18113 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
13286 | fi | 18114 | fi |
13287 | echo "$as_me:13287: result: $ac_cv_type_struct_timespec" >&5 | 18115 | echo "$as_me:$LINENO: result: $ac_cv_type_struct_timespec" >&5 |
13288 | echo "${ECHO_T}$ac_cv_type_struct_timespec" >&6 | 18116 | echo "${ECHO_T}$ac_cv_type_struct_timespec" >&6 |
13289 | if test $ac_cv_type_struct_timespec = yes; then | 18117 | if test $ac_cv_type_struct_timespec = yes; then |
13290 | 18118 | ||
13291 | cat >>confdefs.h <<EOF | 18119 | cat >>confdefs.h <<_ACEOF |
13292 | #define HAVE_STRUCT_TIMESPEC 1 | 18120 | #define HAVE_STRUCT_TIMESPEC 1 |
13293 | EOF | 18121 | _ACEOF |
18122 | |||
13294 | 18123 | ||
13295 | fi | 18124 | fi |
13296 | 18125 | ||
18126 | |||
13297 | # We need int64_t or else certian parts of the compile will fail. | 18127 | # We need int64_t or else certian parts of the compile will fail. |
13298 | if test "x$ac_cv_have_int64_t" = "xno" -a \ | 18128 | if test "x$ac_cv_have_int64_t" = "xno" -a \ |
13299 | "x$ac_cv_sizeof_long_int" != "x8" -a \ | 18129 | "x$ac_cv_sizeof_long_int" != "x8" -a \ |
@@ -13304,13 +18134,18 @@ if test "x$ac_cv_have_int64_t" = "xno" -a \ | |||
13304 | exit 1; | 18134 | exit 1; |
13305 | else | 18135 | else |
13306 | if test "$cross_compiling" = yes; then | 18136 | if test "$cross_compiling" = yes; then |
13307 | { { echo "$as_me:13307: error: cannot run test program while cross compiling" >&5 | 18137 | { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
13308 | echo "$as_me: error: cannot run test program while cross compiling" >&2;} | 18138 | See \`config.log' for more details." >&5 |
18139 | echo "$as_me: error: cannot run test program while cross compiling | ||
18140 | See \`config.log' for more details." >&2;} | ||
13309 | { (exit 1); exit 1; }; } | 18141 | { (exit 1); exit 1; }; } |
13310 | else | 18142 | else |
13311 | cat >conftest.$ac_ext <<_ACEOF | 18143 | cat >conftest.$ac_ext <<_ACEOF |
13312 | #line 13312 "configure" | 18144 | /* confdefs.h. */ |
13313 | #include "confdefs.h" | 18145 | _ACEOF |
18146 | cat confdefs.h >>conftest.$ac_ext | ||
18147 | cat >>conftest.$ac_ext <<_ACEOF | ||
18148 | /* end confdefs.h. */ | ||
13314 | 18149 | ||
13315 | #include <stdio.h> | 18150 | #include <stdio.h> |
13316 | #include <string.h> | 18151 | #include <string.h> |
@@ -13337,47 +18172,54 @@ main() { exit(0); } | |||
13337 | 18172 | ||
13338 | _ACEOF | 18173 | _ACEOF |
13339 | rm -f conftest$ac_exeext | 18174 | rm -f conftest$ac_exeext |
13340 | if { (eval echo "$as_me:13340: \"$ac_link\"") >&5 | 18175 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
13341 | (eval $ac_link) 2>&5 | 18176 | (eval $ac_link) 2>&5 |
13342 | ac_status=$? | 18177 | ac_status=$? |
13343 | echo "$as_me:13343: \$? = $ac_status" >&5 | 18178 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
13344 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | 18179 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
13345 | { (eval echo "$as_me:13345: \"$ac_try\"") >&5 | 18180 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
13346 | (eval $ac_try) 2>&5 | 18181 | (eval $ac_try) 2>&5 |
13347 | ac_status=$? | 18182 | ac_status=$? |
13348 | echo "$as_me:13348: \$? = $ac_status" >&5 | 18183 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
13349 | (exit $ac_status); }; }; then | 18184 | (exit $ac_status); }; }; then |
13350 | true | 18185 | true |
13351 | else | 18186 | else |
13352 | echo "$as_me: program exited with status $ac_status" >&5 | 18187 | echo "$as_me: program exited with status $ac_status" >&5 |
13353 | echo "$as_me: failed program was:" >&5 | 18188 | echo "$as_me: failed program was:" >&5 |
13354 | cat conftest.$ac_ext >&5 | 18189 | sed 's/^/| /' conftest.$ac_ext >&5 |
13355 | cat >>confdefs.h <<\EOF | 18190 | |
18191 | ( exit $ac_status ) | ||
18192 | cat >>confdefs.h <<\_ACEOF | ||
13356 | #define BROKEN_SNPRINTF 1 | 18193 | #define BROKEN_SNPRINTF 1 |
13357 | EOF | 18194 | _ACEOF |
18195 | |||
13358 | 18196 | ||
13359 | fi | 18197 | fi |
13360 | rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | 18198 | rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext |
13361 | fi | 18199 | fi |
13362 | fi | 18200 | fi |
13363 | 18201 | ||
18202 | |||
13364 | # look for field 'ut_host' in header 'utmp.h' | 18203 | # look for field 'ut_host' in header 'utmp.h' |
13365 | ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` | 18204 | ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` |
13366 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_host | 18205 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_host |
13367 | echo "$as_me:13367: checking for ut_host field in utmp.h" >&5 | 18206 | echo "$as_me:$LINENO: checking for ut_host field in utmp.h" >&5 |
13368 | echo $ECHO_N "checking for ut_host field in utmp.h... $ECHO_C" >&6 | 18207 | echo $ECHO_N "checking for ut_host field in utmp.h... $ECHO_C" >&6 |
13369 | if eval "test \"\${$ossh_varname+set}\" = set"; then | 18208 | if eval "test \"\${$ossh_varname+set}\" = set"; then |
13370 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 18209 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
13371 | else | 18210 | else |
13372 | 18211 | ||
13373 | cat >conftest.$ac_ext <<_ACEOF | 18212 | cat >conftest.$ac_ext <<_ACEOF |
13374 | #line 13374 "configure" | 18213 | /* confdefs.h. */ |
13375 | #include "confdefs.h" | 18214 | _ACEOF |
18215 | cat confdefs.h >>conftest.$ac_ext | ||
18216 | cat >>conftest.$ac_ext <<_ACEOF | ||
18217 | /* end confdefs.h. */ | ||
13376 | #include <utmp.h> | 18218 | #include <utmp.h> |
13377 | 18219 | ||
13378 | _ACEOF | 18220 | _ACEOF |
13379 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | 18221 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | |
13380 | egrep "ut_host" >/dev/null 2>&1; then | 18222 | $EGREP "ut_host" >/dev/null 2>&1; then |
13381 | eval "$ossh_varname=yes" | 18223 | eval "$ossh_varname=yes" |
13382 | else | 18224 | else |
13383 | eval "$ossh_varname=no" | 18225 | eval "$ossh_varname=no" |
@@ -13388,36 +18230,40 @@ fi | |||
13388 | 18230 | ||
13389 | ossh_result=`eval 'echo $'"$ossh_varname"` | 18231 | ossh_result=`eval 'echo $'"$ossh_varname"` |
13390 | if test -n "`echo $ossh_varname`"; then | 18232 | if test -n "`echo $ossh_varname`"; then |
13391 | echo "$as_me:13391: result: $ossh_result" >&5 | 18233 | echo "$as_me:$LINENO: result: $ossh_result" >&5 |
13392 | echo "${ECHO_T}$ossh_result" >&6 | 18234 | echo "${ECHO_T}$ossh_result" >&6 |
13393 | if test "x$ossh_result" = "xyes"; then | 18235 | if test "x$ossh_result" = "xyes"; then |
13394 | cat >>confdefs.h <<\EOF | 18236 | cat >>confdefs.h <<\_ACEOF |
13395 | #define HAVE_HOST_IN_UTMP 1 | 18237 | #define HAVE_HOST_IN_UTMP 1 |
13396 | EOF | 18238 | _ACEOF |
13397 | 18239 | ||
13398 | fi | 18240 | fi |
13399 | else | 18241 | else |
13400 | echo "$as_me:13400: result: no" >&5 | 18242 | echo "$as_me:$LINENO: result: no" >&5 |
13401 | echo "${ECHO_T}no" >&6 | 18243 | echo "${ECHO_T}no" >&6 |
13402 | fi | 18244 | fi |
13403 | 18245 | ||
18246 | |||
13404 | # look for field 'ut_host' in header 'utmpx.h' | 18247 | # look for field 'ut_host' in header 'utmpx.h' |
13405 | ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` | 18248 | ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` |
13406 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_host | 18249 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_host |
13407 | echo "$as_me:13407: checking for ut_host field in utmpx.h" >&5 | 18250 | echo "$as_me:$LINENO: checking for ut_host field in utmpx.h" >&5 |
13408 | echo $ECHO_N "checking for ut_host field in utmpx.h... $ECHO_C" >&6 | 18251 | echo $ECHO_N "checking for ut_host field in utmpx.h... $ECHO_C" >&6 |
13409 | if eval "test \"\${$ossh_varname+set}\" = set"; then | 18252 | if eval "test \"\${$ossh_varname+set}\" = set"; then |
13410 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 18253 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
13411 | else | 18254 | else |
13412 | 18255 | ||
13413 | cat >conftest.$ac_ext <<_ACEOF | 18256 | cat >conftest.$ac_ext <<_ACEOF |
13414 | #line 13414 "configure" | 18257 | /* confdefs.h. */ |
13415 | #include "confdefs.h" | 18258 | _ACEOF |
18259 | cat confdefs.h >>conftest.$ac_ext | ||
18260 | cat >>conftest.$ac_ext <<_ACEOF | ||
18261 | /* end confdefs.h. */ | ||
13416 | #include <utmpx.h> | 18262 | #include <utmpx.h> |
13417 | 18263 | ||
13418 | _ACEOF | 18264 | _ACEOF |
13419 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | 18265 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | |
13420 | egrep "ut_host" >/dev/null 2>&1; then | 18266 | $EGREP "ut_host" >/dev/null 2>&1; then |
13421 | eval "$ossh_varname=yes" | 18267 | eval "$ossh_varname=yes" |
13422 | else | 18268 | else |
13423 | eval "$ossh_varname=no" | 18269 | eval "$ossh_varname=no" |
@@ -13428,36 +18274,40 @@ fi | |||
13428 | 18274 | ||
13429 | ossh_result=`eval 'echo $'"$ossh_varname"` | 18275 | ossh_result=`eval 'echo $'"$ossh_varname"` |
13430 | if test -n "`echo $ossh_varname`"; then | 18276 | if test -n "`echo $ossh_varname`"; then |
13431 | echo "$as_me:13431: result: $ossh_result" >&5 | 18277 | echo "$as_me:$LINENO: result: $ossh_result" >&5 |
13432 | echo "${ECHO_T}$ossh_result" >&6 | 18278 | echo "${ECHO_T}$ossh_result" >&6 |
13433 | if test "x$ossh_result" = "xyes"; then | 18279 | if test "x$ossh_result" = "xyes"; then |
13434 | cat >>confdefs.h <<\EOF | 18280 | cat >>confdefs.h <<\_ACEOF |
13435 | #define HAVE_HOST_IN_UTMPX 1 | 18281 | #define HAVE_HOST_IN_UTMPX 1 |
13436 | EOF | 18282 | _ACEOF |
13437 | 18283 | ||
13438 | fi | 18284 | fi |
13439 | else | 18285 | else |
13440 | echo "$as_me:13440: result: no" >&5 | 18286 | echo "$as_me:$LINENO: result: no" >&5 |
13441 | echo "${ECHO_T}no" >&6 | 18287 | echo "${ECHO_T}no" >&6 |
13442 | fi | 18288 | fi |
13443 | 18289 | ||
18290 | |||
13444 | # look for field 'syslen' in header 'utmpx.h' | 18291 | # look for field 'syslen' in header 'utmpx.h' |
13445 | ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` | 18292 | ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` |
13446 | ossh_varname="ossh_cv_$ossh_safe""_has_"syslen | 18293 | ossh_varname="ossh_cv_$ossh_safe""_has_"syslen |
13447 | echo "$as_me:13447: checking for syslen field in utmpx.h" >&5 | 18294 | echo "$as_me:$LINENO: checking for syslen field in utmpx.h" >&5 |
13448 | echo $ECHO_N "checking for syslen field in utmpx.h... $ECHO_C" >&6 | 18295 | echo $ECHO_N "checking for syslen field in utmpx.h... $ECHO_C" >&6 |
13449 | if eval "test \"\${$ossh_varname+set}\" = set"; then | 18296 | if eval "test \"\${$ossh_varname+set}\" = set"; then |
13450 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 18297 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
13451 | else | 18298 | else |
13452 | 18299 | ||
13453 | cat >conftest.$ac_ext <<_ACEOF | 18300 | cat >conftest.$ac_ext <<_ACEOF |
13454 | #line 13454 "configure" | 18301 | /* confdefs.h. */ |
13455 | #include "confdefs.h" | 18302 | _ACEOF |
18303 | cat confdefs.h >>conftest.$ac_ext | ||
18304 | cat >>conftest.$ac_ext <<_ACEOF | ||
18305 | /* end confdefs.h. */ | ||
13456 | #include <utmpx.h> | 18306 | #include <utmpx.h> |
13457 | 18307 | ||
13458 | _ACEOF | 18308 | _ACEOF |
13459 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | 18309 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | |
13460 | egrep "syslen" >/dev/null 2>&1; then | 18310 | $EGREP "syslen" >/dev/null 2>&1; then |
13461 | eval "$ossh_varname=yes" | 18311 | eval "$ossh_varname=yes" |
13462 | else | 18312 | else |
13463 | eval "$ossh_varname=no" | 18313 | eval "$ossh_varname=no" |
@@ -13468,36 +18318,40 @@ fi | |||
13468 | 18318 | ||
13469 | ossh_result=`eval 'echo $'"$ossh_varname"` | 18319 | ossh_result=`eval 'echo $'"$ossh_varname"` |
13470 | if test -n "`echo $ossh_varname`"; then | 18320 | if test -n "`echo $ossh_varname`"; then |
13471 | echo "$as_me:13471: result: $ossh_result" >&5 | 18321 | echo "$as_me:$LINENO: result: $ossh_result" >&5 |
13472 | echo "${ECHO_T}$ossh_result" >&6 | 18322 | echo "${ECHO_T}$ossh_result" >&6 |
13473 | if test "x$ossh_result" = "xyes"; then | 18323 | if test "x$ossh_result" = "xyes"; then |
13474 | cat >>confdefs.h <<\EOF | 18324 | cat >>confdefs.h <<\_ACEOF |
13475 | #define HAVE_SYSLEN_IN_UTMPX 1 | 18325 | #define HAVE_SYSLEN_IN_UTMPX 1 |
13476 | EOF | 18326 | _ACEOF |
13477 | 18327 | ||
13478 | fi | 18328 | fi |
13479 | else | 18329 | else |
13480 | echo "$as_me:13480: result: no" >&5 | 18330 | echo "$as_me:$LINENO: result: no" >&5 |
13481 | echo "${ECHO_T}no" >&6 | 18331 | echo "${ECHO_T}no" >&6 |
13482 | fi | 18332 | fi |
13483 | 18333 | ||
18334 | |||
13484 | # look for field 'ut_pid' in header 'utmp.h' | 18335 | # look for field 'ut_pid' in header 'utmp.h' |
13485 | ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` | 18336 | ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` |
13486 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_pid | 18337 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_pid |
13487 | echo "$as_me:13487: checking for ut_pid field in utmp.h" >&5 | 18338 | echo "$as_me:$LINENO: checking for ut_pid field in utmp.h" >&5 |
13488 | echo $ECHO_N "checking for ut_pid field in utmp.h... $ECHO_C" >&6 | 18339 | echo $ECHO_N "checking for ut_pid field in utmp.h... $ECHO_C" >&6 |
13489 | if eval "test \"\${$ossh_varname+set}\" = set"; then | 18340 | if eval "test \"\${$ossh_varname+set}\" = set"; then |
13490 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 18341 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
13491 | else | 18342 | else |
13492 | 18343 | ||
13493 | cat >conftest.$ac_ext <<_ACEOF | 18344 | cat >conftest.$ac_ext <<_ACEOF |
13494 | #line 13494 "configure" | 18345 | /* confdefs.h. */ |
13495 | #include "confdefs.h" | 18346 | _ACEOF |
18347 | cat confdefs.h >>conftest.$ac_ext | ||
18348 | cat >>conftest.$ac_ext <<_ACEOF | ||
18349 | /* end confdefs.h. */ | ||
13496 | #include <utmp.h> | 18350 | #include <utmp.h> |
13497 | 18351 | ||
13498 | _ACEOF | 18352 | _ACEOF |
13499 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | 18353 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | |
13500 | egrep "ut_pid" >/dev/null 2>&1; then | 18354 | $EGREP "ut_pid" >/dev/null 2>&1; then |
13501 | eval "$ossh_varname=yes" | 18355 | eval "$ossh_varname=yes" |
13502 | else | 18356 | else |
13503 | eval "$ossh_varname=no" | 18357 | eval "$ossh_varname=no" |
@@ -13508,36 +18362,40 @@ fi | |||
13508 | 18362 | ||
13509 | ossh_result=`eval 'echo $'"$ossh_varname"` | 18363 | ossh_result=`eval 'echo $'"$ossh_varname"` |
13510 | if test -n "`echo $ossh_varname`"; then | 18364 | if test -n "`echo $ossh_varname`"; then |
13511 | echo "$as_me:13511: result: $ossh_result" >&5 | 18365 | echo "$as_me:$LINENO: result: $ossh_result" >&5 |
13512 | echo "${ECHO_T}$ossh_result" >&6 | 18366 | echo "${ECHO_T}$ossh_result" >&6 |
13513 | if test "x$ossh_result" = "xyes"; then | 18367 | if test "x$ossh_result" = "xyes"; then |
13514 | cat >>confdefs.h <<\EOF | 18368 | cat >>confdefs.h <<\_ACEOF |
13515 | #define HAVE_PID_IN_UTMP 1 | 18369 | #define HAVE_PID_IN_UTMP 1 |
13516 | EOF | 18370 | _ACEOF |
13517 | 18371 | ||
13518 | fi | 18372 | fi |
13519 | else | 18373 | else |
13520 | echo "$as_me:13520: result: no" >&5 | 18374 | echo "$as_me:$LINENO: result: no" >&5 |
13521 | echo "${ECHO_T}no" >&6 | 18375 | echo "${ECHO_T}no" >&6 |
13522 | fi | 18376 | fi |
13523 | 18377 | ||
18378 | |||
13524 | # look for field 'ut_type' in header 'utmp.h' | 18379 | # look for field 'ut_type' in header 'utmp.h' |
13525 | ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` | 18380 | ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` |
13526 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_type | 18381 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_type |
13527 | echo "$as_me:13527: checking for ut_type field in utmp.h" >&5 | 18382 | echo "$as_me:$LINENO: checking for ut_type field in utmp.h" >&5 |
13528 | echo $ECHO_N "checking for ut_type field in utmp.h... $ECHO_C" >&6 | 18383 | echo $ECHO_N "checking for ut_type field in utmp.h... $ECHO_C" >&6 |
13529 | if eval "test \"\${$ossh_varname+set}\" = set"; then | 18384 | if eval "test \"\${$ossh_varname+set}\" = set"; then |
13530 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 18385 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
13531 | else | 18386 | else |
13532 | 18387 | ||
13533 | cat >conftest.$ac_ext <<_ACEOF | 18388 | cat >conftest.$ac_ext <<_ACEOF |
13534 | #line 13534 "configure" | 18389 | /* confdefs.h. */ |
13535 | #include "confdefs.h" | 18390 | _ACEOF |
18391 | cat confdefs.h >>conftest.$ac_ext | ||
18392 | cat >>conftest.$ac_ext <<_ACEOF | ||
18393 | /* end confdefs.h. */ | ||
13536 | #include <utmp.h> | 18394 | #include <utmp.h> |
13537 | 18395 | ||
13538 | _ACEOF | 18396 | _ACEOF |
13539 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | 18397 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | |
13540 | egrep "ut_type" >/dev/null 2>&1; then | 18398 | $EGREP "ut_type" >/dev/null 2>&1; then |
13541 | eval "$ossh_varname=yes" | 18399 | eval "$ossh_varname=yes" |
13542 | else | 18400 | else |
13543 | eval "$ossh_varname=no" | 18401 | eval "$ossh_varname=no" |
@@ -13548,36 +18406,40 @@ fi | |||
13548 | 18406 | ||
13549 | ossh_result=`eval 'echo $'"$ossh_varname"` | 18407 | ossh_result=`eval 'echo $'"$ossh_varname"` |
13550 | if test -n "`echo $ossh_varname`"; then | 18408 | if test -n "`echo $ossh_varname`"; then |
13551 | echo "$as_me:13551: result: $ossh_result" >&5 | 18409 | echo "$as_me:$LINENO: result: $ossh_result" >&5 |
13552 | echo "${ECHO_T}$ossh_result" >&6 | 18410 | echo "${ECHO_T}$ossh_result" >&6 |
13553 | if test "x$ossh_result" = "xyes"; then | 18411 | if test "x$ossh_result" = "xyes"; then |
13554 | cat >>confdefs.h <<\EOF | 18412 | cat >>confdefs.h <<\_ACEOF |
13555 | #define HAVE_TYPE_IN_UTMP 1 | 18413 | #define HAVE_TYPE_IN_UTMP 1 |
13556 | EOF | 18414 | _ACEOF |
13557 | 18415 | ||
13558 | fi | 18416 | fi |
13559 | else | 18417 | else |
13560 | echo "$as_me:13560: result: no" >&5 | 18418 | echo "$as_me:$LINENO: result: no" >&5 |
13561 | echo "${ECHO_T}no" >&6 | 18419 | echo "${ECHO_T}no" >&6 |
13562 | fi | 18420 | fi |
13563 | 18421 | ||
18422 | |||
13564 | # look for field 'ut_type' in header 'utmpx.h' | 18423 | # look for field 'ut_type' in header 'utmpx.h' |
13565 | ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` | 18424 | ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` |
13566 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_type | 18425 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_type |
13567 | echo "$as_me:13567: checking for ut_type field in utmpx.h" >&5 | 18426 | echo "$as_me:$LINENO: checking for ut_type field in utmpx.h" >&5 |
13568 | echo $ECHO_N "checking for ut_type field in utmpx.h... $ECHO_C" >&6 | 18427 | echo $ECHO_N "checking for ut_type field in utmpx.h... $ECHO_C" >&6 |
13569 | if eval "test \"\${$ossh_varname+set}\" = set"; then | 18428 | if eval "test \"\${$ossh_varname+set}\" = set"; then |
13570 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 18429 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
13571 | else | 18430 | else |
13572 | 18431 | ||
13573 | cat >conftest.$ac_ext <<_ACEOF | 18432 | cat >conftest.$ac_ext <<_ACEOF |
13574 | #line 13574 "configure" | 18433 | /* confdefs.h. */ |
13575 | #include "confdefs.h" | 18434 | _ACEOF |
18435 | cat confdefs.h >>conftest.$ac_ext | ||
18436 | cat >>conftest.$ac_ext <<_ACEOF | ||
18437 | /* end confdefs.h. */ | ||
13576 | #include <utmpx.h> | 18438 | #include <utmpx.h> |
13577 | 18439 | ||
13578 | _ACEOF | 18440 | _ACEOF |
13579 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | 18441 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | |
13580 | egrep "ut_type" >/dev/null 2>&1; then | 18442 | $EGREP "ut_type" >/dev/null 2>&1; then |
13581 | eval "$ossh_varname=yes" | 18443 | eval "$ossh_varname=yes" |
13582 | else | 18444 | else |
13583 | eval "$ossh_varname=no" | 18445 | eval "$ossh_varname=no" |
@@ -13588,36 +18450,40 @@ fi | |||
13588 | 18450 | ||
13589 | ossh_result=`eval 'echo $'"$ossh_varname"` | 18451 | ossh_result=`eval 'echo $'"$ossh_varname"` |
13590 | if test -n "`echo $ossh_varname`"; then | 18452 | if test -n "`echo $ossh_varname`"; then |
13591 | echo "$as_me:13591: result: $ossh_result" >&5 | 18453 | echo "$as_me:$LINENO: result: $ossh_result" >&5 |
13592 | echo "${ECHO_T}$ossh_result" >&6 | 18454 | echo "${ECHO_T}$ossh_result" >&6 |
13593 | if test "x$ossh_result" = "xyes"; then | 18455 | if test "x$ossh_result" = "xyes"; then |
13594 | cat >>confdefs.h <<\EOF | 18456 | cat >>confdefs.h <<\_ACEOF |
13595 | #define HAVE_TYPE_IN_UTMPX 1 | 18457 | #define HAVE_TYPE_IN_UTMPX 1 |
13596 | EOF | 18458 | _ACEOF |
13597 | 18459 | ||
13598 | fi | 18460 | fi |
13599 | else | 18461 | else |
13600 | echo "$as_me:13600: result: no" >&5 | 18462 | echo "$as_me:$LINENO: result: no" >&5 |
13601 | echo "${ECHO_T}no" >&6 | 18463 | echo "${ECHO_T}no" >&6 |
13602 | fi | 18464 | fi |
13603 | 18465 | ||
18466 | |||
13604 | # look for field 'ut_tv' in header 'utmp.h' | 18467 | # look for field 'ut_tv' in header 'utmp.h' |
13605 | ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` | 18468 | ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` |
13606 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_tv | 18469 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_tv |
13607 | echo "$as_me:13607: checking for ut_tv field in utmp.h" >&5 | 18470 | echo "$as_me:$LINENO: checking for ut_tv field in utmp.h" >&5 |
13608 | echo $ECHO_N "checking for ut_tv field in utmp.h... $ECHO_C" >&6 | 18471 | echo $ECHO_N "checking for ut_tv field in utmp.h... $ECHO_C" >&6 |
13609 | if eval "test \"\${$ossh_varname+set}\" = set"; then | 18472 | if eval "test \"\${$ossh_varname+set}\" = set"; then |
13610 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 18473 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
13611 | else | 18474 | else |
13612 | 18475 | ||
13613 | cat >conftest.$ac_ext <<_ACEOF | 18476 | cat >conftest.$ac_ext <<_ACEOF |
13614 | #line 13614 "configure" | 18477 | /* confdefs.h. */ |
13615 | #include "confdefs.h" | 18478 | _ACEOF |
18479 | cat confdefs.h >>conftest.$ac_ext | ||
18480 | cat >>conftest.$ac_ext <<_ACEOF | ||
18481 | /* end confdefs.h. */ | ||
13616 | #include <utmp.h> | 18482 | #include <utmp.h> |
13617 | 18483 | ||
13618 | _ACEOF | 18484 | _ACEOF |
13619 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | 18485 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | |
13620 | egrep "ut_tv" >/dev/null 2>&1; then | 18486 | $EGREP "ut_tv" >/dev/null 2>&1; then |
13621 | eval "$ossh_varname=yes" | 18487 | eval "$ossh_varname=yes" |
13622 | else | 18488 | else |
13623 | eval "$ossh_varname=no" | 18489 | eval "$ossh_varname=no" |
@@ -13628,36 +18494,40 @@ fi | |||
13628 | 18494 | ||
13629 | ossh_result=`eval 'echo $'"$ossh_varname"` | 18495 | ossh_result=`eval 'echo $'"$ossh_varname"` |
13630 | if test -n "`echo $ossh_varname`"; then | 18496 | if test -n "`echo $ossh_varname`"; then |
13631 | echo "$as_me:13631: result: $ossh_result" >&5 | 18497 | echo "$as_me:$LINENO: result: $ossh_result" >&5 |
13632 | echo "${ECHO_T}$ossh_result" >&6 | 18498 | echo "${ECHO_T}$ossh_result" >&6 |
13633 | if test "x$ossh_result" = "xyes"; then | 18499 | if test "x$ossh_result" = "xyes"; then |
13634 | cat >>confdefs.h <<\EOF | 18500 | cat >>confdefs.h <<\_ACEOF |
13635 | #define HAVE_TV_IN_UTMP 1 | 18501 | #define HAVE_TV_IN_UTMP 1 |
13636 | EOF | 18502 | _ACEOF |
13637 | 18503 | ||
13638 | fi | 18504 | fi |
13639 | else | 18505 | else |
13640 | echo "$as_me:13640: result: no" >&5 | 18506 | echo "$as_me:$LINENO: result: no" >&5 |
13641 | echo "${ECHO_T}no" >&6 | 18507 | echo "${ECHO_T}no" >&6 |
13642 | fi | 18508 | fi |
13643 | 18509 | ||
18510 | |||
13644 | # look for field 'ut_id' in header 'utmp.h' | 18511 | # look for field 'ut_id' in header 'utmp.h' |
13645 | ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` | 18512 | ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` |
13646 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_id | 18513 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_id |
13647 | echo "$as_me:13647: checking for ut_id field in utmp.h" >&5 | 18514 | echo "$as_me:$LINENO: checking for ut_id field in utmp.h" >&5 |
13648 | echo $ECHO_N "checking for ut_id field in utmp.h... $ECHO_C" >&6 | 18515 | echo $ECHO_N "checking for ut_id field in utmp.h... $ECHO_C" >&6 |
13649 | if eval "test \"\${$ossh_varname+set}\" = set"; then | 18516 | if eval "test \"\${$ossh_varname+set}\" = set"; then |
13650 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 18517 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
13651 | else | 18518 | else |
13652 | 18519 | ||
13653 | cat >conftest.$ac_ext <<_ACEOF | 18520 | cat >conftest.$ac_ext <<_ACEOF |
13654 | #line 13654 "configure" | 18521 | /* confdefs.h. */ |
13655 | #include "confdefs.h" | 18522 | _ACEOF |
18523 | cat confdefs.h >>conftest.$ac_ext | ||
18524 | cat >>conftest.$ac_ext <<_ACEOF | ||
18525 | /* end confdefs.h. */ | ||
13656 | #include <utmp.h> | 18526 | #include <utmp.h> |
13657 | 18527 | ||
13658 | _ACEOF | 18528 | _ACEOF |
13659 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | 18529 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | |
13660 | egrep "ut_id" >/dev/null 2>&1; then | 18530 | $EGREP "ut_id" >/dev/null 2>&1; then |
13661 | eval "$ossh_varname=yes" | 18531 | eval "$ossh_varname=yes" |
13662 | else | 18532 | else |
13663 | eval "$ossh_varname=no" | 18533 | eval "$ossh_varname=no" |
@@ -13668,36 +18538,40 @@ fi | |||
13668 | 18538 | ||
13669 | ossh_result=`eval 'echo $'"$ossh_varname"` | 18539 | ossh_result=`eval 'echo $'"$ossh_varname"` |
13670 | if test -n "`echo $ossh_varname`"; then | 18540 | if test -n "`echo $ossh_varname`"; then |
13671 | echo "$as_me:13671: result: $ossh_result" >&5 | 18541 | echo "$as_me:$LINENO: result: $ossh_result" >&5 |
13672 | echo "${ECHO_T}$ossh_result" >&6 | 18542 | echo "${ECHO_T}$ossh_result" >&6 |
13673 | if test "x$ossh_result" = "xyes"; then | 18543 | if test "x$ossh_result" = "xyes"; then |
13674 | cat >>confdefs.h <<\EOF | 18544 | cat >>confdefs.h <<\_ACEOF |
13675 | #define HAVE_ID_IN_UTMP 1 | 18545 | #define HAVE_ID_IN_UTMP 1 |
13676 | EOF | 18546 | _ACEOF |
13677 | 18547 | ||
13678 | fi | 18548 | fi |
13679 | else | 18549 | else |
13680 | echo "$as_me:13680: result: no" >&5 | 18550 | echo "$as_me:$LINENO: result: no" >&5 |
13681 | echo "${ECHO_T}no" >&6 | 18551 | echo "${ECHO_T}no" >&6 |
13682 | fi | 18552 | fi |
13683 | 18553 | ||
18554 | |||
13684 | # look for field 'ut_id' in header 'utmpx.h' | 18555 | # look for field 'ut_id' in header 'utmpx.h' |
13685 | ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` | 18556 | ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` |
13686 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_id | 18557 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_id |
13687 | echo "$as_me:13687: checking for ut_id field in utmpx.h" >&5 | 18558 | echo "$as_me:$LINENO: checking for ut_id field in utmpx.h" >&5 |
13688 | echo $ECHO_N "checking for ut_id field in utmpx.h... $ECHO_C" >&6 | 18559 | echo $ECHO_N "checking for ut_id field in utmpx.h... $ECHO_C" >&6 |
13689 | if eval "test \"\${$ossh_varname+set}\" = set"; then | 18560 | if eval "test \"\${$ossh_varname+set}\" = set"; then |
13690 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 18561 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
13691 | else | 18562 | else |
13692 | 18563 | ||
13693 | cat >conftest.$ac_ext <<_ACEOF | 18564 | cat >conftest.$ac_ext <<_ACEOF |
13694 | #line 13694 "configure" | 18565 | /* confdefs.h. */ |
13695 | #include "confdefs.h" | 18566 | _ACEOF |
18567 | cat confdefs.h >>conftest.$ac_ext | ||
18568 | cat >>conftest.$ac_ext <<_ACEOF | ||
18569 | /* end confdefs.h. */ | ||
13696 | #include <utmpx.h> | 18570 | #include <utmpx.h> |
13697 | 18571 | ||
13698 | _ACEOF | 18572 | _ACEOF |
13699 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | 18573 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | |
13700 | egrep "ut_id" >/dev/null 2>&1; then | 18574 | $EGREP "ut_id" >/dev/null 2>&1; then |
13701 | eval "$ossh_varname=yes" | 18575 | eval "$ossh_varname=yes" |
13702 | else | 18576 | else |
13703 | eval "$ossh_varname=no" | 18577 | eval "$ossh_varname=no" |
@@ -13708,36 +18582,40 @@ fi | |||
13708 | 18582 | ||
13709 | ossh_result=`eval 'echo $'"$ossh_varname"` | 18583 | ossh_result=`eval 'echo $'"$ossh_varname"` |
13710 | if test -n "`echo $ossh_varname`"; then | 18584 | if test -n "`echo $ossh_varname`"; then |
13711 | echo "$as_me:13711: result: $ossh_result" >&5 | 18585 | echo "$as_me:$LINENO: result: $ossh_result" >&5 |
13712 | echo "${ECHO_T}$ossh_result" >&6 | 18586 | echo "${ECHO_T}$ossh_result" >&6 |
13713 | if test "x$ossh_result" = "xyes"; then | 18587 | if test "x$ossh_result" = "xyes"; then |
13714 | cat >>confdefs.h <<\EOF | 18588 | cat >>confdefs.h <<\_ACEOF |
13715 | #define HAVE_ID_IN_UTMPX 1 | 18589 | #define HAVE_ID_IN_UTMPX 1 |
13716 | EOF | 18590 | _ACEOF |
13717 | 18591 | ||
13718 | fi | 18592 | fi |
13719 | else | 18593 | else |
13720 | echo "$as_me:13720: result: no" >&5 | 18594 | echo "$as_me:$LINENO: result: no" >&5 |
13721 | echo "${ECHO_T}no" >&6 | 18595 | echo "${ECHO_T}no" >&6 |
13722 | fi | 18596 | fi |
13723 | 18597 | ||
18598 | |||
13724 | # look for field 'ut_addr' in header 'utmp.h' | 18599 | # look for field 'ut_addr' in header 'utmp.h' |
13725 | ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` | 18600 | ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` |
13726 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr | 18601 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr |
13727 | echo "$as_me:13727: checking for ut_addr field in utmp.h" >&5 | 18602 | echo "$as_me:$LINENO: checking for ut_addr field in utmp.h" >&5 |
13728 | echo $ECHO_N "checking for ut_addr field in utmp.h... $ECHO_C" >&6 | 18603 | echo $ECHO_N "checking for ut_addr field in utmp.h... $ECHO_C" >&6 |
13729 | if eval "test \"\${$ossh_varname+set}\" = set"; then | 18604 | if eval "test \"\${$ossh_varname+set}\" = set"; then |
13730 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 18605 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
13731 | else | 18606 | else |
13732 | 18607 | ||
13733 | cat >conftest.$ac_ext <<_ACEOF | 18608 | cat >conftest.$ac_ext <<_ACEOF |
13734 | #line 13734 "configure" | 18609 | /* confdefs.h. */ |
13735 | #include "confdefs.h" | 18610 | _ACEOF |
18611 | cat confdefs.h >>conftest.$ac_ext | ||
18612 | cat >>conftest.$ac_ext <<_ACEOF | ||
18613 | /* end confdefs.h. */ | ||
13736 | #include <utmp.h> | 18614 | #include <utmp.h> |
13737 | 18615 | ||
13738 | _ACEOF | 18616 | _ACEOF |
13739 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | 18617 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | |
13740 | egrep "ut_addr" >/dev/null 2>&1; then | 18618 | $EGREP "ut_addr" >/dev/null 2>&1; then |
13741 | eval "$ossh_varname=yes" | 18619 | eval "$ossh_varname=yes" |
13742 | else | 18620 | else |
13743 | eval "$ossh_varname=no" | 18621 | eval "$ossh_varname=no" |
@@ -13748,36 +18626,40 @@ fi | |||
13748 | 18626 | ||
13749 | ossh_result=`eval 'echo $'"$ossh_varname"` | 18627 | ossh_result=`eval 'echo $'"$ossh_varname"` |
13750 | if test -n "`echo $ossh_varname`"; then | 18628 | if test -n "`echo $ossh_varname`"; then |
13751 | echo "$as_me:13751: result: $ossh_result" >&5 | 18629 | echo "$as_me:$LINENO: result: $ossh_result" >&5 |
13752 | echo "${ECHO_T}$ossh_result" >&6 | 18630 | echo "${ECHO_T}$ossh_result" >&6 |
13753 | if test "x$ossh_result" = "xyes"; then | 18631 | if test "x$ossh_result" = "xyes"; then |
13754 | cat >>confdefs.h <<\EOF | 18632 | cat >>confdefs.h <<\_ACEOF |
13755 | #define HAVE_ADDR_IN_UTMP 1 | 18633 | #define HAVE_ADDR_IN_UTMP 1 |
13756 | EOF | 18634 | _ACEOF |
13757 | 18635 | ||
13758 | fi | 18636 | fi |
13759 | else | 18637 | else |
13760 | echo "$as_me:13760: result: no" >&5 | 18638 | echo "$as_me:$LINENO: result: no" >&5 |
13761 | echo "${ECHO_T}no" >&6 | 18639 | echo "${ECHO_T}no" >&6 |
13762 | fi | 18640 | fi |
13763 | 18641 | ||
18642 | |||
13764 | # look for field 'ut_addr' in header 'utmpx.h' | 18643 | # look for field 'ut_addr' in header 'utmpx.h' |
13765 | ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` | 18644 | ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` |
13766 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr | 18645 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr |
13767 | echo "$as_me:13767: checking for ut_addr field in utmpx.h" >&5 | 18646 | echo "$as_me:$LINENO: checking for ut_addr field in utmpx.h" >&5 |
13768 | echo $ECHO_N "checking for ut_addr field in utmpx.h... $ECHO_C" >&6 | 18647 | echo $ECHO_N "checking for ut_addr field in utmpx.h... $ECHO_C" >&6 |
13769 | if eval "test \"\${$ossh_varname+set}\" = set"; then | 18648 | if eval "test \"\${$ossh_varname+set}\" = set"; then |
13770 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 18649 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
13771 | else | 18650 | else |
13772 | 18651 | ||
13773 | cat >conftest.$ac_ext <<_ACEOF | 18652 | cat >conftest.$ac_ext <<_ACEOF |
13774 | #line 13774 "configure" | 18653 | /* confdefs.h. */ |
13775 | #include "confdefs.h" | 18654 | _ACEOF |
18655 | cat confdefs.h >>conftest.$ac_ext | ||
18656 | cat >>conftest.$ac_ext <<_ACEOF | ||
18657 | /* end confdefs.h. */ | ||
13776 | #include <utmpx.h> | 18658 | #include <utmpx.h> |
13777 | 18659 | ||
13778 | _ACEOF | 18660 | _ACEOF |
13779 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | 18661 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | |
13780 | egrep "ut_addr" >/dev/null 2>&1; then | 18662 | $EGREP "ut_addr" >/dev/null 2>&1; then |
13781 | eval "$ossh_varname=yes" | 18663 | eval "$ossh_varname=yes" |
13782 | else | 18664 | else |
13783 | eval "$ossh_varname=no" | 18665 | eval "$ossh_varname=no" |
@@ -13788,36 +18670,40 @@ fi | |||
13788 | 18670 | ||
13789 | ossh_result=`eval 'echo $'"$ossh_varname"` | 18671 | ossh_result=`eval 'echo $'"$ossh_varname"` |
13790 | if test -n "`echo $ossh_varname`"; then | 18672 | if test -n "`echo $ossh_varname`"; then |
13791 | echo "$as_me:13791: result: $ossh_result" >&5 | 18673 | echo "$as_me:$LINENO: result: $ossh_result" >&5 |
13792 | echo "${ECHO_T}$ossh_result" >&6 | 18674 | echo "${ECHO_T}$ossh_result" >&6 |
13793 | if test "x$ossh_result" = "xyes"; then | 18675 | if test "x$ossh_result" = "xyes"; then |
13794 | cat >>confdefs.h <<\EOF | 18676 | cat >>confdefs.h <<\_ACEOF |
13795 | #define HAVE_ADDR_IN_UTMPX 1 | 18677 | #define HAVE_ADDR_IN_UTMPX 1 |
13796 | EOF | 18678 | _ACEOF |
13797 | 18679 | ||
13798 | fi | 18680 | fi |
13799 | else | 18681 | else |
13800 | echo "$as_me:13800: result: no" >&5 | 18682 | echo "$as_me:$LINENO: result: no" >&5 |
13801 | echo "${ECHO_T}no" >&6 | 18683 | echo "${ECHO_T}no" >&6 |
13802 | fi | 18684 | fi |
13803 | 18685 | ||
18686 | |||
13804 | # look for field 'ut_addr_v6' in header 'utmp.h' | 18687 | # look for field 'ut_addr_v6' in header 'utmp.h' |
13805 | ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` | 18688 | ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` |
13806 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr_v6 | 18689 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr_v6 |
13807 | echo "$as_me:13807: checking for ut_addr_v6 field in utmp.h" >&5 | 18690 | echo "$as_me:$LINENO: checking for ut_addr_v6 field in utmp.h" >&5 |
13808 | echo $ECHO_N "checking for ut_addr_v6 field in utmp.h... $ECHO_C" >&6 | 18691 | echo $ECHO_N "checking for ut_addr_v6 field in utmp.h... $ECHO_C" >&6 |
13809 | if eval "test \"\${$ossh_varname+set}\" = set"; then | 18692 | if eval "test \"\${$ossh_varname+set}\" = set"; then |
13810 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 18693 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
13811 | else | 18694 | else |
13812 | 18695 | ||
13813 | cat >conftest.$ac_ext <<_ACEOF | 18696 | cat >conftest.$ac_ext <<_ACEOF |
13814 | #line 13814 "configure" | 18697 | /* confdefs.h. */ |
13815 | #include "confdefs.h" | 18698 | _ACEOF |
18699 | cat confdefs.h >>conftest.$ac_ext | ||
18700 | cat >>conftest.$ac_ext <<_ACEOF | ||
18701 | /* end confdefs.h. */ | ||
13816 | #include <utmp.h> | 18702 | #include <utmp.h> |
13817 | 18703 | ||
13818 | _ACEOF | 18704 | _ACEOF |
13819 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | 18705 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | |
13820 | egrep "ut_addr_v6" >/dev/null 2>&1; then | 18706 | $EGREP "ut_addr_v6" >/dev/null 2>&1; then |
13821 | eval "$ossh_varname=yes" | 18707 | eval "$ossh_varname=yes" |
13822 | else | 18708 | else |
13823 | eval "$ossh_varname=no" | 18709 | eval "$ossh_varname=no" |
@@ -13828,36 +18714,40 @@ fi | |||
13828 | 18714 | ||
13829 | ossh_result=`eval 'echo $'"$ossh_varname"` | 18715 | ossh_result=`eval 'echo $'"$ossh_varname"` |
13830 | if test -n "`echo $ossh_varname`"; then | 18716 | if test -n "`echo $ossh_varname`"; then |
13831 | echo "$as_me:13831: result: $ossh_result" >&5 | 18717 | echo "$as_me:$LINENO: result: $ossh_result" >&5 |
13832 | echo "${ECHO_T}$ossh_result" >&6 | 18718 | echo "${ECHO_T}$ossh_result" >&6 |
13833 | if test "x$ossh_result" = "xyes"; then | 18719 | if test "x$ossh_result" = "xyes"; then |
13834 | cat >>confdefs.h <<\EOF | 18720 | cat >>confdefs.h <<\_ACEOF |
13835 | #define HAVE_ADDR_V6_IN_UTMP 1 | 18721 | #define HAVE_ADDR_V6_IN_UTMP 1 |
13836 | EOF | 18722 | _ACEOF |
13837 | 18723 | ||
13838 | fi | 18724 | fi |
13839 | else | 18725 | else |
13840 | echo "$as_me:13840: result: no" >&5 | 18726 | echo "$as_me:$LINENO: result: no" >&5 |
13841 | echo "${ECHO_T}no" >&6 | 18727 | echo "${ECHO_T}no" >&6 |
13842 | fi | 18728 | fi |
13843 | 18729 | ||
18730 | |||
13844 | # look for field 'ut_addr_v6' in header 'utmpx.h' | 18731 | # look for field 'ut_addr_v6' in header 'utmpx.h' |
13845 | ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` | 18732 | ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` |
13846 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr_v6 | 18733 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr_v6 |
13847 | echo "$as_me:13847: checking for ut_addr_v6 field in utmpx.h" >&5 | 18734 | echo "$as_me:$LINENO: checking for ut_addr_v6 field in utmpx.h" >&5 |
13848 | echo $ECHO_N "checking for ut_addr_v6 field in utmpx.h... $ECHO_C" >&6 | 18735 | echo $ECHO_N "checking for ut_addr_v6 field in utmpx.h... $ECHO_C" >&6 |
13849 | if eval "test \"\${$ossh_varname+set}\" = set"; then | 18736 | if eval "test \"\${$ossh_varname+set}\" = set"; then |
13850 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 18737 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
13851 | else | 18738 | else |
13852 | 18739 | ||
13853 | cat >conftest.$ac_ext <<_ACEOF | 18740 | cat >conftest.$ac_ext <<_ACEOF |
13854 | #line 13854 "configure" | 18741 | /* confdefs.h. */ |
13855 | #include "confdefs.h" | 18742 | _ACEOF |
18743 | cat confdefs.h >>conftest.$ac_ext | ||
18744 | cat >>conftest.$ac_ext <<_ACEOF | ||
18745 | /* end confdefs.h. */ | ||
13856 | #include <utmpx.h> | 18746 | #include <utmpx.h> |
13857 | 18747 | ||
13858 | _ACEOF | 18748 | _ACEOF |
13859 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | 18749 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | |
13860 | egrep "ut_addr_v6" >/dev/null 2>&1; then | 18750 | $EGREP "ut_addr_v6" >/dev/null 2>&1; then |
13861 | eval "$ossh_varname=yes" | 18751 | eval "$ossh_varname=yes" |
13862 | else | 18752 | else |
13863 | eval "$ossh_varname=no" | 18753 | eval "$ossh_varname=no" |
@@ -13868,36 +18758,40 @@ fi | |||
13868 | 18758 | ||
13869 | ossh_result=`eval 'echo $'"$ossh_varname"` | 18759 | ossh_result=`eval 'echo $'"$ossh_varname"` |
13870 | if test -n "`echo $ossh_varname`"; then | 18760 | if test -n "`echo $ossh_varname`"; then |
13871 | echo "$as_me:13871: result: $ossh_result" >&5 | 18761 | echo "$as_me:$LINENO: result: $ossh_result" >&5 |
13872 | echo "${ECHO_T}$ossh_result" >&6 | 18762 | echo "${ECHO_T}$ossh_result" >&6 |
13873 | if test "x$ossh_result" = "xyes"; then | 18763 | if test "x$ossh_result" = "xyes"; then |
13874 | cat >>confdefs.h <<\EOF | 18764 | cat >>confdefs.h <<\_ACEOF |
13875 | #define HAVE_ADDR_V6_IN_UTMPX 1 | 18765 | #define HAVE_ADDR_V6_IN_UTMPX 1 |
13876 | EOF | 18766 | _ACEOF |
13877 | 18767 | ||
13878 | fi | 18768 | fi |
13879 | else | 18769 | else |
13880 | echo "$as_me:13880: result: no" >&5 | 18770 | echo "$as_me:$LINENO: result: no" >&5 |
13881 | echo "${ECHO_T}no" >&6 | 18771 | echo "${ECHO_T}no" >&6 |
13882 | fi | 18772 | fi |
13883 | 18773 | ||
18774 | |||
13884 | # look for field 'ut_exit' in header 'utmp.h' | 18775 | # look for field 'ut_exit' in header 'utmp.h' |
13885 | ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` | 18776 | ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` |
13886 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_exit | 18777 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_exit |
13887 | echo "$as_me:13887: checking for ut_exit field in utmp.h" >&5 | 18778 | echo "$as_me:$LINENO: checking for ut_exit field in utmp.h" >&5 |
13888 | echo $ECHO_N "checking for ut_exit field in utmp.h... $ECHO_C" >&6 | 18779 | echo $ECHO_N "checking for ut_exit field in utmp.h... $ECHO_C" >&6 |
13889 | if eval "test \"\${$ossh_varname+set}\" = set"; then | 18780 | if eval "test \"\${$ossh_varname+set}\" = set"; then |
13890 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 18781 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
13891 | else | 18782 | else |
13892 | 18783 | ||
13893 | cat >conftest.$ac_ext <<_ACEOF | 18784 | cat >conftest.$ac_ext <<_ACEOF |
13894 | #line 13894 "configure" | 18785 | /* confdefs.h. */ |
13895 | #include "confdefs.h" | 18786 | _ACEOF |
18787 | cat confdefs.h >>conftest.$ac_ext | ||
18788 | cat >>conftest.$ac_ext <<_ACEOF | ||
18789 | /* end confdefs.h. */ | ||
13896 | #include <utmp.h> | 18790 | #include <utmp.h> |
13897 | 18791 | ||
13898 | _ACEOF | 18792 | _ACEOF |
13899 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | 18793 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | |
13900 | egrep "ut_exit" >/dev/null 2>&1; then | 18794 | $EGREP "ut_exit" >/dev/null 2>&1; then |
13901 | eval "$ossh_varname=yes" | 18795 | eval "$ossh_varname=yes" |
13902 | else | 18796 | else |
13903 | eval "$ossh_varname=no" | 18797 | eval "$ossh_varname=no" |
@@ -13908,36 +18802,40 @@ fi | |||
13908 | 18802 | ||
13909 | ossh_result=`eval 'echo $'"$ossh_varname"` | 18803 | ossh_result=`eval 'echo $'"$ossh_varname"` |
13910 | if test -n "`echo $ossh_varname`"; then | 18804 | if test -n "`echo $ossh_varname`"; then |
13911 | echo "$as_me:13911: result: $ossh_result" >&5 | 18805 | echo "$as_me:$LINENO: result: $ossh_result" >&5 |
13912 | echo "${ECHO_T}$ossh_result" >&6 | 18806 | echo "${ECHO_T}$ossh_result" >&6 |
13913 | if test "x$ossh_result" = "xyes"; then | 18807 | if test "x$ossh_result" = "xyes"; then |
13914 | cat >>confdefs.h <<\EOF | 18808 | cat >>confdefs.h <<\_ACEOF |
13915 | #define HAVE_EXIT_IN_UTMP 1 | 18809 | #define HAVE_EXIT_IN_UTMP 1 |
13916 | EOF | 18810 | _ACEOF |
13917 | 18811 | ||
13918 | fi | 18812 | fi |
13919 | else | 18813 | else |
13920 | echo "$as_me:13920: result: no" >&5 | 18814 | echo "$as_me:$LINENO: result: no" >&5 |
13921 | echo "${ECHO_T}no" >&6 | 18815 | echo "${ECHO_T}no" >&6 |
13922 | fi | 18816 | fi |
13923 | 18817 | ||
18818 | |||
13924 | # look for field 'ut_time' in header 'utmp.h' | 18819 | # look for field 'ut_time' in header 'utmp.h' |
13925 | ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` | 18820 | ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` |
13926 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_time | 18821 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_time |
13927 | echo "$as_me:13927: checking for ut_time field in utmp.h" >&5 | 18822 | echo "$as_me:$LINENO: checking for ut_time field in utmp.h" >&5 |
13928 | echo $ECHO_N "checking for ut_time field in utmp.h... $ECHO_C" >&6 | 18823 | echo $ECHO_N "checking for ut_time field in utmp.h... $ECHO_C" >&6 |
13929 | if eval "test \"\${$ossh_varname+set}\" = set"; then | 18824 | if eval "test \"\${$ossh_varname+set}\" = set"; then |
13930 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 18825 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
13931 | else | 18826 | else |
13932 | 18827 | ||
13933 | cat >conftest.$ac_ext <<_ACEOF | 18828 | cat >conftest.$ac_ext <<_ACEOF |
13934 | #line 13934 "configure" | 18829 | /* confdefs.h. */ |
13935 | #include "confdefs.h" | 18830 | _ACEOF |
18831 | cat confdefs.h >>conftest.$ac_ext | ||
18832 | cat >>conftest.$ac_ext <<_ACEOF | ||
18833 | /* end confdefs.h. */ | ||
13936 | #include <utmp.h> | 18834 | #include <utmp.h> |
13937 | 18835 | ||
13938 | _ACEOF | 18836 | _ACEOF |
13939 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | 18837 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | |
13940 | egrep "ut_time" >/dev/null 2>&1; then | 18838 | $EGREP "ut_time" >/dev/null 2>&1; then |
13941 | eval "$ossh_varname=yes" | 18839 | eval "$ossh_varname=yes" |
13942 | else | 18840 | else |
13943 | eval "$ossh_varname=no" | 18841 | eval "$ossh_varname=no" |
@@ -13948,36 +18846,40 @@ fi | |||
13948 | 18846 | ||
13949 | ossh_result=`eval 'echo $'"$ossh_varname"` | 18847 | ossh_result=`eval 'echo $'"$ossh_varname"` |
13950 | if test -n "`echo $ossh_varname`"; then | 18848 | if test -n "`echo $ossh_varname`"; then |
13951 | echo "$as_me:13951: result: $ossh_result" >&5 | 18849 | echo "$as_me:$LINENO: result: $ossh_result" >&5 |
13952 | echo "${ECHO_T}$ossh_result" >&6 | 18850 | echo "${ECHO_T}$ossh_result" >&6 |
13953 | if test "x$ossh_result" = "xyes"; then | 18851 | if test "x$ossh_result" = "xyes"; then |
13954 | cat >>confdefs.h <<\EOF | 18852 | cat >>confdefs.h <<\_ACEOF |
13955 | #define HAVE_TIME_IN_UTMP 1 | 18853 | #define HAVE_TIME_IN_UTMP 1 |
13956 | EOF | 18854 | _ACEOF |
13957 | 18855 | ||
13958 | fi | 18856 | fi |
13959 | else | 18857 | else |
13960 | echo "$as_me:13960: result: no" >&5 | 18858 | echo "$as_me:$LINENO: result: no" >&5 |
13961 | echo "${ECHO_T}no" >&6 | 18859 | echo "${ECHO_T}no" >&6 |
13962 | fi | 18860 | fi |
13963 | 18861 | ||
18862 | |||
13964 | # look for field 'ut_time' in header 'utmpx.h' | 18863 | # look for field 'ut_time' in header 'utmpx.h' |
13965 | ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` | 18864 | ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` |
13966 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_time | 18865 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_time |
13967 | echo "$as_me:13967: checking for ut_time field in utmpx.h" >&5 | 18866 | echo "$as_me:$LINENO: checking for ut_time field in utmpx.h" >&5 |
13968 | echo $ECHO_N "checking for ut_time field in utmpx.h... $ECHO_C" >&6 | 18867 | echo $ECHO_N "checking for ut_time field in utmpx.h... $ECHO_C" >&6 |
13969 | if eval "test \"\${$ossh_varname+set}\" = set"; then | 18868 | if eval "test \"\${$ossh_varname+set}\" = set"; then |
13970 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 18869 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
13971 | else | 18870 | else |
13972 | 18871 | ||
13973 | cat >conftest.$ac_ext <<_ACEOF | 18872 | cat >conftest.$ac_ext <<_ACEOF |
13974 | #line 13974 "configure" | 18873 | /* confdefs.h. */ |
13975 | #include "confdefs.h" | 18874 | _ACEOF |
18875 | cat confdefs.h >>conftest.$ac_ext | ||
18876 | cat >>conftest.$ac_ext <<_ACEOF | ||
18877 | /* end confdefs.h. */ | ||
13976 | #include <utmpx.h> | 18878 | #include <utmpx.h> |
13977 | 18879 | ||
13978 | _ACEOF | 18880 | _ACEOF |
13979 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | 18881 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | |
13980 | egrep "ut_time" >/dev/null 2>&1; then | 18882 | $EGREP "ut_time" >/dev/null 2>&1; then |
13981 | eval "$ossh_varname=yes" | 18883 | eval "$ossh_varname=yes" |
13982 | else | 18884 | else |
13983 | eval "$ossh_varname=no" | 18885 | eval "$ossh_varname=no" |
@@ -13988,36 +18890,40 @@ fi | |||
13988 | 18890 | ||
13989 | ossh_result=`eval 'echo $'"$ossh_varname"` | 18891 | ossh_result=`eval 'echo $'"$ossh_varname"` |
13990 | if test -n "`echo $ossh_varname`"; then | 18892 | if test -n "`echo $ossh_varname`"; then |
13991 | echo "$as_me:13991: result: $ossh_result" >&5 | 18893 | echo "$as_me:$LINENO: result: $ossh_result" >&5 |
13992 | echo "${ECHO_T}$ossh_result" >&6 | 18894 | echo "${ECHO_T}$ossh_result" >&6 |
13993 | if test "x$ossh_result" = "xyes"; then | 18895 | if test "x$ossh_result" = "xyes"; then |
13994 | cat >>confdefs.h <<\EOF | 18896 | cat >>confdefs.h <<\_ACEOF |
13995 | #define HAVE_TIME_IN_UTMPX 1 | 18897 | #define HAVE_TIME_IN_UTMPX 1 |
13996 | EOF | 18898 | _ACEOF |
13997 | 18899 | ||
13998 | fi | 18900 | fi |
13999 | else | 18901 | else |
14000 | echo "$as_me:14000: result: no" >&5 | 18902 | echo "$as_me:$LINENO: result: no" >&5 |
14001 | echo "${ECHO_T}no" >&6 | 18903 | echo "${ECHO_T}no" >&6 |
14002 | fi | 18904 | fi |
14003 | 18905 | ||
18906 | |||
14004 | # look for field 'ut_tv' in header 'utmpx.h' | 18907 | # look for field 'ut_tv' in header 'utmpx.h' |
14005 | ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` | 18908 | ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` |
14006 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_tv | 18909 | ossh_varname="ossh_cv_$ossh_safe""_has_"ut_tv |
14007 | echo "$as_me:14007: checking for ut_tv field in utmpx.h" >&5 | 18910 | echo "$as_me:$LINENO: checking for ut_tv field in utmpx.h" >&5 |
14008 | echo $ECHO_N "checking for ut_tv field in utmpx.h... $ECHO_C" >&6 | 18911 | echo $ECHO_N "checking for ut_tv field in utmpx.h... $ECHO_C" >&6 |
14009 | if eval "test \"\${$ossh_varname+set}\" = set"; then | 18912 | if eval "test \"\${$ossh_varname+set}\" = set"; then |
14010 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 18913 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
14011 | else | 18914 | else |
14012 | 18915 | ||
14013 | cat >conftest.$ac_ext <<_ACEOF | 18916 | cat >conftest.$ac_ext <<_ACEOF |
14014 | #line 14014 "configure" | 18917 | /* confdefs.h. */ |
14015 | #include "confdefs.h" | 18918 | _ACEOF |
18919 | cat confdefs.h >>conftest.$ac_ext | ||
18920 | cat >>conftest.$ac_ext <<_ACEOF | ||
18921 | /* end confdefs.h. */ | ||
14016 | #include <utmpx.h> | 18922 | #include <utmpx.h> |
14017 | 18923 | ||
14018 | _ACEOF | 18924 | _ACEOF |
14019 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | 18925 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | |
14020 | egrep "ut_tv" >/dev/null 2>&1; then | 18926 | $EGREP "ut_tv" >/dev/null 2>&1; then |
14021 | eval "$ossh_varname=yes" | 18927 | eval "$ossh_varname=yes" |
14022 | else | 18928 | else |
14023 | eval "$ossh_varname=no" | 18929 | eval "$ossh_varname=no" |
@@ -14028,27 +18934,31 @@ fi | |||
14028 | 18934 | ||
14029 | ossh_result=`eval 'echo $'"$ossh_varname"` | 18935 | ossh_result=`eval 'echo $'"$ossh_varname"` |
14030 | if test -n "`echo $ossh_varname`"; then | 18936 | if test -n "`echo $ossh_varname`"; then |
14031 | echo "$as_me:14031: result: $ossh_result" >&5 | 18937 | echo "$as_me:$LINENO: result: $ossh_result" >&5 |
14032 | echo "${ECHO_T}$ossh_result" >&6 | 18938 | echo "${ECHO_T}$ossh_result" >&6 |
14033 | if test "x$ossh_result" = "xyes"; then | 18939 | if test "x$ossh_result" = "xyes"; then |
14034 | cat >>confdefs.h <<\EOF | 18940 | cat >>confdefs.h <<\_ACEOF |
14035 | #define HAVE_TV_IN_UTMPX 1 | 18941 | #define HAVE_TV_IN_UTMPX 1 |
14036 | EOF | 18942 | _ACEOF |
14037 | 18943 | ||
14038 | fi | 18944 | fi |
14039 | else | 18945 | else |
14040 | echo "$as_me:14040: result: no" >&5 | 18946 | echo "$as_me:$LINENO: result: no" >&5 |
14041 | echo "${ECHO_T}no" >&6 | 18947 | echo "${ECHO_T}no" >&6 |
14042 | fi | 18948 | fi |
14043 | 18949 | ||
14044 | echo "$as_me:14044: checking for struct stat.st_blksize" >&5 | 18950 | |
18951 | echo "$as_me:$LINENO: checking for struct stat.st_blksize" >&5 | ||
14045 | echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6 | 18952 | echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6 |
14046 | if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then | 18953 | if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then |
14047 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 18954 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
14048 | else | 18955 | else |
14049 | cat >conftest.$ac_ext <<_ACEOF | 18956 | cat >conftest.$ac_ext <<_ACEOF |
14050 | #line 14050 "configure" | 18957 | /* confdefs.h. */ |
14051 | #include "confdefs.h" | 18958 | _ACEOF |
18959 | cat confdefs.h >>conftest.$ac_ext | ||
18960 | cat >>conftest.$ac_ext <<_ACEOF | ||
18961 | /* end confdefs.h. */ | ||
14052 | $ac_includes_default | 18962 | $ac_includes_default |
14053 | int | 18963 | int |
14054 | main () | 18964 | main () |
@@ -14061,44 +18971,106 @@ return 0; | |||
14061 | } | 18971 | } |
14062 | _ACEOF | 18972 | _ACEOF |
14063 | rm -f conftest.$ac_objext | 18973 | rm -f conftest.$ac_objext |
14064 | if { (eval echo "$as_me:14064: \"$ac_compile\"") >&5 | 18974 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
14065 | (eval $ac_compile) 2>&5 | 18975 | (eval $ac_compile) 2>conftest.er1 |
14066 | ac_status=$? | 18976 | ac_status=$? |
14067 | echo "$as_me:14067: \$? = $ac_status" >&5 | 18977 | grep -v '^ *+' conftest.er1 >conftest.err |
18978 | rm -f conftest.er1 | ||
18979 | cat conftest.err >&5 | ||
18980 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14068 | (exit $ac_status); } && | 18981 | (exit $ac_status); } && |
14069 | { ac_try='test -s conftest.$ac_objext' | 18982 | { ac_try='test -z "$ac_c_werror_flag" |
14070 | { (eval echo "$as_me:14070: \"$ac_try\"") >&5 | 18983 | || test ! -s conftest.err' |
18984 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
18985 | (eval $ac_try) 2>&5 | ||
18986 | ac_status=$? | ||
18987 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
18988 | (exit $ac_status); }; } && | ||
18989 | { ac_try='test -s conftest.$ac_objext' | ||
18990 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14071 | (eval $ac_try) 2>&5 | 18991 | (eval $ac_try) 2>&5 |
14072 | ac_status=$? | 18992 | ac_status=$? |
14073 | echo "$as_me:14073: \$? = $ac_status" >&5 | 18993 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
14074 | (exit $ac_status); }; }; then | 18994 | (exit $ac_status); }; }; then |
14075 | ac_cv_member_struct_stat_st_blksize=yes | 18995 | ac_cv_member_struct_stat_st_blksize=yes |
14076 | else | 18996 | else |
14077 | echo "$as_me: failed program was:" >&5 | 18997 | echo "$as_me: failed program was:" >&5 |
14078 | cat conftest.$ac_ext >&5 | 18998 | sed 's/^/| /' conftest.$ac_ext >&5 |
18999 | |||
19000 | cat >conftest.$ac_ext <<_ACEOF | ||
19001 | /* confdefs.h. */ | ||
19002 | _ACEOF | ||
19003 | cat confdefs.h >>conftest.$ac_ext | ||
19004 | cat >>conftest.$ac_ext <<_ACEOF | ||
19005 | /* end confdefs.h. */ | ||
19006 | $ac_includes_default | ||
19007 | int | ||
19008 | main () | ||
19009 | { | ||
19010 | static struct stat ac_aggr; | ||
19011 | if (sizeof ac_aggr.st_blksize) | ||
19012 | return 0; | ||
19013 | ; | ||
19014 | return 0; | ||
19015 | } | ||
19016 | _ACEOF | ||
19017 | rm -f conftest.$ac_objext | ||
19018 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
19019 | (eval $ac_compile) 2>conftest.er1 | ||
19020 | ac_status=$? | ||
19021 | grep -v '^ *+' conftest.er1 >conftest.err | ||
19022 | rm -f conftest.er1 | ||
19023 | cat conftest.err >&5 | ||
19024 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19025 | (exit $ac_status); } && | ||
19026 | { ac_try='test -z "$ac_c_werror_flag" | ||
19027 | || test ! -s conftest.err' | ||
19028 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19029 | (eval $ac_try) 2>&5 | ||
19030 | ac_status=$? | ||
19031 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19032 | (exit $ac_status); }; } && | ||
19033 | { ac_try='test -s conftest.$ac_objext' | ||
19034 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19035 | (eval $ac_try) 2>&5 | ||
19036 | ac_status=$? | ||
19037 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19038 | (exit $ac_status); }; }; then | ||
19039 | ac_cv_member_struct_stat_st_blksize=yes | ||
19040 | else | ||
19041 | echo "$as_me: failed program was:" >&5 | ||
19042 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
19043 | |||
14079 | ac_cv_member_struct_stat_st_blksize=no | 19044 | ac_cv_member_struct_stat_st_blksize=no |
14080 | fi | 19045 | fi |
14081 | rm -f conftest.$ac_objext conftest.$ac_ext | 19046 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
19047 | fi | ||
19048 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14082 | fi | 19049 | fi |
14083 | echo "$as_me:14083: result: $ac_cv_member_struct_stat_st_blksize" >&5 | 19050 | echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blksize" >&5 |
14084 | echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6 | 19051 | echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6 |
14085 | if test $ac_cv_member_struct_stat_st_blksize = yes; then | 19052 | if test $ac_cv_member_struct_stat_st_blksize = yes; then |
14086 | 19053 | ||
14087 | cat >>confdefs.h <<EOF | 19054 | cat >>confdefs.h <<_ACEOF |
14088 | #define HAVE_STRUCT_STAT_ST_BLKSIZE 1 | 19055 | #define HAVE_STRUCT_STAT_ST_BLKSIZE 1 |
14089 | EOF | 19056 | _ACEOF |
19057 | |||
14090 | 19058 | ||
14091 | fi | 19059 | fi |
14092 | 19060 | ||
14093 | echo "$as_me:14093: checking for ss_family field in struct sockaddr_storage" >&5 | 19061 | |
19062 | echo "$as_me:$LINENO: checking for ss_family field in struct sockaddr_storage" >&5 | ||
14094 | echo $ECHO_N "checking for ss_family field in struct sockaddr_storage... $ECHO_C" >&6 | 19063 | echo $ECHO_N "checking for ss_family field in struct sockaddr_storage... $ECHO_C" >&6 |
14095 | if test "${ac_cv_have_ss_family_in_struct_ss+set}" = set; then | 19064 | if test "${ac_cv_have_ss_family_in_struct_ss+set}" = set; then |
14096 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 19065 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
14097 | else | 19066 | else |
14098 | 19067 | ||
14099 | cat >conftest.$ac_ext <<_ACEOF | 19068 | cat >conftest.$ac_ext <<_ACEOF |
14100 | #line 14100 "configure" | 19069 | /* confdefs.h. */ |
14101 | #include "confdefs.h" | 19070 | _ACEOF |
19071 | cat confdefs.h >>conftest.$ac_ext | ||
19072 | cat >>conftest.$ac_ext <<_ACEOF | ||
19073 | /* end confdefs.h. */ | ||
14102 | 19074 | ||
14103 | #include <sys/types.h> | 19075 | #include <sys/types.h> |
14104 | #include <sys/socket.h> | 19076 | #include <sys/socket.h> |
@@ -14112,44 +19084,58 @@ main () | |||
14112 | } | 19084 | } |
14113 | _ACEOF | 19085 | _ACEOF |
14114 | rm -f conftest.$ac_objext | 19086 | rm -f conftest.$ac_objext |
14115 | if { (eval echo "$as_me:14115: \"$ac_compile\"") >&5 | 19087 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
14116 | (eval $ac_compile) 2>&5 | 19088 | (eval $ac_compile) 2>conftest.er1 |
14117 | ac_status=$? | 19089 | ac_status=$? |
14118 | echo "$as_me:14118: \$? = $ac_status" >&5 | 19090 | grep -v '^ *+' conftest.er1 >conftest.err |
19091 | rm -f conftest.er1 | ||
19092 | cat conftest.err >&5 | ||
19093 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14119 | (exit $ac_status); } && | 19094 | (exit $ac_status); } && |
14120 | { ac_try='test -s conftest.$ac_objext' | 19095 | { ac_try='test -z "$ac_c_werror_flag" |
14121 | { (eval echo "$as_me:14121: \"$ac_try\"") >&5 | 19096 | || test ! -s conftest.err' |
19097 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19098 | (eval $ac_try) 2>&5 | ||
19099 | ac_status=$? | ||
19100 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19101 | (exit $ac_status); }; } && | ||
19102 | { ac_try='test -s conftest.$ac_objext' | ||
19103 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14122 | (eval $ac_try) 2>&5 | 19104 | (eval $ac_try) 2>&5 |
14123 | ac_status=$? | 19105 | ac_status=$? |
14124 | echo "$as_me:14124: \$? = $ac_status" >&5 | 19106 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
14125 | (exit $ac_status); }; }; then | 19107 | (exit $ac_status); }; }; then |
14126 | ac_cv_have_ss_family_in_struct_ss="yes" | 19108 | ac_cv_have_ss_family_in_struct_ss="yes" |
14127 | else | 19109 | else |
14128 | echo "$as_me: failed program was:" >&5 | 19110 | echo "$as_me: failed program was:" >&5 |
14129 | cat conftest.$ac_ext >&5 | 19111 | sed 's/^/| /' conftest.$ac_ext >&5 |
19112 | |||
14130 | ac_cv_have_ss_family_in_struct_ss="no" | 19113 | ac_cv_have_ss_family_in_struct_ss="no" |
14131 | fi | 19114 | fi |
14132 | rm -f conftest.$ac_objext conftest.$ac_ext | 19115 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
14133 | 19116 | ||
14134 | fi | 19117 | fi |
14135 | echo "$as_me:14135: result: $ac_cv_have_ss_family_in_struct_ss" >&5 | 19118 | echo "$as_me:$LINENO: result: $ac_cv_have_ss_family_in_struct_ss" >&5 |
14136 | echo "${ECHO_T}$ac_cv_have_ss_family_in_struct_ss" >&6 | 19119 | echo "${ECHO_T}$ac_cv_have_ss_family_in_struct_ss" >&6 |
14137 | if test "x$ac_cv_have_ss_family_in_struct_ss" = "xyes" ; then | 19120 | if test "x$ac_cv_have_ss_family_in_struct_ss" = "xyes" ; then |
14138 | cat >>confdefs.h <<\EOF | 19121 | cat >>confdefs.h <<\_ACEOF |
14139 | #define HAVE_SS_FAMILY_IN_SS 1 | 19122 | #define HAVE_SS_FAMILY_IN_SS 1 |
14140 | EOF | 19123 | _ACEOF |
14141 | 19124 | ||
14142 | fi | 19125 | fi |
14143 | 19126 | ||
14144 | echo "$as_me:14144: checking for __ss_family field in struct sockaddr_storage" >&5 | 19127 | echo "$as_me:$LINENO: checking for __ss_family field in struct sockaddr_storage" >&5 |
14145 | echo $ECHO_N "checking for __ss_family field in struct sockaddr_storage... $ECHO_C" >&6 | 19128 | echo $ECHO_N "checking for __ss_family field in struct sockaddr_storage... $ECHO_C" >&6 |
14146 | if test "${ac_cv_have___ss_family_in_struct_ss+set}" = set; then | 19129 | if test "${ac_cv_have___ss_family_in_struct_ss+set}" = set; then |
14147 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 19130 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
14148 | else | 19131 | else |
14149 | 19132 | ||
14150 | cat >conftest.$ac_ext <<_ACEOF | 19133 | cat >conftest.$ac_ext <<_ACEOF |
14151 | #line 14151 "configure" | 19134 | /* confdefs.h. */ |
14152 | #include "confdefs.h" | 19135 | _ACEOF |
19136 | cat confdefs.h >>conftest.$ac_ext | ||
19137 | cat >>conftest.$ac_ext <<_ACEOF | ||
19138 | /* end confdefs.h. */ | ||
14153 | 19139 | ||
14154 | #include <sys/types.h> | 19140 | #include <sys/types.h> |
14155 | #include <sys/socket.h> | 19141 | #include <sys/socket.h> |
@@ -14163,45 +19149,59 @@ main () | |||
14163 | } | 19149 | } |
14164 | _ACEOF | 19150 | _ACEOF |
14165 | rm -f conftest.$ac_objext | 19151 | rm -f conftest.$ac_objext |
14166 | if { (eval echo "$as_me:14166: \"$ac_compile\"") >&5 | 19152 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
14167 | (eval $ac_compile) 2>&5 | 19153 | (eval $ac_compile) 2>conftest.er1 |
14168 | ac_status=$? | 19154 | ac_status=$? |
14169 | echo "$as_me:14169: \$? = $ac_status" >&5 | 19155 | grep -v '^ *+' conftest.er1 >conftest.err |
19156 | rm -f conftest.er1 | ||
19157 | cat conftest.err >&5 | ||
19158 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14170 | (exit $ac_status); } && | 19159 | (exit $ac_status); } && |
14171 | { ac_try='test -s conftest.$ac_objext' | 19160 | { ac_try='test -z "$ac_c_werror_flag" |
14172 | { (eval echo "$as_me:14172: \"$ac_try\"") >&5 | 19161 | || test ! -s conftest.err' |
19162 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14173 | (eval $ac_try) 2>&5 | 19163 | (eval $ac_try) 2>&5 |
14174 | ac_status=$? | 19164 | ac_status=$? |
14175 | echo "$as_me:14175: \$? = $ac_status" >&5 | 19165 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
19166 | (exit $ac_status); }; } && | ||
19167 | { ac_try='test -s conftest.$ac_objext' | ||
19168 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19169 | (eval $ac_try) 2>&5 | ||
19170 | ac_status=$? | ||
19171 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14176 | (exit $ac_status); }; }; then | 19172 | (exit $ac_status); }; }; then |
14177 | ac_cv_have___ss_family_in_struct_ss="yes" | 19173 | ac_cv_have___ss_family_in_struct_ss="yes" |
14178 | else | 19174 | else |
14179 | echo "$as_me: failed program was:" >&5 | 19175 | echo "$as_me: failed program was:" >&5 |
14180 | cat conftest.$ac_ext >&5 | 19176 | sed 's/^/| /' conftest.$ac_ext >&5 |
19177 | |||
14181 | ac_cv_have___ss_family_in_struct_ss="no" | 19178 | ac_cv_have___ss_family_in_struct_ss="no" |
14182 | 19179 | ||
14183 | fi | 19180 | fi |
14184 | rm -f conftest.$ac_objext conftest.$ac_ext | 19181 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
14185 | 19182 | ||
14186 | fi | 19183 | fi |
14187 | echo "$as_me:14187: result: $ac_cv_have___ss_family_in_struct_ss" >&5 | 19184 | echo "$as_me:$LINENO: result: $ac_cv_have___ss_family_in_struct_ss" >&5 |
14188 | echo "${ECHO_T}$ac_cv_have___ss_family_in_struct_ss" >&6 | 19185 | echo "${ECHO_T}$ac_cv_have___ss_family_in_struct_ss" >&6 |
14189 | if test "x$ac_cv_have___ss_family_in_struct_ss" = "xyes" ; then | 19186 | if test "x$ac_cv_have___ss_family_in_struct_ss" = "xyes" ; then |
14190 | cat >>confdefs.h <<\EOF | 19187 | cat >>confdefs.h <<\_ACEOF |
14191 | #define HAVE___SS_FAMILY_IN_SS 1 | 19188 | #define HAVE___SS_FAMILY_IN_SS 1 |
14192 | EOF | 19189 | _ACEOF |
14193 | 19190 | ||
14194 | fi | 19191 | fi |
14195 | 19192 | ||
14196 | echo "$as_me:14196: checking for pw_class field in struct passwd" >&5 | 19193 | echo "$as_me:$LINENO: checking for pw_class field in struct passwd" >&5 |
14197 | echo $ECHO_N "checking for pw_class field in struct passwd... $ECHO_C" >&6 | 19194 | echo $ECHO_N "checking for pw_class field in struct passwd... $ECHO_C" >&6 |
14198 | if test "${ac_cv_have_pw_class_in_struct_passwd+set}" = set; then | 19195 | if test "${ac_cv_have_pw_class_in_struct_passwd+set}" = set; then |
14199 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 19196 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
14200 | else | 19197 | else |
14201 | 19198 | ||
14202 | cat >conftest.$ac_ext <<_ACEOF | 19199 | cat >conftest.$ac_ext <<_ACEOF |
14203 | #line 14203 "configure" | 19200 | /* confdefs.h. */ |
14204 | #include "confdefs.h" | 19201 | _ACEOF |
19202 | cat confdefs.h >>conftest.$ac_ext | ||
19203 | cat >>conftest.$ac_ext <<_ACEOF | ||
19204 | /* end confdefs.h. */ | ||
14205 | 19205 | ||
14206 | #include <pwd.h> | 19206 | #include <pwd.h> |
14207 | 19207 | ||
@@ -14214,45 +19214,59 @@ main () | |||
14214 | } | 19214 | } |
14215 | _ACEOF | 19215 | _ACEOF |
14216 | rm -f conftest.$ac_objext | 19216 | rm -f conftest.$ac_objext |
14217 | if { (eval echo "$as_me:14217: \"$ac_compile\"") >&5 | 19217 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
14218 | (eval $ac_compile) 2>&5 | 19218 | (eval $ac_compile) 2>conftest.er1 |
14219 | ac_status=$? | 19219 | ac_status=$? |
14220 | echo "$as_me:14220: \$? = $ac_status" >&5 | 19220 | grep -v '^ *+' conftest.er1 >conftest.err |
19221 | rm -f conftest.er1 | ||
19222 | cat conftest.err >&5 | ||
19223 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14221 | (exit $ac_status); } && | 19224 | (exit $ac_status); } && |
14222 | { ac_try='test -s conftest.$ac_objext' | 19225 | { ac_try='test -z "$ac_c_werror_flag" |
14223 | { (eval echo "$as_me:14223: \"$ac_try\"") >&5 | 19226 | || test ! -s conftest.err' |
19227 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19228 | (eval $ac_try) 2>&5 | ||
19229 | ac_status=$? | ||
19230 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19231 | (exit $ac_status); }; } && | ||
19232 | { ac_try='test -s conftest.$ac_objext' | ||
19233 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14224 | (eval $ac_try) 2>&5 | 19234 | (eval $ac_try) 2>&5 |
14225 | ac_status=$? | 19235 | ac_status=$? |
14226 | echo "$as_me:14226: \$? = $ac_status" >&5 | 19236 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
14227 | (exit $ac_status); }; }; then | 19237 | (exit $ac_status); }; }; then |
14228 | ac_cv_have_pw_class_in_struct_passwd="yes" | 19238 | ac_cv_have_pw_class_in_struct_passwd="yes" |
14229 | else | 19239 | else |
14230 | echo "$as_me: failed program was:" >&5 | 19240 | echo "$as_me: failed program was:" >&5 |
14231 | cat conftest.$ac_ext >&5 | 19241 | sed 's/^/| /' conftest.$ac_ext >&5 |
19242 | |||
14232 | ac_cv_have_pw_class_in_struct_passwd="no" | 19243 | ac_cv_have_pw_class_in_struct_passwd="no" |
14233 | 19244 | ||
14234 | fi | 19245 | fi |
14235 | rm -f conftest.$ac_objext conftest.$ac_ext | 19246 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
14236 | 19247 | ||
14237 | fi | 19248 | fi |
14238 | echo "$as_me:14238: result: $ac_cv_have_pw_class_in_struct_passwd" >&5 | 19249 | echo "$as_me:$LINENO: result: $ac_cv_have_pw_class_in_struct_passwd" >&5 |
14239 | echo "${ECHO_T}$ac_cv_have_pw_class_in_struct_passwd" >&6 | 19250 | echo "${ECHO_T}$ac_cv_have_pw_class_in_struct_passwd" >&6 |
14240 | if test "x$ac_cv_have_pw_class_in_struct_passwd" = "xyes" ; then | 19251 | if test "x$ac_cv_have_pw_class_in_struct_passwd" = "xyes" ; then |
14241 | cat >>confdefs.h <<\EOF | 19252 | cat >>confdefs.h <<\_ACEOF |
14242 | #define HAVE_PW_CLASS_IN_PASSWD 1 | 19253 | #define HAVE_PW_CLASS_IN_PASSWD 1 |
14243 | EOF | 19254 | _ACEOF |
14244 | 19255 | ||
14245 | fi | 19256 | fi |
14246 | 19257 | ||
14247 | echo "$as_me:14247: checking for pw_expire field in struct passwd" >&5 | 19258 | echo "$as_me:$LINENO: checking for pw_expire field in struct passwd" >&5 |
14248 | echo $ECHO_N "checking for pw_expire field in struct passwd... $ECHO_C" >&6 | 19259 | echo $ECHO_N "checking for pw_expire field in struct passwd... $ECHO_C" >&6 |
14249 | if test "${ac_cv_have_pw_expire_in_struct_passwd+set}" = set; then | 19260 | if test "${ac_cv_have_pw_expire_in_struct_passwd+set}" = set; then |
14250 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 19261 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
14251 | else | 19262 | else |
14252 | 19263 | ||
14253 | cat >conftest.$ac_ext <<_ACEOF | 19264 | cat >conftest.$ac_ext <<_ACEOF |
14254 | #line 14254 "configure" | 19265 | /* confdefs.h. */ |
14255 | #include "confdefs.h" | 19266 | _ACEOF |
19267 | cat confdefs.h >>conftest.$ac_ext | ||
19268 | cat >>conftest.$ac_ext <<_ACEOF | ||
19269 | /* end confdefs.h. */ | ||
14256 | 19270 | ||
14257 | #include <pwd.h> | 19271 | #include <pwd.h> |
14258 | 19272 | ||
@@ -14265,45 +19279,59 @@ main () | |||
14265 | } | 19279 | } |
14266 | _ACEOF | 19280 | _ACEOF |
14267 | rm -f conftest.$ac_objext | 19281 | rm -f conftest.$ac_objext |
14268 | if { (eval echo "$as_me:14268: \"$ac_compile\"") >&5 | 19282 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
14269 | (eval $ac_compile) 2>&5 | 19283 | (eval $ac_compile) 2>conftest.er1 |
14270 | ac_status=$? | 19284 | ac_status=$? |
14271 | echo "$as_me:14271: \$? = $ac_status" >&5 | 19285 | grep -v '^ *+' conftest.er1 >conftest.err |
19286 | rm -f conftest.er1 | ||
19287 | cat conftest.err >&5 | ||
19288 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14272 | (exit $ac_status); } && | 19289 | (exit $ac_status); } && |
14273 | { ac_try='test -s conftest.$ac_objext' | 19290 | { ac_try='test -z "$ac_c_werror_flag" |
14274 | { (eval echo "$as_me:14274: \"$ac_try\"") >&5 | 19291 | || test ! -s conftest.err' |
19292 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19293 | (eval $ac_try) 2>&5 | ||
19294 | ac_status=$? | ||
19295 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19296 | (exit $ac_status); }; } && | ||
19297 | { ac_try='test -s conftest.$ac_objext' | ||
19298 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14275 | (eval $ac_try) 2>&5 | 19299 | (eval $ac_try) 2>&5 |
14276 | ac_status=$? | 19300 | ac_status=$? |
14277 | echo "$as_me:14277: \$? = $ac_status" >&5 | 19301 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
14278 | (exit $ac_status); }; }; then | 19302 | (exit $ac_status); }; }; then |
14279 | ac_cv_have_pw_expire_in_struct_passwd="yes" | 19303 | ac_cv_have_pw_expire_in_struct_passwd="yes" |
14280 | else | 19304 | else |
14281 | echo "$as_me: failed program was:" >&5 | 19305 | echo "$as_me: failed program was:" >&5 |
14282 | cat conftest.$ac_ext >&5 | 19306 | sed 's/^/| /' conftest.$ac_ext >&5 |
19307 | |||
14283 | ac_cv_have_pw_expire_in_struct_passwd="no" | 19308 | ac_cv_have_pw_expire_in_struct_passwd="no" |
14284 | 19309 | ||
14285 | fi | 19310 | fi |
14286 | rm -f conftest.$ac_objext conftest.$ac_ext | 19311 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
14287 | 19312 | ||
14288 | fi | 19313 | fi |
14289 | echo "$as_me:14289: result: $ac_cv_have_pw_expire_in_struct_passwd" >&5 | 19314 | echo "$as_me:$LINENO: result: $ac_cv_have_pw_expire_in_struct_passwd" >&5 |
14290 | echo "${ECHO_T}$ac_cv_have_pw_expire_in_struct_passwd" >&6 | 19315 | echo "${ECHO_T}$ac_cv_have_pw_expire_in_struct_passwd" >&6 |
14291 | if test "x$ac_cv_have_pw_expire_in_struct_passwd" = "xyes" ; then | 19316 | if test "x$ac_cv_have_pw_expire_in_struct_passwd" = "xyes" ; then |
14292 | cat >>confdefs.h <<\EOF | 19317 | cat >>confdefs.h <<\_ACEOF |
14293 | #define HAVE_PW_EXPIRE_IN_PASSWD 1 | 19318 | #define HAVE_PW_EXPIRE_IN_PASSWD 1 |
14294 | EOF | 19319 | _ACEOF |
14295 | 19320 | ||
14296 | fi | 19321 | fi |
14297 | 19322 | ||
14298 | echo "$as_me:14298: checking for pw_change field in struct passwd" >&5 | 19323 | echo "$as_me:$LINENO: checking for pw_change field in struct passwd" >&5 |
14299 | echo $ECHO_N "checking for pw_change field in struct passwd... $ECHO_C" >&6 | 19324 | echo $ECHO_N "checking for pw_change field in struct passwd... $ECHO_C" >&6 |
14300 | if test "${ac_cv_have_pw_change_in_struct_passwd+set}" = set; then | 19325 | if test "${ac_cv_have_pw_change_in_struct_passwd+set}" = set; then |
14301 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 19326 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
14302 | else | 19327 | else |
14303 | 19328 | ||
14304 | cat >conftest.$ac_ext <<_ACEOF | 19329 | cat >conftest.$ac_ext <<_ACEOF |
14305 | #line 14305 "configure" | 19330 | /* confdefs.h. */ |
14306 | #include "confdefs.h" | 19331 | _ACEOF |
19332 | cat confdefs.h >>conftest.$ac_ext | ||
19333 | cat >>conftest.$ac_ext <<_ACEOF | ||
19334 | /* end confdefs.h. */ | ||
14307 | 19335 | ||
14308 | #include <pwd.h> | 19336 | #include <pwd.h> |
14309 | 19337 | ||
@@ -14316,50 +19344,66 @@ main () | |||
14316 | } | 19344 | } |
14317 | _ACEOF | 19345 | _ACEOF |
14318 | rm -f conftest.$ac_objext | 19346 | rm -f conftest.$ac_objext |
14319 | if { (eval echo "$as_me:14319: \"$ac_compile\"") >&5 | 19347 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
14320 | (eval $ac_compile) 2>&5 | 19348 | (eval $ac_compile) 2>conftest.er1 |
14321 | ac_status=$? | 19349 | ac_status=$? |
14322 | echo "$as_me:14322: \$? = $ac_status" >&5 | 19350 | grep -v '^ *+' conftest.er1 >conftest.err |
19351 | rm -f conftest.er1 | ||
19352 | cat conftest.err >&5 | ||
19353 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14323 | (exit $ac_status); } && | 19354 | (exit $ac_status); } && |
14324 | { ac_try='test -s conftest.$ac_objext' | 19355 | { ac_try='test -z "$ac_c_werror_flag" |
14325 | { (eval echo "$as_me:14325: \"$ac_try\"") >&5 | 19356 | || test ! -s conftest.err' |
19357 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14326 | (eval $ac_try) 2>&5 | 19358 | (eval $ac_try) 2>&5 |
14327 | ac_status=$? | 19359 | ac_status=$? |
14328 | echo "$as_me:14328: \$? = $ac_status" >&5 | 19360 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
19361 | (exit $ac_status); }; } && | ||
19362 | { ac_try='test -s conftest.$ac_objext' | ||
19363 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19364 | (eval $ac_try) 2>&5 | ||
19365 | ac_status=$? | ||
19366 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14329 | (exit $ac_status); }; }; then | 19367 | (exit $ac_status); }; }; then |
14330 | ac_cv_have_pw_change_in_struct_passwd="yes" | 19368 | ac_cv_have_pw_change_in_struct_passwd="yes" |
14331 | else | 19369 | else |
14332 | echo "$as_me: failed program was:" >&5 | 19370 | echo "$as_me: failed program was:" >&5 |
14333 | cat conftest.$ac_ext >&5 | 19371 | sed 's/^/| /' conftest.$ac_ext >&5 |
19372 | |||
14334 | ac_cv_have_pw_change_in_struct_passwd="no" | 19373 | ac_cv_have_pw_change_in_struct_passwd="no" |
14335 | 19374 | ||
14336 | fi | 19375 | fi |
14337 | rm -f conftest.$ac_objext conftest.$ac_ext | 19376 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
14338 | 19377 | ||
14339 | fi | 19378 | fi |
14340 | echo "$as_me:14340: result: $ac_cv_have_pw_change_in_struct_passwd" >&5 | 19379 | echo "$as_me:$LINENO: result: $ac_cv_have_pw_change_in_struct_passwd" >&5 |
14341 | echo "${ECHO_T}$ac_cv_have_pw_change_in_struct_passwd" >&6 | 19380 | echo "${ECHO_T}$ac_cv_have_pw_change_in_struct_passwd" >&6 |
14342 | if test "x$ac_cv_have_pw_change_in_struct_passwd" = "xyes" ; then | 19381 | if test "x$ac_cv_have_pw_change_in_struct_passwd" = "xyes" ; then |
14343 | cat >>confdefs.h <<\EOF | 19382 | cat >>confdefs.h <<\_ACEOF |
14344 | #define HAVE_PW_CHANGE_IN_PASSWD 1 | 19383 | #define HAVE_PW_CHANGE_IN_PASSWD 1 |
14345 | EOF | 19384 | _ACEOF |
14346 | 19385 | ||
14347 | fi | 19386 | fi |
14348 | 19387 | ||
14349 | echo "$as_me:14349: checking for msg_accrights field in struct msghdr" >&5 | 19388 | echo "$as_me:$LINENO: checking for msg_accrights field in struct msghdr" >&5 |
14350 | echo $ECHO_N "checking for msg_accrights field in struct msghdr... $ECHO_C" >&6 | 19389 | echo $ECHO_N "checking for msg_accrights field in struct msghdr... $ECHO_C" >&6 |
14351 | if test "${ac_cv_have_accrights_in_msghdr+set}" = set; then | 19390 | if test "${ac_cv_have_accrights_in_msghdr+set}" = set; then |
14352 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 19391 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
14353 | else | 19392 | else |
14354 | 19393 | ||
14355 | if test "$cross_compiling" = yes; then | 19394 | if test "$cross_compiling" = yes; then |
14356 | { { echo "$as_me:14356: error: cannot run test program while cross compiling" >&5 | 19395 | { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
14357 | echo "$as_me: error: cannot run test program while cross compiling" >&2;} | 19396 | See \`config.log' for more details." >&5 |
19397 | echo "$as_me: error: cannot run test program while cross compiling | ||
19398 | See \`config.log' for more details." >&2;} | ||
14358 | { (exit 1); exit 1; }; } | 19399 | { (exit 1); exit 1; }; } |
14359 | else | 19400 | else |
14360 | cat >conftest.$ac_ext <<_ACEOF | 19401 | cat >conftest.$ac_ext <<_ACEOF |
14361 | #line 14361 "configure" | 19402 | /* confdefs.h. */ |
14362 | #include "confdefs.h" | 19403 | _ACEOF |
19404 | cat confdefs.h >>conftest.$ac_ext | ||
19405 | cat >>conftest.$ac_ext <<_ACEOF | ||
19406 | /* end confdefs.h. */ | ||
14363 | 19407 | ||
14364 | #include <sys/types.h> | 19408 | #include <sys/types.h> |
14365 | #include <sys/socket.h> | 19409 | #include <sys/socket.h> |
@@ -14375,51 +19419,58 @@ exit(0); | |||
14375 | 19419 | ||
14376 | _ACEOF | 19420 | _ACEOF |
14377 | rm -f conftest$ac_exeext | 19421 | rm -f conftest$ac_exeext |
14378 | if { (eval echo "$as_me:14378: \"$ac_link\"") >&5 | 19422 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
14379 | (eval $ac_link) 2>&5 | 19423 | (eval $ac_link) 2>&5 |
14380 | ac_status=$? | 19424 | ac_status=$? |
14381 | echo "$as_me:14381: \$? = $ac_status" >&5 | 19425 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
14382 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | 19426 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
14383 | { (eval echo "$as_me:14383: \"$ac_try\"") >&5 | 19427 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
14384 | (eval $ac_try) 2>&5 | 19428 | (eval $ac_try) 2>&5 |
14385 | ac_status=$? | 19429 | ac_status=$? |
14386 | echo "$as_me:14386: \$? = $ac_status" >&5 | 19430 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
14387 | (exit $ac_status); }; }; then | 19431 | (exit $ac_status); }; }; then |
14388 | ac_cv_have_accrights_in_msghdr="yes" | 19432 | ac_cv_have_accrights_in_msghdr="yes" |
14389 | else | 19433 | else |
14390 | echo "$as_me: program exited with status $ac_status" >&5 | 19434 | echo "$as_me: program exited with status $ac_status" >&5 |
14391 | echo "$as_me: failed program was:" >&5 | 19435 | echo "$as_me: failed program was:" >&5 |
14392 | cat conftest.$ac_ext >&5 | 19436 | sed 's/^/| /' conftest.$ac_ext >&5 |
19437 | |||
19438 | ( exit $ac_status ) | ||
14393 | ac_cv_have_accrights_in_msghdr="no" | 19439 | ac_cv_have_accrights_in_msghdr="no" |
14394 | 19440 | ||
14395 | fi | 19441 | fi |
14396 | rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | 19442 | rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext |
14397 | fi | 19443 | fi |
14398 | 19444 | ||
14399 | fi | 19445 | fi |
14400 | echo "$as_me:14400: result: $ac_cv_have_accrights_in_msghdr" >&5 | 19446 | echo "$as_me:$LINENO: result: $ac_cv_have_accrights_in_msghdr" >&5 |
14401 | echo "${ECHO_T}$ac_cv_have_accrights_in_msghdr" >&6 | 19447 | echo "${ECHO_T}$ac_cv_have_accrights_in_msghdr" >&6 |
14402 | if test "x$ac_cv_have_accrights_in_msghdr" = "xyes" ; then | 19448 | if test "x$ac_cv_have_accrights_in_msghdr" = "xyes" ; then |
14403 | cat >>confdefs.h <<\EOF | 19449 | cat >>confdefs.h <<\_ACEOF |
14404 | #define HAVE_ACCRIGHTS_IN_MSGHDR 1 | 19450 | #define HAVE_ACCRIGHTS_IN_MSGHDR 1 |
14405 | EOF | 19451 | _ACEOF |
14406 | 19452 | ||
14407 | fi | 19453 | fi |
14408 | 19454 | ||
14409 | echo "$as_me:14409: checking for msg_control field in struct msghdr" >&5 | 19455 | echo "$as_me:$LINENO: checking for msg_control field in struct msghdr" >&5 |
14410 | echo $ECHO_N "checking for msg_control field in struct msghdr... $ECHO_C" >&6 | 19456 | echo $ECHO_N "checking for msg_control field in struct msghdr... $ECHO_C" >&6 |
14411 | if test "${ac_cv_have_control_in_msghdr+set}" = set; then | 19457 | if test "${ac_cv_have_control_in_msghdr+set}" = set; then |
14412 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 19458 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
14413 | else | 19459 | else |
14414 | 19460 | ||
14415 | if test "$cross_compiling" = yes; then | 19461 | if test "$cross_compiling" = yes; then |
14416 | { { echo "$as_me:14416: error: cannot run test program while cross compiling" >&5 | 19462 | { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling |
14417 | echo "$as_me: error: cannot run test program while cross compiling" >&2;} | 19463 | See \`config.log' for more details." >&5 |
19464 | echo "$as_me: error: cannot run test program while cross compiling | ||
19465 | See \`config.log' for more details." >&2;} | ||
14418 | { (exit 1); exit 1; }; } | 19466 | { (exit 1); exit 1; }; } |
14419 | else | 19467 | else |
14420 | cat >conftest.$ac_ext <<_ACEOF | 19468 | cat >conftest.$ac_ext <<_ACEOF |
14421 | #line 14421 "configure" | 19469 | /* confdefs.h. */ |
14422 | #include "confdefs.h" | 19470 | _ACEOF |
19471 | cat confdefs.h >>conftest.$ac_ext | ||
19472 | cat >>conftest.$ac_ext <<_ACEOF | ||
19473 | /* end confdefs.h. */ | ||
14423 | 19474 | ||
14424 | #include <sys/types.h> | 19475 | #include <sys/types.h> |
14425 | #include <sys/socket.h> | 19476 | #include <sys/socket.h> |
@@ -14435,46 +19486,51 @@ exit(0); | |||
14435 | 19486 | ||
14436 | _ACEOF | 19487 | _ACEOF |
14437 | rm -f conftest$ac_exeext | 19488 | rm -f conftest$ac_exeext |
14438 | if { (eval echo "$as_me:14438: \"$ac_link\"") >&5 | 19489 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
14439 | (eval $ac_link) 2>&5 | 19490 | (eval $ac_link) 2>&5 |
14440 | ac_status=$? | 19491 | ac_status=$? |
14441 | echo "$as_me:14441: \$? = $ac_status" >&5 | 19492 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
14442 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | 19493 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
14443 | { (eval echo "$as_me:14443: \"$ac_try\"") >&5 | 19494 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
14444 | (eval $ac_try) 2>&5 | 19495 | (eval $ac_try) 2>&5 |
14445 | ac_status=$? | 19496 | ac_status=$? |
14446 | echo "$as_me:14446: \$? = $ac_status" >&5 | 19497 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
14447 | (exit $ac_status); }; }; then | 19498 | (exit $ac_status); }; }; then |
14448 | ac_cv_have_control_in_msghdr="yes" | 19499 | ac_cv_have_control_in_msghdr="yes" |
14449 | else | 19500 | else |
14450 | echo "$as_me: program exited with status $ac_status" >&5 | 19501 | echo "$as_me: program exited with status $ac_status" >&5 |
14451 | echo "$as_me: failed program was:" >&5 | 19502 | echo "$as_me: failed program was:" >&5 |
14452 | cat conftest.$ac_ext >&5 | 19503 | sed 's/^/| /' conftest.$ac_ext >&5 |
19504 | |||
19505 | ( exit $ac_status ) | ||
14453 | ac_cv_have_control_in_msghdr="no" | 19506 | ac_cv_have_control_in_msghdr="no" |
14454 | 19507 | ||
14455 | fi | 19508 | fi |
14456 | rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | 19509 | rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext |
14457 | fi | 19510 | fi |
14458 | 19511 | ||
14459 | fi | 19512 | fi |
14460 | echo "$as_me:14460: result: $ac_cv_have_control_in_msghdr" >&5 | 19513 | echo "$as_me:$LINENO: result: $ac_cv_have_control_in_msghdr" >&5 |
14461 | echo "${ECHO_T}$ac_cv_have_control_in_msghdr" >&6 | 19514 | echo "${ECHO_T}$ac_cv_have_control_in_msghdr" >&6 |
14462 | if test "x$ac_cv_have_control_in_msghdr" = "xyes" ; then | 19515 | if test "x$ac_cv_have_control_in_msghdr" = "xyes" ; then |
14463 | cat >>confdefs.h <<\EOF | 19516 | cat >>confdefs.h <<\_ACEOF |
14464 | #define HAVE_CONTROL_IN_MSGHDR 1 | 19517 | #define HAVE_CONTROL_IN_MSGHDR 1 |
14465 | EOF | 19518 | _ACEOF |
14466 | 19519 | ||
14467 | fi | 19520 | fi |
14468 | 19521 | ||
14469 | echo "$as_me:14469: checking if libc defines __progname" >&5 | 19522 | echo "$as_me:$LINENO: checking if libc defines __progname" >&5 |
14470 | echo $ECHO_N "checking if libc defines __progname... $ECHO_C" >&6 | 19523 | echo $ECHO_N "checking if libc defines __progname... $ECHO_C" >&6 |
14471 | if test "${ac_cv_libc_defines___progname+set}" = set; then | 19524 | if test "${ac_cv_libc_defines___progname+set}" = set; then |
14472 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 19525 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
14473 | else | 19526 | else |
14474 | 19527 | ||
14475 | cat >conftest.$ac_ext <<_ACEOF | 19528 | cat >conftest.$ac_ext <<_ACEOF |
14476 | #line 14476 "configure" | 19529 | /* confdefs.h. */ |
14477 | #include "confdefs.h" | 19530 | _ACEOF |
19531 | cat confdefs.h >>conftest.$ac_ext | ||
19532 | cat >>conftest.$ac_ext <<_ACEOF | ||
19533 | /* end confdefs.h. */ | ||
14478 | 19534 | ||
14479 | int | 19535 | int |
14480 | main () | 19536 | main () |
@@ -14485,45 +19541,60 @@ main () | |||
14485 | } | 19541 | } |
14486 | _ACEOF | 19542 | _ACEOF |
14487 | rm -f conftest.$ac_objext conftest$ac_exeext | 19543 | rm -f conftest.$ac_objext conftest$ac_exeext |
14488 | if { (eval echo "$as_me:14488: \"$ac_link\"") >&5 | 19544 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
14489 | (eval $ac_link) 2>&5 | 19545 | (eval $ac_link) 2>conftest.er1 |
14490 | ac_status=$? | 19546 | ac_status=$? |
14491 | echo "$as_me:14491: \$? = $ac_status" >&5 | 19547 | grep -v '^ *+' conftest.er1 >conftest.err |
19548 | rm -f conftest.er1 | ||
19549 | cat conftest.err >&5 | ||
19550 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14492 | (exit $ac_status); } && | 19551 | (exit $ac_status); } && |
14493 | { ac_try='test -s conftest$ac_exeext' | 19552 | { ac_try='test -z "$ac_c_werror_flag" |
14494 | { (eval echo "$as_me:14494: \"$ac_try\"") >&5 | 19553 | || test ! -s conftest.err' |
19554 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19555 | (eval $ac_try) 2>&5 | ||
19556 | ac_status=$? | ||
19557 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19558 | (exit $ac_status); }; } && | ||
19559 | { ac_try='test -s conftest$ac_exeext' | ||
19560 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14495 | (eval $ac_try) 2>&5 | 19561 | (eval $ac_try) 2>&5 |
14496 | ac_status=$? | 19562 | ac_status=$? |
14497 | echo "$as_me:14497: \$? = $ac_status" >&5 | 19563 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
14498 | (exit $ac_status); }; }; then | 19564 | (exit $ac_status); }; }; then |
14499 | ac_cv_libc_defines___progname="yes" | 19565 | ac_cv_libc_defines___progname="yes" |
14500 | else | 19566 | else |
14501 | echo "$as_me: failed program was:" >&5 | 19567 | echo "$as_me: failed program was:" >&5 |
14502 | cat conftest.$ac_ext >&5 | 19568 | sed 's/^/| /' conftest.$ac_ext >&5 |
19569 | |||
14503 | ac_cv_libc_defines___progname="no" | 19570 | ac_cv_libc_defines___progname="no" |
14504 | 19571 | ||
14505 | fi | 19572 | fi |
14506 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 19573 | rm -f conftest.err conftest.$ac_objext \ |
19574 | conftest$ac_exeext conftest.$ac_ext | ||
14507 | 19575 | ||
14508 | fi | 19576 | fi |
14509 | echo "$as_me:14509: result: $ac_cv_libc_defines___progname" >&5 | 19577 | echo "$as_me:$LINENO: result: $ac_cv_libc_defines___progname" >&5 |
14510 | echo "${ECHO_T}$ac_cv_libc_defines___progname" >&6 | 19578 | echo "${ECHO_T}$ac_cv_libc_defines___progname" >&6 |
14511 | if test "x$ac_cv_libc_defines___progname" = "xyes" ; then | 19579 | if test "x$ac_cv_libc_defines___progname" = "xyes" ; then |
14512 | cat >>confdefs.h <<\EOF | 19580 | cat >>confdefs.h <<\_ACEOF |
14513 | #define HAVE___PROGNAME 1 | 19581 | #define HAVE___PROGNAME 1 |
14514 | EOF | 19582 | _ACEOF |
14515 | 19583 | ||
14516 | fi | 19584 | fi |
14517 | 19585 | ||
14518 | echo "$as_me:14518: checking whether $CC implements __FUNCTION__" >&5 | 19586 | echo "$as_me:$LINENO: checking whether $CC implements __FUNCTION__" >&5 |
14519 | echo $ECHO_N "checking whether $CC implements __FUNCTION__... $ECHO_C" >&6 | 19587 | echo $ECHO_N "checking whether $CC implements __FUNCTION__... $ECHO_C" >&6 |
14520 | if test "${ac_cv_cc_implements___FUNCTION__+set}" = set; then | 19588 | if test "${ac_cv_cc_implements___FUNCTION__+set}" = set; then |
14521 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 19589 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
14522 | else | 19590 | else |
14523 | 19591 | ||
14524 | cat >conftest.$ac_ext <<_ACEOF | 19592 | cat >conftest.$ac_ext <<_ACEOF |
14525 | #line 14525 "configure" | 19593 | /* confdefs.h. */ |
14526 | #include "confdefs.h" | 19594 | _ACEOF |
19595 | cat confdefs.h >>conftest.$ac_ext | ||
19596 | cat >>conftest.$ac_ext <<_ACEOF | ||
19597 | /* end confdefs.h. */ | ||
14527 | 19598 | ||
14528 | #include <stdio.h> | 19599 | #include <stdio.h> |
14529 | 19600 | ||
@@ -14536,45 +19607,60 @@ main () | |||
14536 | } | 19607 | } |
14537 | _ACEOF | 19608 | _ACEOF |
14538 | rm -f conftest.$ac_objext conftest$ac_exeext | 19609 | rm -f conftest.$ac_objext conftest$ac_exeext |
14539 | if { (eval echo "$as_me:14539: \"$ac_link\"") >&5 | 19610 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
14540 | (eval $ac_link) 2>&5 | 19611 | (eval $ac_link) 2>conftest.er1 |
14541 | ac_status=$? | 19612 | ac_status=$? |
14542 | echo "$as_me:14542: \$? = $ac_status" >&5 | 19613 | grep -v '^ *+' conftest.er1 >conftest.err |
19614 | rm -f conftest.er1 | ||
19615 | cat conftest.err >&5 | ||
19616 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14543 | (exit $ac_status); } && | 19617 | (exit $ac_status); } && |
14544 | { ac_try='test -s conftest$ac_exeext' | 19618 | { ac_try='test -z "$ac_c_werror_flag" |
14545 | { (eval echo "$as_me:14545: \"$ac_try\"") >&5 | 19619 | || test ! -s conftest.err' |
19620 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14546 | (eval $ac_try) 2>&5 | 19621 | (eval $ac_try) 2>&5 |
14547 | ac_status=$? | 19622 | ac_status=$? |
14548 | echo "$as_me:14548: \$? = $ac_status" >&5 | 19623 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
19624 | (exit $ac_status); }; } && | ||
19625 | { ac_try='test -s conftest$ac_exeext' | ||
19626 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19627 | (eval $ac_try) 2>&5 | ||
19628 | ac_status=$? | ||
19629 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14549 | (exit $ac_status); }; }; then | 19630 | (exit $ac_status); }; }; then |
14550 | ac_cv_cc_implements___FUNCTION__="yes" | 19631 | ac_cv_cc_implements___FUNCTION__="yes" |
14551 | else | 19632 | else |
14552 | echo "$as_me: failed program was:" >&5 | 19633 | echo "$as_me: failed program was:" >&5 |
14553 | cat conftest.$ac_ext >&5 | 19634 | sed 's/^/| /' conftest.$ac_ext >&5 |
19635 | |||
14554 | ac_cv_cc_implements___FUNCTION__="no" | 19636 | ac_cv_cc_implements___FUNCTION__="no" |
14555 | 19637 | ||
14556 | fi | 19638 | fi |
14557 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 19639 | rm -f conftest.err conftest.$ac_objext \ |
19640 | conftest$ac_exeext conftest.$ac_ext | ||
14558 | 19641 | ||
14559 | fi | 19642 | fi |
14560 | echo "$as_me:14560: result: $ac_cv_cc_implements___FUNCTION__" >&5 | 19643 | echo "$as_me:$LINENO: result: $ac_cv_cc_implements___FUNCTION__" >&5 |
14561 | echo "${ECHO_T}$ac_cv_cc_implements___FUNCTION__" >&6 | 19644 | echo "${ECHO_T}$ac_cv_cc_implements___FUNCTION__" >&6 |
14562 | if test "x$ac_cv_cc_implements___FUNCTION__" = "xyes" ; then | 19645 | if test "x$ac_cv_cc_implements___FUNCTION__" = "xyes" ; then |
14563 | cat >>confdefs.h <<\EOF | 19646 | cat >>confdefs.h <<\_ACEOF |
14564 | #define HAVE___FUNCTION__ 1 | 19647 | #define HAVE___FUNCTION__ 1 |
14565 | EOF | 19648 | _ACEOF |
14566 | 19649 | ||
14567 | fi | 19650 | fi |
14568 | 19651 | ||
14569 | echo "$as_me:14569: checking whether $CC implements __func__" >&5 | 19652 | echo "$as_me:$LINENO: checking whether $CC implements __func__" >&5 |
14570 | echo $ECHO_N "checking whether $CC implements __func__... $ECHO_C" >&6 | 19653 | echo $ECHO_N "checking whether $CC implements __func__... $ECHO_C" >&6 |
14571 | if test "${ac_cv_cc_implements___func__+set}" = set; then | 19654 | if test "${ac_cv_cc_implements___func__+set}" = set; then |
14572 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 19655 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
14573 | else | 19656 | else |
14574 | 19657 | ||
14575 | cat >conftest.$ac_ext <<_ACEOF | 19658 | cat >conftest.$ac_ext <<_ACEOF |
14576 | #line 14576 "configure" | 19659 | /* confdefs.h. */ |
14577 | #include "confdefs.h" | 19660 | _ACEOF |
19661 | cat confdefs.h >>conftest.$ac_ext | ||
19662 | cat >>conftest.$ac_ext <<_ACEOF | ||
19663 | /* end confdefs.h. */ | ||
14578 | 19664 | ||
14579 | #include <stdio.h> | 19665 | #include <stdio.h> |
14580 | 19666 | ||
@@ -14587,45 +19673,60 @@ main () | |||
14587 | } | 19673 | } |
14588 | _ACEOF | 19674 | _ACEOF |
14589 | rm -f conftest.$ac_objext conftest$ac_exeext | 19675 | rm -f conftest.$ac_objext conftest$ac_exeext |
14590 | if { (eval echo "$as_me:14590: \"$ac_link\"") >&5 | 19676 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
14591 | (eval $ac_link) 2>&5 | 19677 | (eval $ac_link) 2>conftest.er1 |
14592 | ac_status=$? | 19678 | ac_status=$? |
14593 | echo "$as_me:14593: \$? = $ac_status" >&5 | 19679 | grep -v '^ *+' conftest.er1 >conftest.err |
19680 | rm -f conftest.er1 | ||
19681 | cat conftest.err >&5 | ||
19682 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14594 | (exit $ac_status); } && | 19683 | (exit $ac_status); } && |
14595 | { ac_try='test -s conftest$ac_exeext' | 19684 | { ac_try='test -z "$ac_c_werror_flag" |
14596 | { (eval echo "$as_me:14596: \"$ac_try\"") >&5 | 19685 | || test ! -s conftest.err' |
19686 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19687 | (eval $ac_try) 2>&5 | ||
19688 | ac_status=$? | ||
19689 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19690 | (exit $ac_status); }; } && | ||
19691 | { ac_try='test -s conftest$ac_exeext' | ||
19692 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14597 | (eval $ac_try) 2>&5 | 19693 | (eval $ac_try) 2>&5 |
14598 | ac_status=$? | 19694 | ac_status=$? |
14599 | echo "$as_me:14599: \$? = $ac_status" >&5 | 19695 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
14600 | (exit $ac_status); }; }; then | 19696 | (exit $ac_status); }; }; then |
14601 | ac_cv_cc_implements___func__="yes" | 19697 | ac_cv_cc_implements___func__="yes" |
14602 | else | 19698 | else |
14603 | echo "$as_me: failed program was:" >&5 | 19699 | echo "$as_me: failed program was:" >&5 |
14604 | cat conftest.$ac_ext >&5 | 19700 | sed 's/^/| /' conftest.$ac_ext >&5 |
19701 | |||
14605 | ac_cv_cc_implements___func__="no" | 19702 | ac_cv_cc_implements___func__="no" |
14606 | 19703 | ||
14607 | fi | 19704 | fi |
14608 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 19705 | rm -f conftest.err conftest.$ac_objext \ |
19706 | conftest$ac_exeext conftest.$ac_ext | ||
14609 | 19707 | ||
14610 | fi | 19708 | fi |
14611 | echo "$as_me:14611: result: $ac_cv_cc_implements___func__" >&5 | 19709 | echo "$as_me:$LINENO: result: $ac_cv_cc_implements___func__" >&5 |
14612 | echo "${ECHO_T}$ac_cv_cc_implements___func__" >&6 | 19710 | echo "${ECHO_T}$ac_cv_cc_implements___func__" >&6 |
14613 | if test "x$ac_cv_cc_implements___func__" = "xyes" ; then | 19711 | if test "x$ac_cv_cc_implements___func__" = "xyes" ; then |
14614 | cat >>confdefs.h <<\EOF | 19712 | cat >>confdefs.h <<\_ACEOF |
14615 | #define HAVE___func__ 1 | 19713 | #define HAVE___func__ 1 |
14616 | EOF | 19714 | _ACEOF |
14617 | 19715 | ||
14618 | fi | 19716 | fi |
14619 | 19717 | ||
14620 | echo "$as_me:14620: checking whether getopt has optreset support" >&5 | 19718 | echo "$as_me:$LINENO: checking whether getopt has optreset support" >&5 |
14621 | echo $ECHO_N "checking whether getopt has optreset support... $ECHO_C" >&6 | 19719 | echo $ECHO_N "checking whether getopt has optreset support... $ECHO_C" >&6 |
14622 | if test "${ac_cv_have_getopt_optreset+set}" = set; then | 19720 | if test "${ac_cv_have_getopt_optreset+set}" = set; then |
14623 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 19721 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
14624 | else | 19722 | else |
14625 | 19723 | ||
14626 | cat >conftest.$ac_ext <<_ACEOF | 19724 | cat >conftest.$ac_ext <<_ACEOF |
14627 | #line 14627 "configure" | 19725 | /* confdefs.h. */ |
14628 | #include "confdefs.h" | 19726 | _ACEOF |
19727 | cat confdefs.h >>conftest.$ac_ext | ||
19728 | cat >>conftest.$ac_ext <<_ACEOF | ||
19729 | /* end confdefs.h. */ | ||
14629 | 19730 | ||
14630 | #include <getopt.h> | 19731 | #include <getopt.h> |
14631 | 19732 | ||
@@ -14638,45 +19739,60 @@ main () | |||
14638 | } | 19739 | } |
14639 | _ACEOF | 19740 | _ACEOF |
14640 | rm -f conftest.$ac_objext conftest$ac_exeext | 19741 | rm -f conftest.$ac_objext conftest$ac_exeext |
14641 | if { (eval echo "$as_me:14641: \"$ac_link\"") >&5 | 19742 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
14642 | (eval $ac_link) 2>&5 | 19743 | (eval $ac_link) 2>conftest.er1 |
14643 | ac_status=$? | 19744 | ac_status=$? |
14644 | echo "$as_me:14644: \$? = $ac_status" >&5 | 19745 | grep -v '^ *+' conftest.er1 >conftest.err |
19746 | rm -f conftest.er1 | ||
19747 | cat conftest.err >&5 | ||
19748 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14645 | (exit $ac_status); } && | 19749 | (exit $ac_status); } && |
14646 | { ac_try='test -s conftest$ac_exeext' | 19750 | { ac_try='test -z "$ac_c_werror_flag" |
14647 | { (eval echo "$as_me:14647: \"$ac_try\"") >&5 | 19751 | || test ! -s conftest.err' |
19752 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19753 | (eval $ac_try) 2>&5 | ||
19754 | ac_status=$? | ||
19755 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19756 | (exit $ac_status); }; } && | ||
19757 | { ac_try='test -s conftest$ac_exeext' | ||
19758 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14648 | (eval $ac_try) 2>&5 | 19759 | (eval $ac_try) 2>&5 |
14649 | ac_status=$? | 19760 | ac_status=$? |
14650 | echo "$as_me:14650: \$? = $ac_status" >&5 | 19761 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
14651 | (exit $ac_status); }; }; then | 19762 | (exit $ac_status); }; }; then |
14652 | ac_cv_have_getopt_optreset="yes" | 19763 | ac_cv_have_getopt_optreset="yes" |
14653 | else | 19764 | else |
14654 | echo "$as_me: failed program was:" >&5 | 19765 | echo "$as_me: failed program was:" >&5 |
14655 | cat conftest.$ac_ext >&5 | 19766 | sed 's/^/| /' conftest.$ac_ext >&5 |
19767 | |||
14656 | ac_cv_have_getopt_optreset="no" | 19768 | ac_cv_have_getopt_optreset="no" |
14657 | 19769 | ||
14658 | fi | 19770 | fi |
14659 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 19771 | rm -f conftest.err conftest.$ac_objext \ |
19772 | conftest$ac_exeext conftest.$ac_ext | ||
14660 | 19773 | ||
14661 | fi | 19774 | fi |
14662 | echo "$as_me:14662: result: $ac_cv_have_getopt_optreset" >&5 | 19775 | echo "$as_me:$LINENO: result: $ac_cv_have_getopt_optreset" >&5 |
14663 | echo "${ECHO_T}$ac_cv_have_getopt_optreset" >&6 | 19776 | echo "${ECHO_T}$ac_cv_have_getopt_optreset" >&6 |
14664 | if test "x$ac_cv_have_getopt_optreset" = "xyes" ; then | 19777 | if test "x$ac_cv_have_getopt_optreset" = "xyes" ; then |
14665 | cat >>confdefs.h <<\EOF | 19778 | cat >>confdefs.h <<\_ACEOF |
14666 | #define HAVE_GETOPT_OPTRESET 1 | 19779 | #define HAVE_GETOPT_OPTRESET 1 |
14667 | EOF | 19780 | _ACEOF |
14668 | 19781 | ||
14669 | fi | 19782 | fi |
14670 | 19783 | ||
14671 | echo "$as_me:14671: checking if libc defines sys_errlist" >&5 | 19784 | echo "$as_me:$LINENO: checking if libc defines sys_errlist" >&5 |
14672 | echo $ECHO_N "checking if libc defines sys_errlist... $ECHO_C" >&6 | 19785 | echo $ECHO_N "checking if libc defines sys_errlist... $ECHO_C" >&6 |
14673 | if test "${ac_cv_libc_defines_sys_errlist+set}" = set; then | 19786 | if test "${ac_cv_libc_defines_sys_errlist+set}" = set; then |
14674 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 19787 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
14675 | else | 19788 | else |
14676 | 19789 | ||
14677 | cat >conftest.$ac_ext <<_ACEOF | 19790 | cat >conftest.$ac_ext <<_ACEOF |
14678 | #line 14678 "configure" | 19791 | /* confdefs.h. */ |
14679 | #include "confdefs.h" | 19792 | _ACEOF |
19793 | cat confdefs.h >>conftest.$ac_ext | ||
19794 | cat >>conftest.$ac_ext <<_ACEOF | ||
19795 | /* end confdefs.h. */ | ||
14680 | 19796 | ||
14681 | int | 19797 | int |
14682 | main () | 19798 | main () |
@@ -14687,45 +19803,61 @@ main () | |||
14687 | } | 19803 | } |
14688 | _ACEOF | 19804 | _ACEOF |
14689 | rm -f conftest.$ac_objext conftest$ac_exeext | 19805 | rm -f conftest.$ac_objext conftest$ac_exeext |
14690 | if { (eval echo "$as_me:14690: \"$ac_link\"") >&5 | 19806 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
14691 | (eval $ac_link) 2>&5 | 19807 | (eval $ac_link) 2>conftest.er1 |
14692 | ac_status=$? | 19808 | ac_status=$? |
14693 | echo "$as_me:14693: \$? = $ac_status" >&5 | 19809 | grep -v '^ *+' conftest.er1 >conftest.err |
19810 | rm -f conftest.er1 | ||
19811 | cat conftest.err >&5 | ||
19812 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14694 | (exit $ac_status); } && | 19813 | (exit $ac_status); } && |
14695 | { ac_try='test -s conftest$ac_exeext' | 19814 | { ac_try='test -z "$ac_c_werror_flag" |
14696 | { (eval echo "$as_me:14696: \"$ac_try\"") >&5 | 19815 | || test ! -s conftest.err' |
19816 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14697 | (eval $ac_try) 2>&5 | 19817 | (eval $ac_try) 2>&5 |
14698 | ac_status=$? | 19818 | ac_status=$? |
14699 | echo "$as_me:14699: \$? = $ac_status" >&5 | 19819 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
19820 | (exit $ac_status); }; } && | ||
19821 | { ac_try='test -s conftest$ac_exeext' | ||
19822 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19823 | (eval $ac_try) 2>&5 | ||
19824 | ac_status=$? | ||
19825 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14700 | (exit $ac_status); }; }; then | 19826 | (exit $ac_status); }; }; then |
14701 | ac_cv_libc_defines_sys_errlist="yes" | 19827 | ac_cv_libc_defines_sys_errlist="yes" |
14702 | else | 19828 | else |
14703 | echo "$as_me: failed program was:" >&5 | 19829 | echo "$as_me: failed program was:" >&5 |
14704 | cat conftest.$ac_ext >&5 | 19830 | sed 's/^/| /' conftest.$ac_ext >&5 |
19831 | |||
14705 | ac_cv_libc_defines_sys_errlist="no" | 19832 | ac_cv_libc_defines_sys_errlist="no" |
14706 | 19833 | ||
14707 | fi | 19834 | fi |
14708 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 19835 | rm -f conftest.err conftest.$ac_objext \ |
19836 | conftest$ac_exeext conftest.$ac_ext | ||
14709 | 19837 | ||
14710 | fi | 19838 | fi |
14711 | echo "$as_me:14711: result: $ac_cv_libc_defines_sys_errlist" >&5 | 19839 | echo "$as_me:$LINENO: result: $ac_cv_libc_defines_sys_errlist" >&5 |
14712 | echo "${ECHO_T}$ac_cv_libc_defines_sys_errlist" >&6 | 19840 | echo "${ECHO_T}$ac_cv_libc_defines_sys_errlist" >&6 |
14713 | if test "x$ac_cv_libc_defines_sys_errlist" = "xyes" ; then | 19841 | if test "x$ac_cv_libc_defines_sys_errlist" = "xyes" ; then |
14714 | cat >>confdefs.h <<\EOF | 19842 | cat >>confdefs.h <<\_ACEOF |
14715 | #define HAVE_SYS_ERRLIST 1 | 19843 | #define HAVE_SYS_ERRLIST 1 |
14716 | EOF | 19844 | _ACEOF |
14717 | 19845 | ||
14718 | fi | 19846 | fi |
14719 | 19847 | ||
14720 | echo "$as_me:14720: checking if libc defines sys_nerr" >&5 | 19848 | |
19849 | echo "$as_me:$LINENO: checking if libc defines sys_nerr" >&5 | ||
14721 | echo $ECHO_N "checking if libc defines sys_nerr... $ECHO_C" >&6 | 19850 | echo $ECHO_N "checking if libc defines sys_nerr... $ECHO_C" >&6 |
14722 | if test "${ac_cv_libc_defines_sys_nerr+set}" = set; then | 19851 | if test "${ac_cv_libc_defines_sys_nerr+set}" = set; then |
14723 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 19852 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
14724 | else | 19853 | else |
14725 | 19854 | ||
14726 | cat >conftest.$ac_ext <<_ACEOF | 19855 | cat >conftest.$ac_ext <<_ACEOF |
14727 | #line 14727 "configure" | 19856 | /* confdefs.h. */ |
14728 | #include "confdefs.h" | 19857 | _ACEOF |
19858 | cat confdefs.h >>conftest.$ac_ext | ||
19859 | cat >>conftest.$ac_ext <<_ACEOF | ||
19860 | /* end confdefs.h. */ | ||
14729 | 19861 | ||
14730 | int | 19862 | int |
14731 | main () | 19863 | main () |
@@ -14736,33 +19868,45 @@ main () | |||
14736 | } | 19868 | } |
14737 | _ACEOF | 19869 | _ACEOF |
14738 | rm -f conftest.$ac_objext conftest$ac_exeext | 19870 | rm -f conftest.$ac_objext conftest$ac_exeext |
14739 | if { (eval echo "$as_me:14739: \"$ac_link\"") >&5 | 19871 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
14740 | (eval $ac_link) 2>&5 | 19872 | (eval $ac_link) 2>conftest.er1 |
14741 | ac_status=$? | 19873 | ac_status=$? |
14742 | echo "$as_me:14742: \$? = $ac_status" >&5 | 19874 | grep -v '^ *+' conftest.er1 >conftest.err |
19875 | rm -f conftest.er1 | ||
19876 | cat conftest.err >&5 | ||
19877 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14743 | (exit $ac_status); } && | 19878 | (exit $ac_status); } && |
14744 | { ac_try='test -s conftest$ac_exeext' | 19879 | { ac_try='test -z "$ac_c_werror_flag" |
14745 | { (eval echo "$as_me:14745: \"$ac_try\"") >&5 | 19880 | || test ! -s conftest.err' |
19881 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14746 | (eval $ac_try) 2>&5 | 19882 | (eval $ac_try) 2>&5 |
14747 | ac_status=$? | 19883 | ac_status=$? |
14748 | echo "$as_me:14748: \$? = $ac_status" >&5 | 19884 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
19885 | (exit $ac_status); }; } && | ||
19886 | { ac_try='test -s conftest$ac_exeext' | ||
19887 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19888 | (eval $ac_try) 2>&5 | ||
19889 | ac_status=$? | ||
19890 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14749 | (exit $ac_status); }; }; then | 19891 | (exit $ac_status); }; }; then |
14750 | ac_cv_libc_defines_sys_nerr="yes" | 19892 | ac_cv_libc_defines_sys_nerr="yes" |
14751 | else | 19893 | else |
14752 | echo "$as_me: failed program was:" >&5 | 19894 | echo "$as_me: failed program was:" >&5 |
14753 | cat conftest.$ac_ext >&5 | 19895 | sed 's/^/| /' conftest.$ac_ext >&5 |
19896 | |||
14754 | ac_cv_libc_defines_sys_nerr="no" | 19897 | ac_cv_libc_defines_sys_nerr="no" |
14755 | 19898 | ||
14756 | fi | 19899 | fi |
14757 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 19900 | rm -f conftest.err conftest.$ac_objext \ |
19901 | conftest$ac_exeext conftest.$ac_ext | ||
14758 | 19902 | ||
14759 | fi | 19903 | fi |
14760 | echo "$as_me:14760: result: $ac_cv_libc_defines_sys_nerr" >&5 | 19904 | echo "$as_me:$LINENO: result: $ac_cv_libc_defines_sys_nerr" >&5 |
14761 | echo "${ECHO_T}$ac_cv_libc_defines_sys_nerr" >&6 | 19905 | echo "${ECHO_T}$ac_cv_libc_defines_sys_nerr" >&6 |
14762 | if test "x$ac_cv_libc_defines_sys_nerr" = "xyes" ; then | 19906 | if test "x$ac_cv_libc_defines_sys_nerr" = "xyes" ; then |
14763 | cat >>confdefs.h <<\EOF | 19907 | cat >>confdefs.h <<\_ACEOF |
14764 | #define HAVE_SYS_NERR 1 | 19908 | #define HAVE_SYS_NERR 1 |
14765 | EOF | 19909 | _ACEOF |
14766 | 19910 | ||
14767 | fi | 19911 | fi |
14768 | 19912 | ||
@@ -14788,26 +19932,82 @@ if test "${with_sectok+set}" = set; then | |||
14788 | for ac_header in sectok.h | 19932 | for ac_header in sectok.h |
14789 | do | 19933 | do |
14790 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | 19934 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` |
14791 | echo "$as_me:14791: checking for $ac_header" >&5 | 19935 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
19936 | echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
14792 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | 19937 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 |
14793 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | 19938 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
14794 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 19939 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
19940 | fi | ||
19941 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
19942 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
14795 | else | 19943 | else |
14796 | cat >conftest.$ac_ext <<_ACEOF | 19944 | # Is the header compilable? |
14797 | #line 14797 "configure" | 19945 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 |
14798 | #include "confdefs.h" | 19946 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 |
19947 | cat >conftest.$ac_ext <<_ACEOF | ||
19948 | /* confdefs.h. */ | ||
19949 | _ACEOF | ||
19950 | cat confdefs.h >>conftest.$ac_ext | ||
19951 | cat >>conftest.$ac_ext <<_ACEOF | ||
19952 | /* end confdefs.h. */ | ||
19953 | $ac_includes_default | ||
19954 | #include <$ac_header> | ||
19955 | _ACEOF | ||
19956 | rm -f conftest.$ac_objext | ||
19957 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
19958 | (eval $ac_compile) 2>conftest.er1 | ||
19959 | ac_status=$? | ||
19960 | grep -v '^ *+' conftest.er1 >conftest.err | ||
19961 | rm -f conftest.er1 | ||
19962 | cat conftest.err >&5 | ||
19963 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19964 | (exit $ac_status); } && | ||
19965 | { ac_try='test -z "$ac_c_werror_flag" | ||
19966 | || test ! -s conftest.err' | ||
19967 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19968 | (eval $ac_try) 2>&5 | ||
19969 | ac_status=$? | ||
19970 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19971 | (exit $ac_status); }; } && | ||
19972 | { ac_try='test -s conftest.$ac_objext' | ||
19973 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
19974 | (eval $ac_try) 2>&5 | ||
19975 | ac_status=$? | ||
19976 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
19977 | (exit $ac_status); }; }; then | ||
19978 | ac_header_compiler=yes | ||
19979 | else | ||
19980 | echo "$as_me: failed program was:" >&5 | ||
19981 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
19982 | |||
19983 | ac_header_compiler=no | ||
19984 | fi | ||
19985 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
19986 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
19987 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
19988 | |||
19989 | # Is the header present? | ||
19990 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
19991 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
19992 | cat >conftest.$ac_ext <<_ACEOF | ||
19993 | /* confdefs.h. */ | ||
19994 | _ACEOF | ||
19995 | cat confdefs.h >>conftest.$ac_ext | ||
19996 | cat >>conftest.$ac_ext <<_ACEOF | ||
19997 | /* end confdefs.h. */ | ||
14799 | #include <$ac_header> | 19998 | #include <$ac_header> |
14800 | _ACEOF | 19999 | _ACEOF |
14801 | if { (eval echo "$as_me:14801: \"$ac_cpp conftest.$ac_ext\"") >&5 | 20000 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 |
14802 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | 20001 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
14803 | ac_status=$? | 20002 | ac_status=$? |
14804 | egrep -v '^ *\+' conftest.er1 >conftest.err | 20003 | grep -v '^ *+' conftest.er1 >conftest.err |
14805 | rm -f conftest.er1 | 20004 | rm -f conftest.er1 |
14806 | cat conftest.err >&5 | 20005 | cat conftest.err >&5 |
14807 | echo "$as_me:14807: \$? = $ac_status" >&5 | 20006 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
14808 | (exit $ac_status); } >/dev/null; then | 20007 | (exit $ac_status); } >/dev/null; then |
14809 | if test -s conftest.err; then | 20008 | if test -s conftest.err; then |
14810 | ac_cpp_err=$ac_c_preproc_warn_flag | 20009 | ac_cpp_err=$ac_c_preproc_warn_flag |
20010 | ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
14811 | else | 20011 | else |
14812 | ac_cpp_err= | 20012 | ac_cpp_err= |
14813 | fi | 20013 | fi |
@@ -14815,31 +20015,76 @@ else | |||
14815 | ac_cpp_err=yes | 20015 | ac_cpp_err=yes |
14816 | fi | 20016 | fi |
14817 | if test -z "$ac_cpp_err"; then | 20017 | if test -z "$ac_cpp_err"; then |
14818 | eval "$as_ac_Header=yes" | 20018 | ac_header_preproc=yes |
14819 | else | 20019 | else |
14820 | echo "$as_me: failed program was:" >&5 | 20020 | echo "$as_me: failed program was:" >&5 |
14821 | cat conftest.$ac_ext >&5 | 20021 | sed 's/^/| /' conftest.$ac_ext >&5 |
14822 | eval "$as_ac_Header=no" | 20022 | |
20023 | ac_header_preproc=no | ||
14823 | fi | 20024 | fi |
14824 | rm -f conftest.err conftest.$ac_ext | 20025 | rm -f conftest.err conftest.$ac_ext |
20026 | echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
20027 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
20028 | |||
20029 | # So? What about this header? | ||
20030 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
20031 | yes:no: ) | ||
20032 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
20033 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
20034 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
20035 | echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
20036 | ac_header_preproc=yes | ||
20037 | ;; | ||
20038 | no:yes:* ) | ||
20039 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
20040 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
20041 | { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
20042 | echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
20043 | { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
20044 | echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
20045 | { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
20046 | echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
20047 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
20048 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
20049 | { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
20050 | echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
20051 | ( | ||
20052 | cat <<\_ASBOX | ||
20053 | ## ------------------------------------------ ## | ||
20054 | ## Report this to the AC_PACKAGE_NAME lists. ## | ||
20055 | ## ------------------------------------------ ## | ||
20056 | _ASBOX | ||
20057 | ) | | ||
20058 | sed "s/^/$as_me: WARNING: /" >&2 | ||
20059 | ;; | ||
20060 | esac | ||
20061 | echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
20062 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | ||
20063 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
20064 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
20065 | else | ||
20066 | eval "$as_ac_Header=\$ac_header_preproc" | ||
14825 | fi | 20067 | fi |
14826 | echo "$as_me:14826: result: `eval echo '${'$as_ac_Header'}'`" >&5 | 20068 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 |
14827 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | 20069 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 |
20070 | |||
20071 | fi | ||
14828 | if test `eval echo '${'$as_ac_Header'}'` = yes; then | 20072 | if test `eval echo '${'$as_ac_Header'}'` = yes; then |
14829 | cat >>confdefs.h <<EOF | 20073 | cat >>confdefs.h <<_ACEOF |
14830 | #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 20074 | #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
14831 | EOF | 20075 | _ACEOF |
14832 | 20076 | ||
14833 | fi | 20077 | fi |
20078 | |||
14834 | done | 20079 | done |
14835 | 20080 | ||
14836 | if test "$ac_cv_header_sectok_h" != yes; then | 20081 | if test "$ac_cv_header_sectok_h" != yes; then |
14837 | { { echo "$as_me:14837: error: Can't find sectok.h" >&5 | 20082 | { { echo "$as_me:$LINENO: error: Can't find sectok.h" >&5 |
14838 | echo "$as_me: error: Can't find sectok.h" >&2;} | 20083 | echo "$as_me: error: Can't find sectok.h" >&2;} |
14839 | { (exit 1); exit 1; }; } | 20084 | { (exit 1); exit 1; }; } |
14840 | fi | 20085 | fi |
14841 | 20086 | ||
14842 | echo "$as_me:14842: checking for sectok_open in -lsectok" >&5 | 20087 | echo "$as_me:$LINENO: checking for sectok_open in -lsectok" >&5 |
14843 | echo $ECHO_N "checking for sectok_open in -lsectok... $ECHO_C" >&6 | 20088 | echo $ECHO_N "checking for sectok_open in -lsectok... $ECHO_C" >&6 |
14844 | if test "${ac_cv_lib_sectok_sectok_open+set}" = set; then | 20089 | if test "${ac_cv_lib_sectok_sectok_open+set}" = set; then |
14845 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 20090 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -14847,8 +20092,11 @@ else | |||
14847 | ac_check_lib_save_LIBS=$LIBS | 20092 | ac_check_lib_save_LIBS=$LIBS |
14848 | LIBS="-lsectok $LIBS" | 20093 | LIBS="-lsectok $LIBS" |
14849 | cat >conftest.$ac_ext <<_ACEOF | 20094 | cat >conftest.$ac_ext <<_ACEOF |
14850 | #line 14850 "configure" | 20095 | /* confdefs.h. */ |
14851 | #include "confdefs.h" | 20096 | _ACEOF |
20097 | cat confdefs.h >>conftest.$ac_ext | ||
20098 | cat >>conftest.$ac_ext <<_ACEOF | ||
20099 | /* end confdefs.h. */ | ||
14852 | 20100 | ||
14853 | /* Override any gcc2 internal prototype to avoid an error. */ | 20101 | /* Override any gcc2 internal prototype to avoid an error. */ |
14854 | #ifdef __cplusplus | 20102 | #ifdef __cplusplus |
@@ -14866,53 +20114,66 @@ sectok_open (); | |||
14866 | } | 20114 | } |
14867 | _ACEOF | 20115 | _ACEOF |
14868 | rm -f conftest.$ac_objext conftest$ac_exeext | 20116 | rm -f conftest.$ac_objext conftest$ac_exeext |
14869 | if { (eval echo "$as_me:14869: \"$ac_link\"") >&5 | 20117 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
14870 | (eval $ac_link) 2>&5 | 20118 | (eval $ac_link) 2>conftest.er1 |
14871 | ac_status=$? | 20119 | ac_status=$? |
14872 | echo "$as_me:14872: \$? = $ac_status" >&5 | 20120 | grep -v '^ *+' conftest.er1 >conftest.err |
20121 | rm -f conftest.er1 | ||
20122 | cat conftest.err >&5 | ||
20123 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
14873 | (exit $ac_status); } && | 20124 | (exit $ac_status); } && |
14874 | { ac_try='test -s conftest$ac_exeext' | 20125 | { ac_try='test -z "$ac_c_werror_flag" |
14875 | { (eval echo "$as_me:14875: \"$ac_try\"") >&5 | 20126 | || test ! -s conftest.err' |
20127 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
20128 | (eval $ac_try) 2>&5 | ||
20129 | ac_status=$? | ||
20130 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20131 | (exit $ac_status); }; } && | ||
20132 | { ac_try='test -s conftest$ac_exeext' | ||
20133 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
14876 | (eval $ac_try) 2>&5 | 20134 | (eval $ac_try) 2>&5 |
14877 | ac_status=$? | 20135 | ac_status=$? |
14878 | echo "$as_me:14878: \$? = $ac_status" >&5 | 20136 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
14879 | (exit $ac_status); }; }; then | 20137 | (exit $ac_status); }; }; then |
14880 | ac_cv_lib_sectok_sectok_open=yes | 20138 | ac_cv_lib_sectok_sectok_open=yes |
14881 | else | 20139 | else |
14882 | echo "$as_me: failed program was:" >&5 | 20140 | echo "$as_me: failed program was:" >&5 |
14883 | cat conftest.$ac_ext >&5 | 20141 | sed 's/^/| /' conftest.$ac_ext >&5 |
20142 | |||
14884 | ac_cv_lib_sectok_sectok_open=no | 20143 | ac_cv_lib_sectok_sectok_open=no |
14885 | fi | 20144 | fi |
14886 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 20145 | rm -f conftest.err conftest.$ac_objext \ |
20146 | conftest$ac_exeext conftest.$ac_ext | ||
14887 | LIBS=$ac_check_lib_save_LIBS | 20147 | LIBS=$ac_check_lib_save_LIBS |
14888 | fi | 20148 | fi |
14889 | echo "$as_me:14889: result: $ac_cv_lib_sectok_sectok_open" >&5 | 20149 | echo "$as_me:$LINENO: result: $ac_cv_lib_sectok_sectok_open" >&5 |
14890 | echo "${ECHO_T}$ac_cv_lib_sectok_sectok_open" >&6 | 20150 | echo "${ECHO_T}$ac_cv_lib_sectok_sectok_open" >&6 |
14891 | if test $ac_cv_lib_sectok_sectok_open = yes; then | 20151 | if test $ac_cv_lib_sectok_sectok_open = yes; then |
14892 | cat >>confdefs.h <<EOF | 20152 | cat >>confdefs.h <<_ACEOF |
14893 | #define HAVE_LIBSECTOK 1 | 20153 | #define HAVE_LIBSECTOK 1 |
14894 | EOF | 20154 | _ACEOF |
14895 | 20155 | ||
14896 | LIBS="-lsectok $LIBS" | 20156 | LIBS="-lsectok $LIBS" |
14897 | 20157 | ||
14898 | fi | 20158 | fi |
14899 | 20159 | ||
14900 | if test "$ac_cv_lib_sectok_sectok_open" != yes; then | 20160 | if test "$ac_cv_lib_sectok_sectok_open" != yes; then |
14901 | { { echo "$as_me:14901: error: Can't find libsectok" >&5 | 20161 | { { echo "$as_me:$LINENO: error: Can't find libsectok" >&5 |
14902 | echo "$as_me: error: Can't find libsectok" >&2;} | 20162 | echo "$as_me: error: Can't find libsectok" >&2;} |
14903 | { (exit 1); exit 1; }; } | 20163 | { (exit 1); exit 1; }; } |
14904 | fi | 20164 | fi |
14905 | cat >>confdefs.h <<\EOF | 20165 | cat >>confdefs.h <<\_ACEOF |
14906 | #define SMARTCARD 1 | 20166 | #define SMARTCARD 1 |
14907 | EOF | 20167 | _ACEOF |
14908 | 20168 | ||
14909 | cat >>confdefs.h <<\EOF | 20169 | cat >>confdefs.h <<\_ACEOF |
14910 | #define USE_SECTOK 1 | 20170 | #define USE_SECTOK 1 |
14911 | EOF | 20171 | _ACEOF |
14912 | 20172 | ||
14913 | SCARD_MSG="yes, using sectok" | 20173 | SCARD_MSG="yes, using sectok" |
14914 | fi | 20174 | fi |
14915 | 20175 | ||
20176 | |||
14916 | fi; | 20177 | fi; |
14917 | 20178 | ||
14918 | # Check whether user wants OpenSC support | 20179 | # Check whether user wants OpenSC support |
@@ -14928,7 +20189,7 @@ if test x$opensc_config_prefix != x ; then | |||
14928 | OPENSC_CONFIG=$opensc_config_prefix/bin/opensc-config | 20189 | OPENSC_CONFIG=$opensc_config_prefix/bin/opensc-config |
14929 | # Extract the first word of "opensc-config", so it can be a program name with args. | 20190 | # Extract the first word of "opensc-config", so it can be a program name with args. |
14930 | set dummy opensc-config; ac_word=$2 | 20191 | set dummy opensc-config; ac_word=$2 |
14931 | echo "$as_me:14931: checking for $ac_word" >&5 | 20192 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
14932 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 20193 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
14933 | if test "${ac_cv_path_OPENSC_CONFIG+set}" = set; then | 20194 | if test "${ac_cv_path_OPENSC_CONFIG+set}" = set; then |
14934 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 20195 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -14938,16 +20199,18 @@ else | |||
14938 | ac_cv_path_OPENSC_CONFIG="$OPENSC_CONFIG" # Let the user override the test with a path. | 20199 | ac_cv_path_OPENSC_CONFIG="$OPENSC_CONFIG" # Let the user override the test with a path. |
14939 | ;; | 20200 | ;; |
14940 | *) | 20201 | *) |
14941 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 20202 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
14942 | ac_dummy="$PATH" | 20203 | for as_dir in $PATH |
14943 | for ac_dir in $ac_dummy; do | 20204 | do |
14944 | IFS=$ac_save_IFS | 20205 | IFS=$as_save_IFS |
14945 | test -z "$ac_dir" && ac_dir=. | 20206 | test -z "$as_dir" && as_dir=. |
14946 | if $as_executable_p "$ac_dir/$ac_word"; then | 20207 | for ac_exec_ext in '' $ac_executable_extensions; do |
14947 | ac_cv_path_OPENSC_CONFIG="$ac_dir/$ac_word" | 20208 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
14948 | echo "$as_me:14948: found $ac_dir/$ac_word" >&5 | 20209 | ac_cv_path_OPENSC_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
14949 | break | 20210 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
14950 | fi | 20211 | break 2 |
20212 | fi | ||
20213 | done | ||
14951 | done | 20214 | done |
14952 | 20215 | ||
14953 | test -z "$ac_cv_path_OPENSC_CONFIG" && ac_cv_path_OPENSC_CONFIG="no" | 20216 | test -z "$ac_cv_path_OPENSC_CONFIG" && ac_cv_path_OPENSC_CONFIG="no" |
@@ -14957,10 +20220,10 @@ fi | |||
14957 | OPENSC_CONFIG=$ac_cv_path_OPENSC_CONFIG | 20220 | OPENSC_CONFIG=$ac_cv_path_OPENSC_CONFIG |
14958 | 20221 | ||
14959 | if test -n "$OPENSC_CONFIG"; then | 20222 | if test -n "$OPENSC_CONFIG"; then |
14960 | echo "$as_me:14960: result: $OPENSC_CONFIG" >&5 | 20223 | echo "$as_me:$LINENO: result: $OPENSC_CONFIG" >&5 |
14961 | echo "${ECHO_T}$OPENSC_CONFIG" >&6 | 20224 | echo "${ECHO_T}$OPENSC_CONFIG" >&6 |
14962 | else | 20225 | else |
14963 | echo "$as_me:14963: result: no" >&5 | 20226 | echo "$as_me:$LINENO: result: no" >&5 |
14964 | echo "${ECHO_T}no" >&6 | 20227 | echo "${ECHO_T}no" >&6 |
14965 | fi | 20228 | fi |
14966 | 20229 | ||
@@ -14969,20 +20232,20 @@ fi | |||
14969 | LIBOPENSC_LIBS=`$OPENSC_CONFIG --libs` | 20232 | LIBOPENSC_LIBS=`$OPENSC_CONFIG --libs` |
14970 | CPPFLAGS="$CPPFLAGS $LIBOPENSC_CFLAGS" | 20233 | CPPFLAGS="$CPPFLAGS $LIBOPENSC_CFLAGS" |
14971 | LDFLAGS="$LDFLAGS $LIBOPENSC_LIBS" | 20234 | LDFLAGS="$LDFLAGS $LIBOPENSC_LIBS" |
14972 | cat >>confdefs.h <<\EOF | 20235 | cat >>confdefs.h <<\_ACEOF |
14973 | #define SMARTCARD 1 | 20236 | #define SMARTCARD 1 |
14974 | EOF | 20237 | _ACEOF |
14975 | 20238 | ||
14976 | cat >>confdefs.h <<\EOF | 20239 | cat >>confdefs.h <<\_ACEOF |
14977 | #define USE_OPENSC 1 | 20240 | #define USE_OPENSC 1 |
14978 | EOF | 20241 | _ACEOF |
14979 | 20242 | ||
14980 | SCARD_MSG="yes, using OpenSC" | 20243 | SCARD_MSG="yes, using OpenSC" |
14981 | fi | 20244 | fi |
14982 | fi | 20245 | fi |
14983 | 20246 | ||
14984 | # Check libraries needed by DNS fingerprint support | 20247 | # Check libraries needed by DNS fingerprint support |
14985 | echo "$as_me:14985: checking for library containing getrrsetbyname" >&5 | 20248 | echo "$as_me:$LINENO: checking for library containing getrrsetbyname" >&5 |
14986 | echo $ECHO_N "checking for library containing getrrsetbyname... $ECHO_C" >&6 | 20249 | echo $ECHO_N "checking for library containing getrrsetbyname... $ECHO_C" >&6 |
14987 | if test "${ac_cv_search_getrrsetbyname+set}" = set; then | 20250 | if test "${ac_cv_search_getrrsetbyname+set}" = set; then |
14988 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 20251 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -14990,8 +20253,11 @@ else | |||
14990 | ac_func_search_save_LIBS=$LIBS | 20253 | ac_func_search_save_LIBS=$LIBS |
14991 | ac_cv_search_getrrsetbyname=no | 20254 | ac_cv_search_getrrsetbyname=no |
14992 | cat >conftest.$ac_ext <<_ACEOF | 20255 | cat >conftest.$ac_ext <<_ACEOF |
14993 | #line 14993 "configure" | 20256 | /* confdefs.h. */ |
14994 | #include "confdefs.h" | 20257 | _ACEOF |
20258 | cat confdefs.h >>conftest.$ac_ext | ||
20259 | cat >>conftest.$ac_ext <<_ACEOF | ||
20260 | /* end confdefs.h. */ | ||
14995 | 20261 | ||
14996 | /* Override any gcc2 internal prototype to avoid an error. */ | 20262 | /* Override any gcc2 internal prototype to avoid an error. */ |
14997 | #ifdef __cplusplus | 20263 | #ifdef __cplusplus |
@@ -15009,29 +20275,44 @@ getrrsetbyname (); | |||
15009 | } | 20275 | } |
15010 | _ACEOF | 20276 | _ACEOF |
15011 | rm -f conftest.$ac_objext conftest$ac_exeext | 20277 | rm -f conftest.$ac_objext conftest$ac_exeext |
15012 | if { (eval echo "$as_me:15012: \"$ac_link\"") >&5 | 20278 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
15013 | (eval $ac_link) 2>&5 | 20279 | (eval $ac_link) 2>conftest.er1 |
15014 | ac_status=$? | 20280 | ac_status=$? |
15015 | echo "$as_me:15015: \$? = $ac_status" >&5 | 20281 | grep -v '^ *+' conftest.er1 >conftest.err |
20282 | rm -f conftest.er1 | ||
20283 | cat conftest.err >&5 | ||
20284 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15016 | (exit $ac_status); } && | 20285 | (exit $ac_status); } && |
15017 | { ac_try='test -s conftest$ac_exeext' | 20286 | { ac_try='test -z "$ac_c_werror_flag" |
15018 | { (eval echo "$as_me:15018: \"$ac_try\"") >&5 | 20287 | || test ! -s conftest.err' |
20288 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15019 | (eval $ac_try) 2>&5 | 20289 | (eval $ac_try) 2>&5 |
15020 | ac_status=$? | 20290 | ac_status=$? |
15021 | echo "$as_me:15021: \$? = $ac_status" >&5 | 20291 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
20292 | (exit $ac_status); }; } && | ||
20293 | { ac_try='test -s conftest$ac_exeext' | ||
20294 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
20295 | (eval $ac_try) 2>&5 | ||
20296 | ac_status=$? | ||
20297 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15022 | (exit $ac_status); }; }; then | 20298 | (exit $ac_status); }; }; then |
15023 | ac_cv_search_getrrsetbyname="none required" | 20299 | ac_cv_search_getrrsetbyname="none required" |
15024 | else | 20300 | else |
15025 | echo "$as_me: failed program was:" >&5 | 20301 | echo "$as_me: failed program was:" >&5 |
15026 | cat conftest.$ac_ext >&5 | 20302 | sed 's/^/| /' conftest.$ac_ext >&5 |
20303 | |||
15027 | fi | 20304 | fi |
15028 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 20305 | rm -f conftest.err conftest.$ac_objext \ |
20306 | conftest$ac_exeext conftest.$ac_ext | ||
15029 | if test "$ac_cv_search_getrrsetbyname" = no; then | 20307 | if test "$ac_cv_search_getrrsetbyname" = no; then |
15030 | for ac_lib in resolv; do | 20308 | for ac_lib in resolv; do |
15031 | LIBS="-l$ac_lib $ac_func_search_save_LIBS" | 20309 | LIBS="-l$ac_lib $ac_func_search_save_LIBS" |
15032 | cat >conftest.$ac_ext <<_ACEOF | 20310 | cat >conftest.$ac_ext <<_ACEOF |
15033 | #line 15033 "configure" | 20311 | /* confdefs.h. */ |
15034 | #include "confdefs.h" | 20312 | _ACEOF |
20313 | cat confdefs.h >>conftest.$ac_ext | ||
20314 | cat >>conftest.$ac_ext <<_ACEOF | ||
20315 | /* end confdefs.h. */ | ||
15035 | 20316 | ||
15036 | /* Override any gcc2 internal prototype to avoid an error. */ | 20317 | /* Override any gcc2 internal prototype to avoid an error. */ |
15037 | #ifdef __cplusplus | 20318 | #ifdef __cplusplus |
@@ -15049,40 +20330,52 @@ getrrsetbyname (); | |||
15049 | } | 20330 | } |
15050 | _ACEOF | 20331 | _ACEOF |
15051 | rm -f conftest.$ac_objext conftest$ac_exeext | 20332 | rm -f conftest.$ac_objext conftest$ac_exeext |
15052 | if { (eval echo "$as_me:15052: \"$ac_link\"") >&5 | 20333 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
15053 | (eval $ac_link) 2>&5 | 20334 | (eval $ac_link) 2>conftest.er1 |
15054 | ac_status=$? | 20335 | ac_status=$? |
15055 | echo "$as_me:15055: \$? = $ac_status" >&5 | 20336 | grep -v '^ *+' conftest.er1 >conftest.err |
20337 | rm -f conftest.er1 | ||
20338 | cat conftest.err >&5 | ||
20339 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15056 | (exit $ac_status); } && | 20340 | (exit $ac_status); } && |
15057 | { ac_try='test -s conftest$ac_exeext' | 20341 | { ac_try='test -z "$ac_c_werror_flag" |
15058 | { (eval echo "$as_me:15058: \"$ac_try\"") >&5 | 20342 | || test ! -s conftest.err' |
20343 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
20344 | (eval $ac_try) 2>&5 | ||
20345 | ac_status=$? | ||
20346 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20347 | (exit $ac_status); }; } && | ||
20348 | { ac_try='test -s conftest$ac_exeext' | ||
20349 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15059 | (eval $ac_try) 2>&5 | 20350 | (eval $ac_try) 2>&5 |
15060 | ac_status=$? | 20351 | ac_status=$? |
15061 | echo "$as_me:15061: \$? = $ac_status" >&5 | 20352 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15062 | (exit $ac_status); }; }; then | 20353 | (exit $ac_status); }; }; then |
15063 | ac_cv_search_getrrsetbyname="-l$ac_lib" | 20354 | ac_cv_search_getrrsetbyname="-l$ac_lib" |
15064 | break | 20355 | break |
15065 | else | 20356 | else |
15066 | echo "$as_me: failed program was:" >&5 | 20357 | echo "$as_me: failed program was:" >&5 |
15067 | cat conftest.$ac_ext >&5 | 20358 | sed 's/^/| /' conftest.$ac_ext >&5 |
20359 | |||
15068 | fi | 20360 | fi |
15069 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 20361 | rm -f conftest.err conftest.$ac_objext \ |
20362 | conftest$ac_exeext conftest.$ac_ext | ||
15070 | done | 20363 | done |
15071 | fi | 20364 | fi |
15072 | LIBS=$ac_func_search_save_LIBS | 20365 | LIBS=$ac_func_search_save_LIBS |
15073 | fi | 20366 | fi |
15074 | echo "$as_me:15074: result: $ac_cv_search_getrrsetbyname" >&5 | 20367 | echo "$as_me:$LINENO: result: $ac_cv_search_getrrsetbyname" >&5 |
15075 | echo "${ECHO_T}$ac_cv_search_getrrsetbyname" >&6 | 20368 | echo "${ECHO_T}$ac_cv_search_getrrsetbyname" >&6 |
15076 | if test "$ac_cv_search_getrrsetbyname" != no; then | 20369 | if test "$ac_cv_search_getrrsetbyname" != no; then |
15077 | test "$ac_cv_search_getrrsetbyname" = "none required" || LIBS="$ac_cv_search_getrrsetbyname $LIBS" | 20370 | test "$ac_cv_search_getrrsetbyname" = "none required" || LIBS="$ac_cv_search_getrrsetbyname $LIBS" |
15078 | cat >>confdefs.h <<\EOF | 20371 | cat >>confdefs.h <<\_ACEOF |
15079 | #define HAVE_GETRRSETBYNAME 1 | 20372 | #define HAVE_GETRRSETBYNAME 1 |
15080 | EOF | 20373 | _ACEOF |
15081 | 20374 | ||
15082 | else | 20375 | else |
15083 | 20376 | ||
15084 | # Needed by our getrrsetbyname() | 20377 | # Needed by our getrrsetbyname() |
15085 | echo "$as_me:15085: checking for library containing res_query" >&5 | 20378 | echo "$as_me:$LINENO: checking for library containing res_query" >&5 |
15086 | echo $ECHO_N "checking for library containing res_query... $ECHO_C" >&6 | 20379 | echo $ECHO_N "checking for library containing res_query... $ECHO_C" >&6 |
15087 | if test "${ac_cv_search_res_query+set}" = set; then | 20380 | if test "${ac_cv_search_res_query+set}" = set; then |
15088 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 20381 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -15090,8 +20383,11 @@ else | |||
15090 | ac_func_search_save_LIBS=$LIBS | 20383 | ac_func_search_save_LIBS=$LIBS |
15091 | ac_cv_search_res_query=no | 20384 | ac_cv_search_res_query=no |
15092 | cat >conftest.$ac_ext <<_ACEOF | 20385 | cat >conftest.$ac_ext <<_ACEOF |
15093 | #line 15093 "configure" | 20386 | /* confdefs.h. */ |
15094 | #include "confdefs.h" | 20387 | _ACEOF |
20388 | cat confdefs.h >>conftest.$ac_ext | ||
20389 | cat >>conftest.$ac_ext <<_ACEOF | ||
20390 | /* end confdefs.h. */ | ||
15095 | 20391 | ||
15096 | /* Override any gcc2 internal prototype to avoid an error. */ | 20392 | /* Override any gcc2 internal prototype to avoid an error. */ |
15097 | #ifdef __cplusplus | 20393 | #ifdef __cplusplus |
@@ -15109,29 +20405,44 @@ res_query (); | |||
15109 | } | 20405 | } |
15110 | _ACEOF | 20406 | _ACEOF |
15111 | rm -f conftest.$ac_objext conftest$ac_exeext | 20407 | rm -f conftest.$ac_objext conftest$ac_exeext |
15112 | if { (eval echo "$as_me:15112: \"$ac_link\"") >&5 | 20408 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
15113 | (eval $ac_link) 2>&5 | 20409 | (eval $ac_link) 2>conftest.er1 |
15114 | ac_status=$? | 20410 | ac_status=$? |
15115 | echo "$as_me:15115: \$? = $ac_status" >&5 | 20411 | grep -v '^ *+' conftest.er1 >conftest.err |
20412 | rm -f conftest.er1 | ||
20413 | cat conftest.err >&5 | ||
20414 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15116 | (exit $ac_status); } && | 20415 | (exit $ac_status); } && |
15117 | { ac_try='test -s conftest$ac_exeext' | 20416 | { ac_try='test -z "$ac_c_werror_flag" |
15118 | { (eval echo "$as_me:15118: \"$ac_try\"") >&5 | 20417 | || test ! -s conftest.err' |
20418 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
20419 | (eval $ac_try) 2>&5 | ||
20420 | ac_status=$? | ||
20421 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20422 | (exit $ac_status); }; } && | ||
20423 | { ac_try='test -s conftest$ac_exeext' | ||
20424 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15119 | (eval $ac_try) 2>&5 | 20425 | (eval $ac_try) 2>&5 |
15120 | ac_status=$? | 20426 | ac_status=$? |
15121 | echo "$as_me:15121: \$? = $ac_status" >&5 | 20427 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15122 | (exit $ac_status); }; }; then | 20428 | (exit $ac_status); }; }; then |
15123 | ac_cv_search_res_query="none required" | 20429 | ac_cv_search_res_query="none required" |
15124 | else | 20430 | else |
15125 | echo "$as_me: failed program was:" >&5 | 20431 | echo "$as_me: failed program was:" >&5 |
15126 | cat conftest.$ac_ext >&5 | 20432 | sed 's/^/| /' conftest.$ac_ext >&5 |
20433 | |||
15127 | fi | 20434 | fi |
15128 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 20435 | rm -f conftest.err conftest.$ac_objext \ |
20436 | conftest$ac_exeext conftest.$ac_ext | ||
15129 | if test "$ac_cv_search_res_query" = no; then | 20437 | if test "$ac_cv_search_res_query" = no; then |
15130 | for ac_lib in resolv; do | 20438 | for ac_lib in resolv; do |
15131 | LIBS="-l$ac_lib $ac_func_search_save_LIBS" | 20439 | LIBS="-l$ac_lib $ac_func_search_save_LIBS" |
15132 | cat >conftest.$ac_ext <<_ACEOF | 20440 | cat >conftest.$ac_ext <<_ACEOF |
15133 | #line 15133 "configure" | 20441 | /* confdefs.h. */ |
15134 | #include "confdefs.h" | 20442 | _ACEOF |
20443 | cat confdefs.h >>conftest.$ac_ext | ||
20444 | cat >>conftest.$ac_ext <<_ACEOF | ||
20445 | /* end confdefs.h. */ | ||
15135 | 20446 | ||
15136 | /* Override any gcc2 internal prototype to avoid an error. */ | 20447 | /* Override any gcc2 internal prototype to avoid an error. */ |
15137 | #ifdef __cplusplus | 20448 | #ifdef __cplusplus |
@@ -15149,36 +20460,48 @@ res_query (); | |||
15149 | } | 20460 | } |
15150 | _ACEOF | 20461 | _ACEOF |
15151 | rm -f conftest.$ac_objext conftest$ac_exeext | 20462 | rm -f conftest.$ac_objext conftest$ac_exeext |
15152 | if { (eval echo "$as_me:15152: \"$ac_link\"") >&5 | 20463 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
15153 | (eval $ac_link) 2>&5 | 20464 | (eval $ac_link) 2>conftest.er1 |
15154 | ac_status=$? | 20465 | ac_status=$? |
15155 | echo "$as_me:15155: \$? = $ac_status" >&5 | 20466 | grep -v '^ *+' conftest.er1 >conftest.err |
20467 | rm -f conftest.er1 | ||
20468 | cat conftest.err >&5 | ||
20469 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15156 | (exit $ac_status); } && | 20470 | (exit $ac_status); } && |
15157 | { ac_try='test -s conftest$ac_exeext' | 20471 | { ac_try='test -z "$ac_c_werror_flag" |
15158 | { (eval echo "$as_me:15158: \"$ac_try\"") >&5 | 20472 | || test ! -s conftest.err' |
20473 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15159 | (eval $ac_try) 2>&5 | 20474 | (eval $ac_try) 2>&5 |
15160 | ac_status=$? | 20475 | ac_status=$? |
15161 | echo "$as_me:15161: \$? = $ac_status" >&5 | 20476 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
20477 | (exit $ac_status); }; } && | ||
20478 | { ac_try='test -s conftest$ac_exeext' | ||
20479 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
20480 | (eval $ac_try) 2>&5 | ||
20481 | ac_status=$? | ||
20482 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15162 | (exit $ac_status); }; }; then | 20483 | (exit $ac_status); }; }; then |
15163 | ac_cv_search_res_query="-l$ac_lib" | 20484 | ac_cv_search_res_query="-l$ac_lib" |
15164 | break | 20485 | break |
15165 | else | 20486 | else |
15166 | echo "$as_me: failed program was:" >&5 | 20487 | echo "$as_me: failed program was:" >&5 |
15167 | cat conftest.$ac_ext >&5 | 20488 | sed 's/^/| /' conftest.$ac_ext >&5 |
20489 | |||
15168 | fi | 20490 | fi |
15169 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 20491 | rm -f conftest.err conftest.$ac_objext \ |
20492 | conftest$ac_exeext conftest.$ac_ext | ||
15170 | done | 20493 | done |
15171 | fi | 20494 | fi |
15172 | LIBS=$ac_func_search_save_LIBS | 20495 | LIBS=$ac_func_search_save_LIBS |
15173 | fi | 20496 | fi |
15174 | echo "$as_me:15174: result: $ac_cv_search_res_query" >&5 | 20497 | echo "$as_me:$LINENO: result: $ac_cv_search_res_query" >&5 |
15175 | echo "${ECHO_T}$ac_cv_search_res_query" >&6 | 20498 | echo "${ECHO_T}$ac_cv_search_res_query" >&6 |
15176 | if test "$ac_cv_search_res_query" != no; then | 20499 | if test "$ac_cv_search_res_query" != no; then |
15177 | test "$ac_cv_search_res_query" = "none required" || LIBS="$ac_cv_search_res_query $LIBS" | 20500 | test "$ac_cv_search_res_query" = "none required" || LIBS="$ac_cv_search_res_query $LIBS" |
15178 | 20501 | ||
15179 | fi | 20502 | fi |
15180 | 20503 | ||
15181 | echo "$as_me:15181: checking for library containing dn_expand" >&5 | 20504 | echo "$as_me:$LINENO: checking for library containing dn_expand" >&5 |
15182 | echo $ECHO_N "checking for library containing dn_expand... $ECHO_C" >&6 | 20505 | echo $ECHO_N "checking for library containing dn_expand... $ECHO_C" >&6 |
15183 | if test "${ac_cv_search_dn_expand+set}" = set; then | 20506 | if test "${ac_cv_search_dn_expand+set}" = set; then |
15184 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 20507 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -15186,8 +20509,11 @@ else | |||
15186 | ac_func_search_save_LIBS=$LIBS | 20509 | ac_func_search_save_LIBS=$LIBS |
15187 | ac_cv_search_dn_expand=no | 20510 | ac_cv_search_dn_expand=no |
15188 | cat >conftest.$ac_ext <<_ACEOF | 20511 | cat >conftest.$ac_ext <<_ACEOF |
15189 | #line 15189 "configure" | 20512 | /* confdefs.h. */ |
15190 | #include "confdefs.h" | 20513 | _ACEOF |
20514 | cat confdefs.h >>conftest.$ac_ext | ||
20515 | cat >>conftest.$ac_ext <<_ACEOF | ||
20516 | /* end confdefs.h. */ | ||
15191 | 20517 | ||
15192 | /* Override any gcc2 internal prototype to avoid an error. */ | 20518 | /* Override any gcc2 internal prototype to avoid an error. */ |
15193 | #ifdef __cplusplus | 20519 | #ifdef __cplusplus |
@@ -15205,29 +20531,44 @@ dn_expand (); | |||
15205 | } | 20531 | } |
15206 | _ACEOF | 20532 | _ACEOF |
15207 | rm -f conftest.$ac_objext conftest$ac_exeext | 20533 | rm -f conftest.$ac_objext conftest$ac_exeext |
15208 | if { (eval echo "$as_me:15208: \"$ac_link\"") >&5 | 20534 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
15209 | (eval $ac_link) 2>&5 | 20535 | (eval $ac_link) 2>conftest.er1 |
15210 | ac_status=$? | 20536 | ac_status=$? |
15211 | echo "$as_me:15211: \$? = $ac_status" >&5 | 20537 | grep -v '^ *+' conftest.er1 >conftest.err |
20538 | rm -f conftest.er1 | ||
20539 | cat conftest.err >&5 | ||
20540 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15212 | (exit $ac_status); } && | 20541 | (exit $ac_status); } && |
15213 | { ac_try='test -s conftest$ac_exeext' | 20542 | { ac_try='test -z "$ac_c_werror_flag" |
15214 | { (eval echo "$as_me:15214: \"$ac_try\"") >&5 | 20543 | || test ! -s conftest.err' |
20544 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
20545 | (eval $ac_try) 2>&5 | ||
20546 | ac_status=$? | ||
20547 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20548 | (exit $ac_status); }; } && | ||
20549 | { ac_try='test -s conftest$ac_exeext' | ||
20550 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15215 | (eval $ac_try) 2>&5 | 20551 | (eval $ac_try) 2>&5 |
15216 | ac_status=$? | 20552 | ac_status=$? |
15217 | echo "$as_me:15217: \$? = $ac_status" >&5 | 20553 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15218 | (exit $ac_status); }; }; then | 20554 | (exit $ac_status); }; }; then |
15219 | ac_cv_search_dn_expand="none required" | 20555 | ac_cv_search_dn_expand="none required" |
15220 | else | 20556 | else |
15221 | echo "$as_me: failed program was:" >&5 | 20557 | echo "$as_me: failed program was:" >&5 |
15222 | cat conftest.$ac_ext >&5 | 20558 | sed 's/^/| /' conftest.$ac_ext >&5 |
20559 | |||
15223 | fi | 20560 | fi |
15224 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 20561 | rm -f conftest.err conftest.$ac_objext \ |
20562 | conftest$ac_exeext conftest.$ac_ext | ||
15225 | if test "$ac_cv_search_dn_expand" = no; then | 20563 | if test "$ac_cv_search_dn_expand" = no; then |
15226 | for ac_lib in resolv; do | 20564 | for ac_lib in resolv; do |
15227 | LIBS="-l$ac_lib $ac_func_search_save_LIBS" | 20565 | LIBS="-l$ac_lib $ac_func_search_save_LIBS" |
15228 | cat >conftest.$ac_ext <<_ACEOF | 20566 | cat >conftest.$ac_ext <<_ACEOF |
15229 | #line 15229 "configure" | 20567 | /* confdefs.h. */ |
15230 | #include "confdefs.h" | 20568 | _ACEOF |
20569 | cat confdefs.h >>conftest.$ac_ext | ||
20570 | cat >>conftest.$ac_ext <<_ACEOF | ||
20571 | /* end confdefs.h. */ | ||
15231 | 20572 | ||
15232 | /* Override any gcc2 internal prototype to avoid an error. */ | 20573 | /* Override any gcc2 internal prototype to avoid an error. */ |
15233 | #ifdef __cplusplus | 20574 | #ifdef __cplusplus |
@@ -15245,112 +20586,268 @@ dn_expand (); | |||
15245 | } | 20586 | } |
15246 | _ACEOF | 20587 | _ACEOF |
15247 | rm -f conftest.$ac_objext conftest$ac_exeext | 20588 | rm -f conftest.$ac_objext conftest$ac_exeext |
15248 | if { (eval echo "$as_me:15248: \"$ac_link\"") >&5 | 20589 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
15249 | (eval $ac_link) 2>&5 | 20590 | (eval $ac_link) 2>conftest.er1 |
15250 | ac_status=$? | 20591 | ac_status=$? |
15251 | echo "$as_me:15251: \$? = $ac_status" >&5 | 20592 | grep -v '^ *+' conftest.er1 >conftest.err |
20593 | rm -f conftest.er1 | ||
20594 | cat conftest.err >&5 | ||
20595 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15252 | (exit $ac_status); } && | 20596 | (exit $ac_status); } && |
15253 | { ac_try='test -s conftest$ac_exeext' | 20597 | { ac_try='test -z "$ac_c_werror_flag" |
15254 | { (eval echo "$as_me:15254: \"$ac_try\"") >&5 | 20598 | || test ! -s conftest.err' |
20599 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15255 | (eval $ac_try) 2>&5 | 20600 | (eval $ac_try) 2>&5 |
15256 | ac_status=$? | 20601 | ac_status=$? |
15257 | echo "$as_me:15257: \$? = $ac_status" >&5 | 20602 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
20603 | (exit $ac_status); }; } && | ||
20604 | { ac_try='test -s conftest$ac_exeext' | ||
20605 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
20606 | (eval $ac_try) 2>&5 | ||
20607 | ac_status=$? | ||
20608 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15258 | (exit $ac_status); }; }; then | 20609 | (exit $ac_status); }; }; then |
15259 | ac_cv_search_dn_expand="-l$ac_lib" | 20610 | ac_cv_search_dn_expand="-l$ac_lib" |
15260 | break | 20611 | break |
15261 | else | 20612 | else |
15262 | echo "$as_me: failed program was:" >&5 | 20613 | echo "$as_me: failed program was:" >&5 |
15263 | cat conftest.$ac_ext >&5 | 20614 | sed 's/^/| /' conftest.$ac_ext >&5 |
20615 | |||
15264 | fi | 20616 | fi |
15265 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 20617 | rm -f conftest.err conftest.$ac_objext \ |
20618 | conftest$ac_exeext conftest.$ac_ext | ||
15266 | done | 20619 | done |
15267 | fi | 20620 | fi |
15268 | LIBS=$ac_func_search_save_LIBS | 20621 | LIBS=$ac_func_search_save_LIBS |
15269 | fi | 20622 | fi |
15270 | echo "$as_me:15270: result: $ac_cv_search_dn_expand" >&5 | 20623 | echo "$as_me:$LINENO: result: $ac_cv_search_dn_expand" >&5 |
15271 | echo "${ECHO_T}$ac_cv_search_dn_expand" >&6 | 20624 | echo "${ECHO_T}$ac_cv_search_dn_expand" >&6 |
15272 | if test "$ac_cv_search_dn_expand" != no; then | 20625 | if test "$ac_cv_search_dn_expand" != no; then |
15273 | test "$ac_cv_search_dn_expand" = "none required" || LIBS="$ac_cv_search_dn_expand $LIBS" | 20626 | test "$ac_cv_search_dn_expand" = "none required" || LIBS="$ac_cv_search_dn_expand $LIBS" |
15274 | 20627 | ||
15275 | fi | 20628 | fi |
15276 | 20629 | ||
20630 | echo "$as_me:$LINENO: checking if res_query will link" >&5 | ||
20631 | echo $ECHO_N "checking if res_query will link... $ECHO_C" >&6 | ||
20632 | cat >conftest.$ac_ext <<_ACEOF | ||
20633 | /* confdefs.h. */ | ||
20634 | _ACEOF | ||
20635 | cat confdefs.h >>conftest.$ac_ext | ||
20636 | cat >>conftest.$ac_ext <<_ACEOF | ||
20637 | /* end confdefs.h. */ | ||
20638 | |||
20639 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
20640 | #ifdef __cplusplus | ||
20641 | extern "C" | ||
20642 | #endif | ||
20643 | /* We use char because int might match the return type of a gcc2 | ||
20644 | builtin and then its argument prototype would still apply. */ | ||
20645 | char res_query (); | ||
20646 | int | ||
20647 | main () | ||
20648 | { | ||
20649 | res_query (); | ||
20650 | ; | ||
20651 | return 0; | ||
20652 | } | ||
20653 | _ACEOF | ||
20654 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
20655 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
20656 | (eval $ac_link) 2>conftest.er1 | ||
20657 | ac_status=$? | ||
20658 | grep -v '^ *+' conftest.er1 >conftest.err | ||
20659 | rm -f conftest.er1 | ||
20660 | cat conftest.err >&5 | ||
20661 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20662 | (exit $ac_status); } && | ||
20663 | { ac_try='test -z "$ac_c_werror_flag" | ||
20664 | || test ! -s conftest.err' | ||
20665 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
20666 | (eval $ac_try) 2>&5 | ||
20667 | ac_status=$? | ||
20668 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20669 | (exit $ac_status); }; } && | ||
20670 | { ac_try='test -s conftest$ac_exeext' | ||
20671 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
20672 | (eval $ac_try) 2>&5 | ||
20673 | ac_status=$? | ||
20674 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20675 | (exit $ac_status); }; }; then | ||
20676 | echo "$as_me:$LINENO: result: yes" >&5 | ||
20677 | echo "${ECHO_T}yes" >&6 | ||
20678 | else | ||
20679 | echo "$as_me: failed program was:" >&5 | ||
20680 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
20681 | |||
20682 | echo "$as_me:$LINENO: result: no" >&5 | ||
20683 | echo "${ECHO_T}no" >&6 | ||
20684 | saved_LIBS="$LIBS" | ||
20685 | LIBS="$LIBS -lresolv" | ||
20686 | echo "$as_me:$LINENO: checking for res_query in -lresolv" >&5 | ||
20687 | echo $ECHO_N "checking for res_query in -lresolv... $ECHO_C" >&6 | ||
20688 | cat >conftest.$ac_ext <<_ACEOF | ||
20689 | |||
20690 | #include <resolv.h> | ||
20691 | int main() | ||
20692 | { | ||
20693 | res_query (0, 0, 0, 0, 0); | ||
20694 | return 0; | ||
20695 | } | ||
20696 | |||
20697 | _ACEOF | ||
20698 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
20699 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
20700 | (eval $ac_link) 2>conftest.er1 | ||
20701 | ac_status=$? | ||
20702 | grep -v '^ *+' conftest.er1 >conftest.err | ||
20703 | rm -f conftest.er1 | ||
20704 | cat conftest.err >&5 | ||
20705 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20706 | (exit $ac_status); } && | ||
20707 | { ac_try='test -z "$ac_c_werror_flag" | ||
20708 | || test ! -s conftest.err' | ||
20709 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
20710 | (eval $ac_try) 2>&5 | ||
20711 | ac_status=$? | ||
20712 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20713 | (exit $ac_status); }; } && | ||
20714 | { ac_try='test -s conftest$ac_exeext' | ||
20715 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
20716 | (eval $ac_try) 2>&5 | ||
20717 | ac_status=$? | ||
20718 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20719 | (exit $ac_status); }; }; then | ||
20720 | LIBS="$LIBS -lresolv" | ||
20721 | echo "$as_me:$LINENO: result: yes" >&5 | ||
20722 | echo "${ECHO_T}yes" >&6 | ||
20723 | else | ||
20724 | echo "$as_me: failed program was:" >&5 | ||
20725 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
20726 | |||
20727 | LIBS="$saved_LIBS" | ||
20728 | echo "$as_me:$LINENO: result: no" >&5 | ||
20729 | echo "${ECHO_T}no" >&6 | ||
20730 | fi | ||
20731 | rm -f conftest.err conftest.$ac_objext \ | ||
20732 | conftest$ac_exeext conftest.$ac_ext | ||
20733 | |||
20734 | fi | ||
20735 | rm -f conftest.err conftest.$ac_objext \ | ||
20736 | conftest$ac_exeext conftest.$ac_ext | ||
20737 | |||
20738 | |||
15277 | for ac_func in _getshort _getlong | 20739 | for ac_func in _getshort _getlong |
15278 | do | 20740 | do |
15279 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | 20741 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
15280 | echo "$as_me:15280: checking for $ac_func" >&5 | 20742 | echo "$as_me:$LINENO: checking for $ac_func" >&5 |
15281 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | 20743 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 |
15282 | if eval "test \"\${$as_ac_var+set}\" = set"; then | 20744 | if eval "test \"\${$as_ac_var+set}\" = set"; then |
15283 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 20745 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
15284 | else | 20746 | else |
15285 | cat >conftest.$ac_ext <<_ACEOF | 20747 | cat >conftest.$ac_ext <<_ACEOF |
15286 | #line 15286 "configure" | 20748 | /* confdefs.h. */ |
15287 | #include "confdefs.h" | 20749 | _ACEOF |
20750 | cat confdefs.h >>conftest.$ac_ext | ||
20751 | cat >>conftest.$ac_ext <<_ACEOF | ||
20752 | /* end confdefs.h. */ | ||
20753 | /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | ||
20754 | For example, HP-UX 11i <limits.h> declares gettimeofday. */ | ||
20755 | #define $ac_func innocuous_$ac_func | ||
20756 | |||
15288 | /* System header to define __stub macros and hopefully few prototypes, | 20757 | /* System header to define __stub macros and hopefully few prototypes, |
15289 | which can conflict with char $ac_func (); below. */ | 20758 | which can conflict with char $ac_func (); below. |
15290 | #include <assert.h> | 20759 | Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
20760 | <limits.h> exists even on freestanding compilers. */ | ||
20761 | |||
20762 | #ifdef __STDC__ | ||
20763 | # include <limits.h> | ||
20764 | #else | ||
20765 | # include <assert.h> | ||
20766 | #endif | ||
20767 | |||
20768 | #undef $ac_func | ||
20769 | |||
15291 | /* Override any gcc2 internal prototype to avoid an error. */ | 20770 | /* Override any gcc2 internal prototype to avoid an error. */ |
15292 | #ifdef __cplusplus | 20771 | #ifdef __cplusplus |
15293 | extern "C" | 20772 | extern "C" |
20773 | { | ||
15294 | #endif | 20774 | #endif |
15295 | /* We use char because int might match the return type of a gcc2 | 20775 | /* We use char because int might match the return type of a gcc2 |
15296 | builtin and then its argument prototype would still apply. */ | 20776 | builtin and then its argument prototype would still apply. */ |
15297 | char $ac_func (); | 20777 | char $ac_func (); |
15298 | char (*f) (); | ||
15299 | |||
15300 | int | ||
15301 | main () | ||
15302 | { | ||
15303 | /* The GNU C library defines this for functions which it implements | 20778 | /* The GNU C library defines this for functions which it implements |
15304 | to always fail with ENOSYS. Some functions are actually named | 20779 | to always fail with ENOSYS. Some functions are actually named |
15305 | something starting with __ and the normal name is an alias. */ | 20780 | something starting with __ and the normal name is an alias. */ |
15306 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) | 20781 | #if defined (__stub_$ac_func) || defined (__stub___$ac_func) |
15307 | choke me | 20782 | choke me |
15308 | #else | 20783 | #else |
15309 | f = $ac_func; | 20784 | char (*f) () = $ac_func; |
20785 | #endif | ||
20786 | #ifdef __cplusplus | ||
20787 | } | ||
15310 | #endif | 20788 | #endif |
15311 | 20789 | ||
20790 | int | ||
20791 | main () | ||
20792 | { | ||
20793 | return f != $ac_func; | ||
15312 | ; | 20794 | ; |
15313 | return 0; | 20795 | return 0; |
15314 | } | 20796 | } |
15315 | _ACEOF | 20797 | _ACEOF |
15316 | rm -f conftest.$ac_objext conftest$ac_exeext | 20798 | rm -f conftest.$ac_objext conftest$ac_exeext |
15317 | if { (eval echo "$as_me:15317: \"$ac_link\"") >&5 | 20799 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
15318 | (eval $ac_link) 2>&5 | 20800 | (eval $ac_link) 2>conftest.er1 |
15319 | ac_status=$? | 20801 | ac_status=$? |
15320 | echo "$as_me:15320: \$? = $ac_status" >&5 | 20802 | grep -v '^ *+' conftest.er1 >conftest.err |
20803 | rm -f conftest.er1 | ||
20804 | cat conftest.err >&5 | ||
20805 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15321 | (exit $ac_status); } && | 20806 | (exit $ac_status); } && |
15322 | { ac_try='test -s conftest$ac_exeext' | 20807 | { ac_try='test -z "$ac_c_werror_flag" |
15323 | { (eval echo "$as_me:15323: \"$ac_try\"") >&5 | 20808 | || test ! -s conftest.err' |
20809 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15324 | (eval $ac_try) 2>&5 | 20810 | (eval $ac_try) 2>&5 |
15325 | ac_status=$? | 20811 | ac_status=$? |
15326 | echo "$as_me:15326: \$? = $ac_status" >&5 | 20812 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
20813 | (exit $ac_status); }; } && | ||
20814 | { ac_try='test -s conftest$ac_exeext' | ||
20815 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
20816 | (eval $ac_try) 2>&5 | ||
20817 | ac_status=$? | ||
20818 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15327 | (exit $ac_status); }; }; then | 20819 | (exit $ac_status); }; }; then |
15328 | eval "$as_ac_var=yes" | 20820 | eval "$as_ac_var=yes" |
15329 | else | 20821 | else |
15330 | echo "$as_me: failed program was:" >&5 | 20822 | echo "$as_me: failed program was:" >&5 |
15331 | cat conftest.$ac_ext >&5 | 20823 | sed 's/^/| /' conftest.$ac_ext >&5 |
20824 | |||
15332 | eval "$as_ac_var=no" | 20825 | eval "$as_ac_var=no" |
15333 | fi | 20826 | fi |
15334 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 20827 | rm -f conftest.err conftest.$ac_objext \ |
20828 | conftest$ac_exeext conftest.$ac_ext | ||
15335 | fi | 20829 | fi |
15336 | echo "$as_me:15336: result: `eval echo '${'$as_ac_var'}'`" >&5 | 20830 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 |
15337 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | 20831 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 |
15338 | if test `eval echo '${'$as_ac_var'}'` = yes; then | 20832 | if test `eval echo '${'$as_ac_var'}'` = yes; then |
15339 | cat >>confdefs.h <<EOF | 20833 | cat >>confdefs.h <<_ACEOF |
15340 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 20834 | #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
15341 | EOF | 20835 | _ACEOF |
15342 | 20836 | ||
15343 | fi | 20837 | fi |
15344 | done | 20838 | done |
15345 | 20839 | ||
15346 | echo "$as_me:15346: checking for HEADER.ad" >&5 | 20840 | echo "$as_me:$LINENO: checking for HEADER.ad" >&5 |
15347 | echo $ECHO_N "checking for HEADER.ad... $ECHO_C" >&6 | 20841 | echo $ECHO_N "checking for HEADER.ad... $ECHO_C" >&6 |
15348 | if test "${ac_cv_member_HEADER_ad+set}" = set; then | 20842 | if test "${ac_cv_member_HEADER_ad+set}" = set; then |
15349 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 20843 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
15350 | else | 20844 | else |
15351 | cat >conftest.$ac_ext <<_ACEOF | 20845 | cat >conftest.$ac_ext <<_ACEOF |
15352 | #line 15352 "configure" | 20846 | /* confdefs.h. */ |
15353 | #include "confdefs.h" | 20847 | _ACEOF |
20848 | cat confdefs.h >>conftest.$ac_ext | ||
20849 | cat >>conftest.$ac_ext <<_ACEOF | ||
20850 | /* end confdefs.h. */ | ||
15354 | #include <arpa/nameser.h> | 20851 | #include <arpa/nameser.h> |
15355 | 20852 | ||
15356 | int | 20853 | int |
@@ -15364,36 +20861,96 @@ return 0; | |||
15364 | } | 20861 | } |
15365 | _ACEOF | 20862 | _ACEOF |
15366 | rm -f conftest.$ac_objext | 20863 | rm -f conftest.$ac_objext |
15367 | if { (eval echo "$as_me:15367: \"$ac_compile\"") >&5 | 20864 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
15368 | (eval $ac_compile) 2>&5 | 20865 | (eval $ac_compile) 2>conftest.er1 |
20866 | ac_status=$? | ||
20867 | grep -v '^ *+' conftest.er1 >conftest.err | ||
20868 | rm -f conftest.er1 | ||
20869 | cat conftest.err >&5 | ||
20870 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20871 | (exit $ac_status); } && | ||
20872 | { ac_try='test -z "$ac_c_werror_flag" | ||
20873 | || test ! -s conftest.err' | ||
20874 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
20875 | (eval $ac_try) 2>&5 | ||
20876 | ac_status=$? | ||
20877 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20878 | (exit $ac_status); }; } && | ||
20879 | { ac_try='test -s conftest.$ac_objext' | ||
20880 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
20881 | (eval $ac_try) 2>&5 | ||
20882 | ac_status=$? | ||
20883 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20884 | (exit $ac_status); }; }; then | ||
20885 | ac_cv_member_HEADER_ad=yes | ||
20886 | else | ||
20887 | echo "$as_me: failed program was:" >&5 | ||
20888 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
20889 | |||
20890 | cat >conftest.$ac_ext <<_ACEOF | ||
20891 | /* confdefs.h. */ | ||
20892 | _ACEOF | ||
20893 | cat confdefs.h >>conftest.$ac_ext | ||
20894 | cat >>conftest.$ac_ext <<_ACEOF | ||
20895 | /* end confdefs.h. */ | ||
20896 | #include <arpa/nameser.h> | ||
20897 | |||
20898 | int | ||
20899 | main () | ||
20900 | { | ||
20901 | static HEADER ac_aggr; | ||
20902 | if (sizeof ac_aggr.ad) | ||
20903 | return 0; | ||
20904 | ; | ||
20905 | return 0; | ||
20906 | } | ||
20907 | _ACEOF | ||
20908 | rm -f conftest.$ac_objext | ||
20909 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
20910 | (eval $ac_compile) 2>conftest.er1 | ||
15369 | ac_status=$? | 20911 | ac_status=$? |
15370 | echo "$as_me:15370: \$? = $ac_status" >&5 | 20912 | grep -v '^ *+' conftest.er1 >conftest.err |
20913 | rm -f conftest.er1 | ||
20914 | cat conftest.err >&5 | ||
20915 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15371 | (exit $ac_status); } && | 20916 | (exit $ac_status); } && |
15372 | { ac_try='test -s conftest.$ac_objext' | 20917 | { ac_try='test -z "$ac_c_werror_flag" |
15373 | { (eval echo "$as_me:15373: \"$ac_try\"") >&5 | 20918 | || test ! -s conftest.err' |
20919 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
20920 | (eval $ac_try) 2>&5 | ||
20921 | ac_status=$? | ||
20922 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
20923 | (exit $ac_status); }; } && | ||
20924 | { ac_try='test -s conftest.$ac_objext' | ||
20925 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15374 | (eval $ac_try) 2>&5 | 20926 | (eval $ac_try) 2>&5 |
15375 | ac_status=$? | 20927 | ac_status=$? |
15376 | echo "$as_me:15376: \$? = $ac_status" >&5 | 20928 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15377 | (exit $ac_status); }; }; then | 20929 | (exit $ac_status); }; }; then |
15378 | ac_cv_member_HEADER_ad=yes | 20930 | ac_cv_member_HEADER_ad=yes |
15379 | else | 20931 | else |
15380 | echo "$as_me: failed program was:" >&5 | 20932 | echo "$as_me: failed program was:" >&5 |
15381 | cat conftest.$ac_ext >&5 | 20933 | sed 's/^/| /' conftest.$ac_ext >&5 |
20934 | |||
15382 | ac_cv_member_HEADER_ad=no | 20935 | ac_cv_member_HEADER_ad=no |
15383 | fi | 20936 | fi |
15384 | rm -f conftest.$ac_objext conftest.$ac_ext | 20937 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
20938 | fi | ||
20939 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
15385 | fi | 20940 | fi |
15386 | echo "$as_me:15386: result: $ac_cv_member_HEADER_ad" >&5 | 20941 | echo "$as_me:$LINENO: result: $ac_cv_member_HEADER_ad" >&5 |
15387 | echo "${ECHO_T}$ac_cv_member_HEADER_ad" >&6 | 20942 | echo "${ECHO_T}$ac_cv_member_HEADER_ad" >&6 |
15388 | if test $ac_cv_member_HEADER_ad = yes; then | 20943 | if test $ac_cv_member_HEADER_ad = yes; then |
15389 | cat >>confdefs.h <<\EOF | 20944 | cat >>confdefs.h <<\_ACEOF |
15390 | #define HAVE_HEADER_AD 1 | 20945 | #define HAVE_HEADER_AD 1 |
15391 | EOF | 20946 | _ACEOF |
15392 | 20947 | ||
15393 | fi | 20948 | fi |
15394 | 20949 | ||
20950 | |||
15395 | fi | 20951 | fi |
15396 | 20952 | ||
20953 | |||
15397 | # Check whether user wants Kerberos 5 support | 20954 | # Check whether user wants Kerberos 5 support |
15398 | KRB5_MSG="no" | 20955 | KRB5_MSG="no" |
15399 | 20956 | ||
@@ -15407,42 +20964,45 @@ if test "${with_kerberos5+set}" = set; then | |||
15407 | KRB5ROOT=${withval} | 20964 | KRB5ROOT=${withval} |
15408 | fi | 20965 | fi |
15409 | 20966 | ||
15410 | cat >>confdefs.h <<\EOF | 20967 | cat >>confdefs.h <<\_ACEOF |
15411 | #define KRB5 1 | 20968 | #define KRB5 1 |
15412 | EOF | 20969 | _ACEOF |
15413 | 20970 | ||
15414 | KRB5_MSG="yes" | 20971 | KRB5_MSG="yes" |
15415 | 20972 | ||
15416 | echo "$as_me:15416: checking for krb5-config" >&5 | 20973 | echo "$as_me:$LINENO: checking for krb5-config" >&5 |
15417 | echo $ECHO_N "checking for krb5-config... $ECHO_C" >&6 | 20974 | echo $ECHO_N "checking for krb5-config... $ECHO_C" >&6 |
15418 | if test -x $KRB5ROOT/bin/krb5-config ; then | 20975 | if test -x $KRB5ROOT/bin/krb5-config ; then |
15419 | KRB5CONF=$KRB5ROOT/bin/krb5-config | 20976 | KRB5CONF=$KRB5ROOT/bin/krb5-config |
15420 | echo "$as_me:15420: result: $KRB5CONF" >&5 | 20977 | echo "$as_me:$LINENO: result: $KRB5CONF" >&5 |
15421 | echo "${ECHO_T}$KRB5CONF" >&6 | 20978 | echo "${ECHO_T}$KRB5CONF" >&6 |
15422 | 20979 | ||
15423 | echo "$as_me:15423: checking for gssapi support" >&5 | 20980 | echo "$as_me:$LINENO: checking for gssapi support" >&5 |
15424 | echo $ECHO_N "checking for gssapi support... $ECHO_C" >&6 | 20981 | echo $ECHO_N "checking for gssapi support... $ECHO_C" >&6 |
15425 | if $KRB5CONF | grep gssapi >/dev/null ; then | 20982 | if $KRB5CONF | grep gssapi >/dev/null ; then |
15426 | echo "$as_me:15426: result: yes" >&5 | 20983 | echo "$as_me:$LINENO: result: yes" >&5 |
15427 | echo "${ECHO_T}yes" >&6 | 20984 | echo "${ECHO_T}yes" >&6 |
15428 | cat >>confdefs.h <<\EOF | 20985 | cat >>confdefs.h <<\_ACEOF |
15429 | #define GSSAPI 1 | 20986 | #define GSSAPI 1 |
15430 | EOF | 20987 | _ACEOF |
15431 | 20988 | ||
15432 | k5confopts=gssapi | 20989 | k5confopts=gssapi |
15433 | else | 20990 | else |
15434 | echo "$as_me:15434: result: no" >&5 | 20991 | echo "$as_me:$LINENO: result: no" >&5 |
15435 | echo "${ECHO_T}no" >&6 | 20992 | echo "${ECHO_T}no" >&6 |
15436 | k5confopts="" | 20993 | k5confopts="" |
15437 | fi | 20994 | fi |
15438 | K5CFLAGS="`$KRB5CONF --cflags $k5confopts`" | 20995 | K5CFLAGS="`$KRB5CONF --cflags $k5confopts`" |
15439 | K5LIBS="`$KRB5CONF --libs $k5confopts`" | 20996 | K5LIBS="`$KRB5CONF --libs $k5confopts`" |
15440 | CPPFLAGS="$CPPFLAGS $K5CFLAGS" | 20997 | CPPFLAGS="$CPPFLAGS $K5CFLAGS" |
15441 | echo "$as_me:15441: checking whether we are using Heimdal" >&5 | 20998 | echo "$as_me:$LINENO: checking whether we are using Heimdal" >&5 |
15442 | echo $ECHO_N "checking whether we are using Heimdal... $ECHO_C" >&6 | 20999 | echo $ECHO_N "checking whether we are using Heimdal... $ECHO_C" >&6 |
15443 | cat >conftest.$ac_ext <<_ACEOF | 21000 | cat >conftest.$ac_ext <<_ACEOF |
15444 | #line 15444 "configure" | 21001 | /* confdefs.h. */ |
15445 | #include "confdefs.h" | 21002 | _ACEOF |
21003 | cat confdefs.h >>conftest.$ac_ext | ||
21004 | cat >>conftest.$ac_ext <<_ACEOF | ||
21005 | /* end confdefs.h. */ | ||
15446 | #include <krb5.h> | 21006 | #include <krb5.h> |
15447 | int | 21007 | int |
15448 | main () | 21008 | main () |
@@ -15453,41 +21013,55 @@ main () | |||
15453 | } | 21013 | } |
15454 | _ACEOF | 21014 | _ACEOF |
15455 | rm -f conftest.$ac_objext | 21015 | rm -f conftest.$ac_objext |
15456 | if { (eval echo "$as_me:15456: \"$ac_compile\"") >&5 | 21016 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
15457 | (eval $ac_compile) 2>&5 | 21017 | (eval $ac_compile) 2>conftest.er1 |
15458 | ac_status=$? | 21018 | ac_status=$? |
15459 | echo "$as_me:15459: \$? = $ac_status" >&5 | 21019 | grep -v '^ *+' conftest.er1 >conftest.err |
21020 | rm -f conftest.er1 | ||
21021 | cat conftest.err >&5 | ||
21022 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15460 | (exit $ac_status); } && | 21023 | (exit $ac_status); } && |
15461 | { ac_try='test -s conftest.$ac_objext' | 21024 | { ac_try='test -z "$ac_c_werror_flag" |
15462 | { (eval echo "$as_me:15462: \"$ac_try\"") >&5 | 21025 | || test ! -s conftest.err' |
21026 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
21027 | (eval $ac_try) 2>&5 | ||
21028 | ac_status=$? | ||
21029 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21030 | (exit $ac_status); }; } && | ||
21031 | { ac_try='test -s conftest.$ac_objext' | ||
21032 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15463 | (eval $ac_try) 2>&5 | 21033 | (eval $ac_try) 2>&5 |
15464 | ac_status=$? | 21034 | ac_status=$? |
15465 | echo "$as_me:15465: \$? = $ac_status" >&5 | 21035 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15466 | (exit $ac_status); }; }; then | 21036 | (exit $ac_status); }; }; then |
15467 | echo "$as_me:15467: result: yes" >&5 | 21037 | echo "$as_me:$LINENO: result: yes" >&5 |
15468 | echo "${ECHO_T}yes" >&6 | 21038 | echo "${ECHO_T}yes" >&6 |
15469 | cat >>confdefs.h <<\EOF | 21039 | cat >>confdefs.h <<\_ACEOF |
15470 | #define HEIMDAL 1 | 21040 | #define HEIMDAL 1 |
15471 | EOF | 21041 | _ACEOF |
15472 | 21042 | ||
15473 | else | 21043 | else |
15474 | echo "$as_me: failed program was:" >&5 | 21044 | echo "$as_me: failed program was:" >&5 |
15475 | cat conftest.$ac_ext >&5 | 21045 | sed 's/^/| /' conftest.$ac_ext >&5 |
15476 | echo "$as_me:15476: result: no" >&5 | 21046 | |
21047 | echo "$as_me:$LINENO: result: no" >&5 | ||
15477 | echo "${ECHO_T}no" >&6 | 21048 | echo "${ECHO_T}no" >&6 |
15478 | 21049 | ||
15479 | fi | 21050 | fi |
15480 | rm -f conftest.$ac_objext conftest.$ac_ext | 21051 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
15481 | else | 21052 | else |
15482 | echo "$as_me:15482: result: no" >&5 | 21053 | echo "$as_me:$LINENO: result: no" >&5 |
15483 | echo "${ECHO_T}no" >&6 | 21054 | echo "${ECHO_T}no" >&6 |
15484 | CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include" | 21055 | CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include" |
15485 | LDFLAGS="$LDFLAGS -L${KRB5ROOT}/lib" | 21056 | LDFLAGS="$LDFLAGS -L${KRB5ROOT}/lib" |
15486 | echo "$as_me:15486: checking whether we are using Heimdal" >&5 | 21057 | echo "$as_me:$LINENO: checking whether we are using Heimdal" >&5 |
15487 | echo $ECHO_N "checking whether we are using Heimdal... $ECHO_C" >&6 | 21058 | echo $ECHO_N "checking whether we are using Heimdal... $ECHO_C" >&6 |
15488 | cat >conftest.$ac_ext <<_ACEOF | 21059 | cat >conftest.$ac_ext <<_ACEOF |
15489 | #line 15489 "configure" | 21060 | /* confdefs.h. */ |
15490 | #include "confdefs.h" | 21061 | _ACEOF |
21062 | cat confdefs.h >>conftest.$ac_ext | ||
21063 | cat >>conftest.$ac_ext <<_ACEOF | ||
21064 | /* end confdefs.h. */ | ||
15491 | #include <krb5.h> | 21065 | #include <krb5.h> |
15492 | int | 21066 | int |
15493 | main () | 21067 | main () |
@@ -15498,35 +21072,116 @@ main () | |||
15498 | } | 21072 | } |
15499 | _ACEOF | 21073 | _ACEOF |
15500 | rm -f conftest.$ac_objext | 21074 | rm -f conftest.$ac_objext |
15501 | if { (eval echo "$as_me:15501: \"$ac_compile\"") >&5 | 21075 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
15502 | (eval $ac_compile) 2>&5 | 21076 | (eval $ac_compile) 2>conftest.er1 |
15503 | ac_status=$? | 21077 | ac_status=$? |
15504 | echo "$as_me:15504: \$? = $ac_status" >&5 | 21078 | grep -v '^ *+' conftest.er1 >conftest.err |
21079 | rm -f conftest.er1 | ||
21080 | cat conftest.err >&5 | ||
21081 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15505 | (exit $ac_status); } && | 21082 | (exit $ac_status); } && |
15506 | { ac_try='test -s conftest.$ac_objext' | 21083 | { ac_try='test -z "$ac_c_werror_flag" |
15507 | { (eval echo "$as_me:15507: \"$ac_try\"") >&5 | 21084 | || test ! -s conftest.err' |
21085 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15508 | (eval $ac_try) 2>&5 | 21086 | (eval $ac_try) 2>&5 |
15509 | ac_status=$? | 21087 | ac_status=$? |
15510 | echo "$as_me:15510: \$? = $ac_status" >&5 | 21088 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
21089 | (exit $ac_status); }; } && | ||
21090 | { ac_try='test -s conftest.$ac_objext' | ||
21091 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
21092 | (eval $ac_try) 2>&5 | ||
21093 | ac_status=$? | ||
21094 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15511 | (exit $ac_status); }; }; then | 21095 | (exit $ac_status); }; }; then |
15512 | echo "$as_me:15512: result: yes" >&5 | 21096 | echo "$as_me:$LINENO: result: yes" >&5 |
15513 | echo "${ECHO_T}yes" >&6 | 21097 | echo "${ECHO_T}yes" >&6 |
15514 | cat >>confdefs.h <<\EOF | 21098 | cat >>confdefs.h <<\_ACEOF |
15515 | #define HEIMDAL 1 | 21099 | #define HEIMDAL 1 |
15516 | EOF | 21100 | _ACEOF |
15517 | 21101 | ||
15518 | K5LIBS="-lkrb5 -ldes -lcom_err -lasn1 -lroken" | 21102 | K5LIBS="-lkrb5 -ldes" |
21103 | K5LIBS="$K5LIBS -lcom_err -lasn1" | ||
21104 | echo "$as_me:$LINENO: checking for net_write in -lroken" >&5 | ||
21105 | echo $ECHO_N "checking for net_write in -lroken... $ECHO_C" >&6 | ||
21106 | if test "${ac_cv_lib_roken_net_write+set}" = set; then | ||
21107 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
21108 | else | ||
21109 | ac_check_lib_save_LIBS=$LIBS | ||
21110 | LIBS="-lroken $LIBS" | ||
21111 | cat >conftest.$ac_ext <<_ACEOF | ||
21112 | /* confdefs.h. */ | ||
21113 | _ACEOF | ||
21114 | cat confdefs.h >>conftest.$ac_ext | ||
21115 | cat >>conftest.$ac_ext <<_ACEOF | ||
21116 | /* end confdefs.h. */ | ||
15519 | 21117 | ||
21118 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
21119 | #ifdef __cplusplus | ||
21120 | extern "C" | ||
21121 | #endif | ||
21122 | /* We use char because int might match the return type of a gcc2 | ||
21123 | builtin and then its argument prototype would still apply. */ | ||
21124 | char net_write (); | ||
21125 | int | ||
21126 | main () | ||
21127 | { | ||
21128 | net_write (); | ||
21129 | ; | ||
21130 | return 0; | ||
21131 | } | ||
21132 | _ACEOF | ||
21133 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
21134 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | ||
21135 | (eval $ac_link) 2>conftest.er1 | ||
21136 | ac_status=$? | ||
21137 | grep -v '^ *+' conftest.er1 >conftest.err | ||
21138 | rm -f conftest.er1 | ||
21139 | cat conftest.err >&5 | ||
21140 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21141 | (exit $ac_status); } && | ||
21142 | { ac_try='test -z "$ac_c_werror_flag" | ||
21143 | || test ! -s conftest.err' | ||
21144 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
21145 | (eval $ac_try) 2>&5 | ||
21146 | ac_status=$? | ||
21147 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21148 | (exit $ac_status); }; } && | ||
21149 | { ac_try='test -s conftest$ac_exeext' | ||
21150 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
21151 | (eval $ac_try) 2>&5 | ||
21152 | ac_status=$? | ||
21153 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21154 | (exit $ac_status); }; }; then | ||
21155 | ac_cv_lib_roken_net_write=yes | ||
15520 | else | 21156 | else |
15521 | echo "$as_me: failed program was:" >&5 | 21157 | echo "$as_me: failed program was:" >&5 |
15522 | cat conftest.$ac_ext >&5 | 21158 | sed 's/^/| /' conftest.$ac_ext >&5 |
15523 | echo "$as_me:15523: result: no" >&5 | 21159 | |
21160 | ac_cv_lib_roken_net_write=no | ||
21161 | fi | ||
21162 | rm -f conftest.err conftest.$ac_objext \ | ||
21163 | conftest$ac_exeext conftest.$ac_ext | ||
21164 | LIBS=$ac_check_lib_save_LIBS | ||
21165 | fi | ||
21166 | echo "$as_me:$LINENO: result: $ac_cv_lib_roken_net_write" >&5 | ||
21167 | echo "${ECHO_T}$ac_cv_lib_roken_net_write" >&6 | ||
21168 | if test $ac_cv_lib_roken_net_write = yes; then | ||
21169 | K5LIBS="$K5LIBS -lroken" | ||
21170 | fi | ||
21171 | |||
21172 | |||
21173 | else | ||
21174 | echo "$as_me: failed program was:" >&5 | ||
21175 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
21176 | |||
21177 | echo "$as_me:$LINENO: result: no" >&5 | ||
15524 | echo "${ECHO_T}no" >&6 | 21178 | echo "${ECHO_T}no" >&6 |
15525 | K5LIBS="-lkrb5 -lk5crypto -lcom_err" | 21179 | K5LIBS="-lkrb5 -lk5crypto -lcom_err" |
15526 | 21180 | ||
21181 | |||
15527 | fi | 21182 | fi |
15528 | rm -f conftest.$ac_objext conftest.$ac_ext | 21183 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
15529 | echo "$as_me:15529: checking for library containing dn_expand" >&5 | 21184 | echo "$as_me:$LINENO: checking for library containing dn_expand" >&5 |
15530 | echo $ECHO_N "checking for library containing dn_expand... $ECHO_C" >&6 | 21185 | echo $ECHO_N "checking for library containing dn_expand... $ECHO_C" >&6 |
15531 | if test "${ac_cv_search_dn_expand+set}" = set; then | 21186 | if test "${ac_cv_search_dn_expand+set}" = set; then |
15532 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 21187 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -15534,8 +21189,11 @@ else | |||
15534 | ac_func_search_save_LIBS=$LIBS | 21189 | ac_func_search_save_LIBS=$LIBS |
15535 | ac_cv_search_dn_expand=no | 21190 | ac_cv_search_dn_expand=no |
15536 | cat >conftest.$ac_ext <<_ACEOF | 21191 | cat >conftest.$ac_ext <<_ACEOF |
15537 | #line 15537 "configure" | 21192 | /* confdefs.h. */ |
15538 | #include "confdefs.h" | 21193 | _ACEOF |
21194 | cat confdefs.h >>conftest.$ac_ext | ||
21195 | cat >>conftest.$ac_ext <<_ACEOF | ||
21196 | /* end confdefs.h. */ | ||
15539 | 21197 | ||
15540 | /* Override any gcc2 internal prototype to avoid an error. */ | 21198 | /* Override any gcc2 internal prototype to avoid an error. */ |
15541 | #ifdef __cplusplus | 21199 | #ifdef __cplusplus |
@@ -15553,29 +21211,44 @@ dn_expand (); | |||
15553 | } | 21211 | } |
15554 | _ACEOF | 21212 | _ACEOF |
15555 | rm -f conftest.$ac_objext conftest$ac_exeext | 21213 | rm -f conftest.$ac_objext conftest$ac_exeext |
15556 | if { (eval echo "$as_me:15556: \"$ac_link\"") >&5 | 21214 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
15557 | (eval $ac_link) 2>&5 | 21215 | (eval $ac_link) 2>conftest.er1 |
15558 | ac_status=$? | 21216 | ac_status=$? |
15559 | echo "$as_me:15559: \$? = $ac_status" >&5 | 21217 | grep -v '^ *+' conftest.er1 >conftest.err |
21218 | rm -f conftest.er1 | ||
21219 | cat conftest.err >&5 | ||
21220 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15560 | (exit $ac_status); } && | 21221 | (exit $ac_status); } && |
15561 | { ac_try='test -s conftest$ac_exeext' | 21222 | { ac_try='test -z "$ac_c_werror_flag" |
15562 | { (eval echo "$as_me:15562: \"$ac_try\"") >&5 | 21223 | || test ! -s conftest.err' |
21224 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15563 | (eval $ac_try) 2>&5 | 21225 | (eval $ac_try) 2>&5 |
15564 | ac_status=$? | 21226 | ac_status=$? |
15565 | echo "$as_me:15565: \$? = $ac_status" >&5 | 21227 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
21228 | (exit $ac_status); }; } && | ||
21229 | { ac_try='test -s conftest$ac_exeext' | ||
21230 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
21231 | (eval $ac_try) 2>&5 | ||
21232 | ac_status=$? | ||
21233 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15566 | (exit $ac_status); }; }; then | 21234 | (exit $ac_status); }; }; then |
15567 | ac_cv_search_dn_expand="none required" | 21235 | ac_cv_search_dn_expand="none required" |
15568 | else | 21236 | else |
15569 | echo "$as_me: failed program was:" >&5 | 21237 | echo "$as_me: failed program was:" >&5 |
15570 | cat conftest.$ac_ext >&5 | 21238 | sed 's/^/| /' conftest.$ac_ext >&5 |
21239 | |||
15571 | fi | 21240 | fi |
15572 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 21241 | rm -f conftest.err conftest.$ac_objext \ |
21242 | conftest$ac_exeext conftest.$ac_ext | ||
15573 | if test "$ac_cv_search_dn_expand" = no; then | 21243 | if test "$ac_cv_search_dn_expand" = no; then |
15574 | for ac_lib in resolv; do | 21244 | for ac_lib in resolv; do |
15575 | LIBS="-l$ac_lib $ac_func_search_save_LIBS" | 21245 | LIBS="-l$ac_lib $ac_func_search_save_LIBS" |
15576 | cat >conftest.$ac_ext <<_ACEOF | 21246 | cat >conftest.$ac_ext <<_ACEOF |
15577 | #line 15577 "configure" | 21247 | /* confdefs.h. */ |
15578 | #include "confdefs.h" | 21248 | _ACEOF |
21249 | cat confdefs.h >>conftest.$ac_ext | ||
21250 | cat >>conftest.$ac_ext <<_ACEOF | ||
21251 | /* end confdefs.h. */ | ||
15579 | 21252 | ||
15580 | /* Override any gcc2 internal prototype to avoid an error. */ | 21253 | /* Override any gcc2 internal prototype to avoid an error. */ |
15581 | #ifdef __cplusplus | 21254 | #ifdef __cplusplus |
@@ -15593,36 +21266,49 @@ dn_expand (); | |||
15593 | } | 21266 | } |
15594 | _ACEOF | 21267 | _ACEOF |
15595 | rm -f conftest.$ac_objext conftest$ac_exeext | 21268 | rm -f conftest.$ac_objext conftest$ac_exeext |
15596 | if { (eval echo "$as_me:15596: \"$ac_link\"") >&5 | 21269 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
15597 | (eval $ac_link) 2>&5 | 21270 | (eval $ac_link) 2>conftest.er1 |
15598 | ac_status=$? | 21271 | ac_status=$? |
15599 | echo "$as_me:15599: \$? = $ac_status" >&5 | 21272 | grep -v '^ *+' conftest.er1 >conftest.err |
21273 | rm -f conftest.er1 | ||
21274 | cat conftest.err >&5 | ||
21275 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15600 | (exit $ac_status); } && | 21276 | (exit $ac_status); } && |
15601 | { ac_try='test -s conftest$ac_exeext' | 21277 | { ac_try='test -z "$ac_c_werror_flag" |
15602 | { (eval echo "$as_me:15602: \"$ac_try\"") >&5 | 21278 | || test ! -s conftest.err' |
21279 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
21280 | (eval $ac_try) 2>&5 | ||
21281 | ac_status=$? | ||
21282 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21283 | (exit $ac_status); }; } && | ||
21284 | { ac_try='test -s conftest$ac_exeext' | ||
21285 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15603 | (eval $ac_try) 2>&5 | 21286 | (eval $ac_try) 2>&5 |
15604 | ac_status=$? | 21287 | ac_status=$? |
15605 | echo "$as_me:15605: \$? = $ac_status" >&5 | 21288 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15606 | (exit $ac_status); }; }; then | 21289 | (exit $ac_status); }; }; then |
15607 | ac_cv_search_dn_expand="-l$ac_lib" | 21290 | ac_cv_search_dn_expand="-l$ac_lib" |
15608 | break | 21291 | break |
15609 | else | 21292 | else |
15610 | echo "$as_me: failed program was:" >&5 | 21293 | echo "$as_me: failed program was:" >&5 |
15611 | cat conftest.$ac_ext >&5 | 21294 | sed 's/^/| /' conftest.$ac_ext >&5 |
21295 | |||
15612 | fi | 21296 | fi |
15613 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 21297 | rm -f conftest.err conftest.$ac_objext \ |
21298 | conftest$ac_exeext conftest.$ac_ext | ||
15614 | done | 21299 | done |
15615 | fi | 21300 | fi |
15616 | LIBS=$ac_func_search_save_LIBS | 21301 | LIBS=$ac_func_search_save_LIBS |
15617 | fi | 21302 | fi |
15618 | echo "$as_me:15618: result: $ac_cv_search_dn_expand" >&5 | 21303 | echo "$as_me:$LINENO: result: $ac_cv_search_dn_expand" >&5 |
15619 | echo "${ECHO_T}$ac_cv_search_dn_expand" >&6 | 21304 | echo "${ECHO_T}$ac_cv_search_dn_expand" >&6 |
15620 | if test "$ac_cv_search_dn_expand" != no; then | 21305 | if test "$ac_cv_search_dn_expand" != no; then |
15621 | test "$ac_cv_search_dn_expand" = "none required" || LIBS="$ac_cv_search_dn_expand $LIBS" | 21306 | test "$ac_cv_search_dn_expand" = "none required" || LIBS="$ac_cv_search_dn_expand $LIBS" |
15622 | 21307 | ||
15623 | fi | 21308 | fi |
15624 | 21309 | ||
15625 | echo "$as_me:15625: checking for gss_init_sec_context in -lgssapi" >&5 | 21310 | |
21311 | echo "$as_me:$LINENO: checking for gss_init_sec_context in -lgssapi" >&5 | ||
15626 | echo $ECHO_N "checking for gss_init_sec_context in -lgssapi... $ECHO_C" >&6 | 21312 | echo $ECHO_N "checking for gss_init_sec_context in -lgssapi... $ECHO_C" >&6 |
15627 | if test "${ac_cv_lib_gssapi_gss_init_sec_context+set}" = set; then | 21313 | if test "${ac_cv_lib_gssapi_gss_init_sec_context+set}" = set; then |
15628 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 21314 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -15630,8 +21316,11 @@ else | |||
15630 | ac_check_lib_save_LIBS=$LIBS | 21316 | ac_check_lib_save_LIBS=$LIBS |
15631 | LIBS="-lgssapi $K5LIBS $LIBS" | 21317 | LIBS="-lgssapi $K5LIBS $LIBS" |
15632 | cat >conftest.$ac_ext <<_ACEOF | 21318 | cat >conftest.$ac_ext <<_ACEOF |
15633 | #line 15633 "configure" | 21319 | /* confdefs.h. */ |
15634 | #include "confdefs.h" | 21320 | _ACEOF |
21321 | cat confdefs.h >>conftest.$ac_ext | ||
21322 | cat >>conftest.$ac_ext <<_ACEOF | ||
21323 | /* end confdefs.h. */ | ||
15635 | 21324 | ||
15636 | /* Override any gcc2 internal prototype to avoid an error. */ | 21325 | /* Override any gcc2 internal prototype to avoid an error. */ |
15637 | #ifdef __cplusplus | 21326 | #ifdef __cplusplus |
@@ -15649,36 +21338,48 @@ gss_init_sec_context (); | |||
15649 | } | 21338 | } |
15650 | _ACEOF | 21339 | _ACEOF |
15651 | rm -f conftest.$ac_objext conftest$ac_exeext | 21340 | rm -f conftest.$ac_objext conftest$ac_exeext |
15652 | if { (eval echo "$as_me:15652: \"$ac_link\"") >&5 | 21341 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
15653 | (eval $ac_link) 2>&5 | 21342 | (eval $ac_link) 2>conftest.er1 |
15654 | ac_status=$? | 21343 | ac_status=$? |
15655 | echo "$as_me:15655: \$? = $ac_status" >&5 | 21344 | grep -v '^ *+' conftest.er1 >conftest.err |
21345 | rm -f conftest.er1 | ||
21346 | cat conftest.err >&5 | ||
21347 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15656 | (exit $ac_status); } && | 21348 | (exit $ac_status); } && |
15657 | { ac_try='test -s conftest$ac_exeext' | 21349 | { ac_try='test -z "$ac_c_werror_flag" |
15658 | { (eval echo "$as_me:15658: \"$ac_try\"") >&5 | 21350 | || test ! -s conftest.err' |
21351 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15659 | (eval $ac_try) 2>&5 | 21352 | (eval $ac_try) 2>&5 |
15660 | ac_status=$? | 21353 | ac_status=$? |
15661 | echo "$as_me:15661: \$? = $ac_status" >&5 | 21354 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
21355 | (exit $ac_status); }; } && | ||
21356 | { ac_try='test -s conftest$ac_exeext' | ||
21357 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
21358 | (eval $ac_try) 2>&5 | ||
21359 | ac_status=$? | ||
21360 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15662 | (exit $ac_status); }; }; then | 21361 | (exit $ac_status); }; }; then |
15663 | ac_cv_lib_gssapi_gss_init_sec_context=yes | 21362 | ac_cv_lib_gssapi_gss_init_sec_context=yes |
15664 | else | 21363 | else |
15665 | echo "$as_me: failed program was:" >&5 | 21364 | echo "$as_me: failed program was:" >&5 |
15666 | cat conftest.$ac_ext >&5 | 21365 | sed 's/^/| /' conftest.$ac_ext >&5 |
21366 | |||
15667 | ac_cv_lib_gssapi_gss_init_sec_context=no | 21367 | ac_cv_lib_gssapi_gss_init_sec_context=no |
15668 | fi | 21368 | fi |
15669 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 21369 | rm -f conftest.err conftest.$ac_objext \ |
21370 | conftest$ac_exeext conftest.$ac_ext | ||
15670 | LIBS=$ac_check_lib_save_LIBS | 21371 | LIBS=$ac_check_lib_save_LIBS |
15671 | fi | 21372 | fi |
15672 | echo "$as_me:15672: result: $ac_cv_lib_gssapi_gss_init_sec_context" >&5 | 21373 | echo "$as_me:$LINENO: result: $ac_cv_lib_gssapi_gss_init_sec_context" >&5 |
15673 | echo "${ECHO_T}$ac_cv_lib_gssapi_gss_init_sec_context" >&6 | 21374 | echo "${ECHO_T}$ac_cv_lib_gssapi_gss_init_sec_context" >&6 |
15674 | if test $ac_cv_lib_gssapi_gss_init_sec_context = yes; then | 21375 | if test $ac_cv_lib_gssapi_gss_init_sec_context = yes; then |
15675 | cat >>confdefs.h <<\EOF | 21376 | cat >>confdefs.h <<\_ACEOF |
15676 | #define GSSAPI 1 | 21377 | #define GSSAPI 1 |
15677 | EOF | 21378 | _ACEOF |
15678 | 21379 | ||
15679 | K5LIBS="-lgssapi $K5LIBS" | 21380 | K5LIBS="-lgssapi $K5LIBS" |
15680 | else | 21381 | else |
15681 | echo "$as_me:15681: checking for gss_init_sec_context in -lgssapi_krb5" >&5 | 21382 | echo "$as_me:$LINENO: checking for gss_init_sec_context in -lgssapi_krb5" >&5 |
15682 | echo $ECHO_N "checking for gss_init_sec_context in -lgssapi_krb5... $ECHO_C" >&6 | 21383 | echo $ECHO_N "checking for gss_init_sec_context in -lgssapi_krb5... $ECHO_C" >&6 |
15683 | if test "${ac_cv_lib_gssapi_krb5_gss_init_sec_context+set}" = set; then | 21384 | if test "${ac_cv_lib_gssapi_krb5_gss_init_sec_context+set}" = set; then |
15684 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 21385 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -15686,8 +21387,11 @@ else | |||
15686 | ac_check_lib_save_LIBS=$LIBS | 21387 | ac_check_lib_save_LIBS=$LIBS |
15687 | LIBS="-lgssapi_krb5 $K5LIBS $LIBS" | 21388 | LIBS="-lgssapi_krb5 $K5LIBS $LIBS" |
15688 | cat >conftest.$ac_ext <<_ACEOF | 21389 | cat >conftest.$ac_ext <<_ACEOF |
15689 | #line 15689 "configure" | 21390 | /* confdefs.h. */ |
15690 | #include "confdefs.h" | 21391 | _ACEOF |
21392 | cat confdefs.h >>conftest.$ac_ext | ||
21393 | cat >>conftest.$ac_ext <<_ACEOF | ||
21394 | /* end confdefs.h. */ | ||
15691 | 21395 | ||
15692 | /* Override any gcc2 internal prototype to avoid an error. */ | 21396 | /* Override any gcc2 internal prototype to avoid an error. */ |
15693 | #ifdef __cplusplus | 21397 | #ifdef __cplusplus |
@@ -15705,61 +21409,131 @@ gss_init_sec_context (); | |||
15705 | } | 21409 | } |
15706 | _ACEOF | 21410 | _ACEOF |
15707 | rm -f conftest.$ac_objext conftest$ac_exeext | 21411 | rm -f conftest.$ac_objext conftest$ac_exeext |
15708 | if { (eval echo "$as_me:15708: \"$ac_link\"") >&5 | 21412 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
15709 | (eval $ac_link) 2>&5 | 21413 | (eval $ac_link) 2>conftest.er1 |
15710 | ac_status=$? | 21414 | ac_status=$? |
15711 | echo "$as_me:15711: \$? = $ac_status" >&5 | 21415 | grep -v '^ *+' conftest.er1 >conftest.err |
21416 | rm -f conftest.er1 | ||
21417 | cat conftest.err >&5 | ||
21418 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
15712 | (exit $ac_status); } && | 21419 | (exit $ac_status); } && |
15713 | { ac_try='test -s conftest$ac_exeext' | 21420 | { ac_try='test -z "$ac_c_werror_flag" |
15714 | { (eval echo "$as_me:15714: \"$ac_try\"") >&5 | 21421 | || test ! -s conftest.err' |
21422 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
21423 | (eval $ac_try) 2>&5 | ||
21424 | ac_status=$? | ||
21425 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21426 | (exit $ac_status); }; } && | ||
21427 | { ac_try='test -s conftest$ac_exeext' | ||
21428 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
15715 | (eval $ac_try) 2>&5 | 21429 | (eval $ac_try) 2>&5 |
15716 | ac_status=$? | 21430 | ac_status=$? |
15717 | echo "$as_me:15717: \$? = $ac_status" >&5 | 21431 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15718 | (exit $ac_status); }; }; then | 21432 | (exit $ac_status); }; }; then |
15719 | ac_cv_lib_gssapi_krb5_gss_init_sec_context=yes | 21433 | ac_cv_lib_gssapi_krb5_gss_init_sec_context=yes |
15720 | else | 21434 | else |
15721 | echo "$as_me: failed program was:" >&5 | 21435 | echo "$as_me: failed program was:" >&5 |
15722 | cat conftest.$ac_ext >&5 | 21436 | sed 's/^/| /' conftest.$ac_ext >&5 |
21437 | |||
15723 | ac_cv_lib_gssapi_krb5_gss_init_sec_context=no | 21438 | ac_cv_lib_gssapi_krb5_gss_init_sec_context=no |
15724 | fi | 21439 | fi |
15725 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 21440 | rm -f conftest.err conftest.$ac_objext \ |
21441 | conftest$ac_exeext conftest.$ac_ext | ||
15726 | LIBS=$ac_check_lib_save_LIBS | 21442 | LIBS=$ac_check_lib_save_LIBS |
15727 | fi | 21443 | fi |
15728 | echo "$as_me:15728: result: $ac_cv_lib_gssapi_krb5_gss_init_sec_context" >&5 | 21444 | echo "$as_me:$LINENO: result: $ac_cv_lib_gssapi_krb5_gss_init_sec_context" >&5 |
15729 | echo "${ECHO_T}$ac_cv_lib_gssapi_krb5_gss_init_sec_context" >&6 | 21445 | echo "${ECHO_T}$ac_cv_lib_gssapi_krb5_gss_init_sec_context" >&6 |
15730 | if test $ac_cv_lib_gssapi_krb5_gss_init_sec_context = yes; then | 21446 | if test $ac_cv_lib_gssapi_krb5_gss_init_sec_context = yes; then |
15731 | cat >>confdefs.h <<\EOF | 21447 | cat >>confdefs.h <<\_ACEOF |
15732 | #define GSSAPI 1 | 21448 | #define GSSAPI 1 |
15733 | EOF | 21449 | _ACEOF |
15734 | 21450 | ||
15735 | K5LIBS="-lgssapi_krb5 $K5LIBS" | 21451 | K5LIBS="-lgssapi_krb5 $K5LIBS" |
15736 | else | 21452 | else |
15737 | { echo "$as_me:15737: WARNING: Cannot find any suitable gss-api library - build may fail" >&5 | 21453 | { echo "$as_me:$LINENO: WARNING: Cannot find any suitable gss-api library - build may fail" >&5 |
15738 | echo "$as_me: WARNING: Cannot find any suitable gss-api library - build may fail" >&2;} | 21454 | echo "$as_me: WARNING: Cannot find any suitable gss-api library - build may fail" >&2;} |
15739 | fi | 21455 | fi |
15740 | 21456 | ||
21457 | |||
15741 | fi | 21458 | fi |
15742 | 21459 | ||
15743 | echo "$as_me:15743: checking for gssapi.h" >&5 | 21460 | |
21461 | if test "${ac_cv_header_gssapi_h+set}" = set; then | ||
21462 | echo "$as_me:$LINENO: checking for gssapi.h" >&5 | ||
15744 | echo $ECHO_N "checking for gssapi.h... $ECHO_C" >&6 | 21463 | echo $ECHO_N "checking for gssapi.h... $ECHO_C" >&6 |
15745 | if test "${ac_cv_header_gssapi_h+set}" = set; then | 21464 | if test "${ac_cv_header_gssapi_h+set}" = set; then |
15746 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 21465 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
21466 | fi | ||
21467 | echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_h" >&5 | ||
21468 | echo "${ECHO_T}$ac_cv_header_gssapi_h" >&6 | ||
15747 | else | 21469 | else |
15748 | cat >conftest.$ac_ext <<_ACEOF | 21470 | # Is the header compilable? |
15749 | #line 15749 "configure" | 21471 | echo "$as_me:$LINENO: checking gssapi.h usability" >&5 |
15750 | #include "confdefs.h" | 21472 | echo $ECHO_N "checking gssapi.h usability... $ECHO_C" >&6 |
21473 | cat >conftest.$ac_ext <<_ACEOF | ||
21474 | /* confdefs.h. */ | ||
21475 | _ACEOF | ||
21476 | cat confdefs.h >>conftest.$ac_ext | ||
21477 | cat >>conftest.$ac_ext <<_ACEOF | ||
21478 | /* end confdefs.h. */ | ||
21479 | $ac_includes_default | ||
21480 | #include <gssapi.h> | ||
21481 | _ACEOF | ||
21482 | rm -f conftest.$ac_objext | ||
21483 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
21484 | (eval $ac_compile) 2>conftest.er1 | ||
21485 | ac_status=$? | ||
21486 | grep -v '^ *+' conftest.er1 >conftest.err | ||
21487 | rm -f conftest.er1 | ||
21488 | cat conftest.err >&5 | ||
21489 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21490 | (exit $ac_status); } && | ||
21491 | { ac_try='test -z "$ac_c_werror_flag" | ||
21492 | || test ! -s conftest.err' | ||
21493 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
21494 | (eval $ac_try) 2>&5 | ||
21495 | ac_status=$? | ||
21496 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21497 | (exit $ac_status); }; } && | ||
21498 | { ac_try='test -s conftest.$ac_objext' | ||
21499 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
21500 | (eval $ac_try) 2>&5 | ||
21501 | ac_status=$? | ||
21502 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21503 | (exit $ac_status); }; }; then | ||
21504 | ac_header_compiler=yes | ||
21505 | else | ||
21506 | echo "$as_me: failed program was:" >&5 | ||
21507 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
21508 | |||
21509 | ac_header_compiler=no | ||
21510 | fi | ||
21511 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
21512 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
21513 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
21514 | |||
21515 | # Is the header present? | ||
21516 | echo "$as_me:$LINENO: checking gssapi.h presence" >&5 | ||
21517 | echo $ECHO_N "checking gssapi.h presence... $ECHO_C" >&6 | ||
21518 | cat >conftest.$ac_ext <<_ACEOF | ||
21519 | /* confdefs.h. */ | ||
21520 | _ACEOF | ||
21521 | cat confdefs.h >>conftest.$ac_ext | ||
21522 | cat >>conftest.$ac_ext <<_ACEOF | ||
21523 | /* end confdefs.h. */ | ||
15751 | #include <gssapi.h> | 21524 | #include <gssapi.h> |
15752 | _ACEOF | 21525 | _ACEOF |
15753 | if { (eval echo "$as_me:15753: \"$ac_cpp conftest.$ac_ext\"") >&5 | 21526 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 |
15754 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | 21527 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
15755 | ac_status=$? | 21528 | ac_status=$? |
15756 | egrep -v '^ *\+' conftest.er1 >conftest.err | 21529 | grep -v '^ *+' conftest.er1 >conftest.err |
15757 | rm -f conftest.er1 | 21530 | rm -f conftest.er1 |
15758 | cat conftest.err >&5 | 21531 | cat conftest.err >&5 |
15759 | echo "$as_me:15759: \$? = $ac_status" >&5 | 21532 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15760 | (exit $ac_status); } >/dev/null; then | 21533 | (exit $ac_status); } >/dev/null; then |
15761 | if test -s conftest.err; then | 21534 | if test -s conftest.err; then |
15762 | ac_cpp_err=$ac_c_preproc_warn_flag | 21535 | ac_cpp_err=$ac_c_preproc_warn_flag |
21536 | ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
15763 | else | 21537 | else |
15764 | ac_cpp_err= | 21538 | ac_cpp_err= |
15765 | fi | 21539 | fi |
@@ -15767,16 +21541,60 @@ else | |||
15767 | ac_cpp_err=yes | 21541 | ac_cpp_err=yes |
15768 | fi | 21542 | fi |
15769 | if test -z "$ac_cpp_err"; then | 21543 | if test -z "$ac_cpp_err"; then |
15770 | ac_cv_header_gssapi_h=yes | 21544 | ac_header_preproc=yes |
15771 | else | 21545 | else |
15772 | echo "$as_me: failed program was:" >&5 | 21546 | echo "$as_me: failed program was:" >&5 |
15773 | cat conftest.$ac_ext >&5 | 21547 | sed 's/^/| /' conftest.$ac_ext >&5 |
15774 | ac_cv_header_gssapi_h=no | 21548 | |
21549 | ac_header_preproc=no | ||
15775 | fi | 21550 | fi |
15776 | rm -f conftest.err conftest.$ac_ext | 21551 | rm -f conftest.err conftest.$ac_ext |
21552 | echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
21553 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
21554 | |||
21555 | # So? What about this header? | ||
21556 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
21557 | yes:no: ) | ||
21558 | { echo "$as_me:$LINENO: WARNING: gssapi.h: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
21559 | echo "$as_me: WARNING: gssapi.h: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
21560 | { echo "$as_me:$LINENO: WARNING: gssapi.h: proceeding with the compiler's result" >&5 | ||
21561 | echo "$as_me: WARNING: gssapi.h: proceeding with the compiler's result" >&2;} | ||
21562 | ac_header_preproc=yes | ||
21563 | ;; | ||
21564 | no:yes:* ) | ||
21565 | { echo "$as_me:$LINENO: WARNING: gssapi.h: present but cannot be compiled" >&5 | ||
21566 | echo "$as_me: WARNING: gssapi.h: present but cannot be compiled" >&2;} | ||
21567 | { echo "$as_me:$LINENO: WARNING: gssapi.h: check for missing prerequisite headers?" >&5 | ||
21568 | echo "$as_me: WARNING: gssapi.h: check for missing prerequisite headers?" >&2;} | ||
21569 | { echo "$as_me:$LINENO: WARNING: gssapi.h: see the Autoconf documentation" >&5 | ||
21570 | echo "$as_me: WARNING: gssapi.h: see the Autoconf documentation" >&2;} | ||
21571 | { echo "$as_me:$LINENO: WARNING: gssapi.h: section \"Present But Cannot Be Compiled\"" >&5 | ||
21572 | echo "$as_me: WARNING: gssapi.h: section \"Present But Cannot Be Compiled\"" >&2;} | ||
21573 | { echo "$as_me:$LINENO: WARNING: gssapi.h: proceeding with the preprocessor's result" >&5 | ||
21574 | echo "$as_me: WARNING: gssapi.h: proceeding with the preprocessor's result" >&2;} | ||
21575 | { echo "$as_me:$LINENO: WARNING: gssapi.h: in the future, the compiler will take precedence" >&5 | ||
21576 | echo "$as_me: WARNING: gssapi.h: in the future, the compiler will take precedence" >&2;} | ||
21577 | ( | ||
21578 | cat <<\_ASBOX | ||
21579 | ## ------------------------------------------ ## | ||
21580 | ## Report this to the AC_PACKAGE_NAME lists. ## | ||
21581 | ## ------------------------------------------ ## | ||
21582 | _ASBOX | ||
21583 | ) | | ||
21584 | sed "s/^/$as_me: WARNING: /" >&2 | ||
21585 | ;; | ||
21586 | esac | ||
21587 | echo "$as_me:$LINENO: checking for gssapi.h" >&5 | ||
21588 | echo $ECHO_N "checking for gssapi.h... $ECHO_C" >&6 | ||
21589 | if test "${ac_cv_header_gssapi_h+set}" = set; then | ||
21590 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
21591 | else | ||
21592 | ac_cv_header_gssapi_h=$ac_header_preproc | ||
15777 | fi | 21593 | fi |
15778 | echo "$as_me:15778: result: $ac_cv_header_gssapi_h" >&5 | 21594 | echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_h" >&5 |
15779 | echo "${ECHO_T}$ac_cv_header_gssapi_h" >&6 | 21595 | echo "${ECHO_T}$ac_cv_header_gssapi_h" >&6 |
21596 | |||
21597 | fi | ||
15780 | if test $ac_cv_header_gssapi_h = yes; then | 21598 | if test $ac_cv_header_gssapi_h = yes; then |
15781 | : | 21599 | : |
15782 | else | 21600 | else |
@@ -15786,26 +21604,82 @@ else | |||
15786 | for ac_header in gssapi.h | 21604 | for ac_header in gssapi.h |
15787 | do | 21605 | do |
15788 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | 21606 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` |
15789 | echo "$as_me:15789: checking for $ac_header" >&5 | 21607 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
21608 | echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
15790 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | 21609 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 |
15791 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | 21610 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
15792 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 21611 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
21612 | fi | ||
21613 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
21614 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
15793 | else | 21615 | else |
15794 | cat >conftest.$ac_ext <<_ACEOF | 21616 | # Is the header compilable? |
15795 | #line 15795 "configure" | 21617 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 |
15796 | #include "confdefs.h" | 21618 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 |
21619 | cat >conftest.$ac_ext <<_ACEOF | ||
21620 | /* confdefs.h. */ | ||
21621 | _ACEOF | ||
21622 | cat confdefs.h >>conftest.$ac_ext | ||
21623 | cat >>conftest.$ac_ext <<_ACEOF | ||
21624 | /* end confdefs.h. */ | ||
21625 | $ac_includes_default | ||
21626 | #include <$ac_header> | ||
21627 | _ACEOF | ||
21628 | rm -f conftest.$ac_objext | ||
21629 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
21630 | (eval $ac_compile) 2>conftest.er1 | ||
21631 | ac_status=$? | ||
21632 | grep -v '^ *+' conftest.er1 >conftest.err | ||
21633 | rm -f conftest.er1 | ||
21634 | cat conftest.err >&5 | ||
21635 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21636 | (exit $ac_status); } && | ||
21637 | { ac_try='test -z "$ac_c_werror_flag" | ||
21638 | || test ! -s conftest.err' | ||
21639 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
21640 | (eval $ac_try) 2>&5 | ||
21641 | ac_status=$? | ||
21642 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21643 | (exit $ac_status); }; } && | ||
21644 | { ac_try='test -s conftest.$ac_objext' | ||
21645 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
21646 | (eval $ac_try) 2>&5 | ||
21647 | ac_status=$? | ||
21648 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21649 | (exit $ac_status); }; }; then | ||
21650 | ac_header_compiler=yes | ||
21651 | else | ||
21652 | echo "$as_me: failed program was:" >&5 | ||
21653 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
21654 | |||
21655 | ac_header_compiler=no | ||
21656 | fi | ||
21657 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
21658 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
21659 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
21660 | |||
21661 | # Is the header present? | ||
21662 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
21663 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
21664 | cat >conftest.$ac_ext <<_ACEOF | ||
21665 | /* confdefs.h. */ | ||
21666 | _ACEOF | ||
21667 | cat confdefs.h >>conftest.$ac_ext | ||
21668 | cat >>conftest.$ac_ext <<_ACEOF | ||
21669 | /* end confdefs.h. */ | ||
15797 | #include <$ac_header> | 21670 | #include <$ac_header> |
15798 | _ACEOF | 21671 | _ACEOF |
15799 | if { (eval echo "$as_me:15799: \"$ac_cpp conftest.$ac_ext\"") >&5 | 21672 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 |
15800 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | 21673 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
15801 | ac_status=$? | 21674 | ac_status=$? |
15802 | egrep -v '^ *\+' conftest.er1 >conftest.err | 21675 | grep -v '^ *+' conftest.er1 >conftest.err |
15803 | rm -f conftest.er1 | 21676 | rm -f conftest.er1 |
15804 | cat conftest.err >&5 | 21677 | cat conftest.err >&5 |
15805 | echo "$as_me:15805: \$? = $ac_status" >&5 | 21678 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15806 | (exit $ac_status); } >/dev/null; then | 21679 | (exit $ac_status); } >/dev/null; then |
15807 | if test -s conftest.err; then | 21680 | if test -s conftest.err; then |
15808 | ac_cpp_err=$ac_c_preproc_warn_flag | 21681 | ac_cpp_err=$ac_c_preproc_warn_flag |
21682 | ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
15809 | else | 21683 | else |
15810 | ac_cpp_err= | 21684 | ac_cpp_err= |
15811 | fi | 21685 | fi |
@@ -15813,52 +21687,157 @@ else | |||
15813 | ac_cpp_err=yes | 21687 | ac_cpp_err=yes |
15814 | fi | 21688 | fi |
15815 | if test -z "$ac_cpp_err"; then | 21689 | if test -z "$ac_cpp_err"; then |
15816 | eval "$as_ac_Header=yes" | 21690 | ac_header_preproc=yes |
15817 | else | 21691 | else |
15818 | echo "$as_me: failed program was:" >&5 | 21692 | echo "$as_me: failed program was:" >&5 |
15819 | cat conftest.$ac_ext >&5 | 21693 | sed 's/^/| /' conftest.$ac_ext >&5 |
15820 | eval "$as_ac_Header=no" | 21694 | |
21695 | ac_header_preproc=no | ||
15821 | fi | 21696 | fi |
15822 | rm -f conftest.err conftest.$ac_ext | 21697 | rm -f conftest.err conftest.$ac_ext |
21698 | echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
21699 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
21700 | |||
21701 | # So? What about this header? | ||
21702 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
21703 | yes:no: ) | ||
21704 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
21705 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
21706 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
21707 | echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
21708 | ac_header_preproc=yes | ||
21709 | ;; | ||
21710 | no:yes:* ) | ||
21711 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
21712 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
21713 | { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
21714 | echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
21715 | { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
21716 | echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
21717 | { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
21718 | echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
21719 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
21720 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
21721 | { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
21722 | echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
21723 | ( | ||
21724 | cat <<\_ASBOX | ||
21725 | ## ------------------------------------------ ## | ||
21726 | ## Report this to the AC_PACKAGE_NAME lists. ## | ||
21727 | ## ------------------------------------------ ## | ||
21728 | _ASBOX | ||
21729 | ) | | ||
21730 | sed "s/^/$as_me: WARNING: /" >&2 | ||
21731 | ;; | ||
21732 | esac | ||
21733 | echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
21734 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | ||
21735 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
21736 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
21737 | else | ||
21738 | eval "$as_ac_Header=\$ac_header_preproc" | ||
15823 | fi | 21739 | fi |
15824 | echo "$as_me:15824: result: `eval echo '${'$as_ac_Header'}'`" >&5 | 21740 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 |
15825 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | 21741 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 |
21742 | |||
21743 | fi | ||
15826 | if test `eval echo '${'$as_ac_Header'}'` = yes; then | 21744 | if test `eval echo '${'$as_ac_Header'}'` = yes; then |
15827 | cat >>confdefs.h <<EOF | 21745 | cat >>confdefs.h <<_ACEOF |
15828 | #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 21746 | #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
15829 | EOF | 21747 | _ACEOF |
15830 | 21748 | ||
15831 | else | 21749 | else |
15832 | { echo "$as_me:15832: WARNING: Cannot find any suitable gss-api header - build may fail" >&5 | 21750 | { echo "$as_me:$LINENO: WARNING: Cannot find any suitable gss-api header - build may fail" >&5 |
15833 | echo "$as_me: WARNING: Cannot find any suitable gss-api header - build may fail" >&2;} | 21751 | echo "$as_me: WARNING: Cannot find any suitable gss-api header - build may fail" >&2;} |
15834 | 21752 | ||
15835 | fi | 21753 | fi |
21754 | |||
15836 | done | 21755 | done |
15837 | 21756 | ||
21757 | |||
21758 | |||
15838 | fi | 21759 | fi |
15839 | 21760 | ||
21761 | |||
21762 | |||
15840 | oldCPP="$CPPFLAGS" | 21763 | oldCPP="$CPPFLAGS" |
15841 | CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include/gssapi" | 21764 | CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include/gssapi" |
15842 | echo "$as_me:15842: checking for gssapi_krb5.h" >&5 | 21765 | if test "${ac_cv_header_gssapi_krb5_h+set}" = set; then |
21766 | echo "$as_me:$LINENO: checking for gssapi_krb5.h" >&5 | ||
15843 | echo $ECHO_N "checking for gssapi_krb5.h... $ECHO_C" >&6 | 21767 | echo $ECHO_N "checking for gssapi_krb5.h... $ECHO_C" >&6 |
15844 | if test "${ac_cv_header_gssapi_krb5_h+set}" = set; then | 21768 | if test "${ac_cv_header_gssapi_krb5_h+set}" = set; then |
15845 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 21769 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
21770 | fi | ||
21771 | echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_krb5_h" >&5 | ||
21772 | echo "${ECHO_T}$ac_cv_header_gssapi_krb5_h" >&6 | ||
15846 | else | 21773 | else |
15847 | cat >conftest.$ac_ext <<_ACEOF | 21774 | # Is the header compilable? |
15848 | #line 15848 "configure" | 21775 | echo "$as_me:$LINENO: checking gssapi_krb5.h usability" >&5 |
15849 | #include "confdefs.h" | 21776 | echo $ECHO_N "checking gssapi_krb5.h usability... $ECHO_C" >&6 |
21777 | cat >conftest.$ac_ext <<_ACEOF | ||
21778 | /* confdefs.h. */ | ||
21779 | _ACEOF | ||
21780 | cat confdefs.h >>conftest.$ac_ext | ||
21781 | cat >>conftest.$ac_ext <<_ACEOF | ||
21782 | /* end confdefs.h. */ | ||
21783 | $ac_includes_default | ||
21784 | #include <gssapi_krb5.h> | ||
21785 | _ACEOF | ||
21786 | rm -f conftest.$ac_objext | ||
21787 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
21788 | (eval $ac_compile) 2>conftest.er1 | ||
21789 | ac_status=$? | ||
21790 | grep -v '^ *+' conftest.er1 >conftest.err | ||
21791 | rm -f conftest.er1 | ||
21792 | cat conftest.err >&5 | ||
21793 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21794 | (exit $ac_status); } && | ||
21795 | { ac_try='test -z "$ac_c_werror_flag" | ||
21796 | || test ! -s conftest.err' | ||
21797 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
21798 | (eval $ac_try) 2>&5 | ||
21799 | ac_status=$? | ||
21800 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21801 | (exit $ac_status); }; } && | ||
21802 | { ac_try='test -s conftest.$ac_objext' | ||
21803 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
21804 | (eval $ac_try) 2>&5 | ||
21805 | ac_status=$? | ||
21806 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21807 | (exit $ac_status); }; }; then | ||
21808 | ac_header_compiler=yes | ||
21809 | else | ||
21810 | echo "$as_me: failed program was:" >&5 | ||
21811 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
21812 | |||
21813 | ac_header_compiler=no | ||
21814 | fi | ||
21815 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
21816 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
21817 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
21818 | |||
21819 | # Is the header present? | ||
21820 | echo "$as_me:$LINENO: checking gssapi_krb5.h presence" >&5 | ||
21821 | echo $ECHO_N "checking gssapi_krb5.h presence... $ECHO_C" >&6 | ||
21822 | cat >conftest.$ac_ext <<_ACEOF | ||
21823 | /* confdefs.h. */ | ||
21824 | _ACEOF | ||
21825 | cat confdefs.h >>conftest.$ac_ext | ||
21826 | cat >>conftest.$ac_ext <<_ACEOF | ||
21827 | /* end confdefs.h. */ | ||
15850 | #include <gssapi_krb5.h> | 21828 | #include <gssapi_krb5.h> |
15851 | _ACEOF | 21829 | _ACEOF |
15852 | if { (eval echo "$as_me:15852: \"$ac_cpp conftest.$ac_ext\"") >&5 | 21830 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 |
15853 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | 21831 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
15854 | ac_status=$? | 21832 | ac_status=$? |
15855 | egrep -v '^ *\+' conftest.er1 >conftest.err | 21833 | grep -v '^ *+' conftest.er1 >conftest.err |
15856 | rm -f conftest.er1 | 21834 | rm -f conftest.er1 |
15857 | cat conftest.err >&5 | 21835 | cat conftest.err >&5 |
15858 | echo "$as_me:15858: \$? = $ac_status" >&5 | 21836 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15859 | (exit $ac_status); } >/dev/null; then | 21837 | (exit $ac_status); } >/dev/null; then |
15860 | if test -s conftest.err; then | 21838 | if test -s conftest.err; then |
15861 | ac_cpp_err=$ac_c_preproc_warn_flag | 21839 | ac_cpp_err=$ac_c_preproc_warn_flag |
21840 | ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
15862 | else | 21841 | else |
15863 | ac_cpp_err= | 21842 | ac_cpp_err= |
15864 | fi | 21843 | fi |
@@ -15866,22 +21845,68 @@ else | |||
15866 | ac_cpp_err=yes | 21845 | ac_cpp_err=yes |
15867 | fi | 21846 | fi |
15868 | if test -z "$ac_cpp_err"; then | 21847 | if test -z "$ac_cpp_err"; then |
15869 | ac_cv_header_gssapi_krb5_h=yes | 21848 | ac_header_preproc=yes |
15870 | else | 21849 | else |
15871 | echo "$as_me: failed program was:" >&5 | 21850 | echo "$as_me: failed program was:" >&5 |
15872 | cat conftest.$ac_ext >&5 | 21851 | sed 's/^/| /' conftest.$ac_ext >&5 |
15873 | ac_cv_header_gssapi_krb5_h=no | 21852 | |
21853 | ac_header_preproc=no | ||
15874 | fi | 21854 | fi |
15875 | rm -f conftest.err conftest.$ac_ext | 21855 | rm -f conftest.err conftest.$ac_ext |
21856 | echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
21857 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
21858 | |||
21859 | # So? What about this header? | ||
21860 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
21861 | yes:no: ) | ||
21862 | { echo "$as_me:$LINENO: WARNING: gssapi_krb5.h: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
21863 | echo "$as_me: WARNING: gssapi_krb5.h: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
21864 | { echo "$as_me:$LINENO: WARNING: gssapi_krb5.h: proceeding with the compiler's result" >&5 | ||
21865 | echo "$as_me: WARNING: gssapi_krb5.h: proceeding with the compiler's result" >&2;} | ||
21866 | ac_header_preproc=yes | ||
21867 | ;; | ||
21868 | no:yes:* ) | ||
21869 | { echo "$as_me:$LINENO: WARNING: gssapi_krb5.h: present but cannot be compiled" >&5 | ||
21870 | echo "$as_me: WARNING: gssapi_krb5.h: present but cannot be compiled" >&2;} | ||
21871 | { echo "$as_me:$LINENO: WARNING: gssapi_krb5.h: check for missing prerequisite headers?" >&5 | ||
21872 | echo "$as_me: WARNING: gssapi_krb5.h: check for missing prerequisite headers?" >&2;} | ||
21873 | { echo "$as_me:$LINENO: WARNING: gssapi_krb5.h: see the Autoconf documentation" >&5 | ||
21874 | echo "$as_me: WARNING: gssapi_krb5.h: see the Autoconf documentation" >&2;} | ||
21875 | { echo "$as_me:$LINENO: WARNING: gssapi_krb5.h: section \"Present But Cannot Be Compiled\"" >&5 | ||
21876 | echo "$as_me: WARNING: gssapi_krb5.h: section \"Present But Cannot Be Compiled\"" >&2;} | ||
21877 | { echo "$as_me:$LINENO: WARNING: gssapi_krb5.h: proceeding with the preprocessor's result" >&5 | ||
21878 | echo "$as_me: WARNING: gssapi_krb5.h: proceeding with the preprocessor's result" >&2;} | ||
21879 | { echo "$as_me:$LINENO: WARNING: gssapi_krb5.h: in the future, the compiler will take precedence" >&5 | ||
21880 | echo "$as_me: WARNING: gssapi_krb5.h: in the future, the compiler will take precedence" >&2;} | ||
21881 | ( | ||
21882 | cat <<\_ASBOX | ||
21883 | ## ------------------------------------------ ## | ||
21884 | ## Report this to the AC_PACKAGE_NAME lists. ## | ||
21885 | ## ------------------------------------------ ## | ||
21886 | _ASBOX | ||
21887 | ) | | ||
21888 | sed "s/^/$as_me: WARNING: /" >&2 | ||
21889 | ;; | ||
21890 | esac | ||
21891 | echo "$as_me:$LINENO: checking for gssapi_krb5.h" >&5 | ||
21892 | echo $ECHO_N "checking for gssapi_krb5.h... $ECHO_C" >&6 | ||
21893 | if test "${ac_cv_header_gssapi_krb5_h+set}" = set; then | ||
21894 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
21895 | else | ||
21896 | ac_cv_header_gssapi_krb5_h=$ac_header_preproc | ||
15876 | fi | 21897 | fi |
15877 | echo "$as_me:15877: result: $ac_cv_header_gssapi_krb5_h" >&5 | 21898 | echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_krb5_h" >&5 |
15878 | echo "${ECHO_T}$ac_cv_header_gssapi_krb5_h" >&6 | 21899 | echo "${ECHO_T}$ac_cv_header_gssapi_krb5_h" >&6 |
21900 | |||
21901 | fi | ||
15879 | if test $ac_cv_header_gssapi_krb5_h = yes; then | 21902 | if test $ac_cv_header_gssapi_krb5_h = yes; then |
15880 | : | 21903 | : |
15881 | else | 21904 | else |
15882 | CPPFLAGS="$oldCPP" | 21905 | CPPFLAGS="$oldCPP" |
15883 | fi | 21906 | fi |
15884 | 21907 | ||
21908 | |||
21909 | |||
15885 | fi | 21910 | fi |
15886 | if test ! -z "$need_dash_r" ; then | 21911 | if test ! -z "$need_dash_r" ; then |
15887 | LDFLAGS="$LDFLAGS -R${KRB5ROOT}/lib" | 21912 | LDFLAGS="$LDFLAGS -R${KRB5ROOT}/lib" |
@@ -15891,29 +21916,87 @@ fi | |||
15891 | fi | 21916 | fi |
15892 | fi | 21917 | fi |
15893 | 21918 | ||
21919 | |||
21920 | |||
15894 | for ac_header in gssapi.h gssapi/gssapi.h | 21921 | for ac_header in gssapi.h gssapi/gssapi.h |
15895 | do | 21922 | do |
15896 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | 21923 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` |
15897 | echo "$as_me:15897: checking for $ac_header" >&5 | 21924 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
21925 | echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
15898 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | 21926 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 |
15899 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | 21927 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
15900 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 21928 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
21929 | fi | ||
21930 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
21931 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
15901 | else | 21932 | else |
15902 | cat >conftest.$ac_ext <<_ACEOF | 21933 | # Is the header compilable? |
15903 | #line 15903 "configure" | 21934 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 |
15904 | #include "confdefs.h" | 21935 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 |
21936 | cat >conftest.$ac_ext <<_ACEOF | ||
21937 | /* confdefs.h. */ | ||
21938 | _ACEOF | ||
21939 | cat confdefs.h >>conftest.$ac_ext | ||
21940 | cat >>conftest.$ac_ext <<_ACEOF | ||
21941 | /* end confdefs.h. */ | ||
21942 | $ac_includes_default | ||
15905 | #include <$ac_header> | 21943 | #include <$ac_header> |
15906 | _ACEOF | 21944 | _ACEOF |
15907 | if { (eval echo "$as_me:15907: \"$ac_cpp conftest.$ac_ext\"") >&5 | 21945 | rm -f conftest.$ac_objext |
21946 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
21947 | (eval $ac_compile) 2>conftest.er1 | ||
21948 | ac_status=$? | ||
21949 | grep -v '^ *+' conftest.er1 >conftest.err | ||
21950 | rm -f conftest.er1 | ||
21951 | cat conftest.err >&5 | ||
21952 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21953 | (exit $ac_status); } && | ||
21954 | { ac_try='test -z "$ac_c_werror_flag" | ||
21955 | || test ! -s conftest.err' | ||
21956 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
21957 | (eval $ac_try) 2>&5 | ||
21958 | ac_status=$? | ||
21959 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21960 | (exit $ac_status); }; } && | ||
21961 | { ac_try='test -s conftest.$ac_objext' | ||
21962 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
21963 | (eval $ac_try) 2>&5 | ||
21964 | ac_status=$? | ||
21965 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
21966 | (exit $ac_status); }; }; then | ||
21967 | ac_header_compiler=yes | ||
21968 | else | ||
21969 | echo "$as_me: failed program was:" >&5 | ||
21970 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
21971 | |||
21972 | ac_header_compiler=no | ||
21973 | fi | ||
21974 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
21975 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
21976 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
21977 | |||
21978 | # Is the header present? | ||
21979 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
21980 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
21981 | cat >conftest.$ac_ext <<_ACEOF | ||
21982 | /* confdefs.h. */ | ||
21983 | _ACEOF | ||
21984 | cat confdefs.h >>conftest.$ac_ext | ||
21985 | cat >>conftest.$ac_ext <<_ACEOF | ||
21986 | /* end confdefs.h. */ | ||
21987 | #include <$ac_header> | ||
21988 | _ACEOF | ||
21989 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
15908 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | 21990 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
15909 | ac_status=$? | 21991 | ac_status=$? |
15910 | egrep -v '^ *\+' conftest.er1 >conftest.err | 21992 | grep -v '^ *+' conftest.er1 >conftest.err |
15911 | rm -f conftest.er1 | 21993 | rm -f conftest.er1 |
15912 | cat conftest.err >&5 | 21994 | cat conftest.err >&5 |
15913 | echo "$as_me:15913: \$? = $ac_status" >&5 | 21995 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15914 | (exit $ac_status); } >/dev/null; then | 21996 | (exit $ac_status); } >/dev/null; then |
15915 | if test -s conftest.err; then | 21997 | if test -s conftest.err; then |
15916 | ac_cpp_err=$ac_c_preproc_warn_flag | 21998 | ac_cpp_err=$ac_c_preproc_warn_flag |
21999 | ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
15917 | else | 22000 | else |
15918 | ac_cpp_err= | 22001 | ac_cpp_err= |
15919 | fi | 22002 | fi |
@@ -15921,47 +22004,150 @@ else | |||
15921 | ac_cpp_err=yes | 22004 | ac_cpp_err=yes |
15922 | fi | 22005 | fi |
15923 | if test -z "$ac_cpp_err"; then | 22006 | if test -z "$ac_cpp_err"; then |
15924 | eval "$as_ac_Header=yes" | 22007 | ac_header_preproc=yes |
15925 | else | 22008 | else |
15926 | echo "$as_me: failed program was:" >&5 | 22009 | echo "$as_me: failed program was:" >&5 |
15927 | cat conftest.$ac_ext >&5 | 22010 | sed 's/^/| /' conftest.$ac_ext >&5 |
15928 | eval "$as_ac_Header=no" | 22011 | |
22012 | ac_header_preproc=no | ||
15929 | fi | 22013 | fi |
15930 | rm -f conftest.err conftest.$ac_ext | 22014 | rm -f conftest.err conftest.$ac_ext |
22015 | echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
22016 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
22017 | |||
22018 | # So? What about this header? | ||
22019 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
22020 | yes:no: ) | ||
22021 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
22022 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
22023 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
22024 | echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
22025 | ac_header_preproc=yes | ||
22026 | ;; | ||
22027 | no:yes:* ) | ||
22028 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
22029 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
22030 | { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
22031 | echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
22032 | { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
22033 | echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
22034 | { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
22035 | echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
22036 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
22037 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
22038 | { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
22039 | echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
22040 | ( | ||
22041 | cat <<\_ASBOX | ||
22042 | ## ------------------------------------------ ## | ||
22043 | ## Report this to the AC_PACKAGE_NAME lists. ## | ||
22044 | ## ------------------------------------------ ## | ||
22045 | _ASBOX | ||
22046 | ) | | ||
22047 | sed "s/^/$as_me: WARNING: /" >&2 | ||
22048 | ;; | ||
22049 | esac | ||
22050 | echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
22051 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | ||
22052 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
22053 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
22054 | else | ||
22055 | eval "$as_ac_Header=\$ac_header_preproc" | ||
15931 | fi | 22056 | fi |
15932 | echo "$as_me:15932: result: `eval echo '${'$as_ac_Header'}'`" >&5 | 22057 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 |
15933 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | 22058 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 |
22059 | |||
22060 | fi | ||
15934 | if test `eval echo '${'$as_ac_Header'}'` = yes; then | 22061 | if test `eval echo '${'$as_ac_Header'}'` = yes; then |
15935 | cat >>confdefs.h <<EOF | 22062 | cat >>confdefs.h <<_ACEOF |
15936 | #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 22063 | #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
15937 | EOF | 22064 | _ACEOF |
15938 | 22065 | ||
15939 | fi | 22066 | fi |
22067 | |||
15940 | done | 22068 | done |
15941 | 22069 | ||
22070 | |||
22071 | |||
15942 | for ac_header in gssapi_krb5.h gssapi/gssapi_krb5.h | 22072 | for ac_header in gssapi_krb5.h gssapi/gssapi_krb5.h |
15943 | do | 22073 | do |
15944 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | 22074 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` |
15945 | echo "$as_me:15945: checking for $ac_header" >&5 | 22075 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
22076 | echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
15946 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | 22077 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 |
15947 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | 22078 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
15948 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 22079 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
22080 | fi | ||
22081 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
22082 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
15949 | else | 22083 | else |
15950 | cat >conftest.$ac_ext <<_ACEOF | 22084 | # Is the header compilable? |
15951 | #line 15951 "configure" | 22085 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 |
15952 | #include "confdefs.h" | 22086 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 |
22087 | cat >conftest.$ac_ext <<_ACEOF | ||
22088 | /* confdefs.h. */ | ||
22089 | _ACEOF | ||
22090 | cat confdefs.h >>conftest.$ac_ext | ||
22091 | cat >>conftest.$ac_ext <<_ACEOF | ||
22092 | /* end confdefs.h. */ | ||
22093 | $ac_includes_default | ||
15953 | #include <$ac_header> | 22094 | #include <$ac_header> |
15954 | _ACEOF | 22095 | _ACEOF |
15955 | if { (eval echo "$as_me:15955: \"$ac_cpp conftest.$ac_ext\"") >&5 | 22096 | rm -f conftest.$ac_objext |
22097 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
22098 | (eval $ac_compile) 2>conftest.er1 | ||
22099 | ac_status=$? | ||
22100 | grep -v '^ *+' conftest.er1 >conftest.err | ||
22101 | rm -f conftest.er1 | ||
22102 | cat conftest.err >&5 | ||
22103 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
22104 | (exit $ac_status); } && | ||
22105 | { ac_try='test -z "$ac_c_werror_flag" | ||
22106 | || test ! -s conftest.err' | ||
22107 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
22108 | (eval $ac_try) 2>&5 | ||
22109 | ac_status=$? | ||
22110 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
22111 | (exit $ac_status); }; } && | ||
22112 | { ac_try='test -s conftest.$ac_objext' | ||
22113 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
22114 | (eval $ac_try) 2>&5 | ||
22115 | ac_status=$? | ||
22116 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
22117 | (exit $ac_status); }; }; then | ||
22118 | ac_header_compiler=yes | ||
22119 | else | ||
22120 | echo "$as_me: failed program was:" >&5 | ||
22121 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
22122 | |||
22123 | ac_header_compiler=no | ||
22124 | fi | ||
22125 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
22126 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
22127 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
22128 | |||
22129 | # Is the header present? | ||
22130 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
22131 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
22132 | cat >conftest.$ac_ext <<_ACEOF | ||
22133 | /* confdefs.h. */ | ||
22134 | _ACEOF | ||
22135 | cat confdefs.h >>conftest.$ac_ext | ||
22136 | cat >>conftest.$ac_ext <<_ACEOF | ||
22137 | /* end confdefs.h. */ | ||
22138 | #include <$ac_header> | ||
22139 | _ACEOF | ||
22140 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
15956 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | 22141 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
15957 | ac_status=$? | 22142 | ac_status=$? |
15958 | egrep -v '^ *\+' conftest.er1 >conftest.err | 22143 | grep -v '^ *+' conftest.er1 >conftest.err |
15959 | rm -f conftest.er1 | 22144 | rm -f conftest.er1 |
15960 | cat conftest.err >&5 | 22145 | cat conftest.err >&5 |
15961 | echo "$as_me:15961: \$? = $ac_status" >&5 | 22146 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
15962 | (exit $ac_status); } >/dev/null; then | 22147 | (exit $ac_status); } >/dev/null; then |
15963 | if test -s conftest.err; then | 22148 | if test -s conftest.err; then |
15964 | ac_cpp_err=$ac_c_preproc_warn_flag | 22149 | ac_cpp_err=$ac_c_preproc_warn_flag |
22150 | ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
15965 | else | 22151 | else |
15966 | ac_cpp_err= | 22152 | ac_cpp_err= |
15967 | fi | 22153 | fi |
@@ -15969,47 +22155,150 @@ else | |||
15969 | ac_cpp_err=yes | 22155 | ac_cpp_err=yes |
15970 | fi | 22156 | fi |
15971 | if test -z "$ac_cpp_err"; then | 22157 | if test -z "$ac_cpp_err"; then |
15972 | eval "$as_ac_Header=yes" | 22158 | ac_header_preproc=yes |
15973 | else | 22159 | else |
15974 | echo "$as_me: failed program was:" >&5 | 22160 | echo "$as_me: failed program was:" >&5 |
15975 | cat conftest.$ac_ext >&5 | 22161 | sed 's/^/| /' conftest.$ac_ext >&5 |
15976 | eval "$as_ac_Header=no" | 22162 | |
22163 | ac_header_preproc=no | ||
15977 | fi | 22164 | fi |
15978 | rm -f conftest.err conftest.$ac_ext | 22165 | rm -f conftest.err conftest.$ac_ext |
22166 | echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
22167 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
22168 | |||
22169 | # So? What about this header? | ||
22170 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
22171 | yes:no: ) | ||
22172 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
22173 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
22174 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
22175 | echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
22176 | ac_header_preproc=yes | ||
22177 | ;; | ||
22178 | no:yes:* ) | ||
22179 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
22180 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
22181 | { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
22182 | echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
22183 | { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
22184 | echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
22185 | { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
22186 | echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
22187 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
22188 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
22189 | { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
22190 | echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
22191 | ( | ||
22192 | cat <<\_ASBOX | ||
22193 | ## ------------------------------------------ ## | ||
22194 | ## Report this to the AC_PACKAGE_NAME lists. ## | ||
22195 | ## ------------------------------------------ ## | ||
22196 | _ASBOX | ||
22197 | ) | | ||
22198 | sed "s/^/$as_me: WARNING: /" >&2 | ||
22199 | ;; | ||
22200 | esac | ||
22201 | echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
22202 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | ||
22203 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
22204 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
22205 | else | ||
22206 | eval "$as_ac_Header=\$ac_header_preproc" | ||
15979 | fi | 22207 | fi |
15980 | echo "$as_me:15980: result: `eval echo '${'$as_ac_Header'}'`" >&5 | 22208 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 |
15981 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | 22209 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 |
22210 | |||
22211 | fi | ||
15982 | if test `eval echo '${'$as_ac_Header'}'` = yes; then | 22212 | if test `eval echo '${'$as_ac_Header'}'` = yes; then |
15983 | cat >>confdefs.h <<EOF | 22213 | cat >>confdefs.h <<_ACEOF |
15984 | #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 22214 | #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
15985 | EOF | 22215 | _ACEOF |
15986 | 22216 | ||
15987 | fi | 22217 | fi |
22218 | |||
15988 | done | 22219 | done |
15989 | 22220 | ||
22221 | |||
22222 | |||
15990 | for ac_header in gssapi_generic.h gssapi/gssapi_generic.h | 22223 | for ac_header in gssapi_generic.h gssapi/gssapi_generic.h |
15991 | do | 22224 | do |
15992 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | 22225 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` |
15993 | echo "$as_me:15993: checking for $ac_header" >&5 | 22226 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
22227 | echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
15994 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | 22228 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 |
15995 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | 22229 | if eval "test \"\${$as_ac_Header+set}\" = set"; then |
15996 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 22230 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
22231 | fi | ||
22232 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
22233 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
15997 | else | 22234 | else |
15998 | cat >conftest.$ac_ext <<_ACEOF | 22235 | # Is the header compilable? |
15999 | #line 15999 "configure" | 22236 | echo "$as_me:$LINENO: checking $ac_header usability" >&5 |
16000 | #include "confdefs.h" | 22237 | echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 |
22238 | cat >conftest.$ac_ext <<_ACEOF | ||
22239 | /* confdefs.h. */ | ||
22240 | _ACEOF | ||
22241 | cat confdefs.h >>conftest.$ac_ext | ||
22242 | cat >>conftest.$ac_ext <<_ACEOF | ||
22243 | /* end confdefs.h. */ | ||
22244 | $ac_includes_default | ||
16001 | #include <$ac_header> | 22245 | #include <$ac_header> |
16002 | _ACEOF | 22246 | _ACEOF |
16003 | if { (eval echo "$as_me:16003: \"$ac_cpp conftest.$ac_ext\"") >&5 | 22247 | rm -f conftest.$ac_objext |
22248 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | ||
22249 | (eval $ac_compile) 2>conftest.er1 | ||
22250 | ac_status=$? | ||
22251 | grep -v '^ *+' conftest.er1 >conftest.err | ||
22252 | rm -f conftest.er1 | ||
22253 | cat conftest.err >&5 | ||
22254 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
22255 | (exit $ac_status); } && | ||
22256 | { ac_try='test -z "$ac_c_werror_flag" | ||
22257 | || test ! -s conftest.err' | ||
22258 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
22259 | (eval $ac_try) 2>&5 | ||
22260 | ac_status=$? | ||
22261 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
22262 | (exit $ac_status); }; } && | ||
22263 | { ac_try='test -s conftest.$ac_objext' | ||
22264 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
22265 | (eval $ac_try) 2>&5 | ||
22266 | ac_status=$? | ||
22267 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
22268 | (exit $ac_status); }; }; then | ||
22269 | ac_header_compiler=yes | ||
22270 | else | ||
22271 | echo "$as_me: failed program was:" >&5 | ||
22272 | sed 's/^/| /' conftest.$ac_ext >&5 | ||
22273 | |||
22274 | ac_header_compiler=no | ||
22275 | fi | ||
22276 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | ||
22277 | echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | ||
22278 | echo "${ECHO_T}$ac_header_compiler" >&6 | ||
22279 | |||
22280 | # Is the header present? | ||
22281 | echo "$as_me:$LINENO: checking $ac_header presence" >&5 | ||
22282 | echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | ||
22283 | cat >conftest.$ac_ext <<_ACEOF | ||
22284 | /* confdefs.h. */ | ||
22285 | _ACEOF | ||
22286 | cat confdefs.h >>conftest.$ac_ext | ||
22287 | cat >>conftest.$ac_ext <<_ACEOF | ||
22288 | /* end confdefs.h. */ | ||
22289 | #include <$ac_header> | ||
22290 | _ACEOF | ||
22291 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
16004 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | 22292 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
16005 | ac_status=$? | 22293 | ac_status=$? |
16006 | egrep -v '^ *\+' conftest.er1 >conftest.err | 22294 | grep -v '^ *+' conftest.er1 >conftest.err |
16007 | rm -f conftest.er1 | 22295 | rm -f conftest.er1 |
16008 | cat conftest.err >&5 | 22296 | cat conftest.err >&5 |
16009 | echo "$as_me:16009: \$? = $ac_status" >&5 | 22297 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
16010 | (exit $ac_status); } >/dev/null; then | 22298 | (exit $ac_status); } >/dev/null; then |
16011 | if test -s conftest.err; then | 22299 | if test -s conftest.err; then |
16012 | ac_cpp_err=$ac_c_preproc_warn_flag | 22300 | ac_cpp_err=$ac_c_preproc_warn_flag |
22301 | ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | ||
16013 | else | 22302 | else |
16014 | ac_cpp_err= | 22303 | ac_cpp_err= |
16015 | fi | 22304 | fi |
@@ -16017,26 +22306,72 @@ else | |||
16017 | ac_cpp_err=yes | 22306 | ac_cpp_err=yes |
16018 | fi | 22307 | fi |
16019 | if test -z "$ac_cpp_err"; then | 22308 | if test -z "$ac_cpp_err"; then |
16020 | eval "$as_ac_Header=yes" | 22309 | ac_header_preproc=yes |
16021 | else | 22310 | else |
16022 | echo "$as_me: failed program was:" >&5 | 22311 | echo "$as_me: failed program was:" >&5 |
16023 | cat conftest.$ac_ext >&5 | 22312 | sed 's/^/| /' conftest.$ac_ext >&5 |
16024 | eval "$as_ac_Header=no" | 22313 | |
22314 | ac_header_preproc=no | ||
16025 | fi | 22315 | fi |
16026 | rm -f conftest.err conftest.$ac_ext | 22316 | rm -f conftest.err conftest.$ac_ext |
22317 | echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | ||
22318 | echo "${ECHO_T}$ac_header_preproc" >&6 | ||
22319 | |||
22320 | # So? What about this header? | ||
22321 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | ||
22322 | yes:no: ) | ||
22323 | { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
22324 | echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
22325 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 | ||
22326 | echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} | ||
22327 | ac_header_preproc=yes | ||
22328 | ;; | ||
22329 | no:yes:* ) | ||
22330 | { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 | ||
22331 | echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} | ||
22332 | { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 | ||
22333 | echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} | ||
22334 | { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 | ||
22335 | echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} | ||
22336 | { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 | ||
22337 | echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} | ||
22338 | { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 | ||
22339 | echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | ||
22340 | { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | ||
22341 | echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | ||
22342 | ( | ||
22343 | cat <<\_ASBOX | ||
22344 | ## ------------------------------------------ ## | ||
22345 | ## Report this to the AC_PACKAGE_NAME lists. ## | ||
22346 | ## ------------------------------------------ ## | ||
22347 | _ASBOX | ||
22348 | ) | | ||
22349 | sed "s/^/$as_me: WARNING: /" >&2 | ||
22350 | ;; | ||
22351 | esac | ||
22352 | echo "$as_me:$LINENO: checking for $ac_header" >&5 | ||
22353 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | ||
22354 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
22355 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
22356 | else | ||
22357 | eval "$as_ac_Header=\$ac_header_preproc" | ||
16027 | fi | 22358 | fi |
16028 | echo "$as_me:16028: result: `eval echo '${'$as_ac_Header'}'`" >&5 | 22359 | echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 |
16029 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | 22360 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 |
22361 | |||
22362 | fi | ||
16030 | if test `eval echo '${'$as_ac_Header'}'` = yes; then | 22363 | if test `eval echo '${'$as_ac_Header'}'` = yes; then |
16031 | cat >>confdefs.h <<EOF | 22364 | cat >>confdefs.h <<_ACEOF |
16032 | #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 22365 | #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
16033 | EOF | 22366 | _ACEOF |
16034 | 22367 | ||
16035 | fi | 22368 | fi |
22369 | |||
16036 | done | 22370 | done |
16037 | 22371 | ||
22372 | |||
16038 | LIBS="$LIBS $K5LIBS" | 22373 | LIBS="$LIBS $K5LIBS" |
16039 | echo "$as_me:16039: checking for library containing k_hasafs" >&5 | 22374 | echo "$as_me:$LINENO: checking for library containing k_hasafs" >&5 |
16040 | echo $ECHO_N "checking for library containing k_hasafs... $ECHO_C" >&6 | 22375 | echo $ECHO_N "checking for library containing k_hasafs... $ECHO_C" >&6 |
16041 | if test "${ac_cv_search_k_hasafs+set}" = set; then | 22376 | if test "${ac_cv_search_k_hasafs+set}" = set; then |
16042 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 22377 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -16044,8 +22379,11 @@ else | |||
16044 | ac_func_search_save_LIBS=$LIBS | 22379 | ac_func_search_save_LIBS=$LIBS |
16045 | ac_cv_search_k_hasafs=no | 22380 | ac_cv_search_k_hasafs=no |
16046 | cat >conftest.$ac_ext <<_ACEOF | 22381 | cat >conftest.$ac_ext <<_ACEOF |
16047 | #line 16047 "configure" | 22382 | /* confdefs.h. */ |
16048 | #include "confdefs.h" | 22383 | _ACEOF |
22384 | cat confdefs.h >>conftest.$ac_ext | ||
22385 | cat >>conftest.$ac_ext <<_ACEOF | ||
22386 | /* end confdefs.h. */ | ||
16049 | 22387 | ||
16050 | /* Override any gcc2 internal prototype to avoid an error. */ | 22388 | /* Override any gcc2 internal prototype to avoid an error. */ |
16051 | #ifdef __cplusplus | 22389 | #ifdef __cplusplus |
@@ -16063,29 +22401,44 @@ k_hasafs (); | |||
16063 | } | 22401 | } |
16064 | _ACEOF | 22402 | _ACEOF |
16065 | rm -f conftest.$ac_objext conftest$ac_exeext | 22403 | rm -f conftest.$ac_objext conftest$ac_exeext |
16066 | if { (eval echo "$as_me:16066: \"$ac_link\"") >&5 | 22404 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
16067 | (eval $ac_link) 2>&5 | 22405 | (eval $ac_link) 2>conftest.er1 |
16068 | ac_status=$? | 22406 | ac_status=$? |
16069 | echo "$as_me:16069: \$? = $ac_status" >&5 | 22407 | grep -v '^ *+' conftest.er1 >conftest.err |
22408 | rm -f conftest.er1 | ||
22409 | cat conftest.err >&5 | ||
22410 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16070 | (exit $ac_status); } && | 22411 | (exit $ac_status); } && |
16071 | { ac_try='test -s conftest$ac_exeext' | 22412 | { ac_try='test -z "$ac_c_werror_flag" |
16072 | { (eval echo "$as_me:16072: \"$ac_try\"") >&5 | 22413 | || test ! -s conftest.err' |
22414 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16073 | (eval $ac_try) 2>&5 | 22415 | (eval $ac_try) 2>&5 |
16074 | ac_status=$? | 22416 | ac_status=$? |
16075 | echo "$as_me:16075: \$? = $ac_status" >&5 | 22417 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
22418 | (exit $ac_status); }; } && | ||
22419 | { ac_try='test -s conftest$ac_exeext' | ||
22420 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
22421 | (eval $ac_try) 2>&5 | ||
22422 | ac_status=$? | ||
22423 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16076 | (exit $ac_status); }; }; then | 22424 | (exit $ac_status); }; }; then |
16077 | ac_cv_search_k_hasafs="none required" | 22425 | ac_cv_search_k_hasafs="none required" |
16078 | else | 22426 | else |
16079 | echo "$as_me: failed program was:" >&5 | 22427 | echo "$as_me: failed program was:" >&5 |
16080 | cat conftest.$ac_ext >&5 | 22428 | sed 's/^/| /' conftest.$ac_ext >&5 |
22429 | |||
16081 | fi | 22430 | fi |
16082 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 22431 | rm -f conftest.err conftest.$ac_objext \ |
22432 | conftest$ac_exeext conftest.$ac_ext | ||
16083 | if test "$ac_cv_search_k_hasafs" = no; then | 22433 | if test "$ac_cv_search_k_hasafs" = no; then |
16084 | for ac_lib in kafs; do | 22434 | for ac_lib in kafs; do |
16085 | LIBS="-l$ac_lib $ac_func_search_save_LIBS" | 22435 | LIBS="-l$ac_lib $ac_func_search_save_LIBS" |
16086 | cat >conftest.$ac_ext <<_ACEOF | 22436 | cat >conftest.$ac_ext <<_ACEOF |
16087 | #line 16087 "configure" | 22437 | /* confdefs.h. */ |
16088 | #include "confdefs.h" | 22438 | _ACEOF |
22439 | cat confdefs.h >>conftest.$ac_ext | ||
22440 | cat >>conftest.$ac_ext <<_ACEOF | ||
22441 | /* end confdefs.h. */ | ||
16089 | 22442 | ||
16090 | /* Override any gcc2 internal prototype to avoid an error. */ | 22443 | /* Override any gcc2 internal prototype to avoid an error. */ |
16091 | #ifdef __cplusplus | 22444 | #ifdef __cplusplus |
@@ -16103,39 +22456,51 @@ k_hasafs (); | |||
16103 | } | 22456 | } |
16104 | _ACEOF | 22457 | _ACEOF |
16105 | rm -f conftest.$ac_objext conftest$ac_exeext | 22458 | rm -f conftest.$ac_objext conftest$ac_exeext |
16106 | if { (eval echo "$as_me:16106: \"$ac_link\"") >&5 | 22459 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
16107 | (eval $ac_link) 2>&5 | 22460 | (eval $ac_link) 2>conftest.er1 |
16108 | ac_status=$? | 22461 | ac_status=$? |
16109 | echo "$as_me:16109: \$? = $ac_status" >&5 | 22462 | grep -v '^ *+' conftest.er1 >conftest.err |
22463 | rm -f conftest.er1 | ||
22464 | cat conftest.err >&5 | ||
22465 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16110 | (exit $ac_status); } && | 22466 | (exit $ac_status); } && |
16111 | { ac_try='test -s conftest$ac_exeext' | 22467 | { ac_try='test -z "$ac_c_werror_flag" |
16112 | { (eval echo "$as_me:16112: \"$ac_try\"") >&5 | 22468 | || test ! -s conftest.err' |
22469 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
22470 | (eval $ac_try) 2>&5 | ||
22471 | ac_status=$? | ||
22472 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
22473 | (exit $ac_status); }; } && | ||
22474 | { ac_try='test -s conftest$ac_exeext' | ||
22475 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16113 | (eval $ac_try) 2>&5 | 22476 | (eval $ac_try) 2>&5 |
16114 | ac_status=$? | 22477 | ac_status=$? |
16115 | echo "$as_me:16115: \$? = $ac_status" >&5 | 22478 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
16116 | (exit $ac_status); }; }; then | 22479 | (exit $ac_status); }; }; then |
16117 | ac_cv_search_k_hasafs="-l$ac_lib" | 22480 | ac_cv_search_k_hasafs="-l$ac_lib" |
16118 | break | 22481 | break |
16119 | else | 22482 | else |
16120 | echo "$as_me: failed program was:" >&5 | 22483 | echo "$as_me: failed program was:" >&5 |
16121 | cat conftest.$ac_ext >&5 | 22484 | sed 's/^/| /' conftest.$ac_ext >&5 |
22485 | |||
16122 | fi | 22486 | fi |
16123 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 22487 | rm -f conftest.err conftest.$ac_objext \ |
22488 | conftest$ac_exeext conftest.$ac_ext | ||
16124 | done | 22489 | done |
16125 | fi | 22490 | fi |
16126 | LIBS=$ac_func_search_save_LIBS | 22491 | LIBS=$ac_func_search_save_LIBS |
16127 | fi | 22492 | fi |
16128 | echo "$as_me:16128: result: $ac_cv_search_k_hasafs" >&5 | 22493 | echo "$as_me:$LINENO: result: $ac_cv_search_k_hasafs" >&5 |
16129 | echo "${ECHO_T}$ac_cv_search_k_hasafs" >&6 | 22494 | echo "${ECHO_T}$ac_cv_search_k_hasafs" >&6 |
16130 | if test "$ac_cv_search_k_hasafs" != no; then | 22495 | if test "$ac_cv_search_k_hasafs" != no; then |
16131 | test "$ac_cv_search_k_hasafs" = "none required" || LIBS="$ac_cv_search_k_hasafs $LIBS" | 22496 | test "$ac_cv_search_k_hasafs" = "none required" || LIBS="$ac_cv_search_k_hasafs $LIBS" |
16132 | cat >>confdefs.h <<\EOF | 22497 | cat >>confdefs.h <<\_ACEOF |
16133 | #define USE_AFS 1 | 22498 | #define USE_AFS 1 |
16134 | EOF | 22499 | _ACEOF |
16135 | 22500 | ||
16136 | fi | 22501 | fi |
16137 | 22502 | ||
16138 | echo "$as_me:16138: checking for library containing krb5_init_ets" >&5 | 22503 | echo "$as_me:$LINENO: checking for library containing krb5_init_ets" >&5 |
16139 | echo $ECHO_N "checking for library containing krb5_init_ets... $ECHO_C" >&6 | 22504 | echo $ECHO_N "checking for library containing krb5_init_ets... $ECHO_C" >&6 |
16140 | if test "${ac_cv_search_krb5_init_ets+set}" = set; then | 22505 | if test "${ac_cv_search_krb5_init_ets+set}" = set; then |
16141 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 22506 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -16143,8 +22508,11 @@ else | |||
16143 | ac_func_search_save_LIBS=$LIBS | 22508 | ac_func_search_save_LIBS=$LIBS |
16144 | ac_cv_search_krb5_init_ets=no | 22509 | ac_cv_search_krb5_init_ets=no |
16145 | cat >conftest.$ac_ext <<_ACEOF | 22510 | cat >conftest.$ac_ext <<_ACEOF |
16146 | #line 16146 "configure" | 22511 | /* confdefs.h. */ |
16147 | #include "confdefs.h" | 22512 | _ACEOF |
22513 | cat confdefs.h >>conftest.$ac_ext | ||
22514 | cat >>conftest.$ac_ext <<_ACEOF | ||
22515 | /* end confdefs.h. */ | ||
16148 | 22516 | ||
16149 | /* Override any gcc2 internal prototype to avoid an error. */ | 22517 | /* Override any gcc2 internal prototype to avoid an error. */ |
16150 | #ifdef __cplusplus | 22518 | #ifdef __cplusplus |
@@ -16162,29 +22530,44 @@ krb5_init_ets (); | |||
16162 | } | 22530 | } |
16163 | _ACEOF | 22531 | _ACEOF |
16164 | rm -f conftest.$ac_objext conftest$ac_exeext | 22532 | rm -f conftest.$ac_objext conftest$ac_exeext |
16165 | if { (eval echo "$as_me:16165: \"$ac_link\"") >&5 | 22533 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
16166 | (eval $ac_link) 2>&5 | 22534 | (eval $ac_link) 2>conftest.er1 |
16167 | ac_status=$? | 22535 | ac_status=$? |
16168 | echo "$as_me:16168: \$? = $ac_status" >&5 | 22536 | grep -v '^ *+' conftest.er1 >conftest.err |
22537 | rm -f conftest.er1 | ||
22538 | cat conftest.err >&5 | ||
22539 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16169 | (exit $ac_status); } && | 22540 | (exit $ac_status); } && |
16170 | { ac_try='test -s conftest$ac_exeext' | 22541 | { ac_try='test -z "$ac_c_werror_flag" |
16171 | { (eval echo "$as_me:16171: \"$ac_try\"") >&5 | 22542 | || test ! -s conftest.err' |
22543 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
22544 | (eval $ac_try) 2>&5 | ||
22545 | ac_status=$? | ||
22546 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
22547 | (exit $ac_status); }; } && | ||
22548 | { ac_try='test -s conftest$ac_exeext' | ||
22549 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16172 | (eval $ac_try) 2>&5 | 22550 | (eval $ac_try) 2>&5 |
16173 | ac_status=$? | 22551 | ac_status=$? |
16174 | echo "$as_me:16174: \$? = $ac_status" >&5 | 22552 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
16175 | (exit $ac_status); }; }; then | 22553 | (exit $ac_status); }; }; then |
16176 | ac_cv_search_krb5_init_ets="none required" | 22554 | ac_cv_search_krb5_init_ets="none required" |
16177 | else | 22555 | else |
16178 | echo "$as_me: failed program was:" >&5 | 22556 | echo "$as_me: failed program was:" >&5 |
16179 | cat conftest.$ac_ext >&5 | 22557 | sed 's/^/| /' conftest.$ac_ext >&5 |
22558 | |||
16180 | fi | 22559 | fi |
16181 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 22560 | rm -f conftest.err conftest.$ac_objext \ |
22561 | conftest$ac_exeext conftest.$ac_ext | ||
16182 | if test "$ac_cv_search_krb5_init_ets" = no; then | 22562 | if test "$ac_cv_search_krb5_init_ets" = no; then |
16183 | for ac_lib in $K5LIBS; do | 22563 | for ac_lib in $K5LIBS; do |
16184 | LIBS="-l$ac_lib $ac_func_search_save_LIBS" | 22564 | LIBS="-l$ac_lib $ac_func_search_save_LIBS" |
16185 | cat >conftest.$ac_ext <<_ACEOF | 22565 | cat >conftest.$ac_ext <<_ACEOF |
16186 | #line 16186 "configure" | 22566 | /* confdefs.h. */ |
16187 | #include "confdefs.h" | 22567 | _ACEOF |
22568 | cat confdefs.h >>conftest.$ac_ext | ||
22569 | cat >>conftest.$ac_ext <<_ACEOF | ||
22570 | /* end confdefs.h. */ | ||
16188 | 22571 | ||
16189 | /* Override any gcc2 internal prototype to avoid an error. */ | 22572 | /* Override any gcc2 internal prototype to avoid an error. */ |
16190 | #ifdef __cplusplus | 22573 | #ifdef __cplusplus |
@@ -16202,38 +22585,52 @@ krb5_init_ets (); | |||
16202 | } | 22585 | } |
16203 | _ACEOF | 22586 | _ACEOF |
16204 | rm -f conftest.$ac_objext conftest$ac_exeext | 22587 | rm -f conftest.$ac_objext conftest$ac_exeext |
16205 | if { (eval echo "$as_me:16205: \"$ac_link\"") >&5 | 22588 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
16206 | (eval $ac_link) 2>&5 | 22589 | (eval $ac_link) 2>conftest.er1 |
16207 | ac_status=$? | 22590 | ac_status=$? |
16208 | echo "$as_me:16208: \$? = $ac_status" >&5 | 22591 | grep -v '^ *+' conftest.er1 >conftest.err |
22592 | rm -f conftest.er1 | ||
22593 | cat conftest.err >&5 | ||
22594 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16209 | (exit $ac_status); } && | 22595 | (exit $ac_status); } && |
16210 | { ac_try='test -s conftest$ac_exeext' | 22596 | { ac_try='test -z "$ac_c_werror_flag" |
16211 | { (eval echo "$as_me:16211: \"$ac_try\"") >&5 | 22597 | || test ! -s conftest.err' |
22598 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16212 | (eval $ac_try) 2>&5 | 22599 | (eval $ac_try) 2>&5 |
16213 | ac_status=$? | 22600 | ac_status=$? |
16214 | echo "$as_me:16214: \$? = $ac_status" >&5 | 22601 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
22602 | (exit $ac_status); }; } && | ||
22603 | { ac_try='test -s conftest$ac_exeext' | ||
22604 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
22605 | (eval $ac_try) 2>&5 | ||
22606 | ac_status=$? | ||
22607 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16215 | (exit $ac_status); }; }; then | 22608 | (exit $ac_status); }; }; then |
16216 | ac_cv_search_krb5_init_ets="-l$ac_lib" | 22609 | ac_cv_search_krb5_init_ets="-l$ac_lib" |
16217 | break | 22610 | break |
16218 | else | 22611 | else |
16219 | echo "$as_me: failed program was:" >&5 | 22612 | echo "$as_me: failed program was:" >&5 |
16220 | cat conftest.$ac_ext >&5 | 22613 | sed 's/^/| /' conftest.$ac_ext >&5 |
22614 | |||
16221 | fi | 22615 | fi |
16222 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | 22616 | rm -f conftest.err conftest.$ac_objext \ |
22617 | conftest$ac_exeext conftest.$ac_ext | ||
16223 | done | 22618 | done |
16224 | fi | 22619 | fi |
16225 | LIBS=$ac_func_search_save_LIBS | 22620 | LIBS=$ac_func_search_save_LIBS |
16226 | fi | 22621 | fi |
16227 | echo "$as_me:16227: result: $ac_cv_search_krb5_init_ets" >&5 | 22622 | echo "$as_me:$LINENO: result: $ac_cv_search_krb5_init_ets" >&5 |
16228 | echo "${ECHO_T}$ac_cv_search_krb5_init_ets" >&6 | 22623 | echo "${ECHO_T}$ac_cv_search_krb5_init_ets" >&6 |
16229 | if test "$ac_cv_search_krb5_init_ets" != no; then | 22624 | if test "$ac_cv_search_krb5_init_ets" != no; then |
16230 | test "$ac_cv_search_krb5_init_ets" = "none required" || LIBS="$ac_cv_search_krb5_init_ets $LIBS" | 22625 | test "$ac_cv_search_krb5_init_ets" = "none required" || LIBS="$ac_cv_search_krb5_init_ets $LIBS" |
16231 | cat >>confdefs.h <<\EOF | 22626 | cat >>confdefs.h <<\_ACEOF |
16232 | #define KRB5_INIT_ETS 1 | 22627 | #define KRB5_INIT_ETS 1 |
16233 | EOF | 22628 | _ACEOF |
16234 | 22629 | ||
16235 | fi | 22630 | fi |
16236 | 22631 | ||
22632 | |||
22633 | |||
16237 | fi; | 22634 | fi; |
16238 | 22635 | ||
16239 | # Looking for programs, paths and files | 22636 | # Looking for programs, paths and files |
@@ -16248,8 +22645,11 @@ if test "${with_privsep_path+set}" = set; then | |||
16248 | PRIVSEP_PATH=$withval | 22645 | PRIVSEP_PATH=$withval |
16249 | fi | 22646 | fi |
16250 | 22647 | ||
22648 | |||
16251 | fi; | 22649 | fi; |
16252 | 22650 | ||
22651 | |||
22652 | |||
16253 | # Check whether --with-xauth or --without-xauth was given. | 22653 | # Check whether --with-xauth or --without-xauth was given. |
16254 | if test "${with_xauth+set}" = set; then | 22654 | if test "${with_xauth+set}" = set; then |
16255 | withval="$with_xauth" | 22655 | withval="$with_xauth" |
@@ -16267,7 +22667,7 @@ else | |||
16267 | TestPath="${TestPath}${PATH_SEPARATOR}/usr/openwin/bin" | 22667 | TestPath="${TestPath}${PATH_SEPARATOR}/usr/openwin/bin" |
16268 | # Extract the first word of "xauth", so it can be a program name with args. | 22668 | # Extract the first word of "xauth", so it can be a program name with args. |
16269 | set dummy xauth; ac_word=$2 | 22669 | set dummy xauth; ac_word=$2 |
16270 | echo "$as_me:16270: checking for $ac_word" >&5 | 22670 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
16271 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 22671 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
16272 | if test "${ac_cv_path_xauth_path+set}" = set; then | 22672 | if test "${ac_cv_path_xauth_path+set}" = set; then |
16273 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 22673 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -16277,16 +22677,18 @@ else | |||
16277 | ac_cv_path_xauth_path="$xauth_path" # Let the user override the test with a path. | 22677 | ac_cv_path_xauth_path="$xauth_path" # Let the user override the test with a path. |
16278 | ;; | 22678 | ;; |
16279 | *) | 22679 | *) |
16280 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 22680 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
16281 | ac_dummy="$TestPath" | 22681 | for as_dir in $TestPath |
16282 | for ac_dir in $ac_dummy; do | 22682 | do |
16283 | IFS=$ac_save_IFS | 22683 | IFS=$as_save_IFS |
16284 | test -z "$ac_dir" && ac_dir=. | 22684 | test -z "$as_dir" && as_dir=. |
16285 | if $as_executable_p "$ac_dir/$ac_word"; then | 22685 | for ac_exec_ext in '' $ac_executable_extensions; do |
16286 | ac_cv_path_xauth_path="$ac_dir/$ac_word" | 22686 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
16287 | echo "$as_me:16287: found $ac_dir/$ac_word" >&5 | 22687 | ac_cv_path_xauth_path="$as_dir/$ac_word$ac_exec_ext" |
16288 | break | 22688 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
16289 | fi | 22689 | break 2 |
22690 | fi | ||
22691 | done | ||
16290 | done | 22692 | done |
16291 | 22693 | ||
16292 | ;; | 22694 | ;; |
@@ -16295,10 +22697,10 @@ fi | |||
16295 | xauth_path=$ac_cv_path_xauth_path | 22697 | xauth_path=$ac_cv_path_xauth_path |
16296 | 22698 | ||
16297 | if test -n "$xauth_path"; then | 22699 | if test -n "$xauth_path"; then |
16298 | echo "$as_me:16298: result: $xauth_path" >&5 | 22700 | echo "$as_me:$LINENO: result: $xauth_path" >&5 |
16299 | echo "${ECHO_T}$xauth_path" >&6 | 22701 | echo "${ECHO_T}$xauth_path" >&6 |
16300 | else | 22702 | else |
16301 | echo "$as_me:16301: result: no" >&5 | 22703 | echo "$as_me:$LINENO: result: no" >&5 |
16302 | echo "${ECHO_T}no" >&6 | 22704 | echo "${ECHO_T}no" >&6 |
16303 | fi | 22705 | fi |
16304 | 22706 | ||
@@ -16306,6 +22708,7 @@ fi | |||
16306 | xauth_path="/usr/openwin/bin/xauth" | 22708 | xauth_path="/usr/openwin/bin/xauth" |
16307 | fi | 22709 | fi |
16308 | 22710 | ||
22711 | |||
16309 | fi; | 22712 | fi; |
16310 | 22713 | ||
16311 | STRIP_OPT=-s | 22714 | STRIP_OPT=-s |
@@ -16317,15 +22720,17 @@ if test "${enable_strip+set}" = set; then | |||
16317 | STRIP_OPT= | 22720 | STRIP_OPT= |
16318 | fi | 22721 | fi |
16319 | 22722 | ||
22723 | |||
16320 | fi; | 22724 | fi; |
16321 | 22725 | ||
22726 | |||
16322 | if test -z "$xauth_path" ; then | 22727 | if test -z "$xauth_path" ; then |
16323 | XAUTH_PATH="undefined" | 22728 | XAUTH_PATH="undefined" |
16324 | 22729 | ||
16325 | else | 22730 | else |
16326 | cat >>confdefs.h <<EOF | 22731 | cat >>confdefs.h <<_ACEOF |
16327 | #define XAUTH_PATH "$xauth_path" | 22732 | #define XAUTH_PATH "$xauth_path" |
16328 | EOF | 22733 | _ACEOF |
16329 | 22734 | ||
16330 | XAUTH_PATH=$xauth_path | 22735 | XAUTH_PATH=$xauth_path |
16331 | 22736 | ||
@@ -16334,21 +22739,21 @@ fi | |||
16334 | # Check for mail directory (last resort if we cannot get it from headers) | 22739 | # Check for mail directory (last resort if we cannot get it from headers) |
16335 | if test ! -z "$MAIL" ; then | 22740 | if test ! -z "$MAIL" ; then |
16336 | maildir=`dirname $MAIL` | 22741 | maildir=`dirname $MAIL` |
16337 | cat >>confdefs.h <<EOF | 22742 | cat >>confdefs.h <<_ACEOF |
16338 | #define MAIL_DIRECTORY "$maildir" | 22743 | #define MAIL_DIRECTORY "$maildir" |
16339 | EOF | 22744 | _ACEOF |
16340 | 22745 | ||
16341 | fi | 22746 | fi |
16342 | 22747 | ||
16343 | if test -z "$no_dev_ptmx" ; then | 22748 | if test -z "$no_dev_ptmx" ; then |
16344 | if test "x$disable_ptmx_check" != "xyes" ; then | 22749 | if test "x$disable_ptmx_check" != "xyes" ; then |
16345 | echo "$as_me:16345: checking for \"/dev/ptmx\"" >&5 | 22750 | echo "$as_me:$LINENO: checking for \"/dev/ptmx\"" >&5 |
16346 | echo $ECHO_N "checking for \"/dev/ptmx\"... $ECHO_C" >&6 | 22751 | echo $ECHO_N "checking for \"/dev/ptmx\"... $ECHO_C" >&6 |
16347 | if test "${ac_cv_file___dev_ptmx_+set}" = set; then | 22752 | if test "${ac_cv_file___dev_ptmx_+set}" = set; then |
16348 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 22753 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
16349 | else | 22754 | else |
16350 | test "$cross_compiling" = yes && | 22755 | test "$cross_compiling" = yes && |
16351 | { { echo "$as_me:16351: error: cannot check for file existence when cross compiling" >&5 | 22756 | { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 |
16352 | echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} | 22757 | echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} |
16353 | { (exit 1); exit 1; }; } | 22758 | { (exit 1); exit 1; }; } |
16354 | if test -r ""/dev/ptmx""; then | 22759 | if test -r ""/dev/ptmx""; then |
@@ -16357,27 +22762,28 @@ else | |||
16357 | ac_cv_file___dev_ptmx_=no | 22762 | ac_cv_file___dev_ptmx_=no |
16358 | fi | 22763 | fi |
16359 | fi | 22764 | fi |
16360 | echo "$as_me:16360: result: $ac_cv_file___dev_ptmx_" >&5 | 22765 | echo "$as_me:$LINENO: result: $ac_cv_file___dev_ptmx_" >&5 |
16361 | echo "${ECHO_T}$ac_cv_file___dev_ptmx_" >&6 | 22766 | echo "${ECHO_T}$ac_cv_file___dev_ptmx_" >&6 |
16362 | if test $ac_cv_file___dev_ptmx_ = yes; then | 22767 | if test $ac_cv_file___dev_ptmx_ = yes; then |
16363 | 22768 | ||
16364 | cat >>confdefs.h <<EOF | 22769 | cat >>confdefs.h <<_ACEOF |
16365 | #define HAVE_DEV_PTMX 1 | 22770 | #define HAVE_DEV_PTMX 1 |
16366 | EOF | 22771 | _ACEOF |
16367 | 22772 | ||
16368 | have_dev_ptmx=1 | 22773 | have_dev_ptmx=1 |
16369 | 22774 | ||
22775 | |||
16370 | fi | 22776 | fi |
16371 | 22777 | ||
16372 | fi | 22778 | fi |
16373 | fi | 22779 | fi |
16374 | echo "$as_me:16374: checking for \"/dev/ptc\"" >&5 | 22780 | echo "$as_me:$LINENO: checking for \"/dev/ptc\"" >&5 |
16375 | echo $ECHO_N "checking for \"/dev/ptc\"... $ECHO_C" >&6 | 22781 | echo $ECHO_N "checking for \"/dev/ptc\"... $ECHO_C" >&6 |
16376 | if test "${ac_cv_file___dev_ptc_+set}" = set; then | 22782 | if test "${ac_cv_file___dev_ptc_+set}" = set; then |
16377 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 22783 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
16378 | else | 22784 | else |
16379 | test "$cross_compiling" = yes && | 22785 | test "$cross_compiling" = yes && |
16380 | { { echo "$as_me:16380: error: cannot check for file existence when cross compiling" >&5 | 22786 | { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 |
16381 | echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} | 22787 | echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} |
16382 | { (exit 1); exit 1; }; } | 22788 | { (exit 1); exit 1; }; } |
16383 | if test -r ""/dev/ptc""; then | 22789 | if test -r ""/dev/ptc""; then |
@@ -16386,18 +22792,20 @@ else | |||
16386 | ac_cv_file___dev_ptc_=no | 22792 | ac_cv_file___dev_ptc_=no |
16387 | fi | 22793 | fi |
16388 | fi | 22794 | fi |
16389 | echo "$as_me:16389: result: $ac_cv_file___dev_ptc_" >&5 | 22795 | echo "$as_me:$LINENO: result: $ac_cv_file___dev_ptc_" >&5 |
16390 | echo "${ECHO_T}$ac_cv_file___dev_ptc_" >&6 | 22796 | echo "${ECHO_T}$ac_cv_file___dev_ptc_" >&6 |
16391 | if test $ac_cv_file___dev_ptc_ = yes; then | 22797 | if test $ac_cv_file___dev_ptc_ = yes; then |
16392 | 22798 | ||
16393 | cat >>confdefs.h <<EOF | 22799 | cat >>confdefs.h <<_ACEOF |
16394 | #define HAVE_DEV_PTS_AND_PTC 1 | 22800 | #define HAVE_DEV_PTS_AND_PTC 1 |
16395 | EOF | 22801 | _ACEOF |
16396 | 22802 | ||
16397 | have_dev_ptc=1 | 22803 | have_dev_ptc=1 |
16398 | 22804 | ||
22805 | |||
16399 | fi | 22806 | fi |
16400 | 22807 | ||
22808 | |||
16401 | # Options from here on. Some of these are preset by platform above | 22809 | # Options from here on. Some of these are preset by platform above |
16402 | 22810 | ||
16403 | # Check whether --with-mantype or --without-mantype was given. | 22811 | # Check whether --with-mantype or --without-mantype was given. |
@@ -16409,12 +22817,13 @@ if test "${with_mantype+set}" = set; then | |||
16409 | MANTYPE=$withval | 22817 | MANTYPE=$withval |
16410 | ;; | 22818 | ;; |
16411 | *) | 22819 | *) |
16412 | { { echo "$as_me:16412: error: invalid man type: $withval" >&5 | 22820 | { { echo "$as_me:$LINENO: error: invalid man type: $withval" >&5 |
16413 | echo "$as_me: error: invalid man type: $withval" >&2;} | 22821 | echo "$as_me: error: invalid man type: $withval" >&2;} |
16414 | { (exit 1); exit 1; }; } | 22822 | { (exit 1); exit 1; }; } |
16415 | ;; | 22823 | ;; |
16416 | esac | 22824 | esac |
16417 | 22825 | ||
22826 | |||
16418 | fi; | 22827 | fi; |
16419 | if test -z "$MANTYPE"; then | 22828 | if test -z "$MANTYPE"; then |
16420 | TestPath="/usr/bin${PATH_SEPARATOR}/usr/ucb" | 22829 | TestPath="/usr/bin${PATH_SEPARATOR}/usr/ucb" |
@@ -16422,7 +22831,7 @@ if test -z "$MANTYPE"; then | |||
16422 | do | 22831 | do |
16423 | # Extract the first word of "$ac_prog", so it can be a program name with args. | 22832 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
16424 | set dummy $ac_prog; ac_word=$2 | 22833 | set dummy $ac_prog; ac_word=$2 |
16425 | echo "$as_me:16425: checking for $ac_word" >&5 | 22834 | echo "$as_me:$LINENO: checking for $ac_word" >&5 |
16426 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | 22835 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
16427 | if test "${ac_cv_path_NROFF+set}" = set; then | 22836 | if test "${ac_cv_path_NROFF+set}" = set; then |
16428 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 22837 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
@@ -16432,16 +22841,18 @@ else | |||
16432 | ac_cv_path_NROFF="$NROFF" # Let the user override the test with a path. | 22841 | ac_cv_path_NROFF="$NROFF" # Let the user override the test with a path. |
16433 | ;; | 22842 | ;; |
16434 | *) | 22843 | *) |
16435 | ac_save_IFS=$IFS; IFS=$ac_path_separator | 22844 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
16436 | ac_dummy="$TestPath" | 22845 | for as_dir in $TestPath |
16437 | for ac_dir in $ac_dummy; do | 22846 | do |
16438 | IFS=$ac_save_IFS | 22847 | IFS=$as_save_IFS |
16439 | test -z "$ac_dir" && ac_dir=. | 22848 | test -z "$as_dir" && as_dir=. |
16440 | if $as_executable_p "$ac_dir/$ac_word"; then | 22849 | for ac_exec_ext in '' $ac_executable_extensions; do |
16441 | ac_cv_path_NROFF="$ac_dir/$ac_word" | 22850 | if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
16442 | echo "$as_me:16442: found $ac_dir/$ac_word" >&5 | 22851 | ac_cv_path_NROFF="$as_dir/$ac_word$ac_exec_ext" |
16443 | break | 22852 | echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
16444 | fi | 22853 | break 2 |
22854 | fi | ||
22855 | done | ||
16445 | done | 22856 | done |
16446 | 22857 | ||
16447 | ;; | 22858 | ;; |
@@ -16450,10 +22861,10 @@ fi | |||
16450 | NROFF=$ac_cv_path_NROFF | 22861 | NROFF=$ac_cv_path_NROFF |
16451 | 22862 | ||
16452 | if test -n "$NROFF"; then | 22863 | if test -n "$NROFF"; then |
16453 | echo "$as_me:16453: result: $NROFF" >&5 | 22864 | echo "$as_me:$LINENO: result: $NROFF" >&5 |
16454 | echo "${ECHO_T}$NROFF" >&6 | 22865 | echo "${ECHO_T}$NROFF" >&6 |
16455 | else | 22866 | else |
16456 | echo "$as_me:16456: result: no" >&5 | 22867 | echo "$as_me:$LINENO: result: no" >&5 |
16457 | echo "${ECHO_T}no" >&6 | 22868 | echo "${ECHO_T}no" >&6 |
16458 | fi | 22869 | fi |
16459 | 22870 | ||
@@ -16476,6 +22887,7 @@ else | |||
16476 | mansubdir=$MANTYPE; | 22887 | mansubdir=$MANTYPE; |
16477 | fi | 22888 | fi |
16478 | 22889 | ||
22890 | |||
16479 | # Check whether to enable MD5 passwords | 22891 | # Check whether to enable MD5 passwords |
16480 | MD5_MSG="no" | 22892 | MD5_MSG="no" |
16481 | 22893 | ||
@@ -16484,13 +22896,14 @@ if test "${with_md5_passwords+set}" = set; then | |||
16484 | withval="$with_md5_passwords" | 22896 | withval="$with_md5_passwords" |
16485 | 22897 | ||
16486 | if test "x$withval" != "xno" ; then | 22898 | if test "x$withval" != "xno" ; then |
16487 | cat >>confdefs.h <<\EOF | 22899 | cat >>confdefs.h <<\_ACEOF |
16488 | #define HAVE_MD5_PASSWORDS 1 | 22900 | #define HAVE_MD5_PASSWORDS 1 |
16489 | EOF | 22901 | _ACEOF |
16490 | 22902 | ||
16491 | MD5_MSG="yes" | 22903 | MD5_MSG="yes" |
16492 | fi | 22904 | fi |
16493 | 22905 | ||
22906 | |||
16494 | fi; | 22907 | fi; |
16495 | 22908 | ||
16496 | # Whether to disable shadow password support | 22909 | # Whether to disable shadow password support |
@@ -16500,21 +22913,25 @@ if test "${with_shadow+set}" = set; then | |||
16500 | withval="$with_shadow" | 22913 | withval="$with_shadow" |
16501 | 22914 | ||
16502 | if test "x$withval" = "xno" ; then | 22915 | if test "x$withval" = "xno" ; then |
16503 | cat >>confdefs.h <<\EOF | 22916 | cat >>confdefs.h <<\_ACEOF |
16504 | #define DISABLE_SHADOW 1 | 22917 | #define DISABLE_SHADOW 1 |
16505 | EOF | 22918 | _ACEOF |
16506 | 22919 | ||
16507 | disable_shadow=yes | 22920 | disable_shadow=yes |
16508 | fi | 22921 | fi |
16509 | 22922 | ||
22923 | |||
16510 | fi; | 22924 | fi; |
16511 | 22925 | ||
16512 | if test -z "$disable_shadow" ; then | 22926 | if test -z "$disable_shadow" ; then |
16513 | echo "$as_me:16513: checking if the systems has expire shadow information" >&5 | 22927 | echo "$as_me:$LINENO: checking if the systems has expire shadow information" >&5 |
16514 | echo $ECHO_N "checking if the systems has expire shadow information... $ECHO_C" >&6 | 22928 | echo $ECHO_N "checking if the systems has expire shadow information... $ECHO_C" >&6 |
16515 | cat >conftest.$ac_ext <<_ACEOF | 22929 | cat >conftest.$ac_ext <<_ACEOF |
16516 | #line 16516 "configure" | 22930 | /* confdefs.h. */ |
16517 | #include "confdefs.h" | 22931 | _ACEOF |
22932 | cat confdefs.h >>conftest.$ac_ext | ||
22933 | cat >>conftest.$ac_ext <<_ACEOF | ||
22934 | /* end confdefs.h. */ | ||
16518 | 22935 | ||
16519 | #include <sys/types.h> | 22936 | #include <sys/types.h> |
16520 | #include <shadow.h> | 22937 | #include <shadow.h> |
@@ -16529,34 +22946,46 @@ main () | |||
16529 | } | 22946 | } |
16530 | _ACEOF | 22947 | _ACEOF |
16531 | rm -f conftest.$ac_objext | 22948 | rm -f conftest.$ac_objext |
16532 | if { (eval echo "$as_me:16532: \"$ac_compile\"") >&5 | 22949 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
16533 | (eval $ac_compile) 2>&5 | 22950 | (eval $ac_compile) 2>conftest.er1 |
16534 | ac_status=$? | 22951 | ac_status=$? |
16535 | echo "$as_me:16535: \$? = $ac_status" >&5 | 22952 | grep -v '^ *+' conftest.er1 >conftest.err |
22953 | rm -f conftest.er1 | ||
22954 | cat conftest.err >&5 | ||
22955 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16536 | (exit $ac_status); } && | 22956 | (exit $ac_status); } && |
16537 | { ac_try='test -s conftest.$ac_objext' | 22957 | { ac_try='test -z "$ac_c_werror_flag" |
16538 | { (eval echo "$as_me:16538: \"$ac_try\"") >&5 | 22958 | || test ! -s conftest.err' |
22959 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
16539 | (eval $ac_try) 2>&5 | 22960 | (eval $ac_try) 2>&5 |
16540 | ac_status=$? | 22961 | ac_status=$? |
16541 | echo "$as_me:16541: \$? = $ac_status" >&5 | 22962 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
22963 | (exit $ac_status); }; } && | ||
22964 | { ac_try='test -s conftest.$ac_objext' | ||
22965 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
22966 | (eval $ac_try) 2>&5 | ||
22967 | ac_status=$? | ||
22968 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
16542 | (exit $ac_status); }; }; then | 22969 | (exit $ac_status); }; }; then |
16543 | sp_expire_available=yes | 22970 | sp_expire_available=yes |
16544 | else | 22971 | else |
16545 | echo "$as_me: failed program was:" >&5 | 22972 | echo "$as_me: failed program was:" >&5 |
16546 | cat conftest.$ac_ext >&5 | 22973 | sed 's/^/| /' conftest.$ac_ext >&5 |
22974 | |||
22975 | |||
16547 | 22976 | ||
16548 | fi | 22977 | fi |
16549 | rm -f conftest.$ac_objext conftest.$ac_ext | 22978 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
16550 | 22979 | ||
16551 | if test "x$sp_expire_available" = "xyes" ; then | 22980 | if test "x$sp_expire_available" = "xyes" ; then |
16552 | echo "$as_me:16552: result: yes" >&5 | 22981 | echo "$as_me:$LINENO: result: yes" >&5 |
16553 | echo "${ECHO_T}yes" >&6 | 22982 | echo "${ECHO_T}yes" >&6 |
16554 | cat >>confdefs.h <<\EOF | 22983 | cat >>confdefs.h <<\_ACEOF |
16555 | #define HAS_SHADOW_EXPIRE 1 | 22984 | #define HAS_SHADOW_EXPIRE 1 |
16556 | EOF | 22985 | _ACEOF |
16557 | 22986 | ||
16558 | else | 22987 | else |
16559 | echo "$as_me:16559: result: no" >&5 | 22988 | echo "$as_me:$LINENO: result: no" >&5 |
16560 | echo "${ECHO_T}no" >&6 | 22989 | echo "${ECHO_T}no" >&6 |
16561 | fi | 22990 | fi |
16562 | fi | 22991 | fi |
@@ -16564,9 +22993,9 @@ fi | |||
16564 | # Use ip address instead of hostname in $DISPLAY | 22993 | # Use ip address instead of hostname in $DISPLAY |
16565 | if test ! -z "$IPADDR_IN_DISPLAY" ; then | 22994 | if test ! -z "$IPADDR_IN_DISPLAY" ; then |
16566 | DISPLAY_HACK_MSG="yes" | 22995 | DISPLAY_HACK_MSG="yes" |
16567 | cat >>confdefs.h <<\EOF | 22996 | cat >>confdefs.h <<\_ACEOF |
16568 | #define IPADDR_IN_DISPLAY 1 | 22997 | #define IPADDR_IN_DISPLAY 1 |
16569 | EOF | 22998 | _ACEOF |
16570 | 22999 | ||
16571 | else | 23000 | else |
16572 | DISPLAY_HACK_MSG="no" | 23001 | DISPLAY_HACK_MSG="no" |
@@ -16576,13 +23005,14 @@ if test "${with_ipaddr_display+set}" = set; then | |||
16576 | withval="$with_ipaddr_display" | 23005 | withval="$with_ipaddr_display" |
16577 | 23006 | ||
16578 | if test "x$withval" != "xno" ; then | 23007 | if test "x$withval" != "xno" ; then |
16579 | cat >>confdefs.h <<\EOF | 23008 | cat >>confdefs.h <<\_ACEOF |
16580 | #define IPADDR_IN_DISPLAY 1 | 23009 | #define IPADDR_IN_DISPLAY 1 |
16581 | EOF | 23010 | _ACEOF |
16582 | 23011 | ||
16583 | DISPLAY_HACK_MSG="yes" | 23012 | DISPLAY_HACK_MSG="yes" |
16584 | fi | 23013 | fi |
16585 | 23014 | ||
23015 | |||
16586 | fi; | 23016 | fi; |
16587 | fi | 23017 | fi |
16588 | 23018 | ||
@@ -16593,13 +23023,13 @@ if test "${enable_etc_default_login+set}" = set; then | |||
16593 | 23023 | ||
16594 | else | 23024 | else |
16595 | 23025 | ||
16596 | echo "$as_me:16596: checking for \"/etc/default/login\"" >&5 | 23026 | echo "$as_me:$LINENO: checking for \"/etc/default/login\"" >&5 |
16597 | echo $ECHO_N "checking for \"/etc/default/login\"... $ECHO_C" >&6 | 23027 | echo $ECHO_N "checking for \"/etc/default/login\"... $ECHO_C" >&6 |
16598 | if test "${ac_cv_file___etc_default_login_+set}" = set; then | 23028 | if test "${ac_cv_file___etc_default_login_+set}" = set; then |
16599 | echo $ECHO_N "(cached) $ECHO_C" >&6 | 23029 | echo $ECHO_N "(cached) $ECHO_C" >&6 |
16600 | else | 23030 | else |
16601 | test "$cross_compiling" = yes && | 23031 | test "$cross_compiling" = yes && |
16602 | { { echo "$as_me:16602: error: cannot check for file existence when cross compiling" >&5 | 23032 | { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 |
16603 | echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} | 23033 | echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} |
16604 | { (exit 1); exit 1; }; } | 23034 | { (exit 1); exit 1; }; } |
16605 | if test -r ""/etc/default/login""; then | 23035 | if test -r ""/etc/default/login""; then |
@@ -16608,16 +23038,17 @@ else | |||
16608 | ac_cv_file___etc_default_login_=no | 23038 | ac_cv_file___etc_default_login_=no |
16609 | fi | 23039 | fi |
16610 | fi | 23040 | fi |
16611 | echo "$as_me:16611: result: $ac_cv_file___etc_default_login_" >&5 | 23041 | echo "$as_me:$LINENO: result: $ac_cv_file___etc_default_login_" >&5 |
16612 | echo "${ECHO_T}$ac_cv_file___etc_default_login_" >&6 | 23042 | echo "${ECHO_T}$ac_cv_file___etc_default_login_" >&6 |
16613 | if test $ac_cv_file___etc_default_login_ = yes; then | 23043 | if test $ac_cv_file___etc_default_login_ = yes; then |
16614 | external_path_file=/etc/default/login | 23044 | external_path_file=/etc/default/login |
16615 | fi | 23045 | fi |
16616 | 23046 | ||
23047 | |||
16617 | if test "x$external_path_file" = "x/etc/default/login"; then | 23048 | if test "x$external_path_file" = "x/etc/default/login"; then |
16618 | cat >>confdefs.h <<\EOF | 23049 | cat >>confdefs.h <<\_ACEOF |
16619 | #define HAVE_ETC_DEFAULT_LOGIN 1 | 23050 | #define HAVE_ETC_DEFAULT_LOGIN 1 |
16620 | EOF | 23051 | _ACEOF |
16621 | 23052 | ||
16622 | fi | 23053 | fi |
16623 | 23054 | ||
@@ -16636,7 +23067,7 @@ if test "${with_default_path+set}" = set; then | |||
16636 | withval="$with_default_path" | 23067 | withval="$with_default_path" |
16637 | 23068 | ||
16638 | if test "x$external_path_file" = "x/etc/login.conf" ; then | 23069 | if test "x$external_path_file" = "x/etc/login.conf" ; then |
16639 | { echo "$as_me:16639: WARNING: | 23070 | { echo "$as_me:$LINENO: WARNING: |
16640 | --with-default-path=PATH has no effect on this system. | 23071 | --with-default-path=PATH has no effect on this system. |
16641 | Edit /etc/login.conf instead." >&5 | 23072 | Edit /etc/login.conf instead." >&5 |
16642 | echo "$as_me: WARNING: | 23073 | echo "$as_me: WARNING: |
@@ -16644,7 +23075,7 @@ echo "$as_me: WARNING: | |||
16644 | Edit /etc/login.conf instead." >&2;} | 23075 | Edit /etc/login.conf instead." >&2;} |
16645 | elif test "x$withval" != "xno" ; then | 23076 | elif test "x$withval" != "xno" ; then |
16646 | if test ! -z "$external_path_file" ; then | 23077 | if test ! -z "$external_path_file" ; then |
16647 | { echo "$as_me:16647: WARNING: | 23078 | { echo "$as_me:$LINENO: WARNING: |
16648 | --with-default-path=PATH will only be used if PATH is not defined in | 23079 | --with-default-path=PATH will only be used if PATH is not defined in |
16649 | $external_path_file ." >&5 | 23080 | $external_path_file ." >&5 |
16650 | echo "$as_me: WARNING: | 23081 | echo "$as_me: WARNING: |
@@ -16657,11 +23088,11 @@ $external_path_file ." >&2;} | |||
16657 | 23088 | ||
16658 | else | 23089 | else |
16659 | if test "x$external_path_file" = "x/etc/login.conf" ; then | 23090 | if test "x$external_path_file" = "x/etc/login.conf" ; then |
16660 | { echo "$as_me:16660: WARNING: Make sure the path to scp is in /etc/login.conf" >&5 | 23091 | { echo "$as_me:$LINENO: WARNING: Make sure the path to scp is in /etc/login.conf" >&5 |
16661 | echo "$as_me: WARNING: Make sure the path to scp is in /etc/login.conf" >&2;} | 23092 | echo "$as_me: WARNING: Make sure the path to scp is in /etc/login.conf" >&2;} |
16662 | else | 23093 | else |
16663 | if test ! -z "$external_path_file" ; then | 23094 | if test ! -z "$external_path_file" ; then |
16664 | { echo "$as_me:16664: WARNING: | 23095 | { echo "$as_me:$LINENO: WARNING: |
16665 | If PATH is defined in $external_path_file, ensure the path to scp is included, | 23096 | If PATH is defined in $external_path_file, ensure the path to scp is included, |
16666 | otherwise scp will not work." >&5 | 23097 | otherwise scp will not work." >&5 |
16667 | echo "$as_me: WARNING: | 23098 | echo "$as_me: WARNING: |
@@ -16673,8 +23104,11 @@ otherwise scp will not work." >&2;} | |||
16673 | 23104 | ||
16674 | else | 23105 | else |
16675 | cat >conftest.$ac_ext <<_ACEOF | 23106 | cat >conftest.$ac_ext <<_ACEOF |
16676 | #line 16676 "configure" | 23107 | /* confdefs.h. */ |
16677 | #include "confdefs.h" | 23108 | _ACEOF |
23109 | cat confdefs.h >>conftest.$ac_ext | ||
23110 | cat >>conftest.$ac_ext <<_ACEOF | ||
23111 | /* end confdefs.h. */ | ||
16678 | 23112 | ||
16679 | /* find out what STDPATH is */ | 23113 | /* find out what STDPATH is */ |
16680 | #include <stdio.h> | 23114 | #include <stdio.h> |
@@ -16710,24 +23144,26 @@ main() | |||
16710 | 23144 | ||
16711 | _ACEOF | 23145 | _ACEOF |
16712 | rm -f conftest$ac_exeext | 23146 | rm -f conftest$ac_exeext |
16713 | if { (eval echo "$as_me:16713: \"$ac_link\"") >&5 | 23147 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
16714 | (eval $ac_link) 2>&5 | 23148 | (eval $ac_link) 2>&5 |
16715 | ac_status=$? | 23149 | ac_status=$? |
16716 | echo "$as_me:16716: \$? = $ac_status" >&5 | 23150 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
16717 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | 23151 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
16718 | { (eval echo "$as_me:16718: \"$ac_try\"") >&5 | 23152 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
16719 | (eval $ac_try) 2>&5 | 23153 | (eval $ac_try) 2>&5 |
16720 | ac_status=$? | 23154 | ac_status=$? |
16721 | echo "$as_me:16721: \$? = $ac_status" >&5 | 23155 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
16722 | (exit $ac_status); }; }; then | 23156 | (exit $ac_status); }; }; then |
16723 | user_path=`cat conftest.stdpath` | 23157 | user_path=`cat conftest.stdpath` |
16724 | else | 23158 | else |
16725 | echo "$as_me: program exited with status $ac_status" >&5 | 23159 | echo "$as_me: program exited with status $ac_status" >&5 |
16726 | echo "$as_me: failed program was:" >&5 | 23160 | echo "$as_me: failed program was:" >&5 |
16727 | cat conftest.$ac_ext >&5 | 23161 | sed 's/^/| /' conftest.$ac_ext >&5 |
23162 | |||
23163 | ( exit $ac_status ) | ||
16728 | user_path="/usr/bin:/bin:/usr/sbin:/sbin" | 23164 | user_path="/usr/bin:/bin:/usr/sbin:/sbin" |
16729 | fi | 23165 | fi |
16730 | rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | 23166 | rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext |
16731 | fi | 23167 | fi |
16732 | # make sure $bindir is in USER_PATH so scp will work | 23168 | # make sure $bindir is in USER_PATH so scp will work |
16733 | t_bindir=`eval echo ${bindir}` | 23169 | t_bindir=`eval echo ${bindir}` |
@@ -16742,7 +23178,7 @@ fi | |||
16742 | echo $user_path | grep "^$t_bindir" > /dev/null 2>&1 | 23178 | echo $user_path | grep "^$t_bindir" > /dev/null 2>&1 |
16743 | if test $? -ne 0 ; then | 23179 | if test $? -ne 0 ; then |
16744 | user_path=$user_path:$t_bindir | 23180 | user_path=$user_path:$t_bindir |
16745 | echo "$as_me:16745: result: Adding $t_bindir to USER_PATH so scp will work" >&5 | 23181 | echo "$as_me:$LINENO: result: Adding $t_bindir to USER_PATH so scp will work" >&5 |
16746 | echo "${ECHO_T}Adding $t_bindir to USER_PATH so scp will work" >&6 | 23182 | echo "${ECHO_T}Adding $t_bindir to USER_PATH so scp will work" >&6 |
16747 | fi | 23183 | fi |
16748 | fi | 23184 | fi |
@@ -16750,9 +23186,10 @@ echo "${ECHO_T}Adding $t_bindir to USER_PATH so scp will work" >&6 | |||
16750 | 23186 | ||
16751 | fi; | 23187 | fi; |
16752 | if test "x$external_path_file" != "x/etc/login.conf" ; then | 23188 | if test "x$external_path_file" != "x/etc/login.conf" ; then |
16753 | cat >>confdefs.h <<EOF | 23189 | cat >>confdefs.h <<_ACEOF |
16754 | #define USER_PATH "$user_path" | 23190 | #define USER_PATH "$user_path" |
16755 | EOF | 23191 | _ACEOF |
23192 | |||
16756 | 23193 | ||
16757 | fi | 23194 | fi |
16758 | 23195 | ||
@@ -16763,16 +23200,18 @@ if test "${with_superuser_path+set}" = set; then | |||
16763 | withval="$with_superuser_path" | 23200 | withval="$with_superuser_path" |
16764 | 23201 | ||
16765 | if test "x$withval" != "xno" ; then | 23202 | if test "x$withval" != "xno" ; then |
16766 | cat >>confdefs.h <<EOF | 23203 | cat >>confdefs.h <<_ACEOF |
16767 | #define SUPERUSER_PATH "$withval" | 23204 | #define SUPERUSER_PATH "$withval" |
16768 | EOF | 23205 | _ACEOF |
16769 | 23206 | ||
16770 | superuser_path=$withval | 23207 | superuser_path=$withval |
16771 | fi | 23208 | fi |
16772 | 23209 | ||
23210 | |||
16773 | fi; | 23211 | fi; |
16774 | 23212 | ||
16775 | echo "$as_me:16775: checking if we need to convert IPv4 in IPv6-mapped addresses" >&5 | 23213 | |
23214 | echo "$as_me:$LINENO: checking if we need to convert IPv4 in IPv6-mapped addresses" >&5 | ||
16776 | echo $ECHO_N "checking if we need to convert IPv4 in IPv6-mapped addresses... $ECHO_C" >&6 | 23215 | echo $ECHO_N "checking if we need to convert IPv4 in IPv6-mapped addresses... $ECHO_C" >&6 |
16777 | IPV4_IN6_HACK_MSG="no" | 23216 | IPV4_IN6_HACK_MSG="no" |
16778 | 23217 | ||
@@ -16781,33 +23220,34 @@ if test "${with_4in6+set}" = set; then | |||
16781 | withval="$with_4in6" | 23220 | withval="$with_4in6" |
16782 | 23221 | ||
16783 | if test "x$withval" != "xno" ; then | 23222 | if test "x$withval" != "xno" ; then |
16784 | echo "$as_me:16784: result: yes" >&5 | 23223 | echo "$as_me:$LINENO: result: yes" >&5 |
16785 | echo "${ECHO_T}yes" >&6 | 23224 | echo "${ECHO_T}yes" >&6 |
16786 | cat >>confdefs.h <<\EOF | 23225 | cat >>confdefs.h <<\_ACEOF |
16787 | #define IPV4_IN_IPV6 1 | 23226 | #define IPV4_IN_IPV6 1 |
16788 | EOF | 23227 | _ACEOF |
16789 | 23228 | ||
16790 | IPV4_IN6_HACK_MSG="yes" | 23229 | IPV4_IN6_HACK_MSG="yes" |
16791 | else | 23230 | else |
16792 | echo "$as_me:16792: result: no" >&5 | 23231 | echo "$as_me:$LINENO: result: no" >&5 |
16793 | echo "${ECHO_T}no" >&6 | 23232 | echo "${ECHO_T}no" >&6 |
16794 | fi | 23233 | fi |
16795 | 23234 | ||
16796 | else | 23235 | else |
16797 | 23236 | ||
16798 | if test "x$inet6_default_4in6" = "xyes"; then | 23237 | if test "x$inet6_default_4in6" = "xyes"; then |
16799 | echo "$as_me:16799: result: yes (default)" >&5 | 23238 | echo "$as_me:$LINENO: result: yes (default)" >&5 |
16800 | echo "${ECHO_T}yes (default)" >&6 | 23239 | echo "${ECHO_T}yes (default)" >&6 |
16801 | cat >>confdefs.h <<\EOF | 23240 | cat >>confdefs.h <<\_ACEOF |
16802 | #define IPV4_IN_IPV6 1 | 23241 | #define IPV4_IN_IPV6 1 |
16803 | EOF | 23242 | _ACEOF |
16804 | 23243 | ||
16805 | IPV4_IN6_HACK_MSG="yes" | 23244 | IPV4_IN6_HACK_MSG="yes" |
16806 | else | 23245 | else |
16807 | echo "$as_me:16807: result: no (default)" >&5 | 23246 | echo "$as_me:$LINENO: result: no (default)" >&5 |
16808 | echo "${ECHO_T}no (default)" >&6 | 23247 | echo "${ECHO_T}no (default)" >&6 |
16809 | fi | 23248 | fi |
16810 | 23249 | ||
23250 | |||
16811 | fi; | 23251 | fi; |
16812 | 23252 | ||
16813 | # Whether to enable BSD auth support | 23253 | # Whether to enable BSD auth support |
@@ -16818,13 +23258,14 @@ if test "${with_bsd_auth+set}" = set; then | |||
16818 | withval="$with_bsd_auth" | 23258 | withval="$with_bsd_auth" |
16819 | 23259 | ||
16820 | if test "x$withval" != "xno" ; then | 23260 | if test "x$withval" != "xno" ; then |
16821 | cat >>confdefs.h <<\EOF | 23261 | cat >>confdefs.h <<\_ACEOF |
16822 | #define BSD_AUTH 1 | 23262 | #define BSD_AUTH 1 |
16823 | EOF | 23263 | _ACEOF |
16824 | 23264 | ||
16825 | BSD_AUTH_MSG=yes | 23265 | BSD_AUTH_MSG=yes |
16826 | fi | 23266 | fi |
16827 | 23267 | ||
23268 | |||
16828 | fi; | 23269 | fi; |
16829 | 23270 | ||
16830 | # Where to place sshd.pid | 23271 | # Where to place sshd.pid |
@@ -16837,6 +23278,7 @@ if test ! -d $piddir ; then | |||
16837 | esac | 23278 | esac |
16838 | fi | 23279 | fi |
16839 | 23280 | ||
23281 | |||
16840 | # Check whether --with-pid-dir or --without-pid-dir was given. | 23282 | # Check whether --with-pid-dir or --without-pid-dir was given. |
16841 | if test "${with_pid_dir+set}" = set; then | 23283 | if test "${with_pid_dir+set}" = set; then |
16842 | withval="$with_pid_dir" | 23284 | withval="$with_pid_dir" |
@@ -16844,112 +23286,123 @@ if test "${with_pid_dir+set}" = set; then | |||
16844 | if test "x$withval" != "xno" ; then | 23286 | if test "x$withval" != "xno" ; then |
16845 | piddir=$withval | 23287 | piddir=$withval |
16846 | if test ! -d $piddir ; then | 23288 | if test ! -d $piddir ; then |
16847 | { echo "$as_me:16847: WARNING: ** no $piddir directory on this system **" >&5 | 23289 | { echo "$as_me:$LINENO: WARNING: ** no $piddir directory on this system **" >&5 |
16848 | echo "$as_me: WARNING: ** no $piddir directory on this system **" >&2;} | 23290 | echo "$as_me: WARNING: ** no $piddir directory on this system **" >&2;} |
16849 | fi | 23291 | fi |
16850 | fi | 23292 | fi |
16851 | 23293 | ||
23294 | |||
16852 | fi; | 23295 | fi; |
16853 | 23296 | ||
16854 | cat >>confdefs.h <<EOF | 23297 | cat >>confdefs.h <<_ACEOF |
16855 | #define _PATH_SSH_PIDDIR "$piddir" | 23298 | #define _PATH_SSH_PIDDIR "$piddir" |
16856 | EOF | 23299 | _ACEOF |
23300 | |||
23301 | |||
16857 | 23302 | ||
16858 | # Check whether --enable-lastlog or --disable-lastlog was given. | 23303 | # Check whether --enable-lastlog or --disable-lastlog was given. |
16859 | if test "${enable_lastlog+set}" = set; then | 23304 | if test "${enable_lastlog+set}" = set; then |
16860 | enableval="$enable_lastlog" | 23305 | enableval="$enable_lastlog" |
16861 | 23306 | ||
16862 | if test "x$enableval" = "xno" ; then | 23307 | if test "x$enableval" = "xno" ; then |
16863 | cat >>confdefs.h <<\EOF | 23308 | cat >>confdefs.h <<\_ACEOF |
16864 | #define DISABLE_LASTLOG 1 | 23309 | #define DISABLE_LASTLOG 1 |
16865 | EOF | 23310 | _ACEOF |
16866 | 23311 | ||
16867 | fi | 23312 | fi |
16868 | 23313 | ||
23314 | |||
16869 | fi; | 23315 | fi; |
16870 | # Check whether --enable-utmp or --disable-utmp was given. | 23316 | # Check whether --enable-utmp or --disable-utmp was given. |
16871 | if test "${enable_utmp+set}" = set; then | 23317 | if test "${enable_utmp+set}" = set; then |
16872 | enableval="$enable_utmp" | 23318 | enableval="$enable_utmp" |
16873 | 23319 | ||
16874 | if test "x$enableval" = "xno" ; then | 23320 | if test "x$enableval" = "xno" ; then |
16875 | cat >>confdefs.h <<\EOF | 23321 | cat >>confdefs.h <<\_ACEOF |
16876 | #define DISABLE_UTMP 1 | 23322 | #define DISABLE_UTMP 1 |
16877 | EOF | 23323 | _ACEOF |
16878 | 23324 | ||
16879 | fi | 23325 | fi |
16880 | 23326 | ||
23327 | |||
16881 | fi; | 23328 | fi; |
16882 | # Check whether --enable-utmpx or --disable-utmpx was given. | 23329 | # Check whether --enable-utmpx or --disable-utmpx was given. |
16883 | if test "${enable_utmpx+set}" = set; then | 23330 | if test "${enable_utmpx+set}" = set; then |
16884 | enableval="$enable_utmpx" | 23331 | enableval="$enable_utmpx" |
16885 | 23332 | ||
16886 | if test "x$enableval" = "xno" ; then | 23333 | if test "x$enableval" = "xno" ; then |
16887 | cat >>confdefs.h <<\EOF | 23334 | cat >>confdefs.h <<\_ACEOF |
16888 | #define DISABLE_UTMPX 1 | 23335 | #define DISABLE_UTMPX 1 |
16889 | EOF | 23336 | _ACEOF |
16890 | 23337 | ||
16891 | fi | 23338 | fi |
16892 | 23339 | ||
23340 | |||
16893 | fi; | 23341 | fi; |
16894 | # Check whether --enable-wtmp or --disable-wtmp was given. | 23342 | # Check whether --enable-wtmp or --disable-wtmp was given. |
16895 | if test "${enable_wtmp+set}" = set; then | 23343 | if test "${enable_wtmp+set}" = set; then |
16896 | enableval="$enable_wtmp" | 23344 | enableval="$enable_wtmp" |
16897 | 23345 | ||
16898 | if test "x$enableval" = "xno" ; then | 23346 | if test "x$enableval" = "xno" ; then |
16899 | cat >>confdefs.h <<\EOF | 23347 | cat >>confdefs.h <<\_ACEOF |
16900 | #define DISABLE_WTMP 1 | 23348 | #define DISABLE_WTMP 1 |
16901 | EOF | 23349 | _ACEOF |
16902 | 23350 | ||
16903 | fi | 23351 | fi |
16904 | 23352 | ||
23353 | |||
16905 | fi; | 23354 | fi; |
16906 | # Check whether --enable-wtmpx or --disable-wtmpx was given. | 23355 | # Check whether --enable-wtmpx or --disable-wtmpx was given. |
16907 | if test "${enable_wtmpx+set}" = set; then | 23356 | if test "${enable_wtmpx+set}" = set; then |
16908 | enableval="$enable_wtmpx" | 23357 | enableval="$enable_wtmpx" |
16909 | 23358 | ||
16910 | if test "x$enableval" = "xno" ; then | 23359 | if test "x$enableval" = "xno" ; then |
16911 | cat >>confdefs.h <<\EOF | 23360 | cat >>confdefs.h <<\_ACEOF |
16912 | #define DISABLE_WTMPX 1 | 23361 | #define DISABLE_WTMPX 1 |
16913 | EOF | 23362 | _ACEOF |
16914 | 23363 | ||
16915 | fi | 23364 | fi |
16916 | 23365 | ||
23366 | |||
16917 | fi; | 23367 | fi; |
16918 | # Check whether --enable-libutil or --disable-libutil was given. | 23368 | # Check whether --enable-libutil or --disable-libutil was given. |
16919 | if test "${enable_libutil+set}" = set; then | 23369 | if test "${enable_libutil+set}" = set; then |
16920 | enableval="$enable_libutil" | 23370 | enableval="$enable_libutil" |
16921 | 23371 | ||
16922 | if test "x$enableval" = "xno" ; then | 23372 | if test "x$enableval" = "xno" ; then |
16923 | cat >>confdefs.h <<\EOF | 23373 | cat >>confdefs.h <<\_ACEOF |
16924 | #define DISABLE_LOGIN 1 | 23374 | #define DISABLE_LOGIN 1 |
16925 | EOF | 23375 | _ACEOF |
16926 | 23376 | ||
16927 | fi | 23377 | fi |
16928 | 23378 | ||
23379 | |||
16929 | fi; | 23380 | fi; |
16930 | # Check whether --enable-pututline or --disable-pututline was given. | 23381 | # Check whether --enable-pututline or --disable-pututline was given. |
16931 | if test "${enable_pututline+set}" = set; then | 23382 | if test "${enable_pututline+set}" = set; then |
16932 | enableval="$enable_pututline" | 23383 | enableval="$enable_pututline" |
16933 | 23384 | ||
16934 | if test "x$enableval" = "xno" ; then | 23385 | if test "x$enableval" = "xno" ; then |
16935 | cat >>confdefs.h <<\EOF | 23386 | cat >>confdefs.h <<\_ACEOF |
16936 | #define DISABLE_PUTUTLINE 1 | 23387 | #define DISABLE_PUTUTLINE 1 |
16937 | EOF | 23388 | _ACEOF |
16938 | 23389 | ||
16939 | fi | 23390 | fi |
16940 | 23391 | ||
23392 | |||
16941 | fi; | 23393 | fi; |
16942 | # Check whether --enable-pututxline or --disable-pututxline was given. | 23394 | # Check whether --enable-pututxline or --disable-pututxline was given. |
16943 | if test "${enable_pututxline+set}" = set; then | 23395 | if test "${enable_pututxline+set}" = set; then |
16944 | enableval="$enable_pututxline" | 23396 | enableval="$enable_pututxline" |
16945 | 23397 | ||
16946 | if test "x$enableval" = "xno" ; then | 23398 | if test "x$enableval" = "xno" ; then |
16947 | cat >>confdefs.h <<\EOF | 23399 | cat >>confdefs.h <<\_ACEOF |
16948 | #define DISABLE_PUTUTXLINE 1 | 23400 | #define DISABLE_PUTUTXLINE 1 |
16949 | EOF | 23401 | _ACEOF |
16950 | 23402 | ||
16951 | fi | 23403 | fi |
16952 | 23404 | ||
23405 | |||
16953 | fi; | 23406 | fi; |
16954 | 23407 | ||
16955 | # Check whether --with-lastlog or --without-lastlog was given. | 23408 | # Check whether --with-lastlog or --without-lastlog was given. |
@@ -16957,21 +23410,26 @@ if test "${with_lastlog+set}" = set; then | |||
16957 | withval="$with_lastlog" | 23410 | withval="$with_lastlog" |
16958 | 23411 | ||
16959 | if test "x$withval" = "xno" ; then | 23412 | if test "x$withval" = "xno" ; then |
16960 | cat >>confdefs.h <<\EOF | 23413 | cat >>confdefs.h <<\_ACEOF |
16961 | #define DISABLE_LASTLOG 1 | 23414 | #define DISABLE_LASTLOG 1 |
16962 | EOF | 23415 | _ACEOF |
16963 | 23416 | ||
16964 | else | 23417 | else |
16965 | conf_lastlog_location=$withval | 23418 | conf_lastlog_location=$withval |
16966 | fi | 23419 | fi |
16967 | 23420 | ||
23421 | |||
16968 | fi; | 23422 | fi; |
16969 | 23423 | ||
16970 | echo "$as_me:16970: checking if your system defines LASTLOG_FILE" >&5 | 23424 | |
23425 | echo "$as_me:$LINENO: checking if your system defines LASTLOG_FILE" >&5 | ||
16971 | echo $ECHO_N "checking if your system defines LASTLOG_FILE... $ECHO_C" >&6 | 23426 | echo $ECHO_N "checking if your system defines LASTLOG_FILE... $ECHO_C" >&6 |
16972 | cat >conftest.$ac_ext <<_ACEOF | 23427 | cat >conftest.$ac_ext <<_ACEOF |
16973 | #line 16973 "configure" | 23428 | /* confdefs.h. */ |
16974 | #include "confdefs.h" | 23429 | _ACEOF |
23430 | cat confdefs.h >>conftest.$ac_ext | ||
23431 | cat >>conftest.$ac_ext <<_ACEOF | ||
23432 | /* end confdefs.h. */ | ||
16975 | 23433 | ||
16976 | #include <sys/types.h> | 23434 | #include <sys/types.h> |
16977 | #include <utmp.h> | 23435 | #include <utmp.h> |
@@ -16994,30 +23452,44 @@ main () | |||
16994 | } | 23452 | } |
16995 | _ACEOF | 23453 | _ACEOF |
16996 | rm -f conftest.$ac_objext | 23454 | rm -f conftest.$ac_objext |
16997 | if { (eval echo "$as_me:16997: \"$ac_compile\"") >&5 | 23455 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
16998 | (eval $ac_compile) 2>&5 | 23456 | (eval $ac_compile) 2>conftest.er1 |
16999 | ac_status=$? | 23457 | ac_status=$? |
17000 | echo "$as_me:17000: \$? = $ac_status" >&5 | 23458 | grep -v '^ *+' conftest.er1 >conftest.err |
23459 | rm -f conftest.er1 | ||
23460 | cat conftest.err >&5 | ||
23461 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17001 | (exit $ac_status); } && | 23462 | (exit $ac_status); } && |
17002 | { ac_try='test -s conftest.$ac_objext' | 23463 | { ac_try='test -z "$ac_c_werror_flag" |
17003 | { (eval echo "$as_me:17003: \"$ac_try\"") >&5 | 23464 | || test ! -s conftest.err' |
23465 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17004 | (eval $ac_try) 2>&5 | 23466 | (eval $ac_try) 2>&5 |
17005 | ac_status=$? | 23467 | ac_status=$? |
17006 | echo "$as_me:17006: \$? = $ac_status" >&5 | 23468 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
23469 | (exit $ac_status); }; } && | ||
23470 | { ac_try='test -s conftest.$ac_objext' | ||
23471 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
23472 | (eval $ac_try) 2>&5 | ||
23473 | ac_status=$? | ||
23474 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17007 | (exit $ac_status); }; }; then | 23475 | (exit $ac_status); }; }; then |
17008 | echo "$as_me:17008: result: yes" >&5 | 23476 | echo "$as_me:$LINENO: result: yes" >&5 |
17009 | echo "${ECHO_T}yes" >&6 | 23477 | echo "${ECHO_T}yes" >&6 |
17010 | else | 23478 | else |
17011 | echo "$as_me: failed program was:" >&5 | 23479 | echo "$as_me: failed program was:" >&5 |
17012 | cat conftest.$ac_ext >&5 | 23480 | sed 's/^/| /' conftest.$ac_ext >&5 |
23481 | |||
17013 | 23482 | ||
17014 | echo "$as_me:17014: result: no" >&5 | 23483 | echo "$as_me:$LINENO: result: no" >&5 |
17015 | echo "${ECHO_T}no" >&6 | 23484 | echo "${ECHO_T}no" >&6 |
17016 | echo "$as_me:17016: checking if your system defines _PATH_LASTLOG" >&5 | 23485 | echo "$as_me:$LINENO: checking if your system defines _PATH_LASTLOG" >&5 |
17017 | echo $ECHO_N "checking if your system defines _PATH_LASTLOG... $ECHO_C" >&6 | 23486 | echo $ECHO_N "checking if your system defines _PATH_LASTLOG... $ECHO_C" >&6 |
17018 | cat >conftest.$ac_ext <<_ACEOF | 23487 | cat >conftest.$ac_ext <<_ACEOF |
17019 | #line 17019 "configure" | 23488 | /* confdefs.h. */ |
17020 | #include "confdefs.h" | 23489 | _ACEOF |
23490 | cat confdefs.h >>conftest.$ac_ext | ||
23491 | cat >>conftest.$ac_ext <<_ACEOF | ||
23492 | /* end confdefs.h. */ | ||
17021 | 23493 | ||
17022 | #include <sys/types.h> | 23494 | #include <sys/types.h> |
17023 | #include <utmp.h> | 23495 | #include <utmp.h> |
@@ -17037,32 +23509,44 @@ main () | |||
17037 | } | 23509 | } |
17038 | _ACEOF | 23510 | _ACEOF |
17039 | rm -f conftest.$ac_objext | 23511 | rm -f conftest.$ac_objext |
17040 | if { (eval echo "$as_me:17040: \"$ac_compile\"") >&5 | 23512 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
17041 | (eval $ac_compile) 2>&5 | 23513 | (eval $ac_compile) 2>conftest.er1 |
17042 | ac_status=$? | 23514 | ac_status=$? |
17043 | echo "$as_me:17043: \$? = $ac_status" >&5 | 23515 | grep -v '^ *+' conftest.er1 >conftest.err |
23516 | rm -f conftest.er1 | ||
23517 | cat conftest.err >&5 | ||
23518 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17044 | (exit $ac_status); } && | 23519 | (exit $ac_status); } && |
17045 | { ac_try='test -s conftest.$ac_objext' | 23520 | { ac_try='test -z "$ac_c_werror_flag" |
17046 | { (eval echo "$as_me:17046: \"$ac_try\"") >&5 | 23521 | || test ! -s conftest.err' |
23522 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
23523 | (eval $ac_try) 2>&5 | ||
23524 | ac_status=$? | ||
23525 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
23526 | (exit $ac_status); }; } && | ||
23527 | { ac_try='test -s conftest.$ac_objext' | ||
23528 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17047 | (eval $ac_try) 2>&5 | 23529 | (eval $ac_try) 2>&5 |
17048 | ac_status=$? | 23530 | ac_status=$? |
17049 | echo "$as_me:17049: \$? = $ac_status" >&5 | 23531 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
17050 | (exit $ac_status); }; }; then | 23532 | (exit $ac_status); }; }; then |
17051 | echo "$as_me:17051: result: yes" >&5 | 23533 | echo "$as_me:$LINENO: result: yes" >&5 |
17052 | echo "${ECHO_T}yes" >&6 | 23534 | echo "${ECHO_T}yes" >&6 |
17053 | else | 23535 | else |
17054 | echo "$as_me: failed program was:" >&5 | 23536 | echo "$as_me: failed program was:" >&5 |
17055 | cat conftest.$ac_ext >&5 | 23537 | sed 's/^/| /' conftest.$ac_ext >&5 |
23538 | |||
17056 | 23539 | ||
17057 | echo "$as_me:17057: result: no" >&5 | 23540 | echo "$as_me:$LINENO: result: no" >&5 |
17058 | echo "${ECHO_T}no" >&6 | 23541 | echo "${ECHO_T}no" >&6 |
17059 | system_lastlog_path=no | 23542 | system_lastlog_path=no |
17060 | 23543 | ||
17061 | fi | 23544 | fi |
17062 | rm -f conftest.$ac_objext conftest.$ac_ext | 23545 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
23546 | |||
17063 | 23547 | ||
17064 | fi | 23548 | fi |
17065 | rm -f conftest.$ac_objext conftest.$ac_ext | 23549 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
17066 | 23550 | ||
17067 | if test -z "$conf_lastlog_location"; then | 23551 | if test -z "$conf_lastlog_location"; then |
17068 | if test x"$system_lastlog_path" = x"no" ; then | 23552 | if test x"$system_lastlog_path" = x"no" ; then |
@@ -17072,24 +23556,27 @@ if test -z "$conf_lastlog_location"; then | |||
17072 | fi | 23556 | fi |
17073 | done | 23557 | done |
17074 | if test -z "$conf_lastlog_location"; then | 23558 | if test -z "$conf_lastlog_location"; then |
17075 | { echo "$as_me:17075: WARNING: ** Cannot find lastlog **" >&5 | 23559 | { echo "$as_me:$LINENO: WARNING: ** Cannot find lastlog **" >&5 |
17076 | echo "$as_me: WARNING: ** Cannot find lastlog **" >&2;} | 23560 | echo "$as_me: WARNING: ** Cannot find lastlog **" >&2;} |
17077 | fi | 23561 | fi |
17078 | fi | 23562 | fi |
17079 | fi | 23563 | fi |
17080 | 23564 | ||
17081 | if test -n "$conf_lastlog_location"; then | 23565 | if test -n "$conf_lastlog_location"; then |
17082 | cat >>confdefs.h <<EOF | 23566 | cat >>confdefs.h <<_ACEOF |
17083 | #define CONF_LASTLOG_FILE "$conf_lastlog_location" | 23567 | #define CONF_LASTLOG_FILE "$conf_lastlog_location" |
17084 | EOF | 23568 | _ACEOF |
17085 | 23569 | ||
17086 | fi | 23570 | fi |
17087 | 23571 | ||
17088 | echo "$as_me:17088: checking if your system defines UTMP_FILE" >&5 | 23572 | echo "$as_me:$LINENO: checking if your system defines UTMP_FILE" >&5 |
17089 | echo $ECHO_N "checking if your system defines UTMP_FILE... $ECHO_C" >&6 | 23573 | echo $ECHO_N "checking if your system defines UTMP_FILE... $ECHO_C" >&6 |
17090 | cat >conftest.$ac_ext <<_ACEOF | 23574 | cat >conftest.$ac_ext <<_ACEOF |
17091 | #line 17091 "configure" | 23575 | /* confdefs.h. */ |
17092 | #include "confdefs.h" | 23576 | _ACEOF |
23577 | cat confdefs.h >>conftest.$ac_ext | ||
23578 | cat >>conftest.$ac_ext <<_ACEOF | ||
23579 | /* end confdefs.h. */ | ||
17093 | 23580 | ||
17094 | #include <sys/types.h> | 23581 | #include <sys/types.h> |
17095 | #include <utmp.h> | 23582 | #include <utmp.h> |
@@ -17106,28 +23593,39 @@ main () | |||
17106 | } | 23593 | } |
17107 | _ACEOF | 23594 | _ACEOF |
17108 | rm -f conftest.$ac_objext | 23595 | rm -f conftest.$ac_objext |
17109 | if { (eval echo "$as_me:17109: \"$ac_compile\"") >&5 | 23596 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
17110 | (eval $ac_compile) 2>&5 | 23597 | (eval $ac_compile) 2>conftest.er1 |
17111 | ac_status=$? | 23598 | ac_status=$? |
17112 | echo "$as_me:17112: \$? = $ac_status" >&5 | 23599 | grep -v '^ *+' conftest.er1 >conftest.err |
23600 | rm -f conftest.er1 | ||
23601 | cat conftest.err >&5 | ||
23602 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17113 | (exit $ac_status); } && | 23603 | (exit $ac_status); } && |
17114 | { ac_try='test -s conftest.$ac_objext' | 23604 | { ac_try='test -z "$ac_c_werror_flag" |
17115 | { (eval echo "$as_me:17115: \"$ac_try\"") >&5 | 23605 | || test ! -s conftest.err' |
23606 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
23607 | (eval $ac_try) 2>&5 | ||
23608 | ac_status=$? | ||
23609 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
23610 | (exit $ac_status); }; } && | ||
23611 | { ac_try='test -s conftest.$ac_objext' | ||
23612 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17116 | (eval $ac_try) 2>&5 | 23613 | (eval $ac_try) 2>&5 |
17117 | ac_status=$? | 23614 | ac_status=$? |
17118 | echo "$as_me:17118: \$? = $ac_status" >&5 | 23615 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
17119 | (exit $ac_status); }; }; then | 23616 | (exit $ac_status); }; }; then |
17120 | echo "$as_me:17120: result: yes" >&5 | 23617 | echo "$as_me:$LINENO: result: yes" >&5 |
17121 | echo "${ECHO_T}yes" >&6 | 23618 | echo "${ECHO_T}yes" >&6 |
17122 | else | 23619 | else |
17123 | echo "$as_me: failed program was:" >&5 | 23620 | echo "$as_me: failed program was:" >&5 |
17124 | cat conftest.$ac_ext >&5 | 23621 | sed 's/^/| /' conftest.$ac_ext >&5 |
17125 | echo "$as_me:17125: result: no" >&5 | 23622 | |
23623 | echo "$as_me:$LINENO: result: no" >&5 | ||
17126 | echo "${ECHO_T}no" >&6 | 23624 | echo "${ECHO_T}no" >&6 |
17127 | system_utmp_path=no | 23625 | system_utmp_path=no |
17128 | 23626 | ||
17129 | fi | 23627 | fi |
17130 | rm -f conftest.$ac_objext conftest.$ac_ext | 23628 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
17131 | if test -z "$conf_utmp_location"; then | 23629 | if test -z "$conf_utmp_location"; then |
17132 | if test x"$system_utmp_path" = x"no" ; then | 23630 | if test x"$system_utmp_path" = x"no" ; then |
17133 | for f in /etc/utmp /usr/adm/utmp /var/run/utmp; do | 23631 | for f in /etc/utmp /usr/adm/utmp /var/run/utmp; do |
@@ -17136,25 +23634,28 @@ if test -z "$conf_utmp_location"; then | |||
17136 | fi | 23634 | fi |
17137 | done | 23635 | done |
17138 | if test -z "$conf_utmp_location"; then | 23636 | if test -z "$conf_utmp_location"; then |
17139 | cat >>confdefs.h <<\EOF | 23637 | cat >>confdefs.h <<\_ACEOF |
17140 | #define DISABLE_UTMP 1 | 23638 | #define DISABLE_UTMP 1 |
17141 | EOF | 23639 | _ACEOF |
17142 | 23640 | ||
17143 | fi | 23641 | fi |
17144 | fi | 23642 | fi |
17145 | fi | 23643 | fi |
17146 | if test -n "$conf_utmp_location"; then | 23644 | if test -n "$conf_utmp_location"; then |
17147 | cat >>confdefs.h <<EOF | 23645 | cat >>confdefs.h <<_ACEOF |
17148 | #define CONF_UTMP_FILE "$conf_utmp_location" | 23646 | #define CONF_UTMP_FILE "$conf_utmp_location" |
17149 | EOF | 23647 | _ACEOF |
17150 | 23648 | ||
17151 | fi | 23649 | fi |
17152 | 23650 | ||
17153 | echo "$as_me:17153: checking if your system defines WTMP_FILE" >&5 | 23651 | echo "$as_me:$LINENO: checking if your system defines WTMP_FILE" >&5 |
17154 | echo $ECHO_N "checking if your system defines WTMP_FILE... $ECHO_C" >&6 | 23652 | echo $ECHO_N "checking if your system defines WTMP_FILE... $ECHO_C" >&6 |
17155 | cat >conftest.$ac_ext <<_ACEOF | 23653 | cat >conftest.$ac_ext <<_ACEOF |
17156 | #line 17156 "configure" | 23654 | /* confdefs.h. */ |
17157 | #include "confdefs.h" | 23655 | _ACEOF |
23656 | cat confdefs.h >>conftest.$ac_ext | ||
23657 | cat >>conftest.$ac_ext <<_ACEOF | ||
23658 | /* end confdefs.h. */ | ||
17158 | 23659 | ||
17159 | #include <sys/types.h> | 23660 | #include <sys/types.h> |
17160 | #include <utmp.h> | 23661 | #include <utmp.h> |
@@ -17171,28 +23672,39 @@ main () | |||
17171 | } | 23672 | } |
17172 | _ACEOF | 23673 | _ACEOF |
17173 | rm -f conftest.$ac_objext | 23674 | rm -f conftest.$ac_objext |
17174 | if { (eval echo "$as_me:17174: \"$ac_compile\"") >&5 | 23675 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
17175 | (eval $ac_compile) 2>&5 | 23676 | (eval $ac_compile) 2>conftest.er1 |
17176 | ac_status=$? | 23677 | ac_status=$? |
17177 | echo "$as_me:17177: \$? = $ac_status" >&5 | 23678 | grep -v '^ *+' conftest.er1 >conftest.err |
23679 | rm -f conftest.er1 | ||
23680 | cat conftest.err >&5 | ||
23681 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17178 | (exit $ac_status); } && | 23682 | (exit $ac_status); } && |
17179 | { ac_try='test -s conftest.$ac_objext' | 23683 | { ac_try='test -z "$ac_c_werror_flag" |
17180 | { (eval echo "$as_me:17180: \"$ac_try\"") >&5 | 23684 | || test ! -s conftest.err' |
23685 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
23686 | (eval $ac_try) 2>&5 | ||
23687 | ac_status=$? | ||
23688 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
23689 | (exit $ac_status); }; } && | ||
23690 | { ac_try='test -s conftest.$ac_objext' | ||
23691 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17181 | (eval $ac_try) 2>&5 | 23692 | (eval $ac_try) 2>&5 |
17182 | ac_status=$? | 23693 | ac_status=$? |
17183 | echo "$as_me:17183: \$? = $ac_status" >&5 | 23694 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
17184 | (exit $ac_status); }; }; then | 23695 | (exit $ac_status); }; }; then |
17185 | echo "$as_me:17185: result: yes" >&5 | 23696 | echo "$as_me:$LINENO: result: yes" >&5 |
17186 | echo "${ECHO_T}yes" >&6 | 23697 | echo "${ECHO_T}yes" >&6 |
17187 | else | 23698 | else |
17188 | echo "$as_me: failed program was:" >&5 | 23699 | echo "$as_me: failed program was:" >&5 |
17189 | cat conftest.$ac_ext >&5 | 23700 | sed 's/^/| /' conftest.$ac_ext >&5 |
17190 | echo "$as_me:17190: result: no" >&5 | 23701 | |
23702 | echo "$as_me:$LINENO: result: no" >&5 | ||
17191 | echo "${ECHO_T}no" >&6 | 23703 | echo "${ECHO_T}no" >&6 |
17192 | system_wtmp_path=no | 23704 | system_wtmp_path=no |
17193 | 23705 | ||
17194 | fi | 23706 | fi |
17195 | rm -f conftest.$ac_objext conftest.$ac_ext | 23707 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
17196 | if test -z "$conf_wtmp_location"; then | 23708 | if test -z "$conf_wtmp_location"; then |
17197 | if test x"$system_wtmp_path" = x"no" ; then | 23709 | if test x"$system_wtmp_path" = x"no" ; then |
17198 | for f in /usr/adm/wtmp /var/log/wtmp; do | 23710 | for f in /usr/adm/wtmp /var/log/wtmp; do |
@@ -17201,25 +23713,29 @@ if test -z "$conf_wtmp_location"; then | |||
17201 | fi | 23713 | fi |
17202 | done | 23714 | done |
17203 | if test -z "$conf_wtmp_location"; then | 23715 | if test -z "$conf_wtmp_location"; then |
17204 | cat >>confdefs.h <<\EOF | 23716 | cat >>confdefs.h <<\_ACEOF |
17205 | #define DISABLE_WTMP 1 | 23717 | #define DISABLE_WTMP 1 |
17206 | EOF | 23718 | _ACEOF |
17207 | 23719 | ||
17208 | fi | 23720 | fi |
17209 | fi | 23721 | fi |
17210 | fi | 23722 | fi |
17211 | if test -n "$conf_wtmp_location"; then | 23723 | if test -n "$conf_wtmp_location"; then |
17212 | cat >>confdefs.h <<EOF | 23724 | cat >>confdefs.h <<_ACEOF |
17213 | #define CONF_WTMP_FILE "$conf_wtmp_location" | 23725 | #define CONF_WTMP_FILE "$conf_wtmp_location" |
17214 | EOF | 23726 | _ACEOF |
17215 | 23727 | ||
17216 | fi | 23728 | fi |
17217 | 23729 | ||
17218 | echo "$as_me:17218: checking if your system defines UTMPX_FILE" >&5 | 23730 | |
23731 | echo "$as_me:$LINENO: checking if your system defines UTMPX_FILE" >&5 | ||
17219 | echo $ECHO_N "checking if your system defines UTMPX_FILE... $ECHO_C" >&6 | 23732 | echo $ECHO_N "checking if your system defines UTMPX_FILE... $ECHO_C" >&6 |
17220 | cat >conftest.$ac_ext <<_ACEOF | 23733 | cat >conftest.$ac_ext <<_ACEOF |
17221 | #line 17221 "configure" | 23734 | /* confdefs.h. */ |
17222 | #include "confdefs.h" | 23735 | _ACEOF |
23736 | cat confdefs.h >>conftest.$ac_ext | ||
23737 | cat >>conftest.$ac_ext <<_ACEOF | ||
23738 | /* end confdefs.h. */ | ||
17223 | 23739 | ||
17224 | #include <sys/types.h> | 23740 | #include <sys/types.h> |
17225 | #include <utmp.h> | 23741 | #include <utmp.h> |
@@ -17239,47 +23755,61 @@ main () | |||
17239 | } | 23755 | } |
17240 | _ACEOF | 23756 | _ACEOF |
17241 | rm -f conftest.$ac_objext | 23757 | rm -f conftest.$ac_objext |
17242 | if { (eval echo "$as_me:17242: \"$ac_compile\"") >&5 | 23758 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
17243 | (eval $ac_compile) 2>&5 | 23759 | (eval $ac_compile) 2>conftest.er1 |
17244 | ac_status=$? | 23760 | ac_status=$? |
17245 | echo "$as_me:17245: \$? = $ac_status" >&5 | 23761 | grep -v '^ *+' conftest.er1 >conftest.err |
23762 | rm -f conftest.er1 | ||
23763 | cat conftest.err >&5 | ||
23764 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17246 | (exit $ac_status); } && | 23765 | (exit $ac_status); } && |
17247 | { ac_try='test -s conftest.$ac_objext' | 23766 | { ac_try='test -z "$ac_c_werror_flag" |
17248 | { (eval echo "$as_me:17248: \"$ac_try\"") >&5 | 23767 | || test ! -s conftest.err' |
23768 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17249 | (eval $ac_try) 2>&5 | 23769 | (eval $ac_try) 2>&5 |
17250 | ac_status=$? | 23770 | ac_status=$? |
17251 | echo "$as_me:17251: \$? = $ac_status" >&5 | 23771 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
23772 | (exit $ac_status); }; } && | ||
23773 | { ac_try='test -s conftest.$ac_objext' | ||
23774 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
23775 | (eval $ac_try) 2>&5 | ||
23776 | ac_status=$? | ||
23777 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17252 | (exit $ac_status); }; }; then | 23778 | (exit $ac_status); }; }; then |
17253 | echo "$as_me:17253: result: yes" >&5 | 23779 | echo "$as_me:$LINENO: result: yes" >&5 |
17254 | echo "${ECHO_T}yes" >&6 | 23780 | echo "${ECHO_T}yes" >&6 |
17255 | else | 23781 | else |
17256 | echo "$as_me: failed program was:" >&5 | 23782 | echo "$as_me: failed program was:" >&5 |
17257 | cat conftest.$ac_ext >&5 | 23783 | sed 's/^/| /' conftest.$ac_ext >&5 |
17258 | echo "$as_me:17258: result: no" >&5 | 23784 | |
23785 | echo "$as_me:$LINENO: result: no" >&5 | ||
17259 | echo "${ECHO_T}no" >&6 | 23786 | echo "${ECHO_T}no" >&6 |
17260 | system_utmpx_path=no | 23787 | system_utmpx_path=no |
17261 | 23788 | ||
17262 | fi | 23789 | fi |
17263 | rm -f conftest.$ac_objext conftest.$ac_ext | 23790 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
17264 | if test -z "$conf_utmpx_location"; then | 23791 | if test -z "$conf_utmpx_location"; then |
17265 | if test x"$system_utmpx_path" = x"no" ; then | 23792 | if test x"$system_utmpx_path" = x"no" ; then |
17266 | cat >>confdefs.h <<\EOF | 23793 | cat >>confdefs.h <<\_ACEOF |
17267 | #define DISABLE_UTMPX 1 | 23794 | #define DISABLE_UTMPX 1 |
17268 | EOF | 23795 | _ACEOF |
17269 | 23796 | ||
17270 | fi | 23797 | fi |
17271 | else | 23798 | else |
17272 | cat >>confdefs.h <<EOF | 23799 | cat >>confdefs.h <<_ACEOF |
17273 | #define CONF_UTMPX_FILE "$conf_utmpx_location" | 23800 | #define CONF_UTMPX_FILE "$conf_utmpx_location" |
17274 | EOF | 23801 | _ACEOF |
17275 | 23802 | ||
17276 | fi | 23803 | fi |
17277 | 23804 | ||
17278 | echo "$as_me:17278: checking if your system defines WTMPX_FILE" >&5 | 23805 | echo "$as_me:$LINENO: checking if your system defines WTMPX_FILE" >&5 |
17279 | echo $ECHO_N "checking if your system defines WTMPX_FILE... $ECHO_C" >&6 | 23806 | echo $ECHO_N "checking if your system defines WTMPX_FILE... $ECHO_C" >&6 |
17280 | cat >conftest.$ac_ext <<_ACEOF | 23807 | cat >conftest.$ac_ext <<_ACEOF |
17281 | #line 17281 "configure" | 23808 | /* confdefs.h. */ |
17282 | #include "confdefs.h" | 23809 | _ACEOF |
23810 | cat confdefs.h >>conftest.$ac_ext | ||
23811 | cat >>conftest.$ac_ext <<_ACEOF | ||
23812 | /* end confdefs.h. */ | ||
17283 | 23813 | ||
17284 | #include <sys/types.h> | 23814 | #include <sys/types.h> |
17285 | #include <utmp.h> | 23815 | #include <utmp.h> |
@@ -17299,45 +23829,57 @@ main () | |||
17299 | } | 23829 | } |
17300 | _ACEOF | 23830 | _ACEOF |
17301 | rm -f conftest.$ac_objext | 23831 | rm -f conftest.$ac_objext |
17302 | if { (eval echo "$as_me:17302: \"$ac_compile\"") >&5 | 23832 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
17303 | (eval $ac_compile) 2>&5 | 23833 | (eval $ac_compile) 2>conftest.er1 |
17304 | ac_status=$? | 23834 | ac_status=$? |
17305 | echo "$as_me:17305: \$? = $ac_status" >&5 | 23835 | grep -v '^ *+' conftest.er1 >conftest.err |
23836 | rm -f conftest.er1 | ||
23837 | cat conftest.err >&5 | ||
23838 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
17306 | (exit $ac_status); } && | 23839 | (exit $ac_status); } && |
17307 | { ac_try='test -s conftest.$ac_objext' | 23840 | { ac_try='test -z "$ac_c_werror_flag" |
17308 | { (eval echo "$as_me:17308: \"$ac_try\"") >&5 | 23841 | || test ! -s conftest.err' |
23842 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
23843 | (eval $ac_try) 2>&5 | ||
23844 | ac_status=$? | ||
23845 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
23846 | (exit $ac_status); }; } && | ||
23847 | { ac_try='test -s conftest.$ac_objext' | ||
23848 | { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | ||
17309 | (eval $ac_try) 2>&5 | 23849 | (eval $ac_try) 2>&5 |
17310 | ac_status=$? | 23850 | ac_status=$? |
17311 | echo "$as_me:17311: \$? = $ac_status" >&5 | 23851 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
17312 | (exit $ac_status); }; }; then | 23852 | (exit $ac_status); }; }; then |
17313 | echo "$as_me:17313: result: yes" >&5 | 23853 | echo "$as_me:$LINENO: result: yes" >&5 |
17314 | echo "${ECHO_T}yes" >&6 | 23854 | echo "${ECHO_T}yes" >&6 |
17315 | else | 23855 | else |
17316 | echo "$as_me: failed program was:" >&5 | 23856 | echo "$as_me: failed program was:" >&5 |
17317 | cat conftest.$ac_ext >&5 | 23857 | sed 's/^/| /' conftest.$ac_ext >&5 |
17318 | echo "$as_me:17318: result: no" >&5 | 23858 | |
23859 | echo "$as_me:$LINENO: result: no" >&5 | ||
17319 | echo "${ECHO_T}no" >&6 | 23860 | echo "${ECHO_T}no" >&6 |
17320 | system_wtmpx_path=no | 23861 | system_wtmpx_path=no |
17321 | 23862 | ||
17322 | fi | 23863 | fi |
17323 | rm -f conftest.$ac_objext conftest.$ac_ext | 23864 | rm -f conftest.err conftest.$ac_objext conftest.$ac_ext |
17324 | if test -z "$conf_wtmpx_location"; then | 23865 | if test -z "$conf_wtmpx_location"; then |
17325 | if test x"$system_wtmpx_path" = x"no" ; then | 23866 | if test x"$system_wtmpx_path" = x"no" ; then |
17326 | cat >>confdefs.h <<\EOF | 23867 | cat >>confdefs.h <<\_ACEOF |
17327 | #define DISABLE_WTMPX 1 | 23868 | #define DISABLE_WTMPX 1 |
17328 | EOF | 23869 | _ACEOF |
17329 | 23870 | ||
17330 | fi | 23871 | fi |
17331 | else | 23872 | else |
17332 | cat >>confdefs.h <<EOF | 23873 | cat >>confdefs.h <<_ACEOF |
17333 | #define CONF_WTMPX_FILE "$conf_wtmpx_location" | 23874 | #define CONF_WTMPX_FILE "$conf_wtmpx_location" |
17334 | EOF | 23875 | _ACEOF |
17335 | 23876 | ||
17336 | fi | 23877 | fi |
17337 | 23878 | ||
23879 | |||
17338 | if test ! -z "$blibpath" ; then | 23880 | if test ! -z "$blibpath" ; then |
17339 | LDFLAGS="$LDFLAGS $blibflags$blibpath" | 23881 | LDFLAGS="$LDFLAGS $blibflags$blibpath" |
17340 | { echo "$as_me:17340: WARNING: Please check and edit blibpath in LDFLAGS in Makefile" >&5 | 23882 | { echo "$as_me:$LINENO: WARNING: Please check and edit blibpath in LDFLAGS in Makefile" >&5 |
17341 | echo "$as_me: WARNING: Please check and edit blibpath in LDFLAGS in Makefile" >&2;} | 23883 | echo "$as_me: WARNING: Please check and edit blibpath in LDFLAGS in Makefile" >&2;} |
17342 | fi | 23884 | fi |
17343 | 23885 | ||
@@ -17348,7 +23890,8 @@ if test "$ac_cv_lib_pam_pam_set_item" = yes ; then | |||
17348 | LIBS=`echo $LIBS | sed 's/-ldl //'` | 23890 | LIBS=`echo $LIBS | sed 's/-ldl //'` |
17349 | fi | 23891 | fi |
17350 | 23892 | ||
17351 | ac_config_files="$ac_config_files Makefile openbsd-compat/Makefile scard/Makefile ssh_prng_cmds" | 23893 | |
23894 | ac_config_files="$ac_config_files Makefile buildpkg.sh opensshd.init openbsd-compat/Makefile scard/Makefile ssh_prng_cmds" | ||
17352 | 23895 | ||
17353 | cat >confcache <<\_ACEOF | 23896 | cat >confcache <<\_ACEOF |
17354 | # This file is a shell script that caches the results of configure | 23897 | # This file is a shell script that caches the results of configure |
@@ -17360,7 +23903,7 @@ cat >confcache <<\_ACEOF | |||
17360 | # config.status only pays attention to the cache file if you give it | 23903 | # config.status only pays attention to the cache file if you give it |
17361 | # the --recheck option to rerun configure. | 23904 | # the --recheck option to rerun configure. |
17362 | # | 23905 | # |
17363 | # `ac_cv_env_foo' variables (set or unset) will be overriden when | 23906 | # `ac_cv_env_foo' variables (set or unset) will be overridden when |
17364 | # loading this file, other *unset* `ac_cv_foo' will be assigned the | 23907 | # loading this file, other *unset* `ac_cv_foo' will be assigned the |
17365 | # following values. | 23908 | # following values. |
17366 | 23909 | ||
@@ -17378,13 +23921,13 @@ _ACEOF | |||
17378 | # `set' does not quote correctly, so add quotes (double-quote | 23921 | # `set' does not quote correctly, so add quotes (double-quote |
17379 | # substitution turns \\\\ into \\, and sed turns \\ into \). | 23922 | # substitution turns \\\\ into \\, and sed turns \\ into \). |
17380 | sed -n \ | 23923 | sed -n \ |
17381 | "s/'/'\\\\''/g; | 23924 | "s/'/'\\\\''/g; |
17382 | s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" | 23925 | s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" |
17383 | ;; | 23926 | ;; |
17384 | *) | 23927 | *) |
17385 | # `set' quotes correctly as required by POSIX, so do not add quotes. | 23928 | # `set' quotes correctly as required by POSIX, so do not add quotes. |
17386 | sed -n \ | 23929 | sed -n \ |
17387 | "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" | 23930 | "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" |
17388 | ;; | 23931 | ;; |
17389 | esac; | 23932 | esac; |
17390 | } | | 23933 | } | |
@@ -17395,7 +23938,7 @@ _ACEOF | |||
17395 | t end | 23938 | t end |
17396 | /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ | 23939 | /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ |
17397 | : end' >>confcache | 23940 | : end' >>confcache |
17398 | if cmp -s $cache_file confcache; then :; else | 23941 | if diff $cache_file confcache >/dev/null 2>&1; then :; else |
17399 | if test -w $cache_file; then | 23942 | if test -w $cache_file; then |
17400 | test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" | 23943 | test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" |
17401 | cat confcache >$cache_file | 23944 | cat confcache >$cache_file |
@@ -17414,47 +23957,240 @@ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' | |||
17414 | # trailing colons and then remove the whole line if VPATH becomes empty | 23957 | # trailing colons and then remove the whole line if VPATH becomes empty |
17415 | # (actually we leave an empty line to preserve line numbers). | 23958 | # (actually we leave an empty line to preserve line numbers). |
17416 | if test "x$srcdir" = x.; then | 23959 | if test "x$srcdir" = x.; then |
17417 | ac_vpsub='/^[ ]*VPATH[ ]*=/{ | 23960 | ac_vpsub='/^[ ]*VPATH[ ]*=/{ |
17418 | s/:*\$(srcdir):*/:/; | 23961 | s/:*\$(srcdir):*/:/; |
17419 | s/:*\${srcdir}:*/:/; | 23962 | s/:*\${srcdir}:*/:/; |
17420 | s/:*@srcdir@:*/:/; | 23963 | s/:*@srcdir@:*/:/; |
17421 | s/^\([^=]*=[ ]*\):*/\1/; | 23964 | s/^\([^=]*=[ ]*\):*/\1/; |
17422 | s/:*$//; | 23965 | s/:*$//; |
17423 | s/^[^=]*=[ ]*$//; | 23966 | s/^[^=]*=[ ]*$//; |
17424 | }' | 23967 | }' |
17425 | fi | 23968 | fi |
17426 | 23969 | ||
17427 | DEFS=-DHAVE_CONFIG_H | 23970 | DEFS=-DHAVE_CONFIG_H |
17428 | 23971 | ||
23972 | ac_libobjs= | ||
23973 | ac_ltlibobjs= | ||
23974 | for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue | ||
23975 | # 1. Remove the extension, and $U if already installed. | ||
23976 | ac_i=`echo "$ac_i" | | ||
23977 | sed 's/\$U\././;s/\.o$//;s/\.obj$//'` | ||
23978 | # 2. Add them. | ||
23979 | ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" | ||
23980 | ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' | ||
23981 | done | ||
23982 | LIBOBJS=$ac_libobjs | ||
23983 | |||
23984 | LTLIBOBJS=$ac_ltlibobjs | ||
23985 | |||
23986 | |||
23987 | |||
17429 | : ${CONFIG_STATUS=./config.status} | 23988 | : ${CONFIG_STATUS=./config.status} |
17430 | ac_clean_files_save=$ac_clean_files | 23989 | ac_clean_files_save=$ac_clean_files |
17431 | ac_clean_files="$ac_clean_files $CONFIG_STATUS" | 23990 | ac_clean_files="$ac_clean_files $CONFIG_STATUS" |
17432 | { echo "$as_me:17432: creating $CONFIG_STATUS" >&5 | 23991 | { echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 |
17433 | echo "$as_me: creating $CONFIG_STATUS" >&6;} | 23992 | echo "$as_me: creating $CONFIG_STATUS" >&6;} |
17434 | cat >$CONFIG_STATUS <<_ACEOF | 23993 | cat >$CONFIG_STATUS <<_ACEOF |
17435 | #! $SHELL | 23994 | #! $SHELL |
17436 | # Generated automatically by configure. | 23995 | # Generated by $as_me. |
17437 | # Run this file to recreate the current configuration. | 23996 | # Run this file to recreate the current configuration. |
17438 | # Compiler output produced by configure, useful for debugging | 23997 | # Compiler output produced by configure, useful for debugging |
17439 | # configure, is in config.log if it exists. | 23998 | # configure, is in config.log if it exists. |
17440 | 23999 | ||
17441 | debug=false | 24000 | debug=false |
24001 | ac_cs_recheck=false | ||
24002 | ac_cs_silent=false | ||
17442 | SHELL=\${CONFIG_SHELL-$SHELL} | 24003 | SHELL=\${CONFIG_SHELL-$SHELL} |
17443 | ac_cs_invocation="\$0 \$@" | ||
17444 | |||
17445 | _ACEOF | 24004 | _ACEOF |
17446 | 24005 | ||
17447 | cat >>$CONFIG_STATUS <<\_ACEOF | 24006 | cat >>$CONFIG_STATUS <<\_ACEOF |
24007 | ## --------------------- ## | ||
24008 | ## M4sh Initialization. ## | ||
24009 | ## --------------------- ## | ||
24010 | |||
17448 | # Be Bourne compatible | 24011 | # Be Bourne compatible |
17449 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | 24012 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then |
17450 | emulate sh | 24013 | emulate sh |
17451 | NULLCMD=: | 24014 | NULLCMD=: |
24015 | # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which | ||
24016 | # is contrary to our usage. Disable this feature. | ||
24017 | alias -g '${1+"$@"}'='"$@"' | ||
17452 | elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then | 24018 | elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then |
17453 | set -o posix | 24019 | set -o posix |
17454 | fi | 24020 | fi |
24021 | DUALCASE=1; export DUALCASE # for MKS sh | ||
24022 | |||
24023 | # Support unset when possible. | ||
24024 | if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then | ||
24025 | as_unset=unset | ||
24026 | else | ||
24027 | as_unset=false | ||
24028 | fi | ||
24029 | |||
24030 | |||
24031 | # Work around bugs in pre-3.0 UWIN ksh. | ||
24032 | $as_unset ENV MAIL MAILPATH | ||
24033 | PS1='$ ' | ||
24034 | PS2='> ' | ||
24035 | PS4='+ ' | ||
24036 | |||
24037 | # NLS nuisances. | ||
24038 | for as_var in \ | ||
24039 | LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ | ||
24040 | LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ | ||
24041 | LC_TELEPHONE LC_TIME | ||
24042 | do | ||
24043 | if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then | ||
24044 | eval $as_var=C; export $as_var | ||
24045 | else | ||
24046 | $as_unset $as_var | ||
24047 | fi | ||
24048 | done | ||
24049 | |||
24050 | # Required to use basename. | ||
24051 | if expr a : '\(a\)' >/dev/null 2>&1; then | ||
24052 | as_expr=expr | ||
24053 | else | ||
24054 | as_expr=false | ||
24055 | fi | ||
24056 | |||
24057 | if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then | ||
24058 | as_basename=basename | ||
24059 | else | ||
24060 | as_basename=false | ||
24061 | fi | ||
24062 | |||
17455 | 24063 | ||
17456 | # Name of the executable. | 24064 | # Name of the executable. |
17457 | as_me=`echo "$0" |sed 's,.*[\\/],,'` | 24065 | as_me=`$as_basename "$0" || |
24066 | $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ | ||
24067 | X"$0" : 'X\(//\)$' \| \ | ||
24068 | X"$0" : 'X\(/\)$' \| \ | ||
24069 | . : '\(.\)' 2>/dev/null || | ||
24070 | echo X/"$0" | | ||
24071 | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } | ||
24072 | /^X\/\(\/\/\)$/{ s//\1/; q; } | ||
24073 | /^X\/\(\/\).*/{ s//\1/; q; } | ||
24074 | s/.*/./; q'` | ||
24075 | |||
24076 | |||
24077 | # PATH needs CR, and LINENO needs CR and PATH. | ||
24078 | # Avoid depending upon Character Ranges. | ||
24079 | as_cr_letters='abcdefghijklmnopqrstuvwxyz' | ||
24080 | as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' | ||
24081 | as_cr_Letters=$as_cr_letters$as_cr_LETTERS | ||
24082 | as_cr_digits='0123456789' | ||
24083 | as_cr_alnum=$as_cr_Letters$as_cr_digits | ||
24084 | |||
24085 | # The user is always right. | ||
24086 | if test "${PATH_SEPARATOR+set}" != set; then | ||
24087 | echo "#! /bin/sh" >conf$$.sh | ||
24088 | echo "exit 0" >>conf$$.sh | ||
24089 | chmod +x conf$$.sh | ||
24090 | if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then | ||
24091 | PATH_SEPARATOR=';' | ||
24092 | else | ||
24093 | PATH_SEPARATOR=: | ||
24094 | fi | ||
24095 | rm -f conf$$.sh | ||
24096 | fi | ||
24097 | |||
24098 | |||
24099 | as_lineno_1=$LINENO | ||
24100 | as_lineno_2=$LINENO | ||
24101 | as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` | ||
24102 | test "x$as_lineno_1" != "x$as_lineno_2" && | ||
24103 | test "x$as_lineno_3" = "x$as_lineno_2" || { | ||
24104 | # Find who we are. Look in the path if we contain no path at all | ||
24105 | # relative or not. | ||
24106 | case $0 in | ||
24107 | *[\\/]* ) as_myself=$0 ;; | ||
24108 | *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
24109 | for as_dir in $PATH | ||
24110 | do | ||
24111 | IFS=$as_save_IFS | ||
24112 | test -z "$as_dir" && as_dir=. | ||
24113 | test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break | ||
24114 | done | ||
24115 | |||
24116 | ;; | ||
24117 | esac | ||
24118 | # We did not find ourselves, most probably we were run as `sh COMMAND' | ||
24119 | # in which case we are not to be found in the path. | ||
24120 | if test "x$as_myself" = x; then | ||
24121 | as_myself=$0 | ||
24122 | fi | ||
24123 | if test ! -f "$as_myself"; then | ||
24124 | { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 | ||
24125 | echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} | ||
24126 | { (exit 1); exit 1; }; } | ||
24127 | fi | ||
24128 | case $CONFIG_SHELL in | ||
24129 | '') | ||
24130 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
24131 | for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH | ||
24132 | do | ||
24133 | IFS=$as_save_IFS | ||
24134 | test -z "$as_dir" && as_dir=. | ||
24135 | for as_base in sh bash ksh sh5; do | ||
24136 | case $as_dir in | ||
24137 | /*) | ||
24138 | if ("$as_dir/$as_base" -c ' | ||
24139 | as_lineno_1=$LINENO | ||
24140 | as_lineno_2=$LINENO | ||
24141 | as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` | ||
24142 | test "x$as_lineno_1" != "x$as_lineno_2" && | ||
24143 | test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then | ||
24144 | $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } | ||
24145 | $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } | ||
24146 | CONFIG_SHELL=$as_dir/$as_base | ||
24147 | export CONFIG_SHELL | ||
24148 | exec "$CONFIG_SHELL" "$0" ${1+"$@"} | ||
24149 | fi;; | ||
24150 | esac | ||
24151 | done | ||
24152 | done | ||
24153 | ;; | ||
24154 | esac | ||
24155 | |||
24156 | # Create $as_me.lineno as a copy of $as_myself, but with $LINENO | ||
24157 | # uniformly replaced by the line number. The first 'sed' inserts a | ||
24158 | # line-number line before each line; the second 'sed' does the real | ||
24159 | # work. The second script uses 'N' to pair each line-number line | ||
24160 | # with the numbered line, and appends trailing '-' during | ||
24161 | # substitution so that $LINENO is not a special case at line end. | ||
24162 | # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the | ||
24163 | # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) | ||
24164 | sed '=' <$as_myself | | ||
24165 | sed ' | ||
24166 | N | ||
24167 | s,$,-, | ||
24168 | : loop | ||
24169 | s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, | ||
24170 | t loop | ||
24171 | s,-$,, | ||
24172 | s,^['$as_cr_digits']*\n,, | ||
24173 | ' >$as_me.lineno && | ||
24174 | chmod +x $as_me.lineno || | ||
24175 | { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 | ||
24176 | echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} | ||
24177 | { (exit 1); exit 1; }; } | ||
24178 | |||
24179 | # Don't try to exec as it changes $[0], causing all sort of problems | ||
24180 | # (the dirname of $[0] is not the place where we might find the | ||
24181 | # original and so on. Autoconf is especially sensible to this). | ||
24182 | . ./$as_me.lineno | ||
24183 | # Exit status is that of the last command. | ||
24184 | exit | ||
24185 | } | ||
24186 | |||
24187 | |||
24188 | case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in | ||
24189 | *c*,-n*) ECHO_N= ECHO_C=' | ||
24190 | ' ECHO_T=' ' ;; | ||
24191 | *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; | ||
24192 | *) ECHO_N= ECHO_C='\c' ECHO_T= ;; | ||
24193 | esac | ||
17458 | 24194 | ||
17459 | if expr a : '\(a\)' >/dev/null 2>&1; then | 24195 | if expr a : '\(a\)' >/dev/null 2>&1; then |
17460 | as_expr=expr | 24196 | as_expr=expr |
@@ -17480,24 +24216,21 @@ else | |||
17480 | fi | 24216 | fi |
17481 | rm -f conf$$ conf$$.exe conf$$.file | 24217 | rm -f conf$$ conf$$.exe conf$$.file |
17482 | 24218 | ||
17483 | as_executable_p="test -f" | 24219 | if mkdir -p . 2>/dev/null; then |
17484 | 24220 | as_mkdir_p=: | |
17485 | # Support unset when possible. | ||
17486 | if (FOO=FOO; unset FOO) >/dev/null 2>&1; then | ||
17487 | as_unset=unset | ||
17488 | else | 24221 | else |
17489 | as_unset=false | 24222 | test -d ./-p && rmdir ./-p |
24223 | as_mkdir_p=false | ||
17490 | fi | 24224 | fi |
17491 | 24225 | ||
17492 | # NLS nuisances. | 24226 | as_executable_p="test -f" |
17493 | $as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } | 24227 | |
17494 | $as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } | 24228 | # Sed expression to map a string onto a valid CPP name. |
17495 | $as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } | 24229 | as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" |
17496 | $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } | 24230 | |
17497 | $as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } | 24231 | # Sed expression to map a string onto a valid variable name. |
17498 | $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } | 24232 | as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" |
17499 | $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } | 24233 | |
17500 | $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } | ||
17501 | 24234 | ||
17502 | # IFS | 24235 | # IFS |
17503 | # We need space, tab and new line, in precisely that order. | 24236 | # We need space, tab and new line, in precisely that order. |
@@ -17506,10 +24239,34 @@ as_nl=' | |||
17506 | IFS=" $as_nl" | 24239 | IFS=" $as_nl" |
17507 | 24240 | ||
17508 | # CDPATH. | 24241 | # CDPATH. |
17509 | $as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } | 24242 | $as_unset CDPATH |
17510 | 24243 | ||
17511 | exec 6>&1 | 24244 | exec 6>&1 |
17512 | 24245 | ||
24246 | # Open the log real soon, to keep \$[0] and so on meaningful, and to | ||
24247 | # report actual input values of CONFIG_FILES etc. instead of their | ||
24248 | # values after options handling. Logging --version etc. is OK. | ||
24249 | exec 5>>config.log | ||
24250 | { | ||
24251 | echo | ||
24252 | sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<BOXI_EOF | ||
24253 | ## Running $as_me. ## | ||
24254 | BOXI_EOF | ||
24255 | } >&5 | ||
24256 | cat >&5 <<_CSEOF | ||
24257 | |||
24258 | This file was extended by $as_me, which was | ||
24259 | generated by GNU Autoconf 2.59. Invocation command line was | ||
24260 | |||
24261 | CONFIG_FILES = $CONFIG_FILES | ||
24262 | CONFIG_HEADERS = $CONFIG_HEADERS | ||
24263 | CONFIG_LINKS = $CONFIG_LINKS | ||
24264 | CONFIG_COMMANDS = $CONFIG_COMMANDS | ||
24265 | $ $0 $@ | ||
24266 | |||
24267 | _CSEOF | ||
24268 | echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 | ||
24269 | echo >&5 | ||
17513 | _ACEOF | 24270 | _ACEOF |
17514 | 24271 | ||
17515 | # Files that config.status was made for. | 24272 | # Files that config.status was made for. |
@@ -17529,7 +24286,7 @@ if test -n "$ac_config_commands"; then | |||
17529 | echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS | 24286 | echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS |
17530 | fi | 24287 | fi |
17531 | 24288 | ||
17532 | cat >>$CONFIG_STATUS <<\EOF | 24289 | cat >>$CONFIG_STATUS <<\_ACEOF |
17533 | 24290 | ||
17534 | ac_cs_usage="\ | 24291 | ac_cs_usage="\ |
17535 | \`$as_me' instantiates files from templates according to the | 24292 | \`$as_me' instantiates files from templates according to the |
@@ -17539,12 +24296,13 @@ Usage: $0 [OPTIONS] [FILE]... | |||
17539 | 24296 | ||
17540 | -h, --help print this help, then exit | 24297 | -h, --help print this help, then exit |
17541 | -V, --version print version number, then exit | 24298 | -V, --version print version number, then exit |
24299 | -q, --quiet do not print progress messages | ||
17542 | -d, --debug don't remove temporary files | 24300 | -d, --debug don't remove temporary files |
17543 | --recheck update $as_me by reconfiguring in the same conditions | 24301 | --recheck update $as_me by reconfiguring in the same conditions |
17544 | --file=FILE[:TEMPLATE] | 24302 | --file=FILE[:TEMPLATE] |
17545 | instantiate the configuration file FILE | 24303 | instantiate the configuration file FILE |
17546 | --header=FILE[:TEMPLATE] | 24304 | --header=FILE[:TEMPLATE] |
17547 | instantiate the configuration header FILE | 24305 | instantiate the configuration header FILE |
17548 | 24306 | ||
17549 | Configuration files: | 24307 | Configuration files: |
17550 | $config_files | 24308 | $config_files |
@@ -17553,23 +24311,22 @@ Configuration headers: | |||
17553 | $config_headers | 24311 | $config_headers |
17554 | 24312 | ||
17555 | Report bugs to <bug-autoconf@gnu.org>." | 24313 | Report bugs to <bug-autoconf@gnu.org>." |
17556 | EOF | 24314 | _ACEOF |
17557 | 24315 | ||
17558 | cat >>$CONFIG_STATUS <<EOF | 24316 | cat >>$CONFIG_STATUS <<_ACEOF |
17559 | ac_cs_version="\\ | 24317 | ac_cs_version="\\ |
17560 | config.status | 24318 | config.status |
17561 | configured by $0, generated by GNU Autoconf 2.52, | 24319 | configured by $0, generated by GNU Autoconf 2.59, |
17562 | with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" | 24320 | with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" |
17563 | 24321 | ||
17564 | Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 | 24322 | Copyright (C) 2003 Free Software Foundation, Inc. |
17565 | Free Software Foundation, Inc. | ||
17566 | This config.status script is free software; the Free Software Foundation | 24323 | This config.status script is free software; the Free Software Foundation |
17567 | gives unlimited permission to copy, distribute and modify it." | 24324 | gives unlimited permission to copy, distribute and modify it." |
17568 | srcdir=$srcdir | 24325 | srcdir=$srcdir |
17569 | INSTALL="$INSTALL" | 24326 | INSTALL="$INSTALL" |
17570 | EOF | 24327 | _ACEOF |
17571 | 24328 | ||
17572 | cat >>$CONFIG_STATUS <<\EOF | 24329 | cat >>$CONFIG_STATUS <<\_ACEOF |
17573 | # If no file are specified by the user, then we need to provide default | 24330 | # If no file are specified by the user, then we need to provide default |
17574 | # value. By we need to know if files were specified by the user. | 24331 | # value. By we need to know if files were specified by the user. |
17575 | ac_need_defaults=: | 24332 | ac_need_defaults=: |
@@ -17579,30 +24336,30 @@ do | |||
17579 | --*=*) | 24336 | --*=*) |
17580 | ac_option=`expr "x$1" : 'x\([^=]*\)='` | 24337 | ac_option=`expr "x$1" : 'x\([^=]*\)='` |
17581 | ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` | 24338 | ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` |
17582 | shift | 24339 | ac_shift=: |
17583 | set dummy "$ac_option" "$ac_optarg" ${1+"$@"} | 24340 | ;; |
17584 | shift | 24341 | -*) |
24342 | ac_option=$1 | ||
24343 | ac_optarg=$2 | ||
24344 | ac_shift=shift | ||
17585 | ;; | 24345 | ;; |
17586 | -*);; | ||
17587 | *) # This is not an option, so the user has probably given explicit | 24346 | *) # This is not an option, so the user has probably given explicit |
17588 | # arguments. | 24347 | # arguments. |
24348 | ac_option=$1 | ||
17589 | ac_need_defaults=false;; | 24349 | ac_need_defaults=false;; |
17590 | esac | 24350 | esac |
17591 | 24351 | ||
17592 | case $1 in | 24352 | case $ac_option in |
17593 | # Handling of the options. | 24353 | # Handling of the options. |
17594 | EOF | 24354 | _ACEOF |
17595 | cat >>$CONFIG_STATUS <<EOF | 24355 | cat >>$CONFIG_STATUS <<\_ACEOF |
17596 | -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) | 24356 | -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) |
17597 | echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" | 24357 | ac_cs_recheck=: ;; |
17598 | exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; | ||
17599 | EOF | ||
17600 | cat >>$CONFIG_STATUS <<\EOF | ||
17601 | --version | --vers* | -V ) | 24358 | --version | --vers* | -V ) |
17602 | echo "$ac_cs_version"; exit 0 ;; | 24359 | echo "$ac_cs_version"; exit 0 ;; |
17603 | --he | --h) | 24360 | --he | --h) |
17604 | # Conflict between --help and --header | 24361 | # Conflict between --help and --header |
17605 | { { echo "$as_me:17605: error: ambiguous option: $1 | 24362 | { { echo "$as_me:$LINENO: error: ambiguous option: $1 |
17606 | Try \`$0 --help' for more information." >&5 | 24363 | Try \`$0 --help' for more information." >&5 |
17607 | echo "$as_me: error: ambiguous option: $1 | 24364 | echo "$as_me: error: ambiguous option: $1 |
17608 | Try \`$0 --help' for more information." >&2;} | 24365 | Try \`$0 --help' for more information." >&2;} |
@@ -17612,16 +24369,19 @@ Try \`$0 --help' for more information." >&2;} | |||
17612 | --debug | --d* | -d ) | 24369 | --debug | --d* | -d ) |
17613 | debug=: ;; | 24370 | debug=: ;; |
17614 | --file | --fil | --fi | --f ) | 24371 | --file | --fil | --fi | --f ) |
17615 | shift | 24372 | $ac_shift |
17616 | CONFIG_FILES="$CONFIG_FILES $1" | 24373 | CONFIG_FILES="$CONFIG_FILES $ac_optarg" |
17617 | ac_need_defaults=false;; | 24374 | ac_need_defaults=false;; |
17618 | --header | --heade | --head | --hea ) | 24375 | --header | --heade | --head | --hea ) |
17619 | shift | 24376 | $ac_shift |
17620 | CONFIG_HEADERS="$CONFIG_HEADERS $1" | 24377 | CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" |
17621 | ac_need_defaults=false;; | 24378 | ac_need_defaults=false;; |
24379 | -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | ||
24380 | | -silent | --silent | --silen | --sile | --sil | --si | --s) | ||
24381 | ac_cs_silent=: ;; | ||
17622 | 24382 | ||
17623 | # This is an error. | 24383 | # This is an error. |
17624 | -*) { { echo "$as_me:17624: error: unrecognized option: $1 | 24384 | -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 |
17625 | Try \`$0 --help' for more information." >&5 | 24385 | Try \`$0 --help' for more information." >&5 |
17626 | echo "$as_me: error: unrecognized option: $1 | 24386 | echo "$as_me: error: unrecognized option: $1 |
17627 | Try \`$0 --help' for more information." >&2;} | 24387 | Try \`$0 --help' for more information." >&2;} |
@@ -17633,35 +24393,39 @@ Try \`$0 --help' for more information." >&2;} | |||
17633 | shift | 24393 | shift |
17634 | done | 24394 | done |
17635 | 24395 | ||
17636 | exec 5>>config.log | 24396 | ac_configure_extra_args= |
17637 | cat >&5 << _ACEOF | ||
17638 | 24397 | ||
17639 | ## ----------------------- ## | 24398 | if $ac_cs_silent; then |
17640 | ## Running config.status. ## | 24399 | exec 6>/dev/null |
17641 | ## ----------------------- ## | 24400 | ac_configure_extra_args="$ac_configure_extra_args --silent" |
24401 | fi | ||
17642 | 24402 | ||
17643 | This file was extended by $as_me 2.52, executed with | 24403 | _ACEOF |
17644 | CONFIG_FILES = $CONFIG_FILES | 24404 | cat >>$CONFIG_STATUS <<_ACEOF |
17645 | CONFIG_HEADERS = $CONFIG_HEADERS | 24405 | if \$ac_cs_recheck; then |
17646 | CONFIG_LINKS = $CONFIG_LINKS | 24406 | echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 |
17647 | CONFIG_COMMANDS = $CONFIG_COMMANDS | 24407 | exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion |
17648 | > $ac_cs_invocation | 24408 | fi |
17649 | on `(hostname || uname -n) 2>/dev/null | sed 1q` | ||
17650 | 24409 | ||
17651 | _ACEOF | 24410 | _ACEOF |
17652 | EOF | ||
17653 | 24411 | ||
17654 | cat >>$CONFIG_STATUS <<\EOF | 24412 | |
24413 | |||
24414 | |||
24415 | |||
24416 | cat >>$CONFIG_STATUS <<\_ACEOF | ||
17655 | for ac_config_target in $ac_config_targets | 24417 | for ac_config_target in $ac_config_targets |
17656 | do | 24418 | do |
17657 | case "$ac_config_target" in | 24419 | case "$ac_config_target" in |
17658 | # Handling of arguments. | 24420 | # Handling of arguments. |
17659 | "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; | 24421 | "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; |
24422 | "buildpkg.sh" ) CONFIG_FILES="$CONFIG_FILES buildpkg.sh" ;; | ||
24423 | "opensshd.init" ) CONFIG_FILES="$CONFIG_FILES opensshd.init" ;; | ||
17660 | "openbsd-compat/Makefile" ) CONFIG_FILES="$CONFIG_FILES openbsd-compat/Makefile" ;; | 24424 | "openbsd-compat/Makefile" ) CONFIG_FILES="$CONFIG_FILES openbsd-compat/Makefile" ;; |
17661 | "scard/Makefile" ) CONFIG_FILES="$CONFIG_FILES scard/Makefile" ;; | 24425 | "scard/Makefile" ) CONFIG_FILES="$CONFIG_FILES scard/Makefile" ;; |
17662 | "ssh_prng_cmds" ) CONFIG_FILES="$CONFIG_FILES ssh_prng_cmds" ;; | 24426 | "ssh_prng_cmds" ) CONFIG_FILES="$CONFIG_FILES ssh_prng_cmds" ;; |
17663 | "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; | 24427 | "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; |
17664 | *) { { echo "$as_me:17664: error: invalid argument: $ac_config_target" >&5 | 24428 | *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 |
17665 | echo "$as_me: error: invalid argument: $ac_config_target" >&2;} | 24429 | echo "$as_me: error: invalid argument: $ac_config_target" >&2;} |
17666 | { (exit 1); exit 1; }; };; | 24430 | { (exit 1); exit 1; }; };; |
17667 | esac | 24431 | esac |
@@ -17676,6 +24440,9 @@ if $ac_need_defaults; then | |||
17676 | test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers | 24440 | test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers |
17677 | fi | 24441 | fi |
17678 | 24442 | ||
24443 | # Have a temporary directory for convenience. Make it in the build tree | ||
24444 | # simply because there is no reason to put it here, and in addition, | ||
24445 | # creating and moving files from /tmp can sometimes cause problems. | ||
17679 | # Create a temporary directory, and hook for its removal unless debugging. | 24446 | # Create a temporary directory, and hook for its removal unless debugging. |
17680 | $debug || | 24447 | $debug || |
17681 | { | 24448 | { |
@@ -17684,23 +24451,23 @@ $debug || | |||
17684 | } | 24451 | } |
17685 | 24452 | ||
17686 | # Create a (secure) tmp directory for tmp files. | 24453 | # Create a (secure) tmp directory for tmp files. |
17687 | : ${TMPDIR=/tmp} | 24454 | |
17688 | { | 24455 | { |
17689 | tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && | 24456 | tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && |
17690 | test -n "$tmp" && test -d "$tmp" | 24457 | test -n "$tmp" && test -d "$tmp" |
17691 | } || | 24458 | } || |
17692 | { | 24459 | { |
17693 | tmp=$TMPDIR/cs$$-$RANDOM | 24460 | tmp=./confstat$$-$RANDOM |
17694 | (umask 077 && mkdir $tmp) | 24461 | (umask 077 && mkdir $tmp) |
17695 | } || | 24462 | } || |
17696 | { | 24463 | { |
17697 | echo "$me: cannot create a temporary directory in $TMPDIR" >&2 | 24464 | echo "$me: cannot create a temporary directory in ." >&2 |
17698 | { (exit 1); exit 1; } | 24465 | { (exit 1); exit 1; } |
17699 | } | 24466 | } |
17700 | 24467 | ||
17701 | EOF | 24468 | _ACEOF |
17702 | 24469 | ||
17703 | cat >>$CONFIG_STATUS <<EOF | 24470 | cat >>$CONFIG_STATUS <<_ACEOF |
17704 | 24471 | ||
17705 | # | 24472 | # |
17706 | # CONFIG_FILES section. | 24473 | # CONFIG_FILES section. |
@@ -17713,6 +24480,12 @@ if test -n "\$CONFIG_FILES"; then | |||
17713 | sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; | 24480 | sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; |
17714 | s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF | 24481 | s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF |
17715 | s,@SHELL@,$SHELL,;t t | 24482 | s,@SHELL@,$SHELL,;t t |
24483 | s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t | ||
24484 | s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t | ||
24485 | s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t | ||
24486 | s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t | ||
24487 | s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t | ||
24488 | s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t | ||
17716 | s,@exec_prefix@,$exec_prefix,;t t | 24489 | s,@exec_prefix@,$exec_prefix,;t t |
17717 | s,@prefix@,$prefix,;t t | 24490 | s,@prefix@,$prefix,;t t |
17718 | s,@program_transform_name@,$program_transform_name,;t t | 24491 | s,@program_transform_name@,$program_transform_name,;t t |
@@ -17728,19 +24501,13 @@ s,@includedir@,$includedir,;t t | |||
17728 | s,@oldincludedir@,$oldincludedir,;t t | 24501 | s,@oldincludedir@,$oldincludedir,;t t |
17729 | s,@infodir@,$infodir,;t t | 24502 | s,@infodir@,$infodir,;t t |
17730 | s,@mandir@,$mandir,;t t | 24503 | s,@mandir@,$mandir,;t t |
17731 | s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t | ||
17732 | s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t | ||
17733 | s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t | ||
17734 | s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t | ||
17735 | s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t | ||
17736 | s,@build_alias@,$build_alias,;t t | 24504 | s,@build_alias@,$build_alias,;t t |
17737 | s,@host_alias@,$host_alias,;t t | 24505 | s,@host_alias@,$host_alias,;t t |
17738 | s,@target_alias@,$target_alias,;t t | 24506 | s,@target_alias@,$target_alias,;t t |
24507 | s,@DEFS@,$DEFS,;t t | ||
17739 | s,@ECHO_C@,$ECHO_C,;t t | 24508 | s,@ECHO_C@,$ECHO_C,;t t |
17740 | s,@ECHO_N@,$ECHO_N,;t t | 24509 | s,@ECHO_N@,$ECHO_N,;t t |
17741 | s,@ECHO_T@,$ECHO_T,;t t | 24510 | s,@ECHO_T@,$ECHO_T,;t t |
17742 | s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t | ||
17743 | s,@DEFS@,$DEFS,;t t | ||
17744 | s,@LIBS@,$LIBS,;t t | 24511 | s,@LIBS@,$LIBS,;t t |
17745 | s,@CC@,$CC,;t t | 24512 | s,@CC@,$CC,;t t |
17746 | s,@CFLAGS@,$CFLAGS,;t t | 24513 | s,@CFLAGS@,$CFLAGS,;t t |
@@ -17765,14 +24532,21 @@ s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t | |||
17765 | s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t | 24532 | s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t |
17766 | s,@INSTALL_DATA@,$INSTALL_DATA,;t t | 24533 | s,@INSTALL_DATA@,$INSTALL_DATA,;t t |
17767 | s,@AR@,$AR,;t t | 24534 | s,@AR@,$AR,;t t |
24535 | s,@CAT@,$CAT,;t t | ||
24536 | s,@KILL@,$KILL,;t t | ||
17768 | s,@PERL@,$PERL,;t t | 24537 | s,@PERL@,$PERL,;t t |
17769 | s,@SED@,$SED,;t t | 24538 | s,@SED@,$SED,;t t |
17770 | s,@ENT@,$ENT,;t t | 24539 | s,@ENT@,$ENT,;t t |
17771 | s,@TEST_MINUS_S_SH@,$TEST_MINUS_S_SH,;t t | 24540 | s,@TEST_MINUS_S_SH@,$TEST_MINUS_S_SH,;t t |
17772 | s,@SH@,$SH,;t t | 24541 | s,@SH@,$SH,;t t |
24542 | s,@TEST_SHELL@,$TEST_SHELL,;t t | ||
24543 | s,@PATH_GROUPADD_PROG@,$PATH_GROUPADD_PROG,;t t | ||
24544 | s,@PATH_USERADD_PROG@,$PATH_USERADD_PROG,;t t | ||
24545 | s,@MAKE_PACKAGE_SUPPORTED@,$MAKE_PACKAGE_SUPPORTED,;t t | ||
17773 | s,@LOGIN_PROGRAM_FALLBACK@,$LOGIN_PROGRAM_FALLBACK,;t t | 24546 | s,@LOGIN_PROGRAM_FALLBACK@,$LOGIN_PROGRAM_FALLBACK,;t t |
17774 | s,@PATH_PASSWD_PROG@,$PATH_PASSWD_PROG,;t t | 24547 | s,@PATH_PASSWD_PROG@,$PATH_PASSWD_PROG,;t t |
17775 | s,@LD@,$LD,;t t | 24548 | s,@LD@,$LD,;t t |
24549 | s,@EGREP@,$EGREP,;t t | ||
17776 | s,@LIBWRAP@,$LIBWRAP,;t t | 24550 | s,@LIBWRAP@,$LIBWRAP,;t t |
17777 | s,@LIBPAM@,$LIBPAM,;t t | 24551 | s,@LIBPAM@,$LIBPAM,;t t |
17778 | s,@INSTALL_SSH_RAND_HELPER@,$INSTALL_SSH_RAND_HELPER,;t t | 24552 | s,@INSTALL_SSH_RAND_HELPER@,$INSTALL_SSH_RAND_HELPER,;t t |
@@ -17804,11 +24578,13 @@ s,@MANTYPE@,$MANTYPE,;t t | |||
17804 | s,@mansubdir@,$mansubdir,;t t | 24578 | s,@mansubdir@,$mansubdir,;t t |
17805 | s,@user_path@,$user_path,;t t | 24579 | s,@user_path@,$user_path,;t t |
17806 | s,@piddir@,$piddir,;t t | 24580 | s,@piddir@,$piddir,;t t |
24581 | s,@LIBOBJS@,$LIBOBJS,;t t | ||
24582 | s,@LTLIBOBJS@,$LTLIBOBJS,;t t | ||
17807 | CEOF | 24583 | CEOF |
17808 | 24584 | ||
17809 | EOF | 24585 | _ACEOF |
17810 | 24586 | ||
17811 | cat >>$CONFIG_STATUS <<\EOF | 24587 | cat >>$CONFIG_STATUS <<\_ACEOF |
17812 | # Split the substitutions into bite-sized pieces for seds with | 24588 | # Split the substitutions into bite-sized pieces for seds with |
17813 | # small command number limits, like on Digital OSF/1 and HP-UX. | 24589 | # small command number limits, like on Digital OSF/1 and HP-UX. |
17814 | ac_max_sed_lines=48 | 24590 | ac_max_sed_lines=48 |
@@ -17833,9 +24609,9 @@ EOF | |||
17833 | (echo ':t | 24609 | (echo ':t |
17834 | /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed | 24610 | /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed |
17835 | if test -z "$ac_sed_cmds"; then | 24611 | if test -z "$ac_sed_cmds"; then |
17836 | ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" | 24612 | ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" |
17837 | else | 24613 | else |
17838 | ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" | 24614 | ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" |
17839 | fi | 24615 | fi |
17840 | ac_sed_frag=`expr $ac_sed_frag + 1` | 24616 | ac_sed_frag=`expr $ac_sed_frag + 1` |
17841 | ac_beg=$ac_end | 24617 | ac_beg=$ac_end |
@@ -17847,86 +24623,144 @@ EOF | |||
17847 | fi | 24623 | fi |
17848 | fi # test -n "$CONFIG_FILES" | 24624 | fi # test -n "$CONFIG_FILES" |
17849 | 24625 | ||
17850 | EOF | 24626 | _ACEOF |
17851 | cat >>$CONFIG_STATUS <<\EOF | 24627 | cat >>$CONFIG_STATUS <<\_ACEOF |
17852 | for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue | 24628 | for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue |
17853 | # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". | 24629 | # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". |
17854 | case $ac_file in | 24630 | case $ac_file in |
17855 | - | *:- | *:-:* ) # input from stdin | 24631 | - | *:- | *:-:* ) # input from stdin |
17856 | cat >$tmp/stdin | 24632 | cat >$tmp/stdin |
17857 | ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` | 24633 | ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` |
17858 | ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; | 24634 | ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; |
17859 | *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` | 24635 | *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` |
17860 | ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; | 24636 | ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; |
17861 | * ) ac_file_in=$ac_file.in ;; | 24637 | * ) ac_file_in=$ac_file.in ;; |
17862 | esac | 24638 | esac |
17863 | 24639 | ||
17864 | # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. | 24640 | # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. |
17865 | ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | 24641 | ac_dir=`(dirname "$ac_file") 2>/dev/null || |
17866 | X"$ac_file" : 'X\(//\)[^/]' \| \ | 24642 | $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
17867 | X"$ac_file" : 'X\(//\)$' \| \ | 24643 | X"$ac_file" : 'X\(//\)[^/]' \| \ |
17868 | X"$ac_file" : 'X\(/\)' \| \ | 24644 | X"$ac_file" : 'X\(//\)$' \| \ |
17869 | . : '\(.\)' 2>/dev/null || | 24645 | X"$ac_file" : 'X\(/\)' \| \ |
24646 | . : '\(.\)' 2>/dev/null || | ||
17870 | echo X"$ac_file" | | 24647 | echo X"$ac_file" | |
17871 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | 24648 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } |
17872 | /^X\(\/\/\)[^/].*/{ s//\1/; q; } | 24649 | /^X\(\/\/\)[^/].*/{ s//\1/; q; } |
17873 | /^X\(\/\/\)$/{ s//\1/; q; } | 24650 | /^X\(\/\/\)$/{ s//\1/; q; } |
17874 | /^X\(\/\).*/{ s//\1/; q; } | 24651 | /^X\(\/\).*/{ s//\1/; q; } |
17875 | s/.*/./; q'` | 24652 | s/.*/./; q'` |
17876 | if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then | 24653 | { if $as_mkdir_p; then |
17877 | { case "$ac_dir" in | 24654 | mkdir -p "$ac_dir" |
17878 | [\\/]* | ?:[\\/]* ) as_incr_dir=;; | ||
17879 | *) as_incr_dir=.;; | ||
17880 | esac | ||
17881 | as_dummy="$ac_dir" | ||
17882 | for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do | ||
17883 | case $as_mkdir_dir in | ||
17884 | # Skip DOS drivespec | ||
17885 | ?:) as_incr_dir=$as_mkdir_dir ;; | ||
17886 | *) | ||
17887 | as_incr_dir=$as_incr_dir/$as_mkdir_dir | ||
17888 | test -d "$as_incr_dir" || mkdir "$as_incr_dir" | ||
17889 | ;; | ||
17890 | esac | ||
17891 | done; } | ||
17892 | |||
17893 | ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`" | ||
17894 | # A "../" for each directory in $ac_dir_suffix. | ||
17895 | ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'` | ||
17896 | else | 24655 | else |
17897 | ac_dir_suffix= ac_dots= | 24656 | as_dir="$ac_dir" |
17898 | fi | 24657 | as_dirs= |
24658 | while test ! -d "$as_dir"; do | ||
24659 | as_dirs="$as_dir $as_dirs" | ||
24660 | as_dir=`(dirname "$as_dir") 2>/dev/null || | ||
24661 | $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
24662 | X"$as_dir" : 'X\(//\)[^/]' \| \ | ||
24663 | X"$as_dir" : 'X\(//\)$' \| \ | ||
24664 | X"$as_dir" : 'X\(/\)' \| \ | ||
24665 | . : '\(.\)' 2>/dev/null || | ||
24666 | echo X"$as_dir" | | ||
24667 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | ||
24668 | /^X\(\/\/\)[^/].*/{ s//\1/; q; } | ||
24669 | /^X\(\/\/\)$/{ s//\1/; q; } | ||
24670 | /^X\(\/\).*/{ s//\1/; q; } | ||
24671 | s/.*/./; q'` | ||
24672 | done | ||
24673 | test ! -n "$as_dirs" || mkdir $as_dirs | ||
24674 | fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 | ||
24675 | echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} | ||
24676 | { (exit 1); exit 1; }; }; } | ||
17899 | 24677 | ||
17900 | case $srcdir in | 24678 | ac_builddir=. |
17901 | .) ac_srcdir=. | 24679 | |
17902 | if test -z "$ac_dots"; then | 24680 | if test "$ac_dir" != .; then |
17903 | ac_top_srcdir=. | 24681 | ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` |
17904 | else | 24682 | # A "../" for each directory in $ac_dir_suffix. |
17905 | ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'` | 24683 | ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` |
17906 | fi ;; | 24684 | else |
17907 | [\\/]* | ?:[\\/]* ) | 24685 | ac_dir_suffix= ac_top_builddir= |
17908 | ac_srcdir=$srcdir$ac_dir_suffix; | 24686 | fi |
17909 | ac_top_srcdir=$srcdir ;; | 24687 | |
24688 | case $srcdir in | ||
24689 | .) # No --srcdir option. We are building in place. | ||
24690 | ac_srcdir=. | ||
24691 | if test -z "$ac_top_builddir"; then | ||
24692 | ac_top_srcdir=. | ||
24693 | else | ||
24694 | ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` | ||
24695 | fi ;; | ||
24696 | [\\/]* | ?:[\\/]* ) # Absolute path. | ||
24697 | ac_srcdir=$srcdir$ac_dir_suffix; | ||
24698 | ac_top_srcdir=$srcdir ;; | ||
17910 | *) # Relative path. | 24699 | *) # Relative path. |
17911 | ac_srcdir=$ac_dots$srcdir$ac_dir_suffix | 24700 | ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix |
17912 | ac_top_srcdir=$ac_dots$srcdir ;; | 24701 | ac_top_srcdir=$ac_top_builddir$srcdir ;; |
17913 | esac | 24702 | esac |
24703 | |||
24704 | # Do not use `cd foo && pwd` to compute absolute paths, because | ||
24705 | # the directories may not exist. | ||
24706 | case `pwd` in | ||
24707 | .) ac_abs_builddir="$ac_dir";; | ||
24708 | *) | ||
24709 | case "$ac_dir" in | ||
24710 | .) ac_abs_builddir=`pwd`;; | ||
24711 | [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; | ||
24712 | *) ac_abs_builddir=`pwd`/"$ac_dir";; | ||
24713 | esac;; | ||
24714 | esac | ||
24715 | case $ac_abs_builddir in | ||
24716 | .) ac_abs_top_builddir=${ac_top_builddir}.;; | ||
24717 | *) | ||
24718 | case ${ac_top_builddir}. in | ||
24719 | .) ac_abs_top_builddir=$ac_abs_builddir;; | ||
24720 | [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; | ||
24721 | *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; | ||
24722 | esac;; | ||
24723 | esac | ||
24724 | case $ac_abs_builddir in | ||
24725 | .) ac_abs_srcdir=$ac_srcdir;; | ||
24726 | *) | ||
24727 | case $ac_srcdir in | ||
24728 | .) ac_abs_srcdir=$ac_abs_builddir;; | ||
24729 | [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; | ||
24730 | *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; | ||
24731 | esac;; | ||
24732 | esac | ||
24733 | case $ac_abs_builddir in | ||
24734 | .) ac_abs_top_srcdir=$ac_top_srcdir;; | ||
24735 | *) | ||
24736 | case $ac_top_srcdir in | ||
24737 | .) ac_abs_top_srcdir=$ac_abs_builddir;; | ||
24738 | [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; | ||
24739 | *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; | ||
24740 | esac;; | ||
24741 | esac | ||
24742 | |||
17914 | 24743 | ||
17915 | case $INSTALL in | 24744 | case $INSTALL in |
17916 | [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; | 24745 | [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; |
17917 | *) ac_INSTALL=$ac_dots$INSTALL ;; | 24746 | *) ac_INSTALL=$ac_top_builddir$INSTALL ;; |
17918 | esac | 24747 | esac |
17919 | 24748 | ||
17920 | if test x"$ac_file" != x-; then | 24749 | if test x"$ac_file" != x-; then |
17921 | { echo "$as_me:17921: creating $ac_file" >&5 | 24750 | { echo "$as_me:$LINENO: creating $ac_file" >&5 |
17922 | echo "$as_me: creating $ac_file" >&6;} | 24751 | echo "$as_me: creating $ac_file" >&6;} |
17923 | rm -f "$ac_file" | 24752 | rm -f "$ac_file" |
17924 | fi | 24753 | fi |
17925 | # Let's still pretend it is `configure' which instantiates (i.e., don't | 24754 | # Let's still pretend it is `configure' which instantiates (i.e., don't |
17926 | # use $as_me), people would be surprised to read: | 24755 | # use $as_me), people would be surprised to read: |
17927 | # /* config.h. Generated automatically by config.status. */ | 24756 | # /* config.h. Generated by config.status. */ |
17928 | configure_input="Generated automatically from `echo $ac_file_in | | 24757 | if test x"$ac_file" = x-; then |
17929 | sed 's,.*/,,'` by configure." | 24758 | configure_input= |
24759 | else | ||
24760 | configure_input="$ac_file. " | ||
24761 | fi | ||
24762 | configure_input=$configure_input"Generated from `echo $ac_file_in | | ||
24763 | sed 's,.*/,,'` by configure." | ||
17930 | 24764 | ||
17931 | # First look for the input files in the build tree, otherwise in the | 24765 | # First look for the input files in the build tree, otherwise in the |
17932 | # src tree. | 24766 | # src tree. |
@@ -17935,37 +24769,43 @@ echo "$as_me: creating $ac_file" >&6;} | |||
17935 | case $f in | 24769 | case $f in |
17936 | -) echo $tmp/stdin ;; | 24770 | -) echo $tmp/stdin ;; |
17937 | [\\/$]*) | 24771 | [\\/$]*) |
17938 | # Absolute (can't be DOS-style, as IFS=:) | 24772 | # Absolute (can't be DOS-style, as IFS=:) |
17939 | test -f "$f" || { { echo "$as_me:17939: error: cannot find input file: $f" >&5 | 24773 | test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 |
17940 | echo "$as_me: error: cannot find input file: $f" >&2;} | 24774 | echo "$as_me: error: cannot find input file: $f" >&2;} |
17941 | { (exit 1); exit 1; }; } | 24775 | { (exit 1); exit 1; }; } |
17942 | echo $f;; | 24776 | echo "$f";; |
17943 | *) # Relative | 24777 | *) # Relative |
17944 | if test -f "$f"; then | 24778 | if test -f "$f"; then |
17945 | # Build tree | 24779 | # Build tree |
17946 | echo $f | 24780 | echo "$f" |
17947 | elif test -f "$srcdir/$f"; then | 24781 | elif test -f "$srcdir/$f"; then |
17948 | # Source tree | 24782 | # Source tree |
17949 | echo $srcdir/$f | 24783 | echo "$srcdir/$f" |
17950 | else | 24784 | else |
17951 | # /dev/null tree | 24785 | # /dev/null tree |
17952 | { { echo "$as_me:17952: error: cannot find input file: $f" >&5 | 24786 | { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 |
17953 | echo "$as_me: error: cannot find input file: $f" >&2;} | 24787 | echo "$as_me: error: cannot find input file: $f" >&2;} |
17954 | { (exit 1); exit 1; }; } | 24788 | { (exit 1); exit 1; }; } |
17955 | fi;; | 24789 | fi;; |
17956 | esac | 24790 | esac |
17957 | done` || { (exit 1); exit 1; } | 24791 | done` || { (exit 1); exit 1; } |
17958 | EOF | 24792 | _ACEOF |
17959 | cat >>$CONFIG_STATUS <<EOF | 24793 | cat >>$CONFIG_STATUS <<_ACEOF |
17960 | sed "$ac_vpsub | 24794 | sed "$ac_vpsub |
17961 | $extrasub | 24795 | $extrasub |
17962 | EOF | 24796 | _ACEOF |
17963 | cat >>$CONFIG_STATUS <<\EOF | 24797 | cat >>$CONFIG_STATUS <<\_ACEOF |
17964 | :t | 24798 | :t |
17965 | /@[a-zA-Z_][a-zA-Z_0-9]*@/!b | 24799 | /@[a-zA-Z_][a-zA-Z_0-9]*@/!b |
17966 | s,@configure_input@,$configure_input,;t t | 24800 | s,@configure_input@,$configure_input,;t t |
17967 | s,@srcdir@,$ac_srcdir,;t t | 24801 | s,@srcdir@,$ac_srcdir,;t t |
24802 | s,@abs_srcdir@,$ac_abs_srcdir,;t t | ||
17968 | s,@top_srcdir@,$ac_top_srcdir,;t t | 24803 | s,@top_srcdir@,$ac_top_srcdir,;t t |
24804 | s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t | ||
24805 | s,@builddir@,$ac_builddir,;t t | ||
24806 | s,@abs_builddir@,$ac_abs_builddir,;t t | ||
24807 | s,@top_builddir@,$ac_top_builddir,;t t | ||
24808 | s,@abs_top_builddir@,$ac_abs_top_builddir,;t t | ||
17969 | s,@INSTALL@,$ac_INSTALL,;t t | 24809 | s,@INSTALL@,$ac_INSTALL,;t t |
17970 | " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out | 24810 | " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out |
17971 | rm -f $tmp/stdin | 24811 | rm -f $tmp/stdin |
@@ -17977,8 +24817,8 @@ s,@INSTALL@,$ac_INSTALL,;t t | |||
17977 | fi | 24817 | fi |
17978 | 24818 | ||
17979 | done | 24819 | done |
17980 | EOF | 24820 | _ACEOF |
17981 | cat >>$CONFIG_STATUS <<\EOF | 24821 | cat >>$CONFIG_STATUS <<\_ACEOF |
17982 | 24822 | ||
17983 | # | 24823 | # |
17984 | # CONFIG_HEADER section. | 24824 | # CONFIG_HEADER section. |
@@ -17988,12 +24828,12 @@ cat >>$CONFIG_STATUS <<\EOF | |||
17988 | # NAME is the cpp macro being defined and VALUE is the value it is being given. | 24828 | # NAME is the cpp macro being defined and VALUE is the value it is being given. |
17989 | # | 24829 | # |
17990 | # ac_d sets the value in "#define NAME VALUE" lines. | 24830 | # ac_d sets the value in "#define NAME VALUE" lines. |
17991 | ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' | 24831 | ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' |
17992 | ac_dB='[ ].*$,\1#\2' | 24832 | ac_dB='[ ].*$,\1#\2' |
17993 | ac_dC=' ' | 24833 | ac_dC=' ' |
17994 | ac_dD=',;t' | 24834 | ac_dD=',;t' |
17995 | # ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". | 24835 | # ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". |
17996 | ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' | 24836 | ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' |
17997 | ac_uB='$,\1#\2define\3' | 24837 | ac_uB='$,\1#\2define\3' |
17998 | ac_uC=' ' | 24838 | ac_uC=' ' |
17999 | ac_uD=',;t' | 24839 | ac_uD=',;t' |
@@ -18002,15 +24842,15 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue | |||
18002 | # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". | 24842 | # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". |
18003 | case $ac_file in | 24843 | case $ac_file in |
18004 | - | *:- | *:-:* ) # input from stdin | 24844 | - | *:- | *:-:* ) # input from stdin |
18005 | cat >$tmp/stdin | 24845 | cat >$tmp/stdin |
18006 | ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` | 24846 | ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` |
18007 | ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; | 24847 | ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; |
18008 | *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` | 24848 | *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` |
18009 | ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; | 24849 | ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; |
18010 | * ) ac_file_in=$ac_file.in ;; | 24850 | * ) ac_file_in=$ac_file.in ;; |
18011 | esac | 24851 | esac |
18012 | 24852 | ||
18013 | test x"$ac_file" != x- && { echo "$as_me:18013: creating $ac_file" >&5 | 24853 | test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 |
18014 | echo "$as_me: creating $ac_file" >&6;} | 24854 | echo "$as_me: creating $ac_file" >&6;} |
18015 | 24855 | ||
18016 | # First look for the input files in the build tree, otherwise in the | 24856 | # First look for the input files in the build tree, otherwise in the |
@@ -18020,30 +24860,31 @@ echo "$as_me: creating $ac_file" >&6;} | |||
18020 | case $f in | 24860 | case $f in |
18021 | -) echo $tmp/stdin ;; | 24861 | -) echo $tmp/stdin ;; |
18022 | [\\/$]*) | 24862 | [\\/$]*) |
18023 | # Absolute (can't be DOS-style, as IFS=:) | 24863 | # Absolute (can't be DOS-style, as IFS=:) |
18024 | test -f "$f" || { { echo "$as_me:18024: error: cannot find input file: $f" >&5 | 24864 | test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 |
18025 | echo "$as_me: error: cannot find input file: $f" >&2;} | 24865 | echo "$as_me: error: cannot find input file: $f" >&2;} |
18026 | { (exit 1); exit 1; }; } | 24866 | { (exit 1); exit 1; }; } |
18027 | echo $f;; | 24867 | # Do quote $f, to prevent DOS paths from being IFS'd. |
24868 | echo "$f";; | ||
18028 | *) # Relative | 24869 | *) # Relative |
18029 | if test -f "$f"; then | 24870 | if test -f "$f"; then |
18030 | # Build tree | 24871 | # Build tree |
18031 | echo $f | 24872 | echo "$f" |
18032 | elif test -f "$srcdir/$f"; then | 24873 | elif test -f "$srcdir/$f"; then |
18033 | # Source tree | 24874 | # Source tree |
18034 | echo $srcdir/$f | 24875 | echo "$srcdir/$f" |
18035 | else | 24876 | else |
18036 | # /dev/null tree | 24877 | # /dev/null tree |
18037 | { { echo "$as_me:18037: error: cannot find input file: $f" >&5 | 24878 | { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 |
18038 | echo "$as_me: error: cannot find input file: $f" >&2;} | 24879 | echo "$as_me: error: cannot find input file: $f" >&2;} |
18039 | { (exit 1); exit 1; }; } | 24880 | { (exit 1); exit 1; }; } |
18040 | fi;; | 24881 | fi;; |
18041 | esac | 24882 | esac |
18042 | done` || { (exit 1); exit 1; } | 24883 | done` || { (exit 1); exit 1; } |
18043 | # Remove the trailing spaces. | 24884 | # Remove the trailing spaces. |
18044 | sed 's/[ ]*$//' $ac_file_inputs >$tmp/in | 24885 | sed 's/[ ]*$//' $ac_file_inputs >$tmp/in |
18045 | 24886 | ||
18046 | EOF | 24887 | _ACEOF |
18047 | 24888 | ||
18048 | # Transform confdefs.h into two sed scripts, `conftest.defines' and | 24889 | # Transform confdefs.h into two sed scripts, `conftest.defines' and |
18049 | # `conftest.undefs', that substitutes the proper values into | 24890 | # `conftest.undefs', that substitutes the proper values into |
@@ -18059,16 +24900,16 @@ rm -f conftest.defines conftest.undefs | |||
18059 | # `end' is used to avoid that the second main sed command (meant for | 24900 | # `end' is used to avoid that the second main sed command (meant for |
18060 | # 0-ary CPP macros) applies to n-ary macro definitions. | 24901 | # 0-ary CPP macros) applies to n-ary macro definitions. |
18061 | # See the Autoconf documentation for `clear'. | 24902 | # See the Autoconf documentation for `clear'. |
18062 | cat >confdef2sed.sed <<\EOF | 24903 | cat >confdef2sed.sed <<\_ACEOF |
18063 | s/[\\&,]/\\&/g | 24904 | s/[\\&,]/\\&/g |
18064 | s,[\\$`],\\&,g | 24905 | s,[\\$`],\\&,g |
18065 | t clear | 24906 | t clear |
18066 | : clear | 24907 | : clear |
18067 | s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp | 24908 | s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp |
18068 | t end | 24909 | t end |
18069 | s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp | 24910 | s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp |
18070 | : end | 24911 | : end |
18071 | EOF | 24912 | _ACEOF |
18072 | # If some macros were called several times there might be several times | 24913 | # If some macros were called several times there might be several times |
18073 | # the same #defines, which is useless. Nevertheless, we may not want to | 24914 | # the same #defines, which is useless. Nevertheless, we may not want to |
18074 | # sort them, since we want the *last* AC-DEFINE to be honored. | 24915 | # sort them, since we want the *last* AC-DEFINE to be honored. |
@@ -18079,14 +24920,14 @@ rm -f confdef2sed.sed | |||
18079 | # This sed command replaces #undef with comments. This is necessary, for | 24920 | # This sed command replaces #undef with comments. This is necessary, for |
18080 | # example, in the case of _POSIX_SOURCE, which is predefined and required | 24921 | # example, in the case of _POSIX_SOURCE, which is predefined and required |
18081 | # on some systems where configure will not decide to define it. | 24922 | # on some systems where configure will not decide to define it. |
18082 | cat >>conftest.undefs <<\EOF | 24923 | cat >>conftest.undefs <<\_ACEOF |
18083 | s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, | 24924 | s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, |
18084 | EOF | 24925 | _ACEOF |
18085 | 24926 | ||
18086 | # Break up conftest.defines because some shells have a limit on the size | 24927 | # Break up conftest.defines because some shells have a limit on the size |
18087 | # of here documents, and old seds have small limits too (100 cmds). | 24928 | # of here documents, and old seds have small limits too (100 cmds). |
18088 | echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS | 24929 | echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS |
18089 | echo ' if egrep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS | 24930 | echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS |
18090 | echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS | 24931 | echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS |
18091 | echo ' :' >>$CONFIG_STATUS | 24932 | echo ' :' >>$CONFIG_STATUS |
18092 | rm -f conftest.tail | 24933 | rm -f conftest.tail |
@@ -18095,7 +24936,7 @@ do | |||
18095 | # Write a limited-size here document to $tmp/defines.sed. | 24936 | # Write a limited-size here document to $tmp/defines.sed. |
18096 | echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS | 24937 | echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS |
18097 | # Speed up: don't consider the non `#define' lines. | 24938 | # Speed up: don't consider the non `#define' lines. |
18098 | echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS | 24939 | echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS |
18099 | # Work around the forget-to-reset-the-flag bug. | 24940 | # Work around the forget-to-reset-the-flag bug. |
18100 | echo 't clr' >>$CONFIG_STATUS | 24941 | echo 't clr' >>$CONFIG_STATUS |
18101 | echo ': clr' >>$CONFIG_STATUS | 24942 | echo ': clr' >>$CONFIG_STATUS |
@@ -18110,7 +24951,7 @@ do | |||
18110 | mv conftest.tail conftest.defines | 24951 | mv conftest.tail conftest.defines |
18111 | done | 24952 | done |
18112 | rm -f conftest.defines | 24953 | rm -f conftest.defines |
18113 | echo ' fi # egrep' >>$CONFIG_STATUS | 24954 | echo ' fi # grep' >>$CONFIG_STATUS |
18114 | echo >>$CONFIG_STATUS | 24955 | echo >>$CONFIG_STATUS |
18115 | 24956 | ||
18116 | # Break up conftest.undefs because some shells have a limit on the size | 24957 | # Break up conftest.undefs because some shells have a limit on the size |
@@ -18122,7 +24963,7 @@ do | |||
18122 | # Write a limited-size here document to $tmp/undefs.sed. | 24963 | # Write a limited-size here document to $tmp/undefs.sed. |
18123 | echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS | 24964 | echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS |
18124 | # Speed up: don't consider the non `#undef' | 24965 | # Speed up: don't consider the non `#undef' |
18125 | echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS | 24966 | echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS |
18126 | # Work around the forget-to-reset-the-flag bug. | 24967 | # Work around the forget-to-reset-the-flag bug. |
18127 | echo 't clr' >>$CONFIG_STATUS | 24968 | echo 't clr' >>$CONFIG_STATUS |
18128 | echo ': clr' >>$CONFIG_STATUS | 24969 | echo ': clr' >>$CONFIG_STATUS |
@@ -18138,51 +24979,59 @@ do | |||
18138 | done | 24979 | done |
18139 | rm -f conftest.undefs | 24980 | rm -f conftest.undefs |
18140 | 24981 | ||
18141 | cat >>$CONFIG_STATUS <<\EOF | 24982 | cat >>$CONFIG_STATUS <<\_ACEOF |
18142 | # Let's still pretend it is `configure' which instantiates (i.e., don't | 24983 | # Let's still pretend it is `configure' which instantiates (i.e., don't |
18143 | # use $as_me), people would be surprised to read: | 24984 | # use $as_me), people would be surprised to read: |
18144 | # /* config.h. Generated automatically by config.status. */ | 24985 | # /* config.h. Generated by config.status. */ |
18145 | if test x"$ac_file" = x-; then | 24986 | if test x"$ac_file" = x-; then |
18146 | echo "/* Generated automatically by configure. */" >$tmp/config.h | 24987 | echo "/* Generated by configure. */" >$tmp/config.h |
18147 | else | 24988 | else |
18148 | echo "/* $ac_file. Generated automatically by configure. */" >$tmp/config.h | 24989 | echo "/* $ac_file. Generated by configure. */" >$tmp/config.h |
18149 | fi | 24990 | fi |
18150 | cat $tmp/in >>$tmp/config.h | 24991 | cat $tmp/in >>$tmp/config.h |
18151 | rm -f $tmp/in | 24992 | rm -f $tmp/in |
18152 | if test x"$ac_file" != x-; then | 24993 | if test x"$ac_file" != x-; then |
18153 | if cmp -s $ac_file $tmp/config.h 2>/dev/null; then | 24994 | if diff $ac_file $tmp/config.h >/dev/null 2>&1; then |
18154 | { echo "$as_me:18154: $ac_file is unchanged" >&5 | 24995 | { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 |
18155 | echo "$as_me: $ac_file is unchanged" >&6;} | 24996 | echo "$as_me: $ac_file is unchanged" >&6;} |
18156 | else | 24997 | else |
18157 | ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | 24998 | ac_dir=`(dirname "$ac_file") 2>/dev/null || |
18158 | X"$ac_file" : 'X\(//\)[^/]' \| \ | 24999 | $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
18159 | X"$ac_file" : 'X\(//\)$' \| \ | 25000 | X"$ac_file" : 'X\(//\)[^/]' \| \ |
18160 | X"$ac_file" : 'X\(/\)' \| \ | 25001 | X"$ac_file" : 'X\(//\)$' \| \ |
18161 | . : '\(.\)' 2>/dev/null || | 25002 | X"$ac_file" : 'X\(/\)' \| \ |
25003 | . : '\(.\)' 2>/dev/null || | ||
18162 | echo X"$ac_file" | | 25004 | echo X"$ac_file" | |
18163 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | 25005 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } |
18164 | /^X\(\/\/\)[^/].*/{ s//\1/; q; } | 25006 | /^X\(\/\/\)[^/].*/{ s//\1/; q; } |
18165 | /^X\(\/\/\)$/{ s//\1/; q; } | 25007 | /^X\(\/\/\)$/{ s//\1/; q; } |
18166 | /^X\(\/\).*/{ s//\1/; q; } | 25008 | /^X\(\/\).*/{ s//\1/; q; } |
18167 | s/.*/./; q'` | 25009 | s/.*/./; q'` |
18168 | if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then | 25010 | { if $as_mkdir_p; then |
18169 | { case "$ac_dir" in | 25011 | mkdir -p "$ac_dir" |
18170 | [\\/]* | ?:[\\/]* ) as_incr_dir=;; | 25012 | else |
18171 | *) as_incr_dir=.;; | 25013 | as_dir="$ac_dir" |
18172 | esac | 25014 | as_dirs= |
18173 | as_dummy="$ac_dir" | 25015 | while test ! -d "$as_dir"; do |
18174 | for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do | 25016 | as_dirs="$as_dir $as_dirs" |
18175 | case $as_mkdir_dir in | 25017 | as_dir=`(dirname "$as_dir") 2>/dev/null || |
18176 | # Skip DOS drivespec | 25018 | $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
18177 | ?:) as_incr_dir=$as_mkdir_dir ;; | 25019 | X"$as_dir" : 'X\(//\)[^/]' \| \ |
18178 | *) | 25020 | X"$as_dir" : 'X\(//\)$' \| \ |
18179 | as_incr_dir=$as_incr_dir/$as_mkdir_dir | 25021 | X"$as_dir" : 'X\(/\)' \| \ |
18180 | test -d "$as_incr_dir" || mkdir "$as_incr_dir" | 25022 | . : '\(.\)' 2>/dev/null || |
18181 | ;; | 25023 | echo X"$as_dir" | |
18182 | esac | 25024 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } |
18183 | done; } | 25025 | /^X\(\/\/\)[^/].*/{ s//\1/; q; } |
25026 | /^X\(\/\/\)$/{ s//\1/; q; } | ||
25027 | /^X\(\/\).*/{ s//\1/; q; } | ||
25028 | s/.*/./; q'` | ||
25029 | done | ||
25030 | test ! -n "$as_dirs" || mkdir $as_dirs | ||
25031 | fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 | ||
25032 | echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} | ||
25033 | { (exit 1); exit 1; }; }; } | ||
18184 | 25034 | ||
18185 | fi | ||
18186 | rm -f $ac_file | 25035 | rm -f $ac_file |
18187 | mv $tmp/config.h $ac_file | 25036 | mv $tmp/config.h $ac_file |
18188 | fi | 25037 | fi |
@@ -18191,15 +25040,16 @@ done; } | |||
18191 | rm -f $tmp/config.h | 25040 | rm -f $tmp/config.h |
18192 | fi | 25041 | fi |
18193 | done | 25042 | done |
18194 | EOF | 25043 | _ACEOF |
18195 | 25044 | ||
18196 | cat >>$CONFIG_STATUS <<\EOF | 25045 | cat >>$CONFIG_STATUS <<\_ACEOF |
18197 | 25046 | ||
18198 | { (exit 0); exit 0; } | 25047 | { (exit 0); exit 0; } |
18199 | EOF | 25048 | _ACEOF |
18200 | chmod +x $CONFIG_STATUS | 25049 | chmod +x $CONFIG_STATUS |
18201 | ac_clean_files=$ac_clean_files_save | 25050 | ac_clean_files=$ac_clean_files_save |
18202 | 25051 | ||
25052 | |||
18203 | # configure is writing to config.log, and then calls config.status. | 25053 | # configure is writing to config.log, and then calls config.status. |
18204 | # config.status does its own redirection, appending to config.log. | 25054 | # config.status does its own redirection, appending to config.log. |
18205 | # Unfortunately, on DOS this fails, as config.log is still kept open | 25055 | # Unfortunately, on DOS this fails, as config.log is still kept open |
@@ -18210,14 +25060,18 @@ ac_clean_files=$ac_clean_files_save | |||
18210 | # need to make the FD available again. | 25060 | # need to make the FD available again. |
18211 | if test "$no_create" != yes; then | 25061 | if test "$no_create" != yes; then |
18212 | ac_cs_success=: | 25062 | ac_cs_success=: |
25063 | ac_config_status_args= | ||
25064 | test "$silent" = yes && | ||
25065 | ac_config_status_args="$ac_config_status_args --quiet" | ||
18213 | exec 5>/dev/null | 25066 | exec 5>/dev/null |
18214 | $SHELL $CONFIG_STATUS || ac_cs_success=false | 25067 | $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false |
18215 | exec 5>>config.log | 25068 | exec 5>>config.log |
18216 | # Use ||, not &&, to avoid exiting from the if with $? = 1, which | 25069 | # Use ||, not &&, to avoid exiting from the if with $? = 1, which |
18217 | # would make configure fail if this is the last instruction. | 25070 | # would make configure fail if this is the last instruction. |
18218 | $ac_cs_success || { (exit 1); exit 1; } | 25071 | $ac_cs_success || { (exit 1); exit 1; } |
18219 | fi | 25072 | fi |
18220 | 25073 | ||
25074 | |||
18221 | # Print summary of options | 25075 | # Print summary of options |
18222 | 25076 | ||
18223 | # Someone please show me a better way :) | 25077 | # Someone please show me a better way :) |
@@ -18280,6 +25134,10 @@ echo " Libraries: ${LIBWRAP} ${LIBPAM} ${LIBS}" | |||
18280 | 25134 | ||
18281 | echo "" | 25135 | echo "" |
18282 | 25136 | ||
25137 | if test "x$MAKE_PACKAGE_SUPPORTED" = "xyes" ; then | ||
25138 | echo "SVR4 style packages are supported with \"make package\"\n" | ||
25139 | fi | ||
25140 | |||
18283 | if test "x$PAM_MSG" = "xyes" ; then | 25141 | if test "x$PAM_MSG" = "xyes" ; then |
18284 | echo "PAM is enabled. You may need to install a PAM control file " | 25142 | echo "PAM is enabled. You may need to install a PAM control file " |
18285 | echo "for sshd, otherwise password authentication may fail. " | 25143 | echo "for sshd, otherwise password authentication may fail. " |
@@ -18296,3 +25154,13 @@ if test ! -z "$RAND_HELPER_CMDHASH" ; then | |||
18296 | echo "" | 25154 | echo "" |
18297 | fi | 25155 | fi |
18298 | 25156 | ||
25157 | if test ! -z "$NO_PEERCHECK" ; then | ||
25158 | echo "WARNING: the operating system that you are using does not " | ||
25159 | echo "appear to support either the getpeereid() API nor the " | ||
25160 | echo "SO_PEERCRED getsockopt() option. These facilities are used to " | ||
25161 | echo "enforce security checks to prevent unauthorised connections to " | ||
25162 | echo "ssh-agent. Their absence increases the risk that a malicious " | ||
25163 | echo "user can connect to your agent. " | ||
25164 | echo "" | ||
25165 | fi | ||
25166 | |||
diff --git a/configure.ac b/configure.ac index 6ba4d244a..36c457728 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.214 2004/04/17 03:03:07 tim Exp $ | 1 | # $Id: configure.ac,v 1.226 2004/08/16 13:12:06 dtucker Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -28,6 +28,8 @@ AC_PROG_CPP | |||
28 | AC_PROG_RANLIB | 28 | AC_PROG_RANLIB |
29 | AC_PROG_INSTALL | 29 | AC_PROG_INSTALL |
30 | AC_PATH_PROG(AR, ar) | 30 | AC_PATH_PROG(AR, ar) |
31 | AC_PATH_PROG(CAT, cat) | ||
32 | AC_PATH_PROG(KILL, kill) | ||
31 | AC_PATH_PROGS(PERL, perl5 perl) | 33 | AC_PATH_PROGS(PERL, perl5 perl) |
32 | AC_PATH_PROG(SED, sed) | 34 | AC_PATH_PROG(SED, sed) |
33 | AC_SUBST(PERL) | 35 | AC_SUBST(PERL) |
@@ -37,6 +39,14 @@ AC_PATH_PROG(TEST_MINUS_S_SH, bash) | |||
37 | AC_PATH_PROG(TEST_MINUS_S_SH, ksh) | 39 | AC_PATH_PROG(TEST_MINUS_S_SH, ksh) |
38 | AC_PATH_PROG(TEST_MINUS_S_SH, sh) | 40 | AC_PATH_PROG(TEST_MINUS_S_SH, sh) |
39 | AC_PATH_PROG(SH, sh) | 41 | AC_PATH_PROG(SH, sh) |
42 | AC_SUBST(TEST_SHELL,sh) | ||
43 | |||
44 | dnl for buildpkg.sh | ||
45 | AC_PATH_PROG(PATH_GROUPADD_PROG, groupadd, groupadd, | ||
46 | [/usr/sbin${PATH_SEPARATOR}/etc]) | ||
47 | AC_PATH_PROG(PATH_USERADD_PROG, useradd, useradd, | ||
48 | [/usr/sbin${PATH_SEPARATOR}/etc]) | ||
49 | AC_CHECK_PROG(MAKE_PACKAGE_SUPPORTED, pkgmk, yes, no) | ||
40 | 50 | ||
41 | # System features | 51 | # System features |
42 | AC_SYS_LARGEFILE | 52 | AC_SYS_LARGEFILE |
@@ -244,6 +254,7 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) | |||
244 | AC_DEFINE(PAM_TTY_KLUDGE) | 254 | AC_DEFINE(PAM_TTY_KLUDGE) |
245 | AC_DEFINE(LOCKED_PASSWD_PREFIX, "!") | 255 | AC_DEFINE(LOCKED_PASSWD_PREFIX, "!") |
246 | AC_DEFINE(SPT_TYPE,SPT_REUSEARGV) | 256 | AC_DEFINE(SPT_TYPE,SPT_REUSEARGV) |
257 | AC_DEFINE(LINK_OPNOTSUPP_ERRNO, EPERM) | ||
247 | inet6_default_4in6=yes | 258 | inet6_default_4in6=yes |
248 | case `uname -r` in | 259 | case `uname -r` in |
249 | 1.*|2.0.*) | 260 | 1.*|2.0.*) |
@@ -287,6 +298,7 @@ mips-sony-bsd|mips-sony-newsos4) | |||
287 | AC_DEFINE(LOGIN_NEEDS_UTMPX) | 298 | AC_DEFINE(LOGIN_NEEDS_UTMPX) |
288 | AC_DEFINE(LOGIN_NEEDS_TERM) | 299 | AC_DEFINE(LOGIN_NEEDS_TERM) |
289 | AC_DEFINE(PAM_TTY_KLUDGE) | 300 | AC_DEFINE(PAM_TTY_KLUDGE) |
301 | AC_DEFINE(SSHPAM_CHAUTHTOK_NEEDS_RUID) | ||
290 | AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*") | 302 | AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*") |
291 | # Pushing STREAMS modules will cause sshd to acquire a controlling tty. | 303 | # Pushing STREAMS modules will cause sshd to acquire a controlling tty. |
292 | AC_DEFINE(SSHD_ACQUIRES_CTTY) | 304 | AC_DEFINE(SSHD_ACQUIRES_CTTY) |
@@ -366,6 +378,7 @@ mips-sony-bsd|mips-sony-newsos4) | |||
366 | AC_CHECK_FUNCS(getluid setluid) | 378 | AC_CHECK_FUNCS(getluid setluid) |
367 | MANTYPE=man | 379 | MANTYPE=man |
368 | do_sco3_extra_lib_check=yes | 380 | do_sco3_extra_lib_check=yes |
381 | TEST_SHELL=ksh | ||
369 | ;; | 382 | ;; |
370 | *-*-sco3.2v5*) | 383 | *-*-sco3.2v5*) |
371 | if test -z "$GCC"; then | 384 | if test -z "$GCC"; then |
@@ -381,8 +394,10 @@ mips-sony-bsd|mips-sony-newsos4) | |||
381 | AC_DEFINE(BROKEN_SETREUID) | 394 | AC_DEFINE(BROKEN_SETREUID) |
382 | AC_DEFINE(BROKEN_SETREGID) | 395 | AC_DEFINE(BROKEN_SETREGID) |
383 | AC_DEFINE(WITH_ABBREV_NO_TTY) | 396 | AC_DEFINE(WITH_ABBREV_NO_TTY) |
397 | AC_DEFINE(BROKEN_UPDWTMPX) | ||
384 | AC_CHECK_FUNCS(getluid setluid) | 398 | AC_CHECK_FUNCS(getluid setluid) |
385 | MANTYPE=man | 399 | MANTYPE=man |
400 | TEST_SHELL=ksh | ||
386 | ;; | 401 | ;; |
387 | *-*-unicosmk*) | 402 | *-*-unicosmk*) |
388 | AC_DEFINE(NO_SSH_LASTLOG) | 403 | AC_DEFINE(NO_SSH_LASTLOG) |
@@ -503,16 +518,16 @@ int main(){exit(0);} | |||
503 | ) | 518 | ) |
504 | 519 | ||
505 | # Checks for header files. | 520 | # Checks for header files. |
506 | AC_CHECK_HEADERS(bstring.h crypt.h endian.h features.h floatingpoint.h \ | 521 | AC_CHECK_HEADERS(bstring.h crypt.h dirent.h endian.h features.h \ |
507 | getopt.h glob.h ia.h lastlog.h limits.h login.h \ | 522 | floatingpoint.h getopt.h glob.h ia.h lastlog.h limits.h login.h \ |
508 | login_cap.h maillock.h netdb.h netgroup.h \ | 523 | login_cap.h maillock.h ndir.h netdb.h netgroup.h \ |
509 | netinet/in_systm.h pam/pam_appl.h paths.h pty.h readpassphrase.h \ | 524 | netinet/in_systm.h pam/pam_appl.h paths.h pty.h readpassphrase.h \ |
510 | rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \ | 525 | rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \ |
511 | strings.h sys/strtio.h sys/audit.h sys/bitypes.h sys/bsdtty.h \ | 526 | strings.h sys/dir.h sys/strtio.h sys/audit.h sys/bitypes.h \ |
512 | sys/cdefs.h sys/mman.h sys/prctl.h sys/pstat.h sys/ptms.h \ | 527 | sys/bsdtty.h sys/cdefs.h sys/mman.h sys/ndir.h sys/prctl.h \ |
513 | sys/select.h sys/stat.h sys/stream.h sys/stropts.h \ | 528 | sys/pstat.h sys/ptms.h sys/select.h sys/stat.h sys/stream.h \ |
514 | sys/sysmacros.h sys/time.h sys/timers.h sys/un.h time.h tmpdir.h \ | 529 | sys/stropts.h sys/sysmacros.h sys/time.h sys/timers.h sys/un.h \ |
515 | ttyent.h usersec.h util.h utime.h utmp.h utmpx.h vis.h) | 530 | time.h tmpdir.h ttyent.h usersec.h util.h utime.h utmp.h utmpx.h vis.h) |
516 | 531 | ||
517 | # Checks for libraries. | 532 | # Checks for libraries. |
518 | AC_CHECK_FUNC(yp_match, , AC_CHECK_LIB(nsl, yp_match)) | 533 | AC_CHECK_FUNC(yp_match, , AC_CHECK_LIB(nsl, yp_match)) |
@@ -717,6 +732,14 @@ int main(void){struct dirent d;exit(sizeof(d.d_name)<=sizeof(char));} | |||
717 | ] | 732 | ] |
718 | ) | 733 | ) |
719 | 734 | ||
735 | AC_MSG_CHECKING([for /proc/pid/fd directory]) | ||
736 | if test -d "/proc/$$/fd" ; then | ||
737 | AC_DEFINE(HAVE_PROC_PID) | ||
738 | AC_MSG_RESULT(yes) | ||
739 | else | ||
740 | AC_MSG_RESULT(no) | ||
741 | fi | ||
742 | |||
720 | # Check whether user wants S/Key support | 743 | # Check whether user wants S/Key support |
721 | SKEY_MSG="no" | 744 | SKEY_MSG="no" |
722 | AC_ARG_WITH(skey, | 745 | AC_ARG_WITH(skey, |
@@ -818,9 +841,9 @@ AC_ARG_WITH(tcp-wrappers, | |||
818 | 841 | ||
819 | dnl Checks for library functions. Please keep in alphabetical order | 842 | dnl Checks for library functions. Please keep in alphabetical order |
820 | AC_CHECK_FUNCS(\ | 843 | AC_CHECK_FUNCS(\ |
821 | arc4random __b64_ntop b64_ntop __b64_pton b64_pton \ | 844 | arc4random __b64_ntop b64_ntop __b64_pton b64_pton bcopy \ |
822 | bcopy bindresvport_sa clock fchmod fchown freeaddrinfo futimes \ | 845 | bindresvport_sa clock closefrom dirfd fchmod fchown freeaddrinfo \ |
823 | getaddrinfo getcwd getgrouplist getnameinfo getopt \ | 846 | futimes getaddrinfo getcwd getgrouplist getnameinfo getopt \ |
824 | getpeereid _getpty getrlimit getttyent glob inet_aton \ | 847 | getpeereid _getpty getrlimit getttyent glob inet_aton \ |
825 | inet_ntoa inet_ntop innetgr login_getcapbool md5_crypt memmove \ | 848 | inet_ntoa inet_ntop innetgr login_getcapbool md5_crypt memmove \ |
826 | mkdtemp mmap ngetaddrinfo nsleep ogetaddrinfo openlog_r openpty \ | 849 | mkdtemp mmap ngetaddrinfo nsleep ogetaddrinfo openlog_r openpty \ |
@@ -860,6 +883,8 @@ AC_CHECK_DECL(tcsendbreak, | |||
860 | [#include <termios.h>] | 883 | [#include <termios.h>] |
861 | ) | 884 | ) |
862 | 885 | ||
886 | AC_CHECK_DECLS(h_errno, , ,[#include <netdb.h>]) | ||
887 | |||
863 | AC_CHECK_FUNCS(setresuid, [ | 888 | AC_CHECK_FUNCS(setresuid, [ |
864 | dnl Some platorms have setresuid that isn't implemented, test for this | 889 | dnl Some platorms have setresuid that isn't implemented, test for this |
865 | AC_MSG_CHECKING(if setresuid seems to work) | 890 | AC_MSG_CHECKING(if setresuid seems to work) |
@@ -924,6 +949,20 @@ int main(void){char b[5];snprintf(b,5,"123456789");exit(b[4]!='\0');} | |||
924 | ) | 949 | ) |
925 | fi | 950 | fi |
926 | 951 | ||
952 | # Check for missing getpeereid (or equiv) support | ||
953 | NO_PEERCHECK="" | ||
954 | if test "x$ac_cv_func_getpeereid" != "xyes" ; then | ||
955 | AC_MSG_CHECKING([whether system supports SO_PEERCRED getsockopt]) | ||
956 | AC_TRY_COMPILE( | ||
957 | [#include <sys/types.h> | ||
958 | #include <sys/socket.h>], | ||
959 | [int i = SO_PEERCRED;], | ||
960 | [AC_MSG_RESULT(yes)], | ||
961 | [AC_MSG_RESULT(no) | ||
962 | NO_PEERCHECK=1] | ||
963 | ) | ||
964 | fi | ||
965 | |||
927 | dnl see whether mkstemp() requires XXXXXX | 966 | dnl see whether mkstemp() requires XXXXXX |
928 | if test "x$ac_cv_func_mkdtemp" = "xyes" ; then | 967 | if test "x$ac_cv_func_mkdtemp" = "xyes" ; then |
929 | AC_MSG_CHECKING([for (overly) strict mkstemp]) | 968 | AC_MSG_CHECKING([for (overly) strict mkstemp]) |
@@ -2154,6 +2193,25 @@ AC_SEARCH_LIBS(getrrsetbyname, resolv, | |||
2154 | # Needed by our getrrsetbyname() | 2193 | # Needed by our getrrsetbyname() |
2155 | AC_SEARCH_LIBS(res_query, resolv) | 2194 | AC_SEARCH_LIBS(res_query, resolv) |
2156 | AC_SEARCH_LIBS(dn_expand, resolv) | 2195 | AC_SEARCH_LIBS(dn_expand, resolv) |
2196 | AC_MSG_CHECKING(if res_query will link) | ||
2197 | AC_TRY_LINK_FUNC(res_query, AC_MSG_RESULT(yes), | ||
2198 | [AC_MSG_RESULT(no) | ||
2199 | saved_LIBS="$LIBS" | ||
2200 | LIBS="$LIBS -lresolv" | ||
2201 | AC_MSG_CHECKING(for res_query in -lresolv) | ||
2202 | AC_LINK_IFELSE([ | ||
2203 | #include <resolv.h> | ||
2204 | int main() | ||
2205 | { | ||
2206 | res_query (0, 0, 0, 0, 0); | ||
2207 | return 0; | ||
2208 | } | ||
2209 | ], | ||
2210 | [LIBS="$LIBS -lresolv" | ||
2211 | AC_MSG_RESULT(yes)], | ||
2212 | [LIBS="$saved_LIBS" | ||
2213 | AC_MSG_RESULT(no)]) | ||
2214 | ]) | ||
2157 | AC_CHECK_FUNCS(_getshort _getlong) | 2215 | AC_CHECK_FUNCS(_getshort _getlong) |
2158 | AC_CHECK_MEMBER(HEADER.ad, | 2216 | AC_CHECK_MEMBER(HEADER.ad, |
2159 | [AC_DEFINE(HAVE_HEADER_AD)],, | 2217 | [AC_DEFINE(HAVE_HEADER_AD)],, |
@@ -2207,7 +2265,10 @@ AC_ARG_WITH(kerberos5, | |||
2207 | [ char *tmp = heimdal_version; ], | 2265 | [ char *tmp = heimdal_version; ], |
2208 | [ AC_MSG_RESULT(yes) | 2266 | [ AC_MSG_RESULT(yes) |
2209 | AC_DEFINE(HEIMDAL) | 2267 | AC_DEFINE(HEIMDAL) |
2210 | K5LIBS="-lkrb5 -ldes -lcom_err -lasn1 -lroken" | 2268 | K5LIBS="-lkrb5 -ldes" |
2269 | K5LIBS="$K5LIBS -lcom_err -lasn1" | ||
2270 | AC_CHECK_LIB(roken, net_write, | ||
2271 | [K5LIBS="$K5LIBS -lroken"]) | ||
2211 | ], | 2272 | ], |
2212 | [ AC_MSG_RESULT(no) | 2273 | [ AC_MSG_RESULT(no) |
2213 | K5LIBS="-lkrb5 -lk5crypto -lcom_err" | 2274 | K5LIBS="-lkrb5 -lk5crypto -lcom_err" |
@@ -2870,7 +2931,7 @@ if test "$ac_cv_lib_pam_pam_set_item" = yes ; then | |||
2870 | fi | 2931 | fi |
2871 | 2932 | ||
2872 | AC_EXEEXT | 2933 | AC_EXEEXT |
2873 | AC_CONFIG_FILES([Makefile openbsd-compat/Makefile scard/Makefile ssh_prng_cmds]) | 2934 | AC_CONFIG_FILES([Makefile buildpkg.sh opensshd.init openbsd-compat/Makefile scard/Makefile ssh_prng_cmds]) |
2874 | AC_OUTPUT | 2935 | AC_OUTPUT |
2875 | 2936 | ||
2876 | # Print summary of options | 2937 | # Print summary of options |
@@ -2935,6 +2996,10 @@ echo " Libraries: ${LIBWRAP} ${LIBPAM} ${LIBS}" | |||
2935 | 2996 | ||
2936 | echo "" | 2997 | echo "" |
2937 | 2998 | ||
2999 | if test "x$MAKE_PACKAGE_SUPPORTED" = "xyes" ; then | ||
3000 | echo "SVR4 style packages are supported with \"make package\"\n" | ||
3001 | fi | ||
3002 | |||
2938 | if test "x$PAM_MSG" = "xyes" ; then | 3003 | if test "x$PAM_MSG" = "xyes" ; then |
2939 | echo "PAM is enabled. You may need to install a PAM control file " | 3004 | echo "PAM is enabled. You may need to install a PAM control file " |
2940 | echo "for sshd, otherwise password authentication may fail. " | 3005 | echo "for sshd, otherwise password authentication may fail. " |
@@ -2951,3 +3016,13 @@ if test ! -z "$RAND_HELPER_CMDHASH" ; then | |||
2951 | echo "" | 3016 | echo "" |
2952 | fi | 3017 | fi |
2953 | 3018 | ||
3019 | if test ! -z "$NO_PEERCHECK" ; then | ||
3020 | echo "WARNING: the operating system that you are using does not " | ||
3021 | echo "appear to support either the getpeereid() API nor the " | ||
3022 | echo "SO_PEERCRED getsockopt() option. These facilities are used to " | ||
3023 | echo "enforce security checks to prevent unauthorised connections to " | ||
3024 | echo "ssh-agent. Their absence increases the risk that a malicious " | ||
3025 | echo "user can connect to your agent. " | ||
3026 | echo "" | ||
3027 | fi | ||
3028 | |||
diff --git a/contrib/README b/contrib/README index 9de3d961d..c00223865 100644 --- a/contrib/README +++ b/contrib/README | |||
@@ -19,7 +19,7 @@ X11 SSH Askpass: | |||
19 | Jim Knoble <jmknoble@pobox.com> has written an excellent X11 | 19 | Jim Knoble <jmknoble@pobox.com> has written an excellent X11 |
20 | passphrase requester. This is highly recommended: | 20 | passphrase requester. This is highly recommended: |
21 | 21 | ||
22 | http://www.ntrnet.net/~jmknoble/software/x11-ssh-askpass/index.html | 22 | http://www.jmknoble.net/software/x11-ssh-askpass/ |
23 | 23 | ||
24 | 24 | ||
25 | In this directory | 25 | In this directory |
@@ -44,17 +44,27 @@ sshd.pam.freebsd: | |||
44 | A PAM config file which works with FreeBSD's PAM port. Contributed by | 44 | A PAM config file which works with FreeBSD's PAM port. Contributed by |
45 | Dominik Brettnacher <domi@saargate.de> | 45 | Dominik Brettnacher <domi@saargate.de> |
46 | 46 | ||
47 | mdoc2man.pl: | 47 | findssl.sh: |
48 | 48 | ||
49 | Converts mdoc formated manpages into normal manpages. This can be used | 49 | Search for all instances of OpenSSL headers and libraries and print their |
50 | on Solaris machines to provide manpages that are not preformated. | 50 | versions. This is intended to help diagnose OpenSSH's "OpenSSL headers do not |
51 | Contributed by Mark D. Roth <roth@feep.net> | 51 | match your library" errors. |
52 | 52 | ||
53 | redhat: | 53 | aix: |
54 | Files to build an AIX native (installp or SMIT installable) package. | ||
54 | 55 | ||
55 | RPM spec file and scripts for building Redhat packages | 56 | caldera: |
57 | RPM spec file and scripts for building Caldera OpenLinuix packages | ||
56 | 58 | ||
57 | suse: | 59 | cygwin: |
60 | Support files for Cygwin | ||
61 | |||
62 | hpux: | ||
63 | Support files for HP-UX | ||
58 | 64 | ||
59 | RPM spec file and scripts for building SuSE packages | 65 | redhat: |
66 | RPM spec file and scripts for building Redhat packages | ||
67 | |||
68 | suse: | ||
69 | RPM spec file and scripts for building SuSE packages | ||
60 | 70 | ||
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec index e690f102f..53b16455e 100644 --- a/contrib/caldera/openssh.spec +++ b/contrib/caldera/openssh.spec | |||
@@ -17,11 +17,11 @@ | |||
17 | #old cvs stuff. please update before use. may be deprecated. | 17 | #old cvs stuff. please update before use. may be deprecated. |
18 | %define use_stable 1 | 18 | %define use_stable 1 |
19 | %if %{use_stable} | 19 | %if %{use_stable} |
20 | %define version 3.8.1p1 | 20 | %define version 3.9p1 |
21 | %define cvs %{nil} | 21 | %define cvs %{nil} |
22 | %define release 1 | 22 | %define release 1 |
23 | %else | 23 | %else |
24 | %define version 3.8.1p1 | 24 | %define version 3.9p1 |
25 | %define cvs cvs20011009 | 25 | %define cvs cvs20011009 |
26 | %define release 0r1 | 26 | %define release 0r1 |
27 | %endif | 27 | %endif |
@@ -60,7 +60,7 @@ Source0: see-above:/.../openssh-%{version}.tar.gz | |||
60 | %if %{use_stable} | 60 | %if %{use_stable} |
61 | Source1: see-above:/.../openssh-%{version}.tar.gz.sig | 61 | Source1: see-above:/.../openssh-%{version}.tar.gz.sig |
62 | %endif | 62 | %endif |
63 | Source2: http://www.ntrnet.net/~jmknoble/software/%{xsa}/%{askpass}.tar.gz | 63 | Source2: http://www.jmknoble.net/software/%{xsa}/%{askpass}.tar.gz |
64 | Source3: http://www.openssh.com/faq.html | 64 | Source3: http://www.openssh.com/faq.html |
65 | 65 | ||
66 | %Package server | 66 | %Package server |
@@ -80,7 +80,7 @@ Summary(pt_BR) : Servidor do protocolo Secure Shell OpenSSH (sshd). | |||
80 | %Package askpass | 80 | %Package askpass |
81 | Group : System/Network | 81 | Group : System/Network |
82 | Requires : openssh = %{version} | 82 | Requires : openssh = %{version} |
83 | URL : http://www.ntrnet.net/~jmknoble/software/x11-ssh-askpass/ | 83 | URL : http://www.jmknoble.net/software/x11-ssh-askpass/ |
84 | Obsoletes : ssh-extras | 84 | Obsoletes : ssh-extras |
85 | 85 | ||
86 | Summary : OpenSSH X11 pass-phrase dialog. | 86 | Summary : OpenSSH X11 pass-phrase dialog. |
@@ -363,4 +363,4 @@ fi | |||
363 | * Mon Jan 01 1998 ... | 363 | * Mon Jan 01 1998 ... |
364 | Template Version: 1.31 | 364 | Template Version: 1.31 |
365 | 365 | ||
366 | $Id: openssh.spec,v 1.49 2004/03/21 22:40:04 djm Exp $ | 366 | $Id: openssh.spec,v 1.51 2004/08/17 12:49:12 djm Exp $ |
diff --git a/contrib/cygwin/README b/contrib/cygwin/README index fc0a2f69b..5a9b1ce0c 100644 --- a/contrib/cygwin/README +++ b/contrib/cygwin/README | |||
@@ -212,8 +212,8 @@ in the Cygwin binary distribution, install like this: | |||
212 | cd /tmp/cygwin-ssh | 212 | cd /tmp/cygwin-ssh |
213 | find * \! -type d | tar cvjfT my-openssh.tar.bz2 - | 213 | find * \! -type d | tar cvjfT my-openssh.tar.bz2 - |
214 | 214 | ||
215 | You must have installed the zlib and openssl-devel packages to be able to | 215 | You must have installed the zlib, the openssl-devel and the minires-devel |
216 | build OpenSSH! | 216 | packages to be able to build OpenSSH! |
217 | 217 | ||
218 | Please send requests, error reports etc. to cygwin@cygwin.com. | 218 | Please send requests, error reports etc. to cygwin@cygwin.com. |
219 | 219 | ||
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index b7470092b..f8a91f2c2 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec | |||
@@ -1,4 +1,4 @@ | |||
1 | %define ver 3.8.1p1 | 1 | %define ver 3.9p1 |
2 | %define rel 1 | 2 | %define rel 1 |
3 | 3 | ||
4 | # OpenSSH privilege separation requires a user & group ID | 4 | # OpenSSH privilege separation requires a user & group ID |
@@ -74,7 +74,7 @@ Release: %{rel} | |||
74 | %endif | 74 | %endif |
75 | URL: http://www.openssh.com/portable.html | 75 | URL: http://www.openssh.com/portable.html |
76 | Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz | 76 | Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz |
77 | Source1: http://www.pobox.com/~jmknoble/software/x11-ssh-askpass/x11-ssh-askpass-%{aversion}.tar.gz | 77 | Source1: http://www.jmknoble.net/software/x11-ssh-askpass/x11-ssh-askpass-%{aversion}.tar.gz |
78 | License: BSD | 78 | License: BSD |
79 | Group: Applications/Internet | 79 | Group: Applications/Internet |
80 | BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot | 80 | BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot |
diff --git a/contrib/redhat/sshd.pam b/contrib/redhat/sshd.pam index 24f3b4651..e48607766 100644 --- a/contrib/redhat/sshd.pam +++ b/contrib/redhat/sshd.pam | |||
@@ -4,5 +4,3 @@ auth required pam_nologin.so | |||
4 | account required pam_stack.so service=system-auth | 4 | account required pam_stack.so service=system-auth |
5 | password required pam_stack.so service=system-auth | 5 | password required pam_stack.so service=system-auth |
6 | session required pam_stack.so service=system-auth | 6 | session required pam_stack.so service=system-auth |
7 | session required pam_limits.so | ||
8 | session optional pam_console.so | ||
diff --git a/contrib/solaris/README b/contrib/solaris/README index eb4c590f4..fefdd4b53 100755 --- a/contrib/solaris/README +++ b/contrib/solaris/README | |||
@@ -12,8 +12,14 @@ Directions: | |||
12 | 12 | ||
13 | 1. make -F Makefile.in distprep (Only if you are getting from the CVS tree) | 13 | 1. make -F Makefile.in distprep (Only if you are getting from the CVS tree) |
14 | 2. ./configure --with-pam [..any other options you want..] | 14 | 2. ./configure --with-pam [..any other options you want..] |
15 | 3. look at the top of contrib/solaris/buildpkg.sh for the configurable options. | 15 | 3. look at the top of buildpkg.sh for the configurable options and put |
16 | 4. ./contrib/solaris/buildpkg.sh | 16 | any changes you want in openssh-config.local. Additional customizations |
17 | can be done to the build process by creating one or more of the following | ||
18 | scripts that will be sourced by buildpkg.sh. | ||
19 | pkg_post_make_install_fixes.sh pkg-post-prototype-edit.sh | ||
20 | pkg-preinstall.local pkg-postinstall.local pkg-preremove.local | ||
21 | pkg-postremove.local pkg-request.local | ||
22 | 4. Run "make package" | ||
17 | 23 | ||
18 | If all goes well you should have a solaris package ready to be installed. | 24 | If all goes well you should have a solaris package ready to be installed. |
19 | 25 | ||
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec index 2b43d0368..3f4a0189b 100644 --- a/contrib/suse/openssh.spec +++ b/contrib/suse/openssh.spec | |||
@@ -1,6 +1,6 @@ | |||
1 | Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation | 1 | Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation |
2 | Name: openssh | 2 | Name: openssh |
3 | Version: 3.8.1p1 | 3 | Version: 3.9p1 |
4 | URL: http://www.openssh.com/ | 4 | URL: http://www.openssh.com/ |
5 | Release: 1 | 5 | Release: 1 |
6 | Source0: openssh-%{version}.tar.gz | 6 | Source0: openssh-%{version}.tar.gz |
diff --git a/debian/changelog b/debian/changelog index 787d2dd0f..42d833e39 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -1,5 +1,6 @@ | |||
1 | openssh (1:3.8.1p1-15) UNRELEASED; urgency=low | 1 | openssh (1:3.9p1-1) UNRELEASED; urgency=low |
2 | 2 | ||
3 | * New upstream release. | ||
3 | * Build ssh in binary-indep, not binary-arch (thanks, LaMont Jones). | 4 | * Build ssh in binary-indep, not binary-arch (thanks, LaMont Jones). |
4 | 5 | ||
5 | -- Colin Watson <cjwatson@debian.org> Wed, 1 Dec 2004 16:23:23 +0000 | 6 | -- Colin Watson <cjwatson@debian.org> Wed, 1 Dec 2004 16:23:23 +0000 |
@@ -25,7 +25,7 @@ | |||
25 | #ifndef _DEFINES_H | 25 | #ifndef _DEFINES_H |
26 | #define _DEFINES_H | 26 | #define _DEFINES_H |
27 | 27 | ||
28 | /* $Id: defines.h,v 1.115 2004/04/14 07:24:30 dtucker Exp $ */ | 28 | /* $Id: defines.h,v 1.117 2004/06/22 03:27:16 dtucker Exp $ */ |
29 | 29 | ||
30 | 30 | ||
31 | /* Constants */ | 31 | /* Constants */ |
@@ -424,6 +424,10 @@ struct winsize { | |||
424 | # define __attribute__(x) | 424 | # define __attribute__(x) |
425 | #endif /* !defined(__GNUC__) || (__GNUC__ < 2) */ | 425 | #endif /* !defined(__GNUC__) || (__GNUC__ < 2) */ |
426 | 426 | ||
427 | #ifndef __dead | ||
428 | # define __dead __attribute__((noreturn)) | ||
429 | #endif | ||
430 | |||
427 | /* *-*-nto-qnx doesn't define this macro in the system headers */ | 431 | /* *-*-nto-qnx doesn't define this macro in the system headers */ |
428 | #ifdef MISSING_HOWMANY | 432 | #ifdef MISSING_HOWMANY |
429 | # define howmany(x,y) (((x)+((y)-1))/(y)) | 433 | # define howmany(x,y) (((x)+((y)-1))/(y)) |
@@ -462,6 +466,9 @@ struct winsize { | |||
462 | (struct cmsghdr *)NULL) | 466 | (struct cmsghdr *)NULL) |
463 | #endif /* CMSG_FIRSTHDR */ | 467 | #endif /* CMSG_FIRSTHDR */ |
464 | 468 | ||
469 | #ifndef offsetof | ||
470 | # define offsetof(type, member) ((size_t) &((type *)0)->member) | ||
471 | #endif | ||
465 | 472 | ||
466 | /* Function replacement / compatibility hacks */ | 473 | /* Function replacement / compatibility hacks */ |
467 | 474 | ||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: dh.c,v 1.29 2004/02/27 22:49:27 dtucker Exp $"); | 26 | RCSID("$OpenBSD: dh.c,v 1.31 2004/08/04 10:37:52 djm Exp $"); |
27 | 27 | ||
28 | #include "xmalloc.h" | 28 | #include "xmalloc.h" |
29 | 29 | ||
@@ -115,8 +115,9 @@ choose_dh(int min, int wantbits, int max) | |||
115 | 115 | ||
116 | if ((f = fopen(_PATH_DH_MODULI, "r")) == NULL && | 116 | if ((f = fopen(_PATH_DH_MODULI, "r")) == NULL && |
117 | (f = fopen(_PATH_DH_PRIMES, "r")) == NULL) { | 117 | (f = fopen(_PATH_DH_PRIMES, "r")) == NULL) { |
118 | logit("WARNING: %s does not exist, using old modulus", _PATH_DH_MODULI); | 118 | logit("WARNING: %s does not exist, using fixed modulus", |
119 | return (dh_new_group1()); | 119 | _PATH_DH_MODULI); |
120 | return (dh_new_group14()); | ||
120 | } | 121 | } |
121 | 122 | ||
122 | linenum = 0; | 123 | linenum = 0; |
@@ -144,7 +145,7 @@ choose_dh(int min, int wantbits, int max) | |||
144 | if (bestcount == 0) { | 145 | if (bestcount == 0) { |
145 | fclose(f); | 146 | fclose(f); |
146 | logit("WARNING: no suitable primes in %s", _PATH_DH_PRIMES); | 147 | logit("WARNING: no suitable primes in %s", _PATH_DH_PRIMES); |
147 | return (NULL); | 148 | return (dh_new_group14()); |
148 | } | 149 | } |
149 | 150 | ||
150 | linenum = 0; | 151 | linenum = 0; |
@@ -169,7 +170,7 @@ choose_dh(int min, int wantbits, int max) | |||
169 | return (dh_new_group(dhg.g, dhg.p)); | 170 | return (dh_new_group(dhg.g, dhg.p)); |
170 | } | 171 | } |
171 | 172 | ||
172 | /* diffie-hellman-group1-sha1 */ | 173 | /* diffie-hellman-groupN-sha1 */ |
173 | 174 | ||
174 | int | 175 | int |
175 | dh_pub_is_valid(DH *dh, BIGNUM *dh_pub) | 176 | dh_pub_is_valid(DH *dh, BIGNUM *dh_pub) |
@@ -272,6 +273,25 @@ dh_new_group1(void) | |||
272 | return (dh_new_group_asc(gen, group1)); | 273 | return (dh_new_group_asc(gen, group1)); |
273 | } | 274 | } |
274 | 275 | ||
276 | DH * | ||
277 | dh_new_group14(void) | ||
278 | { | ||
279 | static char *gen = "2", *group14 = | ||
280 | "FFFFFFFF" "FFFFFFFF" "C90FDAA2" "2168C234" "C4C6628B" "80DC1CD1" | ||
281 | "29024E08" "8A67CC74" "020BBEA6" "3B139B22" "514A0879" "8E3404DD" | ||
282 | "EF9519B3" "CD3A431B" "302B0A6D" "F25F1437" "4FE1356D" "6D51C245" | ||
283 | "E485B576" "625E7EC6" "F44C42E9" "A637ED6B" "0BFF5CB6" "F406B7ED" | ||
284 | "EE386BFB" "5A899FA5" "AE9F2411" "7C4B1FE6" "49286651" "ECE45B3D" | ||
285 | "C2007CB8" "A163BF05" "98DA4836" "1C55D39A" "69163FA8" "FD24CF5F" | ||
286 | "83655D23" "DCA3AD96" "1C62F356" "208552BB" "9ED52907" "7096966D" | ||
287 | "670C354E" "4ABC9804" "F1746C08" "CA18217C" "32905E46" "2E36CE3B" | ||
288 | "E39E772C" "180E8603" "9B2783A2" "EC07A28F" "B5C55DF0" "6F4C52C9" | ||
289 | "DE2BCBF6" "95581718" "3995497C" "EA956AE5" "15D22618" "98FA0510" | ||
290 | "15728E5A" "8AACAA68" "FFFFFFFF" "FFFFFFFF"; | ||
291 | |||
292 | return (dh_new_group_asc(gen, group14)); | ||
293 | } | ||
294 | |||
275 | /* | 295 | /* |
276 | * Estimates the group order for a Diffie-Hellman group that has an | 296 | * Estimates the group order for a Diffie-Hellman group that has an |
277 | * attack complexity approximately the same as O(2**bits). Estimate | 297 | * attack complexity approximately the same as O(2**bits). Estimate |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: dh.h,v 1.7 2001/06/26 17:27:23 markus Exp $ */ | 1 | /* $OpenBSD: dh.h,v 1.8 2004/06/13 12:53:24 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Niels Provos. All rights reserved. | 4 | * Copyright (c) 2000 Niels Provos. All rights reserved. |
@@ -36,6 +36,7 @@ DH *choose_dh(int, int, int); | |||
36 | DH *dh_new_group_asc(const char *, const char *); | 36 | DH *dh_new_group_asc(const char *, const char *); |
37 | DH *dh_new_group(BIGNUM *, BIGNUM *); | 37 | DH *dh_new_group(BIGNUM *, BIGNUM *); |
38 | DH *dh_new_group1(void); | 38 | DH *dh_new_group1(void); |
39 | DH *dh_new_group14(void); | ||
39 | 40 | ||
40 | void dh_gen_key(DH *, int); | 41 | void dh_gen_key(DH *, int); |
41 | int dh_pub_is_valid(DH *, BIGNUM *); | 42 | int dh_pub_is_valid(DH *, BIGNUM *); |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: dns.c,v 1.9 2003/11/21 11:57:03 djm Exp $ */ | 1 | /* $OpenBSD: dns.c,v 1.10 2004/06/21 17:36:31 avsm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2003 Wesley Griffin. All rights reserved. | 4 | * Copyright (c) 2003 Wesley Griffin. All rights reserved. |
@@ -43,7 +43,7 @@ | |||
43 | #include "uuencode.h" | 43 | #include "uuencode.h" |
44 | 44 | ||
45 | extern char *__progname; | 45 | extern char *__progname; |
46 | RCSID("$OpenBSD: dns.c,v 1.9 2003/11/21 11:57:03 djm Exp $"); | 46 | RCSID("$OpenBSD: dns.c,v 1.10 2004/06/21 17:36:31 avsm Exp $"); |
47 | 47 | ||
48 | #ifndef LWRES | 48 | #ifndef LWRES |
49 | static const char *errset_text[] = { | 49 | static const char *errset_text[] = { |
@@ -56,9 +56,9 @@ static const char *errset_text[] = { | |||
56 | }; | 56 | }; |
57 | 57 | ||
58 | static const char * | 58 | static const char * |
59 | dns_result_totext(unsigned int error) | 59 | dns_result_totext(unsigned int res) |
60 | { | 60 | { |
61 | switch (error) { | 61 | switch (res) { |
62 | case ERRSET_SUCCESS: | 62 | case ERRSET_SUCCESS: |
63 | return errset_text[ERRSET_SUCCESS]; | 63 | return errset_text[ERRSET_SUCCESS]; |
64 | case ERRSET_NOMEMORY: | 64 | case ERRSET_NOMEMORY: |
diff --git a/envpass.sh b/envpass.sh new file mode 100644 index 000000000..67044d421 --- /dev/null +++ b/envpass.sh | |||
@@ -0,0 +1,44 @@ | |||
1 | # $OpenBSD: envpass.sh,v 1.1 2004/04/27 09:47:30 djm Exp $ | ||
2 | # Placed in the Public Domain. | ||
3 | |||
4 | tid="environment passing" | ||
5 | |||
6 | # NB accepted env vars are in test-exec.sh (_XXX_TEST_* and _XXX_TEST) | ||
7 | |||
8 | trace "pass env, don't accept" | ||
9 | verbose "test $tid: pass env, don't accept" | ||
10 | _TEST_ENV=blah ${SSH} -oSendEnv="*" -F $OBJ/ssh_proxy otherhost \ | ||
11 | '[ -z "$_TEST_ENV" ]' | ||
12 | r=$? | ||
13 | if [ $r -ne 0 ]; then | ||
14 | fail "environment found" | ||
15 | fi | ||
16 | |||
17 | trace "don't pass env, accept" | ||
18 | verbose "test $tid: don't pass env, accept" | ||
19 | ${SSH} -F $OBJ/ssh_proxy otherhost \ | ||
20 | '[ -z "$_XXX_TEST_A" -a -z "$_XXX_TEST_B" ]' | ||
21 | r=$? | ||
22 | if [ $r -ne 0 ]; then | ||
23 | fail "environment found" | ||
24 | fi | ||
25 | |||
26 | trace "pass single env, accept single env" | ||
27 | verbose "test $tid: pass single env, accept single env" | ||
28 | _XXX_TEST=blah ${SSH} -oSendEnv="_XXX_TEST" -F $OBJ/ssh_proxy otherhost \ | ||
29 | '[ "x$_XXX_TEST" = "xblah" ]' | ||
30 | r=$? | ||
31 | if [ $r -ne 0 ]; then | ||
32 | fail "environment not found" | ||
33 | fi | ||
34 | |||
35 | trace "pass multiple env, accept multiple env" | ||
36 | verbose "test $tid: pass multiple env, accept multiple env" | ||
37 | _XXX_TEST_A=1 _XXX_TEST_B=2 ${SSH} -oSendEnv="_XXX_TEST_*" \ | ||
38 | -F $OBJ/ssh_proxy otherhost \ | ||
39 | '[ "x$_XXX_TEST_A" = "x1" -a "x$_XXX_TEST_B" = "x2" ]' | ||
40 | r=$? | ||
41 | if [ $r -ne 0 ]; then | ||
42 | fail "environment not found" | ||
43 | fi | ||
44 | |||
diff --git a/gss-serv-krb5.c b/gss-serv-krb5.c index 4e3598ead..91d87f798 100644 --- a/gss-serv-krb5.c +++ b/gss-serv-krb5.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: gss-serv-krb5.c,v 1.2 2003/11/21 11:57:03 djm Exp $ */ | 1 | /* $OpenBSD: gss-serv-krb5.c,v 1.3 2004/07/21 10:36:23 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. | 4 | * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. |
@@ -53,7 +53,7 @@ static krb5_context krb_context = NULL; | |||
53 | /* Initialise the krb5 library, for the stuff that GSSAPI won't do */ | 53 | /* Initialise the krb5 library, for the stuff that GSSAPI won't do */ |
54 | 54 | ||
55 | static int | 55 | static int |
56 | ssh_gssapi_krb5_init() | 56 | ssh_gssapi_krb5_init(void) |
57 | { | 57 | { |
58 | krb5_error_code problem; | 58 | krb5_error_code problem; |
59 | 59 | ||
@@ -134,11 +134,15 @@ ssh_gssapi_krb5_storecreds(ssh_gssapi_client *client) | |||
134 | { | 134 | { |
135 | int tmpfd; | 135 | int tmpfd; |
136 | char ccname[40]; | 136 | char ccname[40]; |
137 | mode_t old_umask; | ||
137 | 138 | ||
138 | snprintf(ccname, sizeof(ccname), | 139 | snprintf(ccname, sizeof(ccname), |
139 | "FILE:/tmp/krb5cc_%d_XXXXXX", geteuid()); | 140 | "FILE:/tmp/krb5cc_%d_XXXXXX", geteuid()); |
140 | 141 | ||
141 | if ((tmpfd = mkstemp(ccname + strlen("FILE:"))) == -1) { | 142 | old_umask = umask(0177); |
143 | tmpfd = mkstemp(ccname + strlen("FILE:")); | ||
144 | umask(old_umask); | ||
145 | if (tmpfd == -1) { | ||
142 | logit("mkstemp(): %.100s", strerror(errno)); | 146 | logit("mkstemp(): %.100s", strerror(errno)); |
143 | problem = errno; | 147 | problem = errno; |
144 | return; | 148 | return; |
diff --git a/includes.h b/includes.h index ca943c7e6..3a6b4c32b 100644 --- a/includes.h +++ b/includes.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: includes.h,v 1.17 2002/01/26 16:44:22 stevesk Exp $ */ | 1 | /* $OpenBSD: includes.h,v 1.18 2004/06/13 15:03:02 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -33,6 +33,7 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } | |||
33 | #include <grp.h> | 33 | #include <grp.h> |
34 | #include <time.h> | 34 | #include <time.h> |
35 | #include <dirent.h> | 35 | #include <dirent.h> |
36 | #include <stddef.h> | ||
36 | 37 | ||
37 | #ifdef HAVE_LIMITS_H | 38 | #ifdef HAVE_LIMITS_H |
38 | # include <limits.h> /* For PATH_MAX */ | 39 | # include <limits.h> /* For PATH_MAX */ |
@@ -180,6 +181,16 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } | |||
180 | # include <kafs.h> | 181 | # include <kafs.h> |
181 | #endif | 182 | #endif |
182 | 183 | ||
184 | /* | ||
185 | * On HP-UX 11.11, shadow.h and prot.h provide conflicting declarations | ||
186 | * of getspnam when _INCLUDE__STDC__ is defined, so we unset it here. | ||
187 | */ | ||
188 | #ifdef __hpux | ||
189 | # ifdef _INCLUDE__STDC__ | ||
190 | # undef _INCLUDE__STDC__ | ||
191 | # endif | ||
192 | #endif | ||
193 | |||
183 | #include <openssl/opensslv.h> /* For OPENSSL_VERSION_NUMBER */ | 194 | #include <openssl/opensslv.h> /* For OPENSSL_VERSION_NUMBER */ |
184 | 195 | ||
185 | #include "defines.h" | 196 | #include "defines.h" |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: kex.c,v 1.56 2003/11/21 11:57:03 djm Exp $"); | 26 | RCSID("$OpenBSD: kex.c,v 1.60 2004/06/21 17:36:31 avsm Exp $"); |
27 | 27 | ||
28 | #include <openssl/crypto.h> | 28 | #include <openssl/crypto.h> |
29 | 29 | ||
@@ -148,7 +148,7 @@ kex_finish(Kex *kex) | |||
148 | void | 148 | void |
149 | kex_send_kexinit(Kex *kex) | 149 | kex_send_kexinit(Kex *kex) |
150 | { | 150 | { |
151 | u_int32_t rand = 0; | 151 | u_int32_t rnd = 0; |
152 | u_char *cookie; | 152 | u_char *cookie; |
153 | int i; | 153 | int i; |
154 | 154 | ||
@@ -168,9 +168,9 @@ kex_send_kexinit(Kex *kex) | |||
168 | cookie = buffer_ptr(&kex->my); | 168 | cookie = buffer_ptr(&kex->my); |
169 | for (i = 0; i < KEX_COOKIE_LEN; i++) { | 169 | for (i = 0; i < KEX_COOKIE_LEN; i++) { |
170 | if (i % 4 == 0) | 170 | if (i % 4 == 0) |
171 | rand = arc4random(); | 171 | rnd = arc4random(); |
172 | cookie[i] = rand; | 172 | cookie[i] = rnd; |
173 | rand >>= 8; | 173 | rnd >>= 8; |
174 | } | 174 | } |
175 | packet_start(SSH2_MSG_KEXINIT); | 175 | packet_start(SSH2_MSG_KEXINIT); |
176 | packet_put_raw(buffer_ptr(&kex->my), buffer_len(&kex->my)); | 176 | packet_put_raw(buffer_ptr(&kex->my), buffer_len(&kex->my)); |
@@ -293,6 +293,8 @@ choose_kex(Kex *k, char *client, char *server) | |||
293 | fatal("no kex alg"); | 293 | fatal("no kex alg"); |
294 | if (strcmp(k->name, KEX_DH1) == 0) { | 294 | if (strcmp(k->name, KEX_DH1) == 0) { |
295 | k->kex_type = KEX_DH_GRP1_SHA1; | 295 | k->kex_type = KEX_DH_GRP1_SHA1; |
296 | } else if (strcmp(k->name, KEX_DH14) == 0) { | ||
297 | k->kex_type = KEX_DH_GRP14_SHA1; | ||
296 | } else if (strcmp(k->name, KEX_DHGEX) == 0) { | 298 | } else if (strcmp(k->name, KEX_DHGEX) == 0) { |
297 | k->kex_type = KEX_DH_GEX_SHA1; | 299 | k->kex_type = KEX_DH_GEX_SHA1; |
298 | } else | 300 | } else |
@@ -479,6 +481,39 @@ kex_get_newkeys(int mode) | |||
479 | return ret; | 481 | return ret; |
480 | } | 482 | } |
481 | 483 | ||
484 | void | ||
485 | derive_ssh1_session_id(BIGNUM *host_modulus, BIGNUM *server_modulus, | ||
486 | u_int8_t cookie[8], u_int8_t id[16]) | ||
487 | { | ||
488 | const EVP_MD *evp_md = EVP_md5(); | ||
489 | EVP_MD_CTX md; | ||
490 | u_int8_t nbuf[2048], obuf[EVP_MAX_MD_SIZE]; | ||
491 | int len; | ||
492 | |||
493 | EVP_DigestInit(&md, evp_md); | ||
494 | |||
495 | len = BN_num_bytes(host_modulus); | ||
496 | if (len < (512 / 8) || len > sizeof(nbuf)) | ||
497 | fatal("%s: bad host modulus (len %d)", __func__, len); | ||
498 | BN_bn2bin(host_modulus, nbuf); | ||
499 | EVP_DigestUpdate(&md, nbuf, len); | ||
500 | |||
501 | len = BN_num_bytes(server_modulus); | ||
502 | if (len < (512 / 8) || len > sizeof(nbuf)) | ||
503 | fatal("%s: bad server modulus (len %d)", __func__, len); | ||
504 | BN_bn2bin(server_modulus, nbuf); | ||
505 | EVP_DigestUpdate(&md, nbuf, len); | ||
506 | |||
507 | EVP_DigestUpdate(&md, cookie, 8); | ||
508 | |||
509 | EVP_DigestFinal(&md, obuf, NULL); | ||
510 | memcpy(id, obuf, 16); | ||
511 | |||
512 | memset(nbuf, 0, sizeof(nbuf)); | ||
513 | memset(obuf, 0, sizeof(obuf)); | ||
514 | memset(&md, 0, sizeof(md)); | ||
515 | } | ||
516 | |||
482 | #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH) | 517 | #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH) |
483 | void | 518 | void |
484 | dump_digest(char *msg, u_char *digest, int len) | 519 | dump_digest(char *msg, u_char *digest, int len) |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kex.h,v 1.33 2003/02/16 17:09:57 markus Exp $ */ | 1 | /* $OpenBSD: kex.h,v 1.35 2004/06/13 12:53:24 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
@@ -32,6 +32,7 @@ | |||
32 | #include "key.h" | 32 | #include "key.h" |
33 | 33 | ||
34 | #define KEX_DH1 "diffie-hellman-group1-sha1" | 34 | #define KEX_DH1 "diffie-hellman-group1-sha1" |
35 | #define KEX_DH14 "diffie-hellman-group14-sha1" | ||
35 | #define KEX_DHGEX "diffie-hellman-group-exchange-sha1" | 36 | #define KEX_DHGEX "diffie-hellman-group-exchange-sha1" |
36 | 37 | ||
37 | enum kex_init_proposals { | 38 | enum kex_init_proposals { |
@@ -56,6 +57,7 @@ enum kex_modes { | |||
56 | 57 | ||
57 | enum kex_exchange { | 58 | enum kex_exchange { |
58 | KEX_DH_GRP1_SHA1, | 59 | KEX_DH_GRP1_SHA1, |
60 | KEX_DH_GRP14_SHA1, | ||
59 | KEX_DH_GEX_SHA1, | 61 | KEX_DH_GEX_SHA1, |
60 | KEX_MAX | 62 | KEX_MAX |
61 | }; | 63 | }; |
@@ -137,6 +139,9 @@ u_char * | |||
137 | kexgex_hash(char *, char *, char *, int, char *, int, u_char *, int, | 139 | kexgex_hash(char *, char *, char *, int, char *, int, u_char *, int, |
138 | int, int, int, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *); | 140 | int, int, int, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *); |
139 | 141 | ||
142 | void | ||
143 | derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]); | ||
144 | |||
140 | #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH) | 145 | #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH) |
141 | void dump_digest(char *, u_char *, int); | 146 | void dump_digest(char *, u_char *, int); |
142 | #endif | 147 | #endif |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: kexdhc.c,v 1.1 2003/02/16 17:09:57 markus Exp $"); | 26 | RCSID("$OpenBSD: kexdhc.c,v 1.2 2004/06/13 12:53:24 djm Exp $"); |
27 | 27 | ||
28 | #include "xmalloc.h" | 28 | #include "xmalloc.h" |
29 | #include "key.h" | 29 | #include "key.h" |
@@ -44,7 +44,16 @@ kexdh_client(Kex *kex) | |||
44 | u_int klen, kout, slen, sbloblen; | 44 | u_int klen, kout, slen, sbloblen; |
45 | 45 | ||
46 | /* generate and send 'e', client DH public key */ | 46 | /* generate and send 'e', client DH public key */ |
47 | dh = dh_new_group1(); | 47 | switch (kex->kex_type) { |
48 | case KEX_DH_GRP1_SHA1: | ||
49 | dh = dh_new_group1(); | ||
50 | break; | ||
51 | case KEX_DH_GRP14_SHA1: | ||
52 | dh = dh_new_group14(); | ||
53 | break; | ||
54 | default: | ||
55 | fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); | ||
56 | } | ||
48 | dh_gen_key(dh, kex->we_need * 8); | 57 | dh_gen_key(dh, kex->we_need * 8); |
49 | packet_start(SSH2_MSG_KEXDH_INIT); | 58 | packet_start(SSH2_MSG_KEXDH_INIT); |
50 | packet_put_bignum2(dh->pub_key); | 59 | packet_put_bignum2(dh->pub_key); |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: kexdhs.c,v 1.1 2003/02/16 17:09:57 markus Exp $"); | 26 | RCSID("$OpenBSD: kexdhs.c,v 1.2 2004/06/13 12:53:24 djm Exp $"); |
27 | 27 | ||
28 | #include "xmalloc.h" | 28 | #include "xmalloc.h" |
29 | #include "key.h" | 29 | #include "key.h" |
@@ -45,7 +45,16 @@ kexdh_server(Kex *kex) | |||
45 | u_int slen; | 45 | u_int slen; |
46 | 46 | ||
47 | /* generate server DH public key */ | 47 | /* generate server DH public key */ |
48 | dh = dh_new_group1(); | 48 | switch (kex->kex_type) { |
49 | case KEX_DH_GRP1_SHA1: | ||
50 | dh = dh_new_group1(); | ||
51 | break; | ||
52 | case KEX_DH_GRP14_SHA1: | ||
53 | dh = dh_new_group14(); | ||
54 | break; | ||
55 | default: | ||
56 | fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); | ||
57 | } | ||
49 | dh_gen_key(dh, kex->we_need * 8); | 58 | dh_gen_key(dh, kex->we_need * 8); |
50 | 59 | ||
51 | debug("expecting SSH2_MSG_KEXDH_INIT"); | 60 | debug("expecting SSH2_MSG_KEXDH_INIT"); |
@@ -32,7 +32,7 @@ | |||
32 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 32 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
33 | */ | 33 | */ |
34 | #include "includes.h" | 34 | #include "includes.h" |
35 | RCSID("$OpenBSD: key.c,v 1.55 2003/11/10 16:23:41 jakob Exp $"); | 35 | RCSID("$OpenBSD: key.c,v 1.56 2004/07/28 09:40:29 markus Exp $"); |
36 | 36 | ||
37 | #include <openssl/evp.h> | 37 | #include <openssl/evp.h> |
38 | 38 | ||
@@ -782,7 +782,7 @@ key_sign( | |||
782 | return ssh_rsa_sign(key, sigp, lenp, data, datalen); | 782 | return ssh_rsa_sign(key, sigp, lenp, data, datalen); |
783 | break; | 783 | break; |
784 | default: | 784 | default: |
785 | error("key_sign: illegal key type %d", key->type); | 785 | error("key_sign: invalid key type %d", key->type); |
786 | return -1; | 786 | return -1; |
787 | break; | 787 | break; |
788 | } | 788 | } |
@@ -809,7 +809,7 @@ key_verify( | |||
809 | return ssh_rsa_verify(key, signature, signaturelen, data, datalen); | 809 | return ssh_rsa_verify(key, signature, signaturelen, data, datalen); |
810 | break; | 810 | break; |
811 | default: | 811 | default: |
812 | error("key_verify: illegal key type %d", key->type); | 812 | error("key_verify: invalid key type %d", key->type); |
813 | return -1; | 813 | return -1; |
814 | break; | 814 | break; |
815 | } | 815 | } |
@@ -51,6 +51,9 @@ static char *argv0; | |||
51 | 51 | ||
52 | extern char *__progname; | 52 | extern char *__progname; |
53 | 53 | ||
54 | #define LOG_SYSLOG_VIS (VIS_CSTYLE|VIS_NL|VIS_TAB|VIS_OCTAL) | ||
55 | #define LOG_STDERR_VIS (VIS_SAFE|VIS_OCTAL) | ||
56 | |||
54 | /* textual representation of log-facilities/levels */ | 57 | /* textual representation of log-facilities/levels */ |
55 | 58 | ||
56 | static struct { | 59 | static struct { |
@@ -318,7 +321,8 @@ do_log(LogLevel level, const char *fmt, va_list args) | |||
318 | } else { | 321 | } else { |
319 | vsnprintf(msgbuf, sizeof(msgbuf), fmt, args); | 322 | vsnprintf(msgbuf, sizeof(msgbuf), fmt, args); |
320 | } | 323 | } |
321 | strnvis(fmtbuf, msgbuf, sizeof(fmtbuf), VIS_SAFE|VIS_OCTAL); | 324 | strnvis(fmtbuf, msgbuf, sizeof(fmtbuf), |
325 | log_on_stderr ? LOG_STDERR_VIS : LOG_SYSLOG_VIS); | ||
322 | if (log_on_stderr) { | 326 | if (log_on_stderr) { |
323 | snprintf(msgbuf, sizeof msgbuf, "%s\r\n", fmtbuf); | 327 | snprintf(msgbuf, sizeof msgbuf, "%s\r\n", fmtbuf); |
324 | write(STDERR_FILENO, msgbuf, strlen(msgbuf)); | 328 | write(STDERR_FILENO, msgbuf, strlen(msgbuf)); |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: log.h,v 1.10 2003/09/23 20:17:11 markus Exp $ */ | 1 | /* $OpenBSD: log.h,v 1.11 2004/06/21 22:02:58 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -54,7 +54,7 @@ void log_init(char *, LogLevel, SyslogFacility, int); | |||
54 | SyslogFacility log_facility_number(char *); | 54 | SyslogFacility log_facility_number(char *); |
55 | LogLevel log_level_number(char *); | 55 | LogLevel log_level_number(char *); |
56 | 56 | ||
57 | void fatal(const char *, ...) __attribute__((format(printf, 1, 2))); | 57 | void fatal(const char *, ...) __dead __attribute__((format(printf, 1, 2))); |
58 | void error(const char *, ...) __attribute__((format(printf, 1, 2))); | 58 | void error(const char *, ...) __attribute__((format(printf, 1, 2))); |
59 | void logit(const char *, ...) __attribute__((format(printf, 1, 2))); | 59 | void logit(const char *, ...) __attribute__((format(printf, 1, 2))); |
60 | void verbose(const char *, ...) __attribute__((format(printf, 1, 2))); | 60 | void verbose(const char *, ...) __attribute__((format(printf, 1, 2))); |
@@ -63,5 +63,5 @@ void debug2(const char *, ...) __attribute__((format(printf, 1, 2))); | |||
63 | void debug3(const char *, ...) __attribute__((format(printf, 1, 2))); | 63 | void debug3(const char *, ...) __attribute__((format(printf, 1, 2))); |
64 | 64 | ||
65 | void do_log(LogLevel, const char *, va_list); | 65 | void do_log(LogLevel, const char *, va_list); |
66 | void cleanup_exit(int); | 66 | void cleanup_exit(int) __dead; |
67 | #endif | 67 | #endif |
diff --git a/loginrec.c b/loginrec.c index b74d412e6..f07f65fce 100644 --- a/loginrec.c +++ b/loginrec.c | |||
@@ -158,7 +158,7 @@ | |||
158 | #include "log.h" | 158 | #include "log.h" |
159 | #include "atomicio.h" | 159 | #include "atomicio.h" |
160 | 160 | ||
161 | RCSID("$Id: loginrec.c,v 1.56 2004/04/08 06:16:06 dtucker Exp $"); | 161 | RCSID("$Id: loginrec.c,v 1.58 2004/08/15 09:12:52 djm Exp $"); |
162 | 162 | ||
163 | #ifdef HAVE_UTIL_H | 163 | #ifdef HAVE_UTIL_H |
164 | # include <util.h> | 164 | # include <util.h> |
@@ -435,6 +435,11 @@ login_write (struct logininfo *li) | |||
435 | #ifdef USE_WTMPX | 435 | #ifdef USE_WTMPX |
436 | wtmpx_write_entry(li); | 436 | wtmpx_write_entry(li); |
437 | #endif | 437 | #endif |
438 | #ifdef CUSTOM_SYS_AUTH_RECORD_LOGIN | ||
439 | if (li->type == LTYPE_LOGIN && | ||
440 | !sys_auth_record_login(li->username,li->hostname,li->line)) | ||
441 | logit("Writing login record failed for %s", li->username); | ||
442 | #endif | ||
438 | return 0; | 443 | return 0; |
439 | } | 444 | } |
440 | 445 | ||
@@ -813,8 +818,8 @@ utmp_write_direct(struct logininfo *li, struct utmp *ut) | |||
813 | endttyent(); | 818 | endttyent(); |
814 | 819 | ||
815 | if((struct ttyent *)0 == ty) { | 820 | if((struct ttyent *)0 == ty) { |
816 | logit("utmp_write_entry: tty not found"); | 821 | logit("%s: tty not found", __func__); |
817 | return(1); | 822 | return (0); |
818 | } | 823 | } |
819 | #else /* FIXME */ | 824 | #else /* FIXME */ |
820 | 825 | ||
@@ -823,7 +828,18 @@ utmp_write_direct(struct logininfo *li, struct utmp *ut) | |||
823 | #endif /* HAVE_GETTTYENT */ | 828 | #endif /* HAVE_GETTTYENT */ |
824 | 829 | ||
825 | if (tty > 0 && (fd = open(UTMP_FILE, O_RDWR|O_CREAT, 0644)) >= 0) { | 830 | if (tty > 0 && (fd = open(UTMP_FILE, O_RDWR|O_CREAT, 0644)) >= 0) { |
826 | (void)lseek(fd, (off_t)(tty * sizeof(struct utmp)), SEEK_SET); | 831 | off_t pos, ret; |
832 | |||
833 | pos = (off_t)tty * sizeof(struct utmp); | ||
834 | if ((ret = lseek(fd, pos, SEEK_SET)) == -1) { | ||
835 | logit("%s: llseek: %s", strerror(errno)); | ||
836 | return (0); | ||
837 | } | ||
838 | if (ret != pos) { | ||
839 | logit("%s: Couldn't seek to tty %s slot in %s", tty, | ||
840 | UTMP_FILE); | ||
841 | return (0); | ||
842 | } | ||
827 | /* | 843 | /* |
828 | * Prevent luser from zero'ing out ut_host. | 844 | * Prevent luser from zero'ing out ut_host. |
829 | * If the new ut_line is empty but the old one is not | 845 | * If the new ut_line is empty but the old one is not |
@@ -836,9 +852,17 @@ utmp_write_direct(struct logininfo *li, struct utmp *ut) | |||
836 | (void)memcpy(ut->ut_host, old_ut.ut_host, sizeof(ut->ut_host)); | 852 | (void)memcpy(ut->ut_host, old_ut.ut_host, sizeof(ut->ut_host)); |
837 | } | 853 | } |
838 | 854 | ||
839 | (void)lseek(fd, (off_t)(tty * sizeof(struct utmp)), SEEK_SET); | 855 | if ((ret = lseek(fd, pos, SEEK_SET)) == -1) { |
856 | logit("%s: llseek: %s", __func__, strerror(errno)); | ||
857 | return (0); | ||
858 | } | ||
859 | if (ret != pos) { | ||
860 | logit("%s: Couldn't seek to tty %s slot in %s", | ||
861 | __func__, tty, UTMP_FILE); | ||
862 | return (0); | ||
863 | } | ||
840 | if (atomicio(vwrite, fd, ut, sizeof(*ut)) != sizeof(*ut)) | 864 | if (atomicio(vwrite, fd, ut, sizeof(*ut)) != sizeof(*ut)) |
841 | logit("utmp_write_direct: error writing %s: %s", | 865 | logit("%s: error writing %s: %s", __func__, |
842 | UTMP_FILE, strerror(errno)); | 866 | UTMP_FILE, strerror(errno)); |
843 | 867 | ||
844 | (void)close(fd); | 868 | (void)close(fd); |
diff --git a/logintest.c b/logintest.c index 3f3997d10..95cce5a3a 100644 --- a/logintest.c +++ b/logintest.c | |||
@@ -43,13 +43,9 @@ | |||
43 | 43 | ||
44 | #include "loginrec.h" | 44 | #include "loginrec.h" |
45 | 45 | ||
46 | RCSID("$Id: logintest.c,v 1.10 2003/08/21 23:34:41 djm Exp $"); | 46 | RCSID("$Id: logintest.c,v 1.11 2004/07/17 04:07:42 dtucker Exp $"); |
47 | 47 | ||
48 | #ifdef HAVE___PROGNAME | ||
49 | extern char *__progname; | 48 | extern char *__progname; |
50 | #else | ||
51 | char *__progname; | ||
52 | #endif | ||
53 | 49 | ||
54 | #define PAUSE_BEFORE_LOGOUT 3 | 50 | #define PAUSE_BEFORE_LOGOUT 3 |
55 | 51 | ||
diff --git a/mdoc2man.awk b/mdoc2man.awk index 9135af07e..4e72cdc1c 100644 --- a/mdoc2man.awk +++ b/mdoc2man.awk | |||
@@ -32,6 +32,7 @@ BEGIN { | |||
32 | extopt=0 | 32 | extopt=0 |
33 | literal=0 | 33 | literal=0 |
34 | prenl=0 | 34 | prenl=0 |
35 | breakw=0 | ||
35 | line="" | 36 | line="" |
36 | } | 37 | } |
37 | 38 | ||
@@ -298,6 +299,13 @@ function add(str) { | |||
298 | w=nwords | 299 | w=nwords |
299 | } else if(match(words[w],"^El$")) { | 300 | } else if(match(words[w],"^El$")) { |
300 | optlist=oldoptlist | 301 | optlist=oldoptlist |
302 | } else if(match(words[w],"^Bk$")) { | ||
303 | if(match(words[w+1],"-words")) { | ||
304 | w++ | ||
305 | breakw=1 | ||
306 | } | ||
307 | } else if(match(words[w],"^Ek$")) { | ||
308 | breakw=0 | ||
301 | } else if(match(words[w],"^It$")&&optlist) { | 309 | } else if(match(words[w],"^It$")&&optlist) { |
302 | if(optlist==1) | 310 | if(optlist==1) |
303 | add(".IP \\(bu") | 311 | add(".IP \\(bu") |
@@ -306,7 +314,7 @@ function add(str) { | |||
306 | else if(optlist==3) { | 314 | else if(optlist==3) { |
307 | add(".TP") | 315 | add(".TP") |
308 | prenl++ | 316 | prenl++ |
309 | if(match(words[w+1],"^Pa|Ev$")) { | 317 | if(match(words[w+1],"^Pa$|^Ev$")) { |
310 | add(".B") | 318 | add(".B") |
311 | w++ | 319 | w++ |
312 | } | 320 | } |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: misc.c,v 1.23 2003/10/28 09:08:06 markus Exp $"); | 26 | RCSID("$OpenBSD: misc.c,v 1.25 2004/08/11 21:43:05 avsm Exp $"); |
27 | 27 | ||
28 | #include "misc.h" | 28 | #include "misc.h" |
29 | #include "log.h" | 29 | #include "log.h" |
@@ -46,7 +46,7 @@ chop(char *s) | |||
46 | } | 46 | } |
47 | 47 | ||
48 | /* set/unset filedescriptor to non-blocking */ | 48 | /* set/unset filedescriptor to non-blocking */ |
49 | void | 49 | int |
50 | set_nonblock(int fd) | 50 | set_nonblock(int fd) |
51 | { | 51 | { |
52 | int val; | 52 | int val; |
@@ -54,20 +54,23 @@ set_nonblock(int fd) | |||
54 | val = fcntl(fd, F_GETFL, 0); | 54 | val = fcntl(fd, F_GETFL, 0); |
55 | if (val < 0) { | 55 | if (val < 0) { |
56 | error("fcntl(%d, F_GETFL, 0): %s", fd, strerror(errno)); | 56 | error("fcntl(%d, F_GETFL, 0): %s", fd, strerror(errno)); |
57 | return; | 57 | return (-1); |
58 | } | 58 | } |
59 | if (val & O_NONBLOCK) { | 59 | if (val & O_NONBLOCK) { |
60 | debug2("fd %d is O_NONBLOCK", fd); | 60 | debug3("fd %d is O_NONBLOCK", fd); |
61 | return; | 61 | return (0); |
62 | } | 62 | } |
63 | debug2("fd %d setting O_NONBLOCK", fd); | 63 | debug2("fd %d setting O_NONBLOCK", fd); |
64 | val |= O_NONBLOCK; | 64 | val |= O_NONBLOCK; |
65 | if (fcntl(fd, F_SETFL, val) == -1) | 65 | if (fcntl(fd, F_SETFL, val) == -1) { |
66 | debug("fcntl(%d, F_SETFL, O_NONBLOCK): %s", | 66 | debug("fcntl(%d, F_SETFL, O_NONBLOCK): %s", fd, |
67 | fd, strerror(errno)); | 67 | strerror(errno)); |
68 | return (-1); | ||
69 | } | ||
70 | return (0); | ||
68 | } | 71 | } |
69 | 72 | ||
70 | void | 73 | int |
71 | unset_nonblock(int fd) | 74 | unset_nonblock(int fd) |
72 | { | 75 | { |
73 | int val; | 76 | int val; |
@@ -75,17 +78,20 @@ unset_nonblock(int fd) | |||
75 | val = fcntl(fd, F_GETFL, 0); | 78 | val = fcntl(fd, F_GETFL, 0); |
76 | if (val < 0) { | 79 | if (val < 0) { |
77 | error("fcntl(%d, F_GETFL, 0): %s", fd, strerror(errno)); | 80 | error("fcntl(%d, F_GETFL, 0): %s", fd, strerror(errno)); |
78 | return; | 81 | return (-1); |
79 | } | 82 | } |
80 | if (!(val & O_NONBLOCK)) { | 83 | if (!(val & O_NONBLOCK)) { |
81 | debug2("fd %d is not O_NONBLOCK", fd); | 84 | debug3("fd %d is not O_NONBLOCK", fd); |
82 | return; | 85 | return (0); |
83 | } | 86 | } |
84 | debug("fd %d clearing O_NONBLOCK", fd); | 87 | debug("fd %d clearing O_NONBLOCK", fd); |
85 | val &= ~O_NONBLOCK; | 88 | val &= ~O_NONBLOCK; |
86 | if (fcntl(fd, F_SETFL, val) == -1) | 89 | if (fcntl(fd, F_SETFL, val) == -1) { |
87 | debug("fcntl(%d, F_SETFL, O_NONBLOCK): %s", | 90 | debug("fcntl(%d, F_SETFL, ~O_NONBLOCK): %s", |
88 | fd, strerror(errno)); | 91 | fd, strerror(errno)); |
92 | return (-1); | ||
93 | } | ||
94 | return (0); | ||
89 | } | 95 | } |
90 | 96 | ||
91 | /* disable nagle on socket */ | 97 | /* disable nagle on socket */ |
@@ -308,7 +314,7 @@ addargs(arglist *args, char *fmt, ...) | |||
308 | { | 314 | { |
309 | va_list ap; | 315 | va_list ap; |
310 | char buf[1024]; | 316 | char buf[1024]; |
311 | int nalloc; | 317 | u_int nalloc; |
312 | 318 | ||
313 | va_start(ap, fmt); | 319 | va_start(ap, fmt); |
314 | vsnprintf(buf, sizeof(buf), fmt, ap); | 320 | vsnprintf(buf, sizeof(buf), fmt, ap); |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: misc.h,v 1.12 2002/03/19 10:49:35 markus Exp $ */ | 1 | /* $OpenBSD: misc.h,v 1.17 2004/08/11 21:43:05 avsm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -12,10 +12,12 @@ | |||
12 | * called by a name other than "ssh" or "Secure Shell". | 12 | * called by a name other than "ssh" or "Secure Shell". |
13 | */ | 13 | */ |
14 | 14 | ||
15 | /* misc.c */ | ||
16 | |||
15 | char *chop(char *); | 17 | char *chop(char *); |
16 | char *strdelim(char **); | 18 | char *strdelim(char **); |
17 | void set_nonblock(int); | 19 | int set_nonblock(int); |
18 | void unset_nonblock(int); | 20 | int unset_nonblock(int); |
19 | void set_nodelay(int); | 21 | void set_nodelay(int); |
20 | int a2port(const char *); | 22 | int a2port(const char *); |
21 | char *cleanhostname(char *); | 23 | char *cleanhostname(char *); |
@@ -27,7 +29,20 @@ struct passwd *pwcopy(struct passwd *); | |||
27 | typedef struct arglist arglist; | 29 | typedef struct arglist arglist; |
28 | struct arglist { | 30 | struct arglist { |
29 | char **list; | 31 | char **list; |
30 | int num; | 32 | u_int num; |
31 | int nalloc; | 33 | u_int nalloc; |
32 | }; | 34 | }; |
33 | void addargs(arglist *, char *, ...) __attribute__((format(printf, 2, 3))); | 35 | void addargs(arglist *, char *, ...) __attribute__((format(printf, 2, 3))); |
36 | |||
37 | /* tildexpand.c */ | ||
38 | |||
39 | char *tilde_expand_filename(const char *, uid_t); | ||
40 | |||
41 | /* readpass.c */ | ||
42 | |||
43 | #define RP_ECHO 0x0001 | ||
44 | #define RP_ALLOW_STDIN 0x0002 | ||
45 | #define RP_ALLOW_EOF 0x0004 | ||
46 | #define RP_USE_ASKPASS 0x0008 | ||
47 | |||
48 | char *read_passphrase(const char *, int); | ||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: moduli.c,v 1.5 2003/12/22 09:16:57 djm Exp $ */ | 1 | /* $OpenBSD: moduli.c,v 1.9 2004/07/11 17:48:47 deraadt Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright 1994 Phil Karn <karn@qualcomm.com> | 3 | * Copyright 1994 Phil Karn <karn@qualcomm.com> |
4 | * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com> | 4 | * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com> |
@@ -38,7 +38,6 @@ | |||
38 | */ | 38 | */ |
39 | 39 | ||
40 | #include "includes.h" | 40 | #include "includes.h" |
41 | #include "moduli.h" | ||
42 | #include "xmalloc.h" | 41 | #include "xmalloc.h" |
43 | #include "log.h" | 42 | #include "log.h" |
44 | 43 | ||
@@ -49,55 +48,68 @@ | |||
49 | */ | 48 | */ |
50 | 49 | ||
51 | /* need line long enough for largest moduli plus headers */ | 50 | /* need line long enough for largest moduli plus headers */ |
52 | #define QLINESIZE (100+8192) | 51 | #define QLINESIZE (100+8192) |
53 | 52 | ||
54 | /* Type: decimal. | 53 | /* Type: decimal. |
55 | * Specifies the internal structure of the prime modulus. | 54 | * Specifies the internal structure of the prime modulus. |
56 | */ | 55 | */ |
57 | #define QTYPE_UNKNOWN (0) | 56 | #define QTYPE_UNKNOWN (0) |
58 | #define QTYPE_UNSTRUCTURED (1) | 57 | #define QTYPE_UNSTRUCTURED (1) |
59 | #define QTYPE_SAFE (2) | 58 | #define QTYPE_SAFE (2) |
60 | #define QTYPE_SCHNOOR (3) | 59 | #define QTYPE_SCHNOOR (3) |
61 | #define QTYPE_SOPHIE_GERMAINE (4) | 60 | #define QTYPE_SOPHIE_GERMAIN (4) |
62 | #define QTYPE_STRONG (5) | 61 | #define QTYPE_STRONG (5) |
63 | 62 | ||
64 | /* Tests: decimal (bit field). | 63 | /* Tests: decimal (bit field). |
65 | * Specifies the methods used in checking for primality. | 64 | * Specifies the methods used in checking for primality. |
66 | * Usually, more than one test is used. | 65 | * Usually, more than one test is used. |
67 | */ | 66 | */ |
68 | #define QTEST_UNTESTED (0x00) | 67 | #define QTEST_UNTESTED (0x00) |
69 | #define QTEST_COMPOSITE (0x01) | 68 | #define QTEST_COMPOSITE (0x01) |
70 | #define QTEST_SIEVE (0x02) | 69 | #define QTEST_SIEVE (0x02) |
71 | #define QTEST_MILLER_RABIN (0x04) | 70 | #define QTEST_MILLER_RABIN (0x04) |
72 | #define QTEST_JACOBI (0x08) | 71 | #define QTEST_JACOBI (0x08) |
73 | #define QTEST_ELLIPTIC (0x10) | 72 | #define QTEST_ELLIPTIC (0x10) |
74 | 73 | ||
75 | /* | 74 | /* |
76 | * Size: decimal. | 75 | * Size: decimal. |
77 | * Specifies the number of the most significant bit (0 to M). | 76 | * Specifies the number of the most significant bit (0 to M). |
78 | * WARNING: internally, usually 1 to N. | 77 | * WARNING: internally, usually 1 to N. |
79 | */ | 78 | */ |
80 | #define QSIZE_MINIMUM (511) | 79 | #define QSIZE_MINIMUM (511) |
81 | 80 | ||
82 | /* | 81 | /* |
83 | * Prime sieving defines | 82 | * Prime sieving defines |
84 | */ | 83 | */ |
85 | 84 | ||
86 | /* Constant: assuming 8 bit bytes and 32 bit words */ | 85 | /* Constant: assuming 8 bit bytes and 32 bit words */ |
87 | #define SHIFT_BIT (3) | 86 | #define SHIFT_BIT (3) |
88 | #define SHIFT_BYTE (2) | 87 | #define SHIFT_BYTE (2) |
89 | #define SHIFT_WORD (SHIFT_BIT+SHIFT_BYTE) | 88 | #define SHIFT_WORD (SHIFT_BIT+SHIFT_BYTE) |
90 | #define SHIFT_MEGABYTE (20) | 89 | #define SHIFT_MEGABYTE (20) |
91 | #define SHIFT_MEGAWORD (SHIFT_MEGABYTE-SHIFT_BYTE) | 90 | #define SHIFT_MEGAWORD (SHIFT_MEGABYTE-SHIFT_BYTE) |
91 | |||
92 | /* | ||
93 | * Using virtual memory can cause thrashing. This should be the largest | ||
94 | * number that is supported without a large amount of disk activity -- | ||
95 | * that would increase the run time from hours to days or weeks! | ||
96 | */ | ||
97 | #define LARGE_MINIMUM (8UL) /* megabytes */ | ||
98 | |||
99 | /* | ||
100 | * Do not increase this number beyond the unsigned integer bit size. | ||
101 | * Due to a multiple of 4, it must be LESS than 128 (yielding 2**30 bits). | ||
102 | */ | ||
103 | #define LARGE_MAXIMUM (127UL) /* megabytes */ | ||
92 | 104 | ||
93 | /* | 105 | /* |
94 | * Constant: when used with 32-bit integers, the largest sieve prime | 106 | * Constant: when used with 32-bit integers, the largest sieve prime |
95 | * has to be less than 2**32. | 107 | * has to be less than 2**32. |
96 | */ | 108 | */ |
97 | #define SMALL_MAXIMUM (0xffffffffUL) | 109 | #define SMALL_MAXIMUM (0xffffffffUL) |
98 | 110 | ||
99 | /* Constant: can sieve all primes less than 2**32, as 65537**2 > 2**32-1. */ | 111 | /* Constant: can sieve all primes less than 2**32, as 65537**2 > 2**32-1. */ |
100 | #define TINY_NUMBER (1UL<<16) | 112 | #define TINY_NUMBER (1UL<<16) |
101 | 113 | ||
102 | /* Ensure enough bit space for testing 2*q. */ | 114 | /* Ensure enough bit space for testing 2*q. */ |
103 | #define TEST_MAXIMUM (1UL<<16) | 115 | #define TEST_MAXIMUM (1UL<<16) |
@@ -114,6 +126,9 @@ | |||
114 | * Prime testing defines | 126 | * Prime testing defines |
115 | */ | 127 | */ |
116 | 128 | ||
129 | /* Minimum number of primality tests to perform */ | ||
130 | #define TRIAL_MINIMUM (4) | ||
131 | |||
117 | /* | 132 | /* |
118 | * Sieving data (XXX - move to struct) | 133 | * Sieving data (XXX - move to struct) |
119 | */ | 134 | */ |
@@ -129,6 +144,8 @@ static u_int32_t *LargeSieve, largewords, largetries, largenumbers; | |||
129 | static u_int32_t largebits, largememory; /* megabytes */ | 144 | static u_int32_t largebits, largememory; /* megabytes */ |
130 | static BIGNUM *largebase; | 145 | static BIGNUM *largebase; |
131 | 146 | ||
147 | int gen_candidates(FILE *, int, int, BIGNUM *); | ||
148 | int prime_test(FILE *, FILE *, u_int32_t, u_int32_t); | ||
132 | 149 | ||
133 | /* | 150 | /* |
134 | * print moduli out in consistent form, | 151 | * print moduli out in consistent form, |
@@ -219,7 +236,7 @@ sieve_large(u_int32_t s) | |||
219 | } | 236 | } |
220 | 237 | ||
221 | /* | 238 | /* |
222 | * list candidates for Sophie-Germaine primes (where q = (p-1)/2) | 239 | * list candidates for Sophie-Germain primes (where q = (p-1)/2) |
223 | * to standard output. | 240 | * to standard output. |
224 | * The list is checked against small known primes (less than 2**30). | 241 | * The list is checked against small known primes (less than 2**30). |
225 | */ | 242 | */ |
@@ -235,6 +252,13 @@ gen_candidates(FILE *out, int memory, int power, BIGNUM *start) | |||
235 | 252 | ||
236 | largememory = memory; | 253 | largememory = memory; |
237 | 254 | ||
255 | if (memory != 0 && | ||
256 | (memory < LARGE_MINIMUM || memory > LARGE_MAXIMUM)) { | ||
257 | error("Invalid memory amount (min %ld, max %ld)", | ||
258 | LARGE_MINIMUM, LARGE_MAXIMUM); | ||
259 | return (-1); | ||
260 | } | ||
261 | |||
238 | /* | 262 | /* |
239 | * Set power to the length in bits of the prime to be generated. | 263 | * Set power to the length in bits of the prime to be generated. |
240 | * This is changed to 1 less than the desired safe prime moduli p. | 264 | * This is changed to 1 less than the desired safe prime moduli p. |
@@ -403,7 +427,7 @@ gen_candidates(FILE *out, int memory, int power, BIGNUM *start) | |||
403 | debug2("test q = largebase+%u", 2 * j); | 427 | debug2("test q = largebase+%u", 2 * j); |
404 | BN_set_word(q, 2 * j); | 428 | BN_set_word(q, 2 * j); |
405 | BN_add(q, q, largebase); | 429 | BN_add(q, q, largebase); |
406 | if (qfileout(out, QTYPE_SOPHIE_GERMAINE, QTEST_SIEVE, | 430 | if (qfileout(out, QTYPE_SOPHIE_GERMAIN, QTEST_SIEVE, |
407 | largetries, (power - 1) /* MSB */, (0), q) == -1) { | 431 | largetries, (power - 1) /* MSB */, (0), q) == -1) { |
408 | ret = -1; | 432 | ret = -1; |
409 | break; | 433 | break; |
@@ -430,8 +454,7 @@ gen_candidates(FILE *out, int memory, int power, BIGNUM *start) | |||
430 | * The result is a list of so-call "safe" primes | 454 | * The result is a list of so-call "safe" primes |
431 | */ | 455 | */ |
432 | int | 456 | int |
433 | prime_test(FILE *in, FILE *out, u_int32_t trials, | 457 | prime_test(FILE *in, FILE *out, u_int32_t trials, u_int32_t generator_wanted) |
434 | u_int32_t generator_wanted) | ||
435 | { | 458 | { |
436 | BIGNUM *q, *p, *a; | 459 | BIGNUM *q, *p, *a; |
437 | BN_CTX *ctx; | 460 | BN_CTX *ctx; |
@@ -441,6 +464,11 @@ prime_test(FILE *in, FILE *out, u_int32_t trials, | |||
441 | time_t time_start, time_stop; | 464 | time_t time_start, time_stop; |
442 | int res; | 465 | int res; |
443 | 466 | ||
467 | if (trials < TRIAL_MINIMUM) { | ||
468 | error("Minimum primality trials is %d", TRIAL_MINIMUM); | ||
469 | return (-1); | ||
470 | } | ||
471 | |||
444 | time(&time_start); | 472 | time(&time_start); |
445 | 473 | ||
446 | p = BN_new(); | 474 | p = BN_new(); |
@@ -490,8 +518,8 @@ prime_test(FILE *in, FILE *out, u_int32_t trials, | |||
490 | 518 | ||
491 | /* modulus (hex) */ | 519 | /* modulus (hex) */ |
492 | switch (in_type) { | 520 | switch (in_type) { |
493 | case QTYPE_SOPHIE_GERMAINE: | 521 | case QTYPE_SOPHIE_GERMAIN: |
494 | debug2("%10u: (%u) Sophie-Germaine", count_in, in_type); | 522 | debug2("%10u: (%u) Sophie-Germain", count_in, in_type); |
495 | a = q; | 523 | a = q; |
496 | BN_hex2bn(&a, cp); | 524 | BN_hex2bn(&a, cp); |
497 | /* p = 2*q + 1 */ | 525 | /* p = 2*q + 1 */ |
diff --git a/moduli.h b/moduli.h deleted file mode 100644 index 9cd1cd3f8..000000000 --- a/moduli.h +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | /* $OpenBSD: moduli.h,v 1.1 2003/07/28 09:49:56 djm Exp $ */ | ||
2 | |||
3 | #include <sys/types.h> | ||
4 | #include <openssl/bn.h> | ||
5 | |||
6 | /* | ||
7 | * Using virtual memory can cause thrashing. This should be the largest | ||
8 | * number that is supported without a large amount of disk activity -- | ||
9 | * that would increase the run time from hours to days or weeks! | ||
10 | */ | ||
11 | #define LARGE_MINIMUM (8UL) /* megabytes */ | ||
12 | |||
13 | /* | ||
14 | * Do not increase this number beyond the unsigned integer bit size. | ||
15 | * Due to a multiple of 4, it must be LESS than 128 (yielding 2**30 bits). | ||
16 | */ | ||
17 | #define LARGE_MAXIMUM (127UL) /* megabytes */ | ||
18 | |||
19 | /* Minimum number of primality tests to perform */ | ||
20 | #define TRIAL_MINIMUM (4) | ||
21 | |||
22 | int gen_candidates(FILE *, int, int, BIGNUM *); | ||
23 | int prime_test(FILE *, FILE *, u_int32_t, u_int32_t); | ||
@@ -25,7 +25,7 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "includes.h" | 27 | #include "includes.h" |
28 | RCSID("$OpenBSD: monitor.c,v 1.55 2004/02/05 05:37:17 dtucker Exp $"); | 28 | RCSID("$OpenBSD: monitor.c,v 1.61 2004/07/17 05:31:41 dtucker Exp $"); |
29 | 29 | ||
30 | #include <openssl/dh.h> | 30 | #include <openssl/dh.h> |
31 | 31 | ||
@@ -63,7 +63,6 @@ RCSID("$OpenBSD: monitor.c,v 1.55 2004/02/05 05:37:17 dtucker Exp $"); | |||
63 | #include "bufaux.h" | 63 | #include "bufaux.h" |
64 | #include "compat.h" | 64 | #include "compat.h" |
65 | #include "ssh2.h" | 65 | #include "ssh2.h" |
66 | #include "mpaux.h" | ||
67 | 66 | ||
68 | #ifdef GSSAPI | 67 | #ifdef GSSAPI |
69 | #include "ssh-gss.h" | 68 | #include "ssh-gss.h" |
@@ -80,6 +79,7 @@ extern u_char session_id[]; | |||
80 | extern Buffer input, output; | 79 | extern Buffer input, output; |
81 | extern Buffer auth_debug; | 80 | extern Buffer auth_debug; |
82 | extern int auth_debug_init; | 81 | extern int auth_debug_init; |
82 | extern Buffer loginmsg; | ||
83 | 83 | ||
84 | /* State exported from the child */ | 84 | /* State exported from the child */ |
85 | 85 | ||
@@ -351,9 +351,9 @@ monitor_set_child_handler(pid_t pid) | |||
351 | } | 351 | } |
352 | 352 | ||
353 | static void | 353 | static void |
354 | monitor_child_handler(int signal) | 354 | monitor_child_handler(int sig) |
355 | { | 355 | { |
356 | kill(monitor_child_pid, signal); | 356 | kill(monitor_child_pid, sig); |
357 | } | 357 | } |
358 | 358 | ||
359 | void | 359 | void |
@@ -468,7 +468,7 @@ monitor_reset_key_state(void) | |||
468 | } | 468 | } |
469 | 469 | ||
470 | int | 470 | int |
471 | mm_answer_moduli(int socket, Buffer *m) | 471 | mm_answer_moduli(int sock, Buffer *m) |
472 | { | 472 | { |
473 | DH *dh; | 473 | DH *dh; |
474 | int min, want, max; | 474 | int min, want, max; |
@@ -498,12 +498,12 @@ mm_answer_moduli(int socket, Buffer *m) | |||
498 | 498 | ||
499 | DH_free(dh); | 499 | DH_free(dh); |
500 | } | 500 | } |
501 | mm_request_send(socket, MONITOR_ANS_MODULI, m); | 501 | mm_request_send(sock, MONITOR_ANS_MODULI, m); |
502 | return (0); | 502 | return (0); |
503 | } | 503 | } |
504 | 504 | ||
505 | int | 505 | int |
506 | mm_answer_sign(int socket, Buffer *m) | 506 | mm_answer_sign(int sock, Buffer *m) |
507 | { | 507 | { |
508 | Key *key; | 508 | Key *key; |
509 | u_char *p; | 509 | u_char *p; |
@@ -539,7 +539,7 @@ mm_answer_sign(int socket, Buffer *m) | |||
539 | xfree(p); | 539 | xfree(p); |
540 | xfree(signature); | 540 | xfree(signature); |
541 | 541 | ||
542 | mm_request_send(socket, MONITOR_ANS_SIGN, m); | 542 | mm_request_send(sock, MONITOR_ANS_SIGN, m); |
543 | 543 | ||
544 | /* Turn on permissions for getpwnam */ | 544 | /* Turn on permissions for getpwnam */ |
545 | monitor_permit(mon_dispatch, MONITOR_REQ_PWNAM, 1); | 545 | monitor_permit(mon_dispatch, MONITOR_REQ_PWNAM, 1); |
@@ -550,9 +550,9 @@ mm_answer_sign(int socket, Buffer *m) | |||
550 | /* Retrieves the password entry and also checks if the user is permitted */ | 550 | /* Retrieves the password entry and also checks if the user is permitted */ |
551 | 551 | ||
552 | int | 552 | int |
553 | mm_answer_pwnamallow(int socket, Buffer *m) | 553 | mm_answer_pwnamallow(int sock, Buffer *m) |
554 | { | 554 | { |
555 | char *login; | 555 | char *username; |
556 | struct passwd *pwent; | 556 | struct passwd *pwent; |
557 | int allowed = 0; | 557 | int allowed = 0; |
558 | 558 | ||
@@ -561,13 +561,13 @@ mm_answer_pwnamallow(int socket, Buffer *m) | |||
561 | if (authctxt->attempt++ != 0) | 561 | if (authctxt->attempt++ != 0) |
562 | fatal("%s: multiple attempts for getpwnam", __func__); | 562 | fatal("%s: multiple attempts for getpwnam", __func__); |
563 | 563 | ||
564 | login = buffer_get_string(m, NULL); | 564 | username = buffer_get_string(m, NULL); |
565 | 565 | ||
566 | pwent = getpwnamallow(login); | 566 | pwent = getpwnamallow(username); |
567 | 567 | ||
568 | authctxt->user = xstrdup(login); | 568 | authctxt->user = xstrdup(username); |
569 | setproctitle("%s [priv]", pwent ? login : "unknown"); | 569 | setproctitle("%s [priv]", pwent ? username : "unknown"); |
570 | xfree(login); | 570 | xfree(username); |
571 | 571 | ||
572 | buffer_clear(m); | 572 | buffer_clear(m); |
573 | 573 | ||
@@ -594,7 +594,7 @@ mm_answer_pwnamallow(int socket, Buffer *m) | |||
594 | 594 | ||
595 | out: | 595 | out: |
596 | debug3("%s: sending MONITOR_ANS_PWNAM: %d", __func__, allowed); | 596 | debug3("%s: sending MONITOR_ANS_PWNAM: %d", __func__, allowed); |
597 | mm_request_send(socket, MONITOR_ANS_PWNAM, m); | 597 | mm_request_send(sock, MONITOR_ANS_PWNAM, m); |
598 | 598 | ||
599 | /* For SSHv1 allow authentication now */ | 599 | /* For SSHv1 allow authentication now */ |
600 | if (!compat20) | 600 | if (!compat20) |
@@ -613,14 +613,14 @@ mm_answer_pwnamallow(int socket, Buffer *m) | |||
613 | return (0); | 613 | return (0); |
614 | } | 614 | } |
615 | 615 | ||
616 | int mm_answer_auth2_read_banner(int socket, Buffer *m) | 616 | int mm_answer_auth2_read_banner(int sock, Buffer *m) |
617 | { | 617 | { |
618 | char *banner; | 618 | char *banner; |
619 | 619 | ||
620 | buffer_clear(m); | 620 | buffer_clear(m); |
621 | banner = auth2_read_banner(); | 621 | banner = auth2_read_banner(); |
622 | buffer_put_cstring(m, banner != NULL ? banner : ""); | 622 | buffer_put_cstring(m, banner != NULL ? banner : ""); |
623 | mm_request_send(socket, MONITOR_ANS_AUTH2_READ_BANNER, m); | 623 | mm_request_send(sock, MONITOR_ANS_AUTH2_READ_BANNER, m); |
624 | 624 | ||
625 | if (banner != NULL) | 625 | if (banner != NULL) |
626 | xfree(banner); | 626 | xfree(banner); |
@@ -629,7 +629,7 @@ int mm_answer_auth2_read_banner(int socket, Buffer *m) | |||
629 | } | 629 | } |
630 | 630 | ||
631 | int | 631 | int |
632 | mm_answer_authserv(int socket, Buffer *m) | 632 | mm_answer_authserv(int sock, Buffer *m) |
633 | { | 633 | { |
634 | monitor_permit_authentications(1); | 634 | monitor_permit_authentications(1); |
635 | 635 | ||
@@ -647,7 +647,7 @@ mm_answer_authserv(int socket, Buffer *m) | |||
647 | } | 647 | } |
648 | 648 | ||
649 | int | 649 | int |
650 | mm_answer_authpassword(int socket, Buffer *m) | 650 | mm_answer_authpassword(int sock, Buffer *m) |
651 | { | 651 | { |
652 | static int call_count; | 652 | static int call_count; |
653 | char *passwd; | 653 | char *passwd; |
@@ -665,7 +665,7 @@ mm_answer_authpassword(int socket, Buffer *m) | |||
665 | buffer_put_int(m, authenticated); | 665 | buffer_put_int(m, authenticated); |
666 | 666 | ||
667 | debug3("%s: sending result %d", __func__, authenticated); | 667 | debug3("%s: sending result %d", __func__, authenticated); |
668 | mm_request_send(socket, MONITOR_ANS_AUTHPASSWORD, m); | 668 | mm_request_send(sock, MONITOR_ANS_AUTHPASSWORD, m); |
669 | 669 | ||
670 | call_count++; | 670 | call_count++; |
671 | if (plen == 0 && call_count == 1) | 671 | if (plen == 0 && call_count == 1) |
@@ -679,7 +679,7 @@ mm_answer_authpassword(int socket, Buffer *m) | |||
679 | 679 | ||
680 | #ifdef BSD_AUTH | 680 | #ifdef BSD_AUTH |
681 | int | 681 | int |
682 | mm_answer_bsdauthquery(int socket, Buffer *m) | 682 | mm_answer_bsdauthquery(int sock, Buffer *m) |
683 | { | 683 | { |
684 | char *name, *infotxt; | 684 | char *name, *infotxt; |
685 | u_int numprompts; | 685 | u_int numprompts; |
@@ -696,7 +696,7 @@ mm_answer_bsdauthquery(int socket, Buffer *m) | |||
696 | buffer_put_cstring(m, prompts[0]); | 696 | buffer_put_cstring(m, prompts[0]); |
697 | 697 | ||
698 | debug3("%s: sending challenge success: %u", __func__, success); | 698 | debug3("%s: sending challenge success: %u", __func__, success); |
699 | mm_request_send(socket, MONITOR_ANS_BSDAUTHQUERY, m); | 699 | mm_request_send(sock, MONITOR_ANS_BSDAUTHQUERY, m); |
700 | 700 | ||
701 | if (success) { | 701 | if (success) { |
702 | xfree(name); | 702 | xfree(name); |
@@ -709,7 +709,7 @@ mm_answer_bsdauthquery(int socket, Buffer *m) | |||
709 | } | 709 | } |
710 | 710 | ||
711 | int | 711 | int |
712 | mm_answer_bsdauthrespond(int socket, Buffer *m) | 712 | mm_answer_bsdauthrespond(int sock, Buffer *m) |
713 | { | 713 | { |
714 | char *response; | 714 | char *response; |
715 | int authok; | 715 | int authok; |
@@ -728,7 +728,7 @@ mm_answer_bsdauthrespond(int socket, Buffer *m) | |||
728 | buffer_put_int(m, authok); | 728 | buffer_put_int(m, authok); |
729 | 729 | ||
730 | debug3("%s: sending authenticated: %d", __func__, authok); | 730 | debug3("%s: sending authenticated: %d", __func__, authok); |
731 | mm_request_send(socket, MONITOR_ANS_BSDAUTHRESPOND, m); | 731 | mm_request_send(sock, MONITOR_ANS_BSDAUTHRESPOND, m); |
732 | 732 | ||
733 | auth_method = "bsdauth"; | 733 | auth_method = "bsdauth"; |
734 | 734 | ||
@@ -738,7 +738,7 @@ mm_answer_bsdauthrespond(int socket, Buffer *m) | |||
738 | 738 | ||
739 | #ifdef SKEY | 739 | #ifdef SKEY |
740 | int | 740 | int |
741 | mm_answer_skeyquery(int socket, Buffer *m) | 741 | mm_answer_skeyquery(int sock, Buffer *m) |
742 | { | 742 | { |
743 | struct skey skey; | 743 | struct skey skey; |
744 | char challenge[1024]; | 744 | char challenge[1024]; |
@@ -753,13 +753,13 @@ mm_answer_skeyquery(int socket, Buffer *m) | |||
753 | buffer_put_cstring(m, challenge); | 753 | buffer_put_cstring(m, challenge); |
754 | 754 | ||
755 | debug3("%s: sending challenge success: %u", __func__, success); | 755 | debug3("%s: sending challenge success: %u", __func__, success); |
756 | mm_request_send(socket, MONITOR_ANS_SKEYQUERY, m); | 756 | mm_request_send(sock, MONITOR_ANS_SKEYQUERY, m); |
757 | 757 | ||
758 | return (0); | 758 | return (0); |
759 | } | 759 | } |
760 | 760 | ||
761 | int | 761 | int |
762 | mm_answer_skeyrespond(int socket, Buffer *m) | 762 | mm_answer_skeyrespond(int sock, Buffer *m) |
763 | { | 763 | { |
764 | char *response; | 764 | char *response; |
765 | int authok; | 765 | int authok; |
@@ -777,7 +777,7 @@ mm_answer_skeyrespond(int socket, Buffer *m) | |||
777 | buffer_put_int(m, authok); | 777 | buffer_put_int(m, authok); |
778 | 778 | ||
779 | debug3("%s: sending authenticated: %d", __func__, authok); | 779 | debug3("%s: sending authenticated: %d", __func__, authok); |
780 | mm_request_send(socket, MONITOR_ANS_SKEYRESPOND, m); | 780 | mm_request_send(sock, MONITOR_ANS_SKEYRESPOND, m); |
781 | 781 | ||
782 | auth_method = "skey"; | 782 | auth_method = "skey"; |
783 | 783 | ||
@@ -787,7 +787,7 @@ mm_answer_skeyrespond(int socket, Buffer *m) | |||
787 | 787 | ||
788 | #ifdef USE_PAM | 788 | #ifdef USE_PAM |
789 | int | 789 | int |
790 | mm_answer_pam_start(int socket, Buffer *m) | 790 | mm_answer_pam_start(int sock, Buffer *m) |
791 | { | 791 | { |
792 | if (!options.use_pam) | 792 | if (!options.use_pam) |
793 | fatal("UsePAM not set, but ended up in %s anyway", __func__); | 793 | fatal("UsePAM not set, but ended up in %s anyway", __func__); |
@@ -800,7 +800,7 @@ mm_answer_pam_start(int socket, Buffer *m) | |||
800 | } | 800 | } |
801 | 801 | ||
802 | int | 802 | int |
803 | mm_answer_pam_account(int socket, Buffer *m) | 803 | mm_answer_pam_account(int sock, Buffer *m) |
804 | { | 804 | { |
805 | u_int ret; | 805 | u_int ret; |
806 | 806 | ||
@@ -811,7 +811,7 @@ mm_answer_pam_account(int socket, Buffer *m) | |||
811 | 811 | ||
812 | buffer_put_int(m, ret); | 812 | buffer_put_int(m, ret); |
813 | 813 | ||
814 | mm_request_send(socket, MONITOR_ANS_PAM_ACCOUNT, m); | 814 | mm_request_send(sock, MONITOR_ANS_PAM_ACCOUNT, m); |
815 | 815 | ||
816 | return (ret); | 816 | return (ret); |
817 | } | 817 | } |
@@ -820,7 +820,7 @@ static void *sshpam_ctxt, *sshpam_authok; | |||
820 | extern KbdintDevice sshpam_device; | 820 | extern KbdintDevice sshpam_device; |
821 | 821 | ||
822 | int | 822 | int |
823 | mm_answer_pam_init_ctx(int socket, Buffer *m) | 823 | mm_answer_pam_init_ctx(int sock, Buffer *m) |
824 | { | 824 | { |
825 | 825 | ||
826 | debug3("%s", __func__); | 826 | debug3("%s", __func__); |
@@ -834,12 +834,12 @@ mm_answer_pam_init_ctx(int socket, Buffer *m) | |||
834 | } else { | 834 | } else { |
835 | buffer_put_int(m, 0); | 835 | buffer_put_int(m, 0); |
836 | } | 836 | } |
837 | mm_request_send(socket, MONITOR_ANS_PAM_INIT_CTX, m); | 837 | mm_request_send(sock, MONITOR_ANS_PAM_INIT_CTX, m); |
838 | return (0); | 838 | return (0); |
839 | } | 839 | } |
840 | 840 | ||
841 | int | 841 | int |
842 | mm_answer_pam_query(int socket, Buffer *m) | 842 | mm_answer_pam_query(int sock, Buffer *m) |
843 | { | 843 | { |
844 | char *name, *info, **prompts; | 844 | char *name, *info, **prompts; |
845 | u_int num, *echo_on; | 845 | u_int num, *echo_on; |
@@ -868,12 +868,12 @@ mm_answer_pam_query(int socket, Buffer *m) | |||
868 | xfree(prompts); | 868 | xfree(prompts); |
869 | if (echo_on != NULL) | 869 | if (echo_on != NULL) |
870 | xfree(echo_on); | 870 | xfree(echo_on); |
871 | mm_request_send(socket, MONITOR_ANS_PAM_QUERY, m); | 871 | mm_request_send(sock, MONITOR_ANS_PAM_QUERY, m); |
872 | return (0); | 872 | return (0); |
873 | } | 873 | } |
874 | 874 | ||
875 | int | 875 | int |
876 | mm_answer_pam_respond(int socket, Buffer *m) | 876 | mm_answer_pam_respond(int sock, Buffer *m) |
877 | { | 877 | { |
878 | char **resp; | 878 | char **resp; |
879 | u_int num; | 879 | u_int num; |
@@ -895,7 +895,7 @@ mm_answer_pam_respond(int socket, Buffer *m) | |||
895 | } | 895 | } |
896 | buffer_clear(m); | 896 | buffer_clear(m); |
897 | buffer_put_int(m, ret); | 897 | buffer_put_int(m, ret); |
898 | mm_request_send(socket, MONITOR_ANS_PAM_RESPOND, m); | 898 | mm_request_send(sock, MONITOR_ANS_PAM_RESPOND, m); |
899 | auth_method = "keyboard-interactive/pam"; | 899 | auth_method = "keyboard-interactive/pam"; |
900 | if (ret == 0) | 900 | if (ret == 0) |
901 | sshpam_authok = sshpam_ctxt; | 901 | sshpam_authok = sshpam_ctxt; |
@@ -903,13 +903,13 @@ mm_answer_pam_respond(int socket, Buffer *m) | |||
903 | } | 903 | } |
904 | 904 | ||
905 | int | 905 | int |
906 | mm_answer_pam_free_ctx(int socket, Buffer *m) | 906 | mm_answer_pam_free_ctx(int sock, Buffer *m) |
907 | { | 907 | { |
908 | 908 | ||
909 | debug3("%s", __func__); | 909 | debug3("%s", __func__); |
910 | (sshpam_device.free_ctx)(sshpam_ctxt); | 910 | (sshpam_device.free_ctx)(sshpam_ctxt); |
911 | buffer_clear(m); | 911 | buffer_clear(m); |
912 | mm_request_send(socket, MONITOR_ANS_PAM_FREE_CTX, m); | 912 | mm_request_send(sock, MONITOR_ANS_PAM_FREE_CTX, m); |
913 | return (sshpam_authok == sshpam_ctxt); | 913 | return (sshpam_authok == sshpam_ctxt); |
914 | } | 914 | } |
915 | #endif | 915 | #endif |
@@ -926,7 +926,7 @@ mm_append_debug(Buffer *m) | |||
926 | } | 926 | } |
927 | 927 | ||
928 | int | 928 | int |
929 | mm_answer_keyallowed(int socket, Buffer *m) | 929 | mm_answer_keyallowed(int sock, Buffer *m) |
930 | { | 930 | { |
931 | Key *key; | 931 | Key *key; |
932 | char *cuser, *chost; | 932 | char *cuser, *chost; |
@@ -996,7 +996,7 @@ mm_answer_keyallowed(int socket, Buffer *m) | |||
996 | 996 | ||
997 | mm_append_debug(m); | 997 | mm_append_debug(m); |
998 | 998 | ||
999 | mm_request_send(socket, MONITOR_ANS_KEYALLOWED, m); | 999 | mm_request_send(sock, MONITOR_ANS_KEYALLOWED, m); |
1000 | 1000 | ||
1001 | if (type == MM_RSAHOSTKEY) | 1001 | if (type == MM_RSAHOSTKEY) |
1002 | monitor_permit(mon_dispatch, MONITOR_REQ_RSACHALLENGE, allowed); | 1002 | monitor_permit(mon_dispatch, MONITOR_REQ_RSACHALLENGE, allowed); |
@@ -1117,7 +1117,7 @@ monitor_valid_hostbasedblob(u_char *data, u_int datalen, char *cuser, | |||
1117 | } | 1117 | } |
1118 | 1118 | ||
1119 | int | 1119 | int |
1120 | mm_answer_keyverify(int socket, Buffer *m) | 1120 | mm_answer_keyverify(int sock, Buffer *m) |
1121 | { | 1121 | { |
1122 | Key *key; | 1122 | Key *key; |
1123 | u_char *signature, *data, *blob; | 1123 | u_char *signature, *data, *blob; |
@@ -1167,7 +1167,7 @@ mm_answer_keyverify(int socket, Buffer *m) | |||
1167 | 1167 | ||
1168 | buffer_clear(m); | 1168 | buffer_clear(m); |
1169 | buffer_put_int(m, verified); | 1169 | buffer_put_int(m, verified); |
1170 | mm_request_send(socket, MONITOR_ANS_KEYVERIFY, m); | 1170 | mm_request_send(sock, MONITOR_ANS_KEYVERIFY, m); |
1171 | 1171 | ||
1172 | return (verified); | 1172 | return (verified); |
1173 | } | 1173 | } |
@@ -1209,7 +1209,7 @@ mm_session_close(Session *s) | |||
1209 | } | 1209 | } |
1210 | 1210 | ||
1211 | int | 1211 | int |
1212 | mm_answer_pty(int socket, Buffer *m) | 1212 | mm_answer_pty(int sock, Buffer *m) |
1213 | { | 1213 | { |
1214 | extern struct monitor *pmonitor; | 1214 | extern struct monitor *pmonitor; |
1215 | Session *s; | 1215 | Session *s; |
@@ -1231,10 +1231,6 @@ mm_answer_pty(int socket, Buffer *m) | |||
1231 | 1231 | ||
1232 | buffer_put_int(m, 1); | 1232 | buffer_put_int(m, 1); |
1233 | buffer_put_cstring(m, s->tty); | 1233 | buffer_put_cstring(m, s->tty); |
1234 | mm_request_send(socket, MONITOR_ANS_PTY, m); | ||
1235 | |||
1236 | mm_send_fd(socket, s->ptyfd); | ||
1237 | mm_send_fd(socket, s->ttyfd); | ||
1238 | 1234 | ||
1239 | /* We need to trick ttyslot */ | 1235 | /* We need to trick ttyslot */ |
1240 | if (dup2(s->ttyfd, 0) == -1) | 1236 | if (dup2(s->ttyfd, 0) == -1) |
@@ -1245,6 +1241,15 @@ mm_answer_pty(int socket, Buffer *m) | |||
1245 | /* Now we can close the file descriptor again */ | 1241 | /* Now we can close the file descriptor again */ |
1246 | close(0); | 1242 | close(0); |
1247 | 1243 | ||
1244 | /* send messages generated by record_login */ | ||
1245 | buffer_put_string(m, buffer_ptr(&loginmsg), buffer_len(&loginmsg)); | ||
1246 | buffer_clear(&loginmsg); | ||
1247 | |||
1248 | mm_request_send(sock, MONITOR_ANS_PTY, m); | ||
1249 | |||
1250 | mm_send_fd(sock, s->ptyfd); | ||
1251 | mm_send_fd(sock, s->ttyfd); | ||
1252 | |||
1248 | /* make sure nothing uses fd 0 */ | 1253 | /* make sure nothing uses fd 0 */ |
1249 | if ((fd0 = open(_PATH_DEVNULL, O_RDONLY)) < 0) | 1254 | if ((fd0 = open(_PATH_DEVNULL, O_RDONLY)) < 0) |
1250 | fatal("%s: open(/dev/null): %s", __func__, strerror(errno)); | 1255 | fatal("%s: open(/dev/null): %s", __func__, strerror(errno)); |
@@ -1265,12 +1270,12 @@ mm_answer_pty(int socket, Buffer *m) | |||
1265 | if (s != NULL) | 1270 | if (s != NULL) |
1266 | mm_session_close(s); | 1271 | mm_session_close(s); |
1267 | buffer_put_int(m, 0); | 1272 | buffer_put_int(m, 0); |
1268 | mm_request_send(socket, MONITOR_ANS_PTY, m); | 1273 | mm_request_send(sock, MONITOR_ANS_PTY, m); |
1269 | return (0); | 1274 | return (0); |
1270 | } | 1275 | } |
1271 | 1276 | ||
1272 | int | 1277 | int |
1273 | mm_answer_pty_cleanup(int socket, Buffer *m) | 1278 | mm_answer_pty_cleanup(int sock, Buffer *m) |
1274 | { | 1279 | { |
1275 | Session *s; | 1280 | Session *s; |
1276 | char *tty; | 1281 | char *tty; |
@@ -1286,7 +1291,7 @@ mm_answer_pty_cleanup(int socket, Buffer *m) | |||
1286 | } | 1291 | } |
1287 | 1292 | ||
1288 | int | 1293 | int |
1289 | mm_answer_sesskey(int socket, Buffer *m) | 1294 | mm_answer_sesskey(int sock, Buffer *m) |
1290 | { | 1295 | { |
1291 | BIGNUM *p; | 1296 | BIGNUM *p; |
1292 | int rsafail; | 1297 | int rsafail; |
@@ -1307,7 +1312,7 @@ mm_answer_sesskey(int socket, Buffer *m) | |||
1307 | 1312 | ||
1308 | BN_clear_free(p); | 1313 | BN_clear_free(p); |
1309 | 1314 | ||
1310 | mm_request_send(socket, MONITOR_ANS_SESSKEY, m); | 1315 | mm_request_send(sock, MONITOR_ANS_SESSKEY, m); |
1311 | 1316 | ||
1312 | /* Turn on permissions for sessid passing */ | 1317 | /* Turn on permissions for sessid passing */ |
1313 | monitor_permit(mon_dispatch, MONITOR_REQ_SESSID, 1); | 1318 | monitor_permit(mon_dispatch, MONITOR_REQ_SESSID, 1); |
@@ -1316,7 +1321,7 @@ mm_answer_sesskey(int socket, Buffer *m) | |||
1316 | } | 1321 | } |
1317 | 1322 | ||
1318 | int | 1323 | int |
1319 | mm_answer_sessid(int socket, Buffer *m) | 1324 | mm_answer_sessid(int sock, Buffer *m) |
1320 | { | 1325 | { |
1321 | int i; | 1326 | int i; |
1322 | 1327 | ||
@@ -1334,7 +1339,7 @@ mm_answer_sessid(int socket, Buffer *m) | |||
1334 | } | 1339 | } |
1335 | 1340 | ||
1336 | int | 1341 | int |
1337 | mm_answer_rsa_keyallowed(int socket, Buffer *m) | 1342 | mm_answer_rsa_keyallowed(int sock, Buffer *m) |
1338 | { | 1343 | { |
1339 | BIGNUM *client_n; | 1344 | BIGNUM *client_n; |
1340 | Key *key = NULL; | 1345 | Key *key = NULL; |
@@ -1374,7 +1379,7 @@ mm_answer_rsa_keyallowed(int socket, Buffer *m) | |||
1374 | 1379 | ||
1375 | mm_append_debug(m); | 1380 | mm_append_debug(m); |
1376 | 1381 | ||
1377 | mm_request_send(socket, MONITOR_ANS_RSAKEYALLOWED, m); | 1382 | mm_request_send(sock, MONITOR_ANS_RSAKEYALLOWED, m); |
1378 | 1383 | ||
1379 | monitor_permit(mon_dispatch, MONITOR_REQ_RSACHALLENGE, allowed); | 1384 | monitor_permit(mon_dispatch, MONITOR_REQ_RSACHALLENGE, allowed); |
1380 | monitor_permit(mon_dispatch, MONITOR_REQ_RSARESPONSE, 0); | 1385 | monitor_permit(mon_dispatch, MONITOR_REQ_RSARESPONSE, 0); |
@@ -1382,7 +1387,7 @@ mm_answer_rsa_keyallowed(int socket, Buffer *m) | |||
1382 | } | 1387 | } |
1383 | 1388 | ||
1384 | int | 1389 | int |
1385 | mm_answer_rsa_challenge(int socket, Buffer *m) | 1390 | mm_answer_rsa_challenge(int sock, Buffer *m) |
1386 | { | 1391 | { |
1387 | Key *key = NULL; | 1392 | Key *key = NULL; |
1388 | u_char *blob; | 1393 | u_char *blob; |
@@ -1408,7 +1413,7 @@ mm_answer_rsa_challenge(int socket, Buffer *m) | |||
1408 | buffer_put_bignum2(m, ssh1_challenge); | 1413 | buffer_put_bignum2(m, ssh1_challenge); |
1409 | 1414 | ||
1410 | debug3("%s sending reply", __func__); | 1415 | debug3("%s sending reply", __func__); |
1411 | mm_request_send(socket, MONITOR_ANS_RSACHALLENGE, m); | 1416 | mm_request_send(sock, MONITOR_ANS_RSACHALLENGE, m); |
1412 | 1417 | ||
1413 | monitor_permit(mon_dispatch, MONITOR_REQ_RSARESPONSE, 1); | 1418 | monitor_permit(mon_dispatch, MONITOR_REQ_RSARESPONSE, 1); |
1414 | 1419 | ||
@@ -1418,7 +1423,7 @@ mm_answer_rsa_challenge(int socket, Buffer *m) | |||
1418 | } | 1423 | } |
1419 | 1424 | ||
1420 | int | 1425 | int |
1421 | mm_answer_rsa_response(int socket, Buffer *m) | 1426 | mm_answer_rsa_response(int sock, Buffer *m) |
1422 | { | 1427 | { |
1423 | Key *key = NULL; | 1428 | Key *key = NULL; |
1424 | u_char *blob, *response; | 1429 | u_char *blob, *response; |
@@ -1457,13 +1462,13 @@ mm_answer_rsa_response(int socket, Buffer *m) | |||
1457 | 1462 | ||
1458 | buffer_clear(m); | 1463 | buffer_clear(m); |
1459 | buffer_put_int(m, success); | 1464 | buffer_put_int(m, success); |
1460 | mm_request_send(socket, MONITOR_ANS_RSARESPONSE, m); | 1465 | mm_request_send(sock, MONITOR_ANS_RSARESPONSE, m); |
1461 | 1466 | ||
1462 | return (success); | 1467 | return (success); |
1463 | } | 1468 | } |
1464 | 1469 | ||
1465 | int | 1470 | int |
1466 | mm_answer_term(int socket, Buffer *req) | 1471 | mm_answer_term(int sock, Buffer *req) |
1467 | { | 1472 | { |
1468 | extern struct monitor *pmonitor; | 1473 | extern struct monitor *pmonitor; |
1469 | int res, status; | 1474 | int res, status; |
@@ -1480,7 +1485,7 @@ mm_answer_term(int socket, Buffer *req) | |||
1480 | res = WIFEXITED(status) ? WEXITSTATUS(status) : 1; | 1485 | res = WIFEXITED(status) ? WEXITSTATUS(status) : 1; |
1481 | 1486 | ||
1482 | /* Terminate process */ | 1487 | /* Terminate process */ |
1483 | exit (res); | 1488 | exit(res); |
1484 | } | 1489 | } |
1485 | 1490 | ||
1486 | void | 1491 | void |
@@ -1547,6 +1552,7 @@ mm_get_kex(Buffer *m) | |||
1547 | fatal("mm_get_get: internal error: bad session id"); | 1552 | fatal("mm_get_get: internal error: bad session id"); |
1548 | kex->we_need = buffer_get_int(m); | 1553 | kex->we_need = buffer_get_int(m); |
1549 | kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server; | 1554 | kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server; |
1555 | kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server; | ||
1550 | kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; | 1556 | kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; |
1551 | kex->server = 1; | 1557 | kex->server = 1; |
1552 | kex->hostkey_type = buffer_get_int(m); | 1558 | kex->hostkey_type = buffer_get_int(m); |
@@ -1740,23 +1746,23 @@ monitor_reinit(struct monitor *mon) | |||
1740 | 1746 | ||
1741 | #ifdef GSSAPI | 1747 | #ifdef GSSAPI |
1742 | int | 1748 | int |
1743 | mm_answer_gss_setup_ctx(int socket, Buffer *m) | 1749 | mm_answer_gss_setup_ctx(int sock, Buffer *m) |
1744 | { | 1750 | { |
1745 | gss_OID_desc oid; | 1751 | gss_OID_desc goid; |
1746 | OM_uint32 major; | 1752 | OM_uint32 major; |
1747 | u_int len; | 1753 | u_int len; |
1748 | 1754 | ||
1749 | oid.elements = buffer_get_string(m, &len); | 1755 | goid.elements = buffer_get_string(m, &len); |
1750 | oid.length = len; | 1756 | goid.length = len; |
1751 | 1757 | ||
1752 | major = ssh_gssapi_server_ctx(&gsscontext, &oid); | 1758 | major = ssh_gssapi_server_ctx(&gsscontext, &goid); |
1753 | 1759 | ||
1754 | xfree(oid.elements); | 1760 | xfree(goid.elements); |
1755 | 1761 | ||
1756 | buffer_clear(m); | 1762 | buffer_clear(m); |
1757 | buffer_put_int(m, major); | 1763 | buffer_put_int(m, major); |
1758 | 1764 | ||
1759 | mm_request_send(socket,MONITOR_ANS_GSSSETUP, m); | 1765 | mm_request_send(sock,MONITOR_ANS_GSSSETUP, m); |
1760 | 1766 | ||
1761 | /* Now we have a context, enable the step */ | 1767 | /* Now we have a context, enable the step */ |
1762 | monitor_permit(mon_dispatch, MONITOR_REQ_GSSSTEP, 1); | 1768 | monitor_permit(mon_dispatch, MONITOR_REQ_GSSSTEP, 1); |
@@ -1765,7 +1771,7 @@ mm_answer_gss_setup_ctx(int socket, Buffer *m) | |||
1765 | } | 1771 | } |
1766 | 1772 | ||
1767 | int | 1773 | int |
1768 | mm_answer_gss_accept_ctx(int socket, Buffer *m) | 1774 | mm_answer_gss_accept_ctx(int sock, Buffer *m) |
1769 | { | 1775 | { |
1770 | gss_buffer_desc in; | 1776 | gss_buffer_desc in; |
1771 | gss_buffer_desc out = GSS_C_EMPTY_BUFFER; | 1777 | gss_buffer_desc out = GSS_C_EMPTY_BUFFER; |
@@ -1782,7 +1788,7 @@ mm_answer_gss_accept_ctx(int socket, Buffer *m) | |||
1782 | buffer_put_int(m, major); | 1788 | buffer_put_int(m, major); |
1783 | buffer_put_string(m, out.value, out.length); | 1789 | buffer_put_string(m, out.value, out.length); |
1784 | buffer_put_int(m, flags); | 1790 | buffer_put_int(m, flags); |
1785 | mm_request_send(socket, MONITOR_ANS_GSSSTEP, m); | 1791 | mm_request_send(sock, MONITOR_ANS_GSSSTEP, m); |
1786 | 1792 | ||
1787 | gss_release_buffer(&minor, &out); | 1793 | gss_release_buffer(&minor, &out); |
1788 | 1794 | ||
@@ -1795,7 +1801,7 @@ mm_answer_gss_accept_ctx(int socket, Buffer *m) | |||
1795 | } | 1801 | } |
1796 | 1802 | ||
1797 | int | 1803 | int |
1798 | mm_answer_gss_checkmic(int socket, Buffer *m) | 1804 | mm_answer_gss_checkmic(int sock, Buffer *m) |
1799 | { | 1805 | { |
1800 | gss_buffer_desc gssbuf, mic; | 1806 | gss_buffer_desc gssbuf, mic; |
1801 | OM_uint32 ret; | 1807 | OM_uint32 ret; |
@@ -1814,7 +1820,7 @@ mm_answer_gss_checkmic(int socket, Buffer *m) | |||
1814 | buffer_clear(m); | 1820 | buffer_clear(m); |
1815 | buffer_put_int(m, ret); | 1821 | buffer_put_int(m, ret); |
1816 | 1822 | ||
1817 | mm_request_send(socket, MONITOR_ANS_GSSCHECKMIC, m); | 1823 | mm_request_send(sock, MONITOR_ANS_GSSCHECKMIC, m); |
1818 | 1824 | ||
1819 | if (!GSS_ERROR(ret)) | 1825 | if (!GSS_ERROR(ret)) |
1820 | monitor_permit(mon_dispatch, MONITOR_REQ_GSSUSEROK, 1); | 1826 | monitor_permit(mon_dispatch, MONITOR_REQ_GSSUSEROK, 1); |
@@ -1823,7 +1829,7 @@ mm_answer_gss_checkmic(int socket, Buffer *m) | |||
1823 | } | 1829 | } |
1824 | 1830 | ||
1825 | int | 1831 | int |
1826 | mm_answer_gss_userok(int socket, Buffer *m) | 1832 | mm_answer_gss_userok(int sock, Buffer *m) |
1827 | { | 1833 | { |
1828 | int authenticated; | 1834 | int authenticated; |
1829 | 1835 | ||
@@ -1833,7 +1839,7 @@ mm_answer_gss_userok(int socket, Buffer *m) | |||
1833 | buffer_put_int(m, authenticated); | 1839 | buffer_put_int(m, authenticated); |
1834 | 1840 | ||
1835 | debug3("%s: sending result %d", __func__, authenticated); | 1841 | debug3("%s: sending result %d", __func__, authenticated); |
1836 | mm_request_send(socket, MONITOR_ANS_GSSUSEROK, m); | 1842 | mm_request_send(sock, MONITOR_ANS_GSSUSEROK, m); |
1837 | 1843 | ||
1838 | auth_method="gssapi-with-mic"; | 1844 | auth_method="gssapi-with-mic"; |
1839 | 1845 | ||
diff --git a/monitor_fdpass.c b/monitor_fdpass.c index 6508c9e47..f384c174c 100644 --- a/monitor_fdpass.c +++ b/monitor_fdpass.c | |||
@@ -24,7 +24,7 @@ | |||
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include "includes.h" | 26 | #include "includes.h" |
27 | RCSID("$OpenBSD: monitor_fdpass.c,v 1.4 2002/06/26 14:50:04 deraadt Exp $"); | 27 | RCSID("$OpenBSD: monitor_fdpass.c,v 1.6 2004/08/13 02:51:48 djm Exp $"); |
28 | 28 | ||
29 | #include <sys/uio.h> | 29 | #include <sys/uio.h> |
30 | #include <sys/utsname.h> | 30 | #include <sys/utsname.h> |
@@ -56,7 +56,7 @@ cmsg_type_is_broken(void) | |||
56 | } | 56 | } |
57 | 57 | ||
58 | void | 58 | void |
59 | mm_send_fd(int socket, int fd) | 59 | mm_send_fd(int sock, int fd) |
60 | { | 60 | { |
61 | #if defined(HAVE_SENDMSG) && (defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR)) | 61 | #if defined(HAVE_SENDMSG) && (defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR)) |
62 | struct msghdr msg; | 62 | struct msghdr msg; |
@@ -87,7 +87,7 @@ mm_send_fd(int socket, int fd) | |||
87 | msg.msg_iov = &vec; | 87 | msg.msg_iov = &vec; |
88 | msg.msg_iovlen = 1; | 88 | msg.msg_iovlen = 1; |
89 | 89 | ||
90 | if ((n = sendmsg(socket, &msg, 0)) == -1) | 90 | if ((n = sendmsg(sock, &msg, 0)) == -1) |
91 | fatal("%s: sendmsg(%d): %s", __func__, fd, | 91 | fatal("%s: sendmsg(%d): %s", __func__, fd, |
92 | strerror(errno)); | 92 | strerror(errno)); |
93 | if (n != 1) | 93 | if (n != 1) |
@@ -100,7 +100,7 @@ mm_send_fd(int socket, int fd) | |||
100 | } | 100 | } |
101 | 101 | ||
102 | int | 102 | int |
103 | mm_receive_fd(int socket) | 103 | mm_receive_fd(int sock) |
104 | { | 104 | { |
105 | #if defined(HAVE_RECVMSG) && (defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR)) | 105 | #if defined(HAVE_RECVMSG) && (defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR)) |
106 | struct msghdr msg; | 106 | struct msghdr msg; |
@@ -126,7 +126,7 @@ mm_receive_fd(int socket) | |||
126 | msg.msg_controllen = sizeof(tmp); | 126 | msg.msg_controllen = sizeof(tmp); |
127 | #endif | 127 | #endif |
128 | 128 | ||
129 | if ((n = recvmsg(socket, &msg, 0)) == -1) | 129 | if ((n = recvmsg(sock, &msg, 0)) == -1) |
130 | fatal("%s: recvmsg: %s", __func__, strerror(errno)); | 130 | fatal("%s: recvmsg: %s", __func__, strerror(errno)); |
131 | if (n != 1) | 131 | if (n != 1) |
132 | fatal("%s: recvmsg: expected received 1 got %ld", | 132 | fatal("%s: recvmsg: expected received 1 got %ld", |
@@ -137,6 +137,8 @@ mm_receive_fd(int socket) | |||
137 | fatal("%s: no fd", __func__); | 137 | fatal("%s: no fd", __func__); |
138 | #else | 138 | #else |
139 | cmsg = CMSG_FIRSTHDR(&msg); | 139 | cmsg = CMSG_FIRSTHDR(&msg); |
140 | if (cmsg == NULL) | ||
141 | fatal("%s: no message header", __func__); | ||
140 | if (!cmsg_type_is_broken() && cmsg->cmsg_type != SCM_RIGHTS) | 142 | if (!cmsg_type_is_broken() && cmsg->cmsg_type != SCM_RIGHTS) |
141 | fatal("%s: expected type %d got %d", __func__, | 143 | fatal("%s: expected type %d got %d", __func__, |
142 | SCM_RIGHTS, cmsg->cmsg_type); | 144 | SCM_RIGHTS, cmsg->cmsg_type); |
diff --git a/monitor_mm.c b/monitor_mm.c index e57c87cc2..ff523a5b1 100644 --- a/monitor_mm.c +++ b/monitor_mm.c | |||
@@ -24,7 +24,7 @@ | |||
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include "includes.h" | 26 | #include "includes.h" |
27 | RCSID("$OpenBSD: monitor_mm.c,v 1.8 2002/08/02 14:43:15 millert Exp $"); | 27 | RCSID("$OpenBSD: monitor_mm.c,v 1.9 2004/05/11 19:01:43 deraadt Exp $"); |
28 | 28 | ||
29 | #ifdef HAVE_SYS_MMAN_H | 29 | #ifdef HAVE_SYS_MMAN_H |
30 | #include <sys/mman.h> | 30 | #include <sys/mman.h> |
diff --git a/monitor_wrap.c b/monitor_wrap.c index ee2dc2027..0d7a0e3bd 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c | |||
@@ -25,7 +25,7 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "includes.h" | 27 | #include "includes.h" |
28 | RCSID("$OpenBSD: monitor_wrap.c,v 1.35 2003/11/17 11:06:07 markus Exp $"); | 28 | RCSID("$OpenBSD: monitor_wrap.c,v 1.39 2004/07/17 05:31:41 dtucker Exp $"); |
29 | 29 | ||
30 | #include <openssl/bn.h> | 30 | #include <openssl/bn.h> |
31 | #include <openssl/dh.h> | 31 | #include <openssl/dh.h> |
@@ -70,6 +70,7 @@ extern z_stream incoming_stream; | |||
70 | extern z_stream outgoing_stream; | 70 | extern z_stream outgoing_stream; |
71 | extern struct monitor *pmonitor; | 71 | extern struct monitor *pmonitor; |
72 | extern Buffer input, output; | 72 | extern Buffer input, output; |
73 | extern Buffer loginmsg; | ||
73 | extern ServerOptions options; | 74 | extern ServerOptions options; |
74 | 75 | ||
75 | int | 76 | int |
@@ -83,7 +84,7 @@ mm_is_monitor(void) | |||
83 | } | 84 | } |
84 | 85 | ||
85 | void | 86 | void |
86 | mm_request_send(int socket, enum monitor_reqtype type, Buffer *m) | 87 | mm_request_send(int sock, enum monitor_reqtype type, Buffer *m) |
87 | { | 88 | { |
88 | u_int mlen = buffer_len(m); | 89 | u_int mlen = buffer_len(m); |
89 | u_char buf[5]; | 90 | u_char buf[5]; |
@@ -92,14 +93,14 @@ mm_request_send(int socket, enum monitor_reqtype type, Buffer *m) | |||
92 | 93 | ||
93 | PUT_32BIT(buf, mlen + 1); | 94 | PUT_32BIT(buf, mlen + 1); |
94 | buf[4] = (u_char) type; /* 1st byte of payload is mesg-type */ | 95 | buf[4] = (u_char) type; /* 1st byte of payload is mesg-type */ |
95 | if (atomicio(vwrite, socket, buf, sizeof(buf)) != sizeof(buf)) | 96 | if (atomicio(vwrite, sock, buf, sizeof(buf)) != sizeof(buf)) |
96 | fatal("%s: write", __func__); | 97 | fatal("%s: write", __func__); |
97 | if (atomicio(vwrite, socket, buffer_ptr(m), mlen) != mlen) | 98 | if (atomicio(vwrite, sock, buffer_ptr(m), mlen) != mlen) |
98 | fatal("%s: write", __func__); | 99 | fatal("%s: write", __func__); |
99 | } | 100 | } |
100 | 101 | ||
101 | void | 102 | void |
102 | mm_request_receive(int socket, Buffer *m) | 103 | mm_request_receive(int sock, Buffer *m) |
103 | { | 104 | { |
104 | u_char buf[4]; | 105 | u_char buf[4]; |
105 | u_int msg_len; | 106 | u_int msg_len; |
@@ -107,7 +108,7 @@ mm_request_receive(int socket, Buffer *m) | |||
107 | 108 | ||
108 | debug3("%s entering", __func__); | 109 | debug3("%s entering", __func__); |
109 | 110 | ||
110 | res = atomicio(read, socket, buf, sizeof(buf)); | 111 | res = atomicio(read, sock, buf, sizeof(buf)); |
111 | if (res != sizeof(buf)) { | 112 | if (res != sizeof(buf)) { |
112 | if (res == 0) | 113 | if (res == 0) |
113 | cleanup_exit(255); | 114 | cleanup_exit(255); |
@@ -118,19 +119,19 @@ mm_request_receive(int socket, Buffer *m) | |||
118 | fatal("%s: read: bad msg_len %d", __func__, msg_len); | 119 | fatal("%s: read: bad msg_len %d", __func__, msg_len); |
119 | buffer_clear(m); | 120 | buffer_clear(m); |
120 | buffer_append_space(m, msg_len); | 121 | buffer_append_space(m, msg_len); |
121 | res = atomicio(read, socket, buffer_ptr(m), msg_len); | 122 | res = atomicio(read, sock, buffer_ptr(m), msg_len); |
122 | if (res != msg_len) | 123 | if (res != msg_len) |
123 | fatal("%s: read: %ld != msg_len", __func__, (long)res); | 124 | fatal("%s: read: %ld != msg_len", __func__, (long)res); |
124 | } | 125 | } |
125 | 126 | ||
126 | void | 127 | void |
127 | mm_request_receive_expect(int socket, enum monitor_reqtype type, Buffer *m) | 128 | mm_request_receive_expect(int sock, enum monitor_reqtype type, Buffer *m) |
128 | { | 129 | { |
129 | u_char rtype; | 130 | u_char rtype; |
130 | 131 | ||
131 | debug3("%s entering: type %d", __func__, type); | 132 | debug3("%s entering: type %d", __func__, type); |
132 | 133 | ||
133 | mm_request_receive(socket, m); | 134 | mm_request_receive(sock, m); |
134 | rtype = buffer_get_char(m); | 135 | rtype = buffer_get_char(m); |
135 | if (rtype != type) | 136 | if (rtype != type) |
136 | fatal("%s: read: rtype %d != type %d", __func__, | 137 | fatal("%s: read: rtype %d != type %d", __func__, |
@@ -194,7 +195,7 @@ mm_key_sign(Key *key, u_char **sigp, u_int *lenp, u_char *data, u_int datalen) | |||
194 | } | 195 | } |
195 | 196 | ||
196 | struct passwd * | 197 | struct passwd * |
197 | mm_getpwnamallow(const char *login) | 198 | mm_getpwnamallow(const char *username) |
198 | { | 199 | { |
199 | Buffer m; | 200 | Buffer m; |
200 | struct passwd *pw; | 201 | struct passwd *pw; |
@@ -203,7 +204,7 @@ mm_getpwnamallow(const char *login) | |||
203 | debug3("%s entering", __func__); | 204 | debug3("%s entering", __func__); |
204 | 205 | ||
205 | buffer_init(&m); | 206 | buffer_init(&m); |
206 | buffer_put_cstring(&m, login); | 207 | buffer_put_cstring(&m, username); |
207 | 208 | ||
208 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PWNAM, &m); | 209 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PWNAM, &m); |
209 | 210 | ||
@@ -544,7 +545,7 @@ mm_send_kex(Buffer *m, Kex *kex) | |||
544 | } | 545 | } |
545 | 546 | ||
546 | void | 547 | void |
547 | mm_send_keystate(struct monitor *pmonitor) | 548 | mm_send_keystate(struct monitor *monitor) |
548 | { | 549 | { |
549 | Buffer m; | 550 | Buffer m; |
550 | u_char *blob, *p; | 551 | u_char *blob, *p; |
@@ -580,7 +581,7 @@ mm_send_keystate(struct monitor *pmonitor) | |||
580 | goto skip; | 581 | goto skip; |
581 | } else { | 582 | } else { |
582 | /* Kex for rekeying */ | 583 | /* Kex for rekeying */ |
583 | mm_send_kex(&m, *pmonitor->m_pkex); | 584 | mm_send_kex(&m, *monitor->m_pkex); |
584 | } | 585 | } |
585 | 586 | ||
586 | debug3("%s: Sending new keys: %p %p", | 587 | debug3("%s: Sending new keys: %p %p", |
@@ -632,7 +633,7 @@ mm_send_keystate(struct monitor *pmonitor) | |||
632 | buffer_put_string(&m, buffer_ptr(&input), buffer_len(&input)); | 633 | buffer_put_string(&m, buffer_ptr(&input), buffer_len(&input)); |
633 | buffer_put_string(&m, buffer_ptr(&output), buffer_len(&output)); | 634 | buffer_put_string(&m, buffer_ptr(&output), buffer_len(&output)); |
634 | 635 | ||
635 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_KEYEXPORT, &m); | 636 | mm_request_send(monitor->m_recvfd, MONITOR_REQ_KEYEXPORT, &m); |
636 | debug3("%s: Finished sending state", __func__); | 637 | debug3("%s: Finished sending state", __func__); |
637 | 638 | ||
638 | buffer_free(&m); | 639 | buffer_free(&m); |
@@ -642,7 +643,7 @@ int | |||
642 | mm_pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen) | 643 | mm_pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen) |
643 | { | 644 | { |
644 | Buffer m; | 645 | Buffer m; |
645 | char *p; | 646 | char *p, *msg; |
646 | int success = 0; | 647 | int success = 0; |
647 | 648 | ||
648 | buffer_init(&m); | 649 | buffer_init(&m); |
@@ -658,11 +659,15 @@ mm_pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen) | |||
658 | return (0); | 659 | return (0); |
659 | } | 660 | } |
660 | p = buffer_get_string(&m, NULL); | 661 | p = buffer_get_string(&m, NULL); |
662 | msg = buffer_get_string(&m, NULL); | ||
661 | buffer_free(&m); | 663 | buffer_free(&m); |
662 | 664 | ||
663 | strlcpy(namebuf, p, namebuflen); /* Possible truncation */ | 665 | strlcpy(namebuf, p, namebuflen); /* Possible truncation */ |
664 | xfree(p); | 666 | xfree(p); |
665 | 667 | ||
668 | buffer_append(&loginmsg, msg, strlen(msg)); | ||
669 | xfree(msg); | ||
670 | |||
666 | *ptyfd = mm_receive_fd(pmonitor->m_recvfd); | 671 | *ptyfd = mm_receive_fd(pmonitor->m_recvfd); |
667 | *ttyfd = mm_receive_fd(pmonitor->m_recvfd); | 672 | *ttyfd = mm_receive_fd(pmonitor->m_recvfd); |
668 | 673 | ||
@@ -914,6 +919,7 @@ mm_bsdauth_respond(void *ctx, u_int numresponses, char **responses) | |||
914 | return ((authok == 0) ? -1 : 0); | 919 | return ((authok == 0) ? -1 : 0); |
915 | } | 920 | } |
916 | 921 | ||
922 | #ifdef SKEY | ||
917 | int | 923 | int |
918 | mm_skey_query(void *ctx, char **name, char **infotxt, | 924 | mm_skey_query(void *ctx, char **name, char **infotxt, |
919 | u_int *numprompts, char ***prompts, u_int **echo_on) | 925 | u_int *numprompts, char ***prompts, u_int **echo_on) |
@@ -977,6 +983,7 @@ mm_skey_respond(void *ctx, u_int numresponses, char **responses) | |||
977 | 983 | ||
978 | return ((authok == 0) ? -1 : 0); | 984 | return ((authok == 0) ? -1 : 0); |
979 | } | 985 | } |
986 | #endif /* SKEY */ | ||
980 | 987 | ||
981 | void | 988 | void |
982 | mm_ssh1_session_id(u_char session_id[16]) | 989 | mm_ssh1_session_id(u_char session_id[16]) |
@@ -1093,7 +1100,7 @@ mm_auth_rsa_verify_response(Key *key, BIGNUM *p, u_char response[16]) | |||
1093 | 1100 | ||
1094 | #ifdef GSSAPI | 1101 | #ifdef GSSAPI |
1095 | OM_uint32 | 1102 | OM_uint32 |
1096 | mm_ssh_gssapi_server_ctx(Gssctxt **ctx, gss_OID oid) | 1103 | mm_ssh_gssapi_server_ctx(Gssctxt **ctx, gss_OID goid) |
1097 | { | 1104 | { |
1098 | Buffer m; | 1105 | Buffer m; |
1099 | OM_uint32 major; | 1106 | OM_uint32 major; |
@@ -1102,7 +1109,7 @@ mm_ssh_gssapi_server_ctx(Gssctxt **ctx, gss_OID oid) | |||
1102 | *ctx = NULL; | 1109 | *ctx = NULL; |
1103 | 1110 | ||
1104 | buffer_init(&m); | 1111 | buffer_init(&m); |
1105 | buffer_put_string(&m, oid->elements, oid->length); | 1112 | buffer_put_string(&m, goid->elements, goid->length); |
1106 | 1113 | ||
1107 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSSETUP, &m); | 1114 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSSETUP, &m); |
1108 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSSETUP, &m); | 1115 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSSETUP, &m); |
diff --git a/monitor_wrap.h b/monitor_wrap.h index 2170b1324..e5cf5718c 100644 --- a/monitor_wrap.h +++ b/monitor_wrap.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor_wrap.h,v 1.13 2003/11/17 11:06:07 markus Exp $ */ | 1 | /* $OpenBSD: monitor_wrap.h,v 1.14 2004/06/21 17:36:31 avsm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
@@ -58,9 +58,9 @@ BIGNUM *mm_auth_rsa_generate_challenge(Key *); | |||
58 | 58 | ||
59 | #ifdef GSSAPI | 59 | #ifdef GSSAPI |
60 | #include "ssh-gss.h" | 60 | #include "ssh-gss.h" |
61 | OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **ctxt, gss_OID oid); | 61 | OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID); |
62 | OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *ctxt, | 62 | OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *, |
63 | gss_buffer_desc *recv, gss_buffer_desc *send, OM_uint32 *flags); | 63 | gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *); |
64 | int mm_ssh_gssapi_userok(char *user); | 64 | int mm_ssh_gssapi_userok(char *user); |
65 | OM_uint32 mm_ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t); | 65 | OM_uint32 mm_ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t); |
66 | #endif | 66 | #endif |
diff --git a/myproposal.h b/myproposal.h index 8b431d9d2..228ed6882 100644 --- a/myproposal.h +++ b/myproposal.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: myproposal.h,v 1.15 2003/05/17 04:27:52 markus Exp $ */ | 1 | /* $OpenBSD: myproposal.h,v 1.16 2004/06/13 12:53:24 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -23,7 +23,9 @@ | |||
23 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 23 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
24 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
25 | */ | 25 | */ |
26 | #define KEX_DEFAULT_KEX "diffie-hellman-group-exchange-sha1,diffie-hellman-group1-sha1" | 26 | #define KEX_DEFAULT_KEX "diffie-hellman-group-exchange-sha1," \ |
27 | "diffie-hellman-group14-sha1," \ | ||
28 | "diffie-hellman-group1-sha1" | ||
27 | #define KEX_DEFAULT_PK_ALG "ssh-rsa,ssh-dss" | 29 | #define KEX_DEFAULT_PK_ALG "ssh-rsa,ssh-dss" |
28 | #define KEX_DEFAULT_ENCRYPT \ | 30 | #define KEX_DEFAULT_ENCRYPT \ |
29 | "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour," \ | 31 | "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour," \ |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: nchan.c,v 1.49 2003/08/29 10:04:36 markus Exp $"); | 26 | RCSID("$OpenBSD: nchan.c,v 1.51 2004/07/11 17:48:47 deraadt Exp $"); |
27 | 27 | ||
28 | #include "ssh1.h" | 28 | #include "ssh1.h" |
29 | #include "ssh2.h" | 29 | #include "ssh2.h" |
@@ -42,15 +42,15 @@ RCSID("$OpenBSD: nchan.c,v 1.49 2003/08/29 10:04:36 markus Exp $"); | |||
42 | * tear down of channels: | 42 | * tear down of channels: |
43 | * | 43 | * |
44 | * 1.3: strict request-ack-protocol: | 44 | * 1.3: strict request-ack-protocol: |
45 | * CLOSE -> | 45 | * CLOSE -> |
46 | * <- CLOSE_CONFIRM | 46 | * <- CLOSE_CONFIRM |
47 | * | 47 | * |
48 | * 1.5: uses variations of: | 48 | * 1.5: uses variations of: |
49 | * IEOF -> | 49 | * IEOF -> |
50 | * <- OCLOSE | 50 | * <- OCLOSE |
51 | * <- IEOF | 51 | * <- IEOF |
52 | * OCLOSE -> | 52 | * OCLOSE -> |
53 | * i.e. both sides have to close the channel | 53 | * i.e. both sides have to close the channel |
54 | * | 54 | * |
55 | * 2.0: the EOF messages are optional | 55 | * 2.0: the EOF messages are optional |
56 | * | 56 | * |
@@ -395,7 +395,7 @@ chan_mark_dead(Channel *c) | |||
395 | } | 395 | } |
396 | 396 | ||
397 | int | 397 | int |
398 | chan_is_dead(Channel *c, int send) | 398 | chan_is_dead(Channel *c, int do_send) |
399 | { | 399 | { |
400 | if (c->type == SSH_CHANNEL_ZOMBIE) { | 400 | if (c->type == SSH_CHANNEL_ZOMBIE) { |
401 | debug2("channel %d: zombie", c->self); | 401 | debug2("channel %d: zombie", c->self); |
@@ -416,7 +416,7 @@ chan_is_dead(Channel *c, int send) | |||
416 | return 0; | 416 | return 0; |
417 | } | 417 | } |
418 | if (!(c->flags & CHAN_CLOSE_SENT)) { | 418 | if (!(c->flags & CHAN_CLOSE_SENT)) { |
419 | if (send) { | 419 | if (do_send) { |
420 | chan_send_close2(c); | 420 | chan_send_close2(c); |
421 | } else { | 421 | } else { |
422 | /* channel would be dead if we sent a close */ | 422 | /* channel would be dead if we sent a close */ |
diff --git a/openbsd-compat/Makefile.in b/openbsd-compat/Makefile.in index 5de20abbc..0f34f2240 100644 --- a/openbsd-compat/Makefile.in +++ b/openbsd-compat/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.30 2004/01/21 06:07:23 djm Exp $ | 1 | # $Id: Makefile.in,v 1.31 2004/08/15 08:41:00 djm Exp $ |
2 | 2 | ||
3 | sysconfdir=@sysconfdir@ | 3 | sysconfdir=@sysconfdir@ |
4 | piddir=@piddir@ | 4 | piddir=@piddir@ |
@@ -18,7 +18,7 @@ LDFLAGS=-L. @LDFLAGS@ | |||
18 | 18 | ||
19 | OPENBSD=base64.o basename.o bindresvport.o daemon.o dirname.o getcwd.o getgrouplist.o getopt.o getrrsetbyname.o glob.o inet_aton.o inet_ntoa.o inet_ntop.o mktemp.o readpassphrase.o realpath.o rresvport.o setenv.o setproctitle.o sigact.o strlcat.o strlcpy.o strmode.o strsep.o strtoul.o vis.o | 19 | OPENBSD=base64.o basename.o bindresvport.o daemon.o dirname.o getcwd.o getgrouplist.o getopt.o getrrsetbyname.o glob.o inet_aton.o inet_ntoa.o inet_ntop.o mktemp.o readpassphrase.o realpath.o rresvport.o setenv.o setproctitle.o sigact.o strlcat.o strlcpy.o strmode.o strsep.o strtoul.o vis.o |
20 | 20 | ||
21 | COMPAT=bsd-arc4random.o bsd-cray.o bsd-cygwin_util.o bsd-getpeereid.o bsd-misc.o bsd-nextstep.o bsd-openpty.o bsd-snprintf.o bsd-waitpid.o fake-rfc2553.o xmmap.o xcrypt.o | 21 | COMPAT=bsd-arc4random.o bsd-closefrom.o bsd-cray.o bsd-cygwin_util.o bsd-getpeereid.o bsd-misc.o bsd-nextstep.o bsd-openpty.o bsd-snprintf.o bsd-waitpid.o fake-rfc2553.o xmmap.o xcrypt.o |
22 | 22 | ||
23 | PORTS=port-irix.o port-aix.o | 23 | PORTS=port-irix.o port-aix.o |
24 | 24 | ||
diff --git a/openbsd-compat/bsd-arc4random.c b/openbsd-compat/bsd-arc4random.c index 22003ff0a..5284e1af8 100644 --- a/openbsd-compat/bsd-arc4random.c +++ b/openbsd-compat/bsd-arc4random.c | |||
@@ -17,7 +17,7 @@ | |||
17 | #include "includes.h" | 17 | #include "includes.h" |
18 | #include "log.h" | 18 | #include "log.h" |
19 | 19 | ||
20 | RCSID("$Id: bsd-arc4random.c,v 1.8 2004/02/17 05:49:55 djm Exp $"); | 20 | RCSID("$Id: bsd-arc4random.c,v 1.9 2004/07/18 23:30:40 djm Exp $"); |
21 | 21 | ||
22 | #ifndef HAVE_ARC4RANDOM | 22 | #ifndef HAVE_ARC4RANDOM |
23 | 23 | ||
@@ -56,13 +56,21 @@ unsigned int arc4random(void) | |||
56 | void arc4random_stir(void) | 56 | void arc4random_stir(void) |
57 | { | 57 | { |
58 | unsigned char rand_buf[SEED_SIZE]; | 58 | unsigned char rand_buf[SEED_SIZE]; |
59 | int i; | ||
59 | 60 | ||
60 | memset(&rc4, 0, sizeof(rc4)); | 61 | memset(&rc4, 0, sizeof(rc4)); |
61 | if (RAND_bytes(rand_buf, sizeof(rand_buf)) <= 0) | 62 | if (RAND_bytes(rand_buf, sizeof(rand_buf)) <= 0) |
62 | fatal("Couldn't obtain random bytes (error %ld)", | 63 | fatal("Couldn't obtain random bytes (error %ld)", |
63 | ERR_get_error()); | 64 | ERR_get_error()); |
64 | RC4_set_key(&rc4, sizeof(rand_buf), rand_buf); | 65 | RC4_set_key(&rc4, sizeof(rand_buf), rand_buf); |
65 | RC4(&rc4, sizeof(rand_buf), rand_buf, rand_buf); | 66 | |
67 | /* | ||
68 | * Discard early keystream, as per recommendations in: | ||
69 | * http://www.wisdom.weizmann.ac.il/~itsik/RC4/Papers/Rc4_ksa.ps | ||
70 | */ | ||
71 | for(i = 0; i <= 256; i += sizeof(rand_buf)) | ||
72 | RC4(&rc4, sizeof(rand_buf), rand_buf, rand_buf); | ||
73 | |||
66 | memset(rand_buf, 0, sizeof(rand_buf)); | 74 | memset(rand_buf, 0, sizeof(rand_buf)); |
67 | 75 | ||
68 | rc4_ready = REKEY_BYTES; | 76 | rc4_ready = REKEY_BYTES; |
diff --git a/openbsd-compat/bsd-closefrom.c b/openbsd-compat/bsd-closefrom.c new file mode 100644 index 000000000..61a9fa391 --- /dev/null +++ b/openbsd-compat/bsd-closefrom.c | |||
@@ -0,0 +1,100 @@ | |||
1 | /* | ||
2 | * Copyright (c) 2004 Todd C. Miller <Todd.Miller@courtesan.com> | ||
3 | * | ||
4 | * Permission to use, copy, modify, and distribute this software for any | ||
5 | * purpose with or without fee is hereby granted, provided that the above | ||
6 | * copyright notice and this permission notice appear in all copies. | ||
7 | * | ||
8 | * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
9 | * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
10 | * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
11 | * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
12 | * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
13 | * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
14 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
15 | */ | ||
16 | |||
17 | #include "includes.h" | ||
18 | |||
19 | #ifndef HAVE_CLOSEFROM | ||
20 | |||
21 | #include <sys/types.h> | ||
22 | #include <sys/param.h> | ||
23 | #include <unistd.h> | ||
24 | #include <stdio.h> | ||
25 | #include <limits.h> | ||
26 | #include <stdlib.h> | ||
27 | #include <stddef.h> | ||
28 | #ifdef HAVE_DIRENT_H | ||
29 | # include <dirent.h> | ||
30 | # define NAMLEN(dirent) strlen((dirent)->d_name) | ||
31 | #else | ||
32 | # define dirent direct | ||
33 | # define NAMLEN(dirent) (dirent)->d_namlen | ||
34 | # ifdef HAVE_SYS_NDIR_H | ||
35 | # include <sys/ndir.h> | ||
36 | # endif | ||
37 | # ifdef HAVE_SYS_DIR_H | ||
38 | # include <sys/dir.h> | ||
39 | # endif | ||
40 | # ifdef HAVE_NDIR_H | ||
41 | # include <ndir.h> | ||
42 | # endif | ||
43 | #endif | ||
44 | |||
45 | #ifndef OPEN_MAX | ||
46 | # define OPEN_MAX 256 | ||
47 | #endif | ||
48 | |||
49 | RCSID("$Id: bsd-closefrom.c,v 1.1 2004/08/15 08:41:00 djm Exp $"); | ||
50 | |||
51 | #ifndef lint | ||
52 | static const char sudorcsid[] = "$Sudo: closefrom.c,v 1.6 2004/06/01 20:51:56 millert Exp $"; | ||
53 | #endif /* lint */ | ||
54 | |||
55 | /* | ||
56 | * Close all file descriptors greater than or equal to lowfd. | ||
57 | */ | ||
58 | void | ||
59 | closefrom(int lowfd) | ||
60 | { | ||
61 | long fd, maxfd; | ||
62 | #if defined(HAVE_DIRFD) && defined(HAVE_PROC_PID) | ||
63 | char fdpath[PATH_MAX], *endp; | ||
64 | struct dirent *dent; | ||
65 | DIR *dirp; | ||
66 | int len; | ||
67 | |||
68 | /* Check for a /proc/$$/fd directory. */ | ||
69 | len = snprintf(fdpath, sizeof(fdpath), "/proc/%ld/fd", (long)getpid()); | ||
70 | if (len != -1 && len <= sizeof(fdpath) && (dirp = opendir(fdpath))) { | ||
71 | while ((dent = readdir(dirp)) != NULL) { | ||
72 | fd = strtol(dent->d_name, &endp, 10); | ||
73 | if (dent->d_name != endp && *endp == '\0' && | ||
74 | fd >= 0 && fd < INT_MAX && fd >= lowfd && fd != dirfd(dirp)) | ||
75 | (void) close((int) fd); | ||
76 | } | ||
77 | (void) closedir(dirp); | ||
78 | } else | ||
79 | #endif | ||
80 | { | ||
81 | /* | ||
82 | * Fall back on sysconf() or getdtablesize(). We avoid checking | ||
83 | * resource limits since it is possible to open a file descriptor | ||
84 | * and then drop the rlimit such that it is below the open fd. | ||
85 | */ | ||
86 | #ifdef HAVE_SYSCONF | ||
87 | maxfd = sysconf(_SC_OPEN_MAX); | ||
88 | #else | ||
89 | maxfd = getdtablesize(); | ||
90 | #endif /* HAVE_SYSCONF */ | ||
91 | if (maxfd < 0) | ||
92 | maxfd = OPEN_MAX; | ||
93 | |||
94 | for (fd = lowfd; fd < maxfd; fd++) | ||
95 | (void) close((int) fd); | ||
96 | } | ||
97 | } | ||
98 | |||
99 | #endif /* HAVE_CLOSEFROM */ | ||
100 | |||
diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c index 7b06786f5..1b276b4f4 100644 --- a/openbsd-compat/bsd-misc.c +++ b/openbsd-compat/bsd-misc.c | |||
@@ -1,3 +1,4 @@ | |||
1 | |||
1 | /* | 2 | /* |
2 | * Copyright (c) 1999-2004 Damien Miller <djm@mindrot.org> | 3 | * Copyright (c) 1999-2004 Damien Miller <djm@mindrot.org> |
3 | * | 4 | * |
@@ -17,7 +18,11 @@ | |||
17 | #include "includes.h" | 18 | #include "includes.h" |
18 | #include "xmalloc.h" | 19 | #include "xmalloc.h" |
19 | 20 | ||
20 | RCSID("$Id: bsd-misc.c,v 1.21 2004/02/17 05:49:55 djm Exp $"); | 21 | RCSID("$Id: bsd-misc.c,v 1.25 2004/08/15 08:41:00 djm Exp $"); |
22 | |||
23 | #ifndef HAVE___PROGNAME | ||
24 | char *__progname; | ||
25 | #endif | ||
21 | 26 | ||
22 | /* | 27 | /* |
23 | * NB. duplicate __progname in case it is an alias for argv[0] | 28 | * NB. duplicate __progname in case it is an alias for argv[0] |
diff --git a/openbsd-compat/bsd-misc.h b/openbsd-compat/bsd-misc.h index 009739b14..33a1d707f 100644 --- a/openbsd-compat/bsd-misc.h +++ b/openbsd-compat/bsd-misc.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: bsd-misc.h,v 1.15 2004/03/08 11:59:03 dtucker Exp $ */ | 1 | /* $Id: bsd-misc.h,v 1.17 2004/08/15 08:41:00 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1999-2004 Damien Miller <djm@mindrot.org> | 4 | * Copyright (c) 1999-2004 Damien Miller <djm@mindrot.org> |
diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c index 66d18142e..660427c1f 100644 --- a/openbsd-compat/getrrsetbyname.c +++ b/openbsd-compat/getrrsetbyname.c | |||
@@ -53,6 +53,10 @@ | |||
53 | 53 | ||
54 | #define ANSWER_BUFFER_SIZE 1024*64 | 54 | #define ANSWER_BUFFER_SIZE 1024*64 |
55 | 55 | ||
56 | #if defined(HAVE_DECL_H_ERRNO) && !HAVE_DECL_H_ERRNO | ||
57 | extern int h_errno; | ||
58 | #endif | ||
59 | |||
56 | struct dns_query { | 60 | struct dns_query { |
57 | char *name; | 61 | char *name; |
58 | u_int16_t type; | 62 | u_int16_t type; |
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h index 6be1bcda4..89d1454e0 100644 --- a/openbsd-compat/openbsd-compat.h +++ b/openbsd-compat/openbsd-compat.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: openbsd-compat.h,v 1.25 2004/01/21 06:07:23 djm Exp $ */ | 1 | /* $Id: openbsd-compat.h,v 1.26 2004/08/15 08:41:00 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. | 4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. |
@@ -48,6 +48,10 @@ char *basename(const char *path); | |||
48 | int bindresvport_sa(int sd, struct sockaddr *sa); | 48 | int bindresvport_sa(int sd, struct sockaddr *sa); |
49 | #endif | 49 | #endif |
50 | 50 | ||
51 | #ifndef HAVE_CLOSEFROM | ||
52 | void closefrom(int); | ||
53 | #endif | ||
54 | |||
51 | #ifndef HAVE_GETCWD | 55 | #ifndef HAVE_GETCWD |
52 | char *getcwd(char *pt, size_t size); | 56 | char *getcwd(char *pt, size_t size); |
53 | #endif | 57 | #endif |
diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c index 2895f0d44..78f4faea3 100644 --- a/openbsd-compat/port-aix.c +++ b/openbsd-compat/port-aix.c | |||
@@ -101,7 +101,7 @@ aix_remove_embedded_newlines(char *p) | |||
101 | int | 101 | int |
102 | sys_auth_passwd(Authctxt *ctxt, const char *password) | 102 | sys_auth_passwd(Authctxt *ctxt, const char *password) |
103 | { | 103 | { |
104 | char *authmsg = NULL, *host, *msg, *name = ctxt->pw->pw_name; | 104 | char *authmsg = NULL, *msg, *name = ctxt->pw->pw_name; |
105 | int authsuccess = 0, expired, reenter, result; | 105 | int authsuccess = 0, expired, reenter, result; |
106 | 106 | ||
107 | do { | 107 | do { |
@@ -115,30 +115,21 @@ sys_auth_passwd(Authctxt *ctxt, const char *password) | |||
115 | if (result == 0) { | 115 | if (result == 0) { |
116 | authsuccess = 1; | 116 | authsuccess = 1; |
117 | 117 | ||
118 | host = (char *)get_canonical_hostname(options.use_dns); | ||
119 | |||
120 | /* | 118 | /* |
121 | * Record successful login. We don't have a pty yet, so just | 119 | * Record successful login. We don't have a pty yet, so just |
122 | * label the line as "ssh" | 120 | * label the line as "ssh" |
123 | */ | 121 | */ |
124 | aix_setauthdb(name); | 122 | aix_setauthdb(name); |
125 | if (loginsuccess((char *)name, (char *)host, "ssh", &msg) == 0) { | ||
126 | if (msg != NULL) { | ||
127 | debug("%s: msg %s", __func__, msg); | ||
128 | buffer_append(&loginmsg, msg, strlen(msg)); | ||
129 | xfree(msg); | ||
130 | } | ||
131 | } | ||
132 | 123 | ||
133 | /* | 124 | /* |
134 | * Check if the user's password is expired. | 125 | * Check if the user's password is expired. |
135 | */ | 126 | */ |
136 | expired = passwdexpired(name, &msg); | 127 | expired = passwdexpired(name, &msg); |
137 | if (msg && *msg) { | 128 | if (msg && *msg) { |
138 | buffer_append(&loginmsg, msg, strlen(msg)); | 129 | buffer_append(&loginmsg, msg, strlen(msg)); |
139 | aix_remove_embedded_newlines(msg); | 130 | aix_remove_embedded_newlines(msg); |
140 | } | 131 | } |
141 | debug3("AIX/passwdexpired returned %d msg %.100s", expired, msg); | 132 | debug3("AIX/passwdexpired returned %d msg %.100s", expired, msg); |
142 | 133 | ||
143 | switch (expired) { | 134 | switch (expired) { |
144 | case 0: /* password not expired */ | 135 | case 0: /* password not expired */ |
@@ -163,7 +154,70 @@ sys_auth_passwd(Authctxt *ctxt, const char *password) | |||
163 | 154 | ||
164 | return authsuccess; | 155 | return authsuccess; |
165 | } | 156 | } |
166 | 157 | ||
158 | /* | ||
159 | * Check if specified account is permitted to log in. | ||
160 | * Returns 1 if login is allowed, 0 if not allowed. | ||
161 | */ | ||
162 | int | ||
163 | sys_auth_allowed_user(struct passwd *pw) | ||
164 | { | ||
165 | char *msg = NULL; | ||
166 | int result, permitted = 0; | ||
167 | struct stat st; | ||
168 | |||
169 | /* | ||
170 | * Don't perform checks for root account (PermitRootLogin controls | ||
171 | * logins via * ssh) or if running as non-root user (since | ||
172 | * loginrestrictions will always fail due to insufficient privilege). | ||
173 | */ | ||
174 | if (pw->pw_uid == 0 || geteuid() != 0) { | ||
175 | debug3("%s: not checking", __func__); | ||
176 | return 1; | ||
177 | } | ||
178 | |||
179 | result = loginrestrictions(pw->pw_name, S_RLOGIN, NULL, &msg); | ||
180 | if (result == 0) | ||
181 | permitted = 1; | ||
182 | /* | ||
183 | * If restricted because /etc/nologin exists, the login will be denied | ||
184 | * in session.c after the nologin message is sent, so allow for now | ||
185 | * and do not append the returned message. | ||
186 | */ | ||
187 | if (result == -1 && errno == EPERM && stat(_PATH_NOLOGIN, &st) == 0) | ||
188 | permitted = 1; | ||
189 | else if (msg != NULL) | ||
190 | buffer_append(&loginmsg, msg, strlen(msg)); | ||
191 | if (msg == NULL) | ||
192 | msg = xstrdup("(none)"); | ||
193 | aix_remove_embedded_newlines(msg); | ||
194 | debug3("AIX/loginrestrictions returned %d msg %.100s", result, msg); | ||
195 | |||
196 | if (!permitted) | ||
197 | logit("Login restricted for %s: %.100s", pw->pw_name, msg); | ||
198 | xfree(msg); | ||
199 | return permitted; | ||
200 | } | ||
201 | |||
202 | int | ||
203 | sys_auth_record_login(const char *user, const char *host, const char *ttynm) | ||
204 | { | ||
205 | char *msg; | ||
206 | int success = 0; | ||
207 | |||
208 | aix_setauthdb(user); | ||
209 | if (loginsuccess((char *)user, host, ttynm, &msg) == 0) { | ||
210 | success = 1; | ||
211 | if (msg != NULL) { | ||
212 | debug("AIX/loginsuccess: msg %s", __func__, msg); | ||
213 | buffer_append(&loginmsg, msg, strlen(msg)); | ||
214 | xfree(msg); | ||
215 | } | ||
216 | } | ||
217 | aix_restoreauthdb(); | ||
218 | return (success); | ||
219 | } | ||
220 | |||
167 | # ifdef CUSTOM_FAILED_LOGIN | 221 | # ifdef CUSTOM_FAILED_LOGIN |
168 | /* | 222 | /* |
169 | * record_failed_login: generic "login failed" interface function | 223 | * record_failed_login: generic "login failed" interface function |
diff --git a/openbsd-compat/port-aix.h b/openbsd-compat/port-aix.h index 3118af9a9..29e9751ce 100644 --- a/openbsd-compat/port-aix.h +++ b/openbsd-compat/port-aix.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: port-aix.h,v 1.19 2004/02/10 04:27:35 dtucker Exp $ */ | 1 | /* $Id: port-aix.h,v 1.21 2004/08/14 14:09:12 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * | 4 | * |
@@ -63,6 +63,10 @@ void aix_usrinfo(struct passwd *); | |||
63 | 63 | ||
64 | #ifdef WITH_AIXAUTHENTICATE | 64 | #ifdef WITH_AIXAUTHENTICATE |
65 | # define CUSTOM_SYS_AUTH_PASSWD 1 | 65 | # define CUSTOM_SYS_AUTH_PASSWD 1 |
66 | # define CUSTOM_SYS_AUTH_ALLOWED_USER 1 | ||
67 | int sys_auth_allowed_user(struct passwd *); | ||
68 | # define CUSTOM_SYS_AUTH_RECORD_LOGIN 1 | ||
69 | int sys_auth_record_login(const char *, const char *, const char *); | ||
66 | # define CUSTOM_FAILED_LOGIN 1 | 70 | # define CUSTOM_FAILED_LOGIN 1 |
67 | void record_failed_login(const char *, const char *); | 71 | void record_failed_login(const char *, const char *); |
68 | #endif | 72 | #endif |
diff --git a/openbsd-compat/sys-queue.h b/openbsd-compat/sys-queue.h index 8ff19e452..c49a94650 100644 --- a/openbsd-compat/sys-queue.h +++ b/openbsd-compat/sys-queue.h | |||
@@ -1,6 +1,6 @@ | |||
1 | /* OPENBSD ORIGINAL: sys/sys/queue.h */ | 1 | /* OPENBSD ORIGINAL: sys/sys/queue.h */ |
2 | 2 | ||
3 | /* $OpenBSD: queue.h,v 1.23 2003/06/02 23:28:21 millert Exp $ */ | 3 | /* $OpenBSD: queue.h,v 1.25 2004/04/08 16:08:21 henning Exp $ */ |
4 | /* $NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $ */ | 4 | /* $NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $ */ |
5 | 5 | ||
6 | /* | 6 | /* |
@@ -38,12 +38,13 @@ | |||
38 | #define _FAKE_QUEUE_H_ | 38 | #define _FAKE_QUEUE_H_ |
39 | 39 | ||
40 | /* | 40 | /* |
41 | * Ignore all <sys/queue.h> since older platforms have broken/incomplete | 41 | * Require for OS/X and other platforms that have old/broken/incomplete |
42 | * <sys/queue.h> that are too hard to work around. | 42 | * <sys/queue.h>. |
43 | */ | 43 | */ |
44 | #undef SLIST_HEAD | 44 | #undef SLIST_HEAD |
45 | #undef SLIST_HEAD_INITIALIZER | 45 | #undef SLIST_HEAD_INITIALIZER |
46 | #undef SLIST_ENTRY | 46 | #undef SLIST_ENTRY |
47 | #undef SLIST_FOREACH_PREVPTR | ||
47 | #undef SLIST_FIRST | 48 | #undef SLIST_FIRST |
48 | #undef SLIST_END | 49 | #undef SLIST_END |
49 | #undef SLIST_EMPTY | 50 | #undef SLIST_EMPTY |
@@ -54,6 +55,7 @@ | |||
54 | #undef SLIST_INSERT_HEAD | 55 | #undef SLIST_INSERT_HEAD |
55 | #undef SLIST_REMOVE_HEAD | 56 | #undef SLIST_REMOVE_HEAD |
56 | #undef SLIST_REMOVE | 57 | #undef SLIST_REMOVE |
58 | #undef SLIST_REMOVE_NEXT | ||
57 | #undef LIST_HEAD | 59 | #undef LIST_HEAD |
58 | #undef LIST_HEAD_INITIALIZER | 60 | #undef LIST_HEAD_INITIALIZER |
59 | #undef LIST_ENTRY | 61 | #undef LIST_ENTRY |
@@ -194,6 +196,11 @@ struct { \ | |||
194 | (var) != SLIST_END(head); \ | 196 | (var) != SLIST_END(head); \ |
195 | (var) = SLIST_NEXT(var, field)) | 197 | (var) = SLIST_NEXT(var, field)) |
196 | 198 | ||
199 | #define SLIST_FOREACH_PREVPTR(var, varp, head, field) \ | ||
200 | for ((varp) = &SLIST_FIRST((head)); \ | ||
201 | ((var) = *(varp)) != SLIST_END(head); \ | ||
202 | (varp) = &SLIST_NEXT((var), field)) | ||
203 | |||
197 | /* | 204 | /* |
198 | * Singly-linked List functions. | 205 | * Singly-linked List functions. |
199 | */ | 206 | */ |
@@ -211,6 +218,10 @@ struct { \ | |||
211 | (head)->slh_first = (elm); \ | 218 | (head)->slh_first = (elm); \ |
212 | } while (0) | 219 | } while (0) |
213 | 220 | ||
221 | #define SLIST_REMOVE_NEXT(head, elm, field) do { \ | ||
222 | (elm)->field.sle_next = (elm)->field.sle_next->field.sle_next; \ | ||
223 | } while (0) | ||
224 | |||
214 | #define SLIST_REMOVE_HEAD(head, field) do { \ | 225 | #define SLIST_REMOVE_HEAD(head, field) do { \ |
215 | (head)->slh_first = (head)->slh_first->field.sle_next; \ | 226 | (head)->slh_first = (head)->slh_first->field.sle_next; \ |
216 | } while (0) | 227 | } while (0) |
@@ -400,7 +411,7 @@ struct { \ | |||
400 | (var) != TAILQ_END(head); \ | 411 | (var) != TAILQ_END(head); \ |
401 | (var) = TAILQ_NEXT(var, field)) | 412 | (var) = TAILQ_NEXT(var, field)) |
402 | 413 | ||
403 | #define TAILQ_FOREACH_REVERSE(var, head, field, headname) \ | 414 | #define TAILQ_FOREACH_REVERSE(var, head, headname, field) \ |
404 | for((var) = TAILQ_LAST(head, headname); \ | 415 | for((var) = TAILQ_LAST(head, headname); \ |
405 | (var) != TAILQ_END(head); \ | 416 | (var) != TAILQ_END(head); \ |
406 | (var) = TAILQ_PREV(var, headname, field)) | 417 | (var) = TAILQ_PREV(var, headname, field)) |
diff --git a/openbsd-compat/xmmap.c b/openbsd-compat/xmmap.c index 9dc4340a7..c8d59dee0 100644 --- a/openbsd-compat/xmmap.c +++ b/openbsd-compat/xmmap.c | |||
@@ -23,7 +23,7 @@ | |||
23 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 | */ | 24 | */ |
25 | 25 | ||
26 | /* $Id: xmmap.c,v 1.3 2003/06/02 02:25:27 tim Exp $ */ | 26 | /* $Id: xmmap.c,v 1.5 2004/08/14 13:55:38 dtucker Exp $ */ |
27 | 27 | ||
28 | #include "includes.h" | 28 | #include "includes.h" |
29 | 29 | ||
@@ -40,25 +40,28 @@ void *xmmap(size_t size) | |||
40 | #ifdef HAVE_MMAP | 40 | #ifdef HAVE_MMAP |
41 | # ifdef MAP_ANON | 41 | # ifdef MAP_ANON |
42 | address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_ANON|MAP_SHARED, | 42 | address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_ANON|MAP_SHARED, |
43 | -1, 0); | 43 | -1, (off_t)0); |
44 | # else | 44 | # else |
45 | address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_SHARED, | 45 | address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_SHARED, |
46 | open("/dev/zero", O_RDWR), 0); | 46 | open("/dev/zero", O_RDWR), (off_t)0); |
47 | # endif | 47 | # endif |
48 | 48 | ||
49 | #define MM_SWAP_TEMPLATE "/var/run/sshd.mm.XXXXXXXX" | 49 | #define MM_SWAP_TEMPLATE "/var/run/sshd.mm.XXXXXXXX" |
50 | if (address == MAP_FAILED) { | 50 | if (address == MAP_FAILED) { |
51 | char tmpname[sizeof(MM_SWAP_TEMPLATE)] = MM_SWAP_TEMPLATE; | 51 | char tmpname[sizeof(MM_SWAP_TEMPLATE)] = MM_SWAP_TEMPLATE; |
52 | int tmpfd; | 52 | int tmpfd; |
53 | mode_t old_umask; | ||
53 | 54 | ||
55 | old_umask = umask(0177); | ||
54 | tmpfd = mkstemp(tmpname); | 56 | tmpfd = mkstemp(tmpname); |
57 | umask(old_umask); | ||
55 | if (tmpfd == -1) | 58 | if (tmpfd == -1) |
56 | fatal("mkstemp(\"%s\"): %s", | 59 | fatal("mkstemp(\"%s\"): %s", |
57 | MM_SWAP_TEMPLATE, strerror(errno)); | 60 | MM_SWAP_TEMPLATE, strerror(errno)); |
58 | unlink(tmpname); | 61 | unlink(tmpname); |
59 | ftruncate(tmpfd, size); | 62 | ftruncate(tmpfd, size); |
60 | address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_SHARED, | 63 | address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_SHARED, |
61 | tmpfd, 0); | 64 | tmpfd, (off_t)0); |
62 | close(tmpfd); | 65 | close(tmpfd); |
63 | } | 66 | } |
64 | 67 | ||
diff --git a/contrib/solaris/opensshd.in b/opensshd.init.in index 50e18deea..ffa7cdac2 100755 --- a/contrib/solaris/opensshd.in +++ b/opensshd.init.in | |||
@@ -5,19 +5,19 @@ | |||
5 | 5 | ||
6 | umask 022 | 6 | umask 022 |
7 | 7 | ||
8 | CAT=/usr/bin/cat | 8 | CAT=@CAT@ |
9 | KILL=/usr/bin/kill | 9 | KILL=@KILL@ |
10 | 10 | ||
11 | prefix=%%openSSHDir%% | 11 | prefix=@prefix@ |
12 | etcdir=%%configDir%% | 12 | sysconfdir=@sysconfdir@ |
13 | piddir=%%pidDir%% | 13 | piddir=@piddir@ |
14 | 14 | ||
15 | SSHD=$prefix/sbin/sshd | 15 | SSHD=$prefix/sbin/sshd |
16 | PIDFILE=$piddir/sshd.pid | 16 | PIDFILE=$piddir/sshd.pid |
17 | SSH_KEYGEN=$prefix/bin/ssh-keygen | 17 | SSH_KEYGEN=$prefix/bin/ssh-keygen |
18 | HOST_KEY_RSA1=$etcdir/ssh_host_key | 18 | HOST_KEY_RSA1=$sysconfdir/ssh_host_key |
19 | HOST_KEY_DSA=$etcdir/ssh_host_dsa_key | 19 | HOST_KEY_DSA=$sysconfdir/ssh_host_dsa_key |
20 | HOST_KEY_RSA=$etcdir/ssh_host_rsa_key | 20 | HOST_KEY_RSA=$sysconfdir/ssh_host_rsa_key |
21 | 21 | ||
22 | 22 | ||
23 | checkkeys() { | 23 | checkkeys() { |
@@ -37,7 +37,7 @@ | |||
37 | */ | 37 | */ |
38 | 38 | ||
39 | #include "includes.h" | 39 | #include "includes.h" |
40 | RCSID("$OpenBSD: packet.c,v 1.112 2003/09/23 20:17:11 markus Exp $"); | 40 | RCSID("$OpenBSD: packet.c,v 1.115 2004/06/21 17:36:31 avsm Exp $"); |
41 | 41 | ||
42 | #include "openbsd-compat/sys-queue.h" | 42 | #include "openbsd-compat/sys-queue.h" |
43 | 43 | ||
@@ -157,8 +157,10 @@ packet_set_connection(int fd_in, int fd_out, int new_setup_timeout) | |||
157 | connection_in = fd_in; | 157 | connection_in = fd_in; |
158 | connection_out = fd_out; | 158 | connection_out = fd_out; |
159 | setup_timeout = new_setup_timeout; | 159 | setup_timeout = new_setup_timeout; |
160 | cipher_init(&send_context, none, "", 0, NULL, 0, CIPHER_ENCRYPT); | 160 | cipher_init(&send_context, none, (const u_char *)"", |
161 | cipher_init(&receive_context, none, "", 0, NULL, 0, CIPHER_DECRYPT); | 161 | 0, NULL, 0, CIPHER_ENCRYPT); |
162 | cipher_init(&receive_context, none, (const u_char *)"", | ||
163 | 0, NULL, 0, CIPHER_DECRYPT); | ||
162 | newkeys[MODE_IN] = newkeys[MODE_OUT] = NULL; | 164 | newkeys[MODE_IN] = newkeys[MODE_OUT] = NULL; |
163 | if (!initialized) { | 165 | if (!initialized) { |
164 | initialized = 1; | 166 | initialized = 1; |
@@ -320,13 +322,10 @@ void | |||
320 | packet_set_nonblocking(void) | 322 | packet_set_nonblocking(void) |
321 | { | 323 | { |
322 | /* Set the socket into non-blocking mode. */ | 324 | /* Set the socket into non-blocking mode. */ |
323 | if (fcntl(connection_in, F_SETFL, O_NONBLOCK) < 0) | 325 | set_nonblock(connection_in); |
324 | error("fcntl O_NONBLOCK: %.100s", strerror(errno)); | ||
325 | 326 | ||
326 | if (connection_out != connection_in) { | 327 | if (connection_out != connection_in) |
327 | if (fcntl(connection_out, F_SETFL, O_NONBLOCK) < 0) | 328 | set_nonblock(connection_out); |
328 | error("fcntl O_NONBLOCK: %.100s", strerror(errno)); | ||
329 | } | ||
330 | } | 329 | } |
331 | 330 | ||
332 | /* Returns the socket used for reading. */ | 331 | /* Returns the socket used for reading. */ |
@@ -511,7 +510,7 @@ packet_send1(void) | |||
511 | u_char buf[8], *cp; | 510 | u_char buf[8], *cp; |
512 | int i, padding, len; | 511 | int i, padding, len; |
513 | u_int checksum; | 512 | u_int checksum; |
514 | u_int32_t rand = 0; | 513 | u_int32_t rnd = 0; |
515 | 514 | ||
516 | /* | 515 | /* |
517 | * If using packet compression, compress the payload of the outgoing | 516 | * If using packet compression, compress the payload of the outgoing |
@@ -537,9 +536,9 @@ packet_send1(void) | |||
537 | cp = buffer_ptr(&outgoing_packet); | 536 | cp = buffer_ptr(&outgoing_packet); |
538 | for (i = 0; i < padding; i++) { | 537 | for (i = 0; i < padding; i++) { |
539 | if (i % 4 == 0) | 538 | if (i % 4 == 0) |
540 | rand = arc4random(); | 539 | rnd = arc4random(); |
541 | cp[7 - i] = rand & 0xff; | 540 | cp[7 - i] = rnd & 0xff; |
542 | rand >>= 8; | 541 | rnd >>= 8; |
543 | } | 542 | } |
544 | } | 543 | } |
545 | buffer_consume(&outgoing_packet, 8 - padding); | 544 | buffer_consume(&outgoing_packet, 8 - padding); |
@@ -584,18 +583,18 @@ set_newkeys(int mode) | |||
584 | Comp *comp; | 583 | Comp *comp; |
585 | CipherContext *cc; | 584 | CipherContext *cc; |
586 | u_int64_t *max_blocks; | 585 | u_int64_t *max_blocks; |
587 | int encrypt; | 586 | int crypt_type; |
588 | 587 | ||
589 | debug2("set_newkeys: mode %d", mode); | 588 | debug2("set_newkeys: mode %d", mode); |
590 | 589 | ||
591 | if (mode == MODE_OUT) { | 590 | if (mode == MODE_OUT) { |
592 | cc = &send_context; | 591 | cc = &send_context; |
593 | encrypt = CIPHER_ENCRYPT; | 592 | crypt_type = CIPHER_ENCRYPT; |
594 | p_send.packets = p_send.blocks = 0; | 593 | p_send.packets = p_send.blocks = 0; |
595 | max_blocks = &max_blocks_out; | 594 | max_blocks = &max_blocks_out; |
596 | } else { | 595 | } else { |
597 | cc = &receive_context; | 596 | cc = &receive_context; |
598 | encrypt = CIPHER_DECRYPT; | 597 | crypt_type = CIPHER_DECRYPT; |
599 | p_read.packets = p_read.blocks = 0; | 598 | p_read.packets = p_read.blocks = 0; |
600 | max_blocks = &max_blocks_in; | 599 | max_blocks = &max_blocks_in; |
601 | } | 600 | } |
@@ -624,7 +623,7 @@ set_newkeys(int mode) | |||
624 | mac->enabled = 1; | 623 | mac->enabled = 1; |
625 | DBG(debug("cipher_init_context: %d", mode)); | 624 | DBG(debug("cipher_init_context: %d", mode)); |
626 | cipher_init(cc, enc->cipher, enc->key, enc->key_len, | 625 | cipher_init(cc, enc->cipher, enc->key, enc->key_len, |
627 | enc->iv, enc->block_size, encrypt); | 626 | enc->iv, enc->block_size, crypt_type); |
628 | /* Deleting the keys does not gain extra security */ | 627 | /* Deleting the keys does not gain extra security */ |
629 | /* memset(enc->iv, 0, enc->block_size); | 628 | /* memset(enc->iv, 0, enc->block_size); |
630 | memset(enc->key, 0, enc->key_len); */ | 629 | memset(enc->key, 0, enc->key_len); */ |
@@ -658,7 +657,7 @@ packet_send2_wrapped(void) | |||
658 | u_char padlen, pad; | 657 | u_char padlen, pad; |
659 | u_int packet_length = 0; | 658 | u_int packet_length = 0; |
660 | u_int i, len; | 659 | u_int i, len; |
661 | u_int32_t rand = 0; | 660 | u_int32_t rnd = 0; |
662 | Enc *enc = NULL; | 661 | Enc *enc = NULL; |
663 | Mac *mac = NULL; | 662 | Mac *mac = NULL; |
664 | Comp *comp = NULL; | 663 | Comp *comp = NULL; |
@@ -717,9 +716,9 @@ packet_send2_wrapped(void) | |||
717 | /* random padding */ | 716 | /* random padding */ |
718 | for (i = 0; i < padlen; i++) { | 717 | for (i = 0; i < padlen; i++) { |
719 | if (i % 4 == 0) | 718 | if (i % 4 == 0) |
720 | rand = arc4random(); | 719 | rnd = arc4random(); |
721 | cp[i] = rand & 0xff; | 720 | cp[i] = rnd & 0xff; |
722 | rand >>= 8; | 721 | rnd >>= 8; |
723 | } | 722 | } |
724 | } else { | 723 | } else { |
725 | /* clear padding */ | 724 | /* clear padding */ |
@@ -1463,7 +1462,7 @@ packet_is_interactive(void) | |||
1463 | return interactive_mode; | 1462 | return interactive_mode; |
1464 | } | 1463 | } |
1465 | 1464 | ||
1466 | u_int | 1465 | int |
1467 | packet_set_maxsize(u_int s) | 1466 | packet_set_maxsize(u_int s) |
1468 | { | 1467 | { |
1469 | static int called = 0; | 1468 | static int called = 0; |
@@ -1504,20 +1503,20 @@ packet_add_padding(u_char pad) | |||
1504 | void | 1503 | void |
1505 | packet_send_ignore(int nbytes) | 1504 | packet_send_ignore(int nbytes) |
1506 | { | 1505 | { |
1507 | u_int32_t rand = 0; | 1506 | u_int32_t rnd = 0; |
1508 | int i; | 1507 | int i; |
1509 | 1508 | ||
1510 | packet_start(compat20 ? SSH2_MSG_IGNORE : SSH_MSG_IGNORE); | 1509 | packet_start(compat20 ? SSH2_MSG_IGNORE : SSH_MSG_IGNORE); |
1511 | packet_put_int(nbytes); | 1510 | packet_put_int(nbytes); |
1512 | for (i = 0; i < nbytes; i++) { | 1511 | for (i = 0; i < nbytes; i++) { |
1513 | if (i % 4 == 0) | 1512 | if (i % 4 == 0) |
1514 | rand = arc4random(); | 1513 | rnd = arc4random(); |
1515 | packet_put_char(rand & 0xff); | 1514 | packet_put_char(rnd & 0xff); |
1516 | rand >>= 8; | 1515 | rnd >>= 8; |
1517 | } | 1516 | } |
1518 | } | 1517 | } |
1519 | 1518 | ||
1520 | #define MAX_PACKETS (1<<31) | 1519 | #define MAX_PACKETS (1U<<31) |
1521 | int | 1520 | int |
1522 | packet_need_rekeying(void) | 1521 | packet_need_rekeying(void) |
1523 | { | 1522 | { |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: packet.h,v 1.40 2003/06/24 08:23:46 markus Exp $ */ | 1 | /* $OpenBSD: packet.h,v 1.41 2004/05/11 19:01:43 deraadt Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -82,7 +82,7 @@ void tty_make_modes(int, struct termios *); | |||
82 | void tty_parse_modes(int, int *); | 82 | void tty_parse_modes(int, int *); |
83 | 83 | ||
84 | extern u_int max_packet_size; | 84 | extern u_int max_packet_size; |
85 | u_int packet_set_maxsize(u_int); | 85 | int packet_set_maxsize(u_int); |
86 | #define packet_get_maxsize() max_packet_size | 86 | #define packet_get_maxsize() max_packet_size |
87 | 87 | ||
88 | /* don't allow remaining bytes after the end of the message */ | 88 | /* don't allow remaining bytes after the end of the message */ |
diff --git a/pathnames.h b/pathnames.h index 53208cf58..cf42625a4 100644 --- a/pathnames.h +++ b/pathnames.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pathnames.h,v 1.14 2004/01/30 09:48:57 markus Exp $ */ | 1 | /* $OpenBSD: pathnames.h,v 1.15 2004/07/11 17:48:47 deraadt Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -122,7 +122,7 @@ | |||
122 | 122 | ||
123 | /* Location of ssh-keysign for hostbased authentication */ | 123 | /* Location of ssh-keysign for hostbased authentication */ |
124 | #ifndef _PATH_SSH_KEY_SIGN | 124 | #ifndef _PATH_SSH_KEY_SIGN |
125 | #define _PATH_SSH_KEY_SIGN "/usr/libexec/ssh-keysign" | 125 | #define _PATH_SSH_KEY_SIGN "/usr/libexec/ssh-keysign" |
126 | #endif | 126 | #endif |
127 | 127 | ||
128 | /* xauth for X11 forwarding */ | 128 | /* xauth for X11 forwarding */ |
diff --git a/progressmeter.c b/progressmeter.c index f42668526..93f5a3e62 100644 --- a/progressmeter.c +++ b/progressmeter.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: progressmeter.c,v 1.19 2004/02/05 15:33:33 markus Exp $"); | 26 | RCSID("$OpenBSD: progressmeter.c,v 1.22 2004/07/11 17:48:47 deraadt Exp $"); |
27 | 27 | ||
28 | #include "progressmeter.h" | 28 | #include "progressmeter.h" |
29 | #include "atomicio.h" | 29 | #include "atomicio.h" |
@@ -48,15 +48,15 @@ void refresh_progress_meter(void); | |||
48 | /* signal handler for updating the progress meter */ | 48 | /* signal handler for updating the progress meter */ |
49 | static void update_progress_meter(int); | 49 | static void update_progress_meter(int); |
50 | 50 | ||
51 | static time_t start; /* start progress */ | 51 | static time_t start; /* start progress */ |
52 | static time_t last_update; /* last progress update */ | 52 | static time_t last_update; /* last progress update */ |
53 | static char *file; /* name of the file being transferred */ | 53 | static char *file; /* name of the file being transferred */ |
54 | static off_t end_pos; /* ending position of transfer */ | 54 | static off_t end_pos; /* ending position of transfer */ |
55 | static off_t cur_pos; /* transfer position as of last refresh */ | 55 | static off_t cur_pos; /* transfer position as of last refresh */ |
56 | static volatile off_t *counter; /* progress counter */ | 56 | static volatile off_t *counter; /* progress counter */ |
57 | static long stalled; /* how long we have been stalled */ | 57 | static long stalled; /* how long we have been stalled */ |
58 | static int bytes_per_second; /* current speed in bytes per second */ | 58 | static int bytes_per_second; /* current speed in bytes per second */ |
59 | static int win_size; /* terminal window size */ | 59 | static int win_size; /* terminal window size */ |
60 | 60 | ||
61 | /* units for format_size */ | 61 | /* units for format_size */ |
62 | static const char unit[] = " KMGT"; | 62 | static const char unit[] = " KMGT"; |
@@ -167,7 +167,7 @@ refresh_progress_meter(void) | |||
167 | 167 | ||
168 | /* bandwidth usage */ | 168 | /* bandwidth usage */ |
169 | format_rate(buf + strlen(buf), win_size - strlen(buf), | 169 | format_rate(buf + strlen(buf), win_size - strlen(buf), |
170 | bytes_per_second); | 170 | (off_t)bytes_per_second); |
171 | strlcat(buf, "/s ", win_size); | 171 | strlcat(buf, "/s ", win_size); |
172 | 172 | ||
173 | /* ETA */ | 173 | /* ETA */ |
@@ -224,7 +224,7 @@ update_progress_meter(int ignore) | |||
224 | } | 224 | } |
225 | 225 | ||
226 | void | 226 | void |
227 | start_progress_meter(char *f, off_t filesize, off_t *stat) | 227 | start_progress_meter(char *f, off_t filesize, off_t *ctr) |
228 | { | 228 | { |
229 | struct winsize winsize; | 229 | struct winsize winsize; |
230 | 230 | ||
@@ -232,7 +232,7 @@ start_progress_meter(char *f, off_t filesize, off_t *stat) | |||
232 | file = f; | 232 | file = f; |
233 | end_pos = filesize; | 233 | end_pos = filesize; |
234 | cur_pos = 0; | 234 | cur_pos = 0; |
235 | counter = stat; | 235 | counter = ctr; |
236 | stalled = 0; | 236 | stalled = 0; |
237 | bytes_per_second = 0; | 237 | bytes_per_second = 0; |
238 | 238 | ||
diff --git a/readconf.c b/readconf.c index 2b8ff58d6..aca5b8eff 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: readconf.c,v 1.128 2004/03/05 10:53:58 markus Exp $"); | 15 | RCSID("$OpenBSD: readconf.c,v 1.134 2004/07/11 17:48:47 deraadt Exp $"); |
16 | 16 | ||
17 | #include "ssh.h" | 17 | #include "ssh.h" |
18 | #include "xmalloc.h" | 18 | #include "xmalloc.h" |
@@ -106,6 +106,7 @@ typedef enum { | |||
106 | oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, | 106 | oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, |
107 | oAddressFamily, oGssAuthentication, oGssDelegateCreds, | 107 | oAddressFamily, oGssAuthentication, oGssDelegateCreds, |
108 | oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, | 108 | oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, |
109 | oSendEnv, oControlPath, oControlMaster, | ||
109 | oProtocolKeepAlives, oSetupTimeOut, | 110 | oProtocolKeepAlives, oSetupTimeOut, |
110 | oDeprecated, oUnsupported | 111 | oDeprecated, oUnsupported |
111 | } OpCodes; | 112 | } OpCodes; |
@@ -194,6 +195,9 @@ static struct { | |||
194 | { "addressfamily", oAddressFamily }, | 195 | { "addressfamily", oAddressFamily }, |
195 | { "serveraliveinterval", oServerAliveInterval }, | 196 | { "serveraliveinterval", oServerAliveInterval }, |
196 | { "serveralivecountmax", oServerAliveCountMax }, | 197 | { "serveralivecountmax", oServerAliveCountMax }, |
198 | { "sendenv", oSendEnv }, | ||
199 | { "controlpath", oControlPath }, | ||
200 | { "controlmaster", oControlMaster }, | ||
197 | { "protocolkeepalives", oProtocolKeepAlives }, | 201 | { "protocolkeepalives", oProtocolKeepAlives }, |
198 | { "setuptimeout", oSetupTimeOut }, | 202 | { "setuptimeout", oSetupTimeOut }, |
199 | { NULL, oBadOption } | 203 | { NULL, oBadOption } |
@@ -753,6 +757,27 @@ parse_int: | |||
753 | intptr = &options->server_alive_count_max; | 757 | intptr = &options->server_alive_count_max; |
754 | goto parse_int; | 758 | goto parse_int; |
755 | 759 | ||
760 | case oSendEnv: | ||
761 | while ((arg = strdelim(&s)) != NULL && *arg != '\0') { | ||
762 | if (strchr(arg, '=') != NULL) | ||
763 | fatal("%s line %d: Invalid environment name.", | ||
764 | filename, linenum); | ||
765 | if (options->num_send_env >= MAX_SEND_ENV) | ||
766 | fatal("%s line %d: too many send env.", | ||
767 | filename, linenum); | ||
768 | options->send_env[options->num_send_env++] = | ||
769 | xstrdup(arg); | ||
770 | } | ||
771 | break; | ||
772 | |||
773 | case oControlPath: | ||
774 | charptr = &options->control_path; | ||
775 | goto parse_string; | ||
776 | |||
777 | case oControlMaster: | ||
778 | intptr = &options->control_master; | ||
779 | goto parse_yesnoask; | ||
780 | |||
756 | case oSetupTimeOut: | 781 | case oSetupTimeOut: |
757 | intptr = &options->setuptimeout; | 782 | intptr = &options->setuptimeout; |
758 | goto parse_int; | 783 | goto parse_int; |
@@ -787,7 +812,8 @@ parse_int: | |||
787 | */ | 812 | */ |
788 | 813 | ||
789 | int | 814 | int |
790 | read_config_file(const char *filename, const char *host, Options *options) | 815 | read_config_file(const char *filename, const char *host, Options *options, |
816 | int checkperm) | ||
791 | { | 817 | { |
792 | FILE *f; | 818 | FILE *f; |
793 | char line[1024]; | 819 | char line[1024]; |
@@ -795,10 +821,19 @@ read_config_file(const char *filename, const char *host, Options *options) | |||
795 | int bad_options = 0; | 821 | int bad_options = 0; |
796 | 822 | ||
797 | /* Open the file. */ | 823 | /* Open the file. */ |
798 | f = fopen(filename, "r"); | 824 | if ((f = fopen(filename, "r")) == NULL) |
799 | if (!f) | ||
800 | return 0; | 825 | return 0; |
801 | 826 | ||
827 | if (checkperm) { | ||
828 | struct stat sb; | ||
829 | |||
830 | if (fstat(fileno(f), &sb) == -1) | ||
831 | fatal("fstat %s: %s", filename, strerror(errno)); | ||
832 | if (((sb.st_uid != 0 && sb.st_uid != getuid()) || | ||
833 | (sb.st_mode & 022) != 0)) | ||
834 | fatal("Bad owner or permissions on %s", filename); | ||
835 | } | ||
836 | |||
802 | debug("Reading configuration data %.200s", filename); | 837 | debug("Reading configuration data %.200s", filename); |
803 | 838 | ||
804 | /* | 839 | /* |
@@ -888,6 +923,9 @@ initialize_options(Options * options) | |||
888 | options->verify_host_key_dns = -1; | 923 | options->verify_host_key_dns = -1; |
889 | options->server_alive_interval = -1; | 924 | options->server_alive_interval = -1; |
890 | options->server_alive_count_max = -1; | 925 | options->server_alive_count_max = -1; |
926 | options->num_send_env = 0; | ||
927 | options->control_path = NULL; | ||
928 | options->control_master = -1; | ||
891 | } | 929 | } |
892 | 930 | ||
893 | /* | 931 | /* |
@@ -1013,6 +1051,8 @@ fill_default_options(Options * options) | |||
1013 | } | 1051 | } |
1014 | if (options->server_alive_count_max == -1) | 1052 | if (options->server_alive_count_max == -1) |
1015 | options->server_alive_count_max = 3; | 1053 | options->server_alive_count_max = 3; |
1054 | if (options->control_master == -1) | ||
1055 | options->control_master = 0; | ||
1016 | if (options->setuptimeout == -1) { | 1056 | if (options->setuptimeout == -1) { |
1017 | /* in batch mode, default is 5mins */ | 1057 | /* in batch mode, default is 5mins */ |
1018 | if (options->batch_mode == 1) | 1058 | if (options->batch_mode == 1) |
diff --git a/readconf.h b/readconf.h index 97b6c2be4..2f4908f4e 100644 --- a/readconf.h +++ b/readconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.h,v 1.60 2004/03/05 10:53:58 markus Exp $ */ | 1 | /* $OpenBSD: readconf.h,v 1.64 2004/07/11 17:48:47 deraadt Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -27,6 +27,8 @@ typedef struct { | |||
27 | } Forward; | 27 | } Forward; |
28 | /* Data structure for representing option data. */ | 28 | /* Data structure for representing option data. */ |
29 | 29 | ||
30 | #define MAX_SEND_ENV 256 | ||
31 | |||
30 | typedef struct { | 32 | typedef struct { |
31 | int forward_agent; /* Forward authentication agent. */ | 33 | int forward_agent; /* Forward authentication agent. */ |
32 | int forward_x11; /* Forward X11 display. */ | 34 | int forward_x11; /* Forward X11 display. */ |
@@ -102,14 +104,20 @@ typedef struct { | |||
102 | int rekey_limit; | 104 | int rekey_limit; |
103 | int no_host_authentication_for_localhost; | 105 | int no_host_authentication_for_localhost; |
104 | int identities_only; | 106 | int identities_only; |
105 | int server_alive_interval; | 107 | int server_alive_interval; |
106 | int server_alive_count_max; | 108 | int server_alive_count_max; |
109 | |||
110 | int num_send_env; | ||
111 | char *send_env[MAX_SEND_ENV]; | ||
112 | |||
113 | char *control_path; | ||
114 | int control_master; | ||
107 | } Options; | 115 | } Options; |
108 | 116 | ||
109 | 117 | ||
110 | void initialize_options(Options *); | 118 | void initialize_options(Options *); |
111 | void fill_default_options(Options *); | 119 | void fill_default_options(Options *); |
112 | int read_config_file(const char *, const char *, Options *); | 120 | int read_config_file(const char *, const char *, Options *, int); |
113 | 121 | ||
114 | int | 122 | int |
115 | process_config_line(Options *, const char *, char *, const char *, int, int *); | 123 | process_config_line(Options *, const char *, char *, const char *, int, int *); |
diff --git a/readpass.c b/readpass.c index 95ec5d873..eb4f6fdb6 100644 --- a/readpass.c +++ b/readpass.c | |||
@@ -23,10 +23,10 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: readpass.c,v 1.28 2003/01/23 13:50:27 markus Exp $"); | 26 | RCSID("$OpenBSD: readpass.c,v 1.30 2004/06/17 15:10:14 djm Exp $"); |
27 | 27 | ||
28 | #include "xmalloc.h" | 28 | #include "xmalloc.h" |
29 | #include "readpass.h" | 29 | #include "misc.h" |
30 | #include "pathnames.h" | 30 | #include "pathnames.h" |
31 | #include "log.h" | 31 | #include "log.h" |
32 | #include "ssh.h" | 32 | #include "ssh.h" |
@@ -103,7 +103,9 @@ read_passphrase(const char *prompt, int flags) | |||
103 | int rppflags, use_askpass = 0, ttyfd; | 103 | int rppflags, use_askpass = 0, ttyfd; |
104 | 104 | ||
105 | rppflags = (flags & RP_ECHO) ? RPP_ECHO_ON : RPP_ECHO_OFF; | 105 | rppflags = (flags & RP_ECHO) ? RPP_ECHO_ON : RPP_ECHO_OFF; |
106 | if (flags & RP_ALLOW_STDIN) { | 106 | if (flags & RP_USE_ASKPASS) |
107 | use_askpass = 1; | ||
108 | else if (flags & RP_ALLOW_STDIN) { | ||
107 | if (!isatty(STDIN_FILENO)) | 109 | if (!isatty(STDIN_FILENO)) |
108 | use_askpass = 1; | 110 | use_askpass = 1; |
109 | } else { | 111 | } else { |
@@ -115,6 +117,9 @@ read_passphrase(const char *prompt, int flags) | |||
115 | use_askpass = 1; | 117 | use_askpass = 1; |
116 | } | 118 | } |
117 | 119 | ||
120 | if ((flags & RP_USE_ASKPASS) && getenv("DISPLAY") == NULL) | ||
121 | return (flags & RP_ALLOW_EOF) ? NULL : xstrdup(""); | ||
122 | |||
118 | if (use_askpass && getenv("DISPLAY")) { | 123 | if (use_askpass && getenv("DISPLAY")) { |
119 | if (getenv(SSH_ASKPASS_ENV)) | 124 | if (getenv(SSH_ASKPASS_ENV)) |
120 | askpass = getenv(SSH_ASKPASS_ENV); | 125 | askpass = getenv(SSH_ASKPASS_ENV); |
diff --git a/readpass.h b/readpass.h deleted file mode 100644 index a45d32f2a..000000000 --- a/readpass.h +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | /* $OpenBSD: readpass.h,v 1.7 2002/03/26 15:58:46 markus Exp $ */ | ||
2 | |||
3 | /* | ||
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | ||
5 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | ||
6 | * All rights reserved | ||
7 | * | ||
8 | * As far as I am concerned, the code I have written for this software | ||
9 | * can be used freely for any purpose. Any derived versions of this | ||
10 | * software must be clearly marked as such, and if the derived work is | ||
11 | * incompatible with the protocol description in the RFC file, it must be | ||
12 | * called by a name other than "ssh" or "Secure Shell". | ||
13 | */ | ||
14 | |||
15 | #define RP_ECHO 0x0001 | ||
16 | #define RP_ALLOW_STDIN 0x0002 | ||
17 | #define RP_ALLOW_EOF 0x0004 | ||
18 | |||
19 | char *read_passphrase(const char *, int); | ||
diff --git a/regress/Makefile b/regress/Makefile index cf65b3630..9e98e5880 100644 --- a/regress/Makefile +++ b/regress/Makefile | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: Makefile,v 1.27 2004/02/17 08:23:20 dtucker Exp $ | 1 | # $OpenBSD: Makefile,v 1.31 2004/06/24 19:32:00 djm Exp $ |
2 | 2 | ||
3 | REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t-exec | 3 | REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t-exec |
4 | tests: $(REGRESS_TARGETS) | 4 | tests: $(REGRESS_TARGETS) |
@@ -13,6 +13,7 @@ LTESTS= connect \ | |||
13 | proto-version \ | 13 | proto-version \ |
14 | proto-mismatch \ | 14 | proto-mismatch \ |
15 | exit-status \ | 15 | exit-status \ |
16 | envpass \ | ||
16 | transfer \ | 17 | transfer \ |
17 | banner \ | 18 | banner \ |
18 | rekey \ | 19 | rekey \ |
@@ -28,13 +29,16 @@ LTESTS= connect \ | |||
28 | agent-ptrace \ | 29 | agent-ptrace \ |
29 | keyscan \ | 30 | keyscan \ |
30 | keygen-change \ | 31 | keygen-change \ |
32 | scp \ | ||
31 | sftp \ | 33 | sftp \ |
32 | sftp-cmds \ | 34 | sftp-cmds \ |
33 | sftp-badcmds \ | 35 | sftp-badcmds \ |
34 | sftp-batch \ | 36 | sftp-batch \ |
35 | reconfigure \ | 37 | reconfigure \ |
36 | dynamic-forward \ | 38 | dynamic-forward \ |
37 | forwarding | 39 | forwarding \ |
40 | multiplex \ | ||
41 | reexec | ||
38 | 42 | ||
39 | USER!= id -un | 43 | USER!= id -un |
40 | CLEANFILES= t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \ | 44 | CLEANFILES= t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \ |
@@ -42,7 +46,9 @@ CLEANFILES= t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \ | |||
42 | ssh_config ssh_proxy sshd_config sshd_proxy \ | 46 | ssh_config ssh_proxy sshd_config sshd_proxy \ |
43 | rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \ | 47 | rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \ |
44 | rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \ | 48 | rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \ |
45 | ls.copy banner.in banner.out empty.in remote_pid | 49 | ls.copy banner.in banner.out empty.in \ |
50 | scp-ssh-wrapper.exe \ | ||
51 | remote_pid | ||
46 | 52 | ||
47 | #LTESTS += ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp | 53 | #LTESTS += ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp |
48 | 54 | ||
diff --git a/regress/README.regress b/regress/README.regress index 6ff032b68..0c07c9cf1 100644 --- a/regress/README.regress +++ b/regress/README.regress | |||
@@ -27,15 +27,26 @@ TEST_SSH_QUIET: set to "yes" to suppress non-fatal output. | |||
27 | TEST_SSH_x: path to "ssh" command under test, where x=SSH,SSHD,SSHAGENT,SSHADD | 27 | TEST_SSH_x: path to "ssh" command under test, where x=SSH,SSHD,SSHAGENT,SSHADD |
28 | SSHKEYGEN,SSHKEYSCAN,SFTP,SFTPSERVER | 28 | SSHKEYGEN,SSHKEYSCAN,SFTP,SFTPSERVER |
29 | OBJ: used by test scripts to access build dir. | 29 | OBJ: used by test scripts to access build dir. |
30 | TEST_SHELL: shell used for running the test scripts. | ||
31 | TEST_SSH_PORT: TCP port to be used for the listening tests. | ||
32 | TEST_SSH_SSH_CONFOTPS: Configuration directives to be added to ssh_config | ||
33 | before running each test. | ||
34 | TEST_SSH_SSHD_CONFOTPS: Configuration directives to be added to sshd_config | ||
35 | before running each test. | ||
30 | 36 | ||
31 | 37 | ||
32 | Individual tests. | 38 | Individual tests. |
33 | 39 | ||
34 | You can invoke test-exec.sh directly if you set up the path to find the | 40 | You can run an individual test from the top-level Makefile, eg: |
35 | binaries under test and the test scripts themselves, for example: | 41 | $ make tests LTESTS=agent-timeout |
42 | |||
43 | If you need to manipulate the environment more you can invoke test-exec.sh | ||
44 | directly if you set up the path to find the binaries under test and the | ||
45 | test scripts themselves, for example: | ||
36 | 46 | ||
37 | $ cd regress | 47 | $ cd regress |
38 | $ PATH=`pwd`/..:$PATH:. sh test-exec.sh `pwd` agent-timeout.sh | 48 | $ PATH=`pwd`/..:$PATH:. TEST_SHELL=/bin/sh sh test-exec.sh `pwd` \ |
49 | agent-timeout.sh | ||
39 | ok agent timeout test | 50 | ok agent timeout test |
40 | 51 | ||
41 | 52 | ||
@@ -82,16 +93,12 @@ Failed tests can be difficult to diagnose. Suggestions: | |||
82 | 93 | ||
83 | Known Issues. | 94 | Known Issues. |
84 | 95 | ||
85 | - If you build with tcpwrappers and try to run the regression tests, | ||
86 | your hosts.allow must permit connections from localhost and from | ||
87 | "unknown". This is because some tests are performed via the loopback | ||
88 | interface, while others are done with "sshd -i" as a ProxyCommand. In | ||
89 | the latter case, when sshd calls getpeername() on the socket it will | ||
90 | fail (because it's not a tcp socket) and will be identified as | ||
91 | "unknown", which is then checked against tcpwrappers. | ||
92 | |||
93 | - If your build requires ssh-rand-helper regress tests will fail | 96 | - If your build requires ssh-rand-helper regress tests will fail |
94 | unless ssh-rand-helper is in pre-installed (the path to | 97 | unless ssh-rand-helper is in pre-installed (the path to |
95 | ssh-rand-helper is hard coded). | 98 | ssh-rand-helper is hard coded). |
96 | 99 | ||
97 | $Id: README.regress,v 1.4 2004/03/08 20:12:18 tim Exp $ | 100 | - Recent GNU coreutils deprecate "head -[n]": this will cause the yes-head |
101 | test to fail. The old behaviour can be restored by setting (and | ||
102 | exporting) _POSIX2_VERSION=199209 before running the tests. | ||
103 | |||
104 | $Id: README.regress,v 1.9 2004/08/17 12:31:33 dtucker Exp $ | ||
diff --git a/regress/dynamic-forward.sh b/regress/dynamic-forward.sh index 3a6e5c1ef..392fc1978 100644 --- a/regress/dynamic-forward.sh +++ b/regress/dynamic-forward.sh | |||
@@ -3,8 +3,8 @@ | |||
3 | 3 | ||
4 | tid="dynamic forwarding" | 4 | tid="dynamic forwarding" |
5 | 5 | ||
6 | PORT=4242 | 6 | FWDPORT=`expr $PORT + 1` |
7 | FWDPORT=4243 | 7 | |
8 | DATA=/bin/ls${EXEEXT} | 8 | DATA=/bin/ls${EXEEXT} |
9 | 9 | ||
10 | if have_prog nc && nc -h 2>&1 | grep "proxy address" >/dev/null; then | 10 | if have_prog nc && nc -h 2>&1 | grep "proxy address" >/dev/null; then |
diff --git a/regress/envpass.sh b/regress/envpass.sh new file mode 100644 index 000000000..5a7e178d8 --- /dev/null +++ b/regress/envpass.sh | |||
@@ -0,0 +1,51 @@ | |||
1 | # $OpenBSD: envpass.sh,v 1.3 2004/06/22 22:42:02 dtucker Exp $ | ||
2 | # Placed in the Public Domain. | ||
3 | |||
4 | tid="environment passing" | ||
5 | |||
6 | # NB accepted env vars are in test-exec.sh (_XXX_TEST_* and _XXX_TEST) | ||
7 | |||
8 | trace "pass env, don't accept" | ||
9 | verbose "test $tid: pass env, don't accept" | ||
10 | _TEST_ENV=blah ${SSH} -oSendEnv="*" -F $OBJ/ssh_proxy otherhost \ | ||
11 | sh << 'EOF' | ||
12 | test -z "$_TEST_ENV" | ||
13 | EOF | ||
14 | r=$? | ||
15 | if [ $r -ne 0 ]; then | ||
16 | fail "environment found" | ||
17 | fi | ||
18 | |||
19 | trace "don't pass env, accept" | ||
20 | verbose "test $tid: don't pass env, accept" | ||
21 | ${SSH} -F $OBJ/ssh_proxy otherhost \ | ||
22 | sh << 'EOF' | ||
23 | test -z "$_XXX_TEST_A" && test -z "$_XXX_TEST_B" | ||
24 | EOF | ||
25 | r=$? | ||
26 | if [ $r -ne 0 ]; then | ||
27 | fail "environment found" | ||
28 | fi | ||
29 | |||
30 | trace "pass single env, accept single env" | ||
31 | verbose "test $tid: pass single env, accept single env" | ||
32 | _XXX_TEST=blah ${SSH} -oSendEnv="_XXX_TEST" -F $OBJ/ssh_proxy otherhost \ | ||
33 | sh << 'EOF' | ||
34 | test X"$_XXX_TEST" = X"blah" | ||
35 | EOF | ||
36 | r=$? | ||
37 | if [ $r -ne 0 ]; then | ||
38 | fail "environment not found" | ||
39 | fi | ||
40 | |||
41 | trace "pass multiple env, accept multiple env" | ||
42 | verbose "test $tid: pass multiple env, accept multiple env" | ||
43 | _XXX_TEST_A=1 _XXX_TEST_B=2 ${SSH} -oSendEnv="_XXX_TEST_*" \ | ||
44 | -F $OBJ/ssh_proxy otherhost \ | ||
45 | sh << 'EOF' | ||
46 | test X"$_XXX_TEST_A" = X"1" -a X"$_XXX_TEST_B" = X"2" | ||
47 | EOF | ||
48 | r=$? | ||
49 | if [ $r -ne 0 ]; then | ||
50 | fail "environment not found" | ||
51 | fi | ||
diff --git a/regress/login-timeout.sh b/regress/login-timeout.sh index dfc6e6b44..ce6edade5 100644 --- a/regress/login-timeout.sh +++ b/regress/login-timeout.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: login-timeout.sh,v 1.1 2004/02/17 08:23:20 dtucker Exp $ | 1 | # $OpenBSD: login-timeout.sh,v 1.3 2004/03/08 10:17:12 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="connect after login grace timeout" | 4 | tid="connect after login grace timeout" |
@@ -15,7 +15,7 @@ if [ $? -ne 0 ]; then | |||
15 | fail "ssh connect after login grace timeout failed with privsep" | 15 | fail "ssh connect after login grace timeout failed with privsep" |
16 | fi | 16 | fi |
17 | 17 | ||
18 | kill `cat $PIDFILE` | 18 | $SUDO kill `cat $PIDFILE` |
19 | 19 | ||
20 | trace "test login grace without privsep" | 20 | trace "test login grace without privsep" |
21 | echo "UsePrivilegeSeparation no" >> $OBJ/sshd_config | 21 | echo "UsePrivilegeSeparation no" >> $OBJ/sshd_config |
diff --git a/regress/multiplex.sh b/regress/multiplex.sh new file mode 100644 index 000000000..dbf2025be --- /dev/null +++ b/regress/multiplex.sh | |||
@@ -0,0 +1,74 @@ | |||
1 | # $OpenBSD: multiplex.sh,v 1.8 2004/06/22 03:12:13 markus Exp $ | ||
2 | # Placed in the Public Domain. | ||
3 | |||
4 | CTL=$OBJ/ctl-sock | ||
5 | |||
6 | tid="connection multiplexing" | ||
7 | |||
8 | DATA=/bin/ls${EXEEXT} | ||
9 | COPY=$OBJ/ls.copy | ||
10 | |||
11 | start_sshd | ||
12 | |||
13 | trace "start master, fork to background" | ||
14 | ${SSH} -2 -MS$CTL -F $OBJ/ssh_config -oSendEnv="_XXX_TEST" -f somehost sleep 120 | ||
15 | |||
16 | verbose "test $tid: envpass" | ||
17 | trace "env passing over multiplexed connection" | ||
18 | _XXX_TEST=blah ${SSH} -oSendEnv="_XXX_TEST" -S$CTL otherhost sh << 'EOF' | ||
19 | test X"$_XXX_TEST" = X"blah" | ||
20 | EOF | ||
21 | if [ $? -ne 0 ]; then | ||
22 | fail "environment not found" | ||
23 | fi | ||
24 | |||
25 | verbose "test $tid: transfer" | ||
26 | rm -f ${COPY} | ||
27 | trace "ssh transfer over multiplexed connection and check result" | ||
28 | ${SSH} -S$CTL otherhost cat ${DATA} > ${COPY} | ||
29 | test -f ${COPY} || fail "ssh -Sctl: failed copy ${DATA}" | ||
30 | cmp ${DATA} ${COPY} || fail "ssh -Sctl: corrupted copy of ${DATA}" | ||
31 | |||
32 | rm -f ${COPY} | ||
33 | trace "ssh transfer over multiplexed connection and check result" | ||
34 | ${SSH} -S $CTL otherhost cat ${DATA} > ${COPY} | ||
35 | test -f ${COPY} || fail "ssh -S ctl: failed copy ${DATA}" | ||
36 | cmp ${DATA} ${COPY} || fail "ssh -S ctl: corrupted copy of ${DATA}" | ||
37 | |||
38 | rm -f ${COPY} | ||
39 | trace "sftp transfer over multiplexed connection and check result" | ||
40 | echo "get ${DATA} ${COPY}" | \ | ||
41 | ${SFTP} -S ${SSH} -oControlPath=$CTL otherhost >/dev/null 2>&1 | ||
42 | test -f ${COPY} || fail "sftp: failed copy ${DATA}" | ||
43 | cmp ${DATA} ${COPY} || fail "sftp: corrupted copy of ${DATA}" | ||
44 | |||
45 | rm -f ${COPY} | ||
46 | trace "scp transfer over multiplexed connection and check result" | ||
47 | ${SCP} -S ${SSH} -oControlPath=$CTL otherhost:${DATA} ${COPY} >/dev/null 2>&1 | ||
48 | test -f ${COPY} || fail "scp: failed copy ${DATA}" | ||
49 | cmp ${DATA} ${COPY} || fail "scp: corrupted copy of ${DATA}" | ||
50 | |||
51 | rm -f ${COPY} | ||
52 | |||
53 | for s in 0 1 4 5 44; do | ||
54 | trace "exit status $s over multiplexed connection" | ||
55 | verbose "test $tid: status $s" | ||
56 | ${SSH} -S $CTL otherhost exit $s | ||
57 | r=$? | ||
58 | if [ $r -ne $s ]; then | ||
59 | fail "exit code mismatch for protocol $p: $r != $s" | ||
60 | fi | ||
61 | |||
62 | # same with early close of stdout/err | ||
63 | trace "exit status $s with early close over multiplexed connection" | ||
64 | ${SSH} -S $CTL -n otherhost \ | ||
65 | exec sh -c \'"sleep 2; exec > /dev/null 2>&1; sleep 3; exit $s"\' | ||
66 | r=$? | ||
67 | if [ $r -ne $s ]; then | ||
68 | fail "exit code (with sleep) mismatch for protocol $p: $r != $s" | ||
69 | fi | ||
70 | done | ||
71 | |||
72 | # kill master, remove control socket. ssh -MS will exit when sleep exits | ||
73 | $SUDO kill `cat $PIDFILE` | ||
74 | rm -f $CTL | ||
diff --git a/regress/reexec.sh b/regress/reexec.sh new file mode 100644 index 000000000..39fffefbc --- /dev/null +++ b/regress/reexec.sh | |||
@@ -0,0 +1,87 @@ | |||
1 | # $OpenBSD: reexec.sh,v 1.3 2004/06/25 01:32:44 djm Exp $ | ||
2 | # Placed in the Public Domain. | ||
3 | |||
4 | tid="reexec tests" | ||
5 | |||
6 | DATA=/bin/ls | ||
7 | COPY=${OBJ}/copy | ||
8 | SSHD_ORIG=$SSHD | ||
9 | SSHD_COPY=$OBJ/sshd.copy | ||
10 | |||
11 | # Start a sshd and then delete it | ||
12 | start_sshd_copy_zap () | ||
13 | { | ||
14 | cp $SSHD_ORIG $SSHD_COPY | ||
15 | SSHD=$SSHD_COPY | ||
16 | start_sshd | ||
17 | rm -f $SSHD_COPY | ||
18 | SSHD=$SSHD_ORIG | ||
19 | } | ||
20 | |||
21 | verbose "test config passing" | ||
22 | cp $OBJ/sshd_config $OBJ/sshd_config.orig | ||
23 | |||
24 | start_sshd | ||
25 | |||
26 | echo "InvalidXXX=no" >> $OBJ/sshd_config | ||
27 | |||
28 | rm -f ${COPY} | ||
29 | for p in 1 2; do | ||
30 | verbose "$tid: proto $p" | ||
31 | ${SSH} -nqo "Protocol=$p" -F $OBJ/ssh_config somehost \ | ||
32 | cat ${DATA} > ${COPY} | ||
33 | if [ $? -ne 0 ]; then | ||
34 | fail "ssh cat $DATA failed" | ||
35 | fi | ||
36 | cmp ${DATA} ${COPY} || fail "corrupted copy" | ||
37 | rm -f ${COPY} | ||
38 | done | ||
39 | |||
40 | $SUDO kill `cat $PIDFILE` | ||
41 | rm -f $PIDFILE | ||
42 | |||
43 | cp $OBJ/sshd_config.orig $OBJ/sshd_config | ||
44 | |||
45 | verbose "test reexec fallback" | ||
46 | |||
47 | start_sshd_copy_zap | ||
48 | |||
49 | rm -f ${COPY} | ||
50 | for p in 1 2; do | ||
51 | verbose "$tid: proto $p" | ||
52 | ${SSH} -nqo "Protocol=$p" -F $OBJ/ssh_config somehost \ | ||
53 | cat ${DATA} > ${COPY} | ||
54 | if [ $? -ne 0 ]; then | ||
55 | fail "ssh cat $DATA failed" | ||
56 | fi | ||
57 | cmp ${DATA} ${COPY} || fail "corrupted copy" | ||
58 | rm -f ${COPY} | ||
59 | done | ||
60 | |||
61 | $SUDO kill `cat $PIDFILE` | ||
62 | rm -f $PIDFILE | ||
63 | |||
64 | verbose "test reexec fallback without privsep" | ||
65 | |||
66 | cp $OBJ/sshd_config.orig $OBJ/sshd_config | ||
67 | echo "UsePrivilegeSeparation=no" >> $OBJ/sshd_config | ||
68 | |||
69 | start_sshd_copy_zap | ||
70 | |||
71 | rm -f ${COPY} | ||
72 | for p in 1 2; do | ||
73 | verbose "$tid: proto $p" | ||
74 | ${SSH} -nqo "Protocol=$p" -F $OBJ/ssh_config somehost \ | ||
75 | cat ${DATA} > ${COPY} | ||
76 | if [ $? -ne 0 ]; then | ||
77 | fail "ssh cat $DATA failed" | ||
78 | fi | ||
79 | cmp ${DATA} ${COPY} || fail "corrupted copy" | ||
80 | rm -f ${COPY} | ||
81 | done | ||
82 | |||
83 | $SUDO kill `cat $PIDFILE` | ||
84 | rm -f $PIDFILE | ||
85 | |||
86 | cp $OBJ/sshd_config.orig $OBJ/sshd_config | ||
87 | |||
diff --git a/regress/scp-ssh-wrapper.sh b/regress/scp-ssh-wrapper.sh new file mode 100644 index 000000000..8e4314773 --- /dev/null +++ b/regress/scp-ssh-wrapper.sh | |||
@@ -0,0 +1,54 @@ | |||
1 | #!/bin/sh | ||
2 | # $OpenBSD: scp-ssh-wrapper.sh,v 1.1 2004/06/13 13:51:02 dtucker Exp $ | ||
3 | # Placed in the Public Domain. | ||
4 | |||
5 | printname () { | ||
6 | NAME=$1 | ||
7 | save_IFS=$IFS | ||
8 | IFS=/ | ||
9 | set -- `echo "$NAME"` | ||
10 | IFS="$save_IFS" | ||
11 | while [ $# -ge 1 ] ; do | ||
12 | if [ "x$1" != "x" ]; then | ||
13 | echo "D0755 0 $1" | ||
14 | fi | ||
15 | shift; | ||
16 | done | ||
17 | } | ||
18 | |||
19 | # discard first 5 args | ||
20 | shift; shift; shift; shift; shift | ||
21 | |||
22 | BAD="../../../../../../../../../../../../../${DIR}/dotpathdir" | ||
23 | |||
24 | case "$SCPTESTMODE" in | ||
25 | badserver_0) | ||
26 | echo "D0755 0 /${DIR}/rootpathdir" | ||
27 | echo "C755 2 rootpathfile" | ||
28 | echo "X" | ||
29 | ;; | ||
30 | badserver_1) | ||
31 | echo "D0755 0 $BAD" | ||
32 | echo "C755 2 file" | ||
33 | echo "X" | ||
34 | ;; | ||
35 | badserver_2) | ||
36 | echo "D0755 0 $BAD" | ||
37 | echo "C755 2 file" | ||
38 | echo "X" | ||
39 | ;; | ||
40 | badserver_3) | ||
41 | printname $BAD | ||
42 | echo "C755 2 file" | ||
43 | echo "X" | ||
44 | ;; | ||
45 | badserver_4) | ||
46 | printname $BAD | ||
47 | echo "D0755 0 .." | ||
48 | echo "C755 2 file" | ||
49 | echo "X" | ||
50 | ;; | ||
51 | *) | ||
52 | exec $1 | ||
53 | ;; | ||
54 | esac | ||
diff --git a/regress/scp.sh b/regress/scp.sh new file mode 100644 index 000000000..703cc0893 --- /dev/null +++ b/regress/scp.sh | |||
@@ -0,0 +1,82 @@ | |||
1 | # $OpenBSD: scp.sh,v 1.2 2004/06/16 13:15:09 dtucker Exp $ | ||
2 | # Placed in the Public Domain. | ||
3 | |||
4 | tid="scp" | ||
5 | |||
6 | #set -x | ||
7 | |||
8 | # Figure out if diff understands "-N" | ||
9 | if diff -N ${SRC}/scp.sh ${SRC}/scp.sh 2>/dev/null; then | ||
10 | DIFFOPT="-rN" | ||
11 | else | ||
12 | DIFFOPT="-r" | ||
13 | fi | ||
14 | |||
15 | DATA=/bin/ls | ||
16 | COPY=${OBJ}/copy | ||
17 | COPY2=${OBJ}/copy2 | ||
18 | DIR=${COPY}.dd | ||
19 | DIR2=${COPY}.dd2 | ||
20 | |||
21 | SRC=`dirname ${SCRIPT}` | ||
22 | cp ${SRC}/scp-ssh-wrapper.sh ${OBJ}/scp-ssh-wrapper.exe | ||
23 | chmod 755 ${OBJ}/scp-ssh-wrapper.exe | ||
24 | scpopts="-q -S ${OBJ}/scp-ssh-wrapper.exe" | ||
25 | |||
26 | scpclean() { | ||
27 | rm -rf ${COPY} ${COPY2} ${DIR} ${DIR2} | ||
28 | mkdir ${DIR} ${DIR2} | ||
29 | } | ||
30 | |||
31 | verbose "$tid: simple copy local file to remote file" | ||
32 | scpclean | ||
33 | $SCP $scpopts ${DATA} somehost:${COPY} || fail "copy failed" | ||
34 | cmp ${DATA} ${COPY} || fail "corrupted copy" | ||
35 | |||
36 | verbose "$tid: simple copy remote file to local file" | ||
37 | scpclean | ||
38 | $SCP $scpopts somehost:${DATA} ${COPY} || fail "copy failed" | ||
39 | cmp ${DATA} ${COPY} || fail "corrupted copy" | ||
40 | |||
41 | verbose "$tid: simple copy local file to remote dir" | ||
42 | scpclean | ||
43 | cp ${DATA} ${COPY} | ||
44 | $SCP $scpopts ${COPY} somehost:${DIR} || fail "copy failed" | ||
45 | cmp ${COPY} ${DIR}/copy || fail "corrupted copy" | ||
46 | |||
47 | verbose "$tid: simple copy remote file to local dir" | ||
48 | scpclean | ||
49 | cp ${DATA} ${COPY} | ||
50 | $SCP $scpopts somehost:${COPY} ${DIR} || fail "copy failed" | ||
51 | cmp ${COPY} ${DIR}/copy || fail "corrupted copy" | ||
52 | |||
53 | verbose "$tid: recursive local dir to remote dir" | ||
54 | scpclean | ||
55 | rm -rf ${DIR2} | ||
56 | cp ${DATA} ${DIR}/copy | ||
57 | $SCP $scpopts -r ${DIR} somehost:${DIR2} || fail "copy failed" | ||
58 | diff ${DIFFOPT} ${DIR} ${DIR2} || fail "corrupted copy" | ||
59 | |||
60 | verbose "$tid: recursive remote dir to local dir" | ||
61 | scpclean | ||
62 | rm -rf ${DIR2} | ||
63 | cp ${DATA} ${DIR}/copy | ||
64 | $SCP $scpopts -r somehost:${DIR} ${DIR2} || fail "copy failed" | ||
65 | diff ${DIFFOPT} ${DIR} ${DIR2} || fail "corrupted copy" | ||
66 | |||
67 | for i in 0 1 2 3 4; do | ||
68 | verbose "$tid: disallow bad server #$i" | ||
69 | SCPTESTMODE=badserver_$i | ||
70 | export DIR SCPTESTMODE | ||
71 | scpclean | ||
72 | $SCP $scpopts somehost:${DATA} ${DIR} >/dev/null 2>/dev/null | ||
73 | [ -d {$DIR}/rootpathdir ] && fail "allows dir relative to root dir" | ||
74 | [ -d ${DIR}/dotpathdir ] && fail "allows dir creation in non-recursive mode" | ||
75 | |||
76 | scpclean | ||
77 | $SCP -r $scpopts somehost:${DATA} ${DIR2} >/dev/null 2>/dev/null | ||
78 | [ -d ${DIR}/dotpathdir ] && fail "allows dir creation outside of subdir" | ||
79 | done | ||
80 | |||
81 | scpclean | ||
82 | rm -f ${OBJ}/scp-ssh-wrapper.exe | ||
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 986d99287..70250acd7 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh | |||
@@ -1,9 +1,14 @@ | |||
1 | # $OpenBSD: test-exec.sh,v 1.15 2004/02/24 16:56:30 markus Exp $ | 1 | # $OpenBSD: test-exec.sh,v 1.23 2004/06/25 01:25:12 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | PORT=4242 | ||
5 | #SUDO=sudo | 4 | #SUDO=sudo |
6 | 5 | ||
6 | if [ ! -z "$TEST_SSH_PORT" ]; then | ||
7 | PORT="$TEST_SSH_PORT" | ||
8 | else | ||
9 | PORT=4242 | ||
10 | fi | ||
11 | |||
7 | if [ -x /usr/ucb/whoami ]; then | 12 | if [ -x /usr/ucb/whoami ]; then |
8 | USER=`/usr/ucb/whoami` | 13 | USER=`/usr/ucb/whoami` |
9 | elif whoami >/dev/null 2>&1; then | 14 | elif whoami >/dev/null 2>&1; then |
@@ -47,6 +52,7 @@ SSHKEYGEN=ssh-keygen | |||
47 | SSHKEYSCAN=ssh-keyscan | 52 | SSHKEYSCAN=ssh-keyscan |
48 | SFTP=sftp | 53 | SFTP=sftp |
49 | SFTPSERVER=/usr/libexec/openssh/sftp-server | 54 | SFTPSERVER=/usr/libexec/openssh/sftp-server |
55 | SCP=scp | ||
50 | 56 | ||
51 | if [ "x$TEST_SSH_SSH" != "x" ]; then | 57 | if [ "x$TEST_SSH_SSH" != "x" ]; then |
52 | SSH="${TEST_SSH_SSH}" | 58 | SSH="${TEST_SSH_SSH}" |
@@ -72,10 +78,16 @@ fi | |||
72 | if [ "x$TEST_SSH_SFTPSERVER" != "x" ]; then | 78 | if [ "x$TEST_SSH_SFTPSERVER" != "x" ]; then |
73 | SFTPSERVER="${TEST_SSH_SFTPSERVER}" | 79 | SFTPSERVER="${TEST_SSH_SFTPSERVER}" |
74 | fi | 80 | fi |
81 | if [ "x$TEST_SSH_SCP" != "x" ]; then | ||
82 | SCP="${TEST_SSH_SCP}" | ||
83 | fi | ||
84 | |||
85 | # Path to sshd must be absolute for rexec | ||
86 | SSHD=`which sshd` | ||
75 | 87 | ||
76 | # these should be used in tests | 88 | # these should be used in tests |
77 | export SSH SSHD SSHAGENT SSHADD SSHKEYGEN SSHKEYSCAN SFTP SFTPSERVER | 89 | export SSH SSHD SSHAGENT SSHADD SSHKEYGEN SSHKEYSCAN SFTP SFTPSERVER SCP |
78 | #echo $SSH $SSHD $SSHAGENT $SSHADD $SSHKEYGEN $SSHKEYSCAN $SFTP $SFTPSERVER | 90 | #echo $SSH $SSHD $SSHAGENT $SSHADD $SSHKEYGEN $SSHKEYSCAN $SFTP $SFTPSERVER $SCP |
79 | 91 | ||
80 | # helper | 92 | # helper |
81 | echon() | 93 | echon() |
@@ -156,15 +168,23 @@ trap fatal 3 2 | |||
156 | 168 | ||
157 | # create server config | 169 | # create server config |
158 | cat << EOF > $OBJ/sshd_config | 170 | cat << EOF > $OBJ/sshd_config |
171 | StrictModes no | ||
159 | Port $PORT | 172 | Port $PORT |
160 | ListenAddress 127.0.0.1 | 173 | ListenAddress 127.0.0.1 |
161 | #ListenAddress ::1 | 174 | #ListenAddress ::1 |
162 | PidFile $PIDFILE | 175 | PidFile $PIDFILE |
163 | AuthorizedKeysFile $OBJ/authorized_keys_%u | 176 | AuthorizedKeysFile $OBJ/authorized_keys_%u |
164 | LogLevel QUIET | 177 | LogLevel QUIET |
165 | StrictModes no | 178 | AcceptEnv _XXX_TEST_* |
179 | AcceptEnv _XXX_TEST | ||
180 | Subsystem sftp $SFTPSERVER | ||
166 | EOF | 181 | EOF |
167 | 182 | ||
183 | if [ ! -z "$TEST_SSH_SSHD_CONFOPTS" ]; then | ||
184 | trace "adding sshd_config option $TEST_SSH_SSHD_CONFOPTS" | ||
185 | echo "$TEST_SSH_SSHD_CONFOPTS" >> $OBJ/sshd_config | ||
186 | fi | ||
187 | |||
168 | # server config for proxy connects | 188 | # server config for proxy connects |
169 | cp $OBJ/sshd_config $OBJ/sshd_proxy | 189 | cp $OBJ/sshd_config $OBJ/sshd_proxy |
170 | 190 | ||
@@ -190,6 +210,11 @@ Host * | |||
190 | StrictHostKeyChecking yes | 210 | StrictHostKeyChecking yes |
191 | EOF | 211 | EOF |
192 | 212 | ||
213 | if [ ! -z "$TEST_SSH_SSH_CONFOPTS" ]; then | ||
214 | trace "adding ssh_config option $TEST_SSH_SSHD_CONFOPTS" | ||
215 | echo "$TEST_SSH_SSH_CONFOPTS" >> $OBJ/ssh_config | ||
216 | fi | ||
217 | |||
193 | rm -f $OBJ/known_hosts $OBJ/authorized_keys_$USER | 218 | rm -f $OBJ/known_hosts $OBJ/authorized_keys_$USER |
194 | 219 | ||
195 | trace "generate keys" | 220 | trace "generate keys" |
diff --git a/regress/try-ciphers.sh b/regress/try-ciphers.sh index 15827e250..c6e1b9152 100644 --- a/regress/try-ciphers.sh +++ b/regress/try-ciphers.sh | |||
@@ -29,8 +29,10 @@ for c in $ciphers; do | |||
29 | fi | 29 | fi |
30 | done | 30 | done |
31 | 31 | ||
32 | if ! ${SSH} -oCiphers=acss@openssh.org 2>&1 | grep "Bad SSH2 cipher" >/dev/null | 32 | if ${SSH} -oCiphers=acss@openssh.org 2>&1 | grep "Bad SSH2 cipher" >/dev/null |
33 | then | 33 | then |
34 | : | ||
35 | else | ||
34 | 36 | ||
35 | echo "Ciphers acss@openssh.org" >> $OBJ/sshd_proxy | 37 | echo "Ciphers acss@openssh.org" >> $OBJ/sshd_proxy |
36 | c=acss@openssh.org | 38 | c=acss@openssh.org |
diff --git a/rijndael.c b/rijndael.c index 1cd24de14..7432ea2e4 100644 --- a/rijndael.c +++ b/rijndael.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: rijndael.c,v 1.15 2003/11/21 11:57:03 djm Exp $ */ | 1 | /* $OpenBSD: rijndael.c,v 1.16 2004/06/23 00:39:38 mouring Exp $ */ |
2 | 2 | ||
3 | /** | 3 | /** |
4 | * rijndael-alg-fst.c | 4 | * rijndael-alg-fst.c |
@@ -1218,10 +1218,10 @@ static void rijndaelDecrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 ct[16 | |||
1218 | } | 1218 | } |
1219 | 1219 | ||
1220 | void | 1220 | void |
1221 | rijndael_set_key(rijndael_ctx *ctx, u_char *key, int bits, int encrypt) | 1221 | rijndael_set_key(rijndael_ctx *ctx, u_char *key, int bits, int do_encrypt) |
1222 | { | 1222 | { |
1223 | ctx->Nr = rijndaelKeySetupEnc(ctx->ek, key, bits); | 1223 | ctx->Nr = rijndaelKeySetupEnc(ctx->ek, key, bits); |
1224 | if (encrypt) { | 1224 | if (do_encrypt) { |
1225 | ctx->decrypt = 0; | 1225 | ctx->decrypt = 0; |
1226 | memset(ctx->dk, 0, sizeof(ctx->dk)); | 1226 | memset(ctx->dk, 0, sizeof(ctx->dk)); |
1227 | } else { | 1227 | } else { |
diff --git a/scard-opensc.c b/scard-opensc.c index a9b7ebc61..dd2c28df2 100644 --- a/scard-opensc.c +++ b/scard-opensc.c | |||
@@ -35,7 +35,7 @@ | |||
35 | #include "key.h" | 35 | #include "key.h" |
36 | #include "log.h" | 36 | #include "log.h" |
37 | #include "xmalloc.h" | 37 | #include "xmalloc.h" |
38 | #include "readpass.h" | 38 | #include "misc.h" |
39 | #include "scard.h" | 39 | #include "scard.h" |
40 | 40 | ||
41 | #if OPENSSL_VERSION_NUMBER < 0x00907000L && defined(CRYPTO_LOCK_ENGINE) | 41 | #if OPENSSL_VERSION_NUMBER < 0x00907000L && defined(CRYPTO_LOCK_ENGINE) |
@@ -24,7 +24,7 @@ | |||
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | #if defined(SMARTCARD) && defined(USE_SECTOK) | 26 | #if defined(SMARTCARD) && defined(USE_SECTOK) |
27 | RCSID("$OpenBSD: scard.c,v 1.28 2003/06/12 19:12:02 markus Exp $"); | 27 | RCSID("$OpenBSD: scard.c,v 1.29 2004/05/08 00:21:31 djm Exp $"); |
28 | 28 | ||
29 | #include <openssl/evp.h> | 29 | #include <openssl/evp.h> |
30 | #include <sectok.h> | 30 | #include <sectok.h> |
@@ -32,7 +32,7 @@ RCSID("$OpenBSD: scard.c,v 1.28 2003/06/12 19:12:02 markus Exp $"); | |||
32 | #include "key.h" | 32 | #include "key.h" |
33 | #include "log.h" | 33 | #include "log.h" |
34 | #include "xmalloc.h" | 34 | #include "xmalloc.h" |
35 | #include "readpass.h" | 35 | #include "misc.h" |
36 | #include "scard.h" | 36 | #include "scard.h" |
37 | 37 | ||
38 | #if OPENSSL_VERSION_NUMBER < 0x00907000L | 38 | #if OPENSSL_VERSION_NUMBER < 0x00907000L |
@@ -67,7 +67,9 @@ DESCRIPTION | |||
67 | Compression | 67 | Compression |
68 | CompressionLevel | 68 | CompressionLevel |
69 | ConnectionAttempts | 69 | ConnectionAttempts |
70 | ConnectionTimeout | 70 | ConnectTimeout |
71 | ControlMaster | ||
72 | ControlPath | ||
71 | GlobalKnownHostsFile | 73 | GlobalKnownHostsFile |
72 | GSSAPIAuthentication | 74 | GSSAPIAuthentication |
73 | GSSAPIDelegateCredentials | 75 | GSSAPIDelegateCredentials |
@@ -90,6 +92,7 @@ DESCRIPTION | |||
90 | PubkeyAuthentication | 92 | PubkeyAuthentication |
91 | RhostsRSAAuthentication | 93 | RhostsRSAAuthentication |
92 | RSAAuthentication | 94 | RSAAuthentication |
95 | SendEnv | ||
93 | ServerAliveInterval | 96 | ServerAliveInterval |
94 | ServerAliveCountMax | 97 | ServerAliveCountMax |
95 | SmartcardDevice | 98 | SmartcardDevice |
@@ -136,4 +139,4 @@ AUTHORS | |||
136 | Timo Rinne <tri@iki.fi> | 139 | Timo Rinne <tri@iki.fi> |
137 | Tatu Ylonen <ylo@cs.hut.fi> | 140 | Tatu Ylonen <ylo@cs.hut.fi> |
138 | 141 | ||
139 | OpenBSD 3.5 September 25, 1999 3 | 142 | OpenBSD 3.6 September 25, 1999 3 |
@@ -9,7 +9,7 @@ | |||
9 | .\" | 9 | .\" |
10 | .\" Created: Sun May 7 00:14:37 1995 ylo | 10 | .\" Created: Sun May 7 00:14:37 1995 ylo |
11 | .\" | 11 | .\" |
12 | .\" $OpenBSD: scp.1,v 1.33 2004/03/05 10:53:58 markus Exp $ | 12 | .\" $OpenBSD: scp.1,v 1.36 2004/06/13 15:03:02 djm Exp $ |
13 | .\" | 13 | .\" |
14 | .Dd September 25, 1999 | 14 | .Dd September 25, 1999 |
15 | .Dt SCP 1 | 15 | .Dt SCP 1 |
@@ -127,7 +127,9 @@ For full details of the options listed below, and their possible values, see | |||
127 | .It Compression | 127 | .It Compression |
128 | .It CompressionLevel | 128 | .It CompressionLevel |
129 | .It ConnectionAttempts | 129 | .It ConnectionAttempts |
130 | .It ConnectionTimeout | 130 | .It ConnectTimeout |
131 | .It ControlMaster | ||
132 | .It ControlPath | ||
131 | .It GlobalKnownHostsFile | 133 | .It GlobalKnownHostsFile |
132 | .It GSSAPIAuthentication | 134 | .It GSSAPIAuthentication |
133 | .It GSSAPIDelegateCredentials | 135 | .It GSSAPIDelegateCredentials |
@@ -150,6 +152,7 @@ For full details of the options listed below, and their possible values, see | |||
150 | .It PubkeyAuthentication | 152 | .It PubkeyAuthentication |
151 | .It RhostsRSAAuthentication | 153 | .It RhostsRSAAuthentication |
152 | .It RSAAuthentication | 154 | .It RSAAuthentication |
155 | .It SendEnv | ||
153 | .It ServerAliveInterval | 156 | .It ServerAliveInterval |
154 | .It ServerAliveCountMax | 157 | .It ServerAliveCountMax |
155 | .It SmartcardDevice | 158 | .It SmartcardDevice |
@@ -71,7 +71,7 @@ | |||
71 | */ | 71 | */ |
72 | 72 | ||
73 | #include "includes.h" | 73 | #include "includes.h" |
74 | RCSID("$OpenBSD: scp.c,v 1.113 2003/11/23 23:21:21 djm Exp $"); | 74 | RCSID("$OpenBSD: scp.c,v 1.117 2004/08/11 21:44:32 avsm Exp $"); |
75 | 75 | ||
76 | #include "xmalloc.h" | 76 | #include "xmalloc.h" |
77 | #include "atomicio.h" | 77 | #include "atomicio.h" |
@@ -80,11 +80,7 @@ RCSID("$OpenBSD: scp.c,v 1.113 2003/11/23 23:21:21 djm Exp $"); | |||
80 | #include "misc.h" | 80 | #include "misc.h" |
81 | #include "progressmeter.h" | 81 | #include "progressmeter.h" |
82 | 82 | ||
83 | #ifdef HAVE___PROGNAME | ||
84 | extern char *__progname; | 83 | extern char *__progname; |
85 | #else | ||
86 | char *__progname; | ||
87 | #endif | ||
88 | 84 | ||
89 | void bwlimit(int); | 85 | void bwlimit(int); |
90 | 86 | ||
@@ -663,7 +659,7 @@ bwlimit(int amount) | |||
663 | { | 659 | { |
664 | static struct timeval bwstart, bwend; | 660 | static struct timeval bwstart, bwend; |
665 | static int lamt, thresh = 16384; | 661 | static int lamt, thresh = 16384; |
666 | u_int64_t wait; | 662 | u_int64_t waitlen; |
667 | struct timespec ts, rm; | 663 | struct timespec ts, rm; |
668 | 664 | ||
669 | if (!timerisset(&bwstart)) { | 665 | if (!timerisset(&bwstart)) { |
@@ -681,10 +677,10 @@ bwlimit(int amount) | |||
681 | return; | 677 | return; |
682 | 678 | ||
683 | lamt *= 8; | 679 | lamt *= 8; |
684 | wait = (double)1000000L * lamt / limit_rate; | 680 | waitlen = (double)1000000L * lamt / limit_rate; |
685 | 681 | ||
686 | bwstart.tv_sec = wait / 1000000L; | 682 | bwstart.tv_sec = waitlen / 1000000L; |
687 | bwstart.tv_usec = wait % 1000000L; | 683 | bwstart.tv_usec = waitlen % 1000000L; |
688 | 684 | ||
689 | if (timercmp(&bwstart, &bwend, >)) { | 685 | if (timercmp(&bwstart, &bwend, >)) { |
690 | timersub(&bwstart, &bwend, &bwend); | 686 | timersub(&bwstart, &bwend, &bwend); |
@@ -759,6 +755,8 @@ sink(int argc, char **argv) | |||
759 | *cp++ = ch; | 755 | *cp++ = ch; |
760 | } while (cp < &buf[sizeof(buf) - 1] && ch != '\n'); | 756 | } while (cp < &buf[sizeof(buf) - 1] && ch != '\n'); |
761 | *cp = 0; | 757 | *cp = 0; |
758 | if (verbose_mode) | ||
759 | fprintf(stderr, "Sink: %s", buf); | ||
762 | 760 | ||
763 | if (buf[0] == '\01' || buf[0] == '\02') { | 761 | if (buf[0] == '\01' || buf[0] == '\02') { |
764 | if (iamremote == 0) | 762 | if (iamremote == 0) |
@@ -822,6 +820,10 @@ sink(int argc, char **argv) | |||
822 | size = size * 10 + (*cp++ - '0'); | 820 | size = size * 10 + (*cp++ - '0'); |
823 | if (*cp++ != ' ') | 821 | if (*cp++ != ' ') |
824 | SCREWUP("size not delimited"); | 822 | SCREWUP("size not delimited"); |
823 | if ((strchr(cp, '/') != NULL) || (strcmp(cp, "..") == 0)) { | ||
824 | run_err("error: unexpected filename: %s", cp); | ||
825 | exit(1); | ||
826 | } | ||
825 | if (targisdir) { | 827 | if (targisdir) { |
826 | static char *namebuf; | 828 | static char *namebuf; |
827 | static int cursize; | 829 | static int cursize; |
@@ -843,6 +845,8 @@ sink(int argc, char **argv) | |||
843 | exists = stat(np, &stb) == 0; | 845 | exists = stat(np, &stb) == 0; |
844 | if (buf[0] == 'D') { | 846 | if (buf[0] == 'D') { |
845 | int mod_flag = pflag; | 847 | int mod_flag = pflag; |
848 | if (!iamrecursive) | ||
849 | SCREWUP("received directory without -r"); | ||
846 | if (exists) { | 850 | if (exists) { |
847 | if (!S_ISDIR(stb.st_mode)) { | 851 | if (!S_ISDIR(stb.st_mode)) { |
848 | errno = ENOTDIR; | 852 | errno = ENOTDIR; |
@@ -894,11 +898,8 @@ bad: run_err("%s: %s", np, strerror(errno)); | |||
894 | amt = size - i; | 898 | amt = size - i; |
895 | count += amt; | 899 | count += amt; |
896 | do { | 900 | do { |
897 | j = read(remin, cp, amt); | 901 | j = atomicio(read, remin, cp, amt); |
898 | if (j == -1 && (errno == EINTR || | 902 | if (j <= 0) { |
899 | errno == EAGAIN)) { | ||
900 | continue; | ||
901 | } else if (j <= 0) { | ||
902 | run_err("%s", j ? strerror(errno) : | 903 | run_err("%s", j ? strerror(errno) : |
903 | "dropped connection"); | 904 | "dropped connection"); |
904 | exit(1); | 905 | exit(1); |
@@ -938,21 +939,25 @@ bad: run_err("%s: %s", np, strerror(errno)); | |||
938 | if (pflag) { | 939 | if (pflag) { |
939 | if (exists || omode != mode) | 940 | if (exists || omode != mode) |
940 | #ifdef HAVE_FCHMOD | 941 | #ifdef HAVE_FCHMOD |
941 | if (fchmod(ofd, omode)) | 942 | if (fchmod(ofd, omode)) { |
942 | #else /* HAVE_FCHMOD */ | 943 | #else /* HAVE_FCHMOD */ |
943 | if (chmod(np, omode)) | 944 | if (chmod(np, omode)) { |
944 | #endif /* HAVE_FCHMOD */ | 945 | #endif /* HAVE_FCHMOD */ |
945 | run_err("%s: set mode: %s", | 946 | run_err("%s: set mode: %s", |
946 | np, strerror(errno)); | 947 | np, strerror(errno)); |
948 | wrerr = DISPLAYED; | ||
949 | } | ||
947 | } else { | 950 | } else { |
948 | if (!exists && omode != mode) | 951 | if (!exists && omode != mode) |
949 | #ifdef HAVE_FCHMOD | 952 | #ifdef HAVE_FCHMOD |
950 | if (fchmod(ofd, omode & ~mask)) | 953 | if (fchmod(ofd, omode & ~mask)) { |
951 | #else /* HAVE_FCHMOD */ | 954 | #else /* HAVE_FCHMOD */ |
952 | if (chmod(np, omode & ~mask)) | 955 | if (chmod(np, omode & ~mask)) { |
953 | #endif /* HAVE_FCHMOD */ | 956 | #endif /* HAVE_FCHMOD */ |
954 | run_err("%s: set mode: %s", | 957 | run_err("%s: set mode: %s", |
955 | np, strerror(errno)); | 958 | np, strerror(errno)); |
959 | wrerr = DISPLAYED; | ||
960 | } | ||
956 | } | 961 | } |
957 | if (close(ofd) == -1) { | 962 | if (close(ofd) == -1) { |
958 | wrerr = YES; | 963 | wrerr = YES; |
diff --git a/servconf.c b/servconf.c index a72246b6c..fae3c658e 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "includes.h" | 12 | #include "includes.h" |
13 | RCSID("$OpenBSD: servconf.c,v 1.130 2003/12/23 16:12:10 jakob Exp $"); | 13 | RCSID("$OpenBSD: servconf.c,v 1.137 2004/08/13 11:09:24 dtucker Exp $"); |
14 | 14 | ||
15 | #include "ssh.h" | 15 | #include "ssh.h" |
16 | #include "log.h" | 16 | #include "log.h" |
@@ -18,7 +18,6 @@ RCSID("$OpenBSD: servconf.c,v 1.130 2003/12/23 16:12:10 jakob Exp $"); | |||
18 | #include "xmalloc.h" | 18 | #include "xmalloc.h" |
19 | #include "compat.h" | 19 | #include "compat.h" |
20 | #include "pathnames.h" | 20 | #include "pathnames.h" |
21 | #include "tildexpand.h" | ||
22 | #include "misc.h" | 21 | #include "misc.h" |
23 | #include "cipher.h" | 22 | #include "cipher.h" |
24 | #include "kex.h" | 23 | #include "kex.h" |
@@ -95,12 +94,14 @@ initialize_server_options(ServerOptions *options) | |||
95 | options->max_startups_begin = -1; | 94 | options->max_startups_begin = -1; |
96 | options->max_startups_rate = -1; | 95 | options->max_startups_rate = -1; |
97 | options->max_startups = -1; | 96 | options->max_startups = -1; |
97 | options->max_authtries = -1; | ||
98 | options->banner = NULL; | 98 | options->banner = NULL; |
99 | options->use_dns = -1; | 99 | options->use_dns = -1; |
100 | options->client_alive_interval = -1; | 100 | options->client_alive_interval = -1; |
101 | options->client_alive_count_max = -1; | 101 | options->client_alive_count_max = -1; |
102 | options->authorized_keys_file = NULL; | 102 | options->authorized_keys_file = NULL; |
103 | options->authorized_keys_file2 = NULL; | 103 | options->authorized_keys_file2 = NULL; |
104 | options->num_accept_env = 0; | ||
104 | 105 | ||
105 | /* Needs to be accessable in many places */ | 106 | /* Needs to be accessable in many places */ |
106 | use_privsep = -1; | 107 | use_privsep = -1; |
@@ -212,6 +213,8 @@ fill_default_server_options(ServerOptions *options) | |||
212 | options->max_startups_rate = 100; /* 100% */ | 213 | options->max_startups_rate = 100; /* 100% */ |
213 | if (options->max_startups_begin == -1) | 214 | if (options->max_startups_begin == -1) |
214 | options->max_startups_begin = options->max_startups; | 215 | options->max_startups_begin = options->max_startups; |
216 | if (options->max_authtries == -1) | ||
217 | options->max_authtries = DEFAULT_AUTH_FAIL_MAX; | ||
215 | if (options->use_dns == -1) | 218 | if (options->use_dns == -1) |
216 | options->use_dns = 1; | 219 | options->use_dns = 1; |
217 | if (options->client_alive_interval == -1) | 220 | if (options->client_alive_interval == -1) |
@@ -262,11 +265,12 @@ typedef enum { | |||
262 | sPermitUserEnvironment, sUseLogin, sAllowTcpForwarding, sCompression, | 265 | sPermitUserEnvironment, sUseLogin, sAllowTcpForwarding, sCompression, |
263 | sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups, | 266 | sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups, |
264 | sIgnoreUserKnownHosts, sCiphers, sMacs, sProtocol, sPidFile, | 267 | sIgnoreUserKnownHosts, sCiphers, sMacs, sProtocol, sPidFile, |
265 | sGatewayPorts, sPubkeyAuthentication, sXAuthLocation, sSubsystem, sMaxStartups, | 268 | sGatewayPorts, sPubkeyAuthentication, sXAuthLocation, sSubsystem, |
269 | sMaxStartups, sMaxAuthTries, | ||
266 | sBanner, sUseDNS, sHostbasedAuthentication, | 270 | sBanner, sUseDNS, sHostbasedAuthentication, |
267 | sHostbasedUsesNameFromPacketOnly, sClientAliveInterval, | 271 | sHostbasedUsesNameFromPacketOnly, sClientAliveInterval, |
268 | sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2, | 272 | sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2, |
269 | sGssAuthentication, sGssCleanupCreds, | 273 | sGssAuthentication, sGssCleanupCreds, sAcceptEnv, |
270 | sUsePrivilegeSeparation, | 274 | sUsePrivilegeSeparation, |
271 | sDeprecated, sUnsupported | 275 | sDeprecated, sUnsupported |
272 | } ServerOpCodes; | 276 | } ServerOpCodes; |
@@ -357,6 +361,7 @@ static struct { | |||
357 | { "gatewayports", sGatewayPorts }, | 361 | { "gatewayports", sGatewayPorts }, |
358 | { "subsystem", sSubsystem }, | 362 | { "subsystem", sSubsystem }, |
359 | { "maxstartups", sMaxStartups }, | 363 | { "maxstartups", sMaxStartups }, |
364 | { "maxauthtries", sMaxAuthTries }, | ||
360 | { "banner", sBanner }, | 365 | { "banner", sBanner }, |
361 | { "usedns", sUseDNS }, | 366 | { "usedns", sUseDNS }, |
362 | { "verifyreversemapping", sDeprecated }, | 367 | { "verifyreversemapping", sDeprecated }, |
@@ -366,6 +371,7 @@ static struct { | |||
366 | { "authorizedkeysfile", sAuthorizedKeysFile }, | 371 | { "authorizedkeysfile", sAuthorizedKeysFile }, |
367 | { "authorizedkeysfile2", sAuthorizedKeysFile2 }, | 372 | { "authorizedkeysfile2", sAuthorizedKeysFile2 }, |
368 | { "useprivilegeseparation", sUsePrivilegeSeparation}, | 373 | { "useprivilegeseparation", sUsePrivilegeSeparation}, |
374 | { "acceptenv", sAcceptEnv }, | ||
369 | { NULL, sBadOption } | 375 | { NULL, sBadOption } |
370 | }; | 376 | }; |
371 | 377 | ||
@@ -868,6 +874,10 @@ parse_flag: | |||
868 | options->max_startups = options->max_startups_begin; | 874 | options->max_startups = options->max_startups_begin; |
869 | break; | 875 | break; |
870 | 876 | ||
877 | case sMaxAuthTries: | ||
878 | intptr = &options->max_authtries; | ||
879 | goto parse_int; | ||
880 | |||
871 | case sBanner: | 881 | case sBanner: |
872 | charptr = &options->banner; | 882 | charptr = &options->banner; |
873 | goto parse_filename; | 883 | goto parse_filename; |
@@ -892,6 +902,19 @@ parse_flag: | |||
892 | intptr = &options->client_alive_count_max; | 902 | intptr = &options->client_alive_count_max; |
893 | goto parse_int; | 903 | goto parse_int; |
894 | 904 | ||
905 | case sAcceptEnv: | ||
906 | while ((arg = strdelim(&cp)) && *arg != '\0') { | ||
907 | if (strchr(arg, '=') != NULL) | ||
908 | fatal("%s line %d: Invalid environment name.", | ||
909 | filename, linenum); | ||
910 | if (options->num_accept_env >= MAX_ACCEPT_ENV) | ||
911 | fatal("%s line %d: too many allow env.", | ||
912 | filename, linenum); | ||
913 | options->accept_env[options->num_accept_env++] = | ||
914 | xstrdup(arg); | ||
915 | } | ||
916 | break; | ||
917 | |||
895 | case sDeprecated: | 918 | case sDeprecated: |
896 | logit("%s line %d: Deprecated option %s", | 919 | logit("%s line %d: Deprecated option %s", |
897 | filename, linenum, arg); | 920 | filename, linenum, arg); |
@@ -919,26 +942,50 @@ parse_flag: | |||
919 | /* Reads the server configuration file. */ | 942 | /* Reads the server configuration file. */ |
920 | 943 | ||
921 | void | 944 | void |
922 | read_server_config(ServerOptions *options, const char *filename) | 945 | load_server_config(const char *filename, Buffer *conf) |
923 | { | 946 | { |
924 | int linenum, bad_options = 0; | 947 | char line[1024], *cp; |
925 | char line[1024]; | ||
926 | FILE *f; | 948 | FILE *f; |
927 | 949 | ||
928 | debug2("read_server_config: filename %s", filename); | 950 | debug2("%s: filename %s", __func__, filename); |
929 | f = fopen(filename, "r"); | 951 | if ((f = fopen(filename, "r")) == NULL) { |
930 | if (!f) { | ||
931 | perror(filename); | 952 | perror(filename); |
932 | exit(1); | 953 | exit(1); |
933 | } | 954 | } |
934 | linenum = 0; | 955 | buffer_clear(conf); |
935 | while (fgets(line, sizeof(line), f)) { | 956 | while (fgets(line, sizeof(line), f)) { |
936 | /* Update line number counter. */ | 957 | /* |
937 | linenum++; | 958 | * Trim out comments and strip whitespace |
938 | if (process_server_config_line(options, line, filename, linenum) != 0) | 959 | * NB - preserve newlines, they are needed to reproduce |
939 | bad_options++; | 960 | * line numbers later for error messages |
961 | */ | ||
962 | if ((cp = strchr(line, '#')) != NULL) | ||
963 | memcpy(cp, "\n", 2); | ||
964 | cp = line + strspn(line, " \t\r"); | ||
965 | |||
966 | buffer_append(conf, cp, strlen(cp)); | ||
940 | } | 967 | } |
968 | buffer_append(conf, "\0", 1); | ||
941 | fclose(f); | 969 | fclose(f); |
970 | debug2("%s: done config len = %d", __func__, buffer_len(conf)); | ||
971 | } | ||
972 | |||
973 | void | ||
974 | parse_server_config(ServerOptions *options, const char *filename, Buffer *conf) | ||
975 | { | ||
976 | int linenum, bad_options = 0; | ||
977 | char *cp, *obuf, *cbuf; | ||
978 | |||
979 | debug2("%s: config %s len %d", __func__, filename, buffer_len(conf)); | ||
980 | |||
981 | obuf = cbuf = xstrdup(buffer_ptr(conf)); | ||
982 | linenum = 1; | ||
983 | while((cp = strsep(&cbuf, "\n")) != NULL) { | ||
984 | if (process_server_config_line(options, cp, filename, | ||
985 | linenum++) != 0) | ||
986 | bad_options++; | ||
987 | } | ||
988 | xfree(obuf); | ||
942 | if (bad_options > 0) | 989 | if (bad_options > 0) |
943 | fatal("%s: terminating, %d bad configuration options", | 990 | fatal("%s: terminating, %d bad configuration options", |
944 | filename, bad_options); | 991 | filename, bad_options); |
diff --git a/servconf.h b/servconf.h index 57c7e5fab..ebd056814 100644 --- a/servconf.h +++ b/servconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: servconf.h,v 1.67 2003/12/23 16:12:10 jakob Exp $ */ | 1 | /* $OpenBSD: servconf.h,v 1.70 2004/06/24 19:30:54 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -16,6 +16,8 @@ | |||
16 | #ifndef SERVCONF_H | 16 | #ifndef SERVCONF_H |
17 | #define SERVCONF_H | 17 | #define SERVCONF_H |
18 | 18 | ||
19 | #include "buffer.h" | ||
20 | |||
19 | #define MAX_PORTS 256 /* Max # ports. */ | 21 | #define MAX_PORTS 256 /* Max # ports. */ |
20 | 22 | ||
21 | #define MAX_ALLOW_USERS 256 /* Max # users on allow list. */ | 23 | #define MAX_ALLOW_USERS 256 /* Max # users on allow list. */ |
@@ -24,6 +26,7 @@ | |||
24 | #define MAX_DENY_GROUPS 256 /* Max # groups on deny list. */ | 26 | #define MAX_DENY_GROUPS 256 /* Max # groups on deny list. */ |
25 | #define MAX_SUBSYSTEMS 256 /* Max # subsystems. */ | 27 | #define MAX_SUBSYSTEMS 256 /* Max # subsystems. */ |
26 | #define MAX_HOSTKEYS 256 /* Max # hostkeys. */ | 28 | #define MAX_HOSTKEYS 256 /* Max # hostkeys. */ |
29 | #define MAX_ACCEPT_ENV 256 /* Max # of env vars. */ | ||
27 | 30 | ||
28 | /* permit_root_login */ | 31 | /* permit_root_login */ |
29 | #define PERMIT_NOT_SET -1 | 32 | #define PERMIT_NOT_SET -1 |
@@ -32,6 +35,7 @@ | |||
32 | #define PERMIT_NO_PASSWD 2 | 35 | #define PERMIT_NO_PASSWD 2 |
33 | #define PERMIT_YES 3 | 36 | #define PERMIT_YES 3 |
34 | 37 | ||
38 | #define DEFAULT_AUTH_FAIL_MAX 6 /* Default for MaxAuthTries */ | ||
35 | 39 | ||
36 | typedef struct { | 40 | typedef struct { |
37 | u_int num_ports; | 41 | u_int num_ports; |
@@ -107,9 +111,13 @@ typedef struct { | |||
107 | char *subsystem_name[MAX_SUBSYSTEMS]; | 111 | char *subsystem_name[MAX_SUBSYSTEMS]; |
108 | char *subsystem_command[MAX_SUBSYSTEMS]; | 112 | char *subsystem_command[MAX_SUBSYSTEMS]; |
109 | 113 | ||
114 | u_int num_accept_env; | ||
115 | char *accept_env[MAX_ACCEPT_ENV]; | ||
116 | |||
110 | int max_startups_begin; | 117 | int max_startups_begin; |
111 | int max_startups_rate; | 118 | int max_startups_rate; |
112 | int max_startups; | 119 | int max_startups; |
120 | int max_authtries; | ||
113 | char *banner; /* SSH-2 banner message */ | 121 | char *banner; /* SSH-2 banner message */ |
114 | int use_dns; | 122 | int use_dns; |
115 | int client_alive_interval; /* | 123 | int client_alive_interval; /* |
@@ -128,9 +136,9 @@ typedef struct { | |||
128 | } ServerOptions; | 136 | } ServerOptions; |
129 | 137 | ||
130 | void initialize_server_options(ServerOptions *); | 138 | void initialize_server_options(ServerOptions *); |
131 | void read_server_config(ServerOptions *, const char *); | ||
132 | void fill_default_server_options(ServerOptions *); | 139 | void fill_default_server_options(ServerOptions *); |
133 | int process_server_config_line(ServerOptions *, char *, const char *, int); | 140 | int process_server_config_line(ServerOptions *, char *, const char *, int); |
134 | 141 | void load_server_config(const char *, Buffer *); | |
142 | void parse_server_config(ServerOptions *, const char *, Buffer *); | ||
135 | 143 | ||
136 | #endif /* SERVCONF_H */ | 144 | #endif /* SERVCONF_H */ |
diff --git a/serverloop.c b/serverloop.c index c4e35a377..48bea96a1 100644 --- a/serverloop.c +++ b/serverloop.c | |||
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: serverloop.c,v 1.115 2004/01/19 21:25:15 markus Exp $"); | 38 | RCSID("$OpenBSD: serverloop.c,v 1.117 2004/08/11 21:43:05 avsm Exp $"); |
39 | 39 | ||
40 | #include "xmalloc.h" | 40 | #include "xmalloc.h" |
41 | #include "packet.h" | 41 | #include "packet.h" |
@@ -240,7 +240,7 @@ client_alive_check(void) | |||
240 | */ | 240 | */ |
241 | static void | 241 | static void |
242 | wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, int *maxfdp, | 242 | wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, int *maxfdp, |
243 | int *nallocp, u_int max_time_milliseconds) | 243 | u_int *nallocp, u_int max_time_milliseconds) |
244 | { | 244 | { |
245 | struct timeval tv, *tvp; | 245 | struct timeval tv, *tvp; |
246 | int ret; | 246 | int ret; |
@@ -486,7 +486,8 @@ void | |||
486 | server_loop(pid_t pid, int fdin_arg, int fdout_arg, int fderr_arg) | 486 | server_loop(pid_t pid, int fdin_arg, int fdout_arg, int fderr_arg) |
487 | { | 487 | { |
488 | fd_set *readset = NULL, *writeset = NULL; | 488 | fd_set *readset = NULL, *writeset = NULL; |
489 | int max_fd = 0, nalloc = 0; | 489 | int max_fd = 0; |
490 | u_int nalloc = 0; | ||
490 | int wait_status; /* Status returned by wait(). */ | 491 | int wait_status; /* Status returned by wait(). */ |
491 | pid_t wait_pid; /* pid returned by wait(). */ | 492 | pid_t wait_pid; /* pid returned by wait(). */ |
492 | int waiting_termination = 0; /* Have displayed waiting close message. */ | 493 | int waiting_termination = 0; /* Have displayed waiting close message. */ |
@@ -991,6 +992,17 @@ server_input_global_request(int type, u_int32_t seq, void *ctxt) | |||
991 | listen_address, listen_port, options.gateway_ports); | 992 | listen_address, listen_port, options.gateway_ports); |
992 | } | 993 | } |
993 | xfree(listen_address); | 994 | xfree(listen_address); |
995 | } else if (strcmp(rtype, "cancel-tcpip-forward") == 0) { | ||
996 | char *cancel_address; | ||
997 | u_short cancel_port; | ||
998 | |||
999 | cancel_address = packet_get_string(NULL); | ||
1000 | cancel_port = (u_short)packet_get_int(); | ||
1001 | debug("%s: cancel-tcpip-forward addr %s port %d", __func__, | ||
1002 | cancel_address, cancel_port); | ||
1003 | |||
1004 | success = channel_cancel_rport_listener(cancel_address, | ||
1005 | cancel_port); | ||
994 | } | 1006 | } |
995 | if (want_reply) { | 1007 | if (want_reply) { |
996 | packet_start(success ? | 1008 | packet_start(success ? |
@@ -33,7 +33,7 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "includes.h" | 35 | #include "includes.h" |
36 | RCSID("$OpenBSD: session.c,v 1.172 2004/01/30 09:48:57 markus Exp $"); | 36 | RCSID("$OpenBSD: session.c,v 1.180 2004/07/28 09:40:29 markus Exp $"); |
37 | 37 | ||
38 | #include "ssh.h" | 38 | #include "ssh.h" |
39 | #include "ssh1.h" | 39 | #include "ssh1.h" |
@@ -42,7 +42,7 @@ RCSID("$OpenBSD: session.c,v 1.172 2004/01/30 09:48:57 markus Exp $"); | |||
42 | #include "sshpty.h" | 42 | #include "sshpty.h" |
43 | #include "packet.h" | 43 | #include "packet.h" |
44 | #include "buffer.h" | 44 | #include "buffer.h" |
45 | #include "mpaux.h" | 45 | #include "match.h" |
46 | #include "uidswap.h" | 46 | #include "uidswap.h" |
47 | #include "compat.h" | 47 | #include "compat.h" |
48 | #include "channels.h" | 48 | #include "channels.h" |
@@ -196,12 +196,11 @@ auth_input_request_forwarding(struct passwd * pw) | |||
196 | static void | 196 | static void |
197 | display_loginmsg(void) | 197 | display_loginmsg(void) |
198 | { | 198 | { |
199 | if (buffer_len(&loginmsg) > 0) { | 199 | if (buffer_len(&loginmsg) > 0) { |
200 | buffer_append(&loginmsg, "\0", 1); | 200 | buffer_append(&loginmsg, "\0", 1); |
201 | printf("%s\n", (char *)buffer_ptr(&loginmsg)); | 201 | printf("%s", (char *)buffer_ptr(&loginmsg)); |
202 | buffer_clear(&loginmsg); | 202 | buffer_clear(&loginmsg); |
203 | } | 203 | } |
204 | fflush(stdout); | ||
205 | } | 204 | } |
206 | 205 | ||
207 | void | 206 | void |
@@ -265,7 +264,7 @@ do_authenticated1(Authctxt *authctxt) | |||
265 | compression_level = packet_get_int(); | 264 | compression_level = packet_get_int(); |
266 | packet_check_eom(); | 265 | packet_check_eom(); |
267 | if (compression_level < 1 || compression_level > 9) { | 266 | if (compression_level < 1 || compression_level > 9) { |
268 | packet_send_debug("Received illegal compression level %d.", | 267 | packet_send_debug("Received invalid compression level %d.", |
269 | compression_level); | 268 | compression_level); |
270 | break; | 269 | break; |
271 | } | 270 | } |
@@ -481,7 +480,11 @@ do_exec_no_pty(Session *s, const char *command) | |||
481 | close(perr[1]); | 480 | close(perr[1]); |
482 | 481 | ||
483 | if (compat20) { | 482 | if (compat20) { |
484 | session_set_fds(s, pin[1], pout[0], s->is_subsystem ? -1 : perr[0]); | 483 | if (s->is_subsystem) { |
484 | close(perr[0]); | ||
485 | perr[0] = -1; | ||
486 | } | ||
487 | session_set_fds(s, pin[1], pout[0], perr[0]); | ||
485 | } else { | 488 | } else { |
486 | /* Enter the interactive session. */ | 489 | /* Enter the interactive session. */ |
487 | server_loop(pid, pin[1], pout[0], perr[0]); | 490 | server_loop(pid, pin[1], pout[0], perr[0]); |
@@ -672,14 +675,19 @@ do_exec(Session *s, const char *command) | |||
672 | do_exec_no_pty(s, command); | 675 | do_exec_no_pty(s, command); |
673 | 676 | ||
674 | original_command = NULL; | 677 | original_command = NULL; |
675 | } | ||
676 | 678 | ||
679 | /* | ||
680 | * Clear loginmsg: it's the child's responsibility to display | ||
681 | * it to the user, otherwise multiple sessions may accumulate | ||
682 | * multiple copies of the login messages. | ||
683 | */ | ||
684 | buffer_clear(&loginmsg); | ||
685 | } | ||
677 | 686 | ||
678 | /* administrative, login(1)-like work */ | 687 | /* administrative, login(1)-like work */ |
679 | void | 688 | void |
680 | do_login(Session *s, const char *command) | 689 | do_login(Session *s, const char *command) |
681 | { | 690 | { |
682 | char *time_string; | ||
683 | socklen_t fromlen; | 691 | socklen_t fromlen; |
684 | struct sockaddr_storage from; | 692 | struct sockaddr_storage from; |
685 | struct passwd * pw = s->pw; | 693 | struct passwd * pw = s->pw; |
@@ -724,19 +732,6 @@ do_login(Session *s, const char *command) | |||
724 | 732 | ||
725 | display_loginmsg(); | 733 | display_loginmsg(); |
726 | 734 | ||
727 | #ifndef NO_SSH_LASTLOG | ||
728 | if (options.print_lastlog && s->last_login_time != 0) { | ||
729 | time_string = ctime(&s->last_login_time); | ||
730 | if (strchr(time_string, '\n')) | ||
731 | *strchr(time_string, '\n') = 0; | ||
732 | if (strcmp(s->hostname, "") == 0) | ||
733 | printf("Last login: %s\r\n", time_string); | ||
734 | else | ||
735 | printf("Last login: %s from %s\r\n", time_string, | ||
736 | s->hostname); | ||
737 | } | ||
738 | #endif /* NO_SSH_LASTLOG */ | ||
739 | |||
740 | do_motd(); | 735 | do_motd(); |
741 | } | 736 | } |
742 | 737 | ||
@@ -996,6 +991,10 @@ do_setup_env(Session *s, const char *shell) | |||
996 | 991 | ||
997 | if (!options.use_login) { | 992 | if (!options.use_login) { |
998 | /* Set basic environment. */ | 993 | /* Set basic environment. */ |
994 | for (i = 0; i < s->num_env; i++) | ||
995 | child_set_env(&env, &envsize, s->env[i].name, | ||
996 | s->env[i].val); | ||
997 | |||
999 | child_set_env(&env, &envsize, "USER", pw->pw_name); | 998 | child_set_env(&env, &envsize, "USER", pw->pw_name); |
1000 | child_set_env(&env, &envsize, "LOGNAME", pw->pw_name); | 999 | child_set_env(&env, &envsize, "LOGNAME", pw->pw_name); |
1001 | #ifdef _AIX | 1000 | #ifdef _AIX |
@@ -1310,9 +1309,10 @@ do_setusercontext(struct passwd *pw) | |||
1310 | static void | 1309 | static void |
1311 | do_pwchange(Session *s) | 1310 | do_pwchange(Session *s) |
1312 | { | 1311 | { |
1312 | fflush(NULL); | ||
1313 | fprintf(stderr, "WARNING: Your password has expired.\n"); | 1313 | fprintf(stderr, "WARNING: Your password has expired.\n"); |
1314 | if (s->ttyfd != -1) { | 1314 | if (s->ttyfd != -1) { |
1315 | fprintf(stderr, | 1315 | fprintf(stderr, |
1316 | "You must change your password now and login again!\n"); | 1316 | "You must change your password now and login again!\n"); |
1317 | execl(_PATH_PASSWD_PROG, "passwd", (char *)NULL); | 1317 | execl(_PATH_PASSWD_PROG, "passwd", (char *)NULL); |
1318 | perror("passwd"); | 1318 | perror("passwd"); |
@@ -1423,6 +1423,13 @@ do_child(Session *s, const char *command) | |||
1423 | #else /* HAVE_OSF_SIA */ | 1423 | #else /* HAVE_OSF_SIA */ |
1424 | do_nologin(pw); | 1424 | do_nologin(pw); |
1425 | do_setusercontext(pw); | 1425 | do_setusercontext(pw); |
1426 | /* | ||
1427 | * PAM session modules in do_setusercontext may have | ||
1428 | * generated messages, so if this in an interactive | ||
1429 | * login then display them too. | ||
1430 | */ | ||
1431 | if (command == NULL) | ||
1432 | display_loginmsg(); | ||
1426 | #endif /* HAVE_OSF_SIA */ | 1433 | #endif /* HAVE_OSF_SIA */ |
1427 | } | 1434 | } |
1428 | 1435 | ||
@@ -1688,12 +1695,6 @@ session_pty_req(Session *s) | |||
1688 | packet_disconnect("Protocol error: you already have a pty."); | 1695 | packet_disconnect("Protocol error: you already have a pty."); |
1689 | return 0; | 1696 | return 0; |
1690 | } | 1697 | } |
1691 | /* Get the time and hostname when the user last logged in. */ | ||
1692 | if (options.print_lastlog) { | ||
1693 | s->hostname[0] = '\0'; | ||
1694 | s->last_login_time = get_last_login_time(s->pw->pw_uid, | ||
1695 | s->pw->pw_name, s->hostname, sizeof(s->hostname)); | ||
1696 | } | ||
1697 | 1698 | ||
1698 | s->term = packet_get_string(&len); | 1699 | s->term = packet_get_string(&len); |
1699 | 1700 | ||
@@ -1820,9 +1821,8 @@ session_exec_req(Session *s) | |||
1820 | static int | 1821 | static int |
1821 | session_break_req(Session *s) | 1822 | session_break_req(Session *s) |
1822 | { | 1823 | { |
1823 | u_int break_length; | ||
1824 | 1824 | ||
1825 | break_length = packet_get_int(); /* ignored */ | 1825 | packet_get_int(); /* ignored */ |
1826 | packet_check_eom(); | 1826 | packet_check_eom(); |
1827 | 1827 | ||
1828 | if (s->ttyfd == -1 || | 1828 | if (s->ttyfd == -1 || |
@@ -1832,6 +1832,41 @@ session_break_req(Session *s) | |||
1832 | } | 1832 | } |
1833 | 1833 | ||
1834 | static int | 1834 | static int |
1835 | session_env_req(Session *s) | ||
1836 | { | ||
1837 | char *name, *val; | ||
1838 | u_int name_len, val_len, i; | ||
1839 | |||
1840 | name = packet_get_string(&name_len); | ||
1841 | val = packet_get_string(&val_len); | ||
1842 | packet_check_eom(); | ||
1843 | |||
1844 | /* Don't set too many environment variables */ | ||
1845 | if (s->num_env > 128) { | ||
1846 | debug2("Ignoring env request %s: too many env vars", name); | ||
1847 | goto fail; | ||
1848 | } | ||
1849 | |||
1850 | for (i = 0; i < options.num_accept_env; i++) { | ||
1851 | if (match_pattern(name, options.accept_env[i])) { | ||
1852 | debug2("Setting env %d: %s=%s", s->num_env, name, val); | ||
1853 | s->env = xrealloc(s->env, sizeof(*s->env) * | ||
1854 | (s->num_env + 1)); | ||
1855 | s->env[s->num_env].name = name; | ||
1856 | s->env[s->num_env].val = val; | ||
1857 | s->num_env++; | ||
1858 | return (1); | ||
1859 | } | ||
1860 | } | ||
1861 | debug2("Ignoring env request %s: disallowed name", name); | ||
1862 | |||
1863 | fail: | ||
1864 | xfree(name); | ||
1865 | xfree(val); | ||
1866 | return (0); | ||
1867 | } | ||
1868 | |||
1869 | static int | ||
1835 | session_auth_agent_req(Session *s) | 1870 | session_auth_agent_req(Session *s) |
1836 | { | 1871 | { |
1837 | static int called = 0; | 1872 | static int called = 0; |
@@ -1878,13 +1913,16 @@ session_input_channel_req(Channel *c, const char *rtype) | |||
1878 | success = session_auth_agent_req(s); | 1913 | success = session_auth_agent_req(s); |
1879 | } else if (strcmp(rtype, "subsystem") == 0) { | 1914 | } else if (strcmp(rtype, "subsystem") == 0) { |
1880 | success = session_subsystem_req(s); | 1915 | success = session_subsystem_req(s); |
1881 | } else if (strcmp(rtype, "break") == 0) { | 1916 | } else if (strcmp(rtype, "env") == 0) { |
1882 | success = session_break_req(s); | 1917 | success = session_env_req(s); |
1883 | } | 1918 | } |
1884 | } | 1919 | } |
1885 | if (strcmp(rtype, "window-change") == 0) { | 1920 | if (strcmp(rtype, "window-change") == 0) { |
1886 | success = session_window_change_req(s); | 1921 | success = session_window_change_req(s); |
1922 | } else if (strcmp(rtype, "break") == 0) { | ||
1923 | success = session_break_req(s); | ||
1887 | } | 1924 | } |
1925 | |||
1888 | return success; | 1926 | return success; |
1889 | } | 1927 | } |
1890 | 1928 | ||
@@ -2017,6 +2055,8 @@ session_exit_message(Session *s, int status) | |||
2017 | void | 2055 | void |
2018 | session_close(Session *s) | 2056 | session_close(Session *s) |
2019 | { | 2057 | { |
2058 | int i; | ||
2059 | |||
2020 | debug("session_close: session %d pid %ld", s->self, (long)s->pid); | 2060 | debug("session_close: session %d pid %ld", s->self, (long)s->pid); |
2021 | if (s->ttyfd != -1) | 2061 | if (s->ttyfd != -1) |
2022 | session_pty_cleanup(s); | 2062 | session_pty_cleanup(s); |
@@ -2031,6 +2071,12 @@ session_close(Session *s) | |||
2031 | if (s->auth_proto) | 2071 | if (s->auth_proto) |
2032 | xfree(s->auth_proto); | 2072 | xfree(s->auth_proto); |
2033 | s->used = 0; | 2073 | s->used = 0; |
2074 | for (i = 0; i < s->num_env; i++) { | ||
2075 | xfree(s->env[i].name); | ||
2076 | xfree(s->env[i].val); | ||
2077 | } | ||
2078 | if (s->env != NULL) | ||
2079 | xfree(s->env); | ||
2034 | session_proctitle(s); | 2080 | session_proctitle(s); |
2035 | } | 2081 | } |
2036 | 2082 | ||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: session.h,v 1.21 2003/09/23 20:17:11 markus Exp $ */ | 1 | /* $OpenBSD: session.h,v 1.23 2004/07/17 05:31:41 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
@@ -39,9 +39,6 @@ struct Session { | |||
39 | int ptyfd, ttyfd, ptymaster; | 39 | int ptyfd, ttyfd, ptymaster; |
40 | u_int row, col, xpixel, ypixel; | 40 | u_int row, col, xpixel, ypixel; |
41 | char tty[TTYSZ]; | 41 | char tty[TTYSZ]; |
42 | /* last login */ | ||
43 | char hostname[MAXHOSTNAMELEN]; | ||
44 | time_t last_login_time; | ||
45 | /* X11 */ | 42 | /* X11 */ |
46 | u_int display_number; | 43 | u_int display_number; |
47 | char *display; | 44 | char *display; |
@@ -53,6 +50,11 @@ struct Session { | |||
53 | /* proto 2 */ | 50 | /* proto 2 */ |
54 | int chanid; | 51 | int chanid; |
55 | int is_subsystem; | 52 | int is_subsystem; |
53 | int num_env; | ||
54 | struct { | ||
55 | char *name; | ||
56 | char *val; | ||
57 | } *env; | ||
56 | }; | 58 | }; |
57 | 59 | ||
58 | void do_authenticated(Authctxt *); | 60 | void do_authenticated(Authctxt *); |
diff --git a/sftp-client.c b/sftp-client.c index 781d9827a..0ffacbccc 100644 --- a/sftp-client.c +++ b/sftp-client.c | |||
@@ -20,7 +20,7 @@ | |||
20 | /* XXX: copy between two remote sites */ | 20 | /* XXX: copy between two remote sites */ |
21 | 21 | ||
22 | #include "includes.h" | 22 | #include "includes.h" |
23 | RCSID("$OpenBSD: sftp-client.c,v 1.47 2004/03/03 09:30:42 djm Exp $"); | 23 | RCSID("$OpenBSD: sftp-client.c,v 1.51 2004/07/11 17:48:47 deraadt Exp $"); |
24 | 24 | ||
25 | #include "openbsd-compat/sys-queue.h" | 25 | #include "openbsd-compat/sys-queue.h" |
26 | 26 | ||
@@ -36,6 +36,7 @@ RCSID("$OpenBSD: sftp-client.c,v 1.47 2004/03/03 09:30:42 djm Exp $"); | |||
36 | #include "sftp-common.h" | 36 | #include "sftp-common.h" |
37 | #include "sftp-client.h" | 37 | #include "sftp-client.h" |
38 | 38 | ||
39 | extern volatile sig_atomic_t interrupted; | ||
39 | extern int showprogress; | 40 | extern int showprogress; |
40 | 41 | ||
41 | /* Minimum amount of data to read at at time */ | 42 | /* Minimum amount of data to read at at time */ |
@@ -330,7 +331,7 @@ do_lsreaddir(struct sftp_conn *conn, char *path, int printflag, | |||
330 | (*dir)[0] = NULL; | 331 | (*dir)[0] = NULL; |
331 | } | 332 | } |
332 | 333 | ||
333 | for (;;) { | 334 | for (; !interrupted;) { |
334 | int count; | 335 | int count; |
335 | 336 | ||
336 | id = expected_id = conn->msg_id++; | 337 | id = expected_id = conn->msg_id++; |
@@ -407,6 +408,13 @@ do_lsreaddir(struct sftp_conn *conn, char *path, int printflag, | |||
407 | do_close(conn, handle, handle_len); | 408 | do_close(conn, handle, handle_len); |
408 | xfree(handle); | 409 | xfree(handle); |
409 | 410 | ||
411 | /* Don't return partial matches on interrupt */ | ||
412 | if (interrupted && dir != NULL && *dir != NULL) { | ||
413 | free_sftp_dirents(*dir); | ||
414 | *dir = xmalloc(sizeof(**dir)); | ||
415 | **dir = NULL; | ||
416 | } | ||
417 | |||
410 | return(0); | 418 | return(0); |
411 | } | 419 | } |
412 | 420 | ||
@@ -643,7 +651,7 @@ do_symlink(struct sftp_conn *conn, char *oldpath, char *newpath) | |||
643 | 651 | ||
644 | buffer_init(&msg); | 652 | buffer_init(&msg); |
645 | 653 | ||
646 | /* Send rename request */ | 654 | /* Send symlink request */ |
647 | id = conn->msg_id++; | 655 | id = conn->msg_id++; |
648 | buffer_put_char(&msg, SSH2_FXP_SYMLINK); | 656 | buffer_put_char(&msg, SSH2_FXP_SYMLINK); |
649 | buffer_put_int(&msg, id); | 657 | buffer_put_int(&msg, id); |
@@ -812,6 +820,16 @@ do_download(struct sftp_conn *conn, char *remote_path, char *local_path, | |||
812 | char *data; | 820 | char *data; |
813 | u_int len; | 821 | u_int len; |
814 | 822 | ||
823 | /* | ||
824 | * Simulate EOF on interrupt: stop sending new requests and | ||
825 | * allow outstanding requests to drain gracefully | ||
826 | */ | ||
827 | if (interrupted) { | ||
828 | if (num_req == 0) /* If we haven't started yet... */ | ||
829 | break; | ||
830 | max_req = 0; | ||
831 | } | ||
832 | |||
815 | /* Send some more requests */ | 833 | /* Send some more requests */ |
816 | while (num_req < max_req) { | 834 | while (num_req < max_req) { |
817 | debug3("Request range %llu -> %llu (%d/%d)", | 835 | debug3("Request range %llu -> %llu (%d/%d)", |
@@ -899,8 +917,7 @@ do_download(struct sftp_conn *conn, char *remote_path, char *local_path, | |||
899 | (unsigned long long)offset, | 917 | (unsigned long long)offset, |
900 | num_req); | 918 | num_req); |
901 | max_req = 1; | 919 | max_req = 1; |
902 | } | 920 | } else if (max_req <= conn->num_requests) { |
903 | else if (max_req < conn->num_requests + 1) { | ||
904 | ++max_req; | 921 | ++max_req; |
905 | } | 922 | } |
906 | } | 923 | } |
@@ -975,7 +992,7 @@ do_upload(struct sftp_conn *conn, char *local_path, char *remote_path, | |||
975 | TAILQ_ENTRY(outstanding_ack) tq; | 992 | TAILQ_ENTRY(outstanding_ack) tq; |
976 | }; | 993 | }; |
977 | TAILQ_HEAD(ackhead, outstanding_ack) acks; | 994 | TAILQ_HEAD(ackhead, outstanding_ack) acks; |
978 | struct outstanding_ack *ack; | 995 | struct outstanding_ack *ack = NULL; |
979 | 996 | ||
980 | TAILQ_INIT(&acks); | 997 | TAILQ_INIT(&acks); |
981 | 998 | ||
@@ -1036,10 +1053,14 @@ do_upload(struct sftp_conn *conn, char *local_path, char *remote_path, | |||
1036 | int len; | 1053 | int len; |
1037 | 1054 | ||
1038 | /* | 1055 | /* |
1039 | * Can't use atomicio here because it returns 0 on EOF, thus losing | 1056 | * Can't use atomicio here because it returns 0 on EOF, |
1040 | * the last block of the file | 1057 | * thus losing the last block of the file. |
1058 | * Simulate an EOF on interrupt, allowing ACKs from the | ||
1059 | * server to drain. | ||
1041 | */ | 1060 | */ |
1042 | do | 1061 | if (interrupted) |
1062 | len = 0; | ||
1063 | else do | ||
1043 | len = read(local_fd, data, conn->transfer_buflen); | 1064 | len = read(local_fd, data, conn->transfer_buflen); |
1044 | while ((len == -1) && (errno == EINTR || errno == EAGAIN)); | 1065 | while ((len == -1) && (errno == EINTR || errno == EAGAIN)); |
1045 | 1066 | ||
diff --git a/sftp-server.0 b/sftp-server.0 index b18c84c3a..995e48ecd 100644 --- a/sftp-server.0 +++ b/sftp-server.0 | |||
@@ -24,4 +24,4 @@ AUTHORS | |||
24 | HISTORY | 24 | HISTORY |
25 | sftp-server first appeared in OpenBSD 2.8 . | 25 | sftp-server first appeared in OpenBSD 2.8 . |
26 | 26 | ||
27 | OpenBSD 3.5 August 30, 2000 1 | 27 | OpenBSD 3.6 August 30, 2000 1 |
diff --git a/sftp-server.c b/sftp-server.c index 1d13e97b2..e82280057 100644 --- a/sftp-server.c +++ b/sftp-server.c | |||
@@ -14,7 +14,7 @@ | |||
14 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 14 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
15 | */ | 15 | */ |
16 | #include "includes.h" | 16 | #include "includes.h" |
17 | RCSID("$OpenBSD: sftp-server.c,v 1.45 2004/02/19 21:15:04 markus Exp $"); | 17 | RCSID("$OpenBSD: sftp-server.c,v 1.47 2004/06/25 05:38:48 dtucker Exp $"); |
18 | 18 | ||
19 | #include "buffer.h" | 19 | #include "buffer.h" |
20 | #include "bufaux.h" | 20 | #include "bufaux.h" |
@@ -31,11 +31,7 @@ RCSID("$OpenBSD: sftp-server.c,v 1.45 2004/02/19 21:15:04 markus Exp $"); | |||
31 | #define get_string(lenp) buffer_get_string(&iqueue, lenp); | 31 | #define get_string(lenp) buffer_get_string(&iqueue, lenp); |
32 | #define TRACE debug | 32 | #define TRACE debug |
33 | 33 | ||
34 | #ifdef HAVE___PROGNAME | ||
35 | extern char *__progname; | 34 | extern char *__progname; |
36 | #else | ||
37 | char *__progname; | ||
38 | #endif | ||
39 | 35 | ||
40 | /* input and output queue */ | 36 | /* input and output queue */ |
41 | Buffer iqueue; | 37 | Buffer iqueue; |
@@ -260,7 +256,7 @@ send_msg(Buffer *m) | |||
260 | } | 256 | } |
261 | 257 | ||
262 | static void | 258 | static void |
263 | send_status(u_int32_t id, u_int32_t error) | 259 | send_status(u_int32_t id, u_int32_t status) |
264 | { | 260 | { |
265 | Buffer msg; | 261 | Buffer msg; |
266 | const char *status_messages[] = { | 262 | const char *status_messages[] = { |
@@ -276,14 +272,14 @@ send_status(u_int32_t id, u_int32_t error) | |||
276 | "Unknown error" /* Others */ | 272 | "Unknown error" /* Others */ |
277 | }; | 273 | }; |
278 | 274 | ||
279 | TRACE("sent status id %u error %u", id, error); | 275 | TRACE("sent status id %u error %u", id, status); |
280 | buffer_init(&msg); | 276 | buffer_init(&msg); |
281 | buffer_put_char(&msg, SSH2_FXP_STATUS); | 277 | buffer_put_char(&msg, SSH2_FXP_STATUS); |
282 | buffer_put_int(&msg, id); | 278 | buffer_put_int(&msg, id); |
283 | buffer_put_int(&msg, error); | 279 | buffer_put_int(&msg, status); |
284 | if (version >= 3) { | 280 | if (version >= 3) { |
285 | buffer_put_cstring(&msg, | 281 | buffer_put_cstring(&msg, |
286 | status_messages[MIN(error,SSH2_FX_MAX)]); | 282 | status_messages[MIN(status,SSH2_FX_MAX)]); |
287 | buffer_put_cstring(&msg, ""); | 283 | buffer_put_cstring(&msg, ""); |
288 | } | 284 | } |
289 | send_msg(&msg); | 285 | send_msg(&msg); |
@@ -839,9 +835,29 @@ process_rename(void) | |||
839 | status = errno_to_portable(errno); | 835 | status = errno_to_portable(errno); |
840 | else if (S_ISREG(sb.st_mode)) { | 836 | else if (S_ISREG(sb.st_mode)) { |
841 | /* Race-free rename of regular files */ | 837 | /* Race-free rename of regular files */ |
842 | if (link(oldpath, newpath) == -1) | 838 | if (link(oldpath, newpath) == -1) { |
843 | status = errno_to_portable(errno); | 839 | if (errno == EOPNOTSUPP |
844 | else if (unlink(oldpath) == -1) { | 840 | #ifdef LINK_OPNOTSUPP_ERRNO |
841 | || errno == LINK_OPNOTSUPP_ERRNO | ||
842 | #endif | ||
843 | ) { | ||
844 | struct stat st; | ||
845 | |||
846 | /* | ||
847 | * fs doesn't support links, so fall back to | ||
848 | * stat+rename. This is racy. | ||
849 | */ | ||
850 | if (stat(newpath, &st) == -1) { | ||
851 | if (rename(oldpath, newpath) == -1) | ||
852 | status = | ||
853 | errno_to_portable(errno); | ||
854 | else | ||
855 | status = SSH2_FX_OK; | ||
856 | } | ||
857 | } else { | ||
858 | status = errno_to_portable(errno); | ||
859 | } | ||
860 | } else if (unlink(oldpath) == -1) { | ||
845 | status = errno_to_portable(errno); | 861 | status = errno_to_portable(errno); |
846 | /* clean spare link */ | 862 | /* clean spare link */ |
847 | unlink(newpath); | 863 | unlink(newpath); |
@@ -863,20 +879,20 @@ process_readlink(void) | |||
863 | { | 879 | { |
864 | u_int32_t id; | 880 | u_int32_t id; |
865 | int len; | 881 | int len; |
866 | char link[MAXPATHLEN]; | 882 | char buf[MAXPATHLEN]; |
867 | char *path; | 883 | char *path; |
868 | 884 | ||
869 | id = get_int(); | 885 | id = get_int(); |
870 | path = get_string(NULL); | 886 | path = get_string(NULL); |
871 | TRACE("readlink id %u path %s", id, path); | 887 | TRACE("readlink id %u path %s", id, path); |
872 | if ((len = readlink(path, link, sizeof(link) - 1)) == -1) | 888 | if ((len = readlink(path, buf, sizeof(buf) - 1)) == -1) |
873 | send_status(id, errno_to_portable(errno)); | 889 | send_status(id, errno_to_portable(errno)); |
874 | else { | 890 | else { |
875 | Stat s; | 891 | Stat s; |
876 | 892 | ||
877 | link[len] = '\0'; | 893 | buf[len] = '\0'; |
878 | attrib_clear(&s.attrib); | 894 | attrib_clear(&s.attrib); |
879 | s.name = s.long_name = link; | 895 | s.name = s.long_name = buf; |
880 | send_names(id, 1, &s); | 896 | send_names(id, 1, &s); |
881 | } | 897 | } |
882 | xfree(path); | 898 | xfree(path); |
@@ -72,7 +72,9 @@ DESCRIPTION | |||
72 | Compression | 72 | Compression |
73 | CompressionLevel | 73 | CompressionLevel |
74 | ConnectionAttempts | 74 | ConnectionAttempts |
75 | ConnectionTimeout | 75 | ConnectTimeout |
76 | ControlMaster | ||
77 | ControlPath | ||
76 | GlobalKnownHostsFile | 78 | GlobalKnownHostsFile |
77 | GSSAPIAuthentication | 79 | GSSAPIAuthentication |
78 | GSSAPIDelegateCredentials | 80 | GSSAPIDelegateCredentials |
@@ -95,6 +97,7 @@ DESCRIPTION | |||
95 | PubkeyAuthentication | 97 | PubkeyAuthentication |
96 | RhostsRSAAuthentication | 98 | RhostsRSAAuthentication |
97 | RSAAuthentication | 99 | RSAAuthentication |
100 | SendEnv | ||
98 | ServerAliveInterval | 101 | ServerAliveInterval |
99 | ServerAliveCountMax | 102 | ServerAliveCountMax |
100 | SmartcardDevice | 103 | SmartcardDevice |
@@ -173,7 +176,15 @@ INTERACTIVE COMMANDS | |||
173 | Display remote directory listing of either path or current | 176 | Display remote directory listing of either path or current |
174 | directory if path is not specified. If the -l flag is speci- | 177 | directory if path is not specified. If the -l flag is speci- |
175 | fied, then display additional details including permissions | 178 | fied, then display additional details including permissions |
176 | and ownership information. | 179 | and ownership information. The -n flag will produce a long |
180 | listing with user and group information presented numerical- | ||
181 | ly. | ||
182 | |||
183 | By default, ls listings are sorted in lexicographical order. | ||
184 | This may be changed by specifying the -S (sort by file size), | ||
185 | -t (sort by last modification time), or -f (don't sort at | ||
186 | all) flags. Additionally, the sort order may be reversed us- | ||
187 | ing the -r flag. | ||
177 | 188 | ||
178 | lumask umask | 189 | lumask umask |
179 | Set local umask to umask. | 190 | Set local umask to umask. |
@@ -218,4 +229,4 @@ SEE ALSO | |||
218 | T. Ylonen and S. Lehtinen, SSH File Transfer Protocol, draft-ietf-secsh- | 229 | T. Ylonen and S. Lehtinen, SSH File Transfer Protocol, draft-ietf-secsh- |
219 | filexfer-00.txt, January 2001, work in progress material. | 230 | filexfer-00.txt, January 2001, work in progress material. |
220 | 231 | ||
221 | OpenBSD 3.5 February 4, 2001 4 | 232 | OpenBSD 3.6 February 4, 2001 4 |
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: sftp.1,v 1.52 2004/03/05 10:53:58 markus Exp $ | 1 | .\" $OpenBSD: sftp.1,v 1.57 2004/06/21 22:41:31 djm Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. | 3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. |
4 | .\" | 4 | .\" |
@@ -153,7 +153,9 @@ For full details of the options listed below, and their possible values, see | |||
153 | .It Compression | 153 | .It Compression |
154 | .It CompressionLevel | 154 | .It CompressionLevel |
155 | .It ConnectionAttempts | 155 | .It ConnectionAttempts |
156 | .It ConnectionTimeout | 156 | .It ConnectTimeout |
157 | .It ControlMaster | ||
158 | .It ControlPath | ||
157 | .It GlobalKnownHostsFile | 159 | .It GlobalKnownHostsFile |
158 | .It GSSAPIAuthentication | 160 | .It GSSAPIAuthentication |
159 | .It GSSAPIDelegateCredentials | 161 | .It GSSAPIDelegateCredentials |
@@ -176,6 +178,7 @@ For full details of the options listed below, and their possible values, see | |||
176 | .It PubkeyAuthentication | 178 | .It PubkeyAuthentication |
177 | .It RhostsRSAAuthentication | 179 | .It RhostsRSAAuthentication |
178 | .It RSAAuthentication | 180 | .It RSAAuthentication |
181 | .It SendEnv | ||
179 | .It ServerAliveInterval | 182 | .It ServerAliveInterval |
180 | .It ServerAliveCountMax | 183 | .It ServerAliveCountMax |
181 | .It SmartcardDevice | 184 | .It SmartcardDevice |
@@ -300,6 +303,24 @@ If the | |||
300 | .Fl l | 303 | .Fl l |
301 | flag is specified, then display additional details including permissions | 304 | flag is specified, then display additional details including permissions |
302 | and ownership information. | 305 | and ownership information. |
306 | The | ||
307 | .Fl n | ||
308 | flag will produce a long listing with user and group information presented | ||
309 | numerically. | ||
310 | .Pp | ||
311 | By default, | ||
312 | .Ic ls | ||
313 | listings are sorted in lexicographical order. | ||
314 | This may be changed by specifying the | ||
315 | .Fl S | ||
316 | (sort by file size), | ||
317 | .Fl t | ||
318 | (sort by last modification time), or | ||
319 | .Fl f | ||
320 | (don't sort at all) flags. | ||
321 | Additionally, the sort order may be reversed using the | ||
322 | .Fl r | ||
323 | flag. | ||
303 | .It Ic lumask Ar umask | 324 | .It Ic lumask Ar umask |
304 | Set local umask to | 325 | Set local umask to |
305 | .Ar umask . | 326 | .Ar umask . |
@@ -16,7 +16,7 @@ | |||
16 | 16 | ||
17 | #include "includes.h" | 17 | #include "includes.h" |
18 | 18 | ||
19 | RCSID("$OpenBSD: sftp.c,v 1.45 2004/03/03 09:31:20 djm Exp $"); | 19 | RCSID("$OpenBSD: sftp.c,v 1.56 2004/07/11 17:48:47 deraadt Exp $"); |
20 | 20 | ||
21 | #include "buffer.h" | 21 | #include "buffer.h" |
22 | #include "xmalloc.h" | 22 | #include "xmalloc.h" |
@@ -46,21 +46,32 @@ static pid_t sshpid = -1; | |||
46 | /* This is set to 0 if the progressmeter is not desired. */ | 46 | /* This is set to 0 if the progressmeter is not desired. */ |
47 | int showprogress = 1; | 47 | int showprogress = 1; |
48 | 48 | ||
49 | /* SIGINT received during command processing */ | ||
50 | volatile sig_atomic_t interrupted = 0; | ||
51 | |||
52 | /* I wish qsort() took a separate ctx for the comparison function...*/ | ||
53 | int sort_flag; | ||
54 | |||
49 | int remote_glob(struct sftp_conn *, const char *, int, | 55 | int remote_glob(struct sftp_conn *, const char *, int, |
50 | int (*)(const char *, int), glob_t *); /* proto for sftp-glob.c */ | 56 | int (*)(const char *, int), glob_t *); /* proto for sftp-glob.c */ |
51 | 57 | ||
52 | #ifdef HAVE___PROGNAME | ||
53 | extern char *__progname; | 58 | extern char *__progname; |
54 | #else | ||
55 | char *__progname; | ||
56 | #endif | ||
57 | 59 | ||
58 | /* Separators for interactive commands */ | 60 | /* Separators for interactive commands */ |
59 | #define WHITESPACE " \t\r\n" | 61 | #define WHITESPACE " \t\r\n" |
60 | 62 | ||
61 | /* Define what type of ls view (0 - multi-column) */ | 63 | /* ls flags */ |
62 | #define LONG_VIEW 1 /* Full view ala ls -l */ | 64 | #define LS_LONG_VIEW 0x01 /* Full view ala ls -l */ |
63 | #define SHORT_VIEW 2 /* Single row view ala ls -1 */ | 65 | #define LS_SHORT_VIEW 0x02 /* Single row view ala ls -1 */ |
66 | #define LS_NUMERIC_VIEW 0x04 /* Long view with numeric uid/gid */ | ||
67 | #define LS_NAME_SORT 0x08 /* Sort by name (default) */ | ||
68 | #define LS_TIME_SORT 0x10 /* Sort by mtime */ | ||
69 | #define LS_SIZE_SORT 0x20 /* Sort by file size */ | ||
70 | #define LS_REVERSE_SORT 0x40 /* Reverse sort order */ | ||
71 | #define LS_SHOW_ALL 0x80 /* Don't skip filenames starting with '.' */ | ||
72 | |||
73 | #define VIEW_FLAGS (LS_LONG_VIEW|LS_SHORT_VIEW|LS_NUMERIC_VIEW) | ||
74 | #define SORT_FLAGS (LS_NAME_SORT|LS_TIME_SORT|LS_SIZE_SORT) | ||
64 | 75 | ||
65 | /* Commands for interactive mode */ | 76 | /* Commands for interactive mode */ |
66 | #define I_CHDIR 1 | 77 | #define I_CHDIR 1 |
@@ -131,6 +142,24 @@ static const struct CMD cmds[] = { | |||
131 | int interactive_loop(int fd_in, int fd_out, char *file1, char *file2); | 142 | int interactive_loop(int fd_in, int fd_out, char *file1, char *file2); |
132 | 143 | ||
133 | static void | 144 | static void |
145 | killchild(int signo) | ||
146 | { | ||
147 | if (sshpid > 1) | ||
148 | kill(sshpid, SIGTERM); | ||
149 | |||
150 | _exit(1); | ||
151 | } | ||
152 | |||
153 | static void | ||
154 | cmd_interrupt(int signo) | ||
155 | { | ||
156 | const char msg[] = "\rInterrupt \n"; | ||
157 | |||
158 | write(STDERR_FILENO, msg, sizeof(msg) - 1); | ||
159 | interrupted = 1; | ||
160 | } | ||
161 | |||
162 | static void | ||
134 | help(void) | 163 | help(void) |
135 | { | 164 | { |
136 | printf("Available commands:\n"); | 165 | printf("Available commands:\n"); |
@@ -254,13 +283,13 @@ path_append(char *p1, char *p2) | |||
254 | static char * | 283 | static char * |
255 | make_absolute(char *p, char *pwd) | 284 | make_absolute(char *p, char *pwd) |
256 | { | 285 | { |
257 | char *abs; | 286 | char *abs_str; |
258 | 287 | ||
259 | /* Derelativise */ | 288 | /* Derelativise */ |
260 | if (p && p[0] != '/') { | 289 | if (p && p[0] != '/') { |
261 | abs = path_append(pwd, p); | 290 | abs_str = path_append(pwd, p); |
262 | xfree(p); | 291 | xfree(p); |
263 | return(abs); | 292 | return(abs_str); |
264 | } else | 293 | } else |
265 | return(p); | 294 | return(p); |
266 | } | 295 | } |
@@ -313,15 +342,41 @@ parse_ls_flags(const char **cpp, int *lflag) | |||
313 | { | 342 | { |
314 | const char *cp = *cpp; | 343 | const char *cp = *cpp; |
315 | 344 | ||
345 | /* Defaults */ | ||
346 | *lflag = LS_NAME_SORT; | ||
347 | |||
316 | /* Check for flags */ | 348 | /* Check for flags */ |
317 | if (cp++[0] == '-') { | 349 | if (cp++[0] == '-') { |
318 | for(; strchr(WHITESPACE, *cp) == NULL; cp++) { | 350 | for(; strchr(WHITESPACE, *cp) == NULL; cp++) { |
319 | switch (*cp) { | 351 | switch (*cp) { |
320 | case 'l': | 352 | case 'l': |
321 | *lflag = LONG_VIEW; | 353 | *lflag &= ~VIEW_FLAGS; |
354 | *lflag |= LS_LONG_VIEW; | ||
322 | break; | 355 | break; |
323 | case '1': | 356 | case '1': |
324 | *lflag = SHORT_VIEW; | 357 | *lflag &= ~VIEW_FLAGS; |
358 | *lflag |= LS_SHORT_VIEW; | ||
359 | break; | ||
360 | case 'n': | ||
361 | *lflag &= ~VIEW_FLAGS; | ||
362 | *lflag |= LS_NUMERIC_VIEW|LS_LONG_VIEW; | ||
363 | break; | ||
364 | case 'S': | ||
365 | *lflag &= ~SORT_FLAGS; | ||
366 | *lflag |= LS_SIZE_SORT; | ||
367 | break; | ||
368 | case 't': | ||
369 | *lflag &= ~SORT_FLAGS; | ||
370 | *lflag |= LS_TIME_SORT; | ||
371 | break; | ||
372 | case 'r': | ||
373 | *lflag |= LS_REVERSE_SORT; | ||
374 | break; | ||
375 | case 'f': | ||
376 | *lflag &= ~SORT_FLAGS; | ||
377 | break; | ||
378 | case 'a': | ||
379 | *lflag |= LS_SHOW_ALL; | ||
325 | break; | 380 | break; |
326 | default: | 381 | default: |
327 | error("Invalid flag -%c", *cp); | 382 | error("Invalid flag -%c", *cp); |
@@ -369,7 +424,7 @@ get_pathname(const char **cpp, char **path) | |||
369 | i++; | 424 | i++; |
370 | if (cp[i] != '\'' && cp[i] != '\"' && | 425 | if (cp[i] != '\'' && cp[i] != '\"' && |
371 | cp[i] != '\\') { | 426 | cp[i] != '\\') { |
372 | error("Bad escaped character '\%c'", | 427 | error("Bad escaped character '\\%c'", |
373 | cp[i]); | 428 | cp[i]); |
374 | goto fail; | 429 | goto fail; |
375 | } | 430 | } |
@@ -465,7 +520,7 @@ process_get(struct sftp_conn *conn, char *src, char *dst, char *pwd, int pflag) | |||
465 | goto out; | 520 | goto out; |
466 | } | 521 | } |
467 | 522 | ||
468 | for (i = 0; g.gl_pathv[i]; i++) { | 523 | for (i = 0; g.gl_pathv[i] && !interrupted; i++) { |
469 | if (infer_path(g.gl_pathv[i], &tmp)) { | 524 | if (infer_path(g.gl_pathv[i], &tmp)) { |
470 | err = -1; | 525 | err = -1; |
471 | goto out; | 526 | goto out; |
@@ -534,7 +589,7 @@ process_put(struct sftp_conn *conn, char *src, char *dst, char *pwd, int pflag) | |||
534 | goto out; | 589 | goto out; |
535 | } | 590 | } |
536 | 591 | ||
537 | for (i = 0; g.gl_pathv[i]; i++) { | 592 | for (i = 0; g.gl_pathv[i] && !interrupted; i++) { |
538 | if (!is_reg(g.gl_pathv[i])) { | 593 | if (!is_reg(g.gl_pathv[i])) { |
539 | error("skipping non-regular file %s", | 594 | error("skipping non-regular file %s", |
540 | g.gl_pathv[i]); | 595 | g.gl_pathv[i]); |
@@ -582,8 +637,17 @@ sdirent_comp(const void *aa, const void *bb) | |||
582 | { | 637 | { |
583 | SFTP_DIRENT *a = *(SFTP_DIRENT **)aa; | 638 | SFTP_DIRENT *a = *(SFTP_DIRENT **)aa; |
584 | SFTP_DIRENT *b = *(SFTP_DIRENT **)bb; | 639 | SFTP_DIRENT *b = *(SFTP_DIRENT **)bb; |
640 | int rmul = sort_flag & LS_REVERSE_SORT ? -1 : 1; | ||
641 | |||
642 | #define NCMP(a,b) (a == b ? 0 : (a < b ? 1 : -1)) | ||
643 | if (sort_flag & LS_NAME_SORT) | ||
644 | return (rmul * strcmp(a->filename, b->filename)); | ||
645 | else if (sort_flag & LS_TIME_SORT) | ||
646 | return (rmul * NCMP(a->a.mtime, b->a.mtime)); | ||
647 | else if (sort_flag & LS_SIZE_SORT) | ||
648 | return (rmul * NCMP(a->a.size, b->a.size)); | ||
585 | 649 | ||
586 | return (strcmp(a->filename, b->filename)); | 650 | fatal("Unknown ls sort type"); |
587 | } | 651 | } |
588 | 652 | ||
589 | /* sftp ls.1 replacement for directories */ | 653 | /* sftp ls.1 replacement for directories */ |
@@ -596,14 +660,16 @@ do_ls_dir(struct sftp_conn *conn, char *path, char *strip_path, int lflag) | |||
596 | if ((n = do_readdir(conn, path, &d)) != 0) | 660 | if ((n = do_readdir(conn, path, &d)) != 0) |
597 | return (n); | 661 | return (n); |
598 | 662 | ||
599 | if (!(lflag & SHORT_VIEW)) { | 663 | if (!(lflag & LS_SHORT_VIEW)) { |
600 | int m = 0, width = 80; | 664 | int m = 0, width = 80; |
601 | struct winsize ws; | 665 | struct winsize ws; |
602 | char *tmp; | 666 | char *tmp; |
603 | 667 | ||
604 | /* Count entries for sort and find longest filename */ | 668 | /* Count entries for sort and find longest filename */ |
605 | for (n = 0; d[n] != NULL; n++) | 669 | for (n = 0; d[n] != NULL; n++) { |
606 | m = MAX(m, strlen(d[n]->filename)); | 670 | if (d[n]->filename[0] != '.' || (lflag & LS_SHOW_ALL)) |
671 | m = MAX(m, strlen(d[n]->filename)); | ||
672 | } | ||
607 | 673 | ||
608 | /* Add any subpath that also needs to be counted */ | 674 | /* Add any subpath that also needs to be counted */ |
609 | tmp = path_strip(path, strip_path); | 675 | tmp = path_strip(path, strip_path); |
@@ -619,24 +685,33 @@ do_ls_dir(struct sftp_conn *conn, char *path, char *strip_path, int lflag) | |||
619 | colspace = MIN(colspace, width); | 685 | colspace = MIN(colspace, width); |
620 | } | 686 | } |
621 | 687 | ||
622 | qsort(d, n, sizeof(*d), sdirent_comp); | 688 | if (lflag & SORT_FLAGS) { |
689 | sort_flag = lflag & (SORT_FLAGS|LS_REVERSE_SORT); | ||
690 | qsort(d, n, sizeof(*d), sdirent_comp); | ||
691 | } | ||
623 | 692 | ||
624 | for (n = 0; d[n] != NULL; n++) { | 693 | for (n = 0; d[n] != NULL && !interrupted; n++) { |
625 | char *tmp, *fname; | 694 | char *tmp, *fname; |
626 | 695 | ||
696 | if (d[n]->filename[0] == '.' && !(lflag & LS_SHOW_ALL)) | ||
697 | continue; | ||
698 | |||
627 | tmp = path_append(path, d[n]->filename); | 699 | tmp = path_append(path, d[n]->filename); |
628 | fname = path_strip(tmp, strip_path); | 700 | fname = path_strip(tmp, strip_path); |
629 | xfree(tmp); | 701 | xfree(tmp); |
630 | 702 | ||
631 | if (lflag & LONG_VIEW) { | 703 | if (lflag & LS_LONG_VIEW) { |
632 | char *lname; | 704 | if (lflag & LS_NUMERIC_VIEW) { |
633 | struct stat sb; | 705 | char *lname; |
706 | struct stat sb; | ||
634 | 707 | ||
635 | memset(&sb, 0, sizeof(sb)); | 708 | memset(&sb, 0, sizeof(sb)); |
636 | attrib_to_stat(&d[n]->a, &sb); | 709 | attrib_to_stat(&d[n]->a, &sb); |
637 | lname = ls_file(fname, &sb, 1); | 710 | lname = ls_file(fname, &sb, 1); |
638 | printf("%s\n", lname); | 711 | printf("%s\n", lname); |
639 | xfree(lname); | 712 | xfree(lname); |
713 | } else | ||
714 | printf("%s\n", d[n]->longname); | ||
640 | } else { | 715 | } else { |
641 | printf("%-*s", colspace, fname); | 716 | printf("%-*s", colspace, fname); |
642 | if (c >= columns) { | 717 | if (c >= columns) { |
@@ -649,7 +724,7 @@ do_ls_dir(struct sftp_conn *conn, char *path, char *strip_path, int lflag) | |||
649 | xfree(fname); | 724 | xfree(fname); |
650 | } | 725 | } |
651 | 726 | ||
652 | if (!(lflag & LONG_VIEW) && (c != 1)) | 727 | if (!(lflag & LS_LONG_VIEW) && (c != 1)) |
653 | printf("\n"); | 728 | printf("\n"); |
654 | 729 | ||
655 | free_sftp_dirents(d); | 730 | free_sftp_dirents(d); |
@@ -673,6 +748,9 @@ do_globbed_ls(struct sftp_conn *conn, char *path, char *strip_path, | |||
673 | return (-1); | 748 | return (-1); |
674 | } | 749 | } |
675 | 750 | ||
751 | if (interrupted) | ||
752 | goto out; | ||
753 | |||
676 | /* | 754 | /* |
677 | * If the glob returns a single match, which is the same as the | 755 | * If the glob returns a single match, which is the same as the |
678 | * input glob, and it is a directory, then just list its contents | 756 | * input glob, and it is a directory, then just list its contents |
@@ -690,7 +768,7 @@ do_globbed_ls(struct sftp_conn *conn, char *path, char *strip_path, | |||
690 | } | 768 | } |
691 | } | 769 | } |
692 | 770 | ||
693 | if (!(lflag & SHORT_VIEW)) { | 771 | if (!(lflag & LS_SHORT_VIEW)) { |
694 | int m = 0, width = 80; | 772 | int m = 0, width = 80; |
695 | struct winsize ws; | 773 | struct winsize ws; |
696 | 774 | ||
@@ -706,12 +784,12 @@ do_globbed_ls(struct sftp_conn *conn, char *path, char *strip_path, | |||
706 | colspace = width / columns; | 784 | colspace = width / columns; |
707 | } | 785 | } |
708 | 786 | ||
709 | for (i = 0; g.gl_pathv[i]; i++) { | 787 | for (i = 0; g.gl_pathv[i] && !interrupted; i++) { |
710 | char *fname; | 788 | char *fname; |
711 | 789 | ||
712 | fname = path_strip(g.gl_pathv[i], strip_path); | 790 | fname = path_strip(g.gl_pathv[i], strip_path); |
713 | 791 | ||
714 | if (lflag & LONG_VIEW) { | 792 | if (lflag & LS_LONG_VIEW) { |
715 | char *lname; | 793 | char *lname; |
716 | struct stat sb; | 794 | struct stat sb; |
717 | 795 | ||
@@ -740,9 +818,10 @@ do_globbed_ls(struct sftp_conn *conn, char *path, char *strip_path, | |||
740 | xfree(fname); | 818 | xfree(fname); |
741 | } | 819 | } |
742 | 820 | ||
743 | if (!(lflag & LONG_VIEW) && (c != 1)) | 821 | if (!(lflag & LS_LONG_VIEW) && (c != 1)) |
744 | printf("\n"); | 822 | printf("\n"); |
745 | 823 | ||
824 | out: | ||
746 | if (g.gl_pathc) | 825 | if (g.gl_pathc) |
747 | globfree(&g); | 826 | globfree(&g); |
748 | 827 | ||
@@ -952,7 +1031,7 @@ parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd, | |||
952 | case I_RM: | 1031 | case I_RM: |
953 | path1 = make_absolute(path1, *pwd); | 1032 | path1 = make_absolute(path1, *pwd); |
954 | remote_glob(conn, path1, GLOB_NOCHECK, NULL, &g); | 1033 | remote_glob(conn, path1, GLOB_NOCHECK, NULL, &g); |
955 | for (i = 0; g.gl_pathv[i]; i++) { | 1034 | for (i = 0; g.gl_pathv[i] && !interrupted; i++) { |
956 | printf("Removing %s\n", g.gl_pathv[i]); | 1035 | printf("Removing %s\n", g.gl_pathv[i]); |
957 | err = do_rm(conn, g.gl_pathv[i]); | 1036 | err = do_rm(conn, g.gl_pathv[i]); |
958 | if (err != 0 && err_abort) | 1037 | if (err != 0 && err_abort) |
@@ -1041,7 +1120,7 @@ parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd, | |||
1041 | a.flags |= SSH2_FILEXFER_ATTR_PERMISSIONS; | 1120 | a.flags |= SSH2_FILEXFER_ATTR_PERMISSIONS; |
1042 | a.perm = n_arg; | 1121 | a.perm = n_arg; |
1043 | remote_glob(conn, path1, GLOB_NOCHECK, NULL, &g); | 1122 | remote_glob(conn, path1, GLOB_NOCHECK, NULL, &g); |
1044 | for (i = 0; g.gl_pathv[i]; i++) { | 1123 | for (i = 0; g.gl_pathv[i] && !interrupted; i++) { |
1045 | printf("Changing mode on %s\n", g.gl_pathv[i]); | 1124 | printf("Changing mode on %s\n", g.gl_pathv[i]); |
1046 | err = do_setstat(conn, g.gl_pathv[i], &a); | 1125 | err = do_setstat(conn, g.gl_pathv[i], &a); |
1047 | if (err != 0 && err_abort) | 1126 | if (err != 0 && err_abort) |
@@ -1052,7 +1131,7 @@ parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd, | |||
1052 | case I_CHGRP: | 1131 | case I_CHGRP: |
1053 | path1 = make_absolute(path1, *pwd); | 1132 | path1 = make_absolute(path1, *pwd); |
1054 | remote_glob(conn, path1, GLOB_NOCHECK, NULL, &g); | 1133 | remote_glob(conn, path1, GLOB_NOCHECK, NULL, &g); |
1055 | for (i = 0; g.gl_pathv[i]; i++) { | 1134 | for (i = 0; g.gl_pathv[i] && !interrupted; i++) { |
1056 | if (!(aa = do_stat(conn, g.gl_pathv[i], 0))) { | 1135 | if (!(aa = do_stat(conn, g.gl_pathv[i], 0))) { |
1057 | if (err != 0 && err_abort) | 1136 | if (err != 0 && err_abort) |
1058 | break; | 1137 | break; |
@@ -1180,6 +1259,8 @@ interactive_loop(int fd_in, int fd_out, char *file1, char *file2) | |||
1180 | for (;;) { | 1259 | for (;;) { |
1181 | char *cp; | 1260 | char *cp; |
1182 | 1261 | ||
1262 | signal(SIGINT, SIG_IGN); | ||
1263 | |||
1183 | printf("sftp> "); | 1264 | printf("sftp> "); |
1184 | 1265 | ||
1185 | /* XXX: use libedit */ | 1266 | /* XXX: use libedit */ |
@@ -1195,6 +1276,10 @@ interactive_loop(int fd_in, int fd_out, char *file1, char *file2) | |||
1195 | if (cp) | 1276 | if (cp) |
1196 | *cp = '\0'; | 1277 | *cp = '\0'; |
1197 | 1278 | ||
1279 | /* Handle user interrupts gracefully during commands */ | ||
1280 | interrupted = 0; | ||
1281 | signal(SIGINT, cmd_interrupt); | ||
1282 | |||
1198 | err = parse_dispatch_command(conn, cmd, &pwd, batchmode); | 1283 | err = parse_dispatch_command(conn, cmd, &pwd, batchmode); |
1199 | if (err != 0) | 1284 | if (err != 0) |
1200 | break; | 1285 | break; |
@@ -1206,15 +1291,6 @@ interactive_loop(int fd_in, int fd_out, char *file1, char *file2) | |||
1206 | } | 1291 | } |
1207 | 1292 | ||
1208 | static void | 1293 | static void |
1209 | killchild(int signo) | ||
1210 | { | ||
1211 | if (sshpid > 1) | ||
1212 | kill(sshpid, signo); | ||
1213 | |||
1214 | _exit(1); | ||
1215 | } | ||
1216 | |||
1217 | static void | ||
1218 | connect_to_server(char *path, char **args, int *in, int *out) | 1294 | connect_to_server(char *path, char **args, int *in, int *out) |
1219 | { | 1295 | { |
1220 | int c_in, c_out; | 1296 | int c_in, c_out; |
@@ -1243,15 +1319,23 @@ connect_to_server(char *path, char **args, int *in, int *out) | |||
1243 | if ((dup2(c_in, STDIN_FILENO) == -1) || | 1319 | if ((dup2(c_in, STDIN_FILENO) == -1) || |
1244 | (dup2(c_out, STDOUT_FILENO) == -1)) { | 1320 | (dup2(c_out, STDOUT_FILENO) == -1)) { |
1245 | fprintf(stderr, "dup2: %s\n", strerror(errno)); | 1321 | fprintf(stderr, "dup2: %s\n", strerror(errno)); |
1246 | exit(1); | 1322 | _exit(1); |
1247 | } | 1323 | } |
1248 | close(*in); | 1324 | close(*in); |
1249 | close(*out); | 1325 | close(*out); |
1250 | close(c_in); | 1326 | close(c_in); |
1251 | close(c_out); | 1327 | close(c_out); |
1252 | execv(path, args); | 1328 | |
1329 | /* | ||
1330 | * The underlying ssh is in the same process group, so we must | ||
1331 | * ignore SIGINT if we want to gracefully abort commands, | ||
1332 | * otherwise the signal will make it to the ssh process and | ||
1333 | * kill it too | ||
1334 | */ | ||
1335 | signal(SIGINT, SIG_IGN); | ||
1336 | execvp(path, args); | ||
1253 | fprintf(stderr, "exec: %s: %s\n", path, strerror(errno)); | 1337 | fprintf(stderr, "exec: %s: %s\n", path, strerror(errno)); |
1254 | exit(1); | 1338 | _exit(1); |
1255 | } | 1339 | } |
1256 | 1340 | ||
1257 | signal(SIGTERM, killchild); | 1341 | signal(SIGTERM, killchild); |
@@ -1280,7 +1364,7 @@ int | |||
1280 | main(int argc, char **argv) | 1364 | main(int argc, char **argv) |
1281 | { | 1365 | { |
1282 | int in, out, ch, err; | 1366 | int in, out, ch, err; |
1283 | char *host, *userhost, *cp, *file2; | 1367 | char *host, *userhost, *cp, *file2 = NULL; |
1284 | int debug_level = 0, sshver = 2; | 1368 | int debug_level = 0, sshver = 2; |
1285 | char *file1 = NULL, *sftp_server = NULL; | 1369 | char *file1 = NULL, *sftp_server = NULL; |
1286 | char *ssh_program = _PATH_SSH_PROGRAM, *sftp_direct = NULL; | 1370 | char *ssh_program = _PATH_SSH_PROGRAM, *sftp_direct = NULL; |
@@ -1331,7 +1415,7 @@ main(int argc, char **argv) | |||
1331 | fatal("Batch file already specified."); | 1415 | fatal("Batch file already specified."); |
1332 | 1416 | ||
1333 | /* Allow "-" as stdin */ | 1417 | /* Allow "-" as stdin */ |
1334 | if (strcmp(optarg, "-") != 0 && | 1418 | if (strcmp(optarg, "-") != 0 && |
1335 | (infile = fopen(optarg, "r")) == NULL) | 1419 | (infile = fopen(optarg, "r")) == NULL) |
1336 | fatal("%s (%s).", strerror(errno), optarg); | 1420 | fatal("%s (%s).", strerror(errno), optarg); |
1337 | showprogress = 0; | 1421 | showprogress = 0; |
@@ -99,4 +99,4 @@ AUTHORS | |||
99 | ated OpenSSH. Markus Friedl contributed the support for SSH protocol | 99 | ated OpenSSH. Markus Friedl contributed the support for SSH protocol |
100 | versions 1.5 and 2.0. | 100 | versions 1.5 and 2.0. |
101 | 101 | ||
102 | OpenBSD 3.5 September 25, 1999 2 | 102 | OpenBSD 3.6 September 25, 1999 2 |
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: ssh-add.c,v 1.69 2003/11/21 11:57:03 djm Exp $"); | 38 | RCSID("$OpenBSD: ssh-add.c,v 1.70 2004/05/08 00:21:31 djm Exp $"); |
39 | 39 | ||
40 | #include <openssl/evp.h> | 40 | #include <openssl/evp.h> |
41 | 41 | ||
@@ -47,15 +47,8 @@ RCSID("$OpenBSD: ssh-add.c,v 1.69 2003/11/21 11:57:03 djm Exp $"); | |||
47 | #include "authfd.h" | 47 | #include "authfd.h" |
48 | #include "authfile.h" | 48 | #include "authfile.h" |
49 | #include "pathnames.h" | 49 | #include "pathnames.h" |
50 | #include "readpass.h" | ||
51 | #include "misc.h" | 50 | #include "misc.h" |
52 | 51 | ||
53 | #ifdef HAVE___PROGNAME | ||
54 | extern char *__progname; | ||
55 | #else | ||
56 | char *__progname; | ||
57 | #endif | ||
58 | |||
59 | /* argv0 */ | 52 | /* argv0 */ |
60 | extern char *__progname; | 53 | extern char *__progname; |
61 | 54 | ||
diff --git a/ssh-agent.0 b/ssh-agent.0 index 8967f76a9..c2d7efa57 100644 --- a/ssh-agent.0 +++ b/ssh-agent.0 | |||
@@ -60,12 +60,16 @@ DESCRIPTION | |||
60 | can thus use the privileges given by the identities anywhere in the net- | 60 | can thus use the privileges given by the identities anywhere in the net- |
61 | work in a secure way. | 61 | work in a secure way. |
62 | 62 | ||
63 | There are two main ways to get an agent set up: Either the agent starts a | 63 | There are two main ways to get an agent set up: The first is that the |
64 | new subcommand into which some environment variables are exported, or the | 64 | agent starts a new subcommand into which some environment variables are |
65 | agent prints the needed shell commands (either sh(1) or csh(1) syntax can | 65 | exported, eg ssh-agent xterm &. The second is that the agent prints the |
66 | be generated) which can be evalled in the calling shell. Later ssh(1) | 66 | needed shell commands (either sh(1) or csh(1) syntax can be generated) |
67 | looks at these variables and uses them to establish a connection to the | 67 | which can be evalled in the calling shell, eg eval `ssh-agent -s` for |
68 | agent. | 68 | Bourne-type shells such as sh(1) or ksh(1) and eval `ssh-agent -c` for |
69 | csh(1) and derivatives. | ||
70 | |||
71 | Later ssh(1) looks at these variables and uses them to establish a con- | ||
72 | nection to the agent. | ||
69 | 73 | ||
70 | The agent will never send a private key over its request channel. In- | 74 | The agent will never send a private key over its request channel. In- |
71 | stead, operations that require a private key will be performed by the | 75 | stead, operations that require a private key will be performed by the |
@@ -111,4 +115,4 @@ AUTHORS | |||
111 | ated OpenSSH. Markus Friedl contributed the support for SSH protocol | 115 | ated OpenSSH. Markus Friedl contributed the support for SSH protocol |
112 | versions 1.5 and 2.0. | 116 | versions 1.5 and 2.0. |
113 | 117 | ||
114 | OpenBSD 3.5 September 25, 1999 2 | 118 | OpenBSD 3.6 September 25, 1999 2 |
diff --git a/ssh-agent.1 b/ssh-agent.1 index aab15cc7f..226804e5f 100644 --- a/ssh-agent.1 +++ b/ssh-agent.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-agent.1,v 1.39 2003/06/10 09:12:11 jmc Exp $ | 1 | .\" $OpenBSD: ssh-agent.1,v 1.41 2004/07/11 17:48:47 deraadt Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | .\" Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -134,13 +134,25 @@ remote logins, and the user can thus use the privileges given by the | |||
134 | identities anywhere in the network in a secure way. | 134 | identities anywhere in the network in a secure way. |
135 | .Pp | 135 | .Pp |
136 | There are two main ways to get an agent set up: | 136 | There are two main ways to get an agent set up: |
137 | Either the agent starts a new subcommand into which some environment | 137 | The first is that the agent starts a new subcommand into which some environment |
138 | variables are exported, or the agent prints the needed shell commands | 138 | variables are exported, eg |
139 | (either | 139 | .Cm ssh-agent xterm & . |
140 | The second is that the agent prints the needed shell commands (either | ||
140 | .Xr sh 1 | 141 | .Xr sh 1 |
141 | or | 142 | or |
142 | .Xr csh 1 | 143 | .Xr csh 1 |
143 | syntax can be generated) which can be evalled in the calling shell. | 144 | syntax can be generated) which can be evalled in the calling shell, eg |
145 | .Cm eval `ssh-agent -s` | ||
146 | for Bourne-type shells such as | ||
147 | .Xr sh 1 | ||
148 | or | ||
149 | .Xr ksh 1 | ||
150 | and | ||
151 | .Cm eval `ssh-agent -c` | ||
152 | for | ||
153 | .Xr csh 1 | ||
154 | and derivatives. | ||
155 | .Pp | ||
144 | Later | 156 | Later |
145 | .Xr ssh 1 | 157 | .Xr ssh 1 |
146 | looks at these variables and uses them to establish a connection to the agent. | 158 | looks at these variables and uses them to establish a connection to the agent. |
diff --git a/ssh-agent.c b/ssh-agent.c index f5fce6b2a..bc4d8d33a 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -35,7 +35,7 @@ | |||
35 | 35 | ||
36 | #include "includes.h" | 36 | #include "includes.h" |
37 | #include "openbsd-compat/sys-queue.h" | 37 | #include "openbsd-compat/sys-queue.h" |
38 | RCSID("$OpenBSD: ssh-agent.c,v 1.117 2003/12/02 17:01:15 markus Exp $"); | 38 | RCSID("$OpenBSD: ssh-agent.c,v 1.120 2004/08/11 21:43:05 avsm Exp $"); |
39 | 39 | ||
40 | #include <openssl/evp.h> | 40 | #include <openssl/evp.h> |
41 | #include <openssl/md5.h> | 41 | #include <openssl/md5.h> |
@@ -50,7 +50,6 @@ RCSID("$OpenBSD: ssh-agent.c,v 1.117 2003/12/02 17:01:15 markus Exp $"); | |||
50 | #include "authfd.h" | 50 | #include "authfd.h" |
51 | #include "compat.h" | 51 | #include "compat.h" |
52 | #include "log.h" | 52 | #include "log.h" |
53 | #include "readpass.h" | ||
54 | #include "misc.h" | 53 | #include "misc.h" |
55 | 54 | ||
56 | #ifdef SMARTCARD | 55 | #ifdef SMARTCARD |
@@ -107,11 +106,7 @@ char socket_dir[1024]; | |||
107 | int locked = 0; | 106 | int locked = 0; |
108 | char *lock_passwd = NULL; | 107 | char *lock_passwd = NULL; |
109 | 108 | ||
110 | #ifdef HAVE___PROGNAME | ||
111 | extern char *__progname; | 109 | extern char *__progname; |
112 | #else | ||
113 | char *__progname; | ||
114 | #endif | ||
115 | 110 | ||
116 | /* Default lifetime (0 == forever) */ | 111 | /* Default lifetime (0 == forever) */ |
117 | static int lifetime = 0; | 112 | static int lifetime = 0; |
@@ -790,8 +785,7 @@ new_socket(sock_type type, int fd) | |||
790 | { | 785 | { |
791 | u_int i, old_alloc, new_alloc; | 786 | u_int i, old_alloc, new_alloc; |
792 | 787 | ||
793 | if (fcntl(fd, F_SETFL, O_NONBLOCK) < 0) | 788 | set_nonblock(fd); |
794 | error("fcntl O_NONBLOCK: %s", strerror(errno)); | ||
795 | 789 | ||
796 | if (fd > max_fd) | 790 | if (fd > max_fd) |
797 | max_fd = fd; | 791 | max_fd = fd; |
@@ -822,7 +816,7 @@ new_socket(sock_type type, int fd) | |||
822 | } | 816 | } |
823 | 817 | ||
824 | static int | 818 | static int |
825 | prepare_select(fd_set **fdrp, fd_set **fdwp, int *fdl, int *nallocp) | 819 | prepare_select(fd_set **fdrp, fd_set **fdwp, int *fdl, u_int *nallocp) |
826 | { | 820 | { |
827 | u_int i, sz; | 821 | u_int i, sz; |
828 | int n = 0; | 822 | int n = 0; |
@@ -1008,7 +1002,8 @@ int | |||
1008 | main(int ac, char **av) | 1002 | main(int ac, char **av) |
1009 | { | 1003 | { |
1010 | int c_flag = 0, d_flag = 0, k_flag = 0, s_flag = 0; | 1004 | int c_flag = 0, d_flag = 0, k_flag = 0, s_flag = 0; |
1011 | int sock, fd, ch, nalloc; | 1005 | int sock, fd, ch; |
1006 | u_int nalloc; | ||
1012 | char *shell, *format, *pidstr, *agentsocket = NULL; | 1007 | char *shell, *format, *pidstr, *agentsocket = NULL; |
1013 | fd_set *readsetp = NULL, *writesetp = NULL; | 1008 | fd_set *readsetp = NULL, *writesetp = NULL; |
1014 | struct sockaddr_un sunaddr; | 1009 | struct sockaddr_un sunaddr; |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-gss.h,v 1.4 2003/11/17 11:06:07 markus Exp $ */ | 1 | /* $OpenBSD: ssh-gss.h,v 1.5 2004/06/21 17:36:31 avsm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. | 3 | * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. |
4 | * | 4 | * |
@@ -100,31 +100,31 @@ typedef struct { | |||
100 | 100 | ||
101 | extern ssh_gssapi_mech *supported_mechs[]; | 101 | extern ssh_gssapi_mech *supported_mechs[]; |
102 | 102 | ||
103 | int ssh_gssapi_check_oid(Gssctxt *ctx, void *data, size_t len); | 103 | int ssh_gssapi_check_oid(Gssctxt *, void *, size_t); |
104 | void ssh_gssapi_set_oid_data(Gssctxt *ctx, void *data, size_t len); | 104 | void ssh_gssapi_set_oid_data(Gssctxt *, void *, size_t); |
105 | void ssh_gssapi_set_oid(Gssctxt *ctx, gss_OID oid); | 105 | void ssh_gssapi_set_oid(Gssctxt *, gss_OID); |
106 | void ssh_gssapi_supported_oids(gss_OID_set *oidset); | 106 | void ssh_gssapi_supported_oids(gss_OID_set *); |
107 | ssh_gssapi_mech *ssh_gssapi_get_ctype(Gssctxt *ctxt); | 107 | ssh_gssapi_mech *ssh_gssapi_get_ctype(Gssctxt *); |
108 | 108 | ||
109 | OM_uint32 ssh_gssapi_import_name(Gssctxt *ctx, const char *host); | 109 | OM_uint32 ssh_gssapi_import_name(Gssctxt *, const char *); |
110 | OM_uint32 ssh_gssapi_acquire_cred(Gssctxt *ctx); | 110 | OM_uint32 ssh_gssapi_acquire_cred(Gssctxt *); |
111 | OM_uint32 ssh_gssapi_init_ctx(Gssctxt *ctx, int deleg_creds, | 111 | OM_uint32 ssh_gssapi_init_ctx(Gssctxt *, int, |
112 | gss_buffer_desc *recv_tok, gss_buffer_desc *send_tok, OM_uint32 *flags); | 112 | gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *); |
113 | OM_uint32 ssh_gssapi_accept_ctx(Gssctxt *ctx, | 113 | OM_uint32 ssh_gssapi_accept_ctx(Gssctxt *, |
114 | gss_buffer_desc *recv_tok, gss_buffer_desc *send_tok, OM_uint32 *flags); | 114 | gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *); |
115 | OM_uint32 ssh_gssapi_getclient(Gssctxt *ctx, ssh_gssapi_client *); | 115 | OM_uint32 ssh_gssapi_getclient(Gssctxt *, ssh_gssapi_client *); |
116 | void ssh_gssapi_error(Gssctxt *ctx); | 116 | void ssh_gssapi_error(Gssctxt *); |
117 | char *ssh_gssapi_last_error(Gssctxt *ctxt, OM_uint32 *maj, OM_uint32 *min); | 117 | char *ssh_gssapi_last_error(Gssctxt *, OM_uint32 *, OM_uint32 *); |
118 | void ssh_gssapi_build_ctx(Gssctxt **ctx); | 118 | void ssh_gssapi_build_ctx(Gssctxt **); |
119 | void ssh_gssapi_delete_ctx(Gssctxt **ctx); | 119 | void ssh_gssapi_delete_ctx(Gssctxt **); |
120 | OM_uint32 ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t); | 120 | OM_uint32 ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t); |
121 | OM_uint32 ssh_gssapi_server_ctx(Gssctxt **ctx, gss_OID oid); | 121 | OM_uint32 ssh_gssapi_server_ctx(Gssctxt **, gss_OID); |
122 | void ssh_gssapi_buildmic(Buffer *, const char *, const char *, const char *); | 122 | void ssh_gssapi_buildmic(Buffer *, const char *, const char *, const char *); |
123 | 123 | ||
124 | /* In the server */ | 124 | /* In the server */ |
125 | int ssh_gssapi_userok(char *name); | 125 | int ssh_gssapi_userok(char *name); |
126 | OM_uint32 ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t); | 126 | OM_uint32 ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t); |
127 | void ssh_gssapi_do_child(char ***envp, u_int *envsizep); | 127 | void ssh_gssapi_do_child(char ***, u_int *); |
128 | void ssh_gssapi_cleanup_creds(void); | 128 | void ssh_gssapi_cleanup_creds(void); |
129 | void ssh_gssapi_storecreds(void); | 129 | void ssh_gssapi_storecreds(void); |
130 | 130 | ||
diff --git a/ssh-keygen.0 b/ssh-keygen.0 index 0ca92abc7..38e50b121 100644 --- a/ssh-keygen.0 +++ b/ssh-keygen.0 | |||
@@ -82,7 +82,8 @@ DESCRIPTION | |||
82 | This option allows exporting keys for use by several commercial | 82 | This option allows exporting keys for use by several commercial |
83 | SSH implementations. | 83 | SSH implementations. |
84 | 84 | ||
85 | -g Use generic DNS resource record format. | 85 | -g Use generic DNS format when printing fingerprint resource records |
86 | using the -r command. | ||
86 | 87 | ||
87 | -f filename | 88 | -f filename |
88 | Specifies the filename of the key file. | 89 | Specifies the filename of the key file. |
@@ -156,7 +157,8 @@ DESCRIPTION | |||
156 | is 3. | 157 | is 3. |
157 | 158 | ||
158 | -r hostname | 159 | -r hostname |
159 | Print DNS resource record with the specified hostname. | 160 | Print the SSHFP fingerprint resource record named hostname for |
161 | the specified public key file. | ||
160 | 162 | ||
161 | MODULI GENERATION | 163 | MODULI GENERATION |
162 | ssh-keygen may be used to generate groups for the Diffie-Hellman Group | 164 | ssh-keygen may be used to generate groups for the Diffie-Hellman Group |
@@ -257,4 +259,4 @@ AUTHORS | |||
257 | created OpenSSH. Markus Friedl contributed the support for SSH protocol | 259 | created OpenSSH. Markus Friedl contributed the support for SSH protocol |
258 | versions 1.5 and 2.0. | 260 | versions 1.5 and 2.0. |
259 | 261 | ||
260 | OpenBSD 3.5 September 25, 1999 4 | 262 | OpenBSD 3.6 September 25, 1999 4 |
diff --git a/ssh-keygen.1 b/ssh-keygen.1 index 6dd615428..c0f24dcd0 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-keygen.1,v 1.61 2003/12/22 09:16:58 djm Exp $ | 1 | .\" $OpenBSD: ssh-keygen.1,v 1.63 2004/08/13 00:01:43 jmc Exp $ |
2 | .\" | 2 | .\" |
3 | .\" -*- nroff -*- | 3 | .\" -*- nroff -*- |
4 | .\" | 4 | .\" |
@@ -192,7 +192,9 @@ to stdout. | |||
192 | This option allows exporting keys for use by several commercial | 192 | This option allows exporting keys for use by several commercial |
193 | SSH implementations. | 193 | SSH implementations. |
194 | .It Fl g | 194 | .It Fl g |
195 | Use generic DNS resource record format. | 195 | Use generic DNS format when printing fingerprint resource records using the |
196 | .Fl r | ||
197 | command. | ||
196 | .It Fl f Ar filename | 198 | .It Fl f Ar filename |
197 | Specifies the filename of the key file. | 199 | Specifies the filename of the key file. |
198 | .It Fl i | 200 | .It Fl i |
@@ -276,8 +278,9 @@ Multiple | |||
276 | options increase the verbosity. | 278 | options increase the verbosity. |
277 | The maximum is 3. | 279 | The maximum is 3. |
278 | .It Fl r Ar hostname | 280 | .It Fl r Ar hostname |
279 | Print DNS resource record with the specified | 281 | Print the SSHFP fingerprint resource record named |
280 | .Ar hostname . | 282 | .Ar hostname |
283 | for the specified public key file. | ||
281 | .El | 284 | .El |
282 | .Sh MODULI GENERATION | 285 | .Sh MODULI GENERATION |
283 | .Nm | 286 | .Nm |
diff --git a/ssh-keygen.c b/ssh-keygen.c index 1156a010a..d39e7d881 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.113 2003/12/22 09:16:58 djm Exp $"); | 15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.117 2004/07/11 17:48:47 deraadt Exp $"); |
16 | 16 | ||
17 | #include <openssl/evp.h> | 17 | #include <openssl/evp.h> |
18 | #include <openssl/pem.h> | 18 | #include <openssl/pem.h> |
@@ -26,8 +26,7 @@ RCSID("$OpenBSD: ssh-keygen.c,v 1.113 2003/12/22 09:16:58 djm Exp $"); | |||
26 | #include "bufaux.h" | 26 | #include "bufaux.h" |
27 | #include "pathnames.h" | 27 | #include "pathnames.h" |
28 | #include "log.h" | 28 | #include "log.h" |
29 | #include "readpass.h" | 29 | #include "misc.h" |
30 | #include "moduli.h" | ||
31 | 30 | ||
32 | #ifdef SMARTCARD | 31 | #ifdef SMARTCARD |
33 | #include "scard.h" | 32 | #include "scard.h" |
@@ -77,14 +76,14 @@ int print_generic = 0; | |||
77 | char *key_type_name = NULL; | 76 | char *key_type_name = NULL; |
78 | 77 | ||
79 | /* argv0 */ | 78 | /* argv0 */ |
80 | #ifdef HAVE___PROGNAME | ||
81 | extern char *__progname; | 79 | extern char *__progname; |
82 | #else | ||
83 | char *__progname; | ||
84 | #endif | ||
85 | 80 | ||
86 | char hostname[MAXHOSTNAMELEN]; | 81 | char hostname[MAXHOSTNAMELEN]; |
87 | 82 | ||
83 | /* moduli.c */ | ||
84 | int gen_candidates(FILE *, int, int, BIGNUM *); | ||
85 | int prime_test(FILE *, FILE *, u_int32_t, u_int32_t); | ||
86 | |||
88 | static void | 87 | static void |
89 | ask_filename(struct passwd *pw, const char *prompt) | 88 | ask_filename(struct passwd *pw, const char *prompt) |
90 | { | 89 | { |
@@ -189,8 +188,8 @@ do_convert_to_ssh2(struct passwd *pw) | |||
189 | static void | 188 | static void |
190 | buffer_get_bignum_bits(Buffer *b, BIGNUM *value) | 189 | buffer_get_bignum_bits(Buffer *b, BIGNUM *value) |
191 | { | 190 | { |
192 | u_int bits = buffer_get_int(b); | 191 | u_int bignum_bits = buffer_get_int(b); |
193 | u_int bytes = (bits + 7) / 8; | 192 | u_int bytes = (bignum_bits + 7) / 8; |
194 | 193 | ||
195 | if (buffer_len(b) < bytes) | 194 | if (buffer_len(b) < bytes) |
196 | fatal("buffer_get_bignum_bits: input buffer too small: " | 195 | fatal("buffer_get_bignum_bits: input buffer too small: " |
@@ -627,7 +626,7 @@ do_change_passphrase(struct passwd *pw) | |||
627 | * Print the SSHFP RR. | 626 | * Print the SSHFP RR. |
628 | */ | 627 | */ |
629 | static void | 628 | static void |
630 | do_print_resource_record(struct passwd *pw, char *hostname) | 629 | do_print_resource_record(struct passwd *pw, char *hname) |
631 | { | 630 | { |
632 | Key *public; | 631 | Key *public; |
633 | char *comment = NULL; | 632 | char *comment = NULL; |
@@ -641,7 +640,7 @@ do_print_resource_record(struct passwd *pw, char *hostname) | |||
641 | } | 640 | } |
642 | public = key_load_public(identity_file, &comment); | 641 | public = key_load_public(identity_file, &comment); |
643 | if (public != NULL) { | 642 | if (public != NULL) { |
644 | export_dns_rr(hostname, public, stdout, print_generic); | 643 | export_dns_rr(hname, public, stdout, print_generic); |
645 | key_free(public); | 644 | key_free(public); |
646 | xfree(comment); | 645 | xfree(comment); |
647 | exit(0); | 646 | exit(0); |
@@ -896,7 +895,7 @@ main(int ac, char **av) | |||
896 | if (log_level == SYSLOG_LEVEL_INFO) | 895 | if (log_level == SYSLOG_LEVEL_INFO) |
897 | log_level = SYSLOG_LEVEL_DEBUG1; | 896 | log_level = SYSLOG_LEVEL_DEBUG1; |
898 | else { | 897 | else { |
899 | if (log_level >= SYSLOG_LEVEL_DEBUG1 && | 898 | if (log_level >= SYSLOG_LEVEL_DEBUG1 && |
900 | log_level < SYSLOG_LEVEL_DEBUG3) | 899 | log_level < SYSLOG_LEVEL_DEBUG3) |
901 | log_level++; | 900 | log_level++; |
902 | } | 901 | } |
@@ -911,18 +910,9 @@ main(int ac, char **av) | |||
911 | break; | 910 | break; |
912 | case 'a': | 911 | case 'a': |
913 | trials = atoi(optarg); | 912 | trials = atoi(optarg); |
914 | if (trials < TRIAL_MINIMUM) { | ||
915 | fatal("Minimum primality trials is %d", | ||
916 | TRIAL_MINIMUM); | ||
917 | } | ||
918 | break; | 913 | break; |
919 | case 'M': | 914 | case 'M': |
920 | memory = atoi(optarg); | 915 | memory = atoi(optarg); |
921 | if (memory != 0 && | ||
922 | (memory < LARGE_MINIMUM || memory > LARGE_MAXIMUM)) { | ||
923 | fatal("Invalid memory amount (min %ld, max %ld)", | ||
924 | LARGE_MINIMUM, LARGE_MAXIMUM); | ||
925 | } | ||
926 | break; | 916 | break; |
927 | case 'G': | 917 | case 'G': |
928 | do_gen_candidates = 1; | 918 | do_gen_candidates = 1; |
diff --git a/ssh-keyscan.0 b/ssh-keyscan.0 index c1334378f..a218fbf2b 100644 --- a/ssh-keyscan.0 +++ b/ssh-keyscan.0 | |||
@@ -53,10 +53,10 @@ DESCRIPTION | |||
53 | 53 | ||
54 | SECURITY | 54 | SECURITY |
55 | If a ssh_known_hosts file is constructed using ssh-keyscan without veri- | 55 | If a ssh_known_hosts file is constructed using ssh-keyscan without veri- |
56 | fying the keys, users will be vulnerable to attacks. On the other hand, | 56 | fying the keys, users will be vulnerable to man in the middle attacks. |
57 | if the security model allows such a risk, ssh-keyscan can help in the de- | 57 | On the other hand, if the security model allows such a risk, ssh-keyscan |
58 | tection of tampered keyfiles or man in the middle attacks which have be- | 58 | can help in the detection of tampered keyfiles or man in the middle at- |
59 | gun after the ssh_known_hosts file was created. | 59 | tacks which have begun after the ssh_known_hosts file was created. |
60 | 60 | ||
61 | FILES | 61 | FILES |
62 | Input format: | 62 | Input format: |
@@ -100,4 +100,4 @@ BUGS | |||
100 | This is because it opens a connection to the ssh port, reads the public | 100 | This is because it opens a connection to the ssh port, reads the public |
101 | key, and drops the connection as soon as it gets the key. | 101 | key, and drops the connection as soon as it gets the key. |
102 | 102 | ||
103 | OpenBSD 3.5 January 1, 1996 2 | 103 | OpenBSD 3.6 January 1, 1996 2 |
diff --git a/ssh-keyscan.1 b/ssh-keyscan.1 index 572751f66..9efcf5213 100644 --- a/ssh-keyscan.1 +++ b/ssh-keyscan.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-keyscan.1,v 1.17 2003/06/10 09:12:11 jmc Exp $ | 1 | .\" $OpenBSD: ssh-keyscan.1,v 1.18 2004/07/12 23:34:25 brad Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. | 3 | .\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. |
4 | .\" | 4 | .\" |
@@ -97,7 +97,7 @@ to use IPv6 addresses only. | |||
97 | If a ssh_known_hosts file is constructed using | 97 | If a ssh_known_hosts file is constructed using |
98 | .Nm | 98 | .Nm |
99 | without verifying the keys, users will be vulnerable to | 99 | without verifying the keys, users will be vulnerable to |
100 | .I man in the middle | 100 | .Em man in the middle |
101 | attacks. | 101 | attacks. |
102 | On the other hand, if the security model allows such a risk, | 102 | On the other hand, if the security model allows such a risk, |
103 | .Nm | 103 | .Nm |
diff --git a/ssh-keyscan.c b/ssh-keyscan.c index 770409b86..2f9221605 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c | |||
@@ -7,7 +7,7 @@ | |||
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "includes.h" | 9 | #include "includes.h" |
10 | RCSID("$OpenBSD: ssh-keyscan.c,v 1.47 2004/03/08 09:38:05 djm Exp $"); | 10 | RCSID("$OpenBSD: ssh-keyscan.c,v 1.50 2004/08/11 21:44:32 avsm Exp $"); |
11 | 11 | ||
12 | #include "openbsd-compat/sys-queue.h" | 12 | #include "openbsd-compat/sys-queue.h" |
13 | 13 | ||
@@ -49,11 +49,7 @@ int timeout = 5; | |||
49 | int maxfd; | 49 | int maxfd; |
50 | #define MAXCON (maxfd - 10) | 50 | #define MAXCON (maxfd - 10) |
51 | 51 | ||
52 | #ifdef HAVE___PROGNAME | ||
53 | extern char *__progname; | 52 | extern char *__progname; |
54 | #else | ||
55 | char *__progname; | ||
56 | #endif | ||
57 | fd_set *read_wait; | 53 | fd_set *read_wait; |
58 | size_t read_wait_size; | 54 | size_t read_wait_size; |
59 | int ncon; | 55 | int ncon; |
@@ -349,6 +345,7 @@ keygrab_ssh2(con *c) | |||
349 | "ssh-dss": "ssh-rsa"; | 345 | "ssh-dss": "ssh-rsa"; |
350 | c->c_kex = kex_setup(myproposal); | 346 | c->c_kex = kex_setup(myproposal); |
351 | c->c_kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client; | 347 | c->c_kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client; |
348 | c->c_kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client; | ||
352 | c->c_kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; | 349 | c->c_kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; |
353 | c->c_kex->verify_host_key = hostjump; | 350 | c->c_kex->verify_host_key = hostjump; |
354 | 351 | ||
@@ -396,8 +393,8 @@ tcpconnect(char *host) | |||
396 | error("socket: %s", strerror(errno)); | 393 | error("socket: %s", strerror(errno)); |
397 | continue; | 394 | continue; |
398 | } | 395 | } |
399 | if (fcntl(s, F_SETFL, O_NONBLOCK) < 0) | 396 | if (set_nonblock(s) == -1) |
400 | fatal("F_SETFL: %s", strerror(errno)); | 397 | fatal("%s: set_nonblock(%d)", __func__, s); |
401 | if (connect(s, ai->ai_addr, ai->ai_addrlen) < 0 && | 398 | if (connect(s, ai->ai_addr, ai->ai_addrlen) < 0 && |
402 | errno != EINPROGRESS) | 399 | errno != EINPROGRESS) |
403 | error("connect (`%s'): %s", host, strerror(errno)); | 400 | error("connect (`%s'): %s", host, strerror(errno)); |
@@ -497,7 +494,7 @@ congreet(int s) | |||
497 | 494 | ||
498 | bufsiz = sizeof(buf); | 495 | bufsiz = sizeof(buf); |
499 | cp = buf; | 496 | cp = buf; |
500 | while (bufsiz-- && (n = read(s, cp, 1)) == 1 && *cp != '\n') { | 497 | while (bufsiz-- && (n = atomicio(read, s, cp, 1)) == 1 && *cp != '\n') { |
501 | if (*cp == '\r') | 498 | if (*cp == '\r') |
502 | *cp = '\n'; | 499 | *cp = '\n'; |
503 | cp++; | 500 | cp++; |
@@ -563,7 +560,7 @@ conread(int s) | |||
563 | congreet(s); | 560 | congreet(s); |
564 | return; | 561 | return; |
565 | } | 562 | } |
566 | n = read(s, c->c_data + c->c_off, c->c_len - c->c_off); | 563 | n = atomicio(read, s, c->c_data + c->c_off, c->c_len - c->c_off); |
567 | if (n < 0) { | 564 | if (n < 0) { |
568 | error("read (%s): %s", c->c_name, strerror(errno)); | 565 | error("read (%s): %s", c->c_name, strerror(errno)); |
569 | confree(s); | 566 | confree(s); |
diff --git a/ssh-keysign.0 b/ssh-keysign.0 index 950a21b88..e10b8ac45 100644 --- a/ssh-keysign.0 +++ b/ssh-keysign.0 | |||
@@ -39,4 +39,4 @@ HISTORY | |||
39 | AUTHORS | 39 | AUTHORS |
40 | Markus Friedl <markus@openbsd.org> | 40 | Markus Friedl <markus@openbsd.org> |
41 | 41 | ||
42 | OpenBSD 3.5 May 24, 2002 1 | 42 | OpenBSD 3.6 May 24, 2002 1 |
diff --git a/ssh-keysign.c b/ssh-keysign.c index 9e9ebe2f1..517655790 100644 --- a/ssh-keysign.c +++ b/ssh-keysign.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
23 | */ | 23 | */ |
24 | #include "includes.h" | 24 | #include "includes.h" |
25 | RCSID("$OpenBSD: ssh-keysign.c,v 1.15 2004/01/19 21:25:15 markus Exp $"); | 25 | RCSID("$OpenBSD: ssh-keysign.c,v 1.16 2004/04/18 23:10:26 djm Exp $"); |
26 | 26 | ||
27 | #include <openssl/evp.h> | 27 | #include <openssl/evp.h> |
28 | #include <openssl/rand.h> | 28 | #include <openssl/rand.h> |
@@ -41,15 +41,12 @@ RCSID("$OpenBSD: ssh-keysign.c,v 1.15 2004/01/19 21:25:15 markus Exp $"); | |||
41 | #include "canohost.h" | 41 | #include "canohost.h" |
42 | #include "pathnames.h" | 42 | #include "pathnames.h" |
43 | #include "readconf.h" | 43 | #include "readconf.h" |
44 | #include "uidswap.h" | ||
44 | 45 | ||
45 | /* XXX readconf.c needs these */ | 46 | /* XXX readconf.c needs these */ |
46 | uid_t original_real_uid; | 47 | uid_t original_real_uid; |
47 | 48 | ||
48 | #ifdef HAVE___PROGNAME | ||
49 | extern char *__progname; | 49 | extern char *__progname; |
50 | #else | ||
51 | char *__progname; | ||
52 | #endif | ||
53 | 50 | ||
54 | static int | 51 | static int |
55 | valid_request(struct passwd *pw, char *host, Key **ret, u_char *data, | 52 | valid_request(struct passwd *pw, char *host, Key **ret, u_char *data, |
@@ -154,8 +151,11 @@ main(int argc, char **argv) | |||
154 | key_fd[0] = open(_PATH_HOST_RSA_KEY_FILE, O_RDONLY); | 151 | key_fd[0] = open(_PATH_HOST_RSA_KEY_FILE, O_RDONLY); |
155 | key_fd[1] = open(_PATH_HOST_DSA_KEY_FILE, O_RDONLY); | 152 | key_fd[1] = open(_PATH_HOST_DSA_KEY_FILE, O_RDONLY); |
156 | 153 | ||
157 | seteuid(getuid()); | 154 | if ((pw = getpwuid(getuid())) == NULL) |
158 | setuid(getuid()); | 155 | fatal("getpwuid failed"); |
156 | pw = pwcopy(pw); | ||
157 | |||
158 | permanently_set_uid(pw); | ||
159 | 159 | ||
160 | init_rng(); | 160 | init_rng(); |
161 | seed_rng(); | 161 | seed_rng(); |
@@ -168,7 +168,7 @@ main(int argc, char **argv) | |||
168 | /* verify that ssh-keysign is enabled by the admin */ | 168 | /* verify that ssh-keysign is enabled by the admin */ |
169 | original_real_uid = getuid(); /* XXX readconf.c needs this */ | 169 | original_real_uid = getuid(); /* XXX readconf.c needs this */ |
170 | initialize_options(&options); | 170 | initialize_options(&options); |
171 | (void)read_config_file(_PATH_HOST_CONFIG_FILE, "", &options); | 171 | (void)read_config_file(_PATH_HOST_CONFIG_FILE, "", &options, 0); |
172 | fill_default_options(&options); | 172 | fill_default_options(&options); |
173 | if (options.enable_ssh_keysign != 1) | 173 | if (options.enable_ssh_keysign != 1) |
174 | fatal("ssh-keysign not enabled in %s", | 174 | fatal("ssh-keysign not enabled in %s", |
@@ -177,10 +177,6 @@ main(int argc, char **argv) | |||
177 | if (key_fd[0] == -1 && key_fd[1] == -1) | 177 | if (key_fd[0] == -1 && key_fd[1] == -1) |
178 | fatal("could not open any host key"); | 178 | fatal("could not open any host key"); |
179 | 179 | ||
180 | if ((pw = getpwuid(getuid())) == NULL) | ||
181 | fatal("getpwuid failed"); | ||
182 | pw = pwcopy(pw); | ||
183 | |||
184 | SSLeay_add_all_algorithms(); | 180 | SSLeay_add_all_algorithms(); |
185 | for (i = 0; i < 256; i++) | 181 | for (i = 0; i < 256; i++) |
186 | rnd[i] = arc4random(); | 182 | rnd[i] = arc4random(); |
diff --git a/ssh-rand-helper.0 b/ssh-rand-helper.0 index 2020359f9..9af5fdd8f 100644 --- a/ssh-rand-helper.0 +++ b/ssh-rand-helper.0 | |||
@@ -46,4 +46,4 @@ AUTHORS | |||
46 | SEE ALSO | 46 | SEE ALSO |
47 | ssh(1), ssh-add(1), ssh-keygen(1), sshd(8) | 47 | ssh(1), ssh-add(1), ssh-keygen(1), sshd(8) |
48 | 48 | ||
49 | OpenBSD 3.5 April 14, 2002 1 | 49 | OpenBSD 3.6 April 14, 2002 1 |
diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c index 8a320a71e..86af3893d 100644 --- a/ssh-rand-helper.c +++ b/ssh-rand-helper.c | |||
@@ -39,7 +39,7 @@ | |||
39 | #include "pathnames.h" | 39 | #include "pathnames.h" |
40 | #include "log.h" | 40 | #include "log.h" |
41 | 41 | ||
42 | RCSID("$Id: ssh-rand-helper.c,v 1.16 2003/11/21 12:56:47 djm Exp $"); | 42 | RCSID("$Id: ssh-rand-helper.c,v 1.18 2004/07/17 04:07:42 dtucker Exp $"); |
43 | 43 | ||
44 | /* Number of bytes we write out */ | 44 | /* Number of bytes we write out */ |
45 | #define OUTPUT_SEED_SIZE 48 | 45 | #define OUTPUT_SEED_SIZE 48 |
@@ -63,15 +63,7 @@ RCSID("$Id: ssh-rand-helper.c,v 1.16 2003/11/21 12:56:47 djm Exp $"); | |||
63 | # define SSH_PRNG_COMMAND_FILE SSHDIR "/ssh_prng_cmds" | 63 | # define SSH_PRNG_COMMAND_FILE SSHDIR "/ssh_prng_cmds" |
64 | #endif | 64 | #endif |
65 | 65 | ||
66 | #ifdef HAVE___PROGNAME | ||
67 | extern char *__progname; | 66 | extern char *__progname; |
68 | #else | ||
69 | char *__progname; | ||
70 | #endif | ||
71 | |||
72 | #ifndef offsetof | ||
73 | # define offsetof(type, member) ((size_t) &((type *)0)->member) | ||
74 | #endif | ||
75 | 67 | ||
76 | #define WHITESPACE " \t\n" | 68 | #define WHITESPACE " \t\n" |
77 | 69 | ||
@@ -4,10 +4,10 @@ NAME | |||
4 | ssh - OpenSSH SSH client (remote login program) | 4 | ssh - OpenSSH SSH client (remote login program) |
5 | 5 | ||
6 | SYNOPSIS | 6 | SYNOPSIS |
7 | ssh [-1246AaCfgkNnqsTtVvXxY] [-b bind_address] [-c cipher_spec] [-D port] | 7 | ssh [-1246AaCfgkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec] |
8 | [-e escape_char] [-F configfile] [-i identity_file] | 8 | [-D port] [-e escape_char] [-F configfile] [-i identity_file] |
9 | [-L port:host:hostport] [-l login_name] [-m mac_spec] [-o option] | 9 | [-L port:host:hostport] [-l login_name] [-m mac_spec] [-o option] |
10 | [-p port] [-R port:host:hostport] [user@]hostname [command] | 10 | [-p port] [-R port:host:hostport] [-S ctl] [user@]hostname [command] |
11 | 11 | ||
12 | DESCRIPTION | 12 | DESCRIPTION |
13 | ssh (SSH client) is a program for logging into a remote machine and for | 13 | ssh (SSH client) is a program for logging into a remote machine and for |
@@ -106,9 +106,9 @@ DESCRIPTION | |||
106 | tion. | 106 | tion. |
107 | 107 | ||
108 | Protocol 2 provides additional mechanisms for confidentiality (the traf- | 108 | Protocol 2 provides additional mechanisms for confidentiality (the traf- |
109 | fic is encrypted using 3DES, Blowfish, CAST128 or Arcfour) and integrity | 109 | fic is encrypted using AES, 3DES, Blowfish, CAST128 or Arcfour) and in- |
110 | (hmac-md5, hmac-sha1). Note that protocol 1 lacks a strong mechanism for | 110 | tegrity (hmac-md5, hmac-sha1, hmac-ripemd160). Note that protocol 1 |
111 | ensuring the integrity of the connection. | 111 | lacks a strong mechanism for ensuring the integrity of the connection. |
112 | 112 | ||
113 | Login session and remote execution | 113 | Login session and remote execution |
114 | When the user's identity has been accepted by the server, the server ei- | 114 | When the user's identity has been accepted by the server, the server ei- |
@@ -154,8 +154,10 @@ DESCRIPTION | |||
154 | ~B Send a BREAK to the remote system (only useful for SSH protocol | 154 | ~B Send a BREAK to the remote system (only useful for SSH protocol |
155 | version 2 and if the peer supports it). | 155 | version 2 and if the peer supports it). |
156 | 156 | ||
157 | ~C Open command line (only useful for adding port forwardings using | 157 | ~C Open command line. Currently this allows the addition of port |
158 | the -L and -R options). | 158 | forwardings using the -L and -R options (see below). It also al- |
159 | lows the cancellation of existing remote port-forwardings using | ||
160 | -KR hostport. Basic help is available, using the -h option. | ||
159 | 161 | ||
160 | ~R Request rekeying of the connection (only useful for SSH protocol | 162 | ~R Request rekeying of the connection (only useful for SSH protocol |
161 | version 2 and if the peer supports it). | 163 | version 2 and if the peer supports it). |
@@ -206,6 +208,11 @@ DESCRIPTION | |||
206 | StrictHostKeyChecking option can be used to prevent logins to machines | 208 | StrictHostKeyChecking option can be used to prevent logins to machines |
207 | whose host key is not known or has changed. | 209 | whose host key is not known or has changed. |
208 | 210 | ||
211 | ssh can be configured to verify host identification using fingerprint re- | ||
212 | source records (SSHFP) published in DNS. The VerifyHostKeyDNS option can | ||
213 | be used to control how DNS lookups are performed. SSHFP resource records | ||
214 | can be generated using ssh-keygen(1). | ||
215 | |||
209 | The options are as follows: | 216 | The options are as follows: |
210 | 217 | ||
211 | -1 Forces ssh to try protocol version 1 only. | 218 | -1 Forces ssh to try protocol version 1 only. |
@@ -243,20 +250,27 @@ DESCRIPTION | |||
243 | networks. The default value can be set on a host-by-host basis | 250 | networks. The default value can be set on a host-by-host basis |
244 | in the configuration files; see the Compression option. | 251 | in the configuration files; see the Compression option. |
245 | 252 | ||
246 | -c blowfish | 3des | des | ||
247 | Selects the cipher to use for encrypting the session. 3des is | ||
248 | used by default. It is believed to be secure. 3des (triple-des) | ||
249 | is an encrypt-decrypt-encrypt triple with three different keys. | ||
250 | blowfish is a fast block cipher; it appears very secure and is | ||
251 | much faster than 3des. des is only supported in the ssh client | ||
252 | for interoperability with legacy protocol 1 implementations that | ||
253 | do not support the 3des cipher. Its use is strongly discouraged | ||
254 | due to cryptographic weaknesses. | ||
255 | |||
256 | -c cipher_spec | 253 | -c cipher_spec |
257 | Additionally, for protocol version 2 a comma-separated list of | 254 | Selects the cipher specification for encrypting the session. |
258 | ciphers can be specified in order of preference. See Ciphers for | 255 | |
259 | more information. | 256 | Protocol version 1 allows specification of a single cipher. The |
257 | suported values are ``3des'', ``blowfish'' and ``des''. 3des | ||
258 | (triple-des) is an encrypt-decrypt-encrypt triple with three dif- | ||
259 | ferent keys. It is believed to be secure. blowfish is a fast | ||
260 | block cipher; it appears very secure and is much faster than | ||
261 | 3des. des is only supported in the ssh client for interoperabil- | ||
262 | ity with legacy protocol 1 implementations that do not support | ||
263 | the 3des cipher. Its use is strongly discouraged due to crypto- | ||
264 | graphic weaknesses. The default is ``3des''. | ||
265 | |||
266 | For protocol version 2 cipher_spec is a comma-separated list of | ||
267 | ciphers listed in order of preference. The supported ciphers are | ||
268 | ``3des-cbc'', ``aes128-cbc'', ``aes192-cbc'', ``aes256-cbc'', | ||
269 | ``aes128-ctr'', ``aes192-ctr'', ``aes256-ctr'', ``arcfour'', | ||
270 | ``blowfish-cbc'', and ``cast128-cbc''. The default is | ||
271 | |||
272 | ``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour, | ||
273 | aes192-cbc,aes256-cbc'' | ||
260 | 274 | ||
261 | -D port | 275 | -D port |
262 | Specifies a local ``dynamic'' application-level port forwarding. | 276 | Specifies a local ``dynamic'' application-level port forwarding. |
@@ -324,6 +338,10 @@ DESCRIPTION | |||
324 | Specifies the user to log in as on the remote machine. This also | 338 | Specifies the user to log in as on the remote machine. This also |
325 | may be specified on a per-host basis in the configuration file. | 339 | may be specified on a per-host basis in the configuration file. |
326 | 340 | ||
341 | -M Places the ssh client into ``master'' mode for connection shar- | ||
342 | ing. Refer to the description of ControlMaster in ssh_config(5) | ||
343 | for details. | ||
344 | |||
327 | -m mac_spec | 345 | -m mac_spec |
328 | Additionally, for protocol version 2 a comma-separated list of | 346 | Additionally, for protocol version 2 a comma-separated list of |
329 | MAC (message authentication code) algorithms can be specified in | 347 | MAC (message authentication code) algorithms can be specified in |
@@ -358,7 +376,9 @@ DESCRIPTION | |||
358 | Compression | 376 | Compression |
359 | CompressionLevel | 377 | CompressionLevel |
360 | ConnectionAttempts | 378 | ConnectionAttempts |
361 | ConnectionTimeout | 379 | ConnectTimeout |
380 | ControlMaster | ||
381 | ControlPath | ||
362 | DynamicForward | 382 | DynamicForward |
363 | EscapeChar | 383 | EscapeChar |
364 | ForwardAgent | 384 | ForwardAgent |
@@ -389,6 +409,7 @@ DESCRIPTION | |||
389 | RemoteForward | 409 | RemoteForward |
390 | RhostsRSAAuthentication | 410 | RhostsRSAAuthentication |
391 | RSAAuthentication | 411 | RSAAuthentication |
412 | SendEnv | ||
392 | ServerAliveInterval | 413 | ServerAliveInterval |
393 | ServerAliveCountMax | 414 | ServerAliveCountMax |
394 | SmartcardDevice | 415 | SmartcardDevice |
@@ -419,6 +440,10 @@ DESCRIPTION | |||
419 | machine. IPv6 addresses can be specified with an alternative | 440 | machine. IPv6 addresses can be specified with an alternative |
420 | syntax: port/host/hostport. | 441 | syntax: port/host/hostport. |
421 | 442 | ||
443 | -S ctl Specifies the location of a control socket for connection shar- | ||
444 | ing. Refer to the description of ControlPath and ControlMaster | ||
445 | in ssh_config(5) for details. | ||
446 | |||
422 | -s May be used to request invocation of a subsystem on the remote | 447 | -s May be used to request invocation of a subsystem on the remote |
423 | system. Subsystems are a feature of the SSH2 protocol which fa- | 448 | system. Subsystems are a feature of the SSH2 protocol which fa- |
424 | cilitate the use of SSH as a secure transport for other applica- | 449 | cilitate the use of SSH as a secure transport for other applica- |
@@ -549,7 +574,9 @@ FILES | |||
549 | 574 | ||
550 | $HOME/.ssh/config | 575 | $HOME/.ssh/config |
551 | This is the per-user configuration file. The file format and | 576 | This is the per-user configuration file. The file format and |
552 | configuration options are described in ssh_config(5). | 577 | configuration options are described in ssh_config(5). Because of |
578 | the potential for abuse, this file must have strict permissions: | ||
579 | read/write for the user, and not accessible by others. | ||
553 | 580 | ||
554 | $HOME/.ssh/authorized_keys | 581 | $HOME/.ssh/authorized_keys |
555 | Lists the public keys (RSA/DSA) that can be used for logging in | 582 | Lists the public keys (RSA/DSA) that can be used for logging in |
@@ -666,4 +693,4 @@ AUTHORS | |||
666 | created OpenSSH. Markus Friedl contributed the support for SSH protocol | 693 | created OpenSSH. Markus Friedl contributed the support for SSH protocol |
667 | versions 1.5 and 2.0. | 694 | versions 1.5 and 2.0. |
668 | 695 | ||
669 | OpenBSD 3.5 September 25, 1999 11 | 696 | OpenBSD 3.6 September 25, 1999 11 |
@@ -34,7 +34,7 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: ssh.1,v 1.182 2004/03/05 10:53:58 markus Exp $ | 37 | .\" $OpenBSD: ssh.1,v 1.194 2004/08/12 21:41:13 jakob Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSH 1 | 39 | .Dt SSH 1 |
40 | .Os | 40 | .Os |
@@ -43,14 +43,14 @@ | |||
43 | .Nd OpenSSH SSH client (remote login program) | 43 | .Nd OpenSSH SSH client (remote login program) |
44 | .Sh SYNOPSIS | 44 | .Sh SYNOPSIS |
45 | .Nm ssh | 45 | .Nm ssh |
46 | .Op Fl 1246AaCfgkNnqsTtVvXxY | 46 | .Op Fl 1246AaCfgkMNnqsTtVvXxY |
47 | .Op Fl b Ar bind_address | 47 | .Op Fl b Ar bind_address |
48 | .Op Fl c Ar cipher_spec | 48 | .Op Fl c Ar cipher_spec |
49 | .Bk -words | ||
49 | .Op Fl D Ar port | 50 | .Op Fl D Ar port |
50 | .Op Fl e Ar escape_char | 51 | .Op Fl e Ar escape_char |
51 | .Op Fl F Ar configfile | 52 | .Op Fl F Ar configfile |
52 | .Op Fl i Ar identity_file | 53 | .Op Fl i Ar identity_file |
53 | .Bk -words | ||
54 | .Oo Fl L Xo | 54 | .Oo Fl L Xo |
55 | .Sm off | 55 | .Sm off |
56 | .Ar port : | 56 | .Ar port : |
@@ -74,6 +74,7 @@ | |||
74 | .Sm on | 74 | .Sm on |
75 | .Xc | 75 | .Xc |
76 | .Oc | 76 | .Oc |
77 | .Op Fl S Ar ctl | ||
77 | .Oo Ar user Ns @ Oc Ns Ar hostname | 78 | .Oo Ar user Ns @ Oc Ns Ar hostname |
78 | .Op Ar command | 79 | .Op Ar command |
79 | .Sh DESCRIPTION | 80 | .Sh DESCRIPTION |
@@ -241,8 +242,8 @@ Additionally, | |||
241 | supports hostbased or challenge response authentication. | 242 | supports hostbased or challenge response authentication. |
242 | .Pp | 243 | .Pp |
243 | Protocol 2 provides additional mechanisms for confidentiality | 244 | Protocol 2 provides additional mechanisms for confidentiality |
244 | (the traffic is encrypted using 3DES, Blowfish, CAST128 or Arcfour) | 245 | (the traffic is encrypted using AES, 3DES, Blowfish, CAST128 or Arcfour) |
245 | and integrity (hmac-md5, hmac-sha1). | 246 | and integrity (hmac-md5, hmac-sha1, hmac-ripemd160). |
246 | Note that protocol 1 lacks a strong mechanism for ensuring the | 247 | Note that protocol 1 lacks a strong mechanism for ensuring the |
247 | integrity of the connection. | 248 | integrity of the connection. |
248 | .Ss Login session and remote execution | 249 | .Ss Login session and remote execution |
@@ -302,11 +303,18 @@ Display a list of escape characters. | |||
302 | Send a BREAK to the remote system | 303 | Send a BREAK to the remote system |
303 | (only useful for SSH protocol version 2 and if the peer supports it). | 304 | (only useful for SSH protocol version 2 and if the peer supports it). |
304 | .It Cm ~C | 305 | .It Cm ~C |
305 | Open command line (only useful for adding port forwardings using the | 306 | Open command line. |
307 | Currently this allows the addition of port forwardings using the | ||
306 | .Fl L | 308 | .Fl L |
307 | and | 309 | and |
308 | .Fl R | 310 | .Fl R |
309 | options). | 311 | options (see below). |
312 | It also allows the cancellation of existing remote port-forwardings | ||
313 | using | ||
314 | .Fl KR Ar hostport . | ||
315 | Basic help is available, using the | ||
316 | .Fl h | ||
317 | option. | ||
310 | .It Cm ~R | 318 | .It Cm ~R |
311 | Request rekeying of the connection | 319 | Request rekeying of the connection |
312 | (only useful for SSH protocol version 2 and if the peer supports it). | 320 | (only useful for SSH protocol version 2 and if the peer supports it). |
@@ -392,6 +400,15 @@ The | |||
392 | option can be used to prevent logins to machines whose | 400 | option can be used to prevent logins to machines whose |
393 | host key is not known or has changed. | 401 | host key is not known or has changed. |
394 | .Pp | 402 | .Pp |
403 | .Nm | ||
404 | can be configured to verify host identification using fingerprint resource | ||
405 | records (SSHFP) published in DNS. | ||
406 | The | ||
407 | .Cm VerifyHostKeyDNS | ||
408 | option can be used to control how DNS lookups are performed. | ||
409 | SSHFP resource records can be generated using | ||
410 | .Xr ssh-keygen 1 . | ||
411 | .Pp | ||
395 | The options are as follows: | 412 | The options are as follows: |
396 | .Bl -tag -width Ds | 413 | .Bl -tag -width Ds |
397 | .It Fl 1 | 414 | .It Fl 1 |
@@ -442,13 +459,18 @@ The default value can be set on a host-by-host basis in the | |||
442 | configuration files; see the | 459 | configuration files; see the |
443 | .Cm Compression | 460 | .Cm Compression |
444 | option. | 461 | option. |
445 | .It Fl c Ar blowfish | 3des | des | 462 | .It Fl c Ar cipher_spec |
446 | Selects the cipher to use for encrypting the session. | 463 | Selects the cipher specification for encrypting the session. |
447 | .Ar 3des | 464 | .Pp |
448 | is used by default. | 465 | Protocol version 1 allows specification of a single cipher. |
449 | It is believed to be secure. | 466 | The suported values are |
467 | .Dq 3des , | ||
468 | .Dq blowfish | ||
469 | and | ||
470 | .Dq des . | ||
450 | .Ar 3des | 471 | .Ar 3des |
451 | (triple-des) is an encrypt-decrypt-encrypt triple with three different keys. | 472 | (triple-des) is an encrypt-decrypt-encrypt triple with three different keys. |
473 | It is believed to be secure. | ||
452 | .Ar blowfish | 474 | .Ar blowfish |
453 | is a fast block cipher; it appears very secure and is much faster than | 475 | is a fast block cipher; it appears very secure and is much faster than |
454 | .Ar 3des . | 476 | .Ar 3des . |
@@ -460,12 +482,30 @@ that do not support the | |||
460 | .Ar 3des | 482 | .Ar 3des |
461 | cipher. | 483 | cipher. |
462 | Its use is strongly discouraged due to cryptographic weaknesses. | 484 | Its use is strongly discouraged due to cryptographic weaknesses. |
463 | .It Fl c Ar cipher_spec | 485 | The default is |
464 | Additionally, for protocol version 2 a comma-separated list of ciphers can | 486 | .Dq 3des . |
465 | be specified in order of preference. | 487 | .Pp |
466 | See | 488 | For protocol version 2 |
467 | .Cm Ciphers | 489 | .Ar cipher_spec |
468 | for more information. | 490 | is a comma-separated list of ciphers |
491 | listed in order of preference. | ||
492 | The supported ciphers are | ||
493 | .Dq 3des-cbc , | ||
494 | .Dq aes128-cbc , | ||
495 | .Dq aes192-cbc , | ||
496 | .Dq aes256-cbc , | ||
497 | .Dq aes128-ctr , | ||
498 | .Dq aes192-ctr , | ||
499 | .Dq aes256-ctr , | ||
500 | .Dq arcfour , | ||
501 | .Dq blowfish-cbc , | ||
502 | and | ||
503 | .Dq cast128-cbc . | ||
504 | The default is | ||
505 | .Bd -literal | ||
506 | ``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour, | ||
507 | aes192-cbc,aes256-cbc'' | ||
508 | .Ed | ||
469 | .It Fl D Ar port | 509 | .It Fl D Ar port |
470 | Specifies a local | 510 | Specifies a local |
471 | .Dq dynamic | 511 | .Dq dynamic |
@@ -568,6 +608,17 @@ IPv6 addresses can be specified with an alternative syntax: | |||
568 | .It Fl l Ar login_name | 608 | .It Fl l Ar login_name |
569 | Specifies the user to log in as on the remote machine. | 609 | Specifies the user to log in as on the remote machine. |
570 | This also may be specified on a per-host basis in the configuration file. | 610 | This also may be specified on a per-host basis in the configuration file. |
611 | .It Fl M | ||
612 | Places the | ||
613 | .Nm | ||
614 | client into | ||
615 | .Dq master | ||
616 | mode for connection sharing. | ||
617 | Refer to the description of | ||
618 | .Cm ControlMaster | ||
619 | in | ||
620 | .Xr ssh_config 5 | ||
621 | for details. | ||
571 | .It Fl m Ar mac_spec | 622 | .It Fl m Ar mac_spec |
572 | Additionally, for protocol version 2 a comma-separated list of MAC | 623 | Additionally, for protocol version 2 a comma-separated list of MAC |
573 | (message authentication code) algorithms can | 624 | (message authentication code) algorithms can |
@@ -618,7 +669,9 @@ For full details of the options listed below, and their possible values, see | |||
618 | .It Compression | 669 | .It Compression |
619 | .It CompressionLevel | 670 | .It CompressionLevel |
620 | .It ConnectionAttempts | 671 | .It ConnectionAttempts |
621 | .It ConnectionTimeout | 672 | .It ConnectTimeout |
673 | .It ControlMaster | ||
674 | .It ControlPath | ||
622 | .It DynamicForward | 675 | .It DynamicForward |
623 | .It EscapeChar | 676 | .It EscapeChar |
624 | .It ForwardAgent | 677 | .It ForwardAgent |
@@ -649,6 +702,7 @@ For full details of the options listed below, and their possible values, see | |||
649 | .It RemoteForward | 702 | .It RemoteForward |
650 | .It RhostsRSAAuthentication | 703 | .It RhostsRSAAuthentication |
651 | .It RSAAuthentication | 704 | .It RSAAuthentication |
705 | .It SendEnv | ||
652 | .It ServerAliveInterval | 706 | .It ServerAliveInterval |
653 | .It ServerAliveCountMax | 707 | .It ServerAliveCountMax |
654 | .It SmartcardDevice | 708 | .It SmartcardDevice |
@@ -697,6 +751,15 @@ IPv6 addresses can be specified with an alternative syntax: | |||
697 | .Ar hostport . | 751 | .Ar hostport . |
698 | .Xc | 752 | .Xc |
699 | .Sm on | 753 | .Sm on |
754 | .It Fl S Ar ctl | ||
755 | Specifies the location of a control socket for connection sharing. | ||
756 | Refer to the description of | ||
757 | .Cm ControlPath | ||
758 | and | ||
759 | .Cm ControlMaster | ||
760 | in | ||
761 | .Xr ssh_config 5 | ||
762 | for details. | ||
700 | .It Fl s | 763 | .It Fl s |
701 | May be used to request invocation of a subsystem on the remote system. | 764 | May be used to request invocation of a subsystem on the remote system. |
702 | Subsystems are a feature of the SSH2 protocol which facilitate the use | 765 | Subsystems are a feature of the SSH2 protocol which facilitate the use |
@@ -889,6 +952,8 @@ the convenience of the user. | |||
889 | This is the per-user configuration file. | 952 | This is the per-user configuration file. |
890 | The file format and configuration options are described in | 953 | The file format and configuration options are described in |
891 | .Xr ssh_config 5 . | 954 | .Xr ssh_config 5 . |
955 | Because of the potential for abuse, this file must have strict permissions: | ||
956 | read/write for the user, and not accessible by others. | ||
892 | .It Pa $HOME/.ssh/authorized_keys | 957 | .It Pa $HOME/.ssh/authorized_keys |
893 | Lists the public keys (RSA/DSA) that can be used for logging in as this user. | 958 | Lists the public keys (RSA/DSA) that can be used for logging in as this user. |
894 | The format of this file is described in the | 959 | The format of this file is described in the |
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: ssh.c,v 1.209 2004/03/11 10:21:17 markus Exp $"); | 43 | RCSID("$OpenBSD: ssh.c,v 1.224 2004/07/28 09:40:29 markus Exp $"); |
44 | 44 | ||
45 | #include <openssl/evp.h> | 45 | #include <openssl/evp.h> |
46 | #include <openssl/err.h> | 46 | #include <openssl/err.h> |
@@ -53,31 +53,31 @@ RCSID("$OpenBSD: ssh.c,v 1.209 2004/03/11 10:21:17 markus Exp $"); | |||
53 | #include "xmalloc.h" | 53 | #include "xmalloc.h" |
54 | #include "packet.h" | 54 | #include "packet.h" |
55 | #include "buffer.h" | 55 | #include "buffer.h" |
56 | #include "bufaux.h" | ||
56 | #include "channels.h" | 57 | #include "channels.h" |
57 | #include "key.h" | 58 | #include "key.h" |
58 | #include "authfd.h" | 59 | #include "authfd.h" |
59 | #include "authfile.h" | 60 | #include "authfile.h" |
60 | #include "pathnames.h" | 61 | #include "pathnames.h" |
62 | #include "dispatch.h" | ||
61 | #include "clientloop.h" | 63 | #include "clientloop.h" |
62 | #include "log.h" | 64 | #include "log.h" |
63 | #include "readconf.h" | 65 | #include "readconf.h" |
64 | #include "sshconnect.h" | 66 | #include "sshconnect.h" |
65 | #include "tildexpand.h" | ||
66 | #include "dispatch.h" | ||
67 | #include "misc.h" | 67 | #include "misc.h" |
68 | #include "kex.h" | 68 | #include "kex.h" |
69 | #include "mac.h" | 69 | #include "mac.h" |
70 | #include "sshtty.h" | 70 | #include "sshpty.h" |
71 | #include "match.h" | ||
72 | #include "msg.h" | ||
73 | #include "monitor_fdpass.h" | ||
74 | #include "uidswap.h" | ||
71 | 75 | ||
72 | #ifdef SMARTCARD | 76 | #ifdef SMARTCARD |
73 | #include "scard.h" | 77 | #include "scard.h" |
74 | #endif | 78 | #endif |
75 | 79 | ||
76 | #ifdef HAVE___PROGNAME | ||
77 | extern char *__progname; | 80 | extern char *__progname; |
78 | #else | ||
79 | char *__progname; | ||
80 | #endif | ||
81 | 81 | ||
82 | /* Flag indicating whether debug mode is on. This can be set on the command line. */ | 82 | /* Flag indicating whether debug mode is on. This can be set on the command line. */ |
83 | int debug_flag = 0; | 83 | int debug_flag = 0; |
@@ -141,16 +141,23 @@ static int client_global_request_id = 0; | |||
141 | /* pid of proxycommand child process */ | 141 | /* pid of proxycommand child process */ |
142 | pid_t proxy_command_pid = 0; | 142 | pid_t proxy_command_pid = 0; |
143 | 143 | ||
144 | /* fd to control socket */ | ||
145 | int control_fd = -1; | ||
146 | |||
147 | /* Only used in control client mode */ | ||
148 | volatile sig_atomic_t control_client_terminate = 0; | ||
149 | u_int control_server_pid = 0; | ||
150 | |||
144 | /* Prints a help message to the user. This function never returns. */ | 151 | /* Prints a help message to the user. This function never returns. */ |
145 | 152 | ||
146 | static void | 153 | static void |
147 | usage(void) | 154 | usage(void) |
148 | { | 155 | { |
149 | fprintf(stderr, | 156 | fprintf(stderr, |
150 | "usage: ssh [-1246AaCfghkNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n" | 157 | "usage: ssh [-1246AaCfghkMNnqsTtVvXxY] [-b bind_address] [-c cipher_spec]\n" |
151 | " [-D port] [-e escape_char] [-F configfile] [-i identity_file]\n" | 158 | " [-D port] [-e escape_char] [-F configfile] [-i identity_file]\n" |
152 | " [-L port:host:hostport] [-l login_name] [-m mac_spec] [-o option]\n" | 159 | " [-L port:host:hostport] [-l login_name] [-m mac_spec] [-o option]\n" |
153 | " [-p port] [-R port:host:hostport] [user@]hostname [command]\n" | 160 | " [-p port] [-R port:host:hostport] [-S ctl] [user@]hostname [command]\n" |
154 | ); | 161 | ); |
155 | exit(1); | 162 | exit(1); |
156 | } | 163 | } |
@@ -158,6 +165,7 @@ usage(void) | |||
158 | static int ssh_session(void); | 165 | static int ssh_session(void); |
159 | static int ssh_session2(void); | 166 | static int ssh_session2(void); |
160 | static void load_public_identity_files(void); | 167 | static void load_public_identity_files(void); |
168 | static void control_client(const char *path); | ||
161 | 169 | ||
162 | /* | 170 | /* |
163 | * Main program for the ssh client. | 171 | * Main program for the ssh client. |
@@ -228,7 +236,7 @@ main(int ac, char **av) | |||
228 | 236 | ||
229 | again: | 237 | again: |
230 | while ((opt = getopt(ac, av, | 238 | while ((opt = getopt(ac, av, |
231 | "1246ab:c:e:fgi:kl:m:no:p:qstvxACD:F:I:L:NPR:TVXY")) != -1) { | 239 | "1246ab:c:e:fgi:kl:m:no:p:qstvxACD:F:I:L:MNPR:S:TVXY")) != -1) { |
232 | switch (opt) { | 240 | switch (opt) { |
233 | case '1': | 241 | case '1': |
234 | options.protocol = SSH_PROTO_1; | 242 | options.protocol = SSH_PROTO_1; |
@@ -342,7 +350,7 @@ again: | |||
342 | if (ciphers_valid(optarg)) { | 350 | if (ciphers_valid(optarg)) { |
343 | /* SSH2 only */ | 351 | /* SSH2 only */ |
344 | options.ciphers = xstrdup(optarg); | 352 | options.ciphers = xstrdup(optarg); |
345 | options.cipher = SSH_CIPHER_ILLEGAL; | 353 | options.cipher = SSH_CIPHER_INVALID; |
346 | } else { | 354 | } else { |
347 | /* SSH1 only */ | 355 | /* SSH1 only */ |
348 | options.cipher = cipher_number(optarg); | 356 | options.cipher = cipher_number(optarg); |
@@ -369,6 +377,10 @@ again: | |||
369 | exit(1); | 377 | exit(1); |
370 | } | 378 | } |
371 | break; | 379 | break; |
380 | case 'M': | ||
381 | options.control_master = | ||
382 | (options.control_master >= 1) ? 2 : 1; | ||
383 | break; | ||
372 | case 'p': | 384 | case 'p': |
373 | options.port = a2port(optarg); | 385 | options.port = a2port(optarg); |
374 | if (options.port == 0) { | 386 | if (options.port == 0) { |
@@ -437,6 +449,11 @@ again: | |||
437 | case 's': | 449 | case 's': |
438 | subsystem_flag = 1; | 450 | subsystem_flag = 1; |
439 | break; | 451 | break; |
452 | case 'S': | ||
453 | if (options.control_path != NULL) | ||
454 | free(options.control_path); | ||
455 | options.control_path = xstrdup(optarg); | ||
456 | break; | ||
440 | case 'b': | 457 | case 'b': |
441 | options.bind_address = optarg; | 458 | options.bind_address = optarg; |
442 | break; | 459 | break; |
@@ -531,16 +548,17 @@ again: | |||
531 | * file if the user specifies a config file on the command line. | 548 | * file if the user specifies a config file on the command line. |
532 | */ | 549 | */ |
533 | if (config != NULL) { | 550 | if (config != NULL) { |
534 | if (!read_config_file(config, host, &options)) | 551 | if (!read_config_file(config, host, &options, 0)) |
535 | fatal("Can't open user config file %.100s: " | 552 | fatal("Can't open user config file %.100s: " |
536 | "%.100s", config, strerror(errno)); | 553 | "%.100s", config, strerror(errno)); |
537 | } else { | 554 | } else { |
538 | snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir, | 555 | snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir, |
539 | _PATH_SSH_USER_CONFFILE); | 556 | _PATH_SSH_USER_CONFFILE); |
540 | (void)read_config_file(buf, host, &options); | 557 | (void)read_config_file(buf, host, &options, 1); |
541 | 558 | ||
542 | /* Read systemwide configuration file after use config. */ | 559 | /* Read systemwide configuration file after use config. */ |
543 | (void)read_config_file(_PATH_HOST_CONFIG_FILE, host, &options); | 560 | (void)read_config_file(_PATH_HOST_CONFIG_FILE, host, |
561 | &options, 0); | ||
544 | } | 562 | } |
545 | 563 | ||
546 | /* Fill configuration defaults. */ | 564 | /* Fill configuration defaults. */ |
@@ -570,6 +588,13 @@ again: | |||
570 | strcmp(options.proxy_command, "none") == 0) | 588 | strcmp(options.proxy_command, "none") == 0) |
571 | options.proxy_command = NULL; | 589 | options.proxy_command = NULL; |
572 | 590 | ||
591 | if (options.control_path != NULL) { | ||
592 | options.control_path = tilde_expand_filename( | ||
593 | options.control_path, original_real_uid); | ||
594 | } | ||
595 | if (options.control_path != NULL && options.control_master == 0) | ||
596 | control_client(options.control_path); /* This doesn't return */ | ||
597 | |||
573 | /* Open a connection to the remote host. */ | 598 | /* Open a connection to the remote host. */ |
574 | if (ssh_connect(host, &hostaddr, options.port, | 599 | if (ssh_connect(host, &hostaddr, options.port, |
575 | options.address_family, options.connection_attempts, | 600 | options.address_family, options.connection_attempts, |
@@ -625,8 +650,10 @@ again: | |||
625 | * user's home directory if it happens to be on a NFS volume where | 650 | * user's home directory if it happens to be on a NFS volume where |
626 | * root is mapped to nobody. | 651 | * root is mapped to nobody. |
627 | */ | 652 | */ |
628 | seteuid(original_real_uid); | 653 | if (original_effective_uid == 0) { |
629 | setuid(original_real_uid); | 654 | PRIV_START; |
655 | permanently_set_uid(pw); | ||
656 | } | ||
630 | 657 | ||
631 | /* | 658 | /* |
632 | * Now that we are back to our own permissions, create ~/.ssh | 659 | * Now that we are back to our own permissions, create ~/.ssh |
@@ -682,6 +709,9 @@ again: | |||
682 | exit_status = compat20 ? ssh_session2() : ssh_session(); | 709 | exit_status = compat20 ? ssh_session2() : ssh_session(); |
683 | packet_close(); | 710 | packet_close(); |
684 | 711 | ||
712 | if (options.control_path != NULL && control_fd != -1) | ||
713 | unlink(options.control_path); | ||
714 | |||
685 | /* | 715 | /* |
686 | * Send SIGHUP to proxy command if used. We don't wait() in | 716 | * Send SIGHUP to proxy command if used. We don't wait() in |
687 | * case it hangs and instead rely on init to reap the child | 717 | * case it hangs and instead rely on init to reap the child |
@@ -781,17 +811,17 @@ x11_get_proto(char **_proto, char **_data) | |||
781 | * for the local connection. | 811 | * for the local connection. |
782 | */ | 812 | */ |
783 | if (!got_data) { | 813 | if (!got_data) { |
784 | u_int32_t rand = 0; | 814 | u_int32_t rnd = 0; |
785 | 815 | ||
786 | logit("Warning: No xauth data; " | 816 | logit("Warning: No xauth data; " |
787 | "using fake authentication data for X11 forwarding."); | 817 | "using fake authentication data for X11 forwarding."); |
788 | strlcpy(proto, SSH_X11_PROTO, sizeof proto); | 818 | strlcpy(proto, SSH_X11_PROTO, sizeof proto); |
789 | for (i = 0; i < 16; i++) { | 819 | for (i = 0; i < 16; i++) { |
790 | if (i % 4 == 0) | 820 | if (i % 4 == 0) |
791 | rand = arc4random(); | 821 | rnd = arc4random(); |
792 | snprintf(data + 2 * i, sizeof data - 2 * i, "%02x", | 822 | snprintf(data + 2 * i, sizeof data - 2 * i, "%02x", |
793 | rand & 0xff); | 823 | rnd & 0xff); |
794 | rand >>= 8; | 824 | rnd >>= 8; |
795 | } | 825 | } |
796 | } | 826 | } |
797 | } | 827 | } |
@@ -978,7 +1008,7 @@ ssh_session(void) | |||
978 | } | 1008 | } |
979 | 1009 | ||
980 | static void | 1010 | static void |
981 | client_subsystem_reply(int type, u_int32_t seq, void *ctxt) | 1011 | ssh_subsystem_reply(int type, u_int32_t seq, void *ctxt) |
982 | { | 1012 | { |
983 | int id, len; | 1013 | int id, len; |
984 | 1014 | ||
@@ -1010,40 +1040,53 @@ client_global_request_reply_fwd(int type, u_int32_t seq, void *ctxt) | |||
1010 | options.remote_forwards[i].port); | 1040 | options.remote_forwards[i].port); |
1011 | } | 1041 | } |
1012 | 1042 | ||
1013 | /* request pty/x11/agent/tcpfwd/shell for channel */ | ||
1014 | static void | 1043 | static void |
1015 | ssh_session2_setup(int id, void *arg) | 1044 | ssh_control_listener(void) |
1016 | { | 1045 | { |
1017 | int len; | 1046 | struct sockaddr_un addr; |
1018 | int interactive = 0; | 1047 | mode_t old_umask; |
1019 | struct termios tio; | 1048 | int addr_len; |
1020 | 1049 | ||
1021 | debug2("ssh_session2_setup: id %d", id); | 1050 | if (options.control_path == NULL || options.control_master <= 0) |
1051 | return; | ||
1022 | 1052 | ||
1023 | if (tty_flag) { | 1053 | memset(&addr, '\0', sizeof(addr)); |
1024 | struct winsize ws; | 1054 | addr.sun_family = AF_UNIX; |
1025 | char *cp; | 1055 | addr_len = offsetof(struct sockaddr_un, sun_path) + |
1026 | cp = getenv("TERM"); | 1056 | strlen(options.control_path) + 1; |
1027 | if (!cp) | ||
1028 | cp = ""; | ||
1029 | /* Store window size in the packet. */ | ||
1030 | if (ioctl(fileno(stdin), TIOCGWINSZ, &ws) < 0) | ||
1031 | memset(&ws, 0, sizeof(ws)); | ||
1032 | 1057 | ||
1033 | channel_request_start(id, "pty-req", 0); | 1058 | if (strlcpy(addr.sun_path, options.control_path, |
1034 | packet_put_cstring(cp); | 1059 | sizeof(addr.sun_path)) >= sizeof(addr.sun_path)) |
1035 | packet_put_int(ws.ws_col); | 1060 | fatal("ControlPath too long"); |
1036 | packet_put_int(ws.ws_row); | 1061 | |
1037 | packet_put_int(ws.ws_xpixel); | 1062 | if ((control_fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) |
1038 | packet_put_int(ws.ws_ypixel); | 1063 | fatal("%s socket(): %s\n", __func__, strerror(errno)); |
1039 | tio = get_saved_tio(); | 1064 | |
1040 | tty_make_modes(/*ignored*/ 0, &tio); | 1065 | old_umask = umask(0177); |
1041 | packet_send(); | 1066 | if (bind(control_fd, (struct sockaddr*)&addr, addr_len) == -1) { |
1042 | interactive = 1; | 1067 | control_fd = -1; |
1043 | /* XXX wait for reply */ | 1068 | if (errno == EINVAL) |
1069 | fatal("ControlSocket %s already exists", | ||
1070 | options.control_path); | ||
1071 | else | ||
1072 | fatal("%s bind(): %s\n", __func__, strerror(errno)); | ||
1044 | } | 1073 | } |
1045 | if (options.forward_x11 && | 1074 | umask(old_umask); |
1046 | getenv("DISPLAY") != NULL) { | 1075 | |
1076 | if (listen(control_fd, 64) == -1) | ||
1077 | fatal("%s listen(): %s\n", __func__, strerror(errno)); | ||
1078 | |||
1079 | set_nonblock(control_fd); | ||
1080 | } | ||
1081 | |||
1082 | /* request pty/x11/agent/tcpfwd/shell for channel */ | ||
1083 | static void | ||
1084 | ssh_session2_setup(int id, void *arg) | ||
1085 | { | ||
1086 | extern char **environ; | ||
1087 | |||
1088 | int interactive = tty_flag; | ||
1089 | if (options.forward_x11 && getenv("DISPLAY") != NULL) { | ||
1047 | char *proto, *data; | 1090 | char *proto, *data; |
1048 | /* Get reasonable local authentication information. */ | 1091 | /* Get reasonable local authentication information. */ |
1049 | x11_get_proto(&proto, &data); | 1092 | x11_get_proto(&proto, &data); |
@@ -1061,27 +1104,8 @@ ssh_session2_setup(int id, void *arg) | |||
1061 | packet_send(); | 1104 | packet_send(); |
1062 | } | 1105 | } |
1063 | 1106 | ||
1064 | len = buffer_len(&command); | 1107 | client_session2_setup(id, tty_flag, subsystem_flag, getenv("TERM"), |
1065 | if (len > 0) { | 1108 | NULL, fileno(stdin), &command, environ, &ssh_subsystem_reply); |
1066 | if (len > 900) | ||
1067 | len = 900; | ||
1068 | if (subsystem_flag) { | ||
1069 | debug("Sending subsystem: %.*s", len, (u_char *)buffer_ptr(&command)); | ||
1070 | channel_request_start(id, "subsystem", /*want reply*/ 1); | ||
1071 | /* register callback for reply */ | ||
1072 | /* XXX we assume that client_loop has already been called */ | ||
1073 | dispatch_set(SSH2_MSG_CHANNEL_FAILURE, &client_subsystem_reply); | ||
1074 | dispatch_set(SSH2_MSG_CHANNEL_SUCCESS, &client_subsystem_reply); | ||
1075 | } else { | ||
1076 | debug("Sending command: %.*s", len, (u_char *)buffer_ptr(&command)); | ||
1077 | channel_request_start(id, "exec", 0); | ||
1078 | } | ||
1079 | packet_put_string(buffer_ptr(&command), buffer_len(&command)); | ||
1080 | packet_send(); | ||
1081 | } else { | ||
1082 | channel_request_start(id, "shell", 0); | ||
1083 | packet_send(); | ||
1084 | } | ||
1085 | 1109 | ||
1086 | packet_set_interactive(interactive); | 1110 | packet_set_interactive(interactive); |
1087 | } | 1111 | } |
@@ -1127,7 +1151,7 @@ ssh_session2_open(void) | |||
1127 | 1151 | ||
1128 | channel_send_open(c->self); | 1152 | channel_send_open(c->self); |
1129 | if (!no_shell_flag) | 1153 | if (!no_shell_flag) |
1130 | channel_register_confirm(c->self, ssh_session2_setup); | 1154 | channel_register_confirm(c->self, ssh_session2_setup, NULL); |
1131 | 1155 | ||
1132 | return c->self; | 1156 | return c->self; |
1133 | } | 1157 | } |
@@ -1139,6 +1163,7 @@ ssh_session2(void) | |||
1139 | 1163 | ||
1140 | /* XXX should be pre-session */ | 1164 | /* XXX should be pre-session */ |
1141 | ssh_init_forwarding(); | 1165 | ssh_init_forwarding(); |
1166 | ssh_control_listener(); | ||
1142 | 1167 | ||
1143 | if (!no_shell_flag || (datafellows & SSH_BUG_DUMMYCHAN)) | 1168 | if (!no_shell_flag || (datafellows & SSH_BUG_DUMMYCHAN)) |
1144 | id = ssh_session2_open(); | 1169 | id = ssh_session2_open(); |
@@ -1192,3 +1217,149 @@ load_public_identity_files(void) | |||
1192 | options.identity_keys[i] = public; | 1217 | options.identity_keys[i] = public; |
1193 | } | 1218 | } |
1194 | } | 1219 | } |
1220 | |||
1221 | static void | ||
1222 | control_client_sighandler(int signo) | ||
1223 | { | ||
1224 | control_client_terminate = signo; | ||
1225 | } | ||
1226 | |||
1227 | static void | ||
1228 | control_client_sigrelay(int signo) | ||
1229 | { | ||
1230 | if (control_server_pid > 1) | ||
1231 | kill(control_server_pid, signo); | ||
1232 | } | ||
1233 | |||
1234 | static int | ||
1235 | env_permitted(char *env) | ||
1236 | { | ||
1237 | int i; | ||
1238 | char name[1024], *cp; | ||
1239 | |||
1240 | strlcpy(name, env, sizeof(name)); | ||
1241 | if ((cp = strchr(name, '=')) == NULL) | ||
1242 | return (0); | ||
1243 | |||
1244 | *cp = '\0'; | ||
1245 | |||
1246 | for (i = 0; i < options.num_send_env; i++) | ||
1247 | if (match_pattern(name, options.send_env[i])) | ||
1248 | return (1); | ||
1249 | |||
1250 | return (0); | ||
1251 | } | ||
1252 | |||
1253 | static void | ||
1254 | control_client(const char *path) | ||
1255 | { | ||
1256 | struct sockaddr_un addr; | ||
1257 | int i, r, sock, exitval, num_env, addr_len; | ||
1258 | Buffer m; | ||
1259 | char *cp; | ||
1260 | extern char **environ; | ||
1261 | |||
1262 | memset(&addr, '\0', sizeof(addr)); | ||
1263 | addr.sun_family = AF_UNIX; | ||
1264 | addr_len = offsetof(struct sockaddr_un, sun_path) + | ||
1265 | strlen(path) + 1; | ||
1266 | |||
1267 | if (strlcpy(addr.sun_path, path, | ||
1268 | sizeof(addr.sun_path)) >= sizeof(addr.sun_path)) | ||
1269 | fatal("ControlPath too long"); | ||
1270 | |||
1271 | if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) | ||
1272 | fatal("%s socket(): %s", __func__, strerror(errno)); | ||
1273 | |||
1274 | if (connect(sock, (struct sockaddr*)&addr, addr_len) == -1) | ||
1275 | fatal("Couldn't connect to %s: %s", path, strerror(errno)); | ||
1276 | |||
1277 | if ((cp = getenv("TERM")) == NULL) | ||
1278 | cp = ""; | ||
1279 | |||
1280 | buffer_init(&m); | ||
1281 | |||
1282 | /* Get PID of controlee */ | ||
1283 | if (ssh_msg_recv(sock, &m) == -1) | ||
1284 | fatal("%s: msg_recv", __func__); | ||
1285 | if (buffer_get_char(&m) != 0) | ||
1286 | fatal("%s: wrong version", __func__); | ||
1287 | /* Connection allowed? */ | ||
1288 | if (buffer_get_int(&m) != 1) | ||
1289 | fatal("Connection to master denied"); | ||
1290 | control_server_pid = buffer_get_int(&m); | ||
1291 | |||
1292 | buffer_clear(&m); | ||
1293 | buffer_put_int(&m, tty_flag); | ||
1294 | buffer_put_int(&m, subsystem_flag); | ||
1295 | buffer_put_cstring(&m, cp); | ||
1296 | |||
1297 | buffer_append(&command, "\0", 1); | ||
1298 | buffer_put_cstring(&m, buffer_ptr(&command)); | ||
1299 | |||
1300 | if (options.num_send_env == 0 || environ == NULL) { | ||
1301 | buffer_put_int(&m, 0); | ||
1302 | } else { | ||
1303 | /* Pass environment */ | ||
1304 | num_env = 0; | ||
1305 | for (i = 0; environ[i] != NULL; i++) | ||
1306 | if (env_permitted(environ[i])) | ||
1307 | num_env++; /* Count */ | ||
1308 | |||
1309 | buffer_put_int(&m, num_env); | ||
1310 | |||
1311 | for (i = 0; environ[i] != NULL && num_env >= 0; i++) | ||
1312 | if (env_permitted(environ[i])) { | ||
1313 | num_env--; | ||
1314 | buffer_put_cstring(&m, environ[i]); | ||
1315 | } | ||
1316 | } | ||
1317 | |||
1318 | if (ssh_msg_send(sock, /* version */0, &m) == -1) | ||
1319 | fatal("%s: msg_send", __func__); | ||
1320 | |||
1321 | mm_send_fd(sock, STDIN_FILENO); | ||
1322 | mm_send_fd(sock, STDOUT_FILENO); | ||
1323 | mm_send_fd(sock, STDERR_FILENO); | ||
1324 | |||
1325 | /* Wait for reply, so master has a chance to gather ttymodes */ | ||
1326 | buffer_clear(&m); | ||
1327 | if (ssh_msg_recv(sock, &m) == -1) | ||
1328 | fatal("%s: msg_recv", __func__); | ||
1329 | if (buffer_get_char(&m) != 0) | ||
1330 | fatal("%s: master returned error", __func__); | ||
1331 | buffer_free(&m); | ||
1332 | |||
1333 | signal(SIGINT, control_client_sighandler); | ||
1334 | signal(SIGTERM, control_client_sighandler); | ||
1335 | signal(SIGWINCH, control_client_sigrelay); | ||
1336 | |||
1337 | if (tty_flag) | ||
1338 | enter_raw_mode(); | ||
1339 | |||
1340 | /* Stick around until the controlee closes the client_fd */ | ||
1341 | exitval = 0; | ||
1342 | for (;!control_client_terminate;) { | ||
1343 | r = read(sock, &exitval, sizeof(exitval)); | ||
1344 | if (r == 0) { | ||
1345 | debug2("Received EOF from master"); | ||
1346 | break; | ||
1347 | } | ||
1348 | if (r > 0) | ||
1349 | debug2("Received exit status from master %d", exitval); | ||
1350 | if (r == -1 && errno != EINTR) | ||
1351 | fatal("%s: read %s", __func__, strerror(errno)); | ||
1352 | } | ||
1353 | |||
1354 | if (control_client_terminate) | ||
1355 | debug2("Exiting on signal %d", control_client_terminate); | ||
1356 | |||
1357 | close(sock); | ||
1358 | |||
1359 | leave_raw_mode(); | ||
1360 | |||
1361 | if (tty_flag && options.log_level != SYSLOG_LEVEL_QUIET) | ||
1362 | fprintf(stderr, "Connection to master closed.\r\n"); | ||
1363 | |||
1364 | exit(exitval); | ||
1365 | } | ||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh1.h,v 1.3 2001/05/30 12:55:13 markus Exp $ */ | 1 | /* $OpenBSD: ssh1.h,v 1.4 2004/07/11 17:48:47 deraadt Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -29,8 +29,8 @@ | |||
29 | #define SSH_SMSG_AUTH_RSA_CHALLENGE 7 /* int (BIGNUM) */ | 29 | #define SSH_SMSG_AUTH_RSA_CHALLENGE 7 /* int (BIGNUM) */ |
30 | #define SSH_CMSG_AUTH_RSA_RESPONSE 8 /* int (BIGNUM) */ | 30 | #define SSH_CMSG_AUTH_RSA_RESPONSE 8 /* int (BIGNUM) */ |
31 | #define SSH_CMSG_AUTH_PASSWORD 9 /* pass (string) */ | 31 | #define SSH_CMSG_AUTH_PASSWORD 9 /* pass (string) */ |
32 | #define SSH_CMSG_REQUEST_PTY 10 /* TERM, tty modes */ | 32 | #define SSH_CMSG_REQUEST_PTY 10 /* TERM, tty modes */ |
33 | #define SSH_CMSG_WINDOW_SIZE 11 /* row,col,xpix,ypix */ | 33 | #define SSH_CMSG_WINDOW_SIZE 11 /* row,col,xpix,ypix */ |
34 | #define SSH_CMSG_EXEC_SHELL 12 /* */ | 34 | #define SSH_CMSG_EXEC_SHELL 12 /* */ |
35 | #define SSH_CMSG_EXEC_CMD 13 /* cmd (string) */ | 35 | #define SSH_CMSG_EXEC_CMD 13 /* cmd (string) */ |
36 | #define SSH_SMSG_SUCCESS 14 /* */ | 36 | #define SSH_SMSG_SUCCESS 14 /* */ |
@@ -45,7 +45,7 @@ | |||
45 | #define SSH_MSG_CHANNEL_DATA 23 /* ch,data (int,str) */ | 45 | #define SSH_MSG_CHANNEL_DATA 23 /* ch,data (int,str) */ |
46 | #define SSH_MSG_CHANNEL_CLOSE 24 /* channel (int) */ | 46 | #define SSH_MSG_CHANNEL_CLOSE 24 /* channel (int) */ |
47 | #define SSH_MSG_CHANNEL_CLOSE_CONFIRMATION 25 /* channel (int) */ | 47 | #define SSH_MSG_CHANNEL_CLOSE_CONFIRMATION 25 /* channel (int) */ |
48 | /* SSH_CMSG_X11_REQUEST_FORWARDING 26 OBSOLETE */ | 48 | /* SSH_CMSG_X11_REQUEST_FORWARDING 26 OBSOLETE */ |
49 | #define SSH_SMSG_X11_OPEN 27 /* channel (int) */ | 49 | #define SSH_SMSG_X11_OPEN 27 /* channel (int) */ |
50 | #define SSH_CMSG_PORT_FORWARD_REQUEST 28 /* p,host,hp (i,s,i) */ | 50 | #define SSH_CMSG_PORT_FORWARD_REQUEST 28 /* p,host,hp (i,s,i) */ |
51 | #define SSH_MSG_PORT_OPEN 29 /* ch,h,p (i,s,i) */ | 51 | #define SSH_MSG_PORT_OPEN 29 /* ch,h,p (i,s,i) */ |
diff --git a/ssh_config.0 b/ssh_config.0 index 4be1d7f3f..d1a6ab364 100644 --- a/ssh_config.0 +++ b/ssh_config.0 | |||
@@ -82,8 +82,11 @@ DESCRIPTION | |||
82 | 82 | ||
83 | Ciphers | 83 | Ciphers |
84 | Specifies the ciphers allowed for protocol version 2 in order of | 84 | Specifies the ciphers allowed for protocol version 2 in order of |
85 | preference. Multiple ciphers must be comma-separated. The de- | 85 | preference. Multiple ciphers must be comma-separated. The sup- |
86 | fault is | 86 | ported ciphers are ``3des-cbc'', ``aes128-cbc'', ``aes192-cbc'', |
87 | ``aes256-cbc'', ``aes128-ctr'', ``aes192-ctr'', ``aes256-ctr'', | ||
88 | ``arcfour'', ``blowfish-cbc'', and ``cast128-cbc''. The default | ||
89 | is | ||
87 | 90 | ||
88 | ``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour, | 91 | ``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour, |
89 | aes192-cbc,aes256-cbc'' | 92 | aes192-cbc,aes256-cbc'' |
@@ -118,6 +121,22 @@ DESCRIPTION | |||
118 | This value is used only when the target is down or really un- | 121 | This value is used only when the target is down or really un- |
119 | reachable, not when it refuses the connection. | 122 | reachable, not when it refuses the connection. |
120 | 123 | ||
124 | ControlMaster | ||
125 | Enables the sharing of multiple sessions over a single network | ||
126 | connection. When set to ``yes'' ssh will listen for connections | ||
127 | on a control socket specified using the ControlPath argument. | ||
128 | Additional sessions can connect to this socket using the same | ||
129 | ControlPath with ControlMaster set to ``no'' (the default). | ||
130 | These sessions will reuse the master instance's network connec- | ||
131 | tion rather than initiating new ones. Setting this to ``ask'' | ||
132 | will cause ssh to listen for control connections, but require | ||
133 | confirmation using the SSH_ASKPASS program before they are ac- | ||
134 | cepted (see ssh-add(1) for details). | ||
135 | |||
136 | ControlPath | ||
137 | Specify the path to the control socket used for connection shar- | ||
138 | ing. See ControlMaster above. | ||
139 | |||
121 | DynamicForward | 140 | DynamicForward |
122 | Specifies that a TCP/IP port on the local machine be forwarded | 141 | Specifies that a TCP/IP port on the local machine be forwarded |
123 | over the secure channel, and the application protocol is then | 142 | over the secure channel, and the application protocol is then |
@@ -169,7 +188,7 @@ DESCRIPTION | |||
169 | ForwardX11Trusted option is also enabled. | 188 | ForwardX11Trusted option is also enabled. |
170 | 189 | ||
171 | ForwardX11Trusted | 190 | ForwardX11Trusted |
172 | If the this option is set to ``yes'' then remote X11 clients will | 191 | If this option is set to ``yes'' then remote X11 clients will |
173 | have full access to the original X11 display. If this option is | 192 | have full access to the original X11 display. If this option is |
174 | set to ``no'' then remote X11 clients will be considered untrust- | 193 | set to ``no'' then remote X11 clients will be considered untrust- |
175 | ed and prevented from stealing or tampering with data belonging | 194 | ed and prevented from stealing or tampering with data belonging |
@@ -344,6 +363,17 @@ DESCRIPTION | |||
344 | tion agent is running. The default is ``yes''. Note that this | 363 | tion agent is running. The default is ``yes''. Note that this |
345 | option applies to protocol version 1 only. | 364 | option applies to protocol version 1 only. |
346 | 365 | ||
366 | SendEnv | ||
367 | Specifies what variables from the local environ(7) should be sent | ||
368 | to the server. Note that environment passing is only supported | ||
369 | for protocol 2, the server must also support it, and the server | ||
370 | must be configured to accept these environment variables. Refer | ||
371 | to AcceptEnv in sshd_config(5) for how to configure the server. | ||
372 | Variables are specified by name, which may contain the wildcard | ||
373 | characters `*' and `?'. Multiple environment variables may be | ||
374 | separated by whitespace or spread across multiple SendEnv direc- | ||
375 | tives. The default is not to send any environment variables. | ||
376 | |||
347 | ServerAliveInterval | 377 | ServerAliveInterval |
348 | Sets a timeout interval in seconds after which if no data has | 378 | Sets a timeout interval in seconds after which if no data has |
349 | been received from the server, ssh will send a message through | 379 | been received from the server, ssh will send a message through |
@@ -441,10 +471,9 @@ DESCRIPTION | |||
441 | FILES | 471 | FILES |
442 | $HOME/.ssh/config | 472 | $HOME/.ssh/config |
443 | This is the per-user configuration file. The format of this file | 473 | This is the per-user configuration file. The format of this file |
444 | is described above. This file is used by the ssh client. This | 474 | is described above. This file is used by the ssh client. Be- |
445 | file does not usually contain any sensitive information, but the | 475 | cause of the potential for abuse, this file must have strict per- |
446 | recommended permissions are read/write for the user, and not ac- | 476 | missions: read/write for the user, and not accessible by others. |
447 | cessible by others. | ||
448 | 477 | ||
449 | /etc/ssh/ssh_config | 478 | /etc/ssh/ssh_config |
450 | Systemwide configuration file. This file provides defaults for | 479 | Systemwide configuration file. This file provides defaults for |
@@ -462,4 +491,4 @@ AUTHORS | |||
462 | ated OpenSSH. Markus Friedl contributed the support for SSH protocol | 491 | ated OpenSSH. Markus Friedl contributed the support for SSH protocol |
463 | versions 1.5 and 2.0. | 492 | versions 1.5 and 2.0. |
464 | 493 | ||
465 | OpenBSD 3.5 September 25, 1999 8 | 494 | OpenBSD 3.6 September 25, 1999 8 |
diff --git a/ssh_config.5 b/ssh_config.5 index 0fd3ea5f8..a8767b493 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -34,7 +34,7 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: ssh_config.5,v 1.29 2004/03/05 10:53:58 markus Exp $ | 37 | .\" $OpenBSD: ssh_config.5,v 1.38 2004/06/26 09:11:14 jmc Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSH_CONFIG 5 | 39 | .Dt SSH_CONFIG 5 |
40 | .Os | 40 | .Os |
@@ -192,6 +192,18 @@ The default is | |||
192 | Specifies the ciphers allowed for protocol version 2 | 192 | Specifies the ciphers allowed for protocol version 2 |
193 | in order of preference. | 193 | in order of preference. |
194 | Multiple ciphers must be comma-separated. | 194 | Multiple ciphers must be comma-separated. |
195 | The supported ciphers are | ||
196 | .Dq 3des-cbc , | ||
197 | .Dq aes128-cbc , | ||
198 | .Dq aes192-cbc , | ||
199 | .Dq aes256-cbc , | ||
200 | .Dq aes128-ctr , | ||
201 | .Dq aes192-ctr , | ||
202 | .Dq aes256-ctr , | ||
203 | .Dq arcfour , | ||
204 | .Dq blowfish-cbc , | ||
205 | and | ||
206 | .Dq cast128-cbc . | ||
195 | The default is | 207 | The default is |
196 | .Bd -literal | 208 | .Bd -literal |
197 | ``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour, | 209 | ``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour, |
@@ -239,6 +251,37 @@ Specifies the timeout (in seconds) used when connecting to the ssh | |||
239 | server, instead of using the default system TCP timeout. | 251 | server, instead of using the default system TCP timeout. |
240 | This value is used only when the target is down or really unreachable, | 252 | This value is used only when the target is down or really unreachable, |
241 | not when it refuses the connection. | 253 | not when it refuses the connection. |
254 | .It Cm ControlMaster | ||
255 | Enables the sharing of multiple sessions over a single network connection. | ||
256 | When set to | ||
257 | .Dq yes | ||
258 | .Nm ssh | ||
259 | will listen for connections on a control socket specified using the | ||
260 | .Cm ControlPath | ||
261 | argument. | ||
262 | Additional sessions can connect to this socket using the same | ||
263 | .Cm ControlPath | ||
264 | with | ||
265 | .Cm ControlMaster | ||
266 | set to | ||
267 | .Dq no | ||
268 | (the default). | ||
269 | These sessions will reuse the master instance's network connection rather | ||
270 | than initiating new ones. | ||
271 | Setting this to | ||
272 | .Dq ask | ||
273 | will cause | ||
274 | .Nm ssh | ||
275 | to listen for control connections, but require confirmation using the | ||
276 | .Ev SSH_ASKPASS | ||
277 | program before they are accepted (see | ||
278 | .Xr ssh-add 1 | ||
279 | for details). | ||
280 | .It Cm ControlPath | ||
281 | Specify the path to the control socket used for connection sharing. | ||
282 | See | ||
283 | .Cm ControlMaster | ||
284 | above. | ||
242 | .It Cm DynamicForward | 285 | .It Cm DynamicForward |
243 | Specifies that a TCP/IP port on the local machine be forwarded | 286 | Specifies that a TCP/IP port on the local machine be forwarded |
244 | over the secure channel, and the application | 287 | over the secure channel, and the application |
@@ -320,7 +363,7 @@ if the | |||
320 | .Cm ForwardX11Trusted | 363 | .Cm ForwardX11Trusted |
321 | option is also enabled. | 364 | option is also enabled. |
322 | .It Cm ForwardX11Trusted | 365 | .It Cm ForwardX11Trusted |
323 | If the this option is set to | 366 | If this option is set to |
324 | .Dq yes | 367 | .Dq yes |
325 | then remote X11 clients will have full access to the original X11 display. | 368 | then remote X11 clients will have full access to the original X11 display. |
326 | If this option is set to | 369 | If this option is set to |
@@ -418,7 +461,7 @@ identities will be tried in sequence. | |||
418 | Specifies that | 461 | Specifies that |
419 | .Nm ssh | 462 | .Nm ssh |
420 | should only use the authentication identity files configured in the | 463 | should only use the authentication identity files configured in the |
421 | .Nm | 464 | .Nm |
422 | files, | 465 | files, |
423 | even if the | 466 | even if the |
424 | .Nm ssh-agent | 467 | .Nm ssh-agent |
@@ -578,6 +621,27 @@ running. | |||
578 | The default is | 621 | The default is |
579 | .Dq yes . | 622 | .Dq yes . |
580 | Note that this option applies to protocol version 1 only. | 623 | Note that this option applies to protocol version 1 only. |
624 | .It Cm SendEnv | ||
625 | Specifies what variables from the local | ||
626 | .Xr environ 7 | ||
627 | should be sent to the server. | ||
628 | Note that environment passing is only supported for protocol 2, the | ||
629 | server must also support it, and the server must be configured to | ||
630 | accept these environment variables. | ||
631 | Refer to | ||
632 | .Cm AcceptEnv | ||
633 | in | ||
634 | .Xr sshd_config 5 | ||
635 | for how to configure the server. | ||
636 | Variables are specified by name, which may contain the wildcard characters | ||
637 | .Ql \&* | ||
638 | and | ||
639 | .Ql \&? . | ||
640 | Multiple environment variables may be separated by whitespace or spread | ||
641 | across multiple | ||
642 | .Cm SendEnv | ||
643 | directives. | ||
644 | The default is not to send any environment variables. | ||
581 | .It Cm ServerAliveInterval | 645 | .It Cm ServerAliveInterval |
582 | Sets a timeout interval in seconds after which if no data has been received | 646 | Sets a timeout interval in seconds after which if no data has been received |
583 | from the server, | 647 | from the server, |
@@ -767,9 +831,8 @@ The format of this file is described above. | |||
767 | This file is used by the | 831 | This file is used by the |
768 | .Nm ssh | 832 | .Nm ssh |
769 | client. | 833 | client. |
770 | This file does not usually contain any sensitive information, | 834 | Because of the potential for abuse, this file must have strict permissions: |
771 | but the recommended permissions are read/write for the user, and not | 835 | read/write for the user, and not accessible by others. |
772 | accessible by others. | ||
773 | .It Pa /etc/ssh/ssh_config | 836 | .It Pa /etc/ssh/ssh_config |
774 | Systemwide configuration file. | 837 | Systemwide configuration file. |
775 | This file provides defaults for those | 838 | This file provides defaults for those |
diff --git a/sshconnect.c b/sshconnect.c index e0d1a8c7e..5158416f0 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -13,7 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include "includes.h" | 15 | #include "includes.h" |
16 | RCSID("$OpenBSD: sshconnect.c,v 1.156 2004/01/25 03:49:09 djm Exp $"); | 16 | RCSID("$OpenBSD: sshconnect.c,v 1.158 2004/06/21 17:36:31 avsm Exp $"); |
17 | 17 | ||
18 | #include <openssl/bn.h> | 18 | #include <openssl/bn.h> |
19 | 19 | ||
@@ -31,7 +31,6 @@ RCSID("$OpenBSD: sshconnect.c,v 1.156 2004/01/25 03:49:09 djm Exp $"); | |||
31 | #include "readconf.h" | 31 | #include "readconf.h" |
32 | #include "atomicio.h" | 32 | #include "atomicio.h" |
33 | #include "misc.h" | 33 | #include "misc.h" |
34 | #include "readpass.h" | ||
35 | 34 | ||
36 | #include "dns.h" | 35 | #include "dns.h" |
37 | 36 | ||
@@ -800,19 +799,19 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key, | |||
800 | break; | 799 | break; |
801 | case HOST_CHANGED: | 800 | case HOST_CHANGED: |
802 | if (options.check_host_ip && host_ip_differ) { | 801 | if (options.check_host_ip && host_ip_differ) { |
803 | char *msg; | 802 | char *key_msg; |
804 | if (ip_status == HOST_NEW) | 803 | if (ip_status == HOST_NEW) |
805 | msg = "is unknown"; | 804 | key_msg = "is unknown"; |
806 | else if (ip_status == HOST_OK) | 805 | else if (ip_status == HOST_OK) |
807 | msg = "is unchanged"; | 806 | key_msg = "is unchanged"; |
808 | else | 807 | else |
809 | msg = "has a different value"; | 808 | key_msg = "has a different value"; |
810 | error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); | 809 | error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); |
811 | error("@ WARNING: POSSIBLE DNS SPOOFING DETECTED! @"); | 810 | error("@ WARNING: POSSIBLE DNS SPOOFING DETECTED! @"); |
812 | error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); | 811 | error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); |
813 | error("The %s host key for %s has changed,", type, host); | 812 | error("The %s host key for %s has changed,", type, host); |
814 | error("and the key for the according IP address %s", ip); | 813 | error("and the key for the according IP address %s", ip); |
815 | error("%s. This could either mean that", msg); | 814 | error("%s. This could either mean that", key_msg); |
816 | error("DNS SPOOFING is happening or the IP address for the host"); | 815 | error("DNS SPOOFING is happening or the IP address for the host"); |
817 | error("and its host key have changed at the same time."); | 816 | error("and its host key have changed at the same time."); |
818 | if (ip_status != HOST_NEW) | 817 | if (ip_status != HOST_NEW) |
diff --git a/sshconnect1.c b/sshconnect1.c index 2f89964ec..6e2e31c02 100644 --- a/sshconnect1.c +++ b/sshconnect1.c | |||
@@ -13,7 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include "includes.h" | 15 | #include "includes.h" |
16 | RCSID("$OpenBSD: sshconnect1.c,v 1.56 2003/08/28 12:54:34 markus Exp $"); | 16 | RCSID("$OpenBSD: sshconnect1.c,v 1.60 2004/07/28 09:40:29 markus Exp $"); |
17 | 17 | ||
18 | #include <openssl/bn.h> | 18 | #include <openssl/bn.h> |
19 | #include <openssl/md5.h> | 19 | #include <openssl/md5.h> |
@@ -24,7 +24,7 @@ RCSID("$OpenBSD: sshconnect1.c,v 1.56 2003/08/28 12:54:34 markus Exp $"); | |||
24 | #include "rsa.h" | 24 | #include "rsa.h" |
25 | #include "buffer.h" | 25 | #include "buffer.h" |
26 | #include "packet.h" | 26 | #include "packet.h" |
27 | #include "mpaux.h" | 27 | #include "kex.h" |
28 | #include "uidswap.h" | 28 | #include "uidswap.h" |
29 | #include "log.h" | 29 | #include "log.h" |
30 | #include "readconf.h" | 30 | #include "readconf.h" |
@@ -32,7 +32,7 @@ RCSID("$OpenBSD: sshconnect1.c,v 1.56 2003/08/28 12:54:34 markus Exp $"); | |||
32 | #include "authfd.h" | 32 | #include "authfd.h" |
33 | #include "sshconnect.h" | 33 | #include "sshconnect.h" |
34 | #include "authfile.h" | 34 | #include "authfile.h" |
35 | #include "readpass.h" | 35 | #include "misc.h" |
36 | #include "cipher.h" | 36 | #include "cipher.h" |
37 | #include "canohost.h" | 37 | #include "canohost.h" |
38 | #include "auth.h" | 38 | #include "auth.h" |
@@ -476,7 +476,7 @@ ssh_kex(char *host, struct sockaddr *hostaddr) | |||
476 | u_char cookie[8]; | 476 | u_char cookie[8]; |
477 | u_int supported_ciphers; | 477 | u_int supported_ciphers; |
478 | u_int server_flags, client_flags; | 478 | u_int server_flags, client_flags; |
479 | u_int32_t rand = 0; | 479 | u_int32_t rnd = 0; |
480 | 480 | ||
481 | debug("Waiting for server public key."); | 481 | debug("Waiting for server public key."); |
482 | 482 | ||
@@ -528,7 +528,7 @@ ssh_kex(char *host, struct sockaddr *hostaddr) | |||
528 | 528 | ||
529 | client_flags = SSH_PROTOFLAG_SCREEN_NUMBER | SSH_PROTOFLAG_HOST_IN_FWD_OPEN; | 529 | client_flags = SSH_PROTOFLAG_SCREEN_NUMBER | SSH_PROTOFLAG_HOST_IN_FWD_OPEN; |
530 | 530 | ||
531 | compute_session_id(session_id, cookie, host_key->rsa->n, server_key->rsa->n); | 531 | derive_ssh1_session_id(host_key->rsa->n, server_key->rsa->n, cookie, session_id); |
532 | 532 | ||
533 | /* Generate a session key. */ | 533 | /* Generate a session key. */ |
534 | arc4random_stir(); | 534 | arc4random_stir(); |
@@ -540,9 +540,9 @@ ssh_kex(char *host, struct sockaddr *hostaddr) | |||
540 | */ | 540 | */ |
541 | for (i = 0; i < 32; i++) { | 541 | for (i = 0; i < 32; i++) { |
542 | if (i % 4 == 0) | 542 | if (i % 4 == 0) |
543 | rand = arc4random(); | 543 | rnd = arc4random(); |
544 | session_key[i] = rand & 0xff; | 544 | session_key[i] = rnd & 0xff; |
545 | rand >>= 8; | 545 | rnd >>= 8; |
546 | } | 546 | } |
547 | 547 | ||
548 | /* | 548 | /* |
@@ -598,7 +598,7 @@ ssh_kex(char *host, struct sockaddr *hostaddr) | |||
598 | if (options.cipher == SSH_CIPHER_NOT_SET) { | 598 | if (options.cipher == SSH_CIPHER_NOT_SET) { |
599 | if (cipher_mask_ssh1(1) & supported_ciphers & (1 << ssh_cipher_default)) | 599 | if (cipher_mask_ssh1(1) & supported_ciphers & (1 << ssh_cipher_default)) |
600 | options.cipher = ssh_cipher_default; | 600 | options.cipher = ssh_cipher_default; |
601 | } else if (options.cipher == SSH_CIPHER_ILLEGAL || | 601 | } else if (options.cipher == SSH_CIPHER_INVALID || |
602 | !(cipher_mask_ssh1(1) & (1 << options.cipher))) { | 602 | !(cipher_mask_ssh1(1) & (1 << options.cipher))) { |
603 | logit("No valid SSH1 cipher, using %.100s instead.", | 603 | logit("No valid SSH1 cipher, using %.100s instead.", |
604 | cipher_name(ssh_cipher_default)); | 604 | cipher_name(ssh_cipher_default)); |
diff --git a/sshconnect2.c b/sshconnect2.c index c261dfd18..68d56d020 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: sshconnect2.c,v 1.135 2004/03/05 10:53:58 markus Exp $"); | 26 | RCSID("$OpenBSD: sshconnect2.c,v 1.138 2004/06/13 12:53:24 djm Exp $"); |
27 | 27 | ||
28 | #include "openbsd-compat/sys-queue.h" | 28 | #include "openbsd-compat/sys-queue.h" |
29 | 29 | ||
@@ -43,7 +43,7 @@ RCSID("$OpenBSD: sshconnect2.c,v 1.135 2004/03/05 10:53:58 markus Exp $"); | |||
43 | #include "authfd.h" | 43 | #include "authfd.h" |
44 | #include "log.h" | 44 | #include "log.h" |
45 | #include "readconf.h" | 45 | #include "readconf.h" |
46 | #include "readpass.h" | 46 | #include "misc.h" |
47 | #include "match.h" | 47 | #include "match.h" |
48 | #include "dispatch.h" | 48 | #include "dispatch.h" |
49 | #include "canohost.h" | 49 | #include "canohost.h" |
@@ -120,6 +120,7 @@ ssh_kex2(char *host, struct sockaddr *hostaddr) | |||
120 | /* start key exchange */ | 120 | /* start key exchange */ |
121 | kex = kex_setup(myproposal); | 121 | kex = kex_setup(myproposal); |
122 | kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client; | 122 | kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client; |
123 | kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client; | ||
123 | kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; | 124 | kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; |
124 | kex->client_version_string=client_version_string; | 125 | kex->client_version_string=client_version_string; |
125 | kex->server_version_string=server_version_string; | 126 | kex->server_version_string=server_version_string; |
@@ -458,7 +459,7 @@ input_userauth_pk_ok(int type, u_int32_t seq, void *ctxt) | |||
458 | * moved to the end of the queue. this also avoids confusion by | 459 | * moved to the end of the queue. this also avoids confusion by |
459 | * duplicate keys | 460 | * duplicate keys |
460 | */ | 461 | */ |
461 | TAILQ_FOREACH_REVERSE(id, &authctxt->keys, next, idlist) { | 462 | TAILQ_FOREACH_REVERSE(id, &authctxt->keys, idlist, next) { |
462 | if (key_equal(key, id->key)) { | 463 | if (key_equal(key, id->key)) { |
463 | sent = sign_and_send_pubkey(authctxt, id); | 464 | sent = sign_and_send_pubkey(authctxt, id); |
464 | break; | 465 | break; |
@@ -97,8 +97,8 @@ DESCRIPTION | |||
97 | fied in the configuration file. | 97 | fied in the configuration file. |
98 | 98 | ||
99 | sshd rereads its configuration file when it receives a hangup signal, | 99 | sshd rereads its configuration file when it receives a hangup signal, |
100 | SIGHUP, by executing itself with the name it was started as, i.e., | 100 | SIGHUP, by executing itself with the name and options it was started |
101 | /usr/sbin/sshd. | 101 | with, e.g., /usr/sbin/sshd. |
102 | 102 | ||
103 | The options are as follows: | 103 | The options are as follows: |
104 | 104 | ||
@@ -552,4 +552,4 @@ AUTHORS | |||
552 | versions 1.5 and 2.0. Niels Provos and Markus Friedl contributed support | 552 | versions 1.5 and 2.0. Niels Provos and Markus Friedl contributed support |
553 | for privilege separation. | 553 | for privilege separation. |
554 | 554 | ||
555 | OpenBSD 3.5 September 25, 1999 9 | 555 | OpenBSD 3.6 September 25, 1999 9 |
@@ -34,7 +34,7 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: sshd.8,v 1.200 2003/10/08 08:27:36 jmc Exp $ | 37 | .\" $OpenBSD: sshd.8,v 1.201 2004/05/02 11:54:31 dtucker Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSHD 8 | 39 | .Dt SSHD 8 |
40 | .Os | 40 | .Os |
@@ -196,7 +196,7 @@ configuration file. | |||
196 | .Nm | 196 | .Nm |
197 | rereads its configuration file when it receives a hangup signal, | 197 | rereads its configuration file when it receives a hangup signal, |
198 | .Dv SIGHUP , | 198 | .Dv SIGHUP , |
199 | by executing itself with the name it was started as, e.g., | 199 | by executing itself with the name and options it was started with, e.g., |
200 | .Pa /usr/sbin/sshd . | 200 | .Pa /usr/sbin/sshd . |
201 | .Pp | 201 | .Pp |
202 | The options are as follows: | 202 | The options are as follows: |
@@ -42,7 +42,7 @@ | |||
42 | */ | 42 | */ |
43 | 43 | ||
44 | #include "includes.h" | 44 | #include "includes.h" |
45 | RCSID("$OpenBSD: sshd.c,v 1.290 2004/03/11 10:21:17 markus Exp $"); | 45 | RCSID("$OpenBSD: sshd.c,v 1.301 2004/08/11 11:50:09 dtucker Exp $"); |
46 | 46 | ||
47 | #include <openssl/dh.h> | 47 | #include <openssl/dh.h> |
48 | #include <openssl/bn.h> | 48 | #include <openssl/bn.h> |
@@ -60,12 +60,12 @@ RCSID("$OpenBSD: sshd.c,v 1.290 2004/03/11 10:21:17 markus Exp $"); | |||
60 | #include "rsa.h" | 60 | #include "rsa.h" |
61 | #include "sshpty.h" | 61 | #include "sshpty.h" |
62 | #include "packet.h" | 62 | #include "packet.h" |
63 | #include "mpaux.h" | ||
64 | #include "log.h" | 63 | #include "log.h" |
65 | #include "servconf.h" | 64 | #include "servconf.h" |
66 | #include "uidswap.h" | 65 | #include "uidswap.h" |
67 | #include "compat.h" | 66 | #include "compat.h" |
68 | #include "buffer.h" | 67 | #include "buffer.h" |
68 | #include "bufaux.h" | ||
69 | #include "cipher.h" | 69 | #include "cipher.h" |
70 | #include "kex.h" | 70 | #include "kex.h" |
71 | #include "key.h" | 71 | #include "key.h" |
@@ -77,6 +77,7 @@ RCSID("$OpenBSD: sshd.c,v 1.290 2004/03/11 10:21:17 markus Exp $"); | |||
77 | #include "canohost.h" | 77 | #include "canohost.h" |
78 | #include "auth.h" | 78 | #include "auth.h" |
79 | #include "misc.h" | 79 | #include "misc.h" |
80 | #include "msg.h" | ||
80 | #include "dispatch.h" | 81 | #include "dispatch.h" |
81 | #include "channels.h" | 82 | #include "channels.h" |
82 | #include "session.h" | 83 | #include "session.h" |
@@ -96,11 +97,13 @@ int deny_severity = LOG_WARNING; | |||
96 | #define O_NOCTTY 0 | 97 | #define O_NOCTTY 0 |
97 | #endif | 98 | #endif |
98 | 99 | ||
99 | #ifdef HAVE___PROGNAME | 100 | /* Re-exec fds */ |
101 | #define REEXEC_DEVCRYPTO_RESERVED_FD (STDERR_FILENO + 1) | ||
102 | #define REEXEC_STARTUP_PIPE_FD (STDERR_FILENO + 2) | ||
103 | #define REEXEC_CONFIG_PASS_FD (STDERR_FILENO + 3) | ||
104 | #define REEXEC_MIN_FREE_FD (STDERR_FILENO + 4) | ||
105 | |||
100 | extern char *__progname; | 106 | extern char *__progname; |
101 | #else | ||
102 | char *__progname; | ||
103 | #endif | ||
104 | 107 | ||
105 | /* Server configuration options. */ | 108 | /* Server configuration options. */ |
106 | ServerOptions options; | 109 | ServerOptions options; |
@@ -138,6 +141,12 @@ int log_stderr = 0; | |||
138 | char **saved_argv; | 141 | char **saved_argv; |
139 | int saved_argc; | 142 | int saved_argc; |
140 | 143 | ||
144 | /* re-exec */ | ||
145 | int rexeced_flag = 0; | ||
146 | int rexec_flag = 1; | ||
147 | int rexec_argc = 0; | ||
148 | char **rexec_argv; | ||
149 | |||
141 | /* | 150 | /* |
142 | * The sockets that the server is listening; this is used in the SIGHUP | 151 | * The sockets that the server is listening; this is used in the SIGHUP |
143 | * signal handler. | 152 | * signal handler. |
@@ -201,12 +210,12 @@ int startup_pipe; /* in child */ | |||
201 | int use_privsep; | 210 | int use_privsep; |
202 | struct monitor *pmonitor = NULL; | 211 | struct monitor *pmonitor = NULL; |
203 | 212 | ||
204 | /* message to be displayed after login */ | ||
205 | Buffer loginmsg; | ||
206 | |||
207 | /* global authentication context */ | 213 | /* global authentication context */ |
208 | Authctxt *the_authctxt = NULL; | 214 | Authctxt *the_authctxt = NULL; |
209 | 215 | ||
216 | /* message to be displayed after login */ | ||
217 | Buffer loginmsg; | ||
218 | |||
210 | /* Prototypes for various functions defined later in this file. */ | 219 | /* Prototypes for various functions defined later in this file. */ |
211 | void destroy_sensitive_data(void); | 220 | void destroy_sensitive_data(void); |
212 | void demote_sensitive_data(void); | 221 | void demote_sensitive_data(void); |
@@ -650,6 +659,7 @@ privsep_postauth(Authctxt *authctxt) | |||
650 | else if (pmonitor->m_pid != 0) { | 659 | else if (pmonitor->m_pid != 0) { |
651 | debug2("User child is on pid %ld", (long)pmonitor->m_pid); | 660 | debug2("User child is on pid %ld", (long)pmonitor->m_pid); |
652 | close(pmonitor->m_recvfd); | 661 | close(pmonitor->m_recvfd); |
662 | buffer_clear(&loginmsg); | ||
653 | monitor_child_postauth(pmonitor); | 663 | monitor_child_postauth(pmonitor); |
654 | 664 | ||
655 | /* NEVERREACHED */ | 665 | /* NEVERREACHED */ |
@@ -772,6 +782,87 @@ usage(void) | |||
772 | exit(1); | 782 | exit(1); |
773 | } | 783 | } |
774 | 784 | ||
785 | static void | ||
786 | send_rexec_state(int fd, Buffer *conf) | ||
787 | { | ||
788 | Buffer m; | ||
789 | |||
790 | debug3("%s: entering fd = %d config len %d", __func__, fd, | ||
791 | buffer_len(conf)); | ||
792 | |||
793 | /* | ||
794 | * Protocol from reexec master to child: | ||
795 | * string configuration | ||
796 | * u_int ephemeral_key_follows | ||
797 | * bignum e (only if ephemeral_key_follows == 1) | ||
798 | * bignum n " | ||
799 | * bignum d " | ||
800 | * bignum iqmp " | ||
801 | * bignum p " | ||
802 | * bignum q " | ||
803 | */ | ||
804 | buffer_init(&m); | ||
805 | buffer_put_cstring(&m, buffer_ptr(conf)); | ||
806 | |||
807 | if (sensitive_data.server_key != NULL && | ||
808 | sensitive_data.server_key->type == KEY_RSA1) { | ||
809 | buffer_put_int(&m, 1); | ||
810 | buffer_put_bignum(&m, sensitive_data.server_key->rsa->e); | ||
811 | buffer_put_bignum(&m, sensitive_data.server_key->rsa->n); | ||
812 | buffer_put_bignum(&m, sensitive_data.server_key->rsa->d); | ||
813 | buffer_put_bignum(&m, sensitive_data.server_key->rsa->iqmp); | ||
814 | buffer_put_bignum(&m, sensitive_data.server_key->rsa->p); | ||
815 | buffer_put_bignum(&m, sensitive_data.server_key->rsa->q); | ||
816 | } else | ||
817 | buffer_put_int(&m, 0); | ||
818 | |||
819 | if (ssh_msg_send(fd, 0, &m) == -1) | ||
820 | fatal("%s: ssh_msg_send failed", __func__); | ||
821 | |||
822 | buffer_free(&m); | ||
823 | |||
824 | debug3("%s: done", __func__); | ||
825 | } | ||
826 | |||
827 | static void | ||
828 | recv_rexec_state(int fd, Buffer *conf) | ||
829 | { | ||
830 | Buffer m; | ||
831 | char *cp; | ||
832 | u_int len; | ||
833 | |||
834 | debug3("%s: entering fd = %d", __func__, fd); | ||
835 | |||
836 | buffer_init(&m); | ||
837 | |||
838 | if (ssh_msg_recv(fd, &m) == -1) | ||
839 | fatal("%s: ssh_msg_recv failed", __func__); | ||
840 | if (buffer_get_char(&m) != 0) | ||
841 | fatal("%s: rexec version mismatch", __func__); | ||
842 | |||
843 | cp = buffer_get_string(&m, &len); | ||
844 | if (conf != NULL) | ||
845 | buffer_append(conf, cp, len + 1); | ||
846 | xfree(cp); | ||
847 | |||
848 | if (buffer_get_int(&m)) { | ||
849 | if (sensitive_data.server_key != NULL) | ||
850 | key_free(sensitive_data.server_key); | ||
851 | sensitive_data.server_key = key_new_private(KEY_RSA1); | ||
852 | buffer_get_bignum(&m, sensitive_data.server_key->rsa->e); | ||
853 | buffer_get_bignum(&m, sensitive_data.server_key->rsa->n); | ||
854 | buffer_get_bignum(&m, sensitive_data.server_key->rsa->d); | ||
855 | buffer_get_bignum(&m, sensitive_data.server_key->rsa->iqmp); | ||
856 | buffer_get_bignum(&m, sensitive_data.server_key->rsa->p); | ||
857 | buffer_get_bignum(&m, sensitive_data.server_key->rsa->q); | ||
858 | rsa_generate_additional_parameters( | ||
859 | sensitive_data.server_key->rsa); | ||
860 | } | ||
861 | buffer_free(&m); | ||
862 | |||
863 | debug3("%s: done", __func__); | ||
864 | } | ||
865 | |||
775 | /* | 866 | /* |
776 | * Main program for the daemon. | 867 | * Main program for the daemon. |
777 | */ | 868 | */ |
@@ -780,7 +871,8 @@ main(int ac, char **av) | |||
780 | { | 871 | { |
781 | extern char *optarg; | 872 | extern char *optarg; |
782 | extern int optind; | 873 | extern int optind; |
783 | int opt, sock_in = 0, sock_out = 0, newsock, j, i, fdsetsz, on = 1; | 874 | int opt, j, i, fdsetsz, on = 1; |
875 | int sock_in = -1, sock_out = -1, newsock = -1; | ||
784 | pid_t pid; | 876 | pid_t pid; |
785 | socklen_t fromlen; | 877 | socklen_t fromlen; |
786 | fd_set *fdset; | 878 | fd_set *fdset; |
@@ -792,11 +884,12 @@ main(int ac, char **av) | |||
792 | char ntop[NI_MAXHOST], strport[NI_MAXSERV]; | 884 | char ntop[NI_MAXHOST], strport[NI_MAXSERV]; |
793 | char *line; | 885 | char *line; |
794 | int listen_sock, maxfd; | 886 | int listen_sock, maxfd; |
795 | int startup_p[2]; | 887 | int startup_p[2], config_s[2]; |
796 | int startups = 0; | 888 | int startups = 0; |
797 | Key *key; | 889 | Key *key; |
798 | Authctxt *authctxt; | 890 | Authctxt *authctxt; |
799 | int ret, key_used = 0; | 891 | int ret, key_used = 0; |
892 | Buffer cfg; | ||
800 | 893 | ||
801 | #ifdef HAVE_SECUREWARE | 894 | #ifdef HAVE_SECUREWARE |
802 | (void)set_auth_parameters(ac, av); | 895 | (void)set_auth_parameters(ac, av); |
@@ -806,6 +899,7 @@ main(int ac, char **av) | |||
806 | 899 | ||
807 | /* Save argv. Duplicate so setproctitle emulation doesn't clobber it */ | 900 | /* Save argv. Duplicate so setproctitle emulation doesn't clobber it */ |
808 | saved_argc = ac; | 901 | saved_argc = ac; |
902 | rexec_argc = ac; | ||
809 | saved_argv = xmalloc(sizeof(*saved_argv) * (ac + 1)); | 903 | saved_argv = xmalloc(sizeof(*saved_argv) * (ac + 1)); |
810 | for (i = 0; i < ac; i++) | 904 | for (i = 0; i < ac; i++) |
811 | saved_argv[i] = xstrdup(av[i]); | 905 | saved_argv[i] = xstrdup(av[i]); |
@@ -824,7 +918,7 @@ main(int ac, char **av) | |||
824 | initialize_server_options(&options); | 918 | initialize_server_options(&options); |
825 | 919 | ||
826 | /* Parse command-line arguments. */ | 920 | /* Parse command-line arguments. */ |
827 | while ((opt = getopt(ac, av, "f:p:b:k:h:g:u:o:dDeiqtQ46")) != -1) { | 921 | while ((opt = getopt(ac, av, "f:p:b:k:h:g:u:o:dDeiqrtQR46")) != -1) { |
828 | switch (opt) { | 922 | switch (opt) { |
829 | case '4': | 923 | case '4': |
830 | IPv4or6 = AF_INET; | 924 | IPv4or6 = AF_INET; |
@@ -851,6 +945,13 @@ main(int ac, char **av) | |||
851 | case 'i': | 945 | case 'i': |
852 | inetd_flag = 1; | 946 | inetd_flag = 1; |
853 | break; | 947 | break; |
948 | case 'r': | ||
949 | rexec_flag = 0; | ||
950 | break; | ||
951 | case 'R': | ||
952 | rexeced_flag = 1; | ||
953 | inetd_flag = 1; | ||
954 | break; | ||
854 | case 'Q': | 955 | case 'Q': |
855 | /* ignored */ | 956 | /* ignored */ |
856 | break; | 957 | break; |
@@ -919,6 +1020,15 @@ main(int ac, char **av) | |||
919 | break; | 1020 | break; |
920 | } | 1021 | } |
921 | } | 1022 | } |
1023 | if (rexeced_flag || inetd_flag) | ||
1024 | rexec_flag = 0; | ||
1025 | if (rexec_flag && (av[0] == NULL || *av[0] != '/')) | ||
1026 | fatal("sshd re-exec requires execution with an absolute path"); | ||
1027 | if (rexeced_flag) | ||
1028 | closefrom(REEXEC_MIN_FREE_FD); | ||
1029 | else | ||
1030 | closefrom(REEXEC_DEVCRYPTO_RESERVED_FD); | ||
1031 | |||
922 | SSLeay_add_all_algorithms(); | 1032 | SSLeay_add_all_algorithms(); |
923 | channel_set_af(IPv4or6); | 1033 | channel_set_af(IPv4or6); |
924 | 1034 | ||
@@ -941,7 +1051,7 @@ main(int ac, char **av) | |||
941 | unsetenv("KRB5CCNAME"); | 1051 | unsetenv("KRB5CCNAME"); |
942 | #endif /* _AIX */ | 1052 | #endif /* _AIX */ |
943 | #ifdef _UNICOS | 1053 | #ifdef _UNICOS |
944 | /* Cray can define user privs drop all prives now! | 1054 | /* Cray can define user privs drop all privs now! |
945 | * Not needed on PRIV_SU systems! | 1055 | * Not needed on PRIV_SU systems! |
946 | */ | 1056 | */ |
947 | drop_cray_privs(); | 1057 | drop_cray_privs(); |
@@ -949,8 +1059,23 @@ main(int ac, char **av) | |||
949 | 1059 | ||
950 | seed_rng(); | 1060 | seed_rng(); |
951 | 1061 | ||
952 | /* Read server configuration options from the configuration file. */ | 1062 | sensitive_data.server_key = NULL; |
953 | read_server_config(&options, config_file_name); | 1063 | sensitive_data.ssh1_host_key = NULL; |
1064 | sensitive_data.have_ssh1_key = 0; | ||
1065 | sensitive_data.have_ssh2_key = 0; | ||
1066 | |||
1067 | /* Fetch our configuration */ | ||
1068 | buffer_init(&cfg); | ||
1069 | if (rexeced_flag) | ||
1070 | recv_rexec_state(REEXEC_CONFIG_PASS_FD, &cfg); | ||
1071 | else | ||
1072 | load_server_config(config_file_name, &cfg); | ||
1073 | |||
1074 | parse_server_config(&options, | ||
1075 | rexeced_flag ? "rexec" : config_file_name, &cfg); | ||
1076 | |||
1077 | if (!rexec_flag) | ||
1078 | buffer_free(&cfg); | ||
954 | 1079 | ||
955 | /* Fill in default values for those options not explicitly set. */ | 1080 | /* Fill in default values for those options not explicitly set. */ |
956 | fill_default_server_options(&options); | 1081 | fill_default_server_options(&options); |
@@ -968,10 +1093,6 @@ main(int ac, char **av) | |||
968 | sizeof(Key *)); | 1093 | sizeof(Key *)); |
969 | for (i = 0; i < options.num_host_key_files; i++) | 1094 | for (i = 0; i < options.num_host_key_files; i++) |
970 | sensitive_data.host_keys[i] = NULL; | 1095 | sensitive_data.host_keys[i] = NULL; |
971 | sensitive_data.server_key = NULL; | ||
972 | sensitive_data.ssh1_host_key = NULL; | ||
973 | sensitive_data.have_ssh1_key = 0; | ||
974 | sensitive_data.have_ssh2_key = 0; | ||
975 | 1096 | ||
976 | for (i = 0; i < options.num_host_key_files; i++) { | 1097 | for (i = 0; i < options.num_host_key_files; i++) { |
977 | key = key_load_private(options.host_key_files[i], "", NULL); | 1098 | key = key_load_private(options.host_key_files[i], "", NULL); |
@@ -1070,6 +1191,16 @@ main(int ac, char **av) | |||
1070 | if (setgroups(0, NULL) < 0) | 1191 | if (setgroups(0, NULL) < 0) |
1071 | debug("setgroups() failed: %.200s", strerror(errno)); | 1192 | debug("setgroups() failed: %.200s", strerror(errno)); |
1072 | 1193 | ||
1194 | if (rexec_flag) { | ||
1195 | rexec_argv = xmalloc(sizeof(char *) * (rexec_argc + 2)); | ||
1196 | for (i = 0; i < rexec_argc; i++) { | ||
1197 | debug("rexec_argv[%d]='%s'", i, saved_argv[i]); | ||
1198 | rexec_argv[i] = saved_argv[i]; | ||
1199 | } | ||
1200 | rexec_argv[rexec_argc] = "-R"; | ||
1201 | rexec_argv[rexec_argc + 1] = NULL; | ||
1202 | } | ||
1203 | |||
1073 | /* Initialize the log (it is reinitialized below in case we forked). */ | 1204 | /* Initialize the log (it is reinitialized below in case we forked). */ |
1074 | if (debug_flag && !inetd_flag) | 1205 | if (debug_flag && !inetd_flag) |
1075 | log_stderr = 1; | 1206 | log_stderr = 1; |
@@ -1111,19 +1242,34 @@ main(int ac, char **av) | |||
1111 | 1242 | ||
1112 | /* Start listening for a socket, unless started from inetd. */ | 1243 | /* Start listening for a socket, unless started from inetd. */ |
1113 | if (inetd_flag) { | 1244 | if (inetd_flag) { |
1114 | int s1; | 1245 | int fd; |
1115 | s1 = dup(0); /* Make sure descriptors 0, 1, and 2 are in use. */ | 1246 | |
1116 | dup(s1); | ||
1117 | sock_in = dup(0); | ||
1118 | sock_out = dup(1); | ||
1119 | startup_pipe = -1; | 1247 | startup_pipe = -1; |
1248 | if (rexeced_flag) { | ||
1249 | close(REEXEC_CONFIG_PASS_FD); | ||
1250 | sock_in = sock_out = dup(STDIN_FILENO); | ||
1251 | if (!debug_flag) { | ||
1252 | startup_pipe = dup(REEXEC_STARTUP_PIPE_FD); | ||
1253 | close(REEXEC_STARTUP_PIPE_FD); | ||
1254 | } | ||
1255 | } else { | ||
1256 | sock_in = dup(STDIN_FILENO); | ||
1257 | sock_out = dup(STDOUT_FILENO); | ||
1258 | } | ||
1120 | /* | 1259 | /* |
1121 | * We intentionally do not close the descriptors 0, 1, and 2 | 1260 | * We intentionally do not close the descriptors 0, 1, and 2 |
1122 | * as our code for setting the descriptors won\'t work if | 1261 | * as our code for setting the descriptors won't work if |
1123 | * ttyfd happens to be one of those. | 1262 | * ttyfd happens to be one of those. |
1124 | */ | 1263 | */ |
1264 | if ((fd = open(_PATH_DEVNULL, O_RDWR, 0)) != -1) { | ||
1265 | dup2(fd, STDIN_FILENO); | ||
1266 | dup2(fd, STDOUT_FILENO); | ||
1267 | if (fd > STDOUT_FILENO) | ||
1268 | close(fd); | ||
1269 | } | ||
1125 | debug("inetd sockets after dupping: %d, %d", sock_in, sock_out); | 1270 | debug("inetd sockets after dupping: %d, %d", sock_in, sock_out); |
1126 | if (options.protocol & SSH_PROTO_1) | 1271 | if ((options.protocol & SSH_PROTO_1) && |
1272 | sensitive_data.server_key == NULL) | ||
1127 | generate_ephemeral_server_key(); | 1273 | generate_ephemeral_server_key(); |
1128 | } else { | 1274 | } else { |
1129 | for (ai = options.listen_addrs; ai; ai = ai->ai_next) { | 1275 | for (ai = options.listen_addrs; ai; ai = ai->ai_next) { |
@@ -1146,8 +1292,7 @@ main(int ac, char **av) | |||
1146 | verbose("socket: %.100s", strerror(errno)); | 1292 | verbose("socket: %.100s", strerror(errno)); |
1147 | continue; | 1293 | continue; |
1148 | } | 1294 | } |
1149 | if (fcntl(listen_sock, F_SETFL, O_NONBLOCK) < 0) { | 1295 | if (set_nonblock(listen_sock) == -1) { |
1150 | error("listen_sock O_NONBLOCK: %s", strerror(errno)); | ||
1151 | close(listen_sock); | 1296 | close(listen_sock); |
1152 | continue; | 1297 | continue; |
1153 | } | 1298 | } |
@@ -1290,8 +1435,7 @@ main(int ac, char **av) | |||
1290 | error("accept: %.100s", strerror(errno)); | 1435 | error("accept: %.100s", strerror(errno)); |
1291 | continue; | 1436 | continue; |
1292 | } | 1437 | } |
1293 | if (fcntl(newsock, F_SETFL, 0) < 0) { | 1438 | if (unset_nonblock(newsock) == -1) { |
1294 | error("newsock del O_NONBLOCK: %s", strerror(errno)); | ||
1295 | close(newsock); | 1439 | close(newsock); |
1296 | continue; | 1440 | continue; |
1297 | } | 1441 | } |
@@ -1305,6 +1449,16 @@ main(int ac, char **av) | |||
1305 | continue; | 1449 | continue; |
1306 | } | 1450 | } |
1307 | 1451 | ||
1452 | if (rexec_flag && socketpair(AF_UNIX, | ||
1453 | SOCK_STREAM, 0, config_s) == -1) { | ||
1454 | error("reexec socketpair: %s", | ||
1455 | strerror(errno)); | ||
1456 | close(newsock); | ||
1457 | close(startup_p[0]); | ||
1458 | close(startup_p[1]); | ||
1459 | continue; | ||
1460 | } | ||
1461 | |||
1308 | for (j = 0; j < options.max_startups; j++) | 1462 | for (j = 0; j < options.max_startups; j++) |
1309 | if (startup_pipes[j] == -1) { | 1463 | if (startup_pipes[j] == -1) { |
1310 | startup_pipes[j] = startup_p[0]; | 1464 | startup_pipes[j] = startup_p[0]; |
@@ -1328,8 +1482,15 @@ main(int ac, char **av) | |||
1328 | close_listen_socks(); | 1482 | close_listen_socks(); |
1329 | sock_in = newsock; | 1483 | sock_in = newsock; |
1330 | sock_out = newsock; | 1484 | sock_out = newsock; |
1485 | close(startup_p[0]); | ||
1486 | close(startup_p[1]); | ||
1331 | startup_pipe = -1; | 1487 | startup_pipe = -1; |
1332 | pid = getpid(); | 1488 | pid = getpid(); |
1489 | if (rexec_flag) { | ||
1490 | send_rexec_state(config_s[0], | ||
1491 | &cfg); | ||
1492 | close(config_s[0]); | ||
1493 | } | ||
1333 | break; | 1494 | break; |
1334 | } else { | 1495 | } else { |
1335 | /* | 1496 | /* |
@@ -1351,6 +1512,7 @@ main(int ac, char **av) | |||
1351 | sock_in = newsock; | 1512 | sock_in = newsock; |
1352 | sock_out = newsock; | 1513 | sock_out = newsock; |
1353 | log_init(__progname, options.log_level, options.log_facility, log_stderr); | 1514 | log_init(__progname, options.log_level, options.log_facility, log_stderr); |
1515 | close(config_s[0]); | ||
1354 | break; | 1516 | break; |
1355 | } | 1517 | } |
1356 | } | 1518 | } |
@@ -1363,6 +1525,12 @@ main(int ac, char **av) | |||
1363 | 1525 | ||
1364 | close(startup_p[1]); | 1526 | close(startup_p[1]); |
1365 | 1527 | ||
1528 | if (rexec_flag) { | ||
1529 | send_rexec_state(config_s[0], &cfg); | ||
1530 | close(config_s[0]); | ||
1531 | close(config_s[1]); | ||
1532 | } | ||
1533 | |||
1366 | /* Mark that the key has been used (it was "given" to the child). */ | 1534 | /* Mark that the key has been used (it was "given" to the child). */ |
1367 | if ((options.protocol & SSH_PROTO_1) && | 1535 | if ((options.protocol & SSH_PROTO_1) && |
1368 | key_used == 0) { | 1536 | key_used == 0) { |
@@ -1401,6 +1569,46 @@ main(int ac, char **av) | |||
1401 | error("setsid: %.100s", strerror(errno)); | 1569 | error("setsid: %.100s", strerror(errno)); |
1402 | #endif | 1570 | #endif |
1403 | 1571 | ||
1572 | if (rexec_flag) { | ||
1573 | int fd; | ||
1574 | |||
1575 | debug("rexec start in %d out %d newsock %d pipe %d sock %d", | ||
1576 | sock_in, sock_out, newsock, startup_pipe, config_s[0]); | ||
1577 | dup2(newsock, STDIN_FILENO); | ||
1578 | dup2(STDIN_FILENO, STDOUT_FILENO); | ||
1579 | if (startup_pipe == -1) | ||
1580 | close(REEXEC_STARTUP_PIPE_FD); | ||
1581 | else | ||
1582 | dup2(startup_pipe, REEXEC_STARTUP_PIPE_FD); | ||
1583 | |||
1584 | dup2(config_s[1], REEXEC_CONFIG_PASS_FD); | ||
1585 | close(config_s[1]); | ||
1586 | if (startup_pipe != -1) | ||
1587 | close(startup_pipe); | ||
1588 | |||
1589 | execv(rexec_argv[0], rexec_argv); | ||
1590 | |||
1591 | /* Reexec has failed, fall back and continue */ | ||
1592 | error("rexec of %s failed: %s", rexec_argv[0], strerror(errno)); | ||
1593 | recv_rexec_state(REEXEC_CONFIG_PASS_FD, NULL); | ||
1594 | log_init(__progname, options.log_level, | ||
1595 | options.log_facility, log_stderr); | ||
1596 | |||
1597 | /* Clean up fds */ | ||
1598 | startup_pipe = REEXEC_STARTUP_PIPE_FD; | ||
1599 | close(config_s[1]); | ||
1600 | close(REEXEC_CONFIG_PASS_FD); | ||
1601 | newsock = sock_out = sock_in = dup(STDIN_FILENO); | ||
1602 | if ((fd = open(_PATH_DEVNULL, O_RDWR, 0)) != -1) { | ||
1603 | dup2(fd, STDIN_FILENO); | ||
1604 | dup2(fd, STDOUT_FILENO); | ||
1605 | if (fd > STDERR_FILENO) | ||
1606 | close(fd); | ||
1607 | } | ||
1608 | debug("rexec cleanup in %d out %d newsock %d pipe %d sock %d", | ||
1609 | sock_in, sock_out, newsock, startup_pipe, config_s[0]); | ||
1610 | } | ||
1611 | |||
1404 | /* | 1612 | /* |
1405 | * Disable the key regeneration alarm. We will not regenerate the | 1613 | * Disable the key regeneration alarm. We will not regenerate the |
1406 | * key since we are no longer in a position to give it to anyone. We | 1614 | * key since we are no longer in a position to give it to anyone. We |
@@ -1431,7 +1639,7 @@ main(int ac, char **av) | |||
1431 | 1639 | ||
1432 | #ifdef LIBWRAP | 1640 | #ifdef LIBWRAP |
1433 | /* Check whether logins are denied from this host. */ | 1641 | /* Check whether logins are denied from this host. */ |
1434 | { | 1642 | if (packet_connection_is_on_socket()) { |
1435 | struct request_info req; | 1643 | struct request_info req; |
1436 | 1644 | ||
1437 | request_init(&req, RQ_DAEMON, __progname, RQ_FILE, sock_in, 0); | 1645 | request_init(&req, RQ_DAEMON, __progname, RQ_FILE, sock_in, 0); |
@@ -1479,6 +1687,9 @@ main(int ac, char **av) | |||
1479 | if (privsep_preauth(authctxt) == 1) | 1687 | if (privsep_preauth(authctxt) == 1) |
1480 | goto authenticated; | 1688 | goto authenticated; |
1481 | 1689 | ||
1690 | /* prepare buffer to collect messages to display to user after login */ | ||
1691 | buffer_init(&loginmsg); | ||
1692 | |||
1482 | /* perform the key exchange */ | 1693 | /* perform the key exchange */ |
1483 | /* authenticate user and start session */ | 1694 | /* authenticate user and start session */ |
1484 | if (compat20) { | 1695 | if (compat20) { |
@@ -1694,9 +1905,10 @@ do_ssh1_kex(void) | |||
1694 | BN_bn2bin(session_key_int, | 1905 | BN_bn2bin(session_key_int, |
1695 | session_key + sizeof(session_key) - len); | 1906 | session_key + sizeof(session_key) - len); |
1696 | 1907 | ||
1697 | compute_session_id(session_id, cookie, | 1908 | derive_ssh1_session_id( |
1698 | sensitive_data.ssh1_host_key->rsa->n, | 1909 | sensitive_data.ssh1_host_key->rsa->n, |
1699 | sensitive_data.server_key->rsa->n); | 1910 | sensitive_data.server_key->rsa->n, |
1911 | cookie, session_id); | ||
1700 | /* | 1912 | /* |
1701 | * Xor the first 16 bytes of the session key with the | 1913 | * Xor the first 16 bytes of the session key with the |
1702 | * session id. | 1914 | * session id. |
@@ -1779,6 +1991,7 @@ do_ssh2_kex(void) | |||
1779 | /* start key exchange */ | 1991 | /* start key exchange */ |
1780 | kex = kex_setup(myproposal); | 1992 | kex = kex_setup(myproposal); |
1781 | kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server; | 1993 | kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server; |
1994 | kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server; | ||
1782 | kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; | 1995 | kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; |
1783 | kex->server = 1; | 1996 | kex->server = 1; |
1784 | kex->client_version_string=client_version_string; | 1997 | kex->client_version_string=client_version_string; |
diff --git a/sshd_config b/sshd_config index b45c8c561..65e6f1c32 100644 --- a/sshd_config +++ b/sshd_config | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: sshd_config,v 1.68 2003/12/29 16:39:50 millert Exp $ | 1 | # $OpenBSD: sshd_config,v 1.69 2004/05/23 23:59:53 dtucker Exp $ |
2 | 2 | ||
3 | # This is the sshd server system-wide configuration file. See | 3 | # This is the sshd server system-wide configuration file. See |
4 | # sshd_config(5) for more information. | 4 | # sshd_config(5) for more information. |
@@ -35,6 +35,7 @@ | |||
35 | #LoginGraceTime 2m | 35 | #LoginGraceTime 2m |
36 | #PermitRootLogin yes | 36 | #PermitRootLogin yes |
37 | #StrictModes yes | 37 | #StrictModes yes |
38 | #MaxAuthTries 6 | ||
38 | 39 | ||
39 | #RSAAuthentication yes | 40 | #RSAAuthentication yes |
40 | #PubkeyAuthentication yes | 41 | #PubkeyAuthentication yes |
@@ -67,9 +68,14 @@ | |||
67 | #GSSAPIAuthentication no | 68 | #GSSAPIAuthentication no |
68 | #GSSAPICleanupCredentials yes | 69 | #GSSAPICleanupCredentials yes |
69 | 70 | ||
70 | # Set this to 'yes' to enable PAM authentication (via challenge-response) | 71 | # Set this to 'yes' to enable PAM authentication, account processing, |
71 | # and session processing. Depending on your PAM configuration, this may | 72 | # and session processing. If this is enabled, PAM authentication will |
72 | # bypass the setting of 'PasswordAuthentication' and 'PermitEmptyPasswords' | 73 | # be allowed through the ChallengeResponseAuthentication mechanism. |
74 | # Depending on your PAM configuration, this may bypass the setting of | ||
75 | # PasswordAuthentication, PermitEmptyPasswords, and | ||
76 | # "PermitRootLogin without-password". If you just want the PAM account and | ||
77 | # session checks to run without PAM authentication, then enable this but set | ||
78 | # ChallengeResponseAuthentication=no | ||
73 | #UsePAM no | 79 | #UsePAM no |
74 | 80 | ||
75 | #AllowTcpForwarding yes | 81 | #AllowTcpForwarding yes |
diff --git a/sshd_config.0 b/sshd_config.0 index 8a922666e..0528a8c44 100644 --- a/sshd_config.0 +++ b/sshd_config.0 | |||
@@ -15,6 +15,19 @@ DESCRIPTION | |||
15 | The possible keywords and their meanings are as follows (note that key- | 15 | The possible keywords and their meanings are as follows (note that key- |
16 | words are case-insensitive and arguments are case-sensitive): | 16 | words are case-insensitive and arguments are case-sensitive): |
17 | 17 | ||
18 | AcceptEnv | ||
19 | Specifies what environment variables sent by the client will be | ||
20 | copied into the session's environ(7). See SendEnv in | ||
21 | ssh_config(5) for how to configure the client. Note that envi- | ||
22 | ronment passing is only supported for protocol 2. Variables are | ||
23 | specified by name, which may contain the wildcard characters `*' | ||
24 | and `?'. Multiple environment variables may be separated by | ||
25 | whitespace or spread across multiple AcceptEnv directives. Be | ||
26 | warned that some environment variables could be used to bypass | ||
27 | restricted user environments. For this reason, care should be | ||
28 | taken in the use of this directive. The default is not to accept | ||
29 | any environment variables. | ||
30 | |||
18 | AllowGroups | 31 | AllowGroups |
19 | This keyword can be followed by a list of group name patterns, | 32 | This keyword can be followed by a list of group name patterns, |
20 | separated by spaces. If specified, login is allowed only for | 33 | separated by spaces. If specified, login is allowed only for |
@@ -63,7 +76,10 @@ DESCRIPTION | |||
63 | 76 | ||
64 | Ciphers | 77 | Ciphers |
65 | Specifies the ciphers allowed for protocol version 2. Multiple | 78 | Specifies the ciphers allowed for protocol version 2. Multiple |
66 | ciphers must be comma-separated. The default is | 79 | ciphers must be comma-separated. The supported ciphers are |
80 | ``3des-cbc'', ``aes128-cbc'', ``aes192-cbc'', ``aes256-cbc'', | ||
81 | ``aes128-ctr'', ``aes192-ctr'', ``aes256-ctr'', ``arcfour'', | ||
82 | ``blowfish-cbc'', and ``cast128-cbc''. The default is | ||
67 | 83 | ||
68 | ``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour, | 84 | ``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour, |
69 | aes192-cbc,aes256-cbc,aes128-ctr,aes192-ctr,aes256-ctr'' | 85 | aes192-cbc,aes256-cbc,aes128-ctr,aes192-ctr,aes256-ctr'' |
@@ -224,6 +240,11 @@ DESCRIPTION | |||
224 | ed. The default is ``hmac-md5,hmac-sha1,hmac-ripemd160,hmac- | 240 | ed. The default is ``hmac-md5,hmac-sha1,hmac-ripemd160,hmac- |
225 | sha1-96,hmac-md5-96''. | 241 | sha1-96,hmac-md5-96''. |
226 | 242 | ||
243 | MaxAuthTries | ||
244 | Specifies the maximum number of authentication attempts permitted | ||
245 | per connection. Once the number of failures reaches half this | ||
246 | value, additional failures are logged. The default is 6. | ||
247 | |||
227 | MaxStartups | 248 | MaxStartups |
228 | Specifies the maximum number of concurrent unauthenticated con- | 249 | Specifies the maximum number of concurrent unauthenticated con- |
229 | nections to the sshd daemon. Additional connections will be | 250 | nections to the sshd daemon. Additional connections will be |
@@ -367,10 +388,17 @@ DESCRIPTION | |||
367 | know how to handle xauth(1) cookies. If UsePrivilegeSeparation | 388 | know how to handle xauth(1) cookies. If UsePrivilegeSeparation |
368 | is specified, it will be disabled after authentication. | 389 | is specified, it will be disabled after authentication. |
369 | 390 | ||
370 | UsePAM Enables PAM authentication (via challenge-response) and session | 391 | UsePAM Enables the Pluggable Authentication Module interface. If set to |
371 | set up. If you enable this, you should probably disable | 392 | ``yes'' this will enable PAM authentication using |
372 | PasswordAuthentication. If you enable then you will not be able | 393 | ChallengeResponseAuthentication and PAM account and session mod- |
373 | to run sshd as a non-root user. The default is ``no''. | 394 | ule processing for all authentication types. |
395 | |||
396 | Because PAM challenge-response authentication usually serves an | ||
397 | equivalent role to password authentication, you should disable | ||
398 | either PasswordAuthentication or ChallengeResponseAuthentication. | ||
399 | |||
400 | If UsePAM is enabled, you will not be able to run sshd(8) as a | ||
401 | non-root user. The default is ``no''. | ||
374 | 402 | ||
375 | UsePrivilegeSeparation | 403 | UsePrivilegeSeparation |
376 | Specifies whether sshd separates privileges by creating an un- | 404 | Specifies whether sshd separates privileges by creating an un- |
@@ -463,4 +491,4 @@ AUTHORS | |||
463 | versions 1.5 and 2.0. Niels Provos and Markus Friedl contributed support | 491 | versions 1.5 and 2.0. Niels Provos and Markus Friedl contributed support |
464 | for privilege separation. | 492 | for privilege separation. |
465 | 493 | ||
466 | OpenBSD 3.5 September 25, 1999 8 | 494 | OpenBSD 3.6 September 25, 1999 8 |
diff --git a/sshd_config.5 b/sshd_config.5 index e15a225f2..09532fb8d 100644 --- a/sshd_config.5 +++ b/sshd_config.5 | |||
@@ -34,7 +34,7 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: sshd_config.5,v 1.29 2004/03/08 10:18:57 dtucker Exp $ | 37 | .\" $OpenBSD: sshd_config.5,v 1.35 2004/06/26 09:14:40 jmc Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSHD_CONFIG 5 | 39 | .Dt SSHD_CONFIG 5 |
40 | .Os | 40 | .Os |
@@ -61,6 +61,28 @@ The possible | |||
61 | keywords and their meanings are as follows (note that | 61 | keywords and their meanings are as follows (note that |
62 | keywords are case-insensitive and arguments are case-sensitive): | 62 | keywords are case-insensitive and arguments are case-sensitive): |
63 | .Bl -tag -width Ds | 63 | .Bl -tag -width Ds |
64 | .It Cm AcceptEnv | ||
65 | Specifies what environment variables sent by the client will be copied into | ||
66 | the session's | ||
67 | .Xr environ 7 . | ||
68 | See | ||
69 | .Cm SendEnv | ||
70 | in | ||
71 | .Xr ssh_config 5 | ||
72 | for how to configure the client. | ||
73 | Note that environment passing is only supported for protocol 2. | ||
74 | Variables are specified by name, which may contain the wildcard characters | ||
75 | .Ql \&* | ||
76 | and | ||
77 | .Ql \&? . | ||
78 | Multiple environment variables may be separated by whitespace or spread | ||
79 | across multiple | ||
80 | .Cm AcceptEnv | ||
81 | directives. | ||
82 | Be warned that some environment variables could be used to bypass restricted | ||
83 | user environments. | ||
84 | For this reason, care should be taken in the use of this directive. | ||
85 | The default is not to accept any environment variables. | ||
64 | .It Cm AllowGroups | 86 | .It Cm AllowGroups |
65 | This keyword can be followed by a list of group name patterns, separated | 87 | This keyword can be followed by a list of group name patterns, separated |
66 | by spaces. | 88 | by spaces. |
@@ -73,7 +95,6 @@ can be used as | |||
73 | wildcards in the patterns. | 95 | wildcards in the patterns. |
74 | Only group names are valid; a numerical group ID is not recognized. | 96 | Only group names are valid; a numerical group ID is not recognized. |
75 | By default, login is allowed for all groups. | 97 | By default, login is allowed for all groups. |
76 | .Pp | ||
77 | .It Cm AllowTcpForwarding | 98 | .It Cm AllowTcpForwarding |
78 | Specifies whether TCP forwarding is permitted. | 99 | Specifies whether TCP forwarding is permitted. |
79 | The default is | 100 | The default is |
@@ -81,7 +102,6 @@ The default is | |||
81 | Note that disabling TCP forwarding does not improve security unless | 102 | Note that disabling TCP forwarding does not improve security unless |
82 | users are also denied shell access, as they can always install their | 103 | users are also denied shell access, as they can always install their |
83 | own forwarders. | 104 | own forwarders. |
84 | .Pp | ||
85 | .It Cm AllowUsers | 105 | .It Cm AllowUsers |
86 | This keyword can be followed by a list of user name patterns, separated | 106 | This keyword can be followed by a list of user name patterns, separated |
87 | by spaces. | 107 | by spaces. |
@@ -97,7 +117,6 @@ By default, login is allowed for all users. | |||
97 | If the pattern takes the form USER@HOST then USER and HOST | 117 | If the pattern takes the form USER@HOST then USER and HOST |
98 | are separately checked, restricting logins to particular | 118 | are separately checked, restricting logins to particular |
99 | users from particular hosts. | 119 | users from particular hosts. |
100 | .Pp | ||
101 | .It Cm AuthorizedKeysFile | 120 | .It Cm AuthorizedKeysFile |
102 | Specifies the file that contains the public keys that can be used | 121 | Specifies the file that contains the public keys that can be used |
103 | for user authentication. | 122 | for user authentication. |
@@ -120,7 +139,6 @@ The contents of the specified file are sent to the remote user before | |||
120 | authentication is allowed. | 139 | authentication is allowed. |
121 | This option is only available for protocol version 2. | 140 | This option is only available for protocol version 2. |
122 | By default, no banner is displayed. | 141 | By default, no banner is displayed. |
123 | .Pp | ||
124 | .It Cm ChallengeResponseAuthentication | 142 | .It Cm ChallengeResponseAuthentication |
125 | Specifies whether challenge response authentication is allowed. | 143 | Specifies whether challenge response authentication is allowed. |
126 | All authentication styles from | 144 | All authentication styles from |
@@ -131,8 +149,19 @@ The default is | |||
131 | .It Cm Ciphers | 149 | .It Cm Ciphers |
132 | Specifies the ciphers allowed for protocol version 2. | 150 | Specifies the ciphers allowed for protocol version 2. |
133 | Multiple ciphers must be comma-separated. | 151 | Multiple ciphers must be comma-separated. |
152 | The supported ciphers are | ||
153 | .Dq 3des-cbc , | ||
154 | .Dq aes128-cbc , | ||
155 | .Dq aes192-cbc , | ||
156 | .Dq aes256-cbc , | ||
157 | .Dq aes128-ctr , | ||
158 | .Dq aes192-ctr , | ||
159 | .Dq aes256-ctr , | ||
160 | .Dq arcfour , | ||
161 | .Dq blowfish-cbc , | ||
162 | and | ||
163 | .Dq cast128-cbc . | ||
134 | The default is | 164 | The default is |
135 | .Pp | ||
136 | .Bd -literal | 165 | .Bd -literal |
137 | ``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour, | 166 | ``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour, |
138 | aes192-cbc,aes256-cbc,aes128-ctr,aes192-ctr,aes256-ctr'' | 167 | aes192-cbc,aes256-cbc,aes128-ctr,aes192-ctr,aes256-ctr'' |
@@ -193,7 +222,6 @@ can be used as | |||
193 | wildcards in the patterns. | 222 | wildcards in the patterns. |
194 | Only group names are valid; a numerical group ID is not recognized. | 223 | Only group names are valid; a numerical group ID is not recognized. |
195 | By default, login is allowed for all groups. | 224 | By default, login is allowed for all groups. |
196 | .Pp | ||
197 | .It Cm DenyUsers | 225 | .It Cm DenyUsers |
198 | This keyword can be followed by a list of user name patterns, separated | 226 | This keyword can be followed by a list of user name patterns, separated |
199 | by spaces. | 227 | by spaces. |
@@ -386,6 +414,12 @@ for data integrity protection. | |||
386 | Multiple algorithms must be comma-separated. | 414 | Multiple algorithms must be comma-separated. |
387 | The default is | 415 | The default is |
388 | .Dq hmac-md5,hmac-sha1,hmac-ripemd160,hmac-sha1-96,hmac-md5-96 . | 416 | .Dq hmac-md5,hmac-sha1,hmac-ripemd160,hmac-sha1-96,hmac-md5-96 . |
417 | .It Cm MaxAuthTries | ||
418 | Specifies the maximum number of authentication attempts permitted per | ||
419 | connection. | ||
420 | Once the number of failures reaches half this value, | ||
421 | additional failures are logged. | ||
422 | The default is 6. | ||
389 | .It Cm MaxStartups | 423 | .It Cm MaxStartups |
390 | Specifies the maximum number of concurrent unauthenticated connections to the | 424 | Specifies the maximum number of concurrent unauthenticated connections to the |
391 | .Nm sshd | 425 | .Nm sshd |
@@ -608,12 +642,25 @@ If | |||
608 | .Cm UsePrivilegeSeparation | 642 | .Cm UsePrivilegeSeparation |
609 | is specified, it will be disabled after authentication. | 643 | is specified, it will be disabled after authentication. |
610 | .It Cm UsePAM | 644 | .It Cm UsePAM |
611 | Enables PAM authentication (via challenge-response) and session set up. | 645 | Enables the Pluggable Authentication Module interface. |
612 | If you enable this, you should probably disable | 646 | If set to |
613 | .Cm PasswordAuthentication . | 647 | .Dq yes |
614 | If you enable | 648 | this will enable PAM authentication using |
615 | .CM UsePAM | 649 | .Cm ChallengeResponseAuthentication |
616 | then you will not be able to run sshd as a non-root user. The default is | 650 | and PAM account and session module processing for all authentication types. |
651 | .Pp | ||
652 | Because PAM challenge-response authentication usually serves an equivalent | ||
653 | role to password authentication, you should disable either | ||
654 | .Cm PasswordAuthentication | ||
655 | or | ||
656 | .Cm ChallengeResponseAuthentication. | ||
657 | .Pp | ||
658 | If | ||
659 | .Cm UsePAM | ||
660 | is enabled, you will not be able to run | ||
661 | .Xr sshd 8 | ||
662 | as a non-root user. | ||
663 | The default is | ||
617 | .Dq no . | 664 | .Dq no . |
618 | .It Cm UsePrivilegeSeparation | 665 | .It Cm UsePrivilegeSeparation |
619 | Specifies whether | 666 | Specifies whether |
diff --git a/sshlogin.c b/sshlogin.c index e1cc4cc82..15eb916d1 100644 --- a/sshlogin.c +++ b/sshlogin.c | |||
@@ -39,9 +39,15 @@ | |||
39 | */ | 39 | */ |
40 | 40 | ||
41 | #include "includes.h" | 41 | #include "includes.h" |
42 | RCSID("$OpenBSD: sshlogin.c,v 1.7 2003/06/12 07:57:38 markus Exp $"); | 42 | RCSID("$OpenBSD: sshlogin.c,v 1.13 2004/08/12 09:18:24 djm Exp $"); |
43 | 43 | ||
44 | #include "loginrec.h" | 44 | #include "loginrec.h" |
45 | #include "log.h" | ||
46 | #include "buffer.h" | ||
47 | #include "servconf.h" | ||
48 | |||
49 | extern Buffer loginmsg; | ||
50 | extern ServerOptions options; | ||
45 | 51 | ||
46 | /* | 52 | /* |
47 | * Returns the time when the user last logged in. Returns 0 if the | 53 | * Returns the time when the user last logged in. Returns 0 if the |
@@ -60,16 +66,51 @@ get_last_login_time(uid_t uid, const char *logname, | |||
60 | } | 66 | } |
61 | 67 | ||
62 | /* | 68 | /* |
69 | * Generate and store last login message. This must be done before | ||
70 | * login_login() is called and lastlog is updated. | ||
71 | */ | ||
72 | static void | ||
73 | store_lastlog_message(const char *user, uid_t uid) | ||
74 | { | ||
75 | char *time_string, hostname[MAXHOSTNAMELEN] = "", buf[512]; | ||
76 | time_t last_login_time; | ||
77 | |||
78 | #ifndef NO_SSH_LASTLOG | ||
79 | if (!options.print_lastlog) | ||
80 | return; | ||
81 | |||
82 | last_login_time = get_last_login_time(uid, user, hostname, | ||
83 | sizeof(hostname)); | ||
84 | |||
85 | if (last_login_time != 0) { | ||
86 | time_string = ctime(&last_login_time); | ||
87 | if (strchr(time_string, '\n')) | ||
88 | *strchr(time_string, '\n') = '\0'; | ||
89 | if (strcmp(hostname, "") == 0) | ||
90 | snprintf(buf, sizeof(buf), "Last login: %s\r\n", | ||
91 | time_string); | ||
92 | else | ||
93 | snprintf(buf, sizeof(buf), "Last login: %s from %s\r\n", | ||
94 | time_string, hostname); | ||
95 | buffer_append(&loginmsg, buf, strlen(buf)); | ||
96 | } | ||
97 | #endif /* NO_SSH_LASTLOG */ | ||
98 | } | ||
99 | |||
100 | /* | ||
63 | * Records that the user has logged in. I wish these parts of operating | 101 | * Records that the user has logged in. I wish these parts of operating |
64 | * systems were more standardized. | 102 | * systems were more standardized. |
65 | */ | 103 | */ |
66 | void | 104 | void |
67 | record_login(pid_t pid, const char *ttyname, const char *user, uid_t uid, | 105 | record_login(pid_t pid, const char *tty, const char *user, uid_t uid, |
68 | const char *host, struct sockaddr * addr, socklen_t addrlen) | 106 | const char *host, struct sockaddr * addr, socklen_t addrlen) |
69 | { | 107 | { |
70 | struct logininfo *li; | 108 | struct logininfo *li; |
71 | 109 | ||
72 | li = login_alloc_entry(pid, user, host, ttyname); | 110 | /* save previous login details before writing new */ |
111 | store_lastlog_message(user, uid); | ||
112 | |||
113 | li = login_alloc_entry(pid, user, host, tty); | ||
73 | login_set_addr(li, addr, addrlen); | 114 | login_set_addr(li, addr, addrlen); |
74 | login_login(li); | 115 | login_login(li); |
75 | login_free_entry(li); | 116 | login_free_entry(li); |
@@ -91,11 +132,11 @@ record_utmp_only(pid_t pid, const char *ttyname, const char *user, | |||
91 | 132 | ||
92 | /* Records that the user has logged out. */ | 133 | /* Records that the user has logged out. */ |
93 | void | 134 | void |
94 | record_logout(pid_t pid, const char *ttyname, const char *user) | 135 | record_logout(pid_t pid, const char *tty, const char *user) |
95 | { | 136 | { |
96 | struct logininfo *li; | 137 | struct logininfo *li; |
97 | 138 | ||
98 | li = login_alloc_entry(pid, user, NULL, ttyname); | 139 | li = login_alloc_entry(pid, user, NULL, tty); |
99 | login_logout(li); | 140 | login_logout(li); |
100 | login_free_entry(li); | 141 | login_free_entry(li); |
101 | } | 142 | } |
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: sshpty.c,v 1.11 2004/01/11 21:55:06 deraadt Exp $"); | 15 | RCSID("$OpenBSD: sshpty.c,v 1.12 2004/06/21 17:36:31 avsm Exp $"); |
16 | 16 | ||
17 | #ifdef HAVE_UTIL_H | 17 | #ifdef HAVE_UTIL_H |
18 | # include <util.h> | 18 | # include <util.h> |
@@ -60,18 +60,18 @@ pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen) | |||
60 | /* Releases the tty. Its ownership is returned to root, and permissions to 0666. */ | 60 | /* Releases the tty. Its ownership is returned to root, and permissions to 0666. */ |
61 | 61 | ||
62 | void | 62 | void |
63 | pty_release(const char *ttyname) | 63 | pty_release(const char *tty) |
64 | { | 64 | { |
65 | if (chown(ttyname, (uid_t) 0, (gid_t) 0) < 0) | 65 | if (chown(tty, (uid_t) 0, (gid_t) 0) < 0) |
66 | error("chown %.100s 0 0 failed: %.100s", ttyname, strerror(errno)); | 66 | error("chown %.100s 0 0 failed: %.100s", tty, strerror(errno)); |
67 | if (chmod(ttyname, (mode_t) 0666) < 0) | 67 | if (chmod(tty, (mode_t) 0666) < 0) |
68 | error("chmod %.100s 0666 failed: %.100s", ttyname, strerror(errno)); | 68 | error("chmod %.100s 0666 failed: %.100s", tty, strerror(errno)); |
69 | } | 69 | } |
70 | 70 | ||
71 | /* Makes the tty the process's controlling tty and sets it to sane modes. */ | 71 | /* Makes the tty the process's controlling tty and sets it to sane modes. */ |
72 | 72 | ||
73 | void | 73 | void |
74 | pty_make_controlling_tty(int *ttyfd, const char *ttyname) | 74 | pty_make_controlling_tty(int *ttyfd, const char *tty) |
75 | { | 75 | { |
76 | int fd; | 76 | int fd; |
77 | #ifdef USE_VHANGUP | 77 | #ifdef USE_VHANGUP |
@@ -82,7 +82,7 @@ pty_make_controlling_tty(int *ttyfd, const char *ttyname) | |||
82 | if (setsid() < 0) | 82 | if (setsid() < 0) |
83 | error("setsid: %.100s", strerror(errno)); | 83 | error("setsid: %.100s", strerror(errno)); |
84 | 84 | ||
85 | fd = open(ttyname, O_RDWR|O_NOCTTY); | 85 | fd = open(tty, O_RDWR|O_NOCTTY); |
86 | if (fd != -1) { | 86 | if (fd != -1) { |
87 | signal(SIGHUP, SIG_IGN); | 87 | signal(SIGHUP, SIG_IGN); |
88 | ioctl(fd, TCVHUP, (char *)NULL); | 88 | ioctl(fd, TCVHUP, (char *)NULL); |
@@ -97,7 +97,7 @@ pty_make_controlling_tty(int *ttyfd, const char *ttyname) | |||
97 | ioctl(*ttyfd, TCSETCTTY, NULL); | 97 | ioctl(*ttyfd, TCSETCTTY, NULL); |
98 | fd = open("/dev/tty", O_RDWR); | 98 | fd = open("/dev/tty", O_RDWR); |
99 | if (fd < 0) | 99 | if (fd < 0) |
100 | error("%.100s: %.100s", ttyname, strerror(errno)); | 100 | error("%.100s: %.100s", tty, strerror(errno)); |
101 | close(*ttyfd); | 101 | close(*ttyfd); |
102 | *ttyfd = fd; | 102 | *ttyfd = fd; |
103 | #else /* _UNICOS */ | 103 | #else /* _UNICOS */ |
@@ -137,9 +137,9 @@ pty_make_controlling_tty(int *ttyfd, const char *ttyname) | |||
137 | vhangup(); | 137 | vhangup(); |
138 | signal(SIGHUP, old); | 138 | signal(SIGHUP, old); |
139 | #endif /* USE_VHANGUP */ | 139 | #endif /* USE_VHANGUP */ |
140 | fd = open(ttyname, O_RDWR); | 140 | fd = open(tty, O_RDWR); |
141 | if (fd < 0) { | 141 | if (fd < 0) { |
142 | error("%.100s: %.100s", ttyname, strerror(errno)); | 142 | error("%.100s: %.100s", tty, strerror(errno)); |
143 | } else { | 143 | } else { |
144 | #ifdef USE_VHANGUP | 144 | #ifdef USE_VHANGUP |
145 | close(*ttyfd); | 145 | close(*ttyfd); |
@@ -174,7 +174,7 @@ pty_change_window_size(int ptyfd, int row, int col, | |||
174 | } | 174 | } |
175 | 175 | ||
176 | void | 176 | void |
177 | pty_setowner(struct passwd *pw, const char *ttyname) | 177 | pty_setowner(struct passwd *pw, const char *tty) |
178 | { | 178 | { |
179 | struct group *grp; | 179 | struct group *grp; |
180 | gid_t gid; | 180 | gid_t gid; |
@@ -196,33 +196,33 @@ pty_setowner(struct passwd *pw, const char *ttyname) | |||
196 | * Warn but continue if filesystem is read-only and the uids match/ | 196 | * Warn but continue if filesystem is read-only and the uids match/ |
197 | * tty is owned by root. | 197 | * tty is owned by root. |
198 | */ | 198 | */ |
199 | if (stat(ttyname, &st)) | 199 | if (stat(tty, &st)) |
200 | fatal("stat(%.100s) failed: %.100s", ttyname, | 200 | fatal("stat(%.100s) failed: %.100s", tty, |
201 | strerror(errno)); | 201 | strerror(errno)); |
202 | 202 | ||
203 | if (st.st_uid != pw->pw_uid || st.st_gid != gid) { | 203 | if (st.st_uid != pw->pw_uid || st.st_gid != gid) { |
204 | if (chown(ttyname, pw->pw_uid, gid) < 0) { | 204 | if (chown(tty, pw->pw_uid, gid) < 0) { |
205 | if (errno == EROFS && | 205 | if (errno == EROFS && |
206 | (st.st_uid == pw->pw_uid || st.st_uid == 0)) | 206 | (st.st_uid == pw->pw_uid || st.st_uid == 0)) |
207 | debug("chown(%.100s, %u, %u) failed: %.100s", | 207 | debug("chown(%.100s, %u, %u) failed: %.100s", |
208 | ttyname, (u_int)pw->pw_uid, (u_int)gid, | 208 | tty, (u_int)pw->pw_uid, (u_int)gid, |
209 | strerror(errno)); | 209 | strerror(errno)); |
210 | else | 210 | else |
211 | fatal("chown(%.100s, %u, %u) failed: %.100s", | 211 | fatal("chown(%.100s, %u, %u) failed: %.100s", |
212 | ttyname, (u_int)pw->pw_uid, (u_int)gid, | 212 | tty, (u_int)pw->pw_uid, (u_int)gid, |
213 | strerror(errno)); | 213 | strerror(errno)); |
214 | } | 214 | } |
215 | } | 215 | } |
216 | 216 | ||
217 | if ((st.st_mode & (S_IRWXU|S_IRWXG|S_IRWXO)) != mode) { | 217 | if ((st.st_mode & (S_IRWXU|S_IRWXG|S_IRWXO)) != mode) { |
218 | if (chmod(ttyname, mode) < 0) { | 218 | if (chmod(tty, mode) < 0) { |
219 | if (errno == EROFS && | 219 | if (errno == EROFS && |
220 | (st.st_mode & (S_IRGRP | S_IROTH)) == 0) | 220 | (st.st_mode & (S_IRGRP | S_IROTH)) == 0) |
221 | debug("chmod(%.100s, 0%o) failed: %.100s", | 221 | debug("chmod(%.100s, 0%o) failed: %.100s", |
222 | ttyname, (u_int)mode, strerror(errno)); | 222 | tty, (u_int)mode, strerror(errno)); |
223 | else | 223 | else |
224 | fatal("chmod(%.100s, 0%o) failed: %.100s", | 224 | fatal("chmod(%.100s, 0%o) failed: %.100s", |
225 | ttyname, (u_int)mode, strerror(errno)); | 225 | tty, (u_int)mode, strerror(errno)); |
226 | } | 226 | } |
227 | } | 227 | } |
228 | } | 228 | } |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshpty.h,v 1.4 2002/03/04 17:27:39 stevesk Exp $ */ | 1 | /* $OpenBSD: sshpty.h,v 1.5 2004/05/08 00:01:37 deraadt Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -17,6 +17,10 @@ | |||
17 | #ifndef SSHPTY_H | 17 | #ifndef SSHPTY_H |
18 | #define SSHPTY_H | 18 | #define SSHPTY_H |
19 | 19 | ||
20 | struct termios get_saved_tio(void); | ||
21 | void leave_raw_mode(void); | ||
22 | void enter_raw_mode(void); | ||
23 | |||
20 | int pty_allocate(int *, int *, char *, int); | 24 | int pty_allocate(int *, int *, char *, int); |
21 | void pty_release(const char *); | 25 | void pty_release(const char *); |
22 | void pty_make_controlling_tty(int *, const char *); | 26 | void pty_make_controlling_tty(int *, const char *); |
@@ -35,9 +35,9 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: sshtty.c,v 1.5 2003/09/19 17:43:35 markus Exp $"); | 38 | RCSID("$OpenBSD: sshtty.c,v 1.6 2004/05/08 00:01:37 deraadt Exp $"); |
39 | 39 | ||
40 | #include "sshtty.h" | 40 | #include "sshpty.h" |
41 | #include "log.h" | 41 | #include "log.h" |
42 | 42 | ||
43 | static struct termios _saved_tio; | 43 | static struct termios _saved_tio; |
diff --git a/sshtty.h b/sshtty.h deleted file mode 100644 index 723b27846..000000000 --- a/sshtty.h +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | /* $OpenBSD: sshtty.h,v 1.3 2003/09/19 17:43:35 markus Exp $ */ | ||
2 | /* | ||
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | ||
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | ||
5 | * All rights reserved | ||
6 | * | ||
7 | * As far as I am concerned, the code I have written for this software | ||
8 | * can be used freely for any purpose. Any derived versions of this | ||
9 | * software must be clearly marked as such, and if the derived work is | ||
10 | * incompatible with the protocol description in the RFC file, it must be | ||
11 | * called by a name other than "ssh" or "Secure Shell". | ||
12 | */ | ||
13 | /* | ||
14 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | ||
15 | * Copyright (c) 2001 Kevin Steves. All rights reserved. | ||
16 | * | ||
17 | * Redistribution and use in source and binary forms, with or without | ||
18 | * modification, are permitted provided that the following conditions | ||
19 | * are met: | ||
20 | * 1. Redistributions of source code must retain the above copyright | ||
21 | * notice, this list of conditions and the following disclaimer. | ||
22 | * 2. Redistributions in binary form must reproduce the above copyright | ||
23 | * notice, this list of conditions and the following disclaimer in the | ||
24 | * documentation and/or other materials provided with the distribution. | ||
25 | * | ||
26 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | ||
27 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | ||
28 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | ||
29 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
30 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
31 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
32 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
33 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
34 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
35 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
36 | */ | ||
37 | |||
38 | #ifndef SSHTTY_H | ||
39 | #define SSHTTY_H | ||
40 | |||
41 | #include <termios.h> | ||
42 | |||
43 | struct termios get_saved_tio(void); | ||
44 | void leave_raw_mode(void); | ||
45 | void enter_raw_mode(void); | ||
46 | |||
47 | #endif | ||
diff --git a/stamp-h.in b/stamp-h.in deleted file mode 100644 index e69de29bb..000000000 --- a/stamp-h.in +++ /dev/null | |||
diff --git a/tildexpand.c b/tildexpand.c index cbe981146..cedb653b2 100644 --- a/tildexpand.c +++ b/tildexpand.c | |||
@@ -11,11 +11,11 @@ | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include "includes.h" | 13 | #include "includes.h" |
14 | RCSID("$OpenBSD: tildexpand.c,v 1.13 2002/06/23 03:25:50 deraadt Exp $"); | 14 | RCSID("$OpenBSD: tildexpand.c,v 1.15 2004/05/21 08:43:03 markus Exp $"); |
15 | 15 | ||
16 | #include "xmalloc.h" | 16 | #include "xmalloc.h" |
17 | #include "log.h" | 17 | #include "log.h" |
18 | #include "tildexpand.h" | 18 | #include "misc.h" |
19 | 19 | ||
20 | /* | 20 | /* |
21 | * Expands tildes in the file name. Returns data allocated by xmalloc. | 21 | * Expands tildes in the file name. Returns data allocated by xmalloc. |
diff --git a/tildexpand.h b/tildexpand.h deleted file mode 100644 index f5e7e40bc..000000000 --- a/tildexpand.h +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | /* $OpenBSD: tildexpand.h,v 1.4 2001/06/26 17:27:25 markus Exp $ */ | ||
2 | |||
3 | /* | ||
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | ||
5 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | ||
6 | * All rights reserved | ||
7 | * | ||
8 | * As far as I am concerned, the code I have written for this software | ||
9 | * can be used freely for any purpose. Any derived versions of this | ||
10 | * software must be clearly marked as such, and if the derived work is | ||
11 | * incompatible with the protocol description in the RFC file, it must be | ||
12 | * called by a name other than "ssh" or "Secure Shell". | ||
13 | */ | ||
14 | |||
15 | char *tilde_expand_filename(const char *, uid_t); | ||
diff --git a/ttymodes.h b/ttymodes.h index 7de4b8362..481282cd7 100644 --- a/ttymodes.h +++ b/ttymodes.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ttymodes.h,v 1.12 2002/03/04 17:27:39 stevesk Exp $ */ | 1 | /* $OpenBSD: ttymodes.h,v 1.13 2004/07/11 17:48:47 deraadt Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -113,17 +113,17 @@ TTYCHAR(VDISCARD, 18) | |||
113 | /* name, field, op */ | 113 | /* name, field, op */ |
114 | TTYMODE(IGNPAR, c_iflag, 30) | 114 | TTYMODE(IGNPAR, c_iflag, 30) |
115 | TTYMODE(PARMRK, c_iflag, 31) | 115 | TTYMODE(PARMRK, c_iflag, 31) |
116 | TTYMODE(INPCK, c_iflag, 32) | 116 | TTYMODE(INPCK, c_iflag, 32) |
117 | TTYMODE(ISTRIP, c_iflag, 33) | 117 | TTYMODE(ISTRIP, c_iflag, 33) |
118 | TTYMODE(INLCR, c_iflag, 34) | 118 | TTYMODE(INLCR, c_iflag, 34) |
119 | TTYMODE(IGNCR, c_iflag, 35) | 119 | TTYMODE(IGNCR, c_iflag, 35) |
120 | TTYMODE(ICRNL, c_iflag, 36) | 120 | TTYMODE(ICRNL, c_iflag, 36) |
121 | #if defined(IUCLC) | 121 | #if defined(IUCLC) |
122 | TTYMODE(IUCLC, c_iflag, 37) | 122 | TTYMODE(IUCLC, c_iflag, 37) |
123 | #endif | 123 | #endif |
124 | TTYMODE(IXON, c_iflag, 38) | 124 | TTYMODE(IXON, c_iflag, 38) |
125 | TTYMODE(IXANY, c_iflag, 39) | 125 | TTYMODE(IXANY, c_iflag, 39) |
126 | TTYMODE(IXOFF, c_iflag, 40) | 126 | TTYMODE(IXOFF, c_iflag, 40) |
127 | #ifdef IMAXBEL | 127 | #ifdef IMAXBEL |
128 | TTYMODE(IMAXBEL,c_iflag, 41) | 128 | TTYMODE(IMAXBEL,c_iflag, 41) |
129 | #endif /* IMAXBEL */ | 129 | #endif /* IMAXBEL */ |
@@ -1,5 +1,5 @@ | |||
1 | /* $OpenBSD: version.h,v 1.41 2004/03/20 10:40:59 markus Exp $ */ | 1 | /* $OpenBSD: version.h,v 1.42 2004/08/16 08:17:01 markus Exp $ */ |
2 | 2 | ||
3 | #ifndef SSH_VERSION | 3 | #ifndef SSH_VERSION |
4 | #define SSH_VERSION "OpenSSH_3.8.1p1" | 4 | #define SSH_VERSION "OpenSSH_3.9p1" |
5 | #endif /* SSH_VERSION */ | 5 | #endif /* SSH_VERSION */ |