From 22f8ead2f42066673344cb719a4aedad35e4a511 Mon Sep 17 00:00:00 2001
From: Lucas CHOLLET <lucas.chollet@free.fr>
Date: Sun, 24 Jul 2022 15:59:40 +0200
Subject: [PATCH] Base: Launch SQLServer at session start-up

---
 Base/etc/SystemServer.ini               | 8 --------
 Base/home/anon/.config/SystemServer.ini | 7 +++++++
 Userland/Libraries/LibSQL/SQLClient.h   | 2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Base/etc/SystemServer.ini b/Base/etc/SystemServer.ini
index 576b031b49..e46fc17cf5 100644
--- a/Base/etc/SystemServer.ini
+++ b/Base/etc/SystemServer.ini
@@ -39,14 +39,6 @@ Environment=TERM=xterm
 KeepAlive=true
 SystemModes=text
 
-[SQLServer]
-Socket=/tmp/portal/sql
-SocketPermissions=600
-Priority=low
-Lazy=true
-KeepAlive=true
-User=anon
-
 [CrashDaemon]
 KeepAlive=true
 User=anon
diff --git a/Base/home/anon/.config/SystemServer.ini b/Base/home/anon/.config/SystemServer.ini
index 3a7c560c97..6099e3d501 100644
--- a/Base/home/anon/.config/SystemServer.ini
+++ b/Base/home/anon/.config/SystemServer.ini
@@ -77,6 +77,13 @@ Lazy=true
 MultiInstance=true
 AcceptSocketConnections=true
 
+[SQLServer]
+Socket=/tmp/user/%uid/portal/sql
+SocketPermissions=600
+Priority=low
+Lazy=true
+KeepAlive=true
+
 [LaunchServer]
 Socket=/tmp/user/%uid/portal/launch
 SocketPermissions=600
diff --git a/Userland/Libraries/LibSQL/SQLClient.h b/Userland/Libraries/LibSQL/SQLClient.h
index 8ede4127e5..0653ffa653 100644
--- a/Userland/Libraries/LibSQL/SQLClient.h
+++ b/Userland/Libraries/LibSQL/SQLClient.h
@@ -16,7 +16,7 @@ namespace SQL {
 class SQLClient
     : public IPC::ConnectionToServer<SQLClientEndpoint, SQLServerEndpoint>
     , public SQLClientEndpoint {
-    IPC_CLIENT_CONNECTION(SQLClient, "/tmp/portal/sql"sv)
+    IPC_CLIENT_CONNECTION(SQLClient, "/tmp/user/%uid/portal/sql"sv)
     virtual ~SQLClient() = default;
 
     Function<void(int, String const&)> on_connected;