diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-09-17 10:00:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-17 10:00:19 +0200 |
| commit | 6ac288a990251b39218fa219f03a2048124b9352 (patch) | |
| tree | ffb840c43202f5d9b479045e59652e4862a96000 /src/journal-remote | |
| parent | 0b493a02631d08bd2f48db8bc618dcd1fe3bdcb3 (diff) | |
| parent | 881e6b5edfd6ff82e0683678f19c887cbacab344 (diff) | |
Merge pull request #4123 from keszybz/network-file-dropins
Network file dropins
Diffstat (limited to 'src/journal-remote')
| -rw-r--r-- | src/journal-remote/journal-remote.c | 2 | ||||
| -rw-r--r-- | src/journal-remote/journal-upload.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c index aebc4cafb4..a9009cfefe 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -1194,7 +1194,7 @@ static int parse_config(void) { { "Remote", "TrustedCertificateFile", config_parse_path, 0, &arg_trust }, {}}; - return config_parse_many(PKGSYSCONFDIR "/journal-remote.conf", + return config_parse_many_nulstr(PKGSYSCONFDIR "/journal-remote.conf", CONF_PATHS_NULSTR("systemd/journal-remote.conf.d"), "Remote\0", config_item_table_lookup, items, false, NULL); diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c index 4647cfdeb3..c0f967ab94 100644 --- a/src/journal-remote/journal-upload.c +++ b/src/journal-remote/journal-upload.c @@ -542,7 +542,7 @@ static int parse_config(void) { { "Upload", "TrustedCertificateFile", config_parse_path, 0, &arg_trust }, {}}; - return config_parse_many(PKGSYSCONFDIR "/journal-upload.conf", + return config_parse_many_nulstr(PKGSYSCONFDIR "/journal-upload.conf", CONF_PATHS_NULSTR("systemd/journal-upload.conf.d"), "Upload\0", config_item_table_lookup, items, false, NULL); |