From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 5 Jan 2018 11:17:35 +0000 (+0100)
Subject: dbus-util: properly parse timeout values
X-Git-Tag: v237~105^2~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d6552eaa6c84da09a1bba49bd99f6df40e8ec15e;p=thirdparty%2Fsystemd.git

dbus-util: properly parse timeout values

This makes transient TimeoutStopSec= properties work. After all they are
64bit entitites, not 32bit ones.
---

diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c
index ed83a0e5f4b..75bbd076041 100644
--- a/src/core/dbus-util.c
+++ b/src/core/dbus-util.c
@@ -93,12 +93,12 @@ int bus_set_transient_usec_internal(
                 UnitWriteFlags flags,
                 sd_bus_error *error) {
 
-        usec_t v;
+        uint64_t v;
         int r;
 
         assert(p);
 
-        r = sd_bus_message_read(message, "u", &v);
+        r = sd_bus_message_read(message, "t", &v);
         if (r < 0)
                 return r;
 
@@ -106,7 +106,7 @@ int bus_set_transient_usec_internal(
                 char *n, ts[FORMAT_TIMESPAN_MAX];
 
                 if (fix_0)
-                        *p = v ?: USEC_INFINITY;
+                        *p = v != 0 ? v: USEC_INFINITY;
                 else
                         *p = v;