Changeset 347:6abe16277efe

Timestamp:

09/19/11 23:54:09 (5 months ago)

Author:

xeraph

Branch:

default

Convert:

svn:7c3792e6-d75b-4784-96a6-b298f655ee64/trunk@2781

Message:

changed ldap filter "(&(sAMAccountName=*)(givenName=*))" to "(&(userPrincipalName=*))". givenName can be null.

Location:

kraken-ldap

Files:

• pom.xml (modified) (1 diff)
• src/main/java/org/krakenapps/ldap/impl/JLdapService.java (modified) (2 diffs)

kraken-ldap/pom.xml

@@ -11 +11 @@
         <groupId>org.krakenapps</groupId>
         <artifactId>kraken-ldap</artifactId>
-        <version>1.1.3</version>
+        <version>1.1.4</version>
         <packaging>bundle</packaging>
         <name>Kraken LDAP</name>

kraken-ldap/src/main/java/org/krakenapps/ldap/impl/JLdapService.java

@@ -164 +164 @@
                         lc.bind(LDAPConnection.LDAP_V3, profile.getAccount(), profile.getPassword().getBytes("utf-8"));
                         LDAPSearchResults r = lc.search(buildBaseDN(profile.getDc()), LDAPConnection.SCOPE_SUB,
-                                        "(&(sAMAccountName=*)(givenName=*))", null, false);
+                                        "(&(userPrincipalName=*))", null, false);
 
                         while (r.hasMore()) {
                                 try {
                                         LDAPEntry entry = r.next();
+                                        logger.debug("kraken-ldap: fetch entry [{}]", entry);
+                                        
                                         DomainUserAccount account = parseUserAccount(entry);
                                         if (account != null)
@@ -207 +209 @@
                                 try {
                                         LDAPEntry entry = r.next();
+                                        logger.debug("kraken-ldap: fetch org unit entry [{}]", entry);
+                                        
                                         DomainOrganizationalUnit ou = parseOrganizationUnit(entry);
                                         if (ou != null)