diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-03-21 19:21:17 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-03-21 19:55:33 -0400 |
| commit | 81b843990297ad8c813c531fccd8da30bb715bd6 (patch) | |
| tree | 4d06423f437bd537b5afcca7127e6a5431524b70 /src/timedate | |
| parent | df823e23f04da832ad5fc078176f8c26597a9845 (diff) | |
timedated: fix enable/disable reversal
Bug introduced in 984f1b1d1b. The state was flipped later,
but the enable/disable routine made use of the state to decide
what to do.
context_enable_ntp() and context_start_ntp() now get the desired
state directly, so the Context parameter can be removed.
Diffstat (limited to 'src/timedate')
| -rw-r--r-- | src/timedate/timedated.c | 59 |
1 files changed, 21 insertions, 38 deletions
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c index db9a149ae5..0d4a9dd7e2 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c @@ -222,38 +222,23 @@ static int context_read_ntp(Context *c, sd_bus *bus) { return 0; } -static int context_start_ntp(Context *c, sd_bus *bus, sd_bus_error *error) { +static int context_start_ntp(sd_bus *bus, sd_bus_error *error, bool enabled) { int r; - assert(c); assert(bus); assert(error); - if (c->use_ntp) - r = sd_bus_call_method( - bus, - "org.freedesktop.systemd1", - "/org/freedesktop/systemd1", - "org.freedesktop.systemd1.Manager", - "StartUnit", - error, - NULL, - "ss", - "systemd-timesyncd.service", - "replace"); - else - r = sd_bus_call_method( - bus, - "org.freedesktop.systemd1", - "/org/freedesktop/systemd1", - "org.freedesktop.systemd1.Manager", - "StopUnit", - error, - NULL, - "ss", - "systemd-timesyncd.service", - "replace"); - + r = sd_bus_call_method( + bus, + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + "org.freedesktop.systemd1.Manager", + enabled ? "StartUnit" : "StopUnit", + error, + NULL, + "ss", + "systemd-timesyncd.service", + "replace"); if (r < 0) { if (sd_bus_error_has_name(error, SD_BUS_ERROR_FILE_NOT_FOUND) || sd_bus_error_has_name(error, "org.freedesktop.systemd1.LoadFailed") || @@ -266,14 +251,13 @@ static int context_start_ntp(Context *c, sd_bus *bus, sd_bus_error *error) { return 0; } -static int context_enable_ntp(Context*c, sd_bus *bus, sd_bus_error *error) { +static int context_enable_ntp(sd_bus *bus, sd_bus_error *error, bool enabled) { int r; - assert(c); assert(bus); assert(error); - if (c->use_ntp) + if (enabled) r = sd_bus_call_method( bus, "org.freedesktop.systemd1", @@ -622,15 +606,15 @@ static int method_set_time(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bu } static int method_set_ntp(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *error) { - int ntp, interactive; + int enabled, interactive; Context *c = userdata; int r; - r = sd_bus_message_read(m, "bb", &ntp, &interactive); + r = sd_bus_message_read(m, "bb", &enabled, &interactive); if (r < 0) return r; - if ((bool)ntp == c->use_ntp) + if ((bool)enabled == c->use_ntp) return sd_bus_reply_method_return(m, NULL); r = bus_verify_polkit_async( @@ -646,17 +630,16 @@ static int method_set_ntp(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus if (r == 0) return 1; - r = context_enable_ntp(c, bus, error); + r = context_enable_ntp(bus, error, enabled); if (r < 0) return r; - r = context_start_ntp(c, bus, error); + r = context_start_ntp(bus, error, enabled); if (r < 0) return r; - c->use_ntp = ntp; - - log_info("Set NTP to %s", c->use_ntp ? "enabled" : "disabled"); + c->use_ntp = enabled; + log_info("Set NTP to %s", enabled ? "enabled" : "disabled"); sd_bus_emit_properties_changed(bus, "/org/freedesktop/timedate1", "org.freedesktop.timedate1", "NTP", NULL); |