ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-02-22 10:20:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev

Browse Source
This commit is contained in:
Adam Ierymenko 2018-05-11 13:40:22 -07:00
commit c0efba79c7
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
make-linux.mk
View File

@ -79,7 +79,7 @@ endif
ifeq ($(ZT_SYNOLOGY), 1) ifeq ($(ZT_SYNOLOGY), 1)
override CFLAGS+=-fPIC override CFLAGS+=-fPIC
override CXXFLAGS+=-fPIC override CXXFLAGS+=-fPIC
override DEFS+=-D__SYNOLOGY__ override DEFS+=-D__SYNOLOGY__
endif endif
ifeq ($(ZT_TRACE),1) ifeq ($(ZT_TRACE),1)
@ -111,6 +111,12 @@ ifeq ($(CC_MACH),amd64)
endif endif
ifeq ($(CC_MACH),powerpc64le) ifeq ($(CC_MACH),powerpc64le)
ZT_ARCHITECTURE=8 ZT_ARCHITECTURE=8
override DEFS+=-DZT_NO_TYPE_PUNNING
endif
ifeq ($(CC_MACH),powerpc)
ZT_ARCHITECTURE=8
override DEFS+=-DZT_NO_TYPE_PUNNING
override DEFS+=-DZT_NO_CAPABILITIES
endif endif
ifeq ($(CC_MACH),ppc64le) ifeq ($(CC_MACH),ppc64le)
ZT_ARCHITECTURE=8 ZT_ARCHITECTURE=8
@ -199,10 +205,6 @@ ifeq ($(CC_MACH),mips64el)
ZT_ARCHITECTURE=6 ZT_ARCHITECTURE=6
override DEFS+=-DZT_NO_TYPE_PUNNING override DEFS+=-DZT_NO_TYPE_PUNNING
endif endif
ifeq ($(CC_MACH),powerpc64le)
ZT_ARCHITECTURE=7
override DEFS+=-DZT_NO_TYPE_PUNNING
endif
# Fail if system architecture could not be determined # Fail if system architecture could not be determined
ifeq ($(ZT_ARCHITECTURE),999) ifeq ($(ZT_ARCHITECTURE),999)

2
one.cpp
View File

@ -972,7 +972,7 @@ static void _sighandlerQuit(int sig)
#endif #endif
// Drop privileges on Linux, if supported by libc etc. and "zerotier-one" user exists on system // 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 #ifndef PR_CAP_AMBIENT
#define PR_CAP_AMBIENT 47 #define PR_CAP_AMBIENT 47
#define PR_CAP_AMBIENT_IS_SET 1 #define PR_CAP_AMBIENT_IS_SET 1