mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
Merged V2.9 to HEAD
9241: Merged V2.2 to V2.9 9119: Merged V2.1 to V2.2 8671: Fix for AR-2221 - JavaScript scriptable Map objects recursively converted to Freemarker accessable maps 9256: Merged V2.2 to V2.9 9100: Merged V2.1 to V2.2 8728 <Not required>: Latest AMP changes for AR-2212 8731: Faster content store cleaner 8738: Fix for AWC 1930 - support simple bind when building DNs that contain a comma 8835: Fix regression issue as discussed in ACT 2019 8861: Fix WCM-1158 8866: Fixed AR-2272: Module Management Tool distribution is broken 8872: Fixed distribution of benchmark executable jar after EHCache upgrade 8933: Fix for ACT-2469 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9260 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -61,7 +61,13 @@
|
||||
</property>
|
||||
<property name="transactionService">
|
||||
<ref bean="transactionService" />
|
||||
</property>
|
||||
</property>
|
||||
<property name="escapeCommasInBind">
|
||||
<value>${ldap.authentication.escapeCommasInBind}</value>
|
||||
</property>
|
||||
<property name="escapeCommasInUid">
|
||||
<value>${ldap.authentication.escapeCommasInUid}</value>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!--
|
||||
|
@@ -24,4 +24,14 @@ ldap.authentication.java.naming.security.authentication=DIGEST-MD5
|
||||
ldap.authentication.java.naming.security.principal=reader
|
||||
|
||||
# The password for the default principal (only used for LDAP sync)
|
||||
ldap.authentication.java.naming.security.credentials=secret
|
||||
ldap.authentication.java.naming.security.credentials=secret
|
||||
|
||||
# Escape commas entered by the user at bind time
|
||||
# Useful when using simple authentication and the CN is part of the DN and contains commas
|
||||
ldap.authentication.escapeCommasInBind=false
|
||||
|
||||
# Escape commas entered by the user when setting the authenticated user
|
||||
# Useful when using simple authentication and the CN is part of the DN and contains commas, and the escaped \, is
|
||||
# pulled in as part of an LDAP sync
|
||||
# If this option is set to true it will break the default home folder provider as space names can not contain \
|
||||
ldap.authentication.escapeCommasInUid=false
|
@@ -866,7 +866,7 @@
|
||||
<value>getIndirectionPath</value>
|
||||
<value>getHistory</value>
|
||||
<value>getCommonAncestor</value>
|
||||
<value>getLayereingInfo</value>
|
||||
<value>getLayeringInfo</value>
|
||||
<value>getNodeProperty</value>
|
||||
<value>getNodeProperties</value>
|
||||
<value>getStoreProperty</value>
|
||||
|
Reference in New Issue
Block a user