X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fmodules%2Forg.argeo.security.webapp%2FWEB-INF%2Fldap.xml;h=7e2cac430a994f28b5ffc885d013f8b976a8f949;hb=eb1255435a5afaf329a781ff4041391c71275537;hp=eab6c3a0f190abe3e0429dc973b12a203b9632a6;hpb=f0037ce21f65a9ae5fb87cb706398a83f5b42880;p=lgpl%2Fargeo-commons.git

diff --git a/security/modules/org.argeo.security.webapp/WEB-INF/ldap.xml b/security/modules/org.argeo.security.webapp/WEB-INF/ldap.xml
index eab6c3a0f..7e2cac430 100644
--- a/security/modules/org.argeo.security.webapp/WEB-INF/ldap.xml
+++ b/security/modules/org.argeo.security.webapp/WEB-INF/ldap.xml
@@ -3,47 +3,34 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
               http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.4.xsd">
-	<security:ldap-server url="ldap://localhost:389/dc=argeo,dc=org"
-		manager-dn="cn=Manager,dc=argeo,dc=org" manager-password="secret" />
+
+	<security:ldap-server url="ldap://localhost:10389/dc=demo,dc=argeo,dc=org"
+		manager-dn="uid=admin,ou=system" manager-password="secret" />
+
 	<security:ldap-authentication-provider
-		user-dn-pattern="uid={0},ou=users" group-search-base="ou=groups">
+		user-details-class="inetOrgPerson" user-dn-pattern="uid={0},ou=users"
+		group-search-base="ou=groups">
 		<security:password-compare hash="{sha}" />
 	</security:ldap-authentication-provider>
-  
-  <!-- 
-	<bean id="contextSource"
+
+	<!--
+		<bean id="contextSource"
 		class="org.springframework.security.ldap.DefaultSpringSecurityContextSource">
 		<constructor-arg value="ldap://localhost:389/dc=argeo,dc=org" />
 		<property name="userDn" value="cn=Manager,dc=argeo,dc=org" />
-		<property name="password" value="secret" />
-	</bean>
-	
-	<bean id="ldapAuthProvider"
+		<property name="password" value="secret" /> </bean> <bean
+		id="ldapAuthProvider"
 		class="org.springframework.security.providers.ldap.LdapAuthenticationProvider">
-		<constructor-arg>
-			<bean
-				class="org.springframework.security.providers.ldap.authenticator.PasswordComparisonAuthenticator">
-				<constructor-arg ref="contextSource" />
-				<property name="userDnPatterns">
-					<list>
-						<value>uid={0},ou=users</value>
-					</list>
-				</property>
-				<property name="passwordEncoder">
-					<bean
-						class="org.springframework.security.providers.ldap.authenticator.LdapShaPasswordEncoder"></bean>
-				</property>
-			</bean>
-		</constructor-arg>
-		<constructor-arg>
-			<bean
-				class="org.springframework.security.ldap.populator.DefaultLdapAuthoritiesPopulator">
-				<constructor-arg ref="contextSource" />
-				<constructor-arg value="ou=groups" />
-				<property name="groupRoleAttribute" value="ou" />
-			</bean>
-		</constructor-arg>
-	</bean>
-	
-	 -->
+		<constructor-arg> <bean
+		class="org.springframework.security.providers.ldap.authenticator.PasswordComparisonAuthenticator">
+		<constructor-arg ref="contextSource" /> <property
+		name="userDnPatterns"> <list> <value>uid={0},ou=users</value> </list>
+		</property> <property name="passwordEncoder"> <bean
+		class="org.springframework.security.providers.ldap.authenticator.LdapShaPasswordEncoder"></bean>
+		</property> </bean> </constructor-arg> <constructor-arg> <bean
+		class="org.springframework.security.ldap.populator.DefaultLdapAuthoritiesPopulator">
+		<constructor-arg ref="contextSource" /> <constructor-arg
+		value="ou=groups" /> <property name="groupRoleAttribute" value="ou" />
+		</bean> </constructor-arg> </bean>
+	-->
 </beans>