diff options
Diffstat (limited to 'sway')
| -rw-r--r-- | sway/main.c | 5 | ||||
| -rw-r--r-- | sway/server.c | 11 |
2 files changed, 13 insertions, 3 deletions
diff --git a/sway/main.c b/sway/main.c index a7e808ad..a325dc3a 100644 --- a/sway/main.c +++ b/sway/main.c @@ -359,6 +359,11 @@ int main(int argc, char **argv) { executable_sanity_check(); bool suid = false; + + if (!server_privileged_prepare(&server)) { + return 1; + } + #ifdef __linux__ if (getuid() != geteuid() || getgid() != getegid()) { // Retain capabilities after setuid() diff --git a/sway/server.c b/sway/server.c index 8af0bc5b..a467283b 100644 --- a/sway/server.c +++ b/sway/server.c @@ -26,9 +26,8 @@ #include "sway/tree/layout.h" -bool server_init(struct sway_server *server) { - wlr_log(L_DEBUG, "Initializing Wayland server"); - +bool server_privileged_prepare(struct sway_server *server) { + wlr_log(L_DEBUG, "Preparing Wayland server initialization"); server->wl_display = wl_display_create(); server->wl_event_loop = wl_display_get_event_loop(server->wl_display); server->backend = wlr_backend_autocreate(server->wl_display, NULL); @@ -37,6 +36,12 @@ bool server_init(struct sway_server *server) { wlr_log(L_ERROR, "Unable to create backend"); return false; } + return true; +} + +bool server_init(struct sway_server *server) { + wlr_log(L_DEBUG, "Initializing Wayland server"); + struct wlr_renderer *renderer = wlr_backend_get_renderer(server->backend); assert(renderer); |