picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

core: fix build without libseccomp

Browse source
This commit is contained in:
Lennart Poettering 2014-02-12 18:44:40 +01:00
parent 17df7223be
commit 351a19b17d
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/dbus-execute.c
View file

@ -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);

4
src/core/execute.c
View file

@ -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);
}