ask-password: fix handling of timeouts when waiting for password

diff --git a/src/ask-password-api.c b/src/ask-password-api.c
index cd663ae09ccc5712c7b019d0fafaa7f8676d5cd6..845517a6905d12004bf120ce85657f2bad60822b 100644 (file)
--- a/src/ask-password-api.c
+++ b/src/ask-password-api.c
@@ -111,7 +111,7 @@ int ask_password_tty(
                         y = now(CLOCK_MONOTONIC);
 
                         if (y > until) {
-                                r = -ETIMEDOUT;
+                                r = -ETIME;
                                 goto finish;
                         }
 
@@ -373,7 +373,7 @@ int ask_password_agent(
                         goto finish;
                 }
 
-                if ((k = poll(pollfd, _FD_MAX, until-t/USEC_PER_MSEC)) < 0) {
+                if ((k = poll(pollfd, _FD_MAX, (until-t)/USEC_PER_MSEC)) < 0) {
 
                         if (errno == EINTR)
                                 continue;