picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ask-password: reset signal mask after we are done

This commit is contained in:
Lennart Poettering 2011-03-16 02:55:27 +01:00
parent 0ac1082273
commit f9b72cd804
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@ -26,6 +26,8 @@ F15:
* recreate private socket on SIGUSR2
* serialize condition execution information
Features:
* optionally create watched directories in .path units

12
src/ask-password-api.c
View File

@ -271,11 +271,15 @@ int ask_password_agent(
FILE *f = NULL;
char *socket_name = NULL;
int socket_fd = -1, signal_fd = -1;
sigset_t mask;
sigset_t mask, oldmask;
struct pollfd pollfd[_FD_MAX];
assert(_passphrases);
assert_se(sigemptyset(&mask) == 0);
sigset_add_many(&mask, SIGINT, SIGTERM, -1);
assert_se(sigprocmask(SIG_BLOCK, &mask, &oldmask) == 0);
mkdir_p("/dev/.run/systemd/ask-password", 0755);
if ((fd = mkostemp(temp, O_CLOEXEC|O_CREAT|O_WRONLY)) < 0) {
@ -294,10 +298,6 @@ int ask_password_agent(
fd = -1;
assert_se(sigemptyset(&mask) == 0);
sigset_add_many(&mask, SIGINT, SIGTERM, -1);
assert_se(sigprocmask(SIG_SETMASK, &mask, NULL) == 0);
if ((signal_fd = signalfd(-1, &mask, SFD_NONBLOCK|SFD_CLOEXEC)) < 0) {
log_error("signalfd(): %m");
r = -errno;
@ -493,6 +493,8 @@ finish:
if (final[0])
unlink(final);
assert_se(sigprocmask(SIG_SETMASK, &oldmask, NULL) == 0);
return r;
}