[java-identity-provider COMMIT] /trunk/idp-distribution/src/main/resources/bin/build.xml

[noreply at shibboleth.net]

Author: scantor
Date: Fri Jan 16 18:28:18 2015
New Revision: 7248

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7248&view=rev
Log:
IDP-570 - Installer doesn't honor input entityID in creating URI subject alt names

Modified:
    trunk/idp-distribution/src/main/resources/bin/build.xml

Modified: trunk/idp-distribution/src/main/resources/bin/build.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/build.xml?rev=7248&r1=7247&r2=7248&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/build.xml (original)
+++ trunk/idp-distribution/src/main/resources/bin/build.xml Fri Jan 16 18:28:18 2015
@@ -160,6 +160,7 @@
         <fail if="idp.noprompt">Input needed, silence demanded</fail>
         <local name="entityid" />
         <input message="SAML EntityID:" addproperty="entityid" defaultvalue="https://${idp.host.name}/idp/shibboleth" />
+    	<property name="idp.uri.subject.alt.name" value="${entityid}" />
         <echo file="${idp.merge.properties}" append="yes">
             idp.entityID=${entityid}
         </echo>
@@ -260,7 +261,7 @@
             <!-- We ask for alt name if there is no alt name and we will call certgen -->
             <and>
                 <not>
-                    <isset property="uri.subject.alt.name" />
+                    <isset property="idp.uri.subject.alt.name" />
                 </not>
                 <istrue value="${idp.will.call.certgen}" />
             </and>