don't override pledge and unveil when the host provides them

3 files changed, 16 insertions, 1 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ffe67b..cae3cb9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -343,6 +343,16 @@ if(HAVE_GETPROGNAME)
         add_definitions(-DHAVE_GETPROGNAME)
 endif()
 
+check_symbol_exists(pledge "unistd.h" HAVE_PLEDGE)
+if(HAVE_PLEDGE)
+        add_definitions(-DHAVE_PLEDGE)
+endif()
+
+check_symbol_exists(unveil "unistd.h" HAVE_UNVEIL)
+if(HAVE_UNVEIL)
+        add_definitions(-DHAVE_UNVEIL)
+endif()
+
 check_symbol_exists(syslog_r "syslog.h;stdarg.h" HAVE_SYSLOG_R)
 if(HAVE_SYSLOG_R)
         add_definitions(-DHAVE_SYSLOG_R)
diff --git a/include/compat/unistd.h b/include/compat/unistd.h
index 544cb27..0ce66dd 100644
--- a/include/compat/unistd.h
+++ b/include/compat/unistd.h
@@ -75,8 +75,13 @@ int getentropy(void *buf, size_t buflen);
 int getpagesize(void);
 #endif
 
+#ifndef HAVE_PLEDGE
 #define pledge(request, paths) 0
+#endif
+
+#ifndef HAVE_UNVEIL
 #define unveil(path, permissions) 0
+#endif
 
 #ifndef HAVE_PIPE2
 int pipe2(int fildes[2], int flags);
diff --git a/m4/check-libc.m4 b/m4/check-libc.m4
index eec3cb3..42867cc 100644
--- a/m4/check-libc.m4
+++ b/m4/check-libc.m4
@@ -61,7 +61,7 @@ AM_CONDITIONAL([HAVE_SYSLOG_R], [test "x$ac_cv_func_syslog_r" = xyes])
 ])
 
 AC_DEFUN([CHECK_SYSCALL_COMPAT], [
-AC_CHECK_FUNCS([accept4 pipe2 pledge poll socketpair])
+AC_CHECK_FUNCS([accept4 pipe2 pledge poll socketpair unveil])
 AM_CONDITIONAL([HAVE_ACCEPT4], [test "x$ac_cv_func_accept4" = xyes])
 AM_CONDITIONAL([HAVE_PIPE2], [test "x$ac_cv_func_pipe2" = xyes])
 AM_CONDITIONAL([HAVE_PLEDGE], [test "x$ac_cv_func_pledge" = xyes])