properly disable safe_fork

This commit is contained in:
Nikos Mavrogiannopoulos
2015-01-20 10:12:47 +01:00
parent 2a25795170
commit c0cd87b0e3

View File

@@ -52,9 +52,9 @@ void pr_set_undumpable(const char *mod)
#endif #endif
} }
#if defined(__linux__) && defined(ENABLE_LINUX_NS)
pid_t safe_fork(void) pid_t safe_fork(void)
{ {
#if defined(__linux__) && defined(ENABLE_LINUX_NS)
long ret; long ret;
/* fork: 100% /* fork: 100%
* CLONE_NEWPID|CLONE_NEWNET|CLONE_NEWIPC: 3% * CLONE_NEWPID|CLONE_NEWNET|CLONE_NEWIPC: 3%
@@ -66,10 +66,8 @@ pid_t safe_fork(void)
if (ret == 0 && syscall(SYS_getpid)!= 1) if (ret == 0 && syscall(SYS_getpid)!= 1)
return -1; return -1;
return ret; return ret;
#else
return -1;
#endif
} }
#endif
SIGHANDLER_T ocsignal(int signum, SIGHANDLER_T handler) SIGHANDLER_T ocsignal(int signum, SIGHANDLER_T handler)
{ {