diff options
author | Greg V <greg@unrelenting.technology> | 2016-12-08 15:34:08 +0300 |
---|---|---|
committer | Greg V <greg@unrelenting.technology> | 2016-12-09 19:32:07 +0300 |
commit | da26d69cb1b21d582a81af0cad7342fab6596eed (patch) | |
tree | 18c24336e664111ba9c3a5bfedec5c340ec0a19d /sway/main.c | |
parent | Use return value of write (diff) | |
download | sway-da26d69cb1b21d582a81af0cad7342fab6596eed.tar.gz sway-da26d69cb1b21d582a81af0cad7342fab6596eed.tar.zst sway-da26d69cb1b21d582a81af0cad7342fab6596eed.zip |
Fix build on FreeBSD
- Make sure CMake always finds absolute paths for Cairo, Pango and GdkPixbuf
- Add forgotten json-c include path to swaymsg/CMakeLists.txt
- Disable -Werror because of assert warnings
- Add correct /proc/pid/file path for FreeBSD
- Use libepoll-shim on FreeBSD
- Only use Linux capabilities on, well, Linux
Diffstat (limited to 'sway/main.c')
-rw-r--r-- | sway/main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sway/main.c b/sway/main.c index eb103a1e..157c61b3 100644 --- a/sway/main.c +++ b/sway/main.c | |||
@@ -152,6 +152,7 @@ static void security_sanity_check() { | |||
152 | sway_log(L_ERROR, | 152 | sway_log(L_ERROR, |
153 | "!! DANGER !! /proc is not available - sway CANNOT enforce security rules!"); | 153 | "!! DANGER !! /proc is not available - sway CANNOT enforce security rules!"); |
154 | } | 154 | } |
155 | #ifdef __linux__ | ||
155 | cap_flag_value_t v; | 156 | cap_flag_value_t v; |
156 | cap_t cap = cap_get_proc(); | 157 | cap_t cap = cap_get_proc(); |
157 | if (!cap || cap_get_flag(cap, CAP_SYS_PTRACE, CAP_PERMITTED, &v) != 0 || v != CAP_SET) { | 158 | if (!cap || cap_get_flag(cap, CAP_SYS_PTRACE, CAP_PERMITTED, &v) != 0 || v != CAP_SET) { |
@@ -161,6 +162,7 @@ static void security_sanity_check() { | |||
161 | if (cap) { | 162 | if (cap) { |
162 | cap_free(cap); | 163 | cap_free(cap); |
163 | } | 164 | } |
165 | #endif | ||
164 | if (!stat(SYSCONFDIR "/sway", &s)) { | 166 | if (!stat(SYSCONFDIR "/sway", &s)) { |
165 | if (s.st_uid != 0 || s.st_gid != 0 | 167 | if (s.st_uid != 0 || s.st_gid != 0 |
166 | || (s.st_mode & S_IWGRP) || (s.st_mode & S_IWOTH)) { | 168 | || (s.st_mode & S_IWGRP) || (s.st_mode & S_IWOTH)) { |