summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-02-12 18:44:40 +0100
committerLennart Poettering <lennart@poettering.net>2014-02-12 18:44:40 +0100
commit351a19b17d51ba0a5737f35d3c5deb8e7975fdee (patch)
tree03fb024a7c9f496cb6db9eaa657698c201688b41
parent17df7223be064b1542dbe868e3b35cca977ee639 (diff)
core: fix build without libseccomp
-rw-r--r--src/core/dbus-execute.c4
-rw-r--r--src/core/execute.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
index 34d8eedc07..435c3d505f 100644
--- a/src/core/dbus-execute.c
+++ b/src/core/dbus-execute.c
@@ -350,14 +350,17 @@ static int property_get_syscall_filter(
ExecContext *c = userdata;
_cleanup_strv_free_ char **l = NULL;
_cleanup_free_ char *t = NULL;
+#ifdef HAVE_SECCOMP
Iterator i;
void *id;
int r;
+#endif
assert(bus);
assert(reply);
assert(c);
+#ifdef HAVE_SECCOMP
SET_FOREACH(id, c->syscall_filter, i) {
char *name;
@@ -371,6 +374,7 @@ static int property_get_syscall_filter(
return -ENOMEM;
}
}
+#endif
strv_sort(l);
diff --git a/src/core/execute.c b/src/core/execute.c
index 1184777295..4033470e5b 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -2115,9 +2115,11 @@ void exec_context_dump(ExecContext *c, FILE* f, const char *prefix) {
prefix, c->selinux_context);
if (c->syscall_filter) {
+#ifdef HAVE_SECCOMP
Iterator j;
void *id;
bool first = true;
+#endif
fprintf(f,
"%sSystemCallFilter: \n",
@@ -2126,6 +2128,7 @@ void exec_context_dump(ExecContext *c, FILE* f, const char *prefix) {
if (!c->syscall_whitelist)
fputc('~', f);
+#ifdef HAVE_SECCOMP
SET_FOREACH(id, c->syscall_filter, j) {
_cleanup_free_ char *name = NULL;
@@ -2137,6 +2140,7 @@ void exec_context_dump(ExecContext *c, FILE* f, const char *prefix) {
name = seccomp_syscall_resolve_num_arch(PTR_TO_INT(id)-1, SCMP_ARCH_NATIVE);
fputs(strna(name), f);
}
+#endif
fputc('\n', f);
}