Support isMemberOf attribute of Sun Directory Server

Fixes #1583 (cherry picked from commit 02e693a)
Graylog2 · Dec 8, 2015 · fe2b27f · fe2b27f
1 parent 6444133
commit fe2b27f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/graylog2-server/src/main/java/org/graylog2/security/ldap/LdapConnector.java b/graylog2-server/src/main/java/org/graylog2/security/ldap/LdapConnector.java
@@ -132,7 +132,7 @@ public LdapEntry search(LdapNetworkConnection connection,
             entryCursor = connection.search(searchBase,
                                             filter,
                                             SearchScope.SUBTREE,
-                                            groupIdAttribute, displayNameAttribute, "dn", "uid", "userPrincipalName", "mail", "rfc822Mailbox", "memberOf");
+                                            groupIdAttribute, displayNameAttribute, "dn", "uid", "userPrincipalName", "mail", "rfc822Mailbox", "memberOf", "isMemberOf");
             final Iterator<Entry> it = entryCursor.iterator();
             if (it.hasNext()) {
                 final Entry e = it.next();
@@ -151,7 +151,8 @@ public LdapEntry search(LdapNetworkConnection connection,
                     if (attribute.isHumanReadable()) {
                         ldapEntry.put(attribute.getId(), Joiner.on(", ").join(attribute.iterator()));
                     }
-                    if ("memberOf".equalsIgnoreCase(attribute.getId())) {
+                    // ActiveDirectory (memberOf) and Sun Directory Server (isMemberOf)
+                    if ("memberOf".equalsIgnoreCase(attribute.getId()) || "isMemberOf".equalsIgnoreCase(attribute.getId())) {
                         for (Value<?> group : attribute) {
                             groupDns.add(group.getString());
                         }