Address review comments

hpcc-systems · Aug 13, 2018 · b34fcef · b34fcef
1 parent 6ad7779
commit b34fcef
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/initfiles/componentfiles/configschema/xsd/esp.xsd b/initfiles/componentfiles/configschema/xsd/esp.xsd
@@ -95,7 +95,7 @@
                                         </xs:restriction>
                                     </xs:simpleType>
                                 </xs:attribute>
-                                <xs:attribute name="ldapServer" type="xs:string" use="optional" hpcc:displayName="LDAP Server" hpcc:requiredIf="../EspBinding[@method=('ldap','ldaps')]"
+                                <xs:attribute name="ldapServer" type="xs:string" use="optional" hpcc:displayName="LDAP Server" hpcc:requiredIf=".[@method=('ldap','ldaps')]"
                                     hpcc:tooltip="The ldap server to be used for authentication"/>
                                 <xs:attribute name="ldapAuthMethod" type="xs:string" use="optional" default="kerberos" hpcc:displayName="LDAP Auth Method"
                                     hpcc:requiredIf=".[@method=('ldap','ldaps')]" hpcc:tooltip="The protocol to use for LDAP authentication">
@@ -150,6 +150,7 @@
                                 <xs:attribute name="passphrase" type="xs:string" use="optional" hpcc:modifiers="mask,verify,ignoreNoChange,encrypt" hpcc:displayName="Passphrase" hpcc:tooltip="The passphrase used to generate the private key" />
                                 <xs:attribute name="privateKeyFileName" type="xs:string" use="optional" default="privatekey.cer" hpcc:displayName="Private Key Filename" hpcc:requiredIf="../EspBinding[@protocol='https']"
                                               hpcc:tooltip="Name of destination file in which the private key will be written" />
+                                <!-- The following are deprecated and marked hidden so that they don't appear to the user -->
                                 <xs:attribute name="city" hpcc:deprecated="true" hpcc:hidden="true" type="xs:string" use="optional"/>
                                 <xs:attribute name="country" hpcc:deprecated="true" hpcc:hidden="true" type="xs:string" use="optional"/>
                                 <xs:attribute name="daysValid" hpcc:deprecated="true" hpcc:hidden="true" type="xs:string" use="optional"/>