From db5c0122853a9ecf1cc92e6593461932df2fa866 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 24 Apr 2013 19:53:16 -0300 Subject: conf-parser: restrict .include usage Disallow recursive .include, and make it unavailable in anything but unit files. --- src/journal/journald-server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/journal') diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 8eab5ad677..1b5a22b122 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)); -- cgit v1.2.3-54-g00ecf