From 41aaf938f29a3b1a7da47aaa3f7140eb856d4184 Mon Sep 17 00:00:00 2001 From: Arthur de Jong Date: Sun, 15 Jul 2012 12:59:02 +0000 Subject: rename internal pam_authz_search to pam_authz_searches git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1718 ef36b2f9-881f-0410-afb5-c4e39611909c --- pynslcd/cfg.py | 4 ++-- pynslcd/pam.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pynslcd/cfg.py b/pynslcd/cfg.py index a5f776d..bfb3c38 100644 --- a/pynslcd/cfg.py +++ b/pynslcd/cfg.py @@ -84,7 +84,7 @@ pagesize = 0 nss_initgroups_ignoreusers = set() nss_min_uid = 0 validnames = re.compile(r'^[a-z0-9._@$][a-z0-9._@$ \\~-]{0,98}[a-z0-9._@$~-]$', re.IGNORECASE) -pam_authz_search = [] +pam_authz_searches = [] # allowed boolean values @@ -253,7 +253,7 @@ def read(filename): # pam_authz_search m = re.match('pam_authz_search\s+(?P\S.*)', line, re.IGNORECASE) if m: - pam_authz_search.append(Expression(m.group('value'))) + pam_authz_searches.append(Expression(m.group('value'))) # TODO: check pam_authz_search expression to only contain # username, service, ruser, rhost, tty, hostname, fqdn, dn or # uid variables diff --git a/pynslcd/pam.py b/pynslcd/pam.py index c5f2941..3588797 100644 --- a/pynslcd/pam.py +++ b/pynslcd/pam.py @@ -147,7 +147,7 @@ class PAMAuthorisationRequest(PAMRequest): self.fp.write_int32(constants.NSLCD_RESULT_END) def check_authzsearch(self, parameters): - if not cfg.pam_authz_search: + if not cfg.pam_authz_searches: return # escape all parameters variables = dict((k, escape(v)) for k, v in parameters.items()) @@ -158,7 +158,7 @@ class PAMAuthorisationRequest(PAMRequest): uid=variables['username'], ) # go over all authz searches - for x in cfg.pam_authz_search: + for x in cfg.pam_authz_searches: filter = x.value(variables) logging.debug('trying pam_authz_search "%s"', filter) search = common.Search(self.conn, filter=filter, attributes=('dn', )) -- cgit v1.2.3