summaryrefslogtreecommitdiff
path: root/src/xwayland/Server.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/xwayland/Server.cpp')
-rw-r--r--src/xwayland/Server.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/xwayland/Server.cpp b/src/xwayland/Server.cpp
index f356af18..9d6b3bcb 100644
--- a/src/xwayland/Server.cpp
+++ b/src/xwayland/Server.cpp
@@ -3,14 +3,13 @@
#include <format>
#include <string>
-#include <errno.h>
+#include <cerrno>
#include <fcntl.h>
-#include <stdio.h>
+#include <cstdio>
#include <cstring>
-#include <signal.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdlib.h>
+#include <csignal>
+#include <cstddef>
+#include <cstdlib>
#include <sys/un.h>
#include <unistd.h>
#include <exception>
@@ -94,7 +93,7 @@ static int createSocket(struct sockaddr_un* addr, size_t path_size) {
return fd;
}
-static bool checkPermissionsForSocketDir(void) {
+static bool checkPermissionsForSocketDir() {
struct stat buf;
if (lstat("/tmp/.X11-unix", &buf)) {
@@ -107,7 +106,7 @@ static bool checkPermissionsForSocketDir(void) {
return false;
}
- if (!((buf.st_uid == 0) || (buf.st_uid == getuid()))) {
+ if ((buf.st_uid != 0) && (buf.st_uid != getuid())) {
Debug::log(ERR, "X11 socket dir is not owned by root or current user");
return false;
}