X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fldap%2FArgeoSecurityDaoLdap.java;fp=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fldap%2FArgeoSecurityDaoLdap.java;h=c9ba367c6ec58d450d5328bf719d81bf20cc9b88;hb=9f2aa390f921ccb05e0b6fbf1f2f25f0902d9705;hp=29c2e743d52f277d00b166da7bb79855938bdc2e;hpb=31a0ddf37f5fe0f74b864f1bc9ab108881aa453b;p=lgpl%2Fargeo-commons.git

diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/ArgeoSecurityDaoLdap.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/ArgeoSecurityDaoLdap.java
index 29c2e743d..c9ba367c6 100644
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/ArgeoSecurityDaoLdap.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/ArgeoSecurityDaoLdap.java
@@ -37,11 +37,12 @@ public class ArgeoSecurityDaoLdap implements ArgeoSecurityDao, InitializingBean
 
 	private UserDetailsManager userDetailsManager;
 	private LdapAuthoritiesPopulator authoritiesPopulator;
-	private String userBase = "ou=users";
+	private String userBase = "ou=People";
 	private String usernameAttributeName = "uid";
-	private String groupBase = "ou=groups";
+	private String groupBase = "ou=Roles";
+	private String[] groupClasses = { "top", "groupOfNames" };
 	private String groupRoleAttributeName = "cn";
-	private String groupMemberAttributeName = "uniquemember";
+	private String groupMemberAttributeName = "member";
 	private String defaultRole = "ROLE_USER";
 	private String rolePrefix = "ROLE_";
 
@@ -167,12 +168,12 @@ public class ArgeoSecurityDaoLdap implements ArgeoSecurityDao, InitializingBean
 
 		Name groupDn = buildGroupDn(group);
 		DirContextAdapter context = new DirContextAdapter();
-		context.setAttributeValues("objectClass", new String[] { "top",
-				"groupOfUniqueNames" });
+		context.setAttributeValues("objectClass", groupClasses);
 		context.setAttributeValue("cn", group);
 
 		// Add superuser because cannot create empty group
-		context.setAttributeValue("uniqueMember", superuserDn.toString());
+		context.setAttributeValue(groupMemberAttributeName, superuserDn
+				.toString());
 
 		ldapTemplate.bind(groupDn, context, null);
 	}
@@ -267,4 +268,8 @@ public class ArgeoSecurityDaoLdap implements ArgeoSecurityDao, InitializingBean
 	public String getDefaultRole() {
 		return defaultRole;
 	}
+
+	public void setGroupClasses(String[] groupClasses) {
+		this.groupClasses = groupClasses;
+	}
 }