summaryrefslogtreecommitdiff
path: root/src/journal
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-04-24 19:53:16 -0300
committerLennart Poettering <lennart@poettering.net>2013-04-25 00:05:14 -0300
commitdb5c0122853a9ecf1cc92e6593461932df2fa866 (patch)
tree45f2cca6a0050dfa36ecb08af64d974ec4542ea5 /src/journal
parent60b6991a4dd687097bbc4f1e1ef7585efee079d9 (diff)
conf-parser: restrict .include usage
Disallow recursive .include, and make it unavailable in anything but unit files.
Diffstat (limited to 'src/journal')
-rw-r--r--src/journal/journald-server.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 8eab5ad67..1b5a22b12 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -1271,7 +1271,7 @@ static int server_parse_proc_cmdline(Server *s) {
}
static int server_parse_config_file(Server *s) {
- static const char *fn = "/etc/systemd/journald.conf";
+ static const char fn[] = "/etc/systemd/journald.conf";
_cleanup_fclose_ FILE *f = NULL;
int r;
@@ -1287,7 +1287,7 @@ static int server_parse_config_file(Server *s) {
}
r = config_parse(NULL, fn, f, "Journal\0", config_item_perf_lookup,
- (void*) journald_gperf_lookup, false, s);
+ (void*) journald_gperf_lookup, false, false, s);
if (r < 0)
log_warning("Failed to parse configuration file: %s", strerror(-r));