Blame SOURCES/0213-Revert-journald-audit-exit-gracefully-in-the-case-we.patch
|
 |
17b0f1 |
From d5e8f58887c572e3d9317b68999ca5d6320f2815 Mon Sep 17 00:00:00 2001
|
|
|
17b0f1 |
From: Lukas Nykryn <lnykryn@redhat.com>
|
|
|
17b0f1 |
Date: Wed, 15 Jul 2015 14:52:04 +0200
|
|
|
17b0f1 |
Subject: [PATCH] Revert "journald-audit: exit gracefully in the case we can't
|
|
|
17b0f1 |
join audit multicast group"
|
|
|
17b0f1 |
|
|
|
17b0f1 |
This reverts commit 9b5e05005e534fc7fb6dc56c94e3296bb17fe122.
|
|
|
17b0f1 |
|
|
|
17b0f1 |
Cherry-picked from:
|
|
|
17b0f1 |
Resolves: #1222517
|
|
|
17b0f1 |
---
|
|
|
17b0f1 |
src/journal/journald-audit.c | 6 ++----
|
|
|
17b0f1 |
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
|
17b0f1 |
|
|
|
17b0f1 |
diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c
|
|
|
17b0f1 |
index 77abe2e63c..46eb82fa34 100644
|
|
|
17b0f1 |
--- a/src/journal/journald-audit.c
|
|
|
17b0f1 |
+++ b/src/journal/journald-audit.c
|
|
|
17b0f1 |
@@ -533,10 +533,8 @@ int server_open_audit(Server *s) {
|
|
|
17b0f1 |
}
|
|
|
17b0f1 |
|
|
|
17b0f1 |
r = bind(s->audit_fd, &sa.sa, sizeof(sa.nl));
|
|
|
17b0f1 |
- if (r < 0) {
|
|
|
17b0f1 |
- log_warning_errno(errno, "Failed to join audit multicast group, ignoring: %m");
|
|
|
17b0f1 |
- return 0;
|
|
|
17b0f1 |
- }
|
|
|
17b0f1 |
+ if (r < 0)
|
|
|
17b0f1 |
+ return log_error_errno(errno, "Failed to join audit multicast group: %m");
|
|
|
17b0f1 |
} else
|
|
|
17b0f1 |
fd_nonblock(s->audit_fd, 1);
|
|
|
17b0f1 |
|