From cc567911ba790931743c18332b2476e8c4accf64 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 5 May 2014 23:48:25 +0200 Subject: sd-event: allow disabling event sources when an event object is dying anyway --- src/libsystemd/sd-event/sd-event.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/libsystemd') diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c index 70770fc7ad..47970879da 100644 --- a/src/libsystemd/sd-event/sd-event.c +++ b/src/libsystemd/sd-event/sd-event.c @@ -1313,9 +1313,13 @@ _public_ int sd_event_source_set_enabled(sd_event_source *s, int m) { assert_return(s, -EINVAL); assert_return(m == SD_EVENT_OFF || m == SD_EVENT_ON || m == SD_EVENT_ONESHOT, -EINVAL); - assert_return(s->event->state != SD_EVENT_FINISHED, -ESTALE); assert_return(!event_pid_changed(s->event), -ECHILD); + /* If we are dead anyway, we are fine with turning off + * sources, but everything else needs to fail. */ + if (s->event->state == SD_EVENT_FINISHED) + return m == SD_EVENT_OFF ? 0 : -ESTALE; + if (s->enabled == m) return 0; -- cgit v1.2.3-54-g00ecf