From 971fea32035b642eda6154ef963a6269e9d271ec Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 27 Nov 2017 16:28:53 +0100 Subject: [PATCH] sd-resolve: propagate timeouts in sd_resolve_wait() the same way as in sd_bus_wait(): ETIMEDOUT Thankfully this is an internal API still, so we can mkae changes like this. --- src/basic/io-util.c | 1 - src/libsystemd/sd-resolve/sd-resolve.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/basic/io-util.c b/src/basic/io-util.c index 98bb1857d9..77c9bdc739 100644 --- a/src/basic/io-util.c +++ b/src/basic/io-util.c @@ -200,7 +200,6 @@ int fd_wait_for_event(int fd, int event, usec_t t) { r = ppoll(&pollfd, 1, t == USEC_INFINITY ? NULL : timespec_store(&ts, t), NULL); if (r < 0) return -errno; - if (r == 0) return 0; diff --git a/src/libsystemd/sd-resolve/sd-resolve.c b/src/libsystemd/sd-resolve/sd-resolve.c index 986768e7b3..61a0a4c1de 100644 --- a/src/libsystemd/sd-resolve/sd-resolve.c +++ b/src/libsystemd/sd-resolve/sd-resolve.c @@ -890,6 +890,8 @@ _public_ int sd_resolve_wait(sd_resolve *resolve, uint64_t timeout_usec) { if (r < 0) return r; + if (r == 0) + return -ETIMEDOUT; return sd_resolve_process(resolve); } -- 2.25.1