chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shared: move unit-specific code from bus-util.h to bus-unit-util.h
[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..7dae4d14fe22648a64fcfb3f3ef2fdd84cc0b135 100644
(file)
--- a/
src/shared/spawn-polkit-agent.c
+++ b/
src/shared/spawn-polkit-agent.c
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-19,19
+17,21
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <sys/types.h>
+#include <errno.h>
+#include <poll.h>
+#include <signal.h>
#include <stdlib.h>
#include <unistd.h>
#include <stdlib.h>
#include <unistd.h>
-#include <string.h>
-#include <sys/prctl.h>
-#include <signal.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/poll.h>
+#include "fd-util.h"
+#include "io-util.h"
#include "log.h"
#include "log.h"
-#include "util.h"
+#include "macro.h"
+#include "process-util.h"
#include "spawn-polkit-agent.h"
#include "spawn-polkit-agent.h"
+#include "stdio-util.h"
+#include "time-util.h"
+#include "util.h"
#ifdef ENABLE_POLKIT
static pid_t agent_pid = 0;
#ifdef ENABLE_POLKIT
static pid_t agent_pid = 0;
@@
-39,11
+39,15
@@
static pid_t agent_pid = 0;
int polkit_agent_open(void) {
int r;
int pipe_fd[2];
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;
if (agent_pid > 0)
return 0;
+ /* Clients that run as root don't need to activate/query polkit */
+ if (geteuid() == 0)
+ return 0;
+
/* We check STDIN here, not STDOUT, since this is about input,
* not output */
if (!isatty(STDIN_FILENO))
/* We check STDIN here, not STDOUT, since this is about input,
* not output */
if (!isatty(STDIN_FILENO))
@@
-52,8
+56,7
@@
int polkit_agent_open(void) {
if (pipe2(pipe_fd, 0) < 0)
return -errno;
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,
r = fork_agent(&agent_pid,
&pipe_fd[1], 1,
@@
-64,10
+67,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]);
@@
-80,9
+83,10
@@
void polkit_agent_close(void) {
return;
/* Inform agent that we are done */
return;
/* Inform agent that we are done */
- kill(agent_pid, SIGTERM);
- kill(agent_pid, SIGCONT);
- wait_for_terminate(agent_pid, NULL);
+ (void) kill(agent_pid, SIGTERM);
+ (void) kill(agent_pid, SIGCONT);
+
+ (void) wait_for_terminate(agent_pid, NULL);
agent_pid = 0;
}
agent_pid = 0;
}