From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 1 Nov 2019 09:18:31 +0000 (+0900)
Subject: tree-wide: drop pwd.h and grp.h when user-util.h is included
X-Git-Tag: v244-rc1~101^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=927d2351d73d977940852379a3869b96539e37bf;p=thirdparty%2Fsystemd.git

tree-wide: drop pwd.h and grp.h when user-util.h is included
---

diff --git a/src/basic/capability-util.c b/src/basic/capability-util.c
index bde6a4a57be..d084ad5cf55 100644
--- a/src/basic/capability-util.c
+++ b/src/basic/capability-util.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <grp.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/prctl.h>
diff --git a/src/basic/user-util.c b/src/basic/user-util.c
index 495398ca014..93ba4eedd27 100644
--- a/src/basic/user-util.c
+++ b/src/basic/user-util.c
@@ -2,8 +2,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
diff --git a/src/core/dynamic-user.c b/src/core/dynamic-user.c
index e7a2f645251..75373407b48 100644
--- a/src/core/dynamic-user.c
+++ b/src/core/dynamic-user.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <grp.h>
-#include <pwd.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/src/core/execute.c b/src/core/execute.c
index fe35168cb6b..fadb651def0 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <grp.h>
 #include <poll.h>
 #include <signal.h>
 #include <sys/eventfd.h>
diff --git a/src/login/logind-core.c b/src/login/logind-core.c
index b981544e12d..4585afedc61 100644
--- a/src/login/logind-core.c
+++ b/src/login/logind-core.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <fcntl.h>
-#include <pwd.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <linux/vt.h>
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 1c7c4912fb5..69b59948786 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <pwd.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
diff --git a/src/login/logind-utmp.c b/src/login/logind-utmp.c
index 059a135f873..d2a5890277d 100644
--- a/src/login/logind-utmp.c
+++ b/src/login/logind-utmp.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <pwd.h>
 #include <unistd.h>
 
 #include "sd-messages.h"
diff --git a/src/nspawn/nspawn-setuid.c b/src/nspawn/nspawn-setuid.c
index 3c302d6487d..cb2b2272b6b 100644
--- a/src/nspawn/nspawn-setuid.c
+++ b/src/nspawn/nspawn-setuid.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <fcntl.h>
-#include <grp.h>
 #include <sys/types.h>
 #include <unistd.h>
 
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index db3bc1a4db8..3a866980c8c 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -5,10 +5,8 @@
 #endif
 #include <errno.h>
 #include <getopt.h>
-#include <grp.h>
 #include <linux/fs.h>
 #include <linux/loop.h>
-#include <pwd.h>
 #if HAVE_SELINUX
 #include <selinux/selinux.h>
 #endif
diff --git a/src/test/test-execute.c b/src/test/test-execute.c
index 435ab39cd25..92fb35fd877 100644
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <grp.h>
-#include <pwd.h>
 #include <stdio.h>
 #include <sys/prctl.h>
 #include <sys/types.h>
diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c
index 78e1c68b2a9..c65f6ffe083 100644
--- a/src/test/test-unit-name.c
+++ b/src/test/test-unit-name.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>