SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lennart Poettering
2014-07-16 03:28:18 +02:00
parent 9d6db739ce
commit b9d394ea56
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resolve/resolved-bus.c
+8 -4
View File
@@ -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)
src/resolve/resolved-dns-query.c
+3 -6
View File
@@ -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;
src/shared/bus-errors.h
+1
View File
@@ -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."