瀏覽代碼

Kernel+Userland: Remove "dns" pledge promise alias

This was just an alias for "unix" that I added early on back when there
was some belief that we might be compatible with OpenBSD. We're clearly
never going to be compatible with their pledges so just drop the alias.
Andreas Kling 4 年之前
父節點
當前提交
2cd07c6212

+ 0 - 5
Kernel/Syscalls/pledge.cpp

@@ -62,11 +62,6 @@ int Process::sys$pledge(Userspace<const Syscall::SC_pledge_params*> user_params)
     }
     }
             ENUMERATE_PLEDGE_PROMISES
             ENUMERATE_PLEDGE_PROMISES
 #undef __ENUMERATE_PLEDGE_PROMISE
 #undef __ENUMERATE_PLEDGE_PROMISE
-            if (part == "dns") {
-                // "dns" is an alias for "unix" since DNS queries go via LookupServer
-                mask |= (1u << (u32)Pledge::unix);
-                continue;
-            }
             return false;
             return false;
         }
         }
         return true;
         return true;

+ 2 - 2
Userland/Applications/IRCClient/main.cpp

@@ -33,7 +33,7 @@
 
 
 int main(int argc, char** argv)
 int main(int argc, char** argv)
 {
 {
-    if (pledge("stdio inet dns unix recvfd sendfd cpath rpath fattr wpath cpath", nullptr) < 0) {
+    if (pledge("stdio inet unix recvfd sendfd cpath rpath fattr wpath cpath", nullptr) < 0) {
         perror("pledge");
         perror("pledge");
         return 1;
         return 1;
     }
     }
@@ -45,7 +45,7 @@ int main(int argc, char** argv)
 
 
     auto app = GUI::Application::construct(argc, argv);
     auto app = GUI::Application::construct(argc, argv);
 
 
-    if (pledge("stdio inet dns unix recvfd sendfd rpath wpath cpath", nullptr) < 0) {
+    if (pledge("stdio inet unix recvfd sendfd rpath wpath cpath", nullptr) < 0) {
         perror("pledge");
         perror("pledge");
         return 1;
         return 1;
     }
     }

+ 1 - 1
Userland/Utilities/host.cpp

@@ -34,7 +34,7 @@
 
 
 int main(int argc, char** argv)
 int main(int argc, char** argv)
 {
 {
-    if (pledge("stdio dns", nullptr) < 0) {
+    if (pledge("stdio unix", nullptr) < 0) {
         perror("pledge");
         perror("pledge");
         return 1;
         return 1;
     }
     }

+ 2 - 2
Userland/Utilities/ntpquery.cpp

@@ -111,7 +111,7 @@ static String format_ntp_timestamp(NtpTimestamp ntp_timestamp)
 int main(int argc, char** argv)
 int main(int argc, char** argv)
 {
 {
 #ifdef __serenity__
 #ifdef __serenity__
-    if (pledge("stdio inet dns settime", nullptr) < 0) {
+    if (pledge("stdio inet unix settime", nullptr) < 0) {
         perror("pledge");
         perror("pledge");
         return 1;
         return 1;
     }
     }
@@ -145,7 +145,7 @@ int main(int argc, char** argv)
 
 
 #ifdef __serenity__
 #ifdef __serenity__
     if (!adjust_time && !set_time) {
     if (!adjust_time && !set_time) {
-        if (pledge("stdio inet dns", nullptr) < 0) {
+        if (pledge("stdio inet unix", nullptr) < 0) {
             perror("pledge");
             perror("pledge");
             return 1;
             return 1;
         }
         }

+ 2 - 2
Userland/Utilities/ping.cpp

@@ -61,7 +61,7 @@ static const char* host;
 
 
 int main(int argc, char** argv)
 int main(int argc, char** argv)
 {
 {
-    if (pledge("stdio id inet dns sigaction", nullptr) < 0) {
+    if (pledge("stdio id inet unix sigaction", nullptr) < 0) {
         perror("pledge");
         perror("pledge");
         return 1;
         return 1;
     }
     }
@@ -81,7 +81,7 @@ int main(int argc, char** argv)
         return 1;
         return 1;
     }
     }
 
 
-    if (pledge("stdio inet dns sigaction", nullptr) < 0) {
+    if (pledge("stdio inet unix sigaction", nullptr) < 0) {
         perror("pledge");
         perror("pledge");
         return 1;
         return 1;
     }
     }