add basic (and not very useful) D-Bus support

[elogind.git] / load-dropin.c

diff --git a/load-dropin.c b/load-dropin.c
index b975d83f0450433a47b4d415d22b187ea193c666..521eb0821aea9c84128003b3bb4444f20c18e4ca 100644 (file)
--- a/load-dropin.c
+++ b/load-dropin.c
@@ -5,6 +5,7 @@
 
 #include "unit.h"
 #include "load-dropin.h"
+#include "log.h"
 
 int unit_load_dropin(Unit *u) {
         Iterator i;
@@ -36,8 +37,6 @@ int unit_load_dropin(Unit *u) {
                 free(path);
 
                 while ((de = readdir(d))) {
-                        Unit *other;
-
                         if (de->d_name[0] == '.')
                                 continue;
 
@@ -51,18 +50,19 @@ int unit_load_dropin(Unit *u) {
                                 return -ENOMEM;
                         }
 
-                        r = manager_load_unit(u->meta.manager, path, &other);
+                        if (!unit_name_is_valid(de->d_name)) {
+                                log_info("Name of %s is not a valid unit name. Ignoring.", path);
+                                free(path);
+                                continue;
+                        }
+
+                        r = unit_add_dependency_by_name(u, UNIT_WANTS, path);
                         free(path);
 
                         if (r < 0) {
                                 closedir(d);
                                 return r;
                         }
-
-                        if ((r = unit_add_dependency(u, UNIT_WANTS, other)) < 0) {
-                                closedir(d);
-                                return r;
-                        }
                 }
 
                 closedir(d);