svn commit: r1858358 - /comdev/reporter.apache.org/trunk/site/jiraversions.py

[se...@apache.org]

Author: sebb
Date: Mon Apr 29 10:17:53 2019
New Revision: 1858358

URL: http://svn.apache.org/viewvc?rev=1858358&view=rev
Log:
Update LDAP to use ou=project

Modified:
    comdev/reporter.apache.org/trunk/site/jiraversions.py

Modified: comdev/reporter.apache.org/trunk/site/jiraversions.py
URL: http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/jiraversions.py?rev=1858358&r1=1858357&r2=1858358&view=diff
==============================================================================
--- comdev/reporter.apache.org/trunk/site/jiraversions.py (original)
+++ comdev/reporter.apache.org/trunk/site/jiraversions.py Mon Apr 29 10:17:53 2019
@@ -27,8 +27,10 @@ If a valid JIRA name is used, the projec
 # TODO only needs to determine if the user belongs to a single group; so could simplify the LDAP search
 def getPMCs(uid):
     groups = []
-    ldapdata = subprocess.check_output(['ldapsearch', '-x', '-LLL', '(|(memberUid=%s)(member=uid=%s,ou=people,dc=apache,dc=org))' % (uid, uid), 'cn'])
-    for match in re.finditer(r"dn: cn=([a-zA-Z0-9]+),ou=pmc,ou=committees,ou=groups,dc=apache,dc=org", ldapdata):
+    ldapdata = subprocess.check_output(['ldapsearch', '-x', '-LLL',
+        '-b', 'ou=project,ou=groups,dc=apache,dc=org',
+        'member=uid=%s,ou=people,dc=apache,dc=org' % uid, 'dn'])
+    for match in re.finditer(r"dn: cn=([a-zA-Z0-9]+),ou=project,ou=groups,dc=apache,dc=org", ldapdata):
         group = match.group(1)
         if group != "incubator":
             groups.append(group)