From 07e89ad5382d4c8881ac6e5d998659f57da34439 Mon Sep 17 00:00:00 2001
From: Lucas CHOLLET <lucas.chollet@free.fr>
Date: Sun, 24 Jul 2022 12:06:51 +0200
Subject: [PATCH] Base: Launch ConfigServer at session start-up

---
 Base/etc/SystemServer.ini               | 5 -----
 Base/home/anon/.config/SystemServer.ini | 4 ++++
 Userland/Applications/Terminal/main.cpp | 2 +-
 Userland/Libraries/LibConfig/Client.h   | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Base/etc/SystemServer.ini b/Base/etc/SystemServer.ini
index 736fe8f3af..89c86d50e0 100644
--- a/Base/etc/SystemServer.ini
+++ b/Base/etc/SystemServer.ini
@@ -1,8 +1,3 @@
-[ConfigServer]
-Socket=/tmp/portal/config
-SocketPermissions=600
-User=anon
-
 [RequestServer]
 Socket=/tmp/portal/request
 SocketPermissions=600
diff --git a/Base/home/anon/.config/SystemServer.ini b/Base/home/anon/.config/SystemServer.ini
index 1cb28c95ce..75a20f682b 100644
--- a/Base/home/anon/.config/SystemServer.ini
+++ b/Base/home/anon/.config/SystemServer.ini
@@ -1,3 +1,7 @@
+[ConfigServer]
+Socket=/tmp/user/%uid/portal/config
+SocketPermissions=600
+
 [LaunchServer]
 Socket=/tmp/user/%uid/portal/launch
 SocketPermissions=600
diff --git a/Userland/Applications/Terminal/main.cpp b/Userland/Applications/Terminal/main.cpp
index efa09ad107..d6333b5373 100644
--- a/Userland/Applications/Terminal/main.cpp
+++ b/Userland/Applications/Terminal/main.cpp
@@ -433,7 +433,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
     TRY(Core::System::unveil("/bin/utmpupdate", "x"));
     TRY(Core::System::unveil("/etc/FileIconProvider.ini", "r"));
     TRY(Core::System::unveil("/tmp/user/%uid/portal/launch", "rw"));
-    TRY(Core::System::unveil("/tmp/portal/config", "rw"));
+    TRY(Core::System::unveil("/tmp/user/%uid/portal/config", "rw"));
     TRY(Core::System::unveil(nullptr, nullptr));
 
     auto modified_state_check_timer = Core::Timer::create_repeating(500, [&] {
diff --git a/Userland/Libraries/LibConfig/Client.h b/Userland/Libraries/LibConfig/Client.h
index 48a93e3491..406dd3a93b 100644
--- a/Userland/Libraries/LibConfig/Client.h
+++ b/Userland/Libraries/LibConfig/Client.h
@@ -18,7 +18,7 @@ namespace Config {
 class Client final
     : public IPC::ConnectionToServer<ConfigClientEndpoint, ConfigServerEndpoint>
     , public ConfigClientEndpoint {
-    IPC_CLIENT_CONNECTION(Client, "/tmp/portal/config"sv)
+    IPC_CLIENT_CONNECTION(Client, "/tmp/user/%uid/portal/config"sv)
 
 public:
     void pledge_domains(Vector<String> const&);