morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 16:37:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

notify-recv: several follow-ups for notify_socket_prepare()

Browse Source 
Follow-ups for 2351bc991e.
Addresses post-merge review:
https://github.com/systemd/systemd/pull/36911#pullrequestreview-2732136658
This commit is contained in:
Yu Watanabe
2025-04-01 19:15:59 +09:00
parent 79bc7625f6
commit c5855d9640
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/shared/notify-recv.c
View File

@@ -17,6 +17,10 @@ int notify_socket_prepare(
int r;
assert(event);
assert(ret_path);
/* This creates an autobind AF_UNIX socket and adds an IO event source for the socket, which helps
* prepare the notification socket used to communicate with worker processes. */
_cleanup_close_ int fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
if (fd < 0)
@@ -34,7 +38,7 @@ int notify_socket_prepare(
/* SO_PASSPIDFD is supported since kernel v6.5. */
r = setsockopt_int(fd, SOL_SOCKET, SO_PASSPIDFD, true);
if (r < 0)
log_debug_errno(r, "Failed to enable SO_PASSPIDFD on notification socket, ignoring. %m");
log_debug_errno(r, "Failed to enable SO_PASSPIDFD on notification socket, ignoring: %m");
_cleanup_(sd_event_source_unrefp) sd_event_source *s = NULL;
r = sd_event_add_io(event, &s, fd, EPOLLIN, handler, userdata);
@@ -56,9 +60,7 @@ int notify_socket_prepare(
if (r < 0)
return log_debug_errno(r, "Failed to make notification event source floating: %m");
if (ret_path)
*ret_path = TAKE_PTR(path);
*ret_path = TAKE_PTR(path);
return 0;
}