diff options
author | Brian Gianforcaro <bgianf@serenityos.org> | 2021-11-27 14:26:34 -0800 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2021-11-28 08:04:57 +0100 |
commit | cf4fa936be63a8f5931886142daca54b99293a52 (patch) | |
tree | fcb69966e7fd2a16d30ed2e40e85d2245f1dd409 /Userland/Services | |
parent | 44ffe3e5bb2659fcd4bcd65adaf5fb6e855a9c4f (diff) | |
download | serenity-cf4fa936be63a8f5931886142daca54b99293a52.zip |
Everywhere: Use default execpromises argument for Core::System::pledge
Diffstat (limited to 'Userland/Services')
-rw-r--r-- | Userland/Services/Clipboard/main.cpp | 2 | ||||
-rw-r--r-- | Userland/Services/ConfigServer/main.cpp | 2 | ||||
-rw-r--r-- | Userland/Services/CrashDaemon/main.cpp | 2 | ||||
-rw-r--r-- | Userland/Services/FileSystemAccessServer/main.cpp | 2 | ||||
-rw-r--r-- | Userland/Services/ImageDecoder/main.cpp | 4 | ||||
-rw-r--r-- | Userland/Services/LoginServer/main.cpp | 2 | ||||
-rw-r--r-- | Userland/Services/LookupServer/main.cpp | 4 | ||||
-rw-r--r-- | Userland/Services/NotificationServer/main.cpp | 4 | ||||
-rw-r--r-- | Userland/Services/RequestServer/main.cpp | 4 | ||||
-rw-r--r-- | Userland/Services/Taskbar/main.cpp | 4 | ||||
-rw-r--r-- | Userland/Services/WebContent/main.cpp | 2 | ||||
-rw-r--r-- | Userland/Services/WebServer/main.cpp | 4 | ||||
-rw-r--r-- | Userland/Services/WebSocket/main.cpp | 4 | ||||
-rw-r--r-- | Userland/Services/WindowServer/main.cpp | 4 |
14 files changed, 22 insertions, 22 deletions
diff --git a/Userland/Services/Clipboard/main.cpp b/Userland/Services/Clipboard/main.cpp index 217a989585..cd7d615afa 100644 --- a/Userland/Services/Clipboard/main.cpp +++ b/Userland/Services/Clipboard/main.cpp @@ -14,7 +14,7 @@ ErrorOr<int> serenity_main(Main::Arguments) { - TRY(Core::System::pledge("stdio recvfd sendfd accept", nullptr)); + TRY(Core::System::pledge("stdio recvfd sendfd accept")); Core::EventLoop event_loop; TRY(Core::System::unveil(nullptr, nullptr)); diff --git a/Userland/Services/ConfigServer/main.cpp b/Userland/Services/ConfigServer/main.cpp index cde5a16075..ac97f033f1 100644 --- a/Userland/Services/ConfigServer/main.cpp +++ b/Userland/Services/ConfigServer/main.cpp @@ -12,7 +12,7 @@ ErrorOr<int> serenity_main(Main::Arguments) { - TRY(Core::System::pledge("stdio accept rpath wpath cpath", nullptr)); + TRY(Core::System::pledge("stdio accept rpath wpath cpath")); TRY(Core::System::unveil(Core::StandardPaths::config_directory(), "rwc")); TRY(Core::System::unveil(nullptr, nullptr)); diff --git a/Userland/Services/CrashDaemon/main.cpp b/Userland/Services/CrashDaemon/main.cpp index c9c84324f2..927157ac59 100644 --- a/Userland/Services/CrashDaemon/main.cpp +++ b/Userland/Services/CrashDaemon/main.cpp @@ -53,7 +53,7 @@ static void launch_crash_reporter(const String& coredump_path, bool unlink_on_ex ErrorOr<int> serenity_main(Main::Arguments) { - TRY(Core::System::pledge("stdio rpath wpath cpath proc exec", nullptr)); + TRY(Core::System::pledge("stdio rpath wpath cpath proc exec")); Core::BlockingFileWatcher watcher; TRY(watcher.add_watch("/tmp/coredump", Core::FileWatcherEvent::Type::ChildCreated)); diff --git a/Userland/Services/FileSystemAccessServer/main.cpp b/Userland/Services/FileSystemAccessServer/main.cpp index 2e37422f19..68ea1730ef 100644 --- a/Userland/Services/FileSystemAccessServer/main.cpp +++ b/Userland/Services/FileSystemAccessServer/main.cpp @@ -13,7 +13,7 @@ ErrorOr<int> serenity_main(Main::Arguments) { - TRY(Core::System::pledge("stdio recvfd sendfd rpath cpath wpath unix thread", nullptr)); + TRY(Core::System::pledge("stdio recvfd sendfd rpath cpath wpath unix thread")); auto app = GUI::Application::construct(0, nullptr); app->set_quit_when_last_window_deleted(false); diff --git a/Userland/Services/ImageDecoder/main.cpp b/Userland/Services/ImageDecoder/main.cpp index cab1292c0d..7af4cbacc7 100644 --- a/Userland/Services/ImageDecoder/main.cpp +++ b/Userland/Services/ImageDecoder/main.cpp @@ -14,11 +14,11 @@ ErrorOr<int> serenity_main(Main::Arguments) { Core::EventLoop event_loop; - TRY(Core::System::pledge("stdio recvfd sendfd unix", nullptr)); + TRY(Core::System::pledge("stdio recvfd sendfd unix")); TRY(Core::System::unveil(nullptr, nullptr)); auto socket = TRY(Core::LocalSocket::take_over_accepted_socket_from_system_server()); IPC::new_client_connection<ImageDecoder::ClientConnection>(move(socket), 1); - TRY(Core::System::pledge("stdio recvfd sendfd", nullptr)); + TRY(Core::System::pledge("stdio recvfd sendfd")); return event_loop.exec(); } diff --git a/Userland/Services/LoginServer/main.cpp b/Userland/Services/LoginServer/main.cpp index 0f7c877525..07472f42bb 100644 --- a/Userland/Services/LoginServer/main.cpp +++ b/Userland/Services/LoginServer/main.cpp @@ -55,7 +55,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) { auto app = GUI::Application::construct(arguments); - TRY(Core::System::pledge("stdio recvfd sendfd rpath exec proc id", nullptr)); + TRY(Core::System::pledge("stdio recvfd sendfd rpath exec proc id")); TRY(Core::System::unveil("/home", "r")); TRY(Core::System::unveil("/etc/passwd", "r")); TRY(Core::System::unveil("/etc/shadow", "r")); diff --git a/Userland/Services/LookupServer/main.cpp b/Userland/Services/LookupServer/main.cpp index bc363f2939..37a11e6cc3 100644 --- a/Userland/Services/LookupServer/main.cpp +++ b/Userland/Services/LookupServer/main.cpp @@ -12,11 +12,11 @@ ErrorOr<int> serenity_main(Main::Arguments) { - TRY(Core::System::pledge("stdio accept unix inet rpath", nullptr)); + TRY(Core::System::pledge("stdio accept unix inet rpath")); Core::EventLoop event_loop; auto server = TRY(LookupServer::LookupServer::try_create()); - TRY(Core::System::pledge("stdio accept inet rpath", nullptr)); + TRY(Core::System::pledge("stdio accept inet rpath")); TRY(Core::System::unveil("/proc/net/adapters", "r")); TRY(Core::System::unveil("/etc/hosts", "r")); TRY(Core::System::unveil(nullptr, nullptr)); diff --git a/Userland/Services/NotificationServer/main.cpp b/Userland/Services/NotificationServer/main.cpp index 210b2c0ce0..8239d1e808 100644 --- a/Userland/Services/NotificationServer/main.cpp +++ b/Userland/Services/NotificationServer/main.cpp @@ -13,7 +13,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) { - TRY(Core::System::pledge("stdio recvfd sendfd accept rpath unix", nullptr)); + TRY(Core::System::pledge("stdio recvfd sendfd accept rpath unix")); auto app = TRY(GUI::Application::try_create(arguments)); auto server = TRY(Core::LocalServer::try_create()); @@ -33,7 +33,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) TRY(Core::System::unveil("/res", "r")); TRY(Core::System::unveil(nullptr, nullptr)); - TRY(Core::System::pledge("stdio recvfd sendfd accept rpath", nullptr)); + TRY(Core::System::pledge("stdio recvfd sendfd accept rpath")); return app->exec(); } diff --git a/Userland/Services/RequestServer/main.cpp b/Userland/Services/RequestServer/main.cpp index 5f4a26b0dd..02c0474ddd 100644 --- a/Userland/Services/RequestServer/main.cpp +++ b/Userland/Services/RequestServer/main.cpp @@ -19,7 +19,7 @@ ErrorOr<int> serenity_main(Main::Arguments) { - TRY(Core::System::pledge("stdio inet accept unix rpath sendfd recvfd sigaction", nullptr)); + TRY(Core::System::pledge("stdio inet accept unix rpath sendfd recvfd sigaction")); signal(SIGINFO, [](int) { RequestServer::ConnectionCache::dump_jobs(); }); @@ -28,7 +28,7 @@ ErrorOr<int> serenity_main(Main::Arguments) Core::EventLoop event_loop; // FIXME: Establish a connection to LookupServer and then drop "unix"? - TRY(Core::System::pledge("stdio inet accept unix sendfd recvfd", nullptr)); + TRY(Core::System::pledge("stdio inet accept unix sendfd recvfd")); TRY(Core::System::unveil("/tmp/portal/lookup", "rw")); TRY(Core::System::unveil(nullptr, nullptr)); diff --git a/Userland/Services/Taskbar/main.cpp b/Userland/Services/Taskbar/main.cpp index f093d6dec0..ed5135b7d3 100644 --- a/Userland/Services/Taskbar/main.cpp +++ b/Userland/Services/Taskbar/main.cpp @@ -36,7 +36,7 @@ static ErrorOr<NonnullRefPtr<GUI::Menu>> build_system_menu(); ErrorOr<int> serenity_main(Main::Arguments arguments) { - TRY(Core::System::pledge("stdio recvfd sendfd proc exec rpath unix sigaction", nullptr)); + TRY(Core::System::pledge("stdio recvfd sendfd proc exec rpath unix sigaction")); auto app = TRY(GUI::Application::try_create(arguments)); Config::pledge_domains("Taskbar"); Config::monitor_domain("Taskbar"); @@ -49,7 +49,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) // We need to obtain the WM connection here as well before the pledge shortening. GUI::WindowManagerServerConnection::the(); - TRY(Core::System::pledge("stdio recvfd sendfd proc exec rpath", nullptr)); + TRY(Core::System::pledge("stdio recvfd sendfd proc exec rpath")); auto menu = TRY(build_system_menu()); menu->realize_menu_if_needed(); diff --git a/Userland/Services/WebContent/main.cpp b/Userland/Services/WebContent/main.cpp index d7d5782d99..ac08ecbe93 100644 --- a/Userland/Services/WebContent/main.cpp +++ b/Userland/Services/WebContent/main.cpp @@ -14,7 +14,7 @@ ErrorOr<int> serenity_main(Main::Arguments) { Core::EventLoop event_loop; - TRY(Core::System::pledge("stdio recvfd sendfd accept unix rpath", nullptr)); + TRY(Core::System::pledge("stdio recvfd sendfd accept unix rpath")); TRY(Core::System::unveil("/res", "r")); TRY(Core::System::unveil("/tmp/portal/request", "rw")); TRY(Core::System::unveil("/tmp/portal/image", "rw")); diff --git a/Userland/Services/WebServer/main.cpp b/Userland/Services/WebServer/main.cpp index 29c9984e0a..eb032eec3b 100644 --- a/Userland/Services/WebServer/main.cpp +++ b/Userland/Services/WebServer/main.cpp @@ -60,7 +60,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) return 1; } - TRY(Core::System::pledge("stdio accept rpath inet unix", nullptr)); + TRY(Core::System::pledge("stdio accept rpath inet unix")); WebServer::Configuration configuration(real_root_path); @@ -89,6 +89,6 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) TRY(Core::System::unveil(real_root_path.characters(), "r")); TRY(Core::System::unveil(nullptr, nullptr)); - TRY(Core::System::pledge("stdio accept rpath", nullptr)); + TRY(Core::System::pledge("stdio accept rpath")); return loop.exec(); } diff --git a/Userland/Services/WebSocket/main.cpp b/Userland/Services/WebSocket/main.cpp index 438bba72ed..c65eada58a 100644 --- a/Userland/Services/WebSocket/main.cpp +++ b/Userland/Services/WebSocket/main.cpp @@ -14,14 +14,14 @@ ErrorOr<int> serenity_main(Main::Arguments) { - TRY(Core::System::pledge("stdio inet unix rpath sendfd recvfd", nullptr)); + TRY(Core::System::pledge("stdio inet unix rpath sendfd recvfd")); // Ensure the certificates are read out here. [[maybe_unused]] auto& certs = DefaultRootCACertificates::the(); Core::EventLoop event_loop; // FIXME: Establish a connection to LookupServer and then drop "unix"? - TRY(Core::System::pledge("stdio inet unix sendfd recvfd", nullptr)); + TRY(Core::System::pledge("stdio inet unix sendfd recvfd")); TRY(Core::System::unveil("/tmp/portal/lookup", "rw")); TRY(Core::System::unveil(nullptr, nullptr)); diff --git a/Userland/Services/WindowServer/main.cpp b/Userland/Services/WindowServer/main.cpp index 54e69c6c68..fa3dc03c1a 100644 --- a/Userland/Services/WindowServer/main.cpp +++ b/Userland/Services/WindowServer/main.cpp @@ -21,7 +21,7 @@ ErrorOr<int> serenity_main(Main::Arguments) { - TRY(Core::System::pledge("stdio video thread sendfd recvfd accept rpath wpath cpath unix proc sigaction", nullptr)); + TRY(Core::System::pledge("stdio video thread sendfd recvfd accept rpath wpath cpath unix proc sigaction")); TRY(Core::System::unveil("/res", "r")); TRY(Core::System::unveil("/tmp", "cw")); TRY(Core::System::unveil("/etc/WindowServer.ini", "rwc")); @@ -48,7 +48,7 @@ ErrorOr<int> serenity_main(Main::Arguments) WindowServer::EventLoop loop; - TRY(Core::System::pledge("stdio video thread sendfd recvfd accept rpath wpath cpath proc", nullptr)); + TRY(Core::System::pledge("stdio video thread sendfd recvfd accept rpath wpath cpath proc")); // First check which screens are explicitly configured { |