浏览代码

HPCC-11632 Add serverType attribute to LDAP config

	- Add serverType to dali.xsl
	- Add serverType to esp_service.xsl

Signed-off-by: Gleb Aronsky <gleb.aronsky@lexisnexis.com>
Gleb Aronsky 11 年之前
父节点
当前提交
a4d25b32aa

+ 1 - 0
initfiles/componentfiles/configxml/@temp/esp_service.xsl

@@ -186,6 +186,7 @@ xmlns:seisint="http://seisint.com"  xmlns:set="http://exslt.org/sets" exclude-re
                     <!--if binding has an ldap resourcebasedn specified then copy it out -->
                     <xsl:copy-of select="$bindingNode/@workunitsBasedn"/>
                     <!--if binding has an ldap workunitsbasedn specified then copy it out -->
+                    <xsl:copy-of select="$bindingNode/@serverType"/>
                     <xsl:for-each select="$bindingNode/Authenticate[@path='/']">
                         <Location path="/" resource="{@resource}" required="{@access}" description="{@description}"/>
                     </xsl:for-each>

+ 4 - 1
initfiles/componentfiles/configxml/dali.xsl

@@ -264,6 +264,9 @@
             <xsl:attribute name="filesBasedn">
                 <xsl:value-of select="/Environment/Software/LDAPServerProcess[@name=$ldapServerName]/@filesBasedn"/>
             </xsl:attribute>
+            <xsl:attribute name="serverType">
+                <xsl:value-of select="/Environment/Software/LDAPServerProcess[@name=$ldapServerName]/@serverType"/>
+            </xsl:attribute>
             <xsl:variable name="ldapServerNode" select="/Environment/Software/LDAPServerProcess[@name=$ldapServerName]"/>
             <xsl:if test="not($ldapServerNode)">
               <xsl:message terminate="yes">
@@ -294,7 +297,7 @@
             </xsl:attribute>
 
             <xsl:for-each select="$ldapServerNode">
-              <xsl:copy-of select="@ldapPort | @ldapSecurePort | @cacheTimeout | @workunitsBasedn | @modulesBasedn | @systemBasedn | @systemCommonName | @systemUser | @systemPassword | @usersBasedn | @groupsBasedn"/>
+              <xsl:copy-of select="@ldapPort | @ldapSecurePort | @cacheTimeout | @workunitsBasedn | @modulesBasedn | @systemBasedn | @systemCommonName | @systemUser | @systemPassword | @usersBasedn | @groupsBasedn | @serverType"/>
             </xsl:for-each>
           </xsl:element>
         </xsl:if>

+ 15 - 0
initfiles/componentfiles/configxml/ldapserver.xsd

@@ -237,6 +237,21 @@
                     </xs:appinfo>
                 </xs:annotation>
             </xs:attribute>
+            <xs:attribute name="serverType" use="required" default="ActiveDirectory">
+                <xs:annotation>
+                    <xs:appinfo>
+                        <tooltip>LDAP Server Implementation Type</tooltip>
+                    </xs:appinfo>
+                </xs:annotation>
+                    <xs:simpleType>
+                        <xs:restriction base="xs:string">
+                            <xs:enumeration value="ActiveDirectory"/>
+                            <xs:enumeration value="OpenLDAP"/>
+                            <xs:enumeration value="Fedora389"/>
+			    <xs:enumeration value="iPlanet"/>
+                        </xs:restriction>
+                    </xs:simpleType>
+            </xs:attribute>
         </xs:complexType>
     </xs:element>
 </xs:schema>