diff options
author | Darren Tucker <dtucker@zip.com.au> | 2009-12-08 13:39:48 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2009-12-08 13:39:48 +1100 |
commit | c8802aac28470714ec204d00342f6ecbca45908f (patch) | |
tree | 2732966739075d569e733d65ce0cb6eb1c7a4ac6 /configure.ac | |
parent | d35e0ef61658aa3116eebb1606fcfe6f849fdcca (diff) |
- (dtucker) Bug #1470: Disable OOM-killing of the listening sshd on Linux,
based on a patch from Vaclav Ovsik and Colin Watson. ok djm.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 88a248fb5..94f049fc6 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.431 2009/12/07 00:15:43 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.432 2009/12/08 02:39:48 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 | ||
17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) | 17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) |
18 | AC_REVISION($Revision: 1.431 $) | 18 | AC_REVISION($Revision: 1.432 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | 20 | ||
21 | AC_CONFIG_HEADER(config.h) | 21 | AC_CONFIG_HEADER(config.h) |
@@ -589,6 +589,7 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) | |||
589 | if it doesn't return EOPNOTSUPP.]) | 589 | if it doesn't return EOPNOTSUPP.]) |
590 | AC_DEFINE(_PATH_BTMP, "/var/log/btmp", [log for bad login attempts]) | 590 | AC_DEFINE(_PATH_BTMP, "/var/log/btmp", [log for bad login attempts]) |
591 | AC_DEFINE(USE_BTMP) | 591 | AC_DEFINE(USE_BTMP) |
592 | AC_DEFINE(LINUX_OOM_ADJUST, 1, [Adjust Linux out-of-memory killer]) | ||
592 | inet6_default_4in6=yes | 593 | inet6_default_4in6=yes |
593 | case `uname -r` in | 594 | case `uname -r` in |
594 | 1.*|2.0.*) | 595 | 1.*|2.0.*) |