naccyde / rpms / systemd

Forked from rpms/systemd a year ago
Clone
923a60
From 9b5e05005e534fc7fb6dc56c94e3296bb17fe122 Mon Sep 17 00:00:00 2001
923a60
From: Lukas Nykryn <lnykryn@redhat.com>
923a60
Date: Fri, 6 Mar 2015 12:41:20 +0100
923a60
Subject: [PATCH] journald-audit: exit gracefully in the case we can't join
923a60
 audit multicast group
923a60
923a60
---
923a60
 src/journal/journald-audit.c | 6 ++++--
923a60
 1 file changed, 4 insertions(+), 2 deletions(-)
923a60
923a60
diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c
923a60
index c2f1545cc9..151097a6e6 100644
923a60
--- a/src/journal/journald-audit.c
923a60
+++ b/src/journal/journald-audit.c
923a60
@@ -529,8 +529,10 @@ int server_open_audit(Server *s) {
923a60
                 }
923a60
 
923a60
                 r = bind(s->audit_fd, &sa.sa, sizeof(sa.nl));
923a60
-                if (r < 0)
923a60
-                        return log_error_errno(errno, "Failed to join audit multicast group: %m");
923a60
+                if (r < 0) {
923a60
+                        log_warning_errno(errno, "Failed to join audit multicast group, ignoring: %m");
923a60
+                        return 0;
923a60
+                }
923a60
         } else
923a60
                 fd_nonblock(s->audit_fd, 1);
923a60