cfg.py (nss-pam-ldapd-0.9.11) | : | cfg.py (nss-pam-ldapd-0.9.12) | ||
---|---|---|---|---|
skipping to change at line 89 | skipping to change at line 89 | |||
# other options | # other options | |||
pagesize = 0 # FIXME: add support | pagesize = 0 # FIXME: add support | |||
nss_initgroups_ignoreusers = set() | nss_initgroups_ignoreusers = set() | |||
nss_min_uid = 0 | nss_min_uid = 0 | |||
nss_uid_offset = 0 | nss_uid_offset = 0 | |||
nss_gid_offset = 0 | nss_gid_offset = 0 | |||
nss_nested_groups = False | nss_nested_groups = False | |||
nss_getgrent_skipmembers = False | nss_getgrent_skipmembers = False | |||
nss_disable_enumeration = False | nss_disable_enumeration = False | |||
validnames = re.compile(r'^[a-z0-9._@$][a-z0-9._@$ \\~-]{0,98}[a-z0-9._@$~-]$', re.IGNORECASE) | validnames = re.compile(r'^[a-z0-9._@$][a-z0-9._@$ \\~-]{0,98}[a-z0-9._@$~-]$', re.IGNORECASE) | |||
pam_authc_ppolicy = True | ||||
pam_authz_searches = [] | pam_authz_searches = [] | |||
pam_password_prohibit_message = None | pam_password_prohibit_message = None | |||
reconnect_invalidate = set() | reconnect_invalidate = set() | |||
# allowed boolean values | # allowed boolean values | |||
_boolean_options = {'on': True, 'yes': True, 'true': True, '1': True, | _boolean_options = {'on': True, 'yes': True, 'true': True, '1': True, | |||
'off': False, 'no': False, 'false': False, '0': False} | 'off': False, 'no': False, 'false': False, '0': False} | |||
# allowed log levels (we log notice which is unsupported in Python to warning) | # allowed log levels (we log notice which is unsupported in Python to warning) | |||
_log_levels = {'crit': logging.CRITICAL, 'error': logging.ERROR, | _log_levels = {'crit': logging.CRITICAL, 'error': logging.ERROR, | |||
skipping to change at line 182 | skipping to change at line 183 | |||
r'(?P<keyword>threads|ldap_version|bind_timelimit|timelimit|' | r'(?P<keyword>threads|ldap_version|bind_timelimit|timelimit|' | |||
r'idle_timelimit|reconnect_sleeptime|reconnect_retrytime|pagesize|' | r'idle_timelimit|reconnect_sleeptime|reconnect_retrytime|pagesize|' | |||
r'nss_min_uid|nss_uid_offset|nss_gid_offset)\s+(?P<value>\d+)', | r'nss_min_uid|nss_uid_offset|nss_gid_offset)\s+(?P<value>\d+)', | |||
line, re.IGNORECASE) | line, re.IGNORECASE) | |||
if m: | if m: | |||
globals()[m.group('keyword').lower()] = int(m.group('value')) | globals()[m.group('keyword').lower()] = int(m.group('value')) | |||
continue | continue | |||
# parse options with a single boolean argument | # parse options with a single boolean argument | |||
m = re.match( | m = re.match( | |||
r'(?P<keyword>referrals|nss_nested_groups|nss_getgrent_skipmembers|' | r'(?P<keyword>referrals|nss_nested_groups|nss_getgrent_skipmembers|' | |||
r'nss_disable_enumeration)\s+(?P<value>%s)' % ( | r'nss_disable_enumeration|pam_authc_ppolicy)\s+(?P<value>%s)' % ( | |||
'|'.join(_boolean_options.keys())), | '|'.join(_boolean_options.keys())), | |||
line, re.IGNORECASE) | line, re.IGNORECASE) | |||
if m: | if m: | |||
globals()[m.group('keyword').lower()] = _boolean_options[m.group('va lue').lower()] | globals()[m.group('keyword').lower()] = _boolean_options[m.group('va lue').lower()] | |||
continue | continue | |||
# parse options with a single no-space value | # parse options with a single no-space value | |||
m = re.match( | m = re.match( | |||
r'(?P<keyword>uid|gid|bindpw|rootpwmodpw|sasl_mech)\s+(?P<value>\S+) ', | r'(?P<keyword>uid|gid|bindpw|rootpwmodpw|sasl_mech)\s+(?P<value>\S+) ', | |||
line, re.IGNORECASE) | line, re.IGNORECASE) | |||
if m: | if m: | |||
End of changes. 2 change blocks. | ||||
1 lines changed or deleted | 2 lines changed or added |