|
 |
4213590 |
From 29b5cd796981c42666189501b8bc41f9da2d0f52 Mon Sep 17 00:00:00 2001
|
|
|
4213590 |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
4213590 |
Date: Sat, 21 Mar 2015 19:21:17 -0400
|
|
|
4213590 |
Subject: [PATCH] timedated: fix enable/disable reversal
|
|
|
4213590 |
|
|
|
4213590 |
Bug introduced in 984f1b1d1b. The state was flipped later,
|
|
|
4213590 |
but the enable/disable routine made use of the state to decide
|
|
|
4213590 |
what to do.
|
|
|
4213590 |
|
|
|
4213590 |
context_enable_ntp() and context_start_ntp() now get the desired
|
|
|
4213590 |
state directly, so the Context parameter can be removed.
|
|
|
4213590 |
|
|
|
4213590 |
(cherry picked from commit 81b843990297ad8c813c531fccd8da30bb715bd6)
|
|
|
4213590 |
---
|
|
|
4213590 |
src/timedate/timedated.c | 59 +++++++++++++++++-------------------------------
|
|
|
4213590 |
1 file changed, 21 insertions(+), 38 deletions(-)
|
|
|
4213590 |
|
|
|
4213590 |
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
|
|
|
4213590 |
index bee66af24a..f2d23f34b1 100644
|
|
|
4213590 |
--- a/src/timedate/timedated.c
|
|
|
4213590 |
+++ b/src/timedate/timedated.c
|
|
|
4213590 |
@@ -225,38 +225,23 @@ static int context_read_ntp(Context *c, sd_bus *bus) {
|
|
|
4213590 |
return 0;
|
|
|
4213590 |
}
|
|
|
4213590 |
|
|
|
4213590 |
-static int context_start_ntp(Context *c, sd_bus *bus, sd_bus_error *error) {
|
|
|
4213590 |
+static int context_start_ntp(sd_bus *bus, sd_bus_error *error, bool enabled) {
|
|
|
4213590 |
int r;
|
|
|
4213590 |
|
|
|
4213590 |
- assert(c);
|
|
|
4213590 |
assert(bus);
|
|
|
4213590 |
assert(error);
|
|
|
4213590 |
|
|
|
4213590 |
- if (c->use_ntp)
|
|
|
4213590 |
- r = sd_bus_call_method(
|
|
|
4213590 |
- bus,
|
|
|
4213590 |
- "org.freedesktop.systemd1",
|
|
|
4213590 |
- "/org/freedesktop/systemd1",
|
|
|
4213590 |
- "org.freedesktop.systemd1.Manager",
|
|
|
4213590 |
- "StartUnit",
|
|
|
4213590 |
- error,
|
|
|
4213590 |
- NULL,
|
|
|
4213590 |
- "ss",
|
|
|
4213590 |
- "systemd-timesyncd.service",
|
|
|
4213590 |
- "replace");
|
|
|
4213590 |
- else
|
|
|
4213590 |
- r = sd_bus_call_method(
|
|
|
4213590 |
- bus,
|
|
|
4213590 |
- "org.freedesktop.systemd1",
|
|
|
4213590 |
- "/org/freedesktop/systemd1",
|
|
|
4213590 |
- "org.freedesktop.systemd1.Manager",
|
|
|
4213590 |
- "StopUnit",
|
|
|
4213590 |
- error,
|
|
|
4213590 |
- NULL,
|
|
|
4213590 |
- "ss",
|
|
|
4213590 |
- "systemd-timesyncd.service",
|
|
|
4213590 |
- "replace");
|
|
|
4213590 |
-
|
|
|
4213590 |
+ r = sd_bus_call_method(
|
|
|
4213590 |
+ bus,
|
|
|
4213590 |
+ "org.freedesktop.systemd1",
|
|
|
4213590 |
+ "/org/freedesktop/systemd1",
|
|
|
4213590 |
+ "org.freedesktop.systemd1.Manager",
|
|
|
4213590 |
+ enabled ? "StartUnit" : "StopUnit",
|
|
|
4213590 |
+ error,
|
|
|
4213590 |
+ NULL,
|
|
|
4213590 |
+ "ss",
|
|
|
4213590 |
+ "systemd-timesyncd.service",
|
|
|
4213590 |
+ "replace");
|
|
|
4213590 |
if (r < 0) {
|
|
|
4213590 |
if (sd_bus_error_has_name(error, SD_BUS_ERROR_FILE_NOT_FOUND) ||
|
|
|
4213590 |
sd_bus_error_has_name(error, "org.freedesktop.systemd1.LoadFailed") ||
|
|
|
4213590 |
@@ -269,14 +254,13 @@ static int context_start_ntp(Context *c, sd_bus *bus, sd_bus_error *error) {
|
|
|
4213590 |
return 0;
|
|
|
4213590 |
}
|
|
|
4213590 |
|
|
|
4213590 |
-static int context_enable_ntp(Context*c, sd_bus *bus, sd_bus_error *error) {
|
|
|
4213590 |
+static int context_enable_ntp(sd_bus *bus, sd_bus_error *error, bool enabled) {
|
|
|
4213590 |
int r;
|
|
|
4213590 |
|
|
|
4213590 |
- assert(c);
|
|
|
4213590 |
assert(bus);
|
|
|
4213590 |
assert(error);
|
|
|
4213590 |
|
|
|
4213590 |
- if (c->use_ntp)
|
|
|
4213590 |
+ if (enabled)
|
|
|
4213590 |
r = sd_bus_call_method(
|
|
|
4213590 |
bus,
|
|
|
4213590 |
"org.freedesktop.systemd1",
|
|
|
4213590 |
@@ -592,15 +576,15 @@ static int method_set_time(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bu
|
|
|
4213590 |
}
|
|
|
4213590 |
|
|
|
4213590 |
static int method_set_ntp(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *error) {
|
|
|
4213590 |
- int ntp, interactive;
|
|
|
4213590 |
+ int enabled, interactive;
|
|
|
4213590 |
Context *c = userdata;
|
|
|
4213590 |
int r;
|
|
|
4213590 |
|
|
|
4213590 |
- r = sd_bus_message_read(m, "bb", &ntp, &interactive);
|
|
|
4213590 |
+ r = sd_bus_message_read(m, "bb", &enabled, &interactive);
|
|
|
4213590 |
if (r < 0)
|
|
|
4213590 |
return r;
|
|
|
4213590 |
|
|
|
4213590 |
- if ((bool)ntp == c->use_ntp)
|
|
|
4213590 |
+ if ((bool)enabled == c->use_ntp)
|
|
|
4213590 |
return sd_bus_reply_method_return(m, NULL);
|
|
|
4213590 |
|
|
|
4213590 |
r = bus_verify_polkit_async(m, CAP_SYS_TIME, "org.freedesktop.timedate1.set-ntp", interactive, &c->polkit_registry, error);
|
|
|
4213590 |
@@ -609,17 +593,16 @@ static int method_set_ntp(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus
|
|
|
4213590 |
if (r == 0)
|
|
|
4213590 |
return 1;
|
|
|
4213590 |
|
|
|
4213590 |
- r = context_enable_ntp(c, bus, error);
|
|
|
4213590 |
+ r = context_enable_ntp(bus, error, enabled);
|
|
|
4213590 |
if (r < 0)
|
|
|
4213590 |
return r;
|
|
|
4213590 |
|
|
|
4213590 |
- r = context_start_ntp(c, bus, error);
|
|
|
4213590 |
+ r = context_start_ntp(bus, error, enabled);
|
|
|
4213590 |
if (r < 0)
|
|
|
4213590 |
return r;
|
|
|
4213590 |
|
|
|
4213590 |
- c->use_ntp = ntp;
|
|
|
4213590 |
-
|
|
|
4213590 |
- log_info("Set NTP to %s", c->use_ntp ? "enabled" : "disabled");
|
|
|
4213590 |
+ c->use_ntp = enabled;
|
|
|
4213590 |
+ log_info("Set NTP to %s", enabled ? "enabled" : "disabled");
|
|
|
4213590 |
|
|
|
4213590 |
sd_bus_emit_properties_changed(bus, "/org/freedesktop/timedate1", "org.freedesktop.timedate1", "NTP", NULL);
|
|
|
4213590 |
|