From 061c6607a9f2e39a76ee74048f19b5de16c8fac3 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 7 Aug 2018 10:40:50 +0200
Subject: [PATCH] logind: minor session time handling tweaks

---
 src/login/logind-session.c | 2 +-
 src/login/logind-session.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 068c4a97a97..85ee93ca567 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -810,7 +810,7 @@ int session_release(Session *s) {
         return sd_event_add_time(s->manager->event,
                                  &s->timer_event_source,
                                  CLOCK_MONOTONIC,
-                                 now(CLOCK_MONOTONIC) + RELEASE_USEC, 0,
+                                 usec_add(now(CLOCK_MONOTONIC), RELEASE_USEC), 0,
                                  release_timeout_callback, s);
 }
 
diff --git a/src/login/logind-session.h b/src/login/logind-session.h
index 7d17d9a25fe..fca42b2e6de 100644
--- a/src/login/logind-session.h
+++ b/src/login/logind-session.h
@@ -97,6 +97,7 @@ struct Session {
 
         sd_bus_message *create_message;
 
+        /* Set up when a client requested to release the session via the bus */
         sd_event_source *timer_event_source;
 
         char *controller;
-- 
2.47.3