diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2018-05-21 22:30:06 +0200 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2018-05-21 22:30:06 +0200 |
| commit | 4de442d472f33c1e6012a96c94069ef2923ea716 (patch) | |
| tree | 9476b2f916467d8ae6b637ae31e8e88c76529ab4 /src | |
| parent | 15dccd91c589cd3f376650759b42319f0f712205 (diff) | |
POTD skeleton #72.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/main.c | 7 | ||||
| -rw-r--r-- | src/pseccomp.c | 10 |
3 files changed, 15 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index f3491cf..22c879f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,5 @@ -AM_CFLAGS = -pedantic -Wall -std=gnu99 -fstrict-aliasing -D_GNU_SOURCE=1 $(libssh_CFLAGS) $(libseccomp_CFLAGS) $(SPECTRE_MIT) $(SYMBOL_VISIBILITY) -AM_LDFLAGS = $(libssh_LIBS) $(libseccomp_LIBS) +AM_CFLAGS = -pedantic -Wall -std=gnu99 -fstrict-aliasing -D_GNU_SOURCE=1 $(libssh_CFLAGS) $(libseccomp_CFLAGS) $(valgrind_CFLAGS) $(SPECTRE_MIT) $(SYMBOL_VISIBILITY) +AM_LDFLAGS = $(libssh_LIBS) $(libseccomp_LIBS) $(valgrind_LIBS) sbin_PROGRAMS = potd potd_SOURCES = utils.c log.c log_colored.c socket.c pevent.c capabilities.c pseccomp.c jail.c forward.c redirector.c protocol.c protocol_ssh.c main.c @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <stdio.h> #include <assert.h> #include <sys/types.h> @@ -12,9 +16,6 @@ #include "protocol_ssh.h" #include "forward.h" #include "jail.h" -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif static void jail_preinit(const char *jail_ports[], jail_ctx *ctx[], const size_t siz); diff --git a/src/pseccomp.c b/src/pseccomp.c index c794fdb..e991d46 100644 --- a/src/pseccomp.c +++ b/src/pseccomp.c @@ -1,6 +1,12 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <assert.h> #include <sys/prctl.h> -#include <valgrind/valgrind.h> +#ifdef HAVE_VALGRIND +#include <valgrind.h> +#endif #include "pseccomp.h" #include "log.h" @@ -75,10 +81,12 @@ static const int jail_allowed_syscalls[] = { static int pseccomp_using_valgrind(void) { +#ifdef HAVE_VALGRIND if (RUNNING_ON_VALGRIND) { W("%s", "SECCOMP: running on valgrind, disabled"); return 1; } +#endif return 0; } |