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/timesync/timesyncd-conf.c | |
parent | 0b493a02631d08bd2f48db8bc618dcd1fe3bdcb3 (diff) | |
parent | 881e6b5edfd6ff82e0683678f19c887cbacab344 (diff) |
Merge pull request #4123 from keszybz/network-file-dropins
Network file dropins
Diffstat (limited to 'src/timesync/timesyncd-conf.c')
-rw-r--r-- | src/timesync/timesyncd-conf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/timesync/timesyncd-conf.c b/src/timesync/timesyncd-conf.c index 20c64a3354..bf25b112e1 100644 --- a/src/timesync/timesyncd-conf.c +++ b/src/timesync/timesyncd-conf.c @@ -98,7 +98,7 @@ int config_parse_servers( int manager_parse_config_file(Manager *m) { assert(m); - return config_parse_many(PKGSYSCONFDIR "/timesyncd.conf", + return config_parse_many_nulstr(PKGSYSCONFDIR "/timesyncd.conf", CONF_PATHS_NULSTR("systemd/timesyncd.conf.d"), "Time\0", config_item_perf_lookup, timesyncd_gperf_lookup, |