X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fmain.c;h=f9ee297afaecdf59463e46baad7ee47c76bf8539;hb=f12ea7dad09366b2d6cc0c28609a72094a4c9353;hp=a21a959be974e3e9b78e5711293bb1fed78c025d;hpb=e26807239bd65bc17535a53cd540f38600e7ef24;p=elogind.git

diff --git a/src/core/main.c b/src/core/main.c
index a21a959be..f9ee297af 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -682,23 +682,13 @@ static int parse_config_file(void) {
                 {}
         };
 
-        _cleanup_fclose_ FILE *f;
         const char *fn;
-        int r;
 
         fn = arg_running_as == SYSTEMD_SYSTEM ? PKGSYSCONFDIR "/system.conf" : PKGSYSCONFDIR "/user.conf";
-        f = fopen(fn, "re");
-        if (!f) {
-                if (errno == ENOENT)
-                        return 0;
-
-                log_warning("Failed to open configuration file '%s': %m", fn);
-                return 0;
-        }
-
-        r = config_parse(NULL, fn, f, "Manager\0", config_item_table_lookup, (void*) items, false, false, NULL);
-        if (r < 0)
-                log_warning("Failed to parse configuration file: %s", strerror(-r));
+        config_parse(NULL, fn, NULL,
+                     "Manager\0",
+                     config_item_table_lookup, items,
+                     false, false, true, NULL);
 
         return 0;
 }