summaryrefslogtreecommitdiff
path: root/one.cpp
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2018-05-11 13:40:22 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2018-05-11 13:40:22 -0700
commitc0efba79c70ee537813efd333302dc588668cbce (patch)
treeb4c7334de5bc03b7d24a6b89185c27cf9fbb713d /one.cpp
parent5809941ae9c697c51f20f9810621e7a53a75f48f (diff)
parent535ba8a207f7cfc2ce6e8ba2e44442896ffffc29 (diff)
downloadinfinitytier-c0efba79c70ee537813efd333302dc588668cbce.tar.gz
infinitytier-c0efba79c70ee537813efd333302dc588668cbce.zip
Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev
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