From 3baab23b25aa679c20b2397f2c6e0ca7b89ed14c Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Sat, 27 Apr 2024 19:34:45 +0800 Subject: [PATCH] sd-daemon: downgrade log level for library code, use correct errno Follow-up for 13b67b61b3b4a5356f5d1b29b51137b8e336aa55 --- src/libsystemd/sd-daemon/sd-daemon.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c index 16a8ac6cce1..4945d821501 100644 --- a/src/libsystemd/sd-daemon/sd-daemon.c +++ b/src/libsystemd/sd-daemon/sd-daemon.c @@ -595,14 +595,14 @@ static int pid_notify_with_fds_internal( if (address.sockaddr.sa.sa_family == AF_VSOCK && IN_SET(type, SOCK_STREAM, SOCK_SEQPACKET)) { /* For AF_VSOCK, we need to close the socket to signal the end of the message. */ if (shutdown(fd, SHUT_WR) < 0) - return log_error_errno(errno, "Failed to shutdown notify socket: %m"); + return log_debug_errno(errno, "Failed to shutdown notify socket: %m"); - char buf[1]; - n = recv(fd, buf, sizeof(buf), MSG_NOSIGNAL); - if (n > 0) - return log_error_errno(errno, "Unexpectedly received data on notify socket: %m"); + char c; + n = recv(fd, &c, sizeof(c), MSG_NOSIGNAL); if (n < 0) - return log_error_errno(errno, "Failed to wait for EOF on notify socket: %m"); + return log_debug_errno(errno, "Failed to wait for EOF on notify socket: %m"); + if (n > 0) + return log_debug_errno(SYNTHETIC_ERRNO(EPROTO), "Unexpectedly received data on notify socket."); } return 1; -- 2.47.3