Merge pull request #6420 from keszybz/gateway-name

Rename "gateway" to "_gateway" and other resolved changes
This commit is contained in:
Lennart Poettering
2017-08-01 09:43:41 +02:00
committed by GitHub
9 changed files with 55 additions and 10 deletions
+8
View File
@@ -543,6 +543,14 @@ int manager_dns_stub_start(Manager *m) {
assert(m);
if (m->dns_stub_listener_mode == DNS_STUB_LISTENER_NO)
log_debug("Not creating stub listener.");
else
log_debug("Creating stub listener using %s.",
m->dns_stub_listener_mode == DNS_STUB_LISTENER_UDP ? "UDP" :
m->dns_stub_listener_mode == DNS_STUB_LISTENER_TCP ? "TCP" :
"UDP/TCP");
if (IN_SET(m->dns_stub_listener_mode, DNS_STUB_LISTENER_YES, DNS_STUB_LISTENER_UDP))
r = manager_dns_stub_udp_fd(m);
+1 -1
View File
@@ -334,7 +334,7 @@ static int synthesize_gateway_ptr(Manager *m, int af, const union in_addr_union
if (n < 0)
return n;
return answer_add_addresses_ptr(answer, "gateway", addresses, n, af, address);
return answer_add_addresses_ptr(answer, "_gateway", addresses, n, af, address);
}
int dns_synthesize_answer(