1 files changed, 18 insertions, 66 deletions

diff --git a/configure.ac b/configure.ac
index a3ff2b545..dfd63765b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.427 2009/09/11 04:56:08 dtucker Exp $
+# $Id: configure.ac,v 1.444 2010/03/05 04:04:35 djm Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
-AC_REVISION($Revision: 1.427 $)
+AC_REVISION($Revision: 1.444 $)
 AC_CONFIG_SRCDIR([ssh.c])
 
 AC_CONFIG_HEADER(config.h)
@@ -108,7 +108,7 @@ if test "$GCC" = "yes" || test "$GCC" = "egcs"; then
                      ;;
                 2.*) no_attrib_nonnull=1 ;;
                 3.*) CFLAGS="$CFLAGS -Wsign-compare -Wformat-security" ;;
-                4.*) CFLAGS="$CFLAGS -Wsign-compare -Wno-pointer-sign -Wformat-security" ;;
+                4.*) CFLAGS="$CFLAGS -Wsign-compare -Wno-pointer-sign -Wformat-security -fno-strict-aliasing" ;;
                 *) ;;
         esac
 
@@ -446,7 +446,7 @@ int main(void) { exit(0); }
         AC_DEFINE(DISABLE_FD_PASSING, 1,
                 [Define if your platform needs to skip post auth
                 file descriptor passing])
-        AC_DEFINE(SSH_IOBUFSZ, 65536, [Windows is sensitive to read buffer size])
+        AC_DEFINE(SSH_IOBUFSZ, 65535, [Windows is sensitive to read buffer size])
         ;;
 *-*-dgux*)
         AC_DEFINE(IP_TOS_IS_BROKEN, 1,
@@ -613,6 +613,7 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
                 if it doesn't return EOPNOTSUPP.])
         AC_DEFINE(_PATH_BTMP, "/var/log/btmp", [log for bad login attempts])
         AC_DEFINE(USE_BTMP)
+        AC_DEFINE(LINUX_OOM_ADJUST, 1, [Adjust Linux out-of-memory killer])
         inet6_default_4in6=yes
         case `uname -r` in
         1.*|2.0.*)
@@ -630,7 +631,6 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
                 AC_DEFINE(SSH_TUN_PREPEND_AF, 1,
                     [Prepend the address family to IP tunnel traffic])
         fi
-        AC_DEFINE(OOM_ADJUST, 1, [Adjust Linux out-of-memory killer])
         ;;
 mips-sony-bsd|mips-sony-newsos4)
         AC_DEFINE(NEED_SETPGRP, 1, [Need setpgrp to acquire controlling tty])
@@ -768,9 +768,11 @@ mips-sony-bsd|mips-sony-newsos4)
         ;;
 # UnixWare 7.x, OpenUNIX 8
 *-*-sysv5*)
+        CPPFLAGS="$CPPFLAGS -Dvsnprintf=_xvsnprintf -Dsnprintf=_xsnprintf"
         AC_DEFINE(UNIXWARE_LONG_PASSWORDS, 1, [Support passwords > 8 chars])
         AC_DEFINE(USE_PIPES)
         AC_DEFINE(SETEUID_BREAKS_SETUID)
+        AC_DEFINE(BROKEN_GETADDRINFO)
         AC_DEFINE(BROKEN_SETREUID)
         AC_DEFINE(BROKEN_SETREGID)
         AC_DEFINE(PASSWD_NEEDS_USERNAME)
@@ -809,6 +811,7 @@ mips-sony-bsd|mips-sony-newsos4)
         AC_DEFINE(DISABLE_SHADOW)
         AC_DEFINE(DISABLE_FD_PASSING)
         AC_DEFINE(SETEUID_BREAKS_SETUID)
+        AC_DEFINE(BROKEN_GETADDRINFO)
         AC_DEFINE(BROKEN_SETREUID)
         AC_DEFINE(BROKEN_SETREGID)
         AC_DEFINE(WITH_ABBREV_NO_TTY)
