Commits

Zhang Huangbin committed 5898452

[ldap] Fix incorrect ldap search scope in plugin 'ldap_maillist_access_policy'.

Comments (0)

Files changed (4)

+iRedAPD-1.3.5:
+    * Fix incorrect ldap search scope in plugin 'ldap_maillist_access_policy'.
+
 iRedAPD-1.3.4:
     * Bypass sender if it's under domainAliasName when access policy is
       'domain' or 'subdomain'. Thanks Alvin Chen <zhhchen@>.

src/iredapd-rr.py

 import logging
 import daemon
 
-__version__ = "1.3.4"
+__version__ = "1.3.5"
 
 ACTION_ACCEPT = 'DUNNO'
 ACTION_DEFER = 'DEFER_IF_PERMIT Service temporarily unavailable'
 import logging
 import daemon
 
-__version__ = "1.3.4"
+__version__ = "1.3.5"
 
 ACTION_ACCEPT = 'DUNNO'
 ACTION_DEFER = 'DEFER_IF_PERMIT Service temporarily unavailable'

src/plugins/ldap_maillist_access_policy.py

 
 # ----------------------------------------------------------------------------
 
-import sys
 import os
 
 ACTION_REJECT = 'REJECT Not Authorized.'
         try:
             qr = ldapConn.search_s(
                 ldapBaseDn,
-                ldap.SCOPE_ONELEVEL,
+                1, # 1 == ldap.SCOPE_ONELEVEL
                 "(&(objectClass=mailDomain)(|(domainName=%s)(domainAliasName=%s)))" % (recipient_domain, recipient_domain),
                 ['domainName', 'domainAliasName',]
             )
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.