if we get a timeout in kevent(), there MUST be timer events

diff --git a/src/lib/util/event.c b/src/lib/util/event.c
index 8c2192280860d4ffb93f60687c901df00113b088..12e203b9cb915c119cf23f1e74effe82e458ea97 100644 (file)
--- a/src/lib/util/event.c
+++ b/src/lib/util/event.c
@@ -1526,7 +1526,16 @@ int fr_event_corral(fr_event_list_t *el, fr_time_t now, bool wait)
 
        el->num_fd_events = num_fd_events;
 
-       return num_fd_events + timer_event_ready;
+       if (timer_event_ready || num_fd_events) {
+               return num_fd_events + timer_event_ready;
+       }
+
+       /*
+        *      Else there were no timer events ready BEFORE the call
+        *      to kevent(), but there MUST be timer events ready now.
+        *      Because otherwise kevent() wouldn't have returned.
+        */
+       return 1;
 }
 
 /** Service any outstanding timer or file descriptor events