diff options
| -rw-r--r-- | include/test/test.h | 6 | ||||
| -rw-r--r-- | src/irmd/reg/reg.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/test/test.h b/include/test/test.h index 99681384..a76fe62a 100644 --- a/include/test/test.h +++ b/include/test/test.h @@ -30,6 +30,9 @@ #include <sys/wait.h> #include <sys/types.h> #include <sys/resource.h> +#ifdef __linux__ +#include <sys/prctl.h> +#endif #define TEST_RC_SUCCESS 0 #define TEST_RC_SKIP 1 @@ -86,6 +89,9 @@ static int __attribute__((unused)) test_assert_fail(int(* testfunc)(void)) #ifdef DISABLE_TESTS_CORE_DUMPS struct rlimit rl = { .rlim_cur = 0, .rlim_max = 0 }; setrlimit(RLIMIT_CORE, &rl); +#ifdef __linux__ + prctl(PR_SET_DUMPABLE, 0); +#endif #endif return testfunc(); /* should abort */ } diff --git a/src/irmd/reg/reg.c b/src/irmd/reg/reg.c index 9ee47221..0025f695 100644 --- a/src/irmd/reg/reg.c +++ b/src/irmd/reg/reg.c @@ -2008,11 +2008,7 @@ int reg_respond_accept(struct flow_info * info, info->n_pid = flow->info.n_pid; -<<<<<<< HEAD flow->req_data = *pbuf; -======= - reg_flow_set_data(flow, pbuf); ->>>>>>> c82f0de4 (irmd: Fix memleak in reg tests) clrbuf(*pbuf); if (reg_flow_update(flow, info) < 0) { |