From: Michael Tremer Date: Fri, 23 Nov 2018 23:51:33 +0000 (+0000) Subject: accounts: Save search_domain only once X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=58d22b5d809e41a1e969466a361e6ec2a2f821c5;p=ipfire.org.git accounts: Save search_domain only once Signed-off-by: Michael Tremer --- diff --git a/src/backend/accounts.py b/src/backend/accounts.py index 0d767ee4..95bc0064 100644 --- a/src/backend/accounts.py +++ b/src/backend/accounts.py @@ -20,6 +20,9 @@ from .decorators import * from .misc import Object class Accounts(Object): + def init(self): + self.search_base = self.settings.get("ldap_search_base") + def __iter__(self): # Only return developers (group with ID 1000) accounts = self._search("(&(objectClass=posixAccount)(gidNumber=1000))") @@ -43,10 +46,8 @@ class Accounts(Object): def _query(self, query, attrlist=None, limit=0): logging.debug("Performing LDAP query: %s" % query) - search_base = self.settings.get("ldap_search_base") - try: - results = self.ldap.search_ext_s(search_base, ldap.SCOPE_SUBTREE, + results = self.ldap.search_ext_s(self.search_base, ldap.SCOPE_SUBTREE, query, attrlist=attrlist, sizelimit=limit) except: # Close current connection