]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
fix journald startup problem when code is compiled with -DNDEBUG (#4735)
authorWaldemar Brodkorb <wbx-github@users.noreply.github.com>
Fri, 25 Nov 2016 10:24:58 +0000 (11:24 +0100)
committerMartin Pitt <martin.pitt@ubuntu.com>
Fri, 25 Nov 2016 10:24:58 +0000 (11:24 +0100)
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.

src/journal/journald-server.c

index 567f06515f08a317cd1d5881d8536d129c5c54ad..28487a9451acb150c238796bc2a17e23359ab4dc 100644 (file)
@@ -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)