nss-pam-ldapd commit: r1718 - nss-pam-ldapd/pynslcd

[Commits of the nss-pam-ldapd project <nss-pam-ldapd-commits [at] lists.arthurdejong.org>]

Author: arthur
Date: Sun Jul 15 14:59:02 2012
New Revision: 1718
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?revision=1718&view=revision

Log:
rename internal pam_authz_search to pam_authz_searches

Modified:
   nss-pam-ldapd/pynslcd/cfg.py
   nss-pam-ldapd/pynslcd/pam.py

Modified: nss-pam-ldapd/pynslcd/cfg.py
==============================================================================
--- nss-pam-ldapd/pynslcd/cfg.py        Sun Jul 15 14:47:23 2012        (r1717)
+++ nss-pam-ldapd/pynslcd/cfg.py        Sun Jul 15 14:59:02 2012        (r1718)
@@ -84,7 +84,7 @@
 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 @@
         # pam_authz_search <FILTER>
         m = re.match('pam_authz_search\s+(?P<value>\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

Modified: nss-pam-ldapd/pynslcd/pam.py
==============================================================================
--- nss-pam-ldapd/pynslcd/pam.py        Sun Jul 15 14:47:23 2012        (r1717)
+++ nss-pam-ldapd/pynslcd/pam.py        Sun Jul 15 14:59:02 2012        (r1718)
@@ -147,7 +147,7 @@
         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 @@
                 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', 
))
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits/