From 7ea43aff2c50b8a0f5b637c0716d7c83f1dfcc1e Mon Sep 17 00:00:00 2001
From: Paul Reeves <preeves@ibphoenix.com>
Date: Wed, 18 Jan 2023 12:33:44 +0100
Subject: [PATCH] Forward port the fix for #7096

---
 .../win32/FirebirdInstallEnvironmentChecks.inc    | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc b/builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc
index c4081472fd..bb922c9378 100644
--- a/builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc
+++ b/builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc
@@ -920,9 +920,6 @@ end;
 
 function ConfigureFirebird: boolean;
 begin
-  if IsNotServerInstall then
-    Result := False
-  else
     Result := (InstallAndConfigure AND Configure) = Configure;
 end;
 
@@ -1210,12 +1207,16 @@ begin
 end;
 }
 
+
 function ConfigureAuthentication: boolean;
 begin
-  if FileExists(WizardDirValue + '\security5.fdb') then
-		Result := false
-	else
-		Result := true;
+  if IsNotServerInstall then
+    Result := false
+  else
+    if FileExists(WizardDirValue + '\security5.fdb') then
+      Result := false
+    else
+      Result := true;
 end;