From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 2 Aug 2017 05:38:08 +0000 (+0900)
Subject: core: define variables only when they are required
X-Git-Tag: v235~264^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ecfbc84f1ca88d2aafd974ee13cdda87209c430b;p=thirdparty%2Fsystemd.git

core: define variables only when they are required

Follow-up for 7f18ef0a555a3c3cef08e0965dc453fe5954b5a7.
---

diff --git a/src/core/execute.c b/src/core/execute.c
index 2b6acb266a1..56e3aa61ff5 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -2295,8 +2295,16 @@ static int exec_child(
         const char *home = NULL, *shell = NULL;
         dev_t journal_stream_dev = 0;
         ino_t journal_stream_ino = 0;
-        bool needs_exec_restrictions, needs_mount_namespace,
-                needs_selinux = false, needs_smack = false, needs_apparmor = false;
+        bool needs_exec_restrictions, needs_mount_namespace;
+#ifdef HAVE_SELINUX
+        bool needs_selinux = false;
+#endif
+#ifdef HAVE_SMACK
+        bool needs_smack = false;
+#endif
+#ifdef HAVE_APPARMOR
+        bool needs_apparmor = false;
+#endif
         uid_t uid = UID_INVALID;
         gid_t gid = GID_INVALID;
         int i, r, ngids = 0;