Skip to content

Commit 16d3a64

Browse files
YHNdnzjDaanDeMeyer
authored andcommitted
sd-daemon: downgrade log level for library code, use correct errno
Follow-up for 13b67b6 (cherry picked from commit 3baab23)
1 parent b15490c commit 16d3a64

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/libsystemd/sd-daemon/sd-daemon.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -597,14 +597,14 @@ static int pid_notify_with_fds_internal(
597597
if (address.sockaddr.sa.sa_family == AF_VSOCK && IN_SET(type, SOCK_STREAM, SOCK_SEQPACKET)) {
598598
/* For AF_VSOCK, we need to close the socket to signal the end of the message. */
599599
if (shutdown(fd, SHUT_WR) < 0)
600-
return log_error_errno(errno, "Failed to shutdown notify socket: %m");
600+
return log_debug_errno(errno, "Failed to shutdown notify socket: %m");
601601

602-
char buf[1];
603-
n = recv(fd, buf, sizeof(buf), MSG_NOSIGNAL);
604-
if (n > 0)
605-
return log_error_errno(errno, "Unexpectedly received data on notify socket: %m");
602+
char c;
603+
n = recv(fd, &c, sizeof(c), MSG_NOSIGNAL);
606604
if (n < 0)
607-
return log_error_errno(errno, "Failed to wait for EOF on notify socket: %m");
605+
return log_debug_errno(errno, "Failed to wait for EOF on notify socket: %m");
606+
if (n > 0)
607+
return log_debug_errno(SYNTHETIC_ERRNO(EPROTO), "Unexpectedly received data on notify socket.");
608608
}
609609

610610
return 1;

0 commit comments

Comments
 (0)