summaryrefslogtreecommitdiff
path: root/one.cpp
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2018-05-30 11:19:12 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2018-05-30 11:19:12 -0700
commit8199dbd0dcbc3259eb3218ece183315eddb1e84b (patch)
treee5f6b7a58bb9d0aa87958bcca7ea265e45519ee6 /one.cpp
parent91c8e82c428cea9d9e0a6911fbd1820212871ad8 (diff)
parentc0efba79c70ee537813efd333302dc588668cbce (diff)
downloadinfinitytier-8199dbd0dcbc3259eb3218ece183315eddb1e84b.tar.gz
infinitytier-8199dbd0dcbc3259eb3218ece183315eddb1e84b.zip
Merge branch 'dev' into edge
Diffstat (limited to 'one.cpp')
-rw-r--r--one.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/one.cpp b/one.cpp
index 9ebc83c1..b770451c 100644
--- a/one.cpp
+++ b/one.cpp
@@ -972,7 +972,7 @@ static void _sighandlerQuit(int sig)
#endif
// Drop privileges on Linux, if supported by libc etc. and "zerotier-one" user exists on system
-#ifdef __LINUX__
+#if defined(__LINUX__) && !defined(ZT_NO_CAPABILITIES)
#ifndef PR_CAP_AMBIENT
#define PR_CAP_AMBIENT 47
#define PR_CAP_AMBIENT_IS_SET 1