From: Daan De Meyer Date: Fri, 10 Mar 2023 11:25:42 +0000 (+0100) Subject: execute: Use log_unit_error_errno() instead of log_error_errno() X-Git-Tag: v254-rc1~1046^2~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dcebb015fb168351039ab0c89f49f485503deeb0;p=thirdparty%2Fsystemd.git execute: Use log_unit_error_errno() instead of log_error_errno() --- diff --git a/src/core/execute.c b/src/core/execute.c index 9db5b2cd17e..3800c7a38bf 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -4198,9 +4198,10 @@ static int get_open_file_fd(Unit *u, const OpenFile *of) { ofd = open(of->path, O_PATH | O_CLOEXEC); if (ofd < 0) - return log_error_errno(errno, "Could not open \"%s\": %m", of->path); + return log_unit_error_errno(u, errno, "Could not open \"%s\": %m", of->path); + if (fstat(ofd, &st) < 0) - return log_error_errno(errno, "Failed to stat %s: %m", of->path); + return log_unit_error_errno(u, errno, "Failed to stat %s: %m", of->path); if (S_ISSOCK(st.st_mode)) { fd = connect_unix_harder(u, of, ofd); @@ -4208,7 +4209,8 @@ static int get_open_file_fd(Unit *u, const OpenFile *of) { return fd; if (FLAGS_SET(of->flags, OPENFILE_READ_ONLY) && shutdown(fd, SHUT_WR) < 0) - return log_error_errno(errno, "Failed to shutdown send for socket %s: %m", of->path); + return log_unit_error_errno(u, errno, "Failed to shutdown send for socket %s: %m", + of->path); log_unit_debug(u, "socket %s opened (fd=%d)", of->path, fd); } else {