Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-07-10 00:01:15 +01:00
5 changed files with 11 additions and 10 deletions

View File

@ -248,7 +248,7 @@ server_send_exit(void)
}
RB_FOREACH_SAFE(s, sessions, &sessions, s1)
session_destroy(s);
session_destroy(s, __func__);
}
/* Update socket execute permissions based on whether sessions are attached. */
@ -346,6 +346,7 @@ server_signal(int sig)
{
int fd;
log_debug("%s: %s", __func__, strsignal(sig));
switch (sig) {
case SIGTERM:
server_exit = 1;