@@ -1375,6 +1378,7 @@ AC_CHECK_FUNCS( \
         getrlimit \
         getttyent \
         glob \
+        group_from_gid \
         inet_aton \
         inet_ntoa \
         inet_ntop \
@@ -1401,8 +1405,10 @@ AC_CHECK_FUNCS( \
         setegid \
         setenv \
         seteuid \
+        setgroupent \
         setgroups \
         setlogin \
+        setpassent\
         setpcred \
         setproctitle \
         setregid \
@@ -1431,12 +1437,18 @@ AC_CHECK_FUNCS( \
         truncate \
         unsetenv \
         updwtmpx \
+        user_from_uid \
         vasprintf \
         vhangup \
         vsnprintf \
         waitpid \
 )
 
+# PKCS#11 support requires dlopen() and co
+AC_SEARCH_LIBS(dlopen, dl,
+    AC_DEFINE([ENABLE_PKCS11], [], [Enable for PKCS#11 support])
+)
+
 # IRIX has a const char return value for gai_strerror()
 AC_CHECK_FUNCS(gai_strerror,[
         AC_DEFINE(HAVE_GAI_STRERROR)
@@ -3280,66 +3292,6 @@ if test "x$ac_cv_libc_defines_sys_nerr" = "xyes" ; then
         AC_DEFINE(HAVE_SYS_NERR, 1, [Define if your system defines sys_nerr])
 fi
 
-SCARD_MSG="no"
-# Check whether user wants sectok support
-AC_ARG_WITH(sectok,
-        [  --with-sectok           Enable smartcard support using libsectok],
-        [
-                if test "x$withval" != "xno" ; then
-                        if test "x$withval" != "xyes" ; then
-                                CPPFLAGS="$CPPFLAGS -I${withval}"
-                                LDFLAGS="$LDFLAGS -L${withval}"
-                                if test ! -z "$need_dash_r" ; then
-                                        LDFLAGS="$LDFLAGS -R${withval}"
-                                fi
-                                if test ! -z "$blibpath" ; then
-                                        blibpath="$blibpath:${withval}"
-                                fi
-                        fi
-                        AC_CHECK_HEADERS(sectok.h)
-                        if test "$ac_cv_header_sectok_h" != yes; then
-                                AC_MSG_ERROR(Can't find sectok.h)
-                        fi
-                        AC_CHECK_LIB(sectok, sectok_open)
-                        if test "$ac_cv_lib_sectok_sectok_open" != yes; then
-                                AC_MSG_ERROR(Can't find libsectok)
-                        fi
-                        AC_DEFINE(SMARTCARD, 1,
-                                [Define if you want smartcard support])
-                        AC_DEFINE(USE_SECTOK, 1,
-                                [Define if you want smartcard support
-                                using sectok])
-                        SCARD_MSG="yes, using sectok"
-                fi
-        ]
-)
-
-# Check whether user wants OpenSC support
-OPENSC_CONFIG="no"
-AC_ARG_WITH(opensc,
-        [  --with-opensc[[=PFX]]     Enable smartcard support using OpenSC (optionally in PATH)],
-        [
-            if test "x$withval" != "xno" ; then
-                if test "x$withval" != "xyes" ; then
-                        OPENSC_CONFIG=$withval/bin/opensc-config
-                else
-                        AC_PATH_PROG(OPENSC_CONFIG, opensc-config, no)
-                fi
-                if test "$OPENSC_CONFIG" != "no"; then
-                        LIBOPENSC_CFLAGS=`$OPENSC_CONFIG --cflags`
-                        LIBOPENSC_LIBS=`$OPENSC_CONFIG --libs`
-                        CPPFLAGS="$CPPFLAGS $LIBOPENSC_CFLAGS"
-                        LIBS="$LIBS $LIBOPENSC_LIBS"
-                        AC_DEFINE(SMARTCARD)
-                        AC_DEFINE(USE_OPENSC, 1,
-                                [Define if you want smartcard support
-                                using OpenSC])
-                        SCARD_MSG="yes, using OpenSC"
-                fi
-            fi
-        ]
-)
-
 # Check libraries needed by DNS fingerprint support
 AC_SEARCH_LIBS(getrrsetbyname, resolv,
         [AC_DEFINE(HAVE_GETRRSETBYNAME, 1,
@@ -4210,7 +4162,7 @@ fi
 AC_EXEEXT
 AC_CONFIG_FILES([Makefile buildpkg.sh opensshd.init openssh.xml \
         openbsd-compat/Makefile openbsd-compat/regress/Makefile \
-        scard/Makefile ssh_prng_cmds survey.sh])
+        ssh_prng_cmds survey.sh])
 AC_OUTPUT
 
 # Print summary of options