X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fspawn-polkit-agent.c;h=4db249e1cac8fd298fe072c15116d2925581f061;hb=d13c4b0f724ceae4237d4bdd2d912ed5c92ba93f;hp=fd72588417180352d0f1ef16f360fe87747af1d0;hpb=f33d3ec1d7521c91da8b30ad5cb345d6416bb07d;p=elogind.git
diff --git a/src/shared/spawn-polkit-agent.c b/src/shared/spawn-polkit-agent.c
index fd7258841..4db249e1c 100644
--- a/src/shared/spawn-polkit-agent.c
+++ b/src/shared/spawn-polkit-agent.c
@@ -19,26 +19,24 @@
along with systemd; If not, see .
***/
-#include
#include
#include
-#include
-#include
#include
-#include
#include
-#include
+#include
#include "log.h"
#include "util.h"
+#include "process-util.h"
#include "spawn-polkit-agent.h"
+#ifdef ENABLE_POLKIT
static pid_t agent_pid = 0;
int polkit_agent_open(void) {
int r;
int pipe_fd[2];
- char notify_fd[10 + 1];
+ char notify_fd[DECIMAL_STR_MAX(int) + 1];
if (agent_pid > 0)
return 0;
@@ -51,24 +49,23 @@ int polkit_agent_open(void) {
if (pipe2(pipe_fd, 0) < 0)
return -errno;
- snprintf(notify_fd, sizeof(notify_fd), "%i", pipe_fd[1]);
- char_array_0(notify_fd);
+ xsprintf(notify_fd, "%i", pipe_fd[1]);
r = fork_agent(&agent_pid,
&pipe_fd[1], 1,
POLKIT_AGENT_BINARY_PATH,
- POLKIT_AGENT_BINARY_PATH, "--notify-fd", notify_fd, NULL);
+ POLKIT_AGENT_BINARY_PATH, "--notify-fd", notify_fd, "--fallback", NULL);
/* Close the writing side, because that's the one for the agent */
- close_nointr_nofail(pipe_fd[1]);
+ 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 */
- fd_wait_for_event(pipe_fd[0], POLLHUP, (usec_t) -1);
+ fd_wait_for_event(pipe_fd[0], POLLHUP, USEC_INFINITY);
- close_nointr_nofail(pipe_fd[0]);
+ safe_close(pipe_fd[0]);
return r;
}
@@ -81,6 +78,17 @@ void polkit_agent_close(void) {
/* 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;
}
+
+#else
+
+int polkit_agent_open(void) {
+ return 0;
+}
+
+void polkit_agent_close(void) {
+}
+
+#endif