1 files changed, 22 insertions, 82 deletions

diff --git a/sway/main.c b/sway/main.c
index a0033c45..1c4939aa 100644
--- a/sway/main.c
+++ b/sway/main.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <getopt.h>
 #include <pango/pangocairo.h>
 #include <signal.h>
@@ -49,44 +48,6 @@ void sig_handler(int signal) {
         sway_terminate(EXIT_SUCCESS);
 }
 
-void detect_proprietary(int allow_unsupported_gpu) {
-        FILE *f = fopen("/proc/modules", "r");
-        if (!f) {
-                return;
-        }
-        char *line = NULL;
-        size_t line_size = 0;
-        while (getline(&line, &line_size, f) != -1) {
-                if (strncmp(line, "nvidia ", 7) == 0) {
-                        if (allow_unsupported_gpu) {
-                                sway_log(SWAY_ERROR,
-                                                "!!! Proprietary Nvidia drivers are in use !!!");
-                        } else {
-                                sway_log(SWAY_ERROR,
-                                        "Proprietary Nvidia drivers are NOT supported. "
-                                        "Use Nouveau. To launch sway anyway, launch with "
-                                        "--unsupported-gpu and DO NOT report issues.");
-                                exit(EXIT_FAILURE);
-                        }
-                        break;
-                }
-                if (strstr(line, "fglrx")) {
-                        if (allow_unsupported_gpu) {
-                                sway_log(SWAY_ERROR,
-                                                "!!! Proprietary AMD drivers are in use !!!");
-                        } else {
-                                sway_log(SWAY_ERROR, "Proprietary AMD drivers do NOT support "
-                                        "Wayland. Use radeon. To try anyway, launch sway with "
-                                        "--unsupported-gpu and DO NOT report issues.");
-                                exit(EXIT_FAILURE);
-                        }
-                        break;
-                }
-        }
-        free(line);
-        fclose(f);
-}
-
 void run_as_ipc_client(char *command, char *socket_path) {
         int socketfd = ipc_open_socket(socket_path);
         uint32_t len = strlen(command);
@@ -150,27 +111,17 @@ static void log_kernel(void) {
         pclose(f);
 }
 
-
-static bool drop_permissions(void) {
-        if (getuid() != geteuid() || getgid() != getegid()) {
-                sway_log(SWAY_ERROR, "!!! DEPRECATION WARNING: "
-                        "SUID privilege drop will be removed in a future release, please migrate to seatd-launch");
-
-                // Set the gid and uid in the correct order.
-                if (setgid(getgid()) != 0) {
-                        sway_log(SWAY_ERROR, "Unable to drop root group, refusing to start");
-                        return false;
-                }
-                if (setuid(getuid()) != 0) {
-                        sway_log(SWAY_ERROR, "Unable to drop root user, refusing to start");
-                        return false;
-                }
+static bool detect_suid(void) {
+        if (geteuid() != 0 && getegid() != 0) {
+                return false;
         }
-        if (setgid(0) != -1 || setuid(0) != -1) {
-                sway_log(SWAY_ERROR, "Unable to drop root (we shouldn't be able to "
-                        "restore it after setuid), refusing to start");
+
+        if (getuid() == geteuid() && getgid() == getegid()) {
                 return false;
         }
+
+        sway_log(SWAY_ERROR, "SUID operation is no longer supported, refusing to start. "
+                        "This check will be removed in a future release.");
         return true;
 }
 
@@ -202,11 +153,7 @@ void restore_nofile_limit(void) {
 }
 
 void enable_debug_flag(const char *flag) {
-        if (strcmp(flag, "damage=highlight") == 0) {
-                debug.damage = DAMAGE_HIGHLIGHT;
-        } else if (strcmp(flag, "damage=rerender") == 0) {
-                debug.damage = DAMAGE_RERENDER;
-        } else if (strcmp(flag, "noatomic") == 0) {
+        if (strcmp(flag, "noatomic") == 0) {
                 debug.noatomic = true;
         } else if (strcmp(flag, "txn-wait") == 0) {
                 debug.txn_wait = true;
@@ -214,8 +161,8 @@ void enable_debug_flag(const char *flag) {
                 debug.txn_timings = true;
         } else if (strncmp(flag, "txn-timeout=", 12) == 0) {
                 server.txn_timeout_ms = atoi(&flag[12]);
-        } else if (strcmp(flag, "noscanout") == 0) {
-                debug.noscanout = true;
+        } else if (strcmp(flag, "legacy-wl-drm") == 0) {
+                debug.legacy_wl_drm = true;
         } else {
                 sway_log(SWAY_ERROR, "Unknown debug flag: %s", flag);
         }
@@ -265,7 +212,7 @@ static const char usage[] =
         "\n";
 
 int main(int argc, char **argv) {
-        static bool verbose = false, debug = false, validate = false, allow_unsupported_gpu = false;
+        static bool verbose = false, debug = false, validate = false;
 
         char *config_path = NULL;
 
@@ -304,7 +251,7 @@ int main(int argc, char **argv) {
                 case 'V': // verbose
                         verbose = true;
                         break;
-                case 'p': ; // --get-socketpath
+                case 'p': // --get-socketpath
                         if (getenv("SWAYSOCK")) {
                                 printf("%s\n", getenv("SWAYSOCK"));
                                 exit(EXIT_SUCCESS);
@@ -319,6 +266,11 @@ int main(int argc, char **argv) {
                 }
         }
 
+        // SUID operation is deprecated, so block it for now.
+        if (detect_suid()) {
+                exit(EXIT_FAILURE);
+        }
+
         // Since wayland requires XDG_RUNTIME_DIR to be set, abort with just the
         // clear error message (when not running as an IPC client).
         if (!getenv("XDG_RUNTIME_DIR") && optind == argc) {
@@ -357,9 +309,6 @@ int main(int argc, char **argv) {
                                         "`sway -d 2>sway.log`.");
                         exit(EXIT_FAILURE);
                 }
-                if (!drop_permissions()) {
-                        exit(EXIT_FAILURE);
-                }
                 char *socket_path = getenv("SWAYSOCK");
                 if (!socket_path) {
                         sway_log(SWAY_ERROR, "Unable to retrieve socket path");
@@ -371,17 +320,6 @@ int main(int argc, char **argv) {
                 return 0;
         }
 
-        detect_proprietary(allow_unsupported_gpu);
-
-        if (!server_privileged_prepare(&server)) {
-                return 1;
-        }
-
-        if (!drop_permissions()) {
-                server_fini(&server);
-                exit(EXIT_FAILURE);
-        }
-
         increase_nofile_limit();
 
         // handle SIGTERM signals
@@ -393,12 +331,14 @@ int main(int argc, char **argv) {
 
         sway_log(SWAY_INFO, "Starting sway version " SWAY_VERSION);
 
-        root = root_create();
-
         if (!server_init(&server)) {
                 return 1;
         }
 
+        if (server.linux_dmabuf_v1) {
+                wlr_scene_set_linux_dmabuf_v1(root->root_scene, server.linux_dmabuf_v1);
+        }
+
         if (validate) {
                 bool valid = load_main_config(config_path, false, true);
                 free(config_path);