From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 20 May 2015 12:37:21 +0000 (+0200)
Subject: journald: handle more gracefully when bind() fails on audit sockets
X-Git-Tag: v220~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=417a7fdc418ec76cc4c321c9a07ec15c72b3ac7d;p=thirdparty%2Fsystemd.git

journald: handle more gracefully when bind() fails on audit sockets
---

diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c
index 64395e11486..83c3332abf2 100644
--- a/src/journal/journald-audit.c
+++ b/src/journal/journald-audit.c
@@ -534,9 +534,14 @@ int server_open_audit(Server *s) {
                         return 0;
                 }
 
-                r = bind(s->audit_fd, &sa.sa, sizeof(sa.nl));
-                if (r < 0)
-                        return log_error_errno(errno, "Failed to join audit multicast group: %m");
+                if (bind(s->audit_fd, &sa.sa, sizeof(sa.nl)) < 0) {
+                        log_warning_errno(errno,
+                                          "Failed to join audit multicast group. "
+                                          "The kernel is probably too old or multicast reading is not supported. "
+                                          "Ignoring: %m");
+                        s->audit_fd = safe_close(s->audit_fd);
+                        return 0;
+                }
         } else
                 fd_nonblock(s->audit_fd, 1);