---
src/journal-remote/journal-remote.c | 8 ++++----
src/journal-remote/journal-upload.c | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/journal-remote/journal-remote.c
b/src/journal-remote/journal-remote.c
index a5d40cb..6ec5ad2 100644
--- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
@@ -1131,10 +1131,10 @@ static int parse_config(void) {
{ "Remote", "TrustedCertificateFile", config_parse_path,
0, &arg_trust },
{}};
- return config_parse(NULL, PKGSYSCONFDIR "/journal-remote.conf", NULL,
- "Remote\0",
- config_item_table_lookup, items,
- false, false, true, NULL);
+ return config_parse_many(PKGSYSCONFDIR "/journal-remote.conf",
+
CONF_DIRS_NULSTR("systemd/journal-remote.conf"),
+ "Remote\0", config_item_table_lookup, items,
+ false, NULL);
}
static void help(void) {
diff --git a/src/journal-remote/journal-upload.c
b/src/journal-remote/journal-upload.c
index 8be0f93..62853b6 100644
--- a/src/journal-remote/journal-upload.c
+++ b/src/journal-remote/journal-upload.c
@@ -532,10 +532,10 @@ static int parse_config(void) {
{ "Upload", "TrustedCertificateFile", config_parse_path, 0,
&arg_trust },
{}};
- return config_parse(NULL, PKGSYSCONFDIR "/journal-upload.conf", NULL,
- "Upload\0",
- config_item_table_lookup, items,
- false, false, true, NULL);
+ return config_parse_many(PKGSYSCONFDIR "/journal-upload.conf",
+
CONF_DIRS_NULSTR("systemd/journal-upload.conf"),
+ "Upload\0", config_item_table_lookup, items,
+ false, NULL);
}
static void help(void) {
--
2.1.3
_______________________________________________
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel
