resolve: add distinct bus error code for hosts that exist but lack A or AAAA records

diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c
index 4a011efc4db7669c6d4ced7285c852ac8ee40a23..50eb012f8e76b447fba0fa011adf2d300b4b98ff 100644 (file)
--- a/src/resolve/resolved-bus.c
+++ b/src/resolve/resolved-bus.c
@@ -138,8 +138,10 @@ static void bus_method_resolve_hostname_complete(DnsQuery *q) {
                         added ++;
                 }
 
-                if (added <= 0)
-                        goto parse_fail;
+                if (added <= 0) {
+                        r = sd_bus_reply_method_errorf(q->request, BUS_ERROR_NO_SUCH_RR, "Hostname %s does not have RR of this type", q->request_hostname);
+                        break;
+                }
 
                 r = sd_bus_message_close_container(reply);
                 if (r < 0)
@@ -315,8 +317,10 @@ static void bus_method_resolve_address_complete(DnsQuery *q) {
                         added ++;
                 }
 
-                if (added <= 0)
-                        goto parse_fail;
+                if (added <= 0) {
+                        r = sd_bus_reply_method_errorf(q->request, BUS_ERROR_NO_SUCH_RR, "Address %s does not have RR of this type", ip);
+                        break;
+                }
 
                 r = sd_bus_message_close_container(reply);
                 if (r < 0)

diff --git a/src/resolve/resolved-dns-query.c b/src/resolve/resolved-dns-query.c
index a9880524e617f7bb6e5345ffd3dc84345cc661ca..dd812150cfc6554da47a98a1e5c02fc26f990ef9 100644 (file)
--- a/src/resolve/resolved-dns-query.c
+++ b/src/resolve/resolved-dns-query.c
@@ -107,12 +107,9 @@ int dns_query_transaction_reply(DnsQueryTransaction *t, DnsPacket *p) {
 
         t->packet = dns_packet_ref(p);
 
-        if (DNS_PACKET_RCODE(p) == DNS_RCODE_SUCCESS) {
-                if( be16toh(DNS_PACKET_HEADER(p)->ancount) > 0)
-                        dns_query_transaction_set_state(t, DNS_QUERY_SUCCESS);
-                else
-                        dns_query_transaction_set_state(t, DNS_QUERY_INVALID_REPLY);
-        } else
+        if (DNS_PACKET_RCODE(p) == DNS_RCODE_SUCCESS)
+                dns_query_transaction_set_state(t, DNS_QUERY_SUCCESS);
+        else
                 dns_query_transaction_set_state(t, DNS_QUERY_FAILURE);
 
         return 0;

diff --git a/src/shared/bus-errors.h b/src/shared/bus-errors.h
index 388b42b4fd897ae89ef8ea1668c6ee9535ae3c0e..08a7acc99c3b70891cdd42bf09e347b9ee3b0edb 100644 (file)
--- a/src/shared/bus-errors.h
+++ b/src/shared/bus-errors.h
@@ -62,4 +62,5 @@
 
 #define BUS_ERROR_NO_NAME_SERVERS "org.freedesktop.resolve1.NoNameServers"
 #define BUS_ERROR_INVALID_REPLY "org.freedesktop.resolve1.InvalidReply"
+#define BUS_ERROR_NO_SUCH_RR "org.freedesktop.resolve1.NoSuchRR"
 #define _BUS_ERROR_DNS "org.freedesktop.resolve1.DnsError."