summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-08-05 04:17:45 +0200
committerLennart Poettering <lennart@poettering.net>2014-08-05 04:17:45 +0200
commitd84b686f06a7f724c12dcace0ab5cb82d01885f9 (patch)
tree1a8f96d105e6c6a065f2051dfb0a480c0be9fc8b /src
parent60eb3f7cf1b9c183559ce5c9a21cf2cfd6e6da05 (diff)
resolved: stop the prober when we detect a conflict in LLMNR
Diffstat (limited to 'src')
-rw-r--r--src/resolve/resolved-dns-zone.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/resolve/resolved-dns-zone.c b/src/resolve/resolved-dns-zone.c
index 04a46745f7..72321d0c6b 100644
--- a/src/resolve/resolved-dns-zone.c
+++ b/src/resolve/resolved-dns-zone.c
@@ -496,6 +496,8 @@ void dns_zone_item_conflict(DnsZoneItem *i) {
dns_resource_record_to_string(i->rr, &pretty);
log_info("Detected conflict on %s", strna(pretty));
+ dns_zone_item_probe_stop(i);
+
/* Withdraw the conflict item */
i->state = DNS_ZONE_ITEM_WITHDRAWN;
@@ -522,7 +524,6 @@ void dns_zone_item_ready(DnsZoneItem *i) {
dns_zone_item_probe_stop(i);
i->state = DNS_ZONE_ITEM_ESTABLISHED;
-
} else
dns_zone_item_conflict(i);
}