diff options
author | Olivier Blin <dev@blino.org> | 2015-11-07 02:06:52 +0100 |
---|---|---|
committer | Olivier Blin <dev@blino.org> | 2015-11-07 02:06:52 +0100 |
commit | b7fb17473294035471a12b84b47768babbc907b7 (patch) | |
tree | 7e478006a4ab47ff22d1b1f2107434f9ff66e052 | |
parent | d5e40ac05ce2bb0aa4df25cd912fab68459b9688 (diff) | |
download | puppet-b7fb17473294035471a12b84b47768babbc907b7.tar puppet-b7fb17473294035471a12b84b47768babbc907b7.tar.gz puppet-b7fb17473294035471a12b84b47768babbc907b7.tar.bz2 puppet-b7fb17473294035471a12b84b47768babbc907b7.tar.xz puppet-b7fb17473294035471a12b84b47768babbc907b7.zip |
Revert lint fix on sympa auth.conf to get back login fields (mga#17009)
sympa does not seem to parse auth.conf properly if there is no extra
newline at the end of file.
Matching code in /usr/share/sympa/lib/Conf.pm:
}elsif (/^\s*(ldap|cas|user_table|generic_sso)\s*$/io) {
$current_paragraph->{'auth_type'} = lc($1);
perlre man page says the following about the /o modifier in regexps:
o - pretend to optimize your code, but actually introduce bugs
-rw-r--r-- | modules/sympa/templates/auth.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/modules/sympa/templates/auth.conf b/modules/sympa/templates/auth.conf index 54af2fc5..af998b68 100644 --- a/modules/sympa/templates/auth.conf +++ b/modules/sympa/templates/auth.conf @@ -10,3 +10,4 @@ ldap bind_dn cn=sympa-<%= hostname %>,ou=System Accounts,<%= dc_suffix %> bind_password <%= ldap_password %> authentication_info_url <%= authentication_info_url %> + |