From 3a5d89fa82ef6f2ef98bb6744b507aec418999ff Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 3 Dec 2018 17:40:41 -0800
Subject: [PATCH] analyze: Fix if not HAVE_SECCOMP

The new systemd analyze code dependend on routines provided by
libseccomp even if HAVE_SECCOMP is false. This expands the code disabled
in analyze-security to make sure we don't depend on seccomp.
---
 src/analyze/analyze-security.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/analyze/analyze-security.c b/src/analyze/analyze-security.c
index 6402d4504af..3d2eeade749 100644
--- a/src/analyze/analyze-security.c
+++ b/src/analyze/analyze-security.c
@@ -15,7 +15,9 @@
 #include "parse-util.h"
 #include "path-util.h"
 #include "pretty-print.h"
-#include "seccomp-util.h"
+#if HAVE_SECCOMP
+#  include "seccomp-util.h"
+#endif
 #include "set.h"
 #include "stdio-util.h"
 #include "strv.h"
@@ -476,6 +478,8 @@ static int assess_system_call_architectures(
         return 0;
 }
 
+#if HAVE_SECCOMP
+
 static bool syscall_names_in_filter(Set *s, bool whitelist, const SyscallFilterSet *f) {
         const char *syscall;
 
@@ -487,14 +491,12 @@ static bool syscall_names_in_filter(Set *s, bool whitelist, const SyscallFilterS
                         assert_se(g = syscall_filter_set_find(syscall));
                         b = syscall_names_in_filter(s, whitelist, g);
                 } else {
-#if HAVE_SECCOMP
                         int id;
 
                         /* Let's see if the system call actually exists on this platform, before complaining */
                         id = seccomp_syscall_resolve_name(syscall);
                         if (id < 0)
                                 continue;
-#endif
 
                         b = set_contains(s, syscall);
                 }
@@ -565,6 +567,8 @@ static int assess_system_call_filter(
         return 0;
 }
 
+#endif
+
 static int assess_ip_address_allow(
                 const struct security_assessor *a,
                 const struct security_info *info,
@@ -1258,6 +1262,7 @@ static const struct security_assessor security_assessor_table[] = {
                 .range = 10,
                 .assess = assess_system_call_architectures,
         },
+#if HAVE_SECCOMP
         {
                 .id = "SystemCallFilter=~@swap",
                 .url = "https://www.freedesktop.org/software/systemd/man/systemd.exec.html#SystemCallFilter=",
@@ -1346,6 +1351,7 @@ static const struct security_assessor security_assessor_table[] = {
                 .assess = assess_system_call_filter,
                 .parameter = SYSCALL_FILTER_SET_RESOURCES,
         },
+#endif
         {
                 .id = "IPAddressDeny=",
                 .url = "https://www.freedesktop.org/software/systemd/man/systemd.exec.html#IPAddressDeny=",
-- 
2.47.3