From 9dae68eba51a7b9289d9a64ae8880539ffeca2c0 Mon Sep 17 00:00:00 2001 From: emersion Date: Mon, 29 Oct 2018 23:52:03 +0100 Subject: [PATCH] Make it clear that being able to restore root is a failure --- sway/main.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sway/main.c b/sway/main.c index cc5f71872..a810bb55a 100644 --- a/sway/main.c +++ b/sway/main.c @@ -197,17 +197,18 @@ static void log_kernel(void) { static void drop_permissions(void) { if (getuid() != geteuid() || getgid() != getegid()) { if (setgid(getgid()) != 0) { - wlr_log(WLR_ERROR, "Unable to drop root"); + wlr_log(WLR_ERROR, "Unable to drop root, refusing to start"); exit(EXIT_FAILURE); } if (setuid(getuid()) != 0) { - wlr_log(WLR_ERROR, "Unable to drop root"); + wlr_log(WLR_ERROR, "Unable to drop root, refusing to start"); exit(EXIT_FAILURE); } } if (setuid(0) != -1) { - wlr_log(WLR_ERROR, "Root privileges can be restored."); - exit(EXIT_FAILURE); + wlr_log(WLR_ERROR, "Unable to drop root (we shouldn't be able to " + "restore it after setuid), refusing to start"); + return false; } }