tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) Fix server not exiting with jobs in background.

This commit is contained in:
Damien Miller 2000-09-13 10:43:26 +11:00
parent bac2d8aa5e
commit f384c366d3
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
20000913
- (djm) Fix server not exiting with jobs in background.
20000905 20000905
- (djm) Import OpenBSD CVS changes - (djm) Import OpenBSD CVS changes
- markus@cvs.openbsd.org 2000/08/31 15:52:24 - markus@cvs.openbsd.org 2000/08/31 15:52:24

3
serverloop.c
View File

@ -86,6 +86,7 @@ sigchld_handler2(int sig)
int save_errno = errno; int save_errno = errno;
debug("Received SIGCHLD."); debug("Received SIGCHLD.");
child_terminated = 1; child_terminated = 1;
child_has_selected = 0;
errno = save_errno; errno = save_errno;
} }
@ -652,6 +653,8 @@ server_loop2(void)
signal(SIGCHLD, sigchld_handler2); signal(SIGCHLD, sigchld_handler2);
} }
channel_after_select(&readset, &writeset); channel_after_select(&readset, &writeset);
if (child_terminated && child_has_selected)
break;
process_input(&readset); process_input(&readset);
process_output(&writeset); process_output(&writeset);
} }