bus-proxyd: fix incorrect comparison

[elogind.git] / src / resolve / resolved-manager.c

diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index 96728433b3c7f5cbd9baa347c10659066c4f6d84..f4fa197d49ff83e87beb575488a10c2c41c445c2 100644 (file)
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -29,8 +29,6 @@
 #include "rtnl-util.h"
 #include "event-util.h"
 #include "network-util.h"
-#include "sd-dhcp-lease.h"
-#include "dhcp-lease-internal.h"
 #include "network-internal.h"
 #include "conf-parser.h"
 #include "socket-util.h"
@@ -326,7 +324,7 @@ static int parse_dns_server_string(Manager *m, const char *string) {
                 if (manager_find_dns_server(m, family, &addr))
                         continue;
 
-                r = dns_server_new(m, NULL, DNS_SERVER_SYSTEM, NULL, family, &addr);
+                r = dns_server_new(m, NULL, NULL, family, &addr);
                 if (r < 0)
                         return r;
         }
@@ -395,7 +393,7 @@ int manager_new(Manager **ret) {
 
         m->use_llmnr = true;
 
-        r = parse_dns_server_string(m, /* "172.31.0.125 2001:4860:4860::8888 2001:4860:4860::8889" */ DNS_SERVERS);
+        r = parse_dns_server_string(m, DNS_SERVERS);
         if (r < 0)
                 return r;
 
@@ -517,13 +515,9 @@ int manager_write_resolv_conf(Manager *m) {
               "# resolv.conf(5) in a different way, replace the symlink by a\n"
               "# static file or a different symlink.\n\n", f);
 
-        HASHMAP_FOREACH(l, m->links, i) {
-                LIST_FOREACH(servers, s, l->link_dns_servers)
-                        write_resolve_conf_server(s, f, &count);
-
-                LIST_FOREACH(servers, s, l->dhcp_dns_servers)
+        HASHMAP_FOREACH(l, m->links, i)
+                LIST_FOREACH(servers, s, l->dns_servers)
                         write_resolve_conf_server(s, f, &count);
-        }
 
         LIST_FOREACH(servers, s, m->dns_servers)
                 write_resolve_conf_server(s, f, &count);
@@ -669,7 +663,7 @@ static int on_dns_packet(sd_event_source *s, int fd, uint32_t revents, void *use
                 if (!t)
                         return 0;
 
-                dns_query_transaction_reply(t, p);
+                dns_query_transaction_process_reply(t, p);
         } else
                 log_debug("Invalid reply packet.");
 
@@ -954,7 +948,7 @@ static int on_llmnr_packet(sd_event_source *s, int fd, uint32_t revents, void *u
                 if (!t)
                         return 0;
 
-                dns_query_transaction_reply(t, p);
+                dns_query_transaction_process_reply(t, p);
         }
 
         return 0;