core/smack: downgrade info to debug

[elogind.git] / src / core / load-dropin.c

diff --git a/src/core/load-dropin.c b/src/core/load-dropin.c
index 4323147a01ce62517de1018ee22b5195894c2272..95c9a386ca8efffc7a68cc951975cfd7e6e47454 100644 (file)
--- a/src/core/load-dropin.c
+++ b/src/core/load-dropin.c
@@ -27,51 +27,66 @@
 #include "log.h"
 #include "strv.h"
 #include "unit-name.h"
+#include "conf-parser.h"
+#include "load-fragment.h"
+#include "conf-files.h"
 
-static int iterate_dir(Unit *u, const char *path, UnitDependency dependency) {
-        DIR *d;
-        struct dirent *de;
+static int iterate_dir(Unit *u, const char *path, UnitDependency dependency, char ***strv) {
+        _cleanup_closedir_ DIR *d = NULL;
         int r;
 
         assert(u);
         assert(path);
 
+        /* The config directories are special, since the order of the
+         * drop-ins matters */
+        if (dependency < 0)  {
+                r = strv_extend(strv, path);
+                if (r < 0)
+                        return log_oom();
+
+                return 0;
+        }
+
         d = opendir(path);
         if (!d) {
-
                 if (errno == ENOENT)
                         return 0;
 
                 return -errno;
         }
 
-        while ((de = readdir(d))) {
-                char *f;
+        for (;;) {
+                struct dirent *de;
+                union dirent_storage buf;
+                _cleanup_free_ char *f = NULL;
+                int k;
+
+                k = readdir_r(d, &buf.de, &de);
+                if (k != 0) {
+                        log_error("Failed to read directory %s: %s", path, strerror(k));
+                        return -k;
+                }
+
+                if (!de)
+                        break;
 
                 if (ignore_file(de->d_name))
                         continue;
 
-                f = join(path, "/", de->d_name, NULL);
-                if (!f) {
-                        r = -ENOMEM;
-                        goto finish;
-                }
+                f = strjoin(path, "/", de->d_name, NULL);
+                if (!f)
+                        return log_oom();
 
                 r = unit_add_dependency_by_name(u, dependency, de->d_name, f, true);
-                free(f);
-
                 if (r < 0)
                         log_error("Cannot add dependency %s to %s, ignoring: %s", de->d_name, u->id, strerror(-r));
         }
 
-        r = 0;
-
-finish:
-        closedir(d);
-        return r;
+        return 0;
 }
 
-static int process_dir(Unit *u, const char *unit_path, const char *name, const char *suffix, UnitDependency dependency) {
+static int process_dir(Unit *u, const char *unit_path, const char *name, const char *suffix, UnitDependency dependency, char ***strv) {
         int r;
         char *path;
 
@@ -80,7 +95,7 @@ static int process_dir(Unit *u, const char *unit_path, const char *name, const c
         assert(name);
         assert(suffix);
 
-        path = join(unit_path, "/", name, suffix, NULL);
+        path = strjoin(unit_path, "/", name, suffix, NULL);
         if (!path)
                 return -ENOMEM;
 
@@ -88,7 +103,7 @@ static int process_dir(Unit *u, const char *unit_path, const char *name, const c
             !set_get(u->manager->unit_path_cache, path))
                 r = 0;
         else
-                r = iterate_dir(u, path, dependency);
+                r = iterate_dir(u, path, dependency, strv);
         free(path);
 
         if (r < 0)
@@ -102,7 +117,7 @@ static int process_dir(Unit *u, const char *unit_path, const char *name, const c
                 if (!template)
                         return -ENOMEM;
 
-                path = join(unit_path, "/", template, suffix, NULL);
+                path = strjoin(unit_path, "/", template, suffix, NULL);
                 free(template);
 
                 if (!path)
@@ -112,7 +127,7 @@ static int process_dir(Unit *u, const char *unit_path, const char *name, const c
                     !set_get(u->manager->unit_path_cache, path))
                         r = 0;
                 else
-                        r = iterate_dir(u, path, dependency);
+                        r = iterate_dir(u, path, dependency, strv);
                 free(path);
 
                 if (r < 0)
@@ -125,6 +140,9 @@ static int process_dir(Unit *u, const char *unit_path, const char *name, const c
 int unit_load_dropin(Unit *u) {
         Iterator i;
         char *t;
+        _cleanup_strv_free_ char **strv = NULL;
+        int r;
+
 
         assert(u);
 
@@ -134,13 +152,33 @@ int unit_load_dropin(Unit *u) {
                 char **p;
 
                 STRV_FOREACH(p, u->manager->lookup_paths.unit_path) {
-                        int r;
+                        r = process_dir(u, *p, t, ".wants", UNIT_WANTS, NULL);
+                        if (r < 0)
+                                return r;
+
+                        r = process_dir(u, *p, t, ".requires", UNIT_REQUIRES, NULL);
+                        if (r < 0)
+                                return r;
 
-                        r = process_dir(u, *p, t, ".wants", UNIT_WANTS);
+                        /* This loads the drop-in config snippets */
+                        r = process_dir(u, *p, t, ".d", _UNIT_DEPENDENCY_INVALID, &strv);
                         if (r < 0)
                                 return r;
+                }
+        }
+
+        if (!strv_isempty(strv)) {
+                _cleanup_strv_free_ char **files = NULL;
+                char **f;
+
+                r = conf_files_list_strv(&files, ".conf", NULL, (const char**) strv);
+                if (r < 0) {
+                        log_error("Failed to get list of configuration files: %s", strerror(-r));
+                        return r;
+                }
 
-                        r = process_dir(u, *p, t, ".requires", UNIT_REQUIRES);
+                STRV_FOREACH(f, files) {
+                        r = config_parse(*f, NULL, UNIT_VTABLE(u)->sections, config_item_perf_lookup, (void*) load_fragment_gperf_lookup, false, u);
                         if (r < 0)
                                 return r;
                 }