[java-identity-provider] branch main updated: IDP-2258 Windows v5 msi installer prematurely ends, fails install when AD options chosen

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=936fb83375626431b691729c511f4d4d5eaa4312

The following commit(s) were added to refs/heads/main by this push:
     new 936fb8337 IDP-2258 Windows v5 msi installer prematurely ends, fails install when AD options chosen
936fb8337 is described below

commit 936fb83375626431b691729c511f4d4d5eaa4312
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Apr 13 16:31:26 2024 +0100

    IDP-2258 Windows v5 msi installer prematurely ends, fails install when AD options chosen
    
    https://shibboleth.atlassian.net/browse/IDP-2258
    
    Set the FQP for ldap.merge.properties correctly
    
    Applies d294c8b7ba4b to the Wix4 branch
---
 idp-msi/src/main/wix/scripts/shib_write_configs.vbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/idp-msi/src/main/wix/scripts/shib_write_configs.vbs b/idp-msi/src/main/wix/scripts/shib_write_configs.vbs
index d68be08a7..6068e45d2 100644
--- a/idp-msi/src/main/wix/scripts/shib_write_configs.vbs
+++ b/idp-msi/src/main/wix/scripts/shib_write_configs.vbs
@@ -61,7 +61,7 @@ if (Err.Number = 0 ) then
     end if
     if ConfigureAd = "true" then
        AntFile.Writeline "idp.LDAP.credential=" & AdPass
-       AntFile.WriteLine "ldap.merge.properties=ldap.mergeProperties"
+       AntFile.WriteLine "ldap.merge.properties=" & InstallDirJava & "/ldap.mergeProperties"
     end if
     AntFile.WriteLine "#"
     AntFile.WriteLine "# Debug"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.