summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorTobias Stoeckmann <tobias@cvs.openbsd.org>2017-01-30 21:45:28 +0000
committerTobias Stoeckmann <tobias@cvs.openbsd.org>2017-01-30 21:45:28 +0000
commitc580ce6303f56f9cbf44a6f708f91a95e85de566 (patch)
tree2b5773d1a8248eb4f294abef3ab4f9d4b19f7ca8 /app
parentaace19a8e7d061471d5591eb99d243f02e721390 (diff)
Reset SIGCHLD signal handler to previous value in error path, too.
ok matthieu@
Diffstat (limited to 'app')
-rw-r--r--app/xenodm/xenodm/session.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/xenodm/xenodm/session.c b/app/xenodm/xenodm/session.c
index 905d4b925..ca19a8965 100644
--- a/app/xenodm/xenodm/session.c
+++ b/app/xenodm/xenodm/session.c
@@ -103,7 +103,7 @@ AbortClient (pid_t pid)
LogError ("xdm can't kill client\n");
case EINVAL:
case ESRCH:
- return;
+ goto done;
}
}
sleep(10);
@@ -115,6 +115,7 @@ AbortClient (pid_t pid)
}
sig = SIGKILL;
}
+done:
signal(SIGCHLD, old);
}