Commit f2bf36c3 authored by Darren Tucker's avatar Darren Tucker

- (dtucker) [platform.c platform.h sshd.c] bz#2156: restore Linux oom_adj

   setting when handling SIGHUP to maintain behaviour over retart.  Patch
   from Matthew Ife.
parent e90a06ae
20130922
- (dtucker) [platform.c platform.h sshd.c] bz#2156: restore Linux oom_adj
setting when handling SIGHUP to maintain behaviour over retart. Patch
from Matthew Ife.
20130918
- (dtucker) [sshd_config] Trailing whitespace; from jstjohn at purdue edu.
......
/* $Id: platform.c,v 1.19 2013/03/12 00:31:05 dtucker Exp $ */
/* $Id: platform.c,v 1.20 2013/09/22 09:02:40 dtucker Exp $ */
/*
* Copyright (c) 2006 Darren Tucker. All rights reserved.
......@@ -54,6 +54,14 @@ platform_pre_fork(void)
#endif
}
void
platform_pre_restart(void)
{
#ifdef LINUX_OOM_ADJUST
oom_adjust_restore();
#endif
}
void
platform_post_fork_parent(pid_t child_pid)
{
......
/* $Id: platform.h,v 1.8 2013/03/12 00:31:05 dtucker Exp $ */
/* $Id: platform.h,v 1.9 2013/09/22 09:02:40 dtucker Exp $ */
/*
* Copyright (c) 2006 Darren Tucker. All rights reserved.
......@@ -22,6 +22,7 @@
void platform_pre_listen(void);
void platform_pre_fork(void);
void platform_pre_restart(void);
void platform_post_fork_parent(pid_t child_pid);
void platform_post_fork_child(void);
int platform_privileged_uidswap(void);
......
......@@ -315,6 +315,7 @@ static void
sighup_restart(void)
{
logit("Received SIGHUP; restarting.");
platform_pre_restart();
close_listen_socks();
close_startup_pipes();
alarm(0); /* alarm timer persists across exec */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment