summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog13
-rw-r--r--configure.in51
-rw-r--r--defines.h15
3 files changed, 73 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 701bf403f..ec5ddac55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
120000115
2 - Add --with-xauth-path configure directive and explicit test for
3 /usr/openwin/bin/xauth for Solaris systems. Report from Anders
4 Nordby <anders@fix.no>
5 - Fix incorrect detection of /dev/ptmx on Linux systems that lack
6 openpty. Report from John Seifarth <john@waw.be>
7 - Look for intXX_t and u_intXX_t in sys/bitypes.h if they are not in
8 sys/types.h. Fixes problems on SCO, report from Gary E. Miller
9 <gem@rellim.com>
10 - Use __snprintf and __vnsprintf if they are found where snprintf and
11 vnsprintf are lacking. Suggested by Ben Taylor <bent@shell.clark.net>
12 and others.
13
120000114 1420000114
2 - Merged OpenBSD IPv6 patch: 15 - Merged OpenBSD IPv6 patch:
3 - [sshd.c sshd.8 sshconnect.c ssh.h ssh.c servconf.h servconf.c scp.1] 16 - [sshd.c sshd.8 sshconnect.c ssh.h ssh.c servconf.h servconf.c scp.1]
diff --git a/configure.in b/configure.in
index ab175d409..06a770764 100644
--- a/configure.in
+++ b/configure.in
@@ -11,9 +11,7 @@ AC_PROG_INSTALL
11AC_CHECK_PROG(AR, ar, ar) 11AC_CHECK_PROG(AR, ar, ar)
12AC_PATH_PROG(PERL, perl) 12AC_PATH_PROG(PERL, perl)
13AC_SUBST(PERL) 13AC_SUBST(PERL)
14AC_PATH_PROG(xauth_path, xauth)
15 14
16dnl Use ip address instead of hostname in $DISPLAY
17AC_ARG_WITH(rsh, 15AC_ARG_WITH(rsh,
18 [ --with-rsh=PATH Specify path to remote shell program ], 16 [ --with-rsh=PATH Specify path to remote shell program ],
19 [ 17 [
@@ -26,6 +24,21 @@ AC_ARG_WITH(rsh,
26 ] 24 ]
27) 25)
28 26
27AC_ARG_WITH(xauth-path,
28 [ --with-xauth-path=PATH Specify path to xauth program ],
29 [
30 if test "x$withval" != "$xno" ; then
31 AC_DEFINE_UNQUOTED(XAUTH_PATH, "$withval")
32 fi
33 ],
34 [
35 AC_PATH_PROG(xauth_path, xauth)
36 if test ! -z "$xauth_path" -a -x "/usr/openwin/bin/xauth" ; then
37 xauth_path="/usr/openwin/bin/xauth"
38 fi
39 ]
40)
41
29if test ! -z "$xauth_path" ; then 42if test ! -z "$xauth_path" ; then
30 AC_DEFINE_UNQUOTED(XAUTH_PATH, "$xauth_path") 43 AC_DEFINE_UNQUOTED(XAUTH_PATH, "$xauth_path")
31fi 44fi
@@ -70,6 +83,9 @@ case "$host" in
70 no_libsocket=1 83 no_libsocket=1
71 no_libnsl=1 84 no_libnsl=1
72 ;; 85 ;;
86*-*-linux*)
87 no_dev_ptmx=1
88 ;;
73*-*-solaris*) 89*-*-solaris*)
74 AC_DEFINE(USE_UTMPX) 90 AC_DEFINE(USE_UTMPX)
75 ;; 91 ;;
@@ -125,10 +141,10 @@ if test -z "$no_libnsl" ; then
125fi 141fi
126 142
127dnl Checks for header files. 143dnl Checks for header files.
128AC_CHECK_HEADERS(bstring.h endian.h lastlog.h login.h maillock.h netdb.h netgroup.h paths.h poll.h pty.h shadow.h security/pam_appl.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/select.h sys/stropts.h sys/time.h sys/ttcompat.h util.h utmp.h utmpx.h) 144AC_CHECK_HEADERS(bstring.h endian.h lastlog.h login.h maillock.h netdb.h netgroup.h paths.h poll.h pty.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/select.h sys/stropts.h sys/time.h sys/ttcompat.h util.h utmp.h utmpx.h)
129 145
130dnl Checks for library functions. 146dnl Checks for library functions.
131AC_CHECK_FUNCS(arc4random bindresvport_af freeaddrinfo gai_strerror getaddrinfo getpagesize getnameinfo _getpty innetgr md5_crypt mkdtemp openpty rresvport_af setenv seteuid setlogin setproctitle setreuid snprintf strlcat strlcpy updwtmpx vsnprintf) 147AC_CHECK_FUNCS(arc4random bindresvport_af freeaddrinfo gai_strerror getaddrinfo getpagesize getnameinfo innetgr md5_crypt mkdtemp openpty rresvport_af setenv seteuid setlogin setproctitle setreuid snprintf strlcat strlcpy updwtmpx vsnprintf _getpty __snprintf __vsnprintf)
132 148
133AC_CHECK_FUNC(login, 149AC_CHECK_FUNC(login,
134 [AC_DEFINE(HAVE_LOGIN)], 150 [AC_DEFINE(HAVE_LOGIN)],
@@ -154,6 +170,7 @@ AC_TRY_COMPILE(
154 [ 170 [
155 AC_DEFINE(HAVE_INTXX_T) 171 AC_DEFINE(HAVE_INTXX_T)
156 AC_MSG_RESULT(yes) 172 AC_MSG_RESULT(yes)
173 have_intxx_t=1
157 ], 174 ],
158 [AC_MSG_RESULT(no)] 175 [AC_MSG_RESULT(no)]
159) 176)
@@ -165,10 +182,32 @@ AC_TRY_COMPILE(
165 [ 182 [
166 AC_DEFINE(HAVE_U_INTXX_T) 183 AC_DEFINE(HAVE_U_INTXX_T)
167 AC_MSG_RESULT(yes) 184 AC_MSG_RESULT(yes)
185 have_u_intxx_t=1
168 ], 186 ],
169 [AC_MSG_RESULT(no)] 187 [AC_MSG_RESULT(no)]
170) 188)
171 189
190if test -z "$have_u_intxx_t" -a -z "$have_intxx_t" -a \
191 "x$ac_cv_header_sys_bitypes_h" = "xyes"
192then
193 AC_MSG_CHECKING([for intXX_t and u_intXX_t types in sys/bitypes.h])
194 AC_TRY_COMPILE(
195 [#include <sys/bitypes.h>],
196 [
197 u_int16_t c; u_int32_t d;
198 int16_t e; int32_t f;
199 c = 1235; d = 1235;
200 e = 1235; f = 1235;
201 ],
202 [
203 AC_DEFINE(HAVE_U_INTXX_T)
204 AC_DEFINE(HAVE_INTXX_T)
205 AC_MSG_RESULT(yes)
206 ],
207 [AC_MSG_RESULT(no)]
208 )
209fi
210
172AC_MSG_CHECKING([for uintXX_t types]) 211AC_MSG_CHECKING([for uintXX_t types])
173AC_TRY_COMPILE( 212AC_TRY_COMPILE(
174 [#include <sys/types.h>], 213 [#include <sys/types.h>],
@@ -468,7 +507,9 @@ AC_ARG_WITH(dante,
468 ] 507 ]
469) 508)
470 509
471AC_CHECK_FILE("/dev/ptmx", AC_DEFINE_UNQUOTED(HAVE_DEV_PTMX)) 510if test ! -z "$no_dev_ptmx" ; then
511 AC_CHECK_FILE("/dev/ptmx", AC_DEFINE_UNQUOTED(HAVE_DEV_PTMX))
512fi
472AC_CHECK_FILE("/dev/ptc", AC_DEFINE_UNQUOTED(HAVE_DEV_PTS_AND_PTC)) 513AC_CHECK_FILE("/dev/ptc", AC_DEFINE_UNQUOTED(HAVE_DEV_PTS_AND_PTC))
473 514
474AC_MSG_CHECKING([whether libc defines __progname]) 515AC_MSG_CHECKING([whether libc defines __progname])
diff --git a/defines.h b/defines.h
index d2f61e269..9c88f2e85 100644
--- a/defines.h
+++ b/defines.h
@@ -3,9 +3,13 @@
3 3
4/* Necessary headers */ 4/* Necessary headers */
5 5
6#include <sys/types.h> /* For u_intXX_t */ 6#include <sys/types.h>
7#include <sys/socket.h> /* For SHUT_XXXX */ 7#include <sys/socket.h> /* For SHUT_XXXX */
8 8
9#ifdef HAVE_SYS_BITYPES_H
10# include <sys/bitypes.h> /* For u_intXX_t */
11#endif
12
9#ifdef HAVE_PATHS_H 13#ifdef HAVE_PATHS_H
10# include <paths.h> /* For _PATH_XXX */ 14# include <paths.h> /* For _PATH_XXX */
11#endif 15#endif
@@ -232,4 +236,13 @@ typedef unsigned int size_t;
232# define PAM_STRERROR(a,b) pam_strerror((a),(b)) 236# define PAM_STRERROR(a,b) pam_strerror((a),(b))
233#endif 237#endif
234 238
239/* Solaris doesn't have a public [v]snprintf() function, but it has */
240/* __[v]snprintf() */
241#if !defined(HAVE_SNPRINTF) && defined(HAVE___SNPRINTF)
242# define snprintf __snprintf
243#endif /* !defined(HAVE_SNPRINTF) && defined(HAVE___SNPRINTF) */
244#if !defined(HAVE_VSNPRINTF) && defined(HAVE___VSNPRINTF)
245# define vsnprintf __vsnprintf
246#endif /* !defined(HAVE_VSNPRINTF) && defined(HAVE___VSNPRINTF) */
247
235#endif /* _DEFINES_H */ 248#endif /* _DEFINES_H */