From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 14 May 2025 21:26:24 +0000 (+0200)
Subject: nsresourced: Clean up includes
X-Git-Tag: v258-rc1~589^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1e519910ba3254ef085268b2d3f520def9029b6;p=thirdparty%2Fsystemd.git

nsresourced: Clean up includes

Split out of #37344.
---

diff --git a/src/nsresourced/nsresourced-manager.c b/src/nsresourced/nsresourced-manager.c
index ee52f09f84f..ab3086ad76e 100644
--- a/src/nsresourced/nsresourced-manager.c
+++ b/src/nsresourced/nsresourced-manager.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <stdlib.h>
 #include <sys/mount.h>
 #include <sys/wait.h>
 
@@ -14,6 +15,7 @@
 #include "env-util.h"
 #include "event-util.h"
 #include "fd-util.h"
+#include "format-util.h"
 #include "fs-util.h"
 #include "log.h"
 #include "mkdir.h"
@@ -24,9 +26,10 @@
 #include "set.h"
 #include "signal-util.h"
 #include "socket-util.h"
-#include "stat-util.h"
 #include "stdio-util.h"
+#include "string-util.h"
 #include "strv.h"
+#include "time-util.h"
 #include "umask-util.h"
 #include "unaligned.h"
 #include "user-util.h"
diff --git a/src/nsresourced/nsresourced-manager.h b/src/nsresourced/nsresourced-manager.h
index 5ecf378a60c..ce8d8c690a0 100644
--- a/src/nsresourced/nsresourced-manager.h
+++ b/src/nsresourced/nsresourced-manager.h
@@ -1,18 +1,13 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "sd-bus.h"
-#include "sd-event.h"
-
-typedef struct Manager Manager;
-
-#include "hashmap.h"
+#include "forward.h"
 #include "ratelimit.h"
 
 #define NSRESOURCE_WORKERS_MIN 5
 #define NSRESOURCE_WORKERS_MAX 4096
 
-struct Manager {
+typedef struct Manager {
         sd_event *event;
 
         Set *workers_fixed;    /* Workers 0…NSRESOURCE_WORKERS_MIN */
@@ -31,7 +26,7 @@ struct Manager {
 #endif
 
         int registry_fd;
-};
+} Manager;
 
 int manager_new(Manager **ret);
 Manager* manager_free(Manager *m);
diff --git a/src/nsresourced/nsresourced.c b/src/nsresourced/nsresourced.c
index ff84f766cd9..455ee70705b 100644
--- a/src/nsresourced/nsresourced.c
+++ b/src/nsresourced/nsresourced.c
@@ -1,7 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <stdlib.h>
 #include <sys/stat.h>
-#include <sys/types.h>
+
+#include "sd-event.h"
 
 #include "daemon-util.h"
 #include "log.h"
diff --git a/src/nsresourced/nsresourcework.c b/src/nsresourced/nsresourcework.c
index b1c6dd86f94..e283593bf7f 100644
--- a/src/nsresourced/nsresourcework.c
+++ b/src/nsresourced/nsresourcework.c
@@ -5,6 +5,7 @@
 #include <linux/nsfs.h>
 #include <linux/veth.h>
 #include <net/if.h>
+#include <poll.h>
 #include <sys/eventfd.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
@@ -12,36 +13,40 @@
 #include <utmpx.h>
 
 #include "sd-daemon.h"
+#include "sd-event.h"
 #include "sd-netlink.h"
 #include "sd-varlink.h"
 
 #include "argv-util.h"
 #include "bus-polkit.h"
 #include "env-util.h"
+#include "errno-util.h"
+#include "ether-addr-util.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "fs-util.h"
-#include "group-record.h"
+#include "format-util.h"
+#include "hashmap.h"
 #include "io-util.h"
 #include "json-util.h"
-#include "lock-util.h"
 #include "main-func.h"
 #include "missing_magic.h"
+#include "missing_sched.h"
 #include "missing_syscall.h"
-#include "mount-util.h"
 #include "mountpoint-util.h"
 #include "namespace-util.h"
 #include "netlink-util.h"
+#include "pidref.h"
 #include "process-util.h"
 #include "random-util.h"
+#include "siphash24.h"
 #include "socket-util.h"
 #include "stat-util.h"
+#include "string-util.h"
 #include "strv.h"
 #include "time-util.h"
 #include "uid-classification.h"
 #include "uid-range.h"
 #include "user-record.h"
-#include "user-record-nss.h"
 #include "user-util.h"
 #include "userdb.h"
 #include "userns-registry.h"
diff --git a/src/nsresourced/test-userns-restrict.c b/src/nsresourced/test-userns-restrict.c
index 0aff1c87fbd..61d4cd64bc5 100644
--- a/src/nsresourced/test-userns-restrict.c
+++ b/src/nsresourced/test-userns-restrict.c
@@ -2,12 +2,13 @@
 
 #include <sys/eventfd.h>
 #include <sys/mount.h>
+#include <sys/stat.h>
 
 #include "errno-util.h"
 #include "fd-util.h"
 #include "log.h"
 #include "main-func.h"
-#include "missing_syscall.h"
+#include "missing_sched.h"
 #include "namespace-util.h"
 #include "process-util.h"
 #include "rm-rf.h"
diff --git a/src/nsresourced/userns-registry.c b/src/nsresourced/userns-registry.c
index be314231aec..464bbee55aa 100644
--- a/src/nsresourced/userns-registry.c
+++ b/src/nsresourced/userns-registry.c
@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <unistd.h>
+
 #include "sd-json.h"
 #include "sd-netlink.h"
 
@@ -15,6 +17,8 @@
 #include "path-util.h"
 #include "recurse-dir.h"
 #include "rm-rf.h"
+#include "stat-util.h"
+#include "string-util.h"
 #include "strv.h"
 #include "user-util.h"
 #include "userns-registry.h"
diff --git a/src/nsresourced/userns-registry.h b/src/nsresourced/userns-registry.h
index e25b402e888..c1e7c9f1f5a 100644
--- a/src/nsresourced/userns-registry.h
+++ b/src/nsresourced/userns-registry.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "memory-util.h"
+#include "forward.h"
 
 #define USER_NAMESPACE_CGROUPS_DELEGATE_MAX 16U
 #define USER_NAMESPACE_NETIFS_DELEGATE_MAX 16U
diff --git a/src/nsresourced/userns-restrict.c b/src/nsresourced/userns-restrict.c
index e464731e707..e082dce2437 100644
--- a/src/nsresourced/userns-restrict.c
+++ b/src/nsresourced/userns-restrict.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <sys/stat.h>
 #include <sched.h>
 #include <sys/mount.h>
 
@@ -10,10 +11,10 @@
 #include "log.h"
 #include "lsm-util.h"
 #include "mkdir.h"
-#include "mount-util.h"
 #include "mountpoint-util.h"
 #include "namespace-util.h"
 #include "path-util.h"
+#include "string-util.h"
 #include "userns-restrict.h"
 
 #define USERNS_MAX (16U*1024U)
diff --git a/src/nsresourced/userns-restrict.h b/src/nsresourced/userns-restrict.h
index 92c8c9f2110..d9c0f611ef8 100644
--- a/src/nsresourced/userns-restrict.h
+++ b/src/nsresourced/userns-restrict.h
@@ -1,10 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stdbool.h>
-
-#include "macro.h"
-#include "memory-util.h"
+#include "forward.h"
 
 #if HAVE_VMLINUX_H
 #include "bpf/userns_restrict/userns-restrict-skel.h"