chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
60eb3f7
)
resolved: stop the prober when we detect a conflict in LLMNR
author
Lennart Poettering
<lennart@poettering.net>
Tue, 5 Aug 2014 02:17:45 +0000
(
04:17
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 5 Aug 2014 02:17:45 +0000
(
04:17
+0200)
src/resolve/resolved-dns-zone.c
patch
|
blob
|
history
diff --git
a/src/resolve/resolved-dns-zone.c
b/src/resolve/resolved-dns-zone.c
index 04a46745f77b8cf6b439eefd658c31d63b5f9296..72321d0c6b2c8db70ce65fdd26db2f28c3304a88 100644
(file)
--- 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);
}