Lennart Poettering
0084360296
Primarily clean-up error logging: log either all or no error messages in the various functions. Mostly this means the actual password querying calls no longer will log on their own, but the callers have to do so. Contains various other fixes too, for example ports some code over to use the clean-up macro. Should contain no functional changes.
65 lines
1.8 KiB
C
65 lines
1.8 KiB
C
/*-*- 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 <http://www.gnu.org/licenses/>.
|
|
***/
|
|
|
|
#include <signal.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
|
|
#include "log.h"
|
|
#include "process-util.h"
|
|
#include "util.h"
|
|
#include "spawn-ask-password-agent.h"
|
|
|
|
static pid_t agent_pid = 0;
|
|
|
|
int ask_password_agent_open(void) {
|
|
int r;
|
|
|
|
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;
|
|
|
|
r = fork_agent(&agent_pid,
|
|
NULL, 0,
|
|
SYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH,
|
|
SYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH, "--watch", NULL);
|
|
if (r < 0)
|
|
return log_error_errno(r, "Failed to fork TTY ask password agent: %m");
|
|
|
|
return 1;
|
|
}
|
|
|
|
void ask_password_agent_close(void) {
|
|
|
|
if (agent_pid <= 0)
|
|
return;
|
|
|
|
/* Inform agent that we are done */
|
|
(void) kill(agent_pid, SIGTERM);
|
|
(void) kill(agent_pid, SIGCONT);
|
|
(void) wait_for_terminate(agent_pid, NULL);
|
|
agent_pid = 0;
|
|
}
|