shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-25 01:34:28 +03:00
Code

ask-password: support passwords without timeouts

Browse Source
This commit is contained in:
Lennart Poettering 2011-04-13 21:42:46 +02:00
parent d55f4f3f92
commit 7dcda352a6
5 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ask-password-api.c
View File

@ -404,13 +404,13 @@ int ask_password_agent(
t = now(CLOCK_MONOTONIC);
if (until <= t) {
if (until > 0 && until <= t) {
log_notice("Timed out");
r = -ETIME;
goto finish;
}
if ((k = poll(pollfd, _FD_MAX, (until-t)/USEC_PER_MSEC)) < 0) {
if ((k = poll(pollfd, _FD_MAX, until > 0 ? (int) ((until-t)/USEC_PER_MSEC) : -1)) < 0) {
if (errno == EINTR)
continue;

12
src/ask-password.c
View File

@ -101,7 +101,7 @@ static int parse_argv(int argc, char *argv[]) {
break;
case ARG_TIMEOUT:
if (parse_usec(optarg, &arg_timeout) < 0 || arg_timeout <= 0) {
if (parse_usec(optarg, &arg_timeout) < 0) {
log_error("Failed to parse --timeout parameter %s", optarg);
return -EINVAL;
}
@ -139,6 +139,7 @@ static int parse_argv(int argc, char *argv[]) {
int main(int argc, char *argv[]) {
int r;
usec_t timeout;
log_parse_environment();
log_open();
@ -146,10 +147,15 @@ int main(int argc, char *argv[]) {
if ((r = parse_argv(argc, argv)) <= 0)
goto finish;
if (arg_timeout > 0)
timeout = now(CLOCK_MONOTONIC) + arg_timeout;
else
timeout = 0;
if (arg_use_tty && isatty(STDIN_FILENO)) {
char *password = NULL;
if ((r = ask_password_tty(arg_message, now(CLOCK_MONOTONIC) + arg_timeout, NULL, &password)) >= 0) {
if ((r = ask_password_tty(arg_message, timeout, NULL, &password)) >= 0) {
puts(password);
free(password);
}
@ -157,7 +163,7 @@ int main(int argc, char *argv[]) {
} else {
char **l;
if ((r = ask_password_agent(arg_message, arg_icon, now(CLOCK_MONOTONIC) + arg_timeout, arg_accept_cached, &l)) >= 0) {
if ((r = ask_password_agent(arg_message, arg_icon, timeout, arg_accept_cached, &l)) >= 0) {
char **p;
STRV_FOREACH(p, l) {

7
src/cryptsetup.c
View File

@ -309,7 +309,10 @@ int main(int argc, char *argv[]) {
if (opt_readonly)
flags |= CRYPT_ACTIVATE_READONLY;
until = now(CLOCK_MONOTONIC) + (opt_timeout > 0 ? opt_timeout : DEFAULT_TIMEOUT_USEC);
if (opt_timeout > 0)
until = now(CLOCK_MONOTONIC) + opt_timeout;
else
until = 0;
opt_tries = opt_tries > 0 ? opt_tries : 3;
opt_key_size = (opt_key_size > 0 ? opt_key_size : 256);
@ -404,6 +407,8 @@ int main(int argc, char *argv[]) {
}
}
k = 0;
if (!opt_type || streq(opt_type, CRYPT_LUKS1))
k = crypt_load(cd, CRYPT_LUKS1, NULL);

2
src/gnome-ask-password-agent.vala
View File

@ -165,7 +165,7 @@ public class MyStatusIcon : StatusIcon {
if (not_after_as_string.scanf("%llu", out not_after) != 1)
return false;
if (not_after < now)
if (not_after > 0 && not_after < now)
return false;
socket = key_file.get_string("Ask", "Socket");

12
src/tty-ask-password-agent.c
View File

@ -261,7 +261,6 @@ static int parse_password(const char *filename, char **wall) {
FILE *f;
int r;
usec_t n;
assert(filename);
@ -279,16 +278,17 @@ static int parse_password(const char *filename, char **wall) {
goto finish;
}
if (!socket_name || not_after <= 0) {
if (!socket_name) {
log_error("Invalid password file %s", filename);
r = -EBADMSG;
goto finish;
}
n = now(CLOCK_MONOTONIC);
if (n > not_after) {
r = 0;
goto finish;
if (not_after > 0) {
if (now(CLOCK_MONOTONIC) > not_after) {
r = 0;
goto finish;
}
}
if (arg_action == ACTION_LIST)