summaryrefslogtreecommitdiff
path: root/src/libsystemd
diff options
context:
space:
mode:
authorDaniel Mack <github@zonque.org>2015-11-03 17:53:15 +0100
committerDaniel Mack <github@zonque.org>2015-11-03 17:53:15 +0100
commit5604b971cf16bd936570d7496c01ce0bd8348632 (patch)
treecf4124bf2346ec37f07c07965ff2a5989f5f031e /src/libsystemd
parent5703176d6e9680c32caac1de2d6bdb84cdc72c96 (diff)
parent119e9655dc36f18ed74f9a256d5c693b5aeb43ab (diff)
Merge pull request #1767 from poettering/journald-watchdog
restore journald watchdog
Diffstat (limited to 'src/libsystemd')
-rw-r--r--src/libsystemd/sd-daemon/sd-daemon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c
index 27045e25d0..a48fa05908 100644
--- a/src/libsystemd/sd-daemon/sd-daemon.c
+++ b/src/libsystemd/sd-daemon/sd-daemon.c
@@ -586,7 +586,7 @@ _public_ int sd_watchdog_enabled(int unset_environment, uint64_t *usec) {
r = safe_atou64(s, &u);
if (r < 0)
goto finish;
- if (u <= 0) {
+ if (u <= 0 || u >= USEC_INFINITY) {
r = -EINVAL;
goto finish;
}