chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ask-password: modernizations
[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 fd72588417180352d0f1ef16f360fe87747af1d0..fccf1e9173b709ffc6bb7fd7402ef8f9103ba1b4 100644
(file)
--- a/
src/shared/spawn-polkit-agent.c
+++ b/
src/shared/spawn-polkit-agent.c
@@
-33,6
+33,7
@@
#include "util.h"
#include "spawn-polkit-agent.h"
#include "util.h"
#include "spawn-polkit-agent.h"
+#ifdef ENABLE_POLKIT
static pid_t agent_pid = 0;
int polkit_agent_open(void) {
static pid_t agent_pid = 0;
int polkit_agent_open(void) {
@@
-57,10
+58,10
@@
int polkit_agent_open(void) {
r = fork_agent(&agent_pid,
&pipe_fd[1], 1,
POLKIT_AGENT_BINARY_PATH,
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 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));
if (r < 0)
log_error("Failed to fork TTY ask password agent: %s", strerror(-r));
@@
-68,7
+69,7
@@
int polkit_agent_open(void) {
/* Wait until the agent closes the fd */
fd_wait_for_event(pipe_fd[0], POLLHUP, (usec_t) -1);
/* Wait until the agent closes the fd */
fd_wait_for_event(pipe_fd[0], POLLHUP, (usec_t) -1);
-
close_nointr_nofail
(pipe_fd[0]);
+
safe_close
(pipe_fd[0]);
return r;
}
return r;
}
@@
-84,3
+85,14
@@
void polkit_agent_close(void) {
wait_for_terminate(agent_pid, NULL);
agent_pid = 0;
}
wait_for_terminate(agent_pid, NULL);
agent_pid = 0;
}
+
+#else
+
+int polkit_agent_open(void) {
+ return 0;
+}
+
+void polkit_agent_close(void) {
+}
+
+#endif