chiark / gitweb /
resolved: stop the prober when we detect a conflict in LLMNR
authorLennart Poettering <lennart@poettering.net>
Tue, 5 Aug 2014 02:17:45 +0000 (04:17 +0200)
committerLennart Poettering <lennart@poettering.net>
Tue, 5 Aug 2014 02:17:45 +0000 (04:17 +0200)
src/resolve/resolved-dns-zone.c

index 04a4674..72321d0 100644 (file)
@@ -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);
 }