diff options
| author | Waldemar Brodkorb <wbx-github@users.noreply.github.com> | 2016-11-25 11:24:58 +0100 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2016-11-25 11:24:58 +0100 |
| commit | 9bab3b65b0ad625ebbf50583c46f5c7c35b18a70 (patch) | |
| tree | cb75a9e58e81e7a0c97906c4158477c08b985bb7 /src | |
| parent | 2f08ccc32e5543fc73ac6c9d301d6e5a427dddf7 (diff) | |
fix journald startup problem when code is compiled with -DNDEBUG (#4735)
Similar to this patch from here:
http://systemd-devel.freedesktop.narkive.com/AvfCbi6c/patch-0-3-using-assert-se-on-actions-with-side-effects-on-test-cases
If the code is compiled with -DNDEBUG which is the default for
some embedded buildsystems, systemd-journald does not startup
and silently fails.
Diffstat (limited to 'src')
| -rw-r--r-- | src/journal/journald-server.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 567f06515f..28487a9451 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -1480,7 +1480,7 @@ static int setup_signals(Server *s) { assert(s); - assert(sigprocmask_many(SIG_SETMASK, NULL, SIGINT, SIGTERM, SIGUSR1, SIGUSR2, SIGRTMIN+1, -1) >= 0); + assert_se(sigprocmask_many(SIG_SETMASK, NULL, SIGINT, SIGTERM, SIGUSR1, SIGUSR2, SIGRTMIN+1, -1) >= 0); r = sd_event_add_signal(s->event, &s->sigusr1_event_source, SIGUSR1, dispatch_sigusr1, s); if (r < 0) |