diff options
Diffstat (limited to 'src/systemd-timesyncd')
-rw-r--r-- | src/systemd-timesyncd/90-timesyncd.preset | 3 | ||||
-rw-r--r-- | src/systemd-timesyncd/systemd-timesyncd.service.in | 6 | ||||
-rw-r--r-- | src/systemd-timesyncd/timesyncd-conf.c | 2 | ||||
-rw-r--r-- | src/systemd-timesyncd/timesyncd-server.c | 7 |
4 files changed, 11 insertions, 7 deletions
diff --git a/src/systemd-timesyncd/90-timesyncd.preset b/src/systemd-timesyncd/90-timesyncd.preset index d40b418358..b42460ef5e 100644 --- a/src/systemd-timesyncd/90-timesyncd.preset +++ b/src/systemd-timesyncd/90-timesyncd.preset @@ -5,4 +5,7 @@ # the Free Software Foundation; either version 2.1 of the License, or # (at your option) any later version. +# These ones should be enabled by default, even if distributions +# generally follow a default-off policy. + enable systemd-timesyncd.service diff --git a/src/systemd-timesyncd/systemd-timesyncd.service.in b/src/systemd-timesyncd/systemd-timesyncd.service.in index df1e339196..9a6c6ea60d 100644 --- a/src/systemd-timesyncd/systemd-timesyncd.service.in +++ b/src/systemd-timesyncd/systemd-timesyncd.service.in @@ -22,13 +22,17 @@ Type=notify Restart=always RestartSec=0 ExecStart=@rootlibexecdir@/systemd-timesyncd +WatchdogSec=3min CapabilityBoundingSet=CAP_SYS_TIME CAP_SETUID CAP_SETGID CAP_SETPCAP CAP_CHOWN CAP_DAC_OVERRIDE CAP_FOWNER PrivateTmp=yes PrivateDevices=yes ProtectSystem=full ProtectHome=yes -WatchdogSec=3min +ProtectControlGroups=yes +ProtectKernelTunables=yes MemoryDenyWriteExecute=yes +RestrictRealtime=yes +RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6 SystemCallFilter=~@cpu-emulation @debug @keyring @module @mount @obsolete @raw-io [Install] diff --git a/src/systemd-timesyncd/timesyncd-conf.c b/src/systemd-timesyncd/timesyncd-conf.c index 76bcfa5ef7..4bc87709d1 100644 --- a/src/systemd-timesyncd/timesyncd-conf.c +++ b/src/systemd-timesyncd/timesyncd-conf.c @@ -99,7 +99,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, diff --git a/src/systemd-timesyncd/timesyncd-server.c b/src/systemd-timesyncd/timesyncd-server.c index b4cac7c6ed..1a2138589b 100644 --- a/src/systemd-timesyncd/timesyncd-server.c +++ b/src/systemd-timesyncd/timesyncd-server.c @@ -62,8 +62,7 @@ ServerAddress* server_address_free(ServerAddress *a) { manager_set_server_address(a->name->manager, NULL); } - free(a); - return NULL; + return mfree(a); } int server_name_new( @@ -138,9 +137,7 @@ ServerName *server_name_free(ServerName *n) { log_debug("Removed server %s.", n->string); free(n->string); - free(n); - - return NULL; + return mfree(n); } void server_name_flush_addresses(ServerName *n) { |