chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cgroup: simplify how instantiated units are mapped to cgroups
[elogind.git]
/
src
/
shared
/
conf-parser.c
diff --git
a/src/shared/conf-parser.c
b/src/shared/conf-parser.c
index 7a986623fb18684776501bcda1e3efd0b63c67c5..2303d9a50b7bb348bba6f2631f0708d40a02022b 100644
(file)
--- a/
src/shared/conf-parser.c
+++ b/
src/shared/conf-parser.c
@@
-70,7
+70,7
@@
int log_syntax_internal(const char *unit, int level,
"ERRNO=%d", error > 0 ? error : EINVAL,
"MESSAGE=[%s:%u] %s", config_file, config_line, msg,
NULL);
"ERRNO=%d", error > 0 ? error : EINVAL,
"MESSAGE=[%s:%u] %s", config_file, config_line, msg,
NULL);
- log_info("logged here: '%s': %d", msg, r);
+
return r;
}
return r;
}
@@
-199,6
+199,7
@@
static int parse_line(const char* unit,
ConfigItemLookup lookup,
void *table,
bool relaxed,
ConfigItemLookup lookup,
void *table,
bool relaxed,
+ bool allow_include,
char **section,
char *l,
void *userdata) {
char **section,
char *l,
void *userdata) {
@@
-219,13
+220,19
@@
static int parse_line(const char* unit,
return 0;
if (startswith(l, ".include ")) {
return 0;
if (startswith(l, ".include ")) {
- char _cleanup_free_ *fn;
+ _cleanup_free_ char *fn = NULL;
+
+ if (!allow_include) {
+ log_syntax(unit, LOG_ERR, filename, line, EBADMSG,
+ ".include not allowed here. Ignoring.");
+ return 0;
+ }
fn = file_in_same_dir(filename, strstrip(l+9));
if (!fn)
return -ENOMEM;
fn = file_in_same_dir(filename, strstrip(l+9));
if (!fn)
return -ENOMEM;
- return config_parse(unit, fn, NULL, sections, lookup, table, relaxed, userdata);
+ return config_parse(unit, fn, NULL, sections, lookup, table, relaxed,
false,
userdata);
}
if (*l == '[') {
}
if (*l == '[') {
@@
-299,11
+306,12
@@
int config_parse(const char *unit,
ConfigItemLookup lookup,
void *table,
bool relaxed,
ConfigItemLookup lookup,
void *table,
bool relaxed,
+ bool allow_include,
void *userdata) {
void *userdata) {
+ _cleanup_free_ char *section = NULL, *continuation = NULL;
+ _cleanup_fclose_ FILE *ours = NULL;
unsigned line = 0;
unsigned line = 0;
- char _cleanup_free_ *section = NULL, *continuation = NULL;
- FILE _cleanup_fclose_ *ours = NULL;
int r;
assert(filename);
int r;
assert(filename);
@@
-370,6
+378,7
@@
int config_parse(const char *unit,
lookup,
table,
relaxed,
lookup,
table,
relaxed,
+ allow_include,
§ion,
p,
userdata);
§ion,
p,
userdata);