tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-09-25 19:08:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
setting when handling SIGHUP to maintain behaviour over retart.  Patch
   from Matthew Ife.
This commit is contained in:
Darren Tucker 2013-09-22 19:02:40 +10:00
parent e90a06ae57
commit f2bf36c3eb
4 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
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 20130918
- (dtucker) [sshd_config] Trailing whitespace; from jstjohn at purdue edu. - (dtucker) [sshd_config] Trailing whitespace; from jstjohn at purdue edu.

10
platform.c
View File

@ -1,4 +1,4 @@
/* $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. * Copyright (c) 2006 Darren Tucker. All rights reserved.
@ -54,6 +54,14 @@ platform_pre_fork(void)
#endif #endif
} }
void
platform_pre_restart(void)
{
#ifdef LINUX_OOM_ADJUST
oom_adjust_restore();
#endif
}
void void
platform_post_fork_parent(pid_t child_pid) platform_post_fork_parent(pid_t child_pid)
{ {

3
platform.h
View File

@ -1,4 +1,4 @@
/* $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. * Copyright (c) 2006 Darren Tucker. All rights reserved.
@ -22,6 +22,7 @@
void platform_pre_listen(void); void platform_pre_listen(void);
void platform_pre_fork(void); void platform_pre_fork(void);
void platform_pre_restart(void);
void platform_post_fork_parent(pid_t child_pid); void platform_post_fork_parent(pid_t child_pid);
void platform_post_fork_child(void); void platform_post_fork_child(void);
int platform_privileged_uidswap(void); int platform_privileged_uidswap(void);

1
sshd.c
View File

@ -315,6 +315,7 @@ static void
sighup_restart(void) sighup_restart(void)
{ {
logit("Received SIGHUP; restarting."); logit("Received SIGHUP; restarting.");
platform_pre_restart();
close_listen_socks(); close_listen_socks();
close_startup_pipes(); close_startup_pipes();
alarm(0); /* alarm timer persists across exec */ alarm(0); /* alarm timer persists across exec */