From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 12 Feb 2016 20:29:01 +0000 (+0100)
Subject: time-util: map ALARM clockids to non-ALARM clockids in now()
X-Git-Tag: v231.3~249
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=c5dee65877cc659b9710b2044006e0984fc57413

time-util: map ALARM clockids to non-ALARM clockids in now()

Fixes: #2597
---

diff --git a/src/libelogind/sd-event/sd-event.c b/src/libelogind/sd-event/sd-event.c
index e32507942..805edb214 100644
--- a/src/libelogind/sd-event/sd-event.c
+++ b/src/libelogind/sd-event/sd-event.c
@@ -2805,9 +2805,13 @@ _public_ int sd_event_now(sd_event *e, clockid_t clock, uint64_t *usec) {
                 *usec = e->timestamp.monotonic;
                 break;
 
-        default:
+        case CLOCK_BOOTTIME:
+        case CLOCK_BOOTTIME_ALARM:
                 *usec = e->timestamp_boottime;
                 break;
+
+        default:
+                assert_not_reached("Unknown clock?");
         }
 
         return 0;