From d2d9d6631cb41b43b2ae077620d4f6f60247053c Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Tue, 7 May 2024 13:29:30 +0200
Subject: [PATCH 0597/1160] manager: pass the right error variable
(cherry picked from commit af1690cfccceb7e7553f6f842a201be4ebcbbd27)
src/core/manager.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
@@ -1236,13 +1236,13 @@ static int manager_setup_user_lookup_fd(Manager *m) {
if (!m->user_lookup_event_source) {
r = sd_event_add_io(m->event, &m->user_lookup_event_source, m->user_lookup_fds[0], EPOLLIN, manager_dispatch_user_lookup_fd, m);
if (r < 0)
- return log_error_errno(errno, "Failed to allocate user lookup event source: %m");
+ return log_error_errno(r, "Failed to allocate user lookup event source: %m");
/* Process even earlier than the notify event source, so that we always know first about valid UID/GID
* resolutions */
r = sd_event_source_set_priority(m->user_lookup_event_source, SD_EVENT_PRIORITY_NORMAL-11);
if (r < 0)
- return log_error_errno(errno, "Failed to set priority of user lookup event source: %m");
+ return log_error_errno(r, "Failed to set priority of user lookup event source: %m");
(void) sd_event_source_set_description(m->user_lookup_event_source, "user-lookup");
}
@@ -2986,7 +2986,7 @@ static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t
r = manager_get_dump_string(m, /* patterns= */ NULL, &dump);
if (r < 0) {
- log_warning_errno(errno, "Failed to acquire manager dump: %m");
+ log_warning_errno(r, "Failed to acquire manager dump: %m");
break;
}
@@ -3077,7 +3077,7 @@ static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t
r = manager_get_dump_jobs_string(m, /* patterns= */ NULL, " ", &dump_jobs);
if (r < 0) {
- log_warning_errno(errno, "Failed to acquire manager jobs dump: %m");
+ log_warning_errno(r, "Failed to acquire manager jobs dump: %m");
break;
}
--
2.33.0