X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=load-dropin.c;h=13d7bc8fe4cb5e2cbdbd19ae1b62d9c02753659b;hp=b975d83f0450433a47b4d415d22b187ea193c666;hb=a9f5d45466c923442ceb31ab2a4206736133d9d4;hpb=0301abf48ed3be921c33d409c73b554435cf6378

diff --git a/load-dropin.c b/load-dropin.c
index b975d83f0..13d7bc8fe 100644
--- a/load-dropin.c
+++ b/load-dropin.c
@@ -1,10 +1,30 @@
 /*-*- Mode: C; c-basic-offset: 8 -*-*/
 
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
 #include <dirent.h>
 #include <errno.h>
 
 #include "unit.h"
 #include "load-dropin.h"
+#include "log.h"
 
 int unit_load_dropin(Unit *u) {
         Iterator i;
@@ -36,8 +56,6 @@ int unit_load_dropin(Unit *u) {
                 free(path);
 
                 while ((de = readdir(d))) {
-                        Unit *other;
-
                         if (de->d_name[0] == '.')
                                 continue;
 
@@ -51,18 +69,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);