From: Josh Triplett <josh@joshtriplett.org>
Date: Sat, 29 Nov 2014 09:07:28 +0000 (-0800)
Subject: journald-remote,journal-upload: Support .d directories in the usual search paths
X-Git-Tag: v218~196
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=bf257aed057efd113f1b84e037fde09ffeed32ee

journald-remote,journal-upload: Support .d directories in the usual search paths
---

diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
index a5d40cb71..6ec5ad2e7 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 8be0f93b7..62853b636 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) {