diff options
| author | Simo Sorce <simo@redhat.com> | 2015-03-17 20:25:18 -0400 |
|---|---|---|
| committer | Patrick Uiterwijk <puiterwijk@redhat.com> | 2015-03-23 15:44:25 +0100 |
| commit | cacb41e93b377496e77f824f4f1b0ce206da0bed (patch) | |
| tree | e3f08b34d1480099eb1aca84ad25e0324bf16c22 /ipsilon/info | |
| parent | 521a28fd446a64c4fa5895e1aa768512249652f6 (diff) | |
| download | ipsilon-cacb41e93b377496e77f824f4f1b0ce206da0bed.tar.gz ipsilon-cacb41e93b377496e77f824f4f1b0ce206da0bed.tar.xz ipsilon-cacb41e93b377496e77f824f4f1b0ce206da0bed.zip | |
Add LDAP test
This finally tests the LDAP login/info plugins as well as the special
"groups" attribute.
Signed-off-by: Simo Sorce <simo@redhat.com>
Reviewed-by: Patrick Uiterwijk <puiterwijk@redhat.com>
Diffstat (limited to 'ipsilon/info')
| -rw-r--r-- | ipsilon/info/infoldap.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ipsilon/info/infoldap.py b/ipsilon/info/infoldap.py index e56a6a0..01d2512 100644 --- a/ipsilon/info/infoldap.py +++ b/ipsilon/info/infoldap.py @@ -209,7 +209,12 @@ class Installer(InfoProviderInstaller): config['user dn template'] = opts['info_ldap_user_dn_template'] elif 'ldap_bind_dn_template' in opts: config['user dn template'] = opts['ldap_bind_dn_template'] - config['tls'] = 'Demand' + if 'info_ldap_tls_level' in opts and opts['info_ldap_tls_level']: + config['tls'] = opts['info_ldap_tls_level'] + elif 'ldap_tls_level' in opts and opts['ldap_tls_level']: + config['tls'] = opts['ldap_tls_level'] + else: + config['tls'] = 'Demand' if 'info_ldap_base_dn' in opts and opts['info_ldap_base_dn']: config['base dn'] = opts['info_ldap_base_dn'] elif 'ldap_base_dn' in opts and opts['ldap_base_dn']: |