diff options
| author | Stefan Hacker <dd0t@users.sourceforge.net> | 2015-02-15 10:15:58 +0300 |
|---|---|---|
| committer | Stefan Hacker <dd0t@users.sourceforge.net> | 2015-02-15 10:15:58 +0300 |
| commit | 1d4ab5c72ae801e832ba1d0d6eecb2f5717c9958 (patch) | |
| tree | 6e44b702b7cf81d05b792831d2962dc9e01116c6 | |
| parent | 468dfbfa9d5365c951fa39512385941a83dcd41f (diff) | |
| parent | 14e3e88d0e898e620cfa967b7a850a7ac798fd06 (diff) | |
Merge pull request #6 from ColinFinck/master
Bug fixes for the LDAP Authenticator
| -rw-r--r-- | Authenticators/LDAP/LDAPauth.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Authenticators/LDAP/LDAPauth.py b/Authenticators/LDAP/LDAPauth.py index 45bb0c6..93f1277 100644 --- a/Authenticators/LDAP/LDAPauth.py +++ b/Authenticators/LDAP/LDAPauth.py @@ -501,7 +501,7 @@ def do_main_program(): debug('Checking group membership for ' + name) #Search for user in group - res = ldap_conn.search_s(cfg.ldap.group_cn, ldap.SCOPE_SUBTREE, user_dn, [cfg.ldap.number_attr, cfg.ldap.display_attr]) + res = ldap_conn.search_s(cfg.ldap.group_cn, ldap.SCOPE_SUBTREE, '(%s=%s)' % (cfg.ldap.group_attr, user_dn), [cfg.ldap.number_attr, cfg.ldap.display_attr]) # Check if the user is a member of the group if len(res) < 1: @@ -612,7 +612,7 @@ def do_main_program(): debug('nameToId %s -> ?', name) return FALL_THROUGH - return result + return uid @fortifyIceFu("") |