X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftty-ask-password-agent.c;h=4a29abacbbcc65e91b7b12c8394071f4312695ac;hb=7dcda352a609d063098e238db09c03cdc25c564b;hp=a414cba3748c27c16cba6ad82a5fbc2f5a4f7bbb;hpb=d55f4f3f92f56f76bdd06192d6a2ef3ee9fe4772;p=elogind.git diff --git a/src/tty-ask-password-agent.c b/src/tty-ask-password-agent.c index a414cba37..4a29abacb 100644 --- a/src/tty-ask-password-agent.c +++ b/src/tty-ask-password-agent.c @@ -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)