From: Mike Yuan <me@yhndnzj.com>
Date: Sat, 27 Apr 2024 06:08:10 +0000 (+0800)
Subject: core/manager-serialize: deserialize handoff-timestamp fds
X-Git-Tag: v256-rc2~181^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0c49dbcd75aa1f8771b5940d0e25137fd71f9dd;p=thirdparty%2Fsystemd.git

core/manager-serialize: deserialize handoff-timestamp fds

Follow-up for 817062e6211e7559ff91bcb7bb5dc4e472fc1646

Fixes #32512
---

diff --git a/src/core/manager-serialize.c b/src/core/manager-serialize.c
index 022d64a288d..b4af82b4e17 100644
--- a/src/core/manager-serialize.c
+++ b/src/core/manager-serialize.c
@@ -482,6 +482,15 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) {
                         if (r < 0)
                                 log_warning_errno(r, "Failed to parse user-lookup fds: \"%s\", ignoring: %m", val);
 
+                } else if ((val = startswith(l, "handoff-timestamp-fds="))) {
+
+                        m->handoff_timestamp_event_source = sd_event_source_disable_unref(m->handoff_timestamp_event_source);
+                        safe_close_pair(m->handoff_timestamp_fds);
+
+                        r = deserialize_fd_many(fds, val, 2, m->handoff_timestamp_fds);
+                        if (r < 0)
+                                log_warning_errno(r, "Failed to parse handoff-timestamp fds: \"%s\", ignoring: %m", val);
+
                 } else if ((val = startswith(l, "dynamic-user=")))
                         dynamic_user_deserialize_one(m, val, fds, NULL);
                 else if ((val = startswith(l, "destroy-ipc-uid=")))