From d84b686f06a7f724c12dcace0ab5cb82d01885f9 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 5 Aug 2014 04:17:45 +0200 Subject: [PATCH] resolved: stop the prober when we detect a conflict in LLMNR --- src/resolve/resolved-dns-zone.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/resolve/resolved-dns-zone.c b/src/resolve/resolved-dns-zone.c index 04a46745f77..72321d0c6b2 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); }