diff options
| -rw-r--r-- | include/sway/server.h | 2 | ||||
| -rw-r--r-- | sway/main.c | 5 | ||||
| -rw-r--r-- | sway/server.c | 13 |
3 files changed, 17 insertions, 3 deletions
diff --git a/include/sway/server.h b/include/sway/server.h index 65d96e7a..963d4dc1 100644 --- a/include/sway/server.h +++ b/include/sway/server.h @@ -47,6 +47,8 @@ struct sway_server { struct sway_server server; +/* Prepares an unprivileged server_init by performing all privileged operations in advance */ +bool server_privileged_prepare(struct sway_server *server); bool server_init(struct sway_server *server); void server_fini(struct sway_server *server); void server_run(struct sway_server *server); 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 824b1d8e..a467283b 100644 --- a/sway/server.c +++ b/sway/server.c @@ -11,6 +11,7 @@ #include <wlr/types/wlr_idle.h> #include <wlr/types/wlr_layer_shell.h> #include <wlr/types/wlr_linux_dmabuf.h> +#include <wlr/types/wlr_export_dmabuf_v1.h> #include <wlr/types/wlr_primary_selection.h> #include <wlr/types/wlr_screenshooter.h> #include <wlr/types/wlr_server_decoration.h> @@ -25,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); @@ -36,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); @@ -97,6 +103,7 @@ bool server_init(struct sway_server *server) { deco_manager, WLR_SERVER_DECORATION_MANAGER_MODE_SERVER); wlr_linux_dmabuf_create(server->wl_display, renderer); + wlr_export_dmabuf_manager_v1_create(server->wl_display); server->socket = wl_display_add_socket_auto(server->wl_display); if (!server->socket) { |