chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
21bc923
)
ask-password: fix handling of timeouts when waiting for password
author
Lennart Poettering
<lennart@poettering.net>
Wed, 23 Feb 2011 00:12:29 +0000
(
01:12
+0100)
committer
Lennart Poettering
<lennart@poettering.net>
Wed, 23 Feb 2011 00:12:29 +0000
(
01:12
+0100)
src/ask-password-api.c
patch
|
blob
|
history
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 = -ETIME
DOUT
;
+ 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;