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