From f4f5944e31f3871f61e26279f6c7f7ab49916582 Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <dbelyavs@redhat.com>
Date: Aug 03 2023 08:32:24 +0000
Subject: Disable forking of ssh-agent on startup


Resoves: rhbz#2148555

---

diff --git a/openssh.spec b/openssh.spec
index 6a400e0..f654e01 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -746,6 +746,7 @@ test -f %{sysconfig_anaconda} && \
 %changelog
 * Thu Aug 03 2023 Dmitry Belyavskiy <dbelyavs@redhat.com> - 9.3p1-8
 - Split including crypto-policies to a separate config (rhbz#1970566)
+- Disable forking of ssh-agent on startup (rhbz#2148555)
 
 * Tue Aug 01 2023 Dmitry Belyavskiy <dbelyavs@redhat.com> - 9.3p1-7
 - Relax checks of OpenSSL version
diff --git a/ssh-agent.service b/ssh-agent.service
index 311f91d..812303c 100644
--- a/ssh-agent.service
+++ b/ssh-agent.service
@@ -10,10 +10,10 @@ Requires=ssh-agent.socket
 [Service]
 Environment=SSH_AUTH_SOCK=%t/ssh-agent.socket
 ExecStartPre=/usr/bin/rm -f $SSH_AUTH_SOCK
-ExecStart=/usr/bin/ssh-agent -a $SSH_AUTH_SOCK
+ExecStart=/usr/bin/ssh-agent -D -a $SSH_AUTH_SOCK
 PassEnvironment=SSH_AGENT_PID
 SuccessExitStatus=2
-Type=forking
+Type=simple
 
 [Install]
 Also=ssh-agent.socket