diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-04-13 21:42:46 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-04-13 21:42:46 +0200 |
| commit | 7dcda352a609d063098e238db09c03cdc25c564b (patch) | |
| tree | 545a8c2f76af39cae406633c5bc181824ae076cc /src/ask-password.c | |
| parent | d55f4f3f92f56f76bdd06192d6a2ef3ee9fe4772 (diff) | |
ask-password: support passwords without timeouts
Diffstat (limited to 'src/ask-password.c')
| -rw-r--r-- | src/ask-password.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/ask-password.c b/src/ask-password.c index c77376482e..6330369b4f 100644 --- a/src/ask-password.c +++ b/src/ask-password.c @@ -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) { |