resolved,networkd: unify ResolveSupport enum

networkd previously knew an enum "ResolveSupport" for configuring
per-interface LLMNR support, resolved had a similar enum just called
"Support", with the same value and similar pasers.

Unify this, call the enum ResolveSupport, and port both daemons to it.
This commit is contained in:
Lennart Poettering
2016-01-05 17:30:51 +01:00
parent b18b866215
commit af49ca27ff
16 changed files with 108 additions and 113 deletions
+2 -2
View File
@@ -42,7 +42,7 @@ int manager_mdns_start(Manager *m) {
assert(m);
if (m->mdns_support == SUPPORT_NO)
if (m->mdns_support == RESOLVE_SUPPORT_NO)
return 0;
r = manager_mdns_ipv4_fd(m);
@@ -63,7 +63,7 @@ int manager_mdns_start(Manager *m) {
eaddrinuse:
log_warning("There appears to be another mDNS responder running. Turning off mDNS support.");
m->mdns_support = SUPPORT_NO;
m->mdns_support = RESOLVE_SUPPORT_NO;
manager_mdns_stop(m);
return 0;