diff options
| author | Damien Miller <djm@mindrot.org> | 2008-12-07 23:35:36 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2008-12-07 23:35:36 +0100 |
| commit | 7df2e400745219a87f9a9e445a9b89661d6fec42 (patch) | |
| tree | 38e17bb1d3fc7c42b1d3f31eae49033d20b5ef10 /configure.ac | |
| parent | - dtucker@cvs.openbsd.org 2008/11/30 11:59:26 (diff) | |
| download | openssh-7df2e400745219a87f9a9e445a9b89661d6fec42.tar.xz openssh-7df2e400745219a87f9a9e445a9b89661d6fec42.zip | |
- (djm) [configure.ac] bz#1538: better test for ProPolice/SSP: actually
use some stack in main().
Report and suggested fix from vapier AT gentoo.org
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 3e0821bae..43732abb8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.410 2008/11/19 05:26:42 tim Exp $ +# $Id: configure.ac,v 1.411 2008/12/07 22:35:36 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.410 $) +AC_REVISION($Revision: 1.411 $) 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 ], |