summaryrefslogtreecommitdiff
path: root/pynslcd
diff options
context:
space:
mode:
authorArthur de Jong <arthur@arthurdejong.org>2012-05-04 13:36:45 +0000
committerArthur de Jong <arthur@arthurdejong.org>2012-05-04 13:36:45 +0000
commitdcb2c6be4101985dd7f9d519635227e9f81ac2a7 (patch)
tree636c6577afc2c42fb1ea3319dadd16d7436d2773 /pynslcd
parentd02bfa44cfda8b7d5b95817305e30f77cfbee079 (diff)
allow the pam_authz_search option to be specified multiple times
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1679 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'pynslcd')
-rw-r--r--pynslcd/cfg.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/pynslcd/cfg.py b/pynslcd/cfg.py
index 9386716..a0415e3 100644
--- a/pynslcd/cfg.py
+++ b/pynslcd/cfg.py
@@ -82,7 +82,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 = None
+pam_authz_search = []
# allowed boolean values
@@ -248,9 +248,8 @@ def read(filename):
# pam_authz_search <FILTER>
m = re.match('pam_authz_search\s+(?P<value>\S.*)', line, re.IGNORECASE)
if m:
- global pam_authz_search
from attmap import Expression
- pam_authz_search = Expression(m.group('value'))
+ pam_authz_search.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
continue
# ssl <on|off|start_tls>