1 files changed, 32 insertions, 14 deletions

diff --git a/configure.ac b/configure.ac
index 991e0fef3..396fc974a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.409 2008/07/09 11:07:19 djm Exp $
+# $Id: configure.ac,v 1.415 2009/02/16 04:37:03 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.409 $)
+AC_REVISION($Revision: 1.415 $)
 AC_CONFIG_SRCDIR([ssh.c])
 
 AC_CONFIG_HEADER(config.h)
@@ -126,7 +126,7 @@ int main(void){char b[10]; memset(b, 0, sizeof(b));}
 
         # -fstack-protector-all doesn't always work for some GCC versions
         # and/or platforms, so we test if we can.  If it's not supported
-        # on a give platform gcc will emit a warning so we use -Werror.
+        # on a given platform gcc will emit a warning so we use -Werror.
         if test "x$use_stack_protector" = "x1"; then
             for t in -fstack-protector-all -fstack-protector; do
                 AC_MSG_CHECKING(if $CC supports $t)
@@ -136,8 +136,8 @@ int main(void){char b[10]; memset(b, 0, sizeof(b));}
                 LDFLAGS="$LDFLAGS $t -Werror"
                 AC_LINK_IFELSE(
                         [AC_LANG_SOURCE([
-#include <stdlib.h>
-int main(void){return 0;}
+#include <stdio.h>
+int main(void){char x[[256]]; snprintf(x, sizeof(x), "XXX"); return 0;}
                          ])],
                     [ AC_MSG_RESULT(yes)
                       CFLAGS="$saved_CFLAGS $t"
@@ -145,8 +145,8 @@ int main(void){return 0;}
                       AC_MSG_CHECKING(if $t works)
                       AC_RUN_IFELSE(
                         [AC_LANG_SOURCE([
-#include <stdlib.h>
-int main(void){exit(0);}
+#include <stdio.h>
+int main(void){char x[[256]]; snprintf(x, sizeof(x), "XXX"); return 0;}
                         ])],
                         [ AC_MSG_RESULT(yes)
                           break ],
@@ -473,11 +473,6 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
             [Use tunnel device compatibility to OpenBSD])
         AC_DEFINE(SSH_TUN_PREPEND_AF, 1,
             [Prepend the address family to IP tunnel traffic])
-        m4_pattern_allow(AU_IPv)
-        AC_CHECK_DECL(AU_IPv4, [], 
-            AC_DEFINE(AU_IPv4, 0, [System only supports IPv4 audit records])
-            [#include <bsm/audit.h>]
-        )
         AC_MSG_CHECKING(if we have the Security Authorization Session API)
         AC_TRY_COMPILE([#include <Security/AuthSession.h>],
                 [SessionCreate(0, 0);],
@@ -502,6 +497,13 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
                 fi],
                 [AC_MSG_RESULT(no)]
         )
+        m4_pattern_allow(AU_IPv)
+        AC_CHECK_DECL(AU_IPv4, [], 
+            AC_DEFINE(AU_IPv4, 0, [System only supports IPv4 audit records])
+            [#include <bsm/audit.h>]
+        AC_DEFINE(LASTLOG_WRITE_PUTUTXLINE, 1,
+            [Define if pututxline updates lastlog too])
+        )
         ;;
 *-*-dragonfly*)
         SSHDLIBS="$SSHDLIBS -lcrypt"
@@ -585,7 +587,7 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
         AC_DEFINE(WITH_ABBREV_NO_TTY)
         AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")
         ;;
-*-*-k*bsd*-gnu)
+*-*-k*bsd*-gnu | *-*-kopensolaris*-gnu)
         check_for_libcrypt_later=1
         AC_DEFINE(PAM_TTY_KLUDGE)
         AC_DEFINE(LOCKED_PASSWD_PREFIX, "!")
@@ -761,7 +763,6 @@ mips-sony-bsd|mips-sony-newsos4)
         ;;
 # UnixWare 7.x, OpenUNIX 8
 *-*-sysv5*)
-        check_for_libcrypt_later=1
         AC_DEFINE(UNIXWARE_LONG_PASSWORDS, 1, [Support passwords > 8 chars])
         AC_DEFINE(USE_PIPES)
         AC_DEFINE(SETEUID_BREAKS_SETUID)
@@ -774,8 +775,14 @@ mips-sony-bsd|mips-sony-newsos4)
                 AC_DEFINE(BROKEN_LIBIAF, 1,
                         [ia_uinfo routines not supported by OS yet])
                 AC_DEFINE(BROKEN_UPDWTMPX)
+                AC_CHECK_LIB(prot, getluid,[ LIBS="$LIBS -lprot"
+                        AC_CHECK_FUNCS(getluid setluid,,,-lprot)
+                        AC_DEFINE(HAVE_SECUREWARE)
+                        AC_DEFINE(DISABLE_SHADOW)
+                        ],,)
                 ;;
         *)      AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")
+                check_for_libcrypt_later=1
                 ;;
         esac
         ;;
@@ -1536,6 +1543,8 @@ AC_CHECK_FUNCS(utmpname)
 dnl    Checks for utmpx functions
 AC_CHECK_FUNCS(endutxent getutxent getutxid getutxline pututxline )
 AC_CHECK_FUNCS(setutxent utmpxname)
+dnl    Checks for lastlog functions
+AC_CHECK_FUNCS(getlastlogxbyname)
 
 AC_CHECK_FUNC(daemon,
         [AC_DEFINE(HAVE_DAEMON, 1, [Define if your libraries define daemon()])],
@@ -2857,6 +2866,15 @@ AC_CACHE_CHECK([for struct in6_addr], ac_cv_have_struct_in6_addr, [
 if test "x$ac_cv_have_struct_in6_addr" = "xyes" ; then
         AC_DEFINE(HAVE_STRUCT_IN6_ADDR, 1,
                 [define if you have struct in6_addr data type])
+
+dnl Now check for sin6_scope_id
+        AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_scope_id],,,
+                [
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#include <netinet/in.h>
+                ])
 fi
 
 AC_CACHE_CHECK([for struct addrinfo], ac_cv_have_struct_addrinfo, [