- (dtucker) [configure.ac] bz#2178: Don't try to use BSM on Solaris versions

   greater than 11 either rather than just 11.  Patch from Tomas Kuthan.

diff --git a/ChangeLog b/ChangeLog
index a8d892f6d915d6c4d604f2a691a68a863e6ddb50..092344a416a70b589d4e232ffb0a89277bcd59fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20131219
+ - (dtucker) [configure.ac] bz#2178: Don't try to use BSM on Solaris versions
+   greater than 11 either rather than just 11.  Patch from Tomas Kuthan.
+
 20131218
  - (djm) OpenBSD CVS Sync
    - djm@cvs.openbsd.org 2013/12/07 08:08:26

diff --git a/configure.ac b/configure.ac
index c8d4bfc6bd17ca014797b3a47245d780c18bf693..d37a211ed9e6499979bfb4645527a9521d88f0fa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.546 2013/12/07 00:51:51 djm Exp $
+# $Id: configure.ac,v 1.547 2013/12/19 00:00:12 dtucker 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.546 $)
+AC_REVISION($Revision: 1.547 $)
 AC_CONFIG_SRCDIR([ssh.c])
 AC_LANG([C])
 
@@ -1501,7 +1501,7 @@ AC_ARG_WITH([audit],
                # These are optional
                AC_CHECK_FUNCS([getaudit_addr aug_get_machine])
                AC_DEFINE([USE_BSM_AUDIT], [1], [Use BSM audit module])
-               if test "$sol2ver" -eq 11; then
+               if test "$sol2ver" -ge 11; then
                        SSHDLIBS="$SSHDLIBS -lscf"
                        AC_DEFINE([BROKEN_BSM_API], [1], 
                                  [The system has incomplete BSM API])