diff options
| author | Drew DeVault <sir@cmpwn.com> | 2016-09-27 14:28:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-27 14:28:14 -0400 |
| commit | 4e660975a99cba67526b62dff930b334d550b4b4 (patch) | |
| tree | b0c6c2a4ede896dd0a840201c8ae3f77037af7cc | |
| parent | a95ce5ce6575ac68a6af2c6c4cbb001be5799737 (diff) | |
| parent | 5e585f96037854842827db478a978ff959026713 (diff) | |
| download | sway-0.10-rc1.zip sway-0.10-rc1.tar.gz sway-0.10-rc1.tar.bz2 | |
Merge pull request #911 from thejan2009/setgid-setuid0.10-rc1
Split setgid and setuid, add privilege check [RFC]
| -rw-r--r-- | sway/main.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sway/main.c b/sway/main.c index 972b260..660da18 100644 --- a/sway/main.c +++ b/sway/main.c @@ -156,10 +156,18 @@ int main(int argc, char **argv) { exit(EXIT_FAILURE); } if (getuid() != geteuid() || getgid() != getegid()) { - if (setgid(getgid()) != 0 || setuid(getuid()) != 0) { + if (setgid(getgid()) != 0) { sway_log(L_ERROR, "Unable to drop root"); exit(EXIT_FAILURE); } + if (setuid(getuid()) != 0) { + sway_log(L_ERROR, "Unable to drop root"); + exit(EXIT_FAILURE); + } + } + if (setuid(0) != -1) { + sway_log(L_ERROR, "Root privileges can be restored."); + exit(EXIT_FAILURE); } char *socket_path = getenv("SWAYSOCK"); if (!socket_path) { |