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 /platform.c | |
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 'platform.c')
-rw-r--r-- | platform.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/platform.c b/platform.c index aee4b01e7..2dc4352f4 100644 --- a/platform.c +++ b/platform.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: platform.c,v 1.1 2006/08/30 17:24:41 djm Exp $ */ | 1 | /* $Id: platform.c,v 1.2 2009/12/08 02:39:48 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2006 Darren Tucker. All rights reserved. | 4 | * Copyright (c) 2006 Darren Tucker. All rights reserved. |
@@ -22,6 +22,15 @@ | |||
22 | #include "openbsd-compat/openbsd-compat.h" | 22 | #include "openbsd-compat/openbsd-compat.h" |
23 | 23 | ||
24 | void | 24 | void |
25 | platform_pre_listen(void) | ||
26 | { | ||
27 | #ifdef LINUX_OOM_ADJUST | ||
28 | /* Adjust out-of-memory killer so listening process is not killed */ | ||
29 | oom_adjust_setup(); | ||
30 | #endif | ||
31 | } | ||
32 | |||
33 | void | ||
25 | platform_pre_fork(void) | 34 | platform_pre_fork(void) |
26 | { | 35 | { |
27 | #ifdef USE_SOLARIS_PROCESS_CONTRACTS | 36 | #ifdef USE_SOLARIS_PROCESS_CONTRACTS |
@@ -43,4 +52,7 @@ platform_post_fork_child(void) | |||
43 | #ifdef USE_SOLARIS_PROCESS_CONTRACTS | 52 | #ifdef USE_SOLARIS_PROCESS_CONTRACTS |
44 | solaris_contract_post_fork_child(); | 53 | solaris_contract_post_fork_child(); |
45 | #endif | 54 | #endif |
55 | #ifdef LINUX_OOM_ADJUST | ||
56 | oom_adjust_restore(); | ||
57 | #endif | ||
46 | } | 58 | } |