X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fresolve%2Fresolved-conf.c;h=7af63b0a82289ba7e49d9e5988c39b5bf48c2ffb;hp=63e87f8df52c44cae9d49c663d2af8cb442a58da;hb=30fbcf24460263961855e0ce4d8867fd2af3e149;hpb=3e684349c2cead2e6fd2f816c34eb17daba23a49

diff --git a/src/resolve/resolved-conf.c b/src/resolve/resolved-conf.c
index 63e87f8df..7af63b0a8 100644
--- a/src/resolve/resolved-conf.c
+++ b/src/resolve/resolved-conf.c
@@ -120,14 +120,12 @@ int config_parse_support(
                 void *data,
                 void *userdata) {
 
-        Manager *m = userdata;
         Support support, *v = data;
         int r;
 
         assert(filename);
         assert(lvalue);
         assert(rvalue);
-        assert(m);
 
         support = support_from_string(rvalue);
         if (support < 0) {
@@ -147,8 +145,9 @@ int config_parse_support(
 int manager_parse_config_file(Manager *m) {
         assert(m);
 
-        return config_parse(NULL, "/etc/systemd/resolved.conf", NULL,
-                            "Resolve\0",
-                            config_item_perf_lookup, resolved_gperf_lookup,
-                            false, false, true, m);
+        return config_parse_many("/etc/systemd/resolved.conf",
+                                 CONF_DIRS_NULSTR("systemd/resolved.conf"),
+                                 "Resolve\0",
+                                 config_item_perf_lookup, resolved_gperf_lookup,
+                                 false, m);
 }