1
0
mirror of https://github.com/systemd/systemd.git synced 2024-12-25 01:34:28 +03:00

Merge pull request #251 from zonque/signal

core: execute: fix regression in pam_setup()
This commit is contained in:
Kay Sievers 2015-06-17 15:09:32 +02:00
commit ed443d9862

View File

@ -771,7 +771,7 @@ static int setup_pam(
};
pam_handle_t *handle = NULL;
sigset_t ss, old_ss;
sigset_t old_ss;
int pam_code = PAM_SUCCESS;
int err;
char **e = NULL;
@ -868,6 +868,11 @@ static int setup_pam(
/* Check if our parent process might already have
* died? */
if (getppid() == parent_pid) {
sigset_t ss;
assert_se(sigemptyset(&ss) >= 0);
assert_se(sigaddset(&ss, SIGTERM) >= 0);
for (;;) {
if (sigwait(&ss, &sig) < 0) {
if (errno == EINTR)