simono41/shellinabox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #338 from BenjiWiebe/master

Browse source 
Kill children with HUP instead of TERM at end of session
This commit is contained in:
Luka Krajger 2015-08-27 23:49:37 +02:00
commit 6f30739e33
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
shellinabox/launcher.c
View file

@ -1629,6 +1629,10 @@ static void childProcess(struct Service *service, int width, int height,
} }
} }
// Reset the sigaction for HUP to the default, so the child does not inherit the action of SIG_IGN from us.
// We need the child to be able to get HUP's because we send HUP if the session times out/closes.
signal(SIGHUP, SIG_DFL);
// Finally, launch the child process. // Finally, launch the child process.
if (service->useLogin == 1) { if (service->useLogin == 1) {
// At login service launch, we try to pass real IP in '-h' parameter. Real // At login service launch, we try to pass real IP in '-h' parameter. Real
@ -1700,8 +1704,8 @@ static void launcherDaemon(int fd) {
errno = 0; errno = 0;
NOINTR(pid = waitpid(request.terminate, &status, WNOHANG)); NOINTR(pid = waitpid(request.terminate, &status, WNOHANG));
if (pid == 0 && errno == 0) { if (pid == 0 && errno == 0) {
if (kill(request.terminate, SIGTERM) == 0) { if (kill(request.terminate, SIGHUP) == 0) {
debug("[server] Terminating child %d! [kill]", request.terminate); debug("[server] Terminating child %d! [HUP]", request.terminate);
} else { } else {
debug("[server] Terminating child %d failed! [%s]", request.terminate, debug("[server] Terminating child %d failed! [%s]", request.terminate,
strerror(errno)); strerror(errno));