summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2013-03-05 19:57:39 +1100
committerDarren Tucker <dtucker@zip.com.au>2013-03-05 19:57:39 +1100
commit5f0e54c8924e7f2391342cfd8198bd92e28d726f (patch)
tree8c7f035172eb3e6eae5cfe5dfe02f549bfca364f
parent43e5e60badb827104363169c333b0b7eadb0d09a (diff)
- (dtucker) [configure.ac] use "=" for shell test and not "==". Spotted by
Kevin Brott.
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac6
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8190c663d..15f20c8bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
120130305 120130305
2 - (djm) [regress/modpipe.c] Compilation fix for AIX and parsing fix for 2 - (djm) [regress/modpipe.c] Compilation fix for AIX and parsing fix for
3 HP/UX. Spotted by Kevin Brott 3 HP/UX. Spotted by Kevin Brott
4 - (dtucker) [configure.ac] use "=" for shell test and not "==". Spotted by
5 Kevin Brott.
4 6
520130227 720130227
6 - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] 8 - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
diff --git a/configure.ac b/configure.ac
index f2d671197..bd8b21d61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.510 2013/02/25 00:24:44 dtucker Exp $ 1# $Id: configure.ac,v 1.511 2013/03/05 08:57:39 dtucker Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -15,7 +15,7 @@
15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 16
17AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) 17AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
18AC_REVISION($Revision: 1.510 $) 18AC_REVISION($Revision: 1.511 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20AC_LANG([C]) 20AC_LANG([C])
21 21
@@ -2744,7 +2744,7 @@ elif test "x$sandbox_arg" = "xseccomp_filter" || \
2744 AC_DEFINE([SANDBOX_SECCOMP_FILTER], [1], [Sandbox using seccomp filter]) 2744 AC_DEFINE([SANDBOX_SECCOMP_FILTER], [1], [Sandbox using seccomp filter])
2745elif test "x$sandbox_arg" = "xrlimit" || \ 2745elif test "x$sandbox_arg" = "xrlimit" || \
2746 ( test -z "$sandbox_arg" && test "x$ac_cv_func_setrlimit" = "xyes" && \ 2746 ( test -z "$sandbox_arg" && test "x$ac_cv_func_setrlimit" = "xyes" && \
2747 test "x$select_works_with_rlimit" == "xyes" ) ; then 2747 test "x$select_works_with_rlimit" = "xyes" ) ; then
2748 test "x$ac_cv_func_setrlimit" != "xyes" && \ 2748 test "x$ac_cv_func_setrlimit" != "xyes" && \
2749 AC_MSG_ERROR([rlimit sandbox requires setrlimit function]) 2749 AC_MSG_ERROR([rlimit sandbox requires setrlimit function])
2750 test "x$select_works_with_rlimit" != "xyes" && \ 2750 test "x$select_works_with_rlimit" != "xyes" && \