ryantimwilson / rpms / systemd

Forked from rpms/systemd a month ago
Clone
Zbigniew Jędrzejewski-Szmek 27bd1b
From 0e50428d3699e3ad25861f458540d24038cfaa4e Mon Sep 17 00:00:00 2001
Zbigniew Jędrzejewski-Szmek 27bd1b
From: Lennart Poettering <lennart@poettering.net>
Zbigniew Jędrzejewski-Szmek 27bd1b
Date: Thu, 20 Jul 2017 20:46:58 +0200
Zbigniew Jędrzejewski-Szmek 27bd1b
Subject: [PATCH] nspawn: downgrade warning when we get sd_notify() message
Zbigniew Jędrzejewski-Szmek 27bd1b
 from unexpected process (#6416)
Zbigniew Jędrzejewski-Szmek 27bd1b
Zbigniew Jędrzejewski-Szmek 27bd1b
Given that we set NOTIFY_SOCKET unconditionally it's not surprising that
Zbigniew Jędrzejewski-Szmek 27bd1b
processes way down the process tree think it's smart to send us a
Zbigniew Jędrzejewski-Szmek 27bd1b
notification message.
Zbigniew Jędrzejewski-Szmek 27bd1b
Zbigniew Jędrzejewski-Szmek 27bd1b
It's still useful to keep this message, for debugging things, but it
Zbigniew Jędrzejewski-Szmek 27bd1b
shouldn't be generated by default.
Zbigniew Jędrzejewski-Szmek 27bd1b
Zbigniew Jędrzejewski-Szmek 27bd1b
(cherry picked from commit 8cb574307963d1aeb1c53e1d1fbeee4a2be37259)
Zbigniew Jędrzejewski-Szmek 27bd1b
---
Zbigniew Jędrzejewski-Szmek 27bd1b
 src/nspawn/nspawn.c | 2 +-
Zbigniew Jędrzejewski-Szmek 27bd1b
 1 file changed, 1 insertion(+), 1 deletion(-)
Zbigniew Jędrzejewski-Szmek 27bd1b
Zbigniew Jędrzejewski-Szmek 27bd1b
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
Zbigniew Jędrzejewski-Szmek 27bd1b
index 8a5fedd4b0..0cbd8c3491 100644
Zbigniew Jędrzejewski-Szmek 27bd1b
--- a/src/nspawn/nspawn.c
Zbigniew Jędrzejewski-Szmek 27bd1b
+++ b/src/nspawn/nspawn.c
Zbigniew Jędrzejewski-Szmek 27bd1b
@@ -2836,7 +2836,7 @@ static int nspawn_dispatch_notify_fd(sd_event_source *source, int fd, uint32_t r
Zbigniew Jędrzejewski-Szmek 27bd1b
         }
Zbigniew Jędrzejewski-Szmek 27bd1b
 
Zbigniew Jędrzejewski-Szmek 27bd1b
         if (!ucred || ucred->pid != inner_child_pid) {
Zbigniew Jędrzejewski-Szmek 27bd1b
-                log_warning("Received notify message without valid credentials. Ignoring.");
Zbigniew Jędrzejewski-Szmek 27bd1b
+                log_debug("Received notify message without valid credentials. Ignoring.");
Zbigniew Jędrzejewski-Szmek 27bd1b
                 return 0;
Zbigniew Jędrzejewski-Szmek 27bd1b
         }
Zbigniew Jędrzejewski-Szmek 27bd1b