From f33d3ec1d7521c91da8b30ad5cb345d6416bb07d Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Thu, 12 Apr 2012 01:51:49 +0200 Subject: move more common files to shared/ and add them to shared.la --- src/shared/spawn-polkit-agent.c | 86 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 src/shared/spawn-polkit-agent.c (limited to 'src/shared/spawn-polkit-agent.c') diff --git a/src/shared/spawn-polkit-agent.c b/src/shared/spawn-polkit-agent.c new file mode 100644 index 0000000000..fd72588417 --- /dev/null +++ b/src/shared/spawn-polkit-agent.c @@ -0,0 +1,86 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +/*** + This file is part of systemd. + + Copyright 2011 Lennart Poettering + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see . +***/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "log.h" +#include "util.h" +#include "spawn-polkit-agent.h" + +static pid_t agent_pid = 0; + +int polkit_agent_open(void) { + int r; + int pipe_fd[2]; + char notify_fd[10 + 1]; + + if (agent_pid > 0) + return 0; + + /* We check STDIN here, not STDOUT, since this is about input, + * not output */ + if (!isatty(STDIN_FILENO)) + return 0; + + if (pipe2(pipe_fd, 0) < 0) + return -errno; + + snprintf(notify_fd, sizeof(notify_fd), "%i", pipe_fd[1]); + char_array_0(notify_fd); + + r = fork_agent(&agent_pid, + &pipe_fd[1], 1, + POLKIT_AGENT_BINARY_PATH, + POLKIT_AGENT_BINARY_PATH, "--notify-fd", notify_fd, NULL); + + /* Close the writing side, because that's the one for the agent */ + close_nointr_nofail(pipe_fd[1]); + + if (r < 0) + log_error("Failed to fork TTY ask password agent: %s", strerror(-r)); + else + /* Wait until the agent closes the fd */ + fd_wait_for_event(pipe_fd[0], POLLHUP, (usec_t) -1); + + close_nointr_nofail(pipe_fd[0]); + + return r; +} + +void polkit_agent_close(void) { + + if (agent_pid <= 0) + return; + + /* Inform agent that we are done */ + kill(agent_pid, SIGTERM); + kill(agent_pid, SIGCONT); + wait_for_terminate(agent_pid, NULL); + agent_pid = 0; +} -- cgit v1.2.3-54-g00ecf From 8aec53fb902563208f27a4452cec52190e901f32 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 13 Apr 2012 21:52:25 +0200 Subject: polkit: spawn agent in --fallback mode --- TODO | 2 -- src/shared/spawn-polkit-agent.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'src/shared/spawn-polkit-agent.c') diff --git a/TODO b/TODO index 2e20fd46e5..fa0905657c 100644 --- a/TODO +++ b/TODO @@ -21,8 +21,6 @@ Features: * place start-pre/start-post/... scripts in sub cgrouprs -* Make RuntimeWatchdogUSec= property writable - * make gtk-doc optional (like kmod?) * udev: find a way to tell udev to not cancel firmware requests in initramfs diff --git a/src/shared/spawn-polkit-agent.c b/src/shared/spawn-polkit-agent.c index fd72588417..fcb3722ddf 100644 --- a/src/shared/spawn-polkit-agent.c +++ b/src/shared/spawn-polkit-agent.c @@ -57,7 +57,7 @@ int polkit_agent_open(void) { 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]); -- cgit v1.2.3-54-g00ecf