From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 27 Sep 2017 15:30:50 +0000 (+0200)
Subject: unit: when JobTimeoutSec= is turned off, implicitly turn off JobRunningTimeoutSec... 
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=aa5df7baa80ea7bf923177bbe115b7ad8cc93d96;p=elogind.git

unit: when JobTimeoutSec= is turned off, implicitly turn off JobRunningTimeoutSec= too

We added JobRunningTimeoutSec= late, and Dracut configured only
JobTimeoutSec= to turn of root device timeouts before. With this change
we'll propagate a reset of JobTimeoutSec= into JobRunningTimeoutSec=,
but only if the latter wasn't set explicitly.

This should restore compatibility with older elogind versions.

Fixes: #6402
---

diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index 0a0f806e8..7f32cf608 100644
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -1097,7 +1097,11 @@ int parse_sec(const char *t, usec_t *usec) {
 
 #if 0 /// UNNEEDED by elogind
 int parse_sec_fix_0(const char *t, usec_t *usec) {
+        assert(t);
+        assert(usec);
+
         t += strspn(t, WHITESPACE);
+
         if (streq(t, "0")) {
                 *usec = USEC_INFINITY;
                 return 0;