clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-09-06 13:41:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

timedated: flip internal status after executing operation

Browse Source 
timedated would set the internal status before calling out to systemd to do
the actual change. When the operation was refused because of a SELinux denial,
the state kept in timedated would get out of sync, and the second call from
timedatectl would appear to succeed.

https://bugzilla.redhat.com/show_bug.cgi?id=1014315

(cherry picked from commit 192b98b8fe)
(cherry picked from commit fb14f86a71)

[Amended to reverse the condition.]
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2015-03-23 02:36:47 -04:00
parent 78db230ae6
commit 347a55643e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/timedate/timedated.c
+4 -4
View File
@@ -286,7 +286,7 @@ static int context_start_ntp(Context *c, sd_bus *bus, sd_bus_error *error) {
l = get_ntp_services();
STRV_FOREACH(i, l) {
if (c->use_ntp)
if (!c->use_ntp)
r = sd_bus_call_method(
bus,
"org.freedesktop.systemd1",
@@ -337,7 +337,7 @@ static int context_enable_ntp(Context*c, sd_bus *bus, sd_bus_error *error) {
l = get_ntp_services();
STRV_FOREACH(i, l) {
if (c->use_ntp)
if (!c->use_ntp)
r = sd_bus_call_method(
bus,
"org.freedesktop.systemd1",
@@ -673,8 +673,6 @@ static int method_set_ntp(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus
if (r == 0)
return 1;
c->use_ntp = ntp;
r = context_enable_ntp(c, bus, error);
if (r < 0)
return r;
@@ -683,6 +681,8 @@ static int method_set_ntp(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus
if (r < 0)
return r;
c->use_ntp = ntp;
log_info("Set NTP to %s", c->use_ntp ? "enabled" : "disabled");
sd_bus_emit_properties_changed(bus, "/org/freedesktop/timedate1", "org.freedesktop.timedate1", "NTP", NULL);