diff options
Diffstat (limited to 'src/journal-remote')
| -rw-r--r-- | src/journal-remote/journal-remote-main.c | 11 | ||||
| -rw-r--r-- | src/journal-remote/journal-upload.c | 11 |
2 files changed, 6 insertions, 16 deletions
diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c index e620b60a31..956c96c5e3 100644 --- a/src/journal-remote/journal-remote-main.c +++ b/src/journal-remote/journal-remote-main.c @@ -769,14 +769,9 @@ static int parse_config(void) { {} }; - return config_parse_many_nulstr( - PKGSYSCONFDIR "/journal-remote.conf", - CONF_PATHS_NULSTR("systemd/journal-remote.conf.d"), - "Remote\0", - config_item_table_lookup, items, - CONFIG_PARSE_WARN, - NULL, - NULL); + return config_parse_config_file("journal-remote.conf", "Remote\0", + config_item_table_lookup, items, + CONFIG_PARSE_WARN, NULL); } static int help(void) { diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c index fc55f13bab..e42516c799 100644 --- a/src/journal-remote/journal-upload.c +++ b/src/journal-remote/journal-upload.c @@ -568,14 +568,9 @@ static int parse_config(void) { {} }; - return config_parse_many_nulstr( - PKGSYSCONFDIR "/journal-upload.conf", - CONF_PATHS_NULSTR("systemd/journal-upload.conf.d"), - "Upload\0", - config_item_table_lookup, items, - CONFIG_PARSE_WARN, - NULL, - NULL); + return config_parse_config_file("journal-upload.conf", "Upload\0", + config_item_table_lookup, items, + CONFIG_PARSE_WARN, NULL); } static int help(void) { |