X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fmodules%2Forg.argeo.security.dao.ldap%2FMETA-INF%2Fspring%2Fldap.xml;h=33dc554a87de4a0af7891448d5444aedd6a9ba0a;hb=149023e5969377045847bbecf24b0898b18a67a9;hp=e990cad8b2937789e087fa032f092295314c0118;hpb=7f23c34bcf51716cfb8f3853d47680035747052f;p=lgpl%2Fargeo-commons.git

diff --git a/security/modules/org.argeo.security.dao.ldap/META-INF/spring/ldap.xml b/security/modules/org.argeo.security.dao.ldap/META-INF/spring/ldap.xml
index e990cad8b..33dc554a8 100644
--- a/security/modules/org.argeo.security.dao.ldap/META-INF/spring/ldap.xml
+++ b/security/modules/org.argeo.security.dao.ldap/META-INF/spring/ldap.xml
@@ -13,8 +13,9 @@
 		</property>
 	</bean>
 
-	<bean id="passwordEncoder"
-		class="org.springframework.security.providers.ldap.authenticator.LdapShaPasswordEncoder" />
+	<bean id="passwordEncoder" class="org.argeo.security.ldap.ArgeoLdapShaPasswordEncoder">
+		<property name="useSalt" value="${argeo.ldap.password.useSalt}" />
+	</bean>
 
 	<bean id="contextSource"
 		class="org.springframework.security.ldap.DefaultSpringSecurityContextSource">
@@ -57,7 +58,7 @@
 	<!-- </bean> -->
 
 	<!-- USER DETAILS -->
-	<bean id="securityDao" class="org.argeo.security.ldap.ArgeoSecurityDaoLdap">
+	<bean id="userAdminDao" class="org.argeo.security.ldap.ArgeoSecurityDaoLdap">
 		<constructor-arg ref="contextSource" />
 		<property name="userBase" value="${argeo.ldap.userBase}" />
 		<property name="usernameAttribute" value="${argeo.ldap.usernameAttribute}" />
@@ -72,9 +73,7 @@
 		<property name="groupMemberAttribute" value="${argeo.ldap.groupMemberAttribute}" />
 		<property name="defaultRole" value="${argeo.security.defaultRole}" />
 		<property name="rolePrefix" value="${argeo.security.rolePrefix}" />
-		<property name="passwordEncoder" ref="passwordEncoder" />
 		<property name="usernameMapper" ref="usernameMapper" />
-		<property name="userDetailsManager" ref="userDetailsManager" />
 	</bean>
 
 	<bean id="usernameMapper"
@@ -98,6 +97,7 @@
 		<property name="groupMemberAttributeName" value="${argeo.ldap.groupMemberAttribute}" />
 		<property name="usernameMapper" ref="usernameMapper" />
 		<property name="userDetailsMapper" ref="jcrUserDetailsContextMapper" />
+		<property name="userAdminDao" ref="userAdminDao" />
 		<property name="passwordEncoder" ref="passwordEncoder" />
 		<property name="passwordAttributeName" value="${argeo.ldap.passwordAttribute}" />
 	</bean>