AC_INIT(ssh.c)
AC_CONFIG_HEADER(config.h)
+AC_PROG_CC
AC_CANONICAL_HOST
-# C Compiler features
-if test "$GCC" = "yes"; then CFLAGS="$CFLAGS -Wall"; fi
-AC_C_INLINE
-
# Checks for programs.
-AC_PROG_CC
AC_PROG_CPP
AC_PROG_RANLIB
AC_PROG_INSTALL
AC_CHECK_PROG(AR, ar, ar)
AC_PATH_PROG(PERL, perl)
AC_SUBST(PERL)
+AC_PATH_PROG(ENT, ent)
+AC_SUBST(ENT)
+
+if test -z "$LD" ; then
+ LD=$CC
+fi
+AC_SUBST(LD)
+
+# C Compiler features
+AC_C_INLINE
+if test "$GCC" = "yes"; then
+ CFLAGS="$CFLAGS -Wall"
+fi
# Check for some target-specific stuff
case "$host" in
AFS_LIBS="-lld"
CFLAGS="$CFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib"
+ if test "$LD" != "gcc" -a -z "$blibpath"; then
+ blibpath="/usr/lib:/lib:/usr/local/lib"
+ fi
+ AC_CHECK_FUNC(authenticate, [AC_DEFINE(WITH_AIXAUTHENTICATE)])
AC_DEFINE(BROKEN_GETADDRINFO)
;;
*-*-hpux10*)
MANTYPE='$(CATMAN)'
mansubdir=cat
;;
+*-*-hpux11*)
+ if test -z "$GCC"; then
+ CFLAGS="$CFLAGS -Ae"
+ fi
+ CFLAGS="$CFLAGS -D_HPUX_SOURCE"
+ CFLAGS="$CFLAGS -I/usr/local/include"
+ LDFLAGS="$LDFLAGS -L/usr/local/lib"
+ AC_DEFINE(IPADDR_IN_DISPLAY)
+ AC_DEFINE(USE_UTMPX)
+ AC_MSG_CHECKING(for HPUX trusted system password database)
+ if test -f /tcb/files/auth/system/default; then
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_HPUX_TRUSTED_SYSTEM_PW)
+ LIBS="$LIBS -lsec"
+ AC_MSG_WARN([This configuration is untested])
+ else
+ AC_MSG_RESULT(no)
+ AC_DEFINE(DISABLE_SHADOW)
+ fi
+ MANTYPE='$(CATMAN)'
+ mansubdir=cat
+ ;;
*-*-irix5*)
CFLAGS="$CFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib"
;;
*-*-solaris*)
CFLAGS="$CFLAGS -I/usr/local/include"
- LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib"
+ LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib -L/usr/ucblib -R/usr/ucblib"
need_dash_r=1
- LDFLAGS="-L/usr/ucblib -R/usr/ucblib"
AC_DEFINE(USE_UTMPX)
;;
*-*-sysv*)
fi
# Checks for header files.
-AC_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/sysmacros.h sys/time.h sys/ttcompat.h stddef.h util.h utmp.h utmpx.h)
+AC_CHECK_HEADERS(bstring.h endian.h lastlog.h login.h maillock.h netdb.h netgroup.h netinet/in_systm.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/sysmacros.h sys/time.h sys/ttcompat.h stddef.h util.h utmp.h utmpx.h)
# Checks for library functions.
-AC_CHECK_FUNCS(arc4random bindresvport_af freeaddrinfo gai_strerror getaddrinfo getnameinfo innetgr md5_crypt mkdtemp openpty rresvport_af setenv seteuid setlogin setproctitle setreuid snprintf strlcat strlcpy updwtmpx vsnprintf _getpty)
+AC_CHECK_FUNCS(arc4random b64_ntop bcopy bindresvport_af clock freeaddrinfo gai_strerror getaddrinfo getnameinfo getrusage innetgr md5_crypt memmove mkdtemp openpty rresvport_af setenv seteuid setlogin setproctitle setreuid snprintf strlcat strlcpy updwtmpx vsnprintf vhangup _getpty __b64_ntop)
AC_CHECK_FUNC(login,
[AC_DEFINE(HAVE_LOGIN)],
AC_CHECK_LIB(dl, dlopen, , )
LIBS="$LIBS -lpam"
+ AC_CHECK_FUNCS(pam_getenvlist)
+
# Check PAM strerror arguments (old PAM)
AC_MSG_CHECKING([whether pam_strerror takes only one argument])
AC_TRY_COMPILE(
[
- #include <stdlib.h>
- #include <security/pam_appl.h>
+#include <stdlib.h>
+#include <security/pam_appl.h>
],
[(void)pam_strerror((pam_handle_t *)NULL, -1);],
[AC_MSG_RESULT(no)],
)
saved_LIBS="$LIBS"
+saved_LDFLAGS="$LDFLAGS"
saved_CFLAGS="$CFLAGS"
if test "x$prefix" != "xNONE" ; then
tryssldir="$tryssldir $prefix"
fi
-AC_MSG_CHECKING([for OpenSSL/SSLeay directory])
-for ssldir in "" $tryssldir /usr /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl ; do
- if test ! -z "$ssldir" ; then
- LIBS="$saved_LIBS -L$ssldir/lib -L$ssldir -lcrypto"
- CFLAGS="$CFLAGS -I$ssldir/include"
- if test "x$need_dash_r" = "x1" ; then
- LIBS="$LIBS -R$ssldir/lib -L$ssldir"
+AC_CACHE_CHECK([for OpenSSL directory], ac_cv_openssldir, [
+
+ for ssldir in "" $tryssldir /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl ; do
+ if test ! -z "$ssldir" ; then
+ LDFLAGS="$saved_LDFLAGS -L$ssldir/lib -L$ssldir"
+ CFLAGS="$saved_CFLAGS -I$ssldir/include"
+ if test ! -z "$need_dash_r" ; then
+ LDFLAGS="$LDFLAGS -R$ssldir/lib -R$ssldir"
+ fi
+ else
+ LDFLAGS="$saved_LDFLAGS"
fi
- else
- LIBS="$saved_LIBS -lcrypto"
- fi
- for WANTS_RSAREF in "" 1 ; do
+ for WANTS_RSAREF in "" 1 ; do
- if test ! -z "$WANTS_RSAREF" ; then
- LIBS="$LIBS -lRSAglue -lrsaref"
- fi
+ if test -z "$WANTS_RSAREF" ; then
+ LIBS="$saved_LIBS -lcrypto"
+ else
+ LIBS="$saved_LIBS -lcrypto -lRSAglue -lrsaref"
+ fi
- AC_TRY_RUN(
- [
- #include <openssl/rsa.h>
- #include <openssl/bn.h>
- #include <openssl/sha.h>
- int main(void)
- {RSA *key; char seed[2048];memset(seed, 0, sizeof(seed));
- RAND_seed(seed, sizeof(seed));key=RSA_generate_key(32,3,NULL,NULL);
- return(key==NULL);}
- ],
- [
- AC_DEFINE(HAVE_OPENSSL)
- found_crypto=1
- break;
- ], []
- )
- AC_TRY_RUN(
- [
- #include <ssl/rsa.h>
- #include <ssl/bn.h>
- #include <ssl/sha.h>
- int main(void)
- {RSA *key; char seed[2048];memset(seed, 0, sizeof(seed));
- RAND_seed(seed, sizeof(seed));key=RSA_generate_key(32,3,NULL,NULL);
- return(key==NULL);}
- ],
- [
- AC_DEFINE(HAVE_SSL)
- found_crypto=1
- break;
- ], []
- )
+ AC_TRY_RUN(
+ [
+#include <string.h>
+#include <openssl/rand.h>
+#include <openssl/rsa.h>
+#include <openssl/bn.h>
+#include <openssl/sha.h>
+int main(void)
+{
+ RSA *key; char a[2048],b[2048];;
+ memset(a, 0, sizeof(a));memset(b, 0, sizeof(b));
+ RAND_add(a, sizeof(a), sizeof(a));
+ key=RSA_generate_key(32,3,NULL,NULL);
+ if (key==NULL) return(1);
+ return(-1==RSA_private_decrypt(RSA_size(key),a,b,key,RSA_NO_PADDING));
+}
+ ],
+ [
+ found_crypto=1
+ break;
+ ], []
+ )
+ done
+
+ if test ! -z "$found_crypto" ; then
+ break;
+ fi
done
- if test ! -z "$found_crypto" ; then
- break;
+ if test -z "$found_crypto" ; then
+ AC_MSG_ERROR([Could not find working SSLeay / OpenSSL libraries, please install])
+ fi
+ if test -z "$ssldir" ; then
+ ssldir="(system)"
fi
-done
-if test -z "$found_crypto" ; then
- AC_MSG_ERROR([Could not find working SSLeay / OpenSSL libraries, please install])
-fi
-if test -z "$ssldir" ; then
- ssldir="(system)"
-else
- CFLAGS="$CFLAGS -I$ssldir/include"
- LDFLAGS="$LDFLAGS -L$ssldir/lib"
- if test "x$need_dash_r" = "x1" ; then
- LDFLAGS="$LDFLAGS -R$ssldir"
+ ac_cv_openssldir=$ssldir
+])
+
+if test ! -z "$ac_cv_openssldir" -a ! "x$ac_cv_openssldir" = "x(system)" ; then
+ AC_DEFINE(HAVE_OPENSSL)
+ dnl Need to recover ssldir - test above runs in subshell
+ ssldir=$ac_cv_openssldir
+ CFLAGS="$saved_CFLAGS -I$ssldir/include"
+ LDFLAGS="$saved_LDFLAGS -L$ssldir/lib -L$ssldir"
+ if test ! -z "$need_dash_r" ; then
+ LDFLAGS="$LDFLAGS -R$ssldir/lib -R$ssldir"
+ fi
+ if test ! -z "$blibpath" ; then
+ blibpath="$blibpath:$ssldir:$ssldir/lib"
fi
fi
-LIBS="$saved_LIBS -lcrypto"
-if test ! -z "$WANTS_RSAREF" ; then
- LIBS="$LIBS -lRSAglue -lrsaref"
+if test -z "$WANTS_RSAREF" ; then
+ LIBS="$saved_LIBS -lcrypto"
+else
+ LIBS="$saved_LIBS -lcrypto -lRSAglue -lrsaref"
fi
-AC_MSG_RESULT($ssldir)
+
# Checks for data types
AC_CHECK_SIZEOF(char, 1)
AC_CHECK_SIZEOF(long long int, 8)
# More checks for data types
-AC_MSG_CHECKING([for intXX_t types])
-AC_TRY_COMPILE(
- [#include <sys/types.h>],
- [int16_t a; int32_t b; a = 1235; b = 1235;],
- [
- AC_DEFINE(HAVE_INTXX_T)
- AC_MSG_RESULT(yes)
- have_intxx_t=1
- ],
- [AC_MSG_RESULT(no)]
-)
+AC_CACHE_CHECK([for intXX_t types], ac_cv_have_intxx_t, [
+ AC_TRY_COMPILE(
+ [ #include <sys/types.h> ],
+ [ int8_t a; int16_t b; int32_t c; a = b = c = 1;],
+ [ ac_cv_have_intxx_t="yes" ],
+ [ ac_cv_have_intxx_t="no" ]
+ )
+])
+if test "x$ac_cv_have_intxx_t" = "xyes" ; then
+ AC_DEFINE(HAVE_INTXX_T)
+ have_intxx_t=1
+fi
+
+AC_CACHE_CHECK([for u_intXX_t types], ac_cv_have_u_intxx_t, [
+ AC_TRY_COMPILE(
+ [ #include <sys/types.h> ],
+ [ u_int8_t a; u_int16_t b; u_int32_t c; a = b = c = 1;],
+ [ ac_cv_have_u_intxx_t="yes" ],
+ [ ac_cv_have_u_intxx_t="no" ]
+ )
+])
+if test "x$ac_cv_have_u_intxx_t" = "xyes" ; then
+ AC_DEFINE(HAVE_U_INTXX_T)
+ have_u_intxx_t=1
+fi
-AC_MSG_CHECKING([for u_intXX_t types])
-AC_TRY_COMPILE(
- [#include <sys/types.h>],
- [u_int16_t c; u_int32_t d; c = 1235; d = 1235;],
- [
- AC_DEFINE(HAVE_U_INTXX_T)
- AC_MSG_RESULT(yes)
- have_u_intxx_t=1
- ],
- [AC_MSG_RESULT(no)]
-)
if test -z "$have_u_intxx_t" -o -z "$have_intxx_t" -a \
"x$ac_cv_header_sys_bitypes_h" = "xyes"
then
AC_MSG_CHECKING([for intXX_t and u_intXX_t types in sys/bitypes.h])
AC_TRY_COMPILE(
- [#include <sys/bitypes.h>],
[
- u_int16_t c; u_int32_t d;
- int16_t e; int32_t f;
- c = 1235; d = 1235;
- e = 1235; f = 1235;
+#include <sys/bitypes.h>
+ ],
+ [
+ int8_t a; int16_t b; int32_t c;
+ u_int8_t e; u_int16_t f; u_int32_t g;
+ a = b = c = e = f = g = 1;
],
[
AC_DEFINE(HAVE_U_INTXX_T)
)
fi
-AC_MSG_CHECKING([for uintXX_t types])
-AC_TRY_COMPILE(
- [#include <sys/types.h>],
- [uint16_t c; uint32_t d; c = 1235; d = 1235;],
- [
+if test -z "$have_u_intxx_t" ; then
+ AC_CACHE_CHECK([for uintXX_t types], ac_cv_have_uintxx_t, [
+ AC_TRY_COMPILE(
+ [
+#include <sys/types.h>
+ ],
+ [ uint8_t a; uint16_t b; uint32_t c; a = b = c = 1; ],
+ [ ac_cv_have_uintxx_t="yes" ],
+ [ ac_cv_have_uintxx_t="no" ]
+ )
+ ])
+ if test "x$ac_cv_have_uintxx_t" = "xyes" ; then
AC_DEFINE(HAVE_UINTXX_T)
- AC_MSG_RESULT(yes)
- ],
- [AC_MSG_RESULT(no)]
-)
+ fi
+fi
-AC_MSG_CHECKING([for socklen_t])
-AC_TRY_COMPILE(
- [
- #include <sys/types.h>
- #include <sys/socket.h>
- ],
- [socklen_t foo; foo = 1235;],
- [
- AC_DEFINE(HAVE_SOCKLEN_T)
- AC_MSG_RESULT(yes)
- ],
- [AC_MSG_RESULT(no)]
-)
+AC_CACHE_CHECK([for socklen_t], ac_cv_have_socklen_t, [
+ AC_TRY_COMPILE(
+ [
+#include <sys/types.h>
+#include <sys/socket.h>
+ ],
+ [socklen_t foo; foo = 1235;],
+ [ ac_cv_have_socklen_t="yes" ],
+ [ ac_cv_have_socklen_t="no" ]
+ )
+])
+if test "x$ac_cv_have_socklen_t" = "xyes" ; then
+ AC_DEFINE(HAVE_SOCKLEN_T)
+fi
-AC_MSG_CHECKING([for size_t])
-AC_TRY_COMPILE(
- [#include <sys/types.h>],
- [size_t foo; foo = 1235;],
- [
- AC_DEFINE(HAVE_SIZE_T)
- AC_MSG_RESULT(yes)
- ],
- [AC_MSG_RESULT(no)]
-)
+AC_CACHE_CHECK([for size_t], ac_cv_have_size_t, [
+ AC_TRY_COMPILE(
+ [
+#include <sys/types.h>
+ ],
+ [ size_t foo; foo = 1235; ],
+ [ ac_cv_have_size_t="yes" ],
+ [ ac_cv_have_size_t="no" ]
+ )
+])
+if test "x$ac_cv_have_size_t" = "xyes" ; then
+ AC_DEFINE(HAVE_SIZE_T)
+fi
-AC_MSG_CHECKING([for struct sockaddr_storage])
-AC_TRY_COMPILE(
- [
- #include <sys/types.h>
- #include <sys/socket.h>
- ],
- [struct sockaddr_storage s;],
- [
- AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE)
- AC_MSG_RESULT(yes)
- ],
- [AC_MSG_RESULT(no)]
-)
+AC_CACHE_CHECK([for ssize_t], ac_cv_have_ssize_t, [
+ AC_TRY_COMPILE(
+ [
+#include <sys/types.h>
+ ],
+ [ ssize_t foo; foo = 1235; ],
+ [ ac_cv_have_ssize_t="yes" ],
+ [ ac_cv_have_ssize_t="no" ]
+ )
+])
+if test "x$ac_cv_have_ssize_t" = "xyes" ; then
+ AC_DEFINE(HAVE_SSIZE_T)
+fi
-AC_MSG_CHECKING([for struct sockaddr_in6])
-AC_TRY_COMPILE(
- [#include <netinet/in.h>],
- [struct sockaddr_in6 s; s.sin6_family = 0;],
- [
- AC_DEFINE(HAVE_STRUCT_SOCKADDR_IN6)
- AC_MSG_RESULT(yes)
- ],
- [AC_MSG_RESULT(no)]
-)
-AC_MSG_CHECKING([for struct in6_addr])
-AC_TRY_COMPILE(
- [#include <netinet/in.h>],
- [struct in6_addr s; s.s6_addr[0] = 0;],
- [
- AC_DEFINE(HAVE_STRUCT_IN6_ADDR)
- AC_MSG_RESULT(yes)
- ],
- [AC_MSG_RESULT(no)]
-)
+AC_CACHE_CHECK([for struct sockaddr_storage], ac_cv_have_struct_sockaddr_storage, [
+ AC_TRY_COMPILE(
+ [
+#include <sys/types.h>
+#include <sys/socket.h>
+ ],
+ [ struct sockaddr_storage s; ],
+ [ ac_cv_have_struct_sockaddr_storage="yes" ],
+ [ ac_cv_have_struct_sockaddr_storage="no" ]
+ )
+])
+if test "x$ac_cv_have_struct_sockaddr_storage" = "xyes" ; then
+ AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE)
+fi
+
+AC_CACHE_CHECK([for struct sockaddr_in6], ac_cv_have_struct_sockaddr_in6, [
+ AC_TRY_COMPILE(
+ [
+#include <netinet/in.h>
+ ],
+ [ struct sockaddr_in6 s; s.sin6_family = 0; ],
+ [ ac_cv_have_struct_sockaddr_in6="yes" ],
+ [ ac_cv_have_struct_sockaddr_in6="no" ]
+ )
+])
+if test "x$ac_cv_have_struct_sockaddr_in6" = "xyes" ; then
+ AC_DEFINE(HAVE_STRUCT_SOCKADDR_IN6)
+fi
+
+AC_CACHE_CHECK([for struct in6_addr], ac_cv_have_struct_in6_addr, [
+ AC_TRY_COMPILE(
+ [
+#include <netinet/in.h>
+ ],
+ [ struct in6_addr s; s.s6_addr[0] = 0; ],
+ [ ac_cv_have_struct_in6_addr="yes" ],
+ [ ac_cv_have_struct_in6_addr="no" ]
+ )
+])
+if test "x$ac_cv_have_struct_in6_addr" = "xyes" ; then
+ AC_DEFINE(HAVE_STRUCT_IN6_ADDR)
+fi
+
+AC_CACHE_CHECK([for struct addrinfo], ac_cv_have_struct_addrinfo, [
+ AC_TRY_COMPILE(
+ [
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+ ],
+ [ struct addrinfo s; s.ai_flags = AI_PASSIVE; ],
+ [ ac_cv_have_struct_addrinfo="yes" ],
+ [ ac_cv_have_struct_addrinfo="no" ]
+ )
+])
+if test "x$ac_cv_have_struct_addrinfo" = "xyes" ; then
+ AC_DEFINE(HAVE_STRUCT_ADDRINFO)
+fi
-AC_MSG_CHECKING([for struct addrinfo])
-AC_TRY_COMPILE(
- [
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netdb.h>
- ],
- [struct addrinfo s; s.ai_flags = AI_PASSIVE;],
- [
- AC_DEFINE(HAVE_STRUCT_ADDRINFO)
- AC_MSG_RESULT(yes)
- ],
- [AC_MSG_RESULT(no)]
-)
# Checks for structure members
-AC_MSG_CHECKING([whether utmp.h has ut_host field])
-AC_EGREP_HEADER(ut_host, utmp.h,
- [AC_DEFINE(HAVE_HOST_IN_UTMP) AC_MSG_RESULT(yes); ],
- [AC_MSG_RESULT(no)]
-)
-AC_MSG_CHECKING([whether utmpx.h has ut_host field])
-AC_EGREP_HEADER(ut_host, utmpx.h,
- [AC_DEFINE(HAVE_HOST_IN_UTMPX) AC_MSG_RESULT(yes); ],
- [AC_MSG_RESULT(no)]
-)
-AC_MSG_CHECKING([whether utmpx.h has syslen field])
-AC_EGREP_HEADER(syslen, utmpx.h,
- [AC_DEFINE(HAVE_SYSLEN_IN_UTMPX) AC_MSG_RESULT(yes); ],
- [AC_MSG_RESULT(no)]
-)
-AC_MSG_CHECKING([whether utmp.h has ut_pid field])
-AC_EGREP_HEADER(ut_pid, utmp.h,
- [AC_DEFINE(HAVE_PID_IN_UTMP) AC_MSG_RESULT(yes); ],
- [AC_MSG_RESULT(no)]
-)
-AC_MSG_CHECKING([whether utmp.h has ut_type field])
-AC_EGREP_HEADER(ut_type, utmp.h,
- [AC_DEFINE(HAVE_TYPE_IN_UTMP) AC_MSG_RESULT(yes); ],
- [AC_MSG_RESULT(no)]
-)
-AC_MSG_CHECKING([whether utmp.h has ut_tv field])
-AC_EGREP_HEADER(ut_tv, utmp.h,
- [AC_DEFINE(HAVE_TV_IN_UTMP) AC_MSG_RESULT(yes); ],
- [AC_MSG_RESULT(no)]
-)
-AC_MSG_CHECKING([whether utmp.h has ut_id field])
-AC_EGREP_HEADER(ut_id, utmp.h,
- [AC_DEFINE(HAVE_ID_IN_UTMP) AC_MSG_RESULT(yes); ],
- [AC_MSG_RESULT(no)]
-)
-AC_MSG_CHECKING([whether utmp.h has ut_addr field])
-AC_EGREP_HEADER(ut_addr, utmp.h,
- [AC_DEFINE(HAVE_ADDR_IN_UTMP) AC_MSG_RESULT(yes); ],
- [AC_MSG_RESULT(no)]
-)
-AC_MSG_CHECKING([whether utmpx.h has ut_addr field])
-AC_EGREP_HEADER(ut_addr, utmpx.h,
- [AC_DEFINE(HAVE_ADDR_IN_UTMPX) AC_MSG_RESULT(yes); ],
- [AC_MSG_RESULT(no)]
-)
-AC_MSG_CHECKING([whether utmp.h has ut_addr_v6 field])
-AC_EGREP_HEADER(ut_addr_v6, utmp.h,
- [AC_DEFINE(HAVE_ADDR_V6_IN_UTMP) AC_MSG_RESULT(yes); ],
- [AC_MSG_RESULT(no)]
-)
-AC_MSG_CHECKING([whether utmpx.h has ut_addr_v6 field])
-AC_EGREP_HEADER(ut_addr_v6, utmpx.h,
- [AC_DEFINE(HAVE_ADDR_V6_IN_UTMPX) AC_MSG_RESULT(yes); ],
- [AC_MSG_RESULT(no)]
-)
-AC_MSG_CHECKING([whether struct sockaddr_storage has ss_family field])
-AC_TRY_COMPILE(
- [
- #include <sys/types.h>
- #include <sys/socket.h>
- ],
- [struct sockaddr_storage s; s.ss_family = 1;],
- [
- AC_DEFINE(HAVE_SS_FAMILY_IN_SS)
- AC_MSG_RESULT(yes)
- ],
- [AC_MSG_RESULT(no)]
-)
-AC_MSG_CHECKING([whether struct sockaddr_storage has __ss_family field])
-AC_TRY_COMPILE(
- [
- #include <sys/types.h>
- #include <sys/socket.h>
- ],
- [struct sockaddr_storage s; s.__ss_family = 1;],
- [
- AC_DEFINE(HAVE___SS_FAMILY_IN_SS)
- AC_MSG_RESULT(yes)
- ],
- [AC_MSG_RESULT(no)]
-)
+OSSH_CHECK_HEADER_FOR_FIELD(ut_host, utmp.h, HAVE_HOST_IN_UTMP)
+OSSH_CHECK_HEADER_FOR_FIELD(ut_host, utmpx.h, HAVE_HOST_IN_UTMPX)
+OSSH_CHECK_HEADER_FOR_FIELD(syslen, utmpx.h, HAVE_SYSLEN_IN_UTMPX)
+OSSH_CHECK_HEADER_FOR_FIELD(ut_pid, utmp.h, HAVE_PID_IN_UTMP)
+OSSH_CHECK_HEADER_FOR_FIELD(ut_type, utmp.h, HAVE_TYPE_IN_UTMP)
+OSSH_CHECK_HEADER_FOR_FIELD(ut_tv, utmp.h, HAVE_TV_IN_UTMP)
+OSSH_CHECK_HEADER_FOR_FIELD(ut_id, utmp.h, HAVE_ID_IN_UTMP)
+OSSH_CHECK_HEADER_FOR_FIELD(ut_addr, utmp.h, HAVE_ADDR_IN_UTMP)
+OSSH_CHECK_HEADER_FOR_FIELD(ut_addr, utmpx.h, HAVE_ADDR_IN_UTMPX)
+OSSH_CHECK_HEADER_FOR_FIELD(ut_addr_v6, utmp.h, HAVE_ADDR_V6_IN_UTMP)
+OSSH_CHECK_HEADER_FOR_FIELD(ut_addr_v6, utmpx.h, HAVE_ADDR_V6_IN_UTMPX)
+
+
+AC_CACHE_CHECK([for ss_family field in struct sockaddr_storage],
+ ac_cv_have_ss_family_in_struct_ss, [
+ AC_TRY_COMPILE(
+ [
+#include <sys/types.h>
+#include <sys/socket.h>
+ ],
+ [ struct sockaddr_storage s; s.ss_family = 1; ],
+ [ ac_cv_have_ss_family_in_struct_ss="yes" ],
+ [ ac_cv_have_ss_family_in_struct_ss="no" ],
+ )
+])
+if test "x$ac_cv_have_ss_family_in_struct_ss" = "xyes" ; then
+ AC_DEFINE(HAVE_SS_FAMILY_IN_SS)
+fi
+
+
+AC_CACHE_CHECK([for __ss_family field in struct sockaddr_storage],
+ ac_cv_have___ss_family_in_struct_ss, [
+ AC_TRY_COMPILE(
+ [
+#include <sys/types.h>
+#include <sys/socket.h>
+ ],
+ [ struct sockaddr_storage s; s.__ss_family = 1; ],
+ [ ac_cv_have___ss_family_in_struct_ss="yes" ],
+ [ ac_cv_have___ss_family_in_struct_ss="no" ]
+ )
+])
+if test "x$ac_cv_have___ss_family_in_struct_ss" = "xyes" ; then
+ AC_DEFINE(HAVE___SS_FAMILY_IN_SS)
+fi
+
+
+AC_CACHE_CHECK([if libc defines __progname], ac_cv_libc_defines___progname, [
+ AC_TRY_LINK([],
+ [ extern char *__progname; printf("%s", __progname); ],
+ [ ac_cv_libc_defines___progname="yes" ],
+ [ ac_cv_libc_defines___progname="no" ]
+ )
+])
+if test "x$ac_cv_libc_defines___progname" = "xyes" ; then
+ AC_DEFINE(HAVE___PROGNAME)
+fi
-AC_MSG_CHECKING([whether libc defines __progname])
-AC_TRY_LINK([],
- [extern char *__progname; printf("%s", __progname);],
- [
- AC_DEFINE(HAVE___PROGNAME)
- AC_MSG_RESULT(yes)
- ],
- [
- AC_MSG_RESULT(no)
- ]
-)
# Looking for programs, paths and files
AC_ARG_WITH(rsh,
# Options from here on. Some of these are preset by platform above
-# Check whether user wants GNOME ssh-askpass
-AC_MSG_CHECKING([whether to build GNOME ssh-askpass])
-AC_ARG_WITH(gnome-askpass,
- [ --with-gnome-askpass Build the GNOME passphrase requester (default=no)],
- [
- if test "x$withval" = "xno" ; then
- GNOME_ASKPASS="";
- else
- GNOME_ASKPASS="gnome-ssh-askpass";
- fi
- ])
-AC_SUBST(GNOME_ASKPASS)
-
-if test -z "$GNOME_ASKPASS" ; then
- AC_MSG_RESULT(no)
-else
- AC_MSG_RESULT(yes)
-fi
-
# Check for user-specified random device, otherwise check /dev/urandom
AC_ARG_WITH(random,
[ --with-random=FILE read randomness from FILE (default=/dev/urandom)],
[
- RANDOM_POOL="$withval";
- AC_DEFINE_UNQUOTED(RANDOM_POOL, "$RANDOM_POOL")
+ if test "x$withval" != "xno" ; then
+ RANDOM_POOL="$withval";
+ AC_DEFINE_UNQUOTED(RANDOM_POOL, "$RANDOM_POOL")
+ fi
],
[
# Check for random device
AC_ARG_WITH(egd-pool,
[ --with-egd-pool=FILE read randomness from EGD pool FILE (default none)],
[
- RANDOM_POOL="$withval";
- AC_DEFINE(HAVE_EGD)
- AC_SUBST(RANDOM_POOL)
- AC_DEFINE_UNQUOTED(RANDOM_POOL, "$RANDOM_POOL")
+ if test "x$withval" != "xno" ; then
+ EGD_SOCKET="$withval";
+ AC_DEFINE_UNQUOTED(EGD_SOCKET, "$EGD_SOCKET")
+ fi
]
)
-# Make sure we have some random number support
-if test -z "$RANDOM_POOL" -a -z "$EGD_POOL"; then
- AC_MSG_ERROR([No random device found, and no EGD random pool specified])
+# detect pathnames for entropy gathering commands, if we need them
+INSTALL_SSH_PRNG_CMDS=""
+rm -f prng_commands
+if test -z "$RANDOM_POOL" -a -z "$EGD_SOCKET" ; then
+ # Use these commands to collect entropy
+ OSSH_PATH_ENTROPY_PROG(PROG_LS, ls)
+ OSSH_PATH_ENTROPY_PROG(PROG_NETSTAT, netstat)
+ OSSH_PATH_ENTROPY_PROG(PROG_ARP, arp)
+ OSSH_PATH_ENTROPY_PROG(PROG_IFCONFIG, ifconfig)
+ OSSH_PATH_ENTROPY_PROG(PROG_PS, ps)
+ OSSH_PATH_ENTROPY_PROG(PROG_W, w)
+ OSSH_PATH_ENTROPY_PROG(PROG_WHO, who)
+ OSSH_PATH_ENTROPY_PROG(PROG_LAST, last)
+ OSSH_PATH_ENTROPY_PROG(PROG_LASTLOG, lastlog)
+ OSSH_PATH_ENTROPY_PROG(PROG_DF, df)
+ OSSH_PATH_ENTROPY_PROG(PROG_VMSTAT, vmstat)
+ OSSH_PATH_ENTROPY_PROG(PROG_UPTIME, uptime)
+ OSSH_PATH_ENTROPY_PROG(PROG_IPCS, ipcs)
+ OSSH_PATH_ENTROPY_PROG(PROG_TAIL, tail)
+ OSSH_PATH_ENTROPY_PROG(PROG_LS, ls)
+
+ INSTALL_SSH_PRNG_CMDS="yes"
fi
+AC_SUBST(INSTALL_SSH_PRNG_CMDS)
+
AC_ARG_WITH(catman,
[ --with-catman=man|cat Install preformatted manpages[no]],
if test "x$withval" != "$xyes" ; then
CFLAGS="$CFLAGS -I${withval}/include"
LDFLAGS="$LDFLAGS -L${withval}/lib"
+ if test ! -z "$need_dash_r" ; then
+ LDFLAGS="$LDFLAGS -R${withval}/lib"
+ fi
+ if test ! -z "$blibpath" ; then
+ blibpath="$blibpath:${withval}/lib"
+ fi
else
if test -d /usr/include/kerberosIV ; then
CFLAGS="$CFLAGS -I/usr/include/kerberosIV"
AC_MSG_CHECKING(for libwrap)
AC_TRY_LINK(
[
- #include <tcpd.h>
+#include <tcpd.h>
int deny_severity = 0, allow_severity = 0;
],
[hosts_access(0);],
]
)
-AC_MSG_CHECKING([to convert IPv4 in IPv6-mapped addresses])
+AC_MSG_CHECKING([if we need to convert IPv4 in IPv6-mapped addresses])
AC_ARG_WITH(4in6,
[ --with-4in6 Check for and convert IPv4 in IPv6 mapped addresses],
[
fi
]
)
+
AC_DEFINE_UNQUOTED(PIDDIR, "$piddir")
AC_SUBST(piddir)
-AC_OUTPUT(Makefile)
+
+# Change default command timeout for builtin PRNG
+entropy_timeout=100
+AC_ARG_WITH(entropy-timeout,
+ [ --with-entropy-timeout Specify entropy gathering command timeout (msec)],
+ [
+ if test "x$withval" != "xno" ; then
+ entropy_timeout=$withval
+ fi
+ ]
+)
+AC_DEFINE_UNQUOTED(ENTROPY_TIMEOUT_MSEC, $entropy_timeout)
+
+
+if test ! -z "$blibpath" ; then
+ LDFLAGS="$LDFLAGS -blibpath:$blibpath"
+ AC_MSG_WARN([Please check and edit -blibpath in LDFLAGS in Makefile])
+fi
+
+AC_OUTPUT(Makefile ssh_prng_cmds)
+
+
andersk / openssh.git / blobdiff