chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unit_merge() needs a proper review
[elogind.git]
/
load-dropin.c
diff --git
a/load-dropin.c
b/load-dropin.c
index b975d83f0450433a47b4d415d22b187ea193c666..a57bfc455be3d45b5a30f5b9e0c3b08ec214271b 100644
(file)
--- a/
load-dropin.c
+++ b/
load-dropin.c
@@
-5,6
+5,7
@@
#include "unit.h"
#include "load-dropin.h"
#include "unit.h"
#include "load-dropin.h"
+#include "log.h"
int unit_load_dropin(Unit *u) {
Iterator i;
int unit_load_dropin(Unit *u) {
Iterator i;
@@
-51,6
+52,12
@@
int unit_load_dropin(Unit *u) {
return -ENOMEM;
}
return -ENOMEM;
}
+ 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 = manager_load_unit(u->meta.manager, path, &other);
free(path);
r = manager_load_unit(u->meta.manager, path, &other);
free(path);