chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tmpfiles: implement augmenting of existing ACLs
[elogind.git]
/
src
/
shared
/
spawn-polkit-agent.c
diff --git
a/src/shared/spawn-polkit-agent.c
b/src/shared/spawn-polkit-agent.c
index fccf1e9173b709ffc6bb7fd7402ef8f9103ba1b4..e7419b5ee4c9e206951ba7a2af9b53a678a86e1d 100644
(file)
--- a/
src/shared/spawn-polkit-agent.c
+++ b/
src/shared/spawn-polkit-agent.c
@@
-64,10
+64,10
@@
int polkit_agent_open(void) {
safe_close(pipe_fd[1]);
if (r < 0)
safe_close(pipe_fd[1]);
if (r < 0)
- log_error
("Failed to fork TTY ask password agent: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to fork TTY ask password agent: %m"
);
else
/* Wait until the agent closes the fd */
else
/* Wait until the agent closes the fd */
- fd_wait_for_event(pipe_fd[0], POLLHUP,
(usec_t) -1
);
+ fd_wait_for_event(pipe_fd[0], POLLHUP,
USEC_INFINITY
);
safe_close(pipe_fd[0]);
safe_close(pipe_fd[0]);
@@
-82,7
+82,7
@@
void polkit_agent_close(void) {
/* Inform agent that we are done */
kill(agent_pid, SIGTERM);
kill(agent_pid, SIGCONT);
/* Inform agent that we are done */
kill(agent_pid, SIGTERM);
kill(agent_pid, SIGCONT);
- wait_for_terminate(agent_pid, NULL);
+
(void)
wait_for_terminate(agent_pid, NULL);
agent_pid = 0;
}
agent_pid = 0;
}