diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-08-06 16:32:17 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-08-11 15:06:22 +0200 |
| commit | 818f766b12e025683cf4fed12b3da2a025bb0b31 (patch) | |
| tree | fd3fc9d812cea184649c6be1f5feedf49e867548 | |
| parent | a407657425a3e47fd2b559cd3bc800f791303f63 (diff) | |
resolved: properly pass aborted transaction result back to clients
| -rw-r--r-- | src/resolve/resolved-bus.c | 7 | ||||
| -rw-r--r-- | src/shared/bus-errors.h | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c index e158fdc22b..89a9300dfb 100644 --- a/src/resolve/resolved-bus.c +++ b/src/resolve/resolved-bus.c @@ -51,11 +51,14 @@ static int reply_query_state(DnsQuery *q) { case DNS_TRANSACTION_ATTEMPTS_MAX_REACHED: return sd_bus_reply_method_errorf(q->request, SD_BUS_ERROR_TIMEOUT, "All attempts to contact name servers or networks failed"); + case DNS_TRANSACTION_INVALID_REPLY: + return sd_bus_reply_method_errorf(q->request, BUS_ERROR_INVALID_REPLY, "Received invalid reply"); + case DNS_TRANSACTION_RESOURCES: return sd_bus_reply_method_errorf(q->request, BUS_ERROR_NO_RESOURCES, "Not enough resources"); - case DNS_TRANSACTION_INVALID_REPLY: - return sd_bus_reply_method_errorf(q->request, BUS_ERROR_INVALID_REPLY, "Received invalid reply"); + case DNS_TRANSACTION_ABORTED: + return sd_bus_reply_method_errorf(q->request, BUS_ERROR_ABORTED, "Query aborted"); case DNS_TRANSACTION_FAILURE: { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; diff --git a/src/shared/bus-errors.h b/src/shared/bus-errors.h index e4d0d435a5..504ab1f796 100644 --- a/src/shared/bus-errors.h +++ b/src/shared/bus-errors.h @@ -65,4 +65,5 @@ #define BUS_ERROR_NO_SUCH_RR "org.freedesktop.resolve1.NoSuchRR" #define BUS_ERROR_NO_RESOURCES "org.freedesktop.resolve1.NoResources" #define BUS_ERROR_CNAME_LOOP "org.freedesktop.resolve1.CNameLoop" +#define BUS_ERROR_ABORTED "org.freedesktop.resolve1.Aborted" #define _BUS_ERROR_DNS "org.freedesktop.resolve1.DnsError." |