chiark / gitweb /
ask-password: fix handling of timeouts when waiting for password
authorLennart Poettering <lennart@poettering.net>
Wed, 23 Feb 2011 00:12:29 +0000 (01:12 +0100)
committerLennart Poettering <lennart@poettering.net>
Wed, 23 Feb 2011 00:12:29 +0000 (01:12 +0100)
src/ask-password-api.c

index cd663ae..845517a 100644 (file)
@@ -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;