[java-identity-provider] branch master updated: IDP-1557 Cleanup dialog used for AD attribute resolver

[Rod Widdowson]

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

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

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

The following commit(s) were added to refs/heads/master by this push:
       new  476a4b5   IDP-1557 Cleanup dialog used for AD attribute resolver
476a4b5 is described below

commit 476a4b59a7e0d768bc798cc9d678196e9f1e5992
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Feb 24 15:13:07 2020 +0000

    IDP-1557 Cleanup dialog used for AD attribute resolver
    
    https://issues.shibboleth.net/jira/browse/IDP-1557
---
 idp-installer/src/main/wix/ShibbolethIdP-adconfig-dlg.wxs | 2 +-
 idp-installer/src/main/wix/scripts/shib_write_configs.vbs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/idp-installer/src/main/wix/ShibbolethIdP-adconfig-dlg.wxs b/idp-installer/src/main/wix/ShibbolethIdP-adconfig-dlg.wxs
index 024c094..6c4b203 100644
--- a/idp-installer/src/main/wix/ShibbolethIdP-adconfig-dlg.wxs
+++ b/idp-installer/src/main/wix/ShibbolethIdP-adconfig-dlg.wxs
@@ -50,7 +50,7 @@
 
                 <Control Id="ADDescriptionLine3" Type="Text" X="25" Y="111" Height="18" Width="320" Text="In order to resolve attributes, the IdP needs a username/password for Active Directory" />
 
-                <Control Id="ADDescriptionLine4" Type="Text" X="25" Y="131" Height="18" Width="150" Text="Username (no domain)" />
+                <Control Id="ADDescriptionLine4" Type="Text" X="25" Y="131" Height="18" Width="150" Text="User Principal Name (UPN)" />
                 <Control Id="ADUser" Type="Edit" X="185" Y="131" Height="18" Width="150" Property="AD_USER" Text="[AD_USER]" />
 
 
diff --git a/idp-installer/src/main/wix/scripts/shib_write_configs.vbs b/idp-installer/src/main/wix/scripts/shib_write_configs.vbs
index 06d93f6..d08e3ff 100644
--- a/idp-installer/src/main/wix/scripts/shib_write_configs.vbs
+++ b/idp-installer/src/main/wix/scripts/shib_write_configs.vbs
@@ -166,7 +166,7 @@ if ConfigureAd = "true" then
         LDAPFile.Writeline "idp.authn.LDAP.ldapURL=ldap://" & AdDomain & ":" & LDAPPort
         LDAPFile.Writeline "idp.authn.LDAP.baseDN=" & LDAPSearchPath
         LDAPFile.Writeline "idp.authn.LDAP.userFilter= (sAMAccountName={user})"
-        LDAPFile.Writeline "idp.authn.LDAP.bindDN=" & AdUser & "@" & AdDomain
+        LDAPFile.Writeline "idp.authn.LDAP.bindDN=" & AdUser
         LDAPFile.Writeline "idp.attribute.resolver.LDAP.searchFilter= (sAMAccountName=$resolutionContext.principal)"
         LDAPFile.Writeline "idp.authn.LDAP.dnFormat= %s@" & AdDomain
         LDAPFile.Close

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