summaryrefslogtreecommitdiffstats
path: root/ipsilon/login/authldap.py
diff options
context:
space:
mode:
authorSimo Sorce <simo@redhat.com>2015-03-17 20:25:18 -0400
committerPatrick Uiterwijk <puiterwijk@redhat.com>2015-03-23 15:44:25 +0100
commitcacb41e93b377496e77f824f4f1b0ce206da0bed (patch)
treee3f08b34d1480099eb1aca84ad25e0324bf16c22 /ipsilon/login/authldap.py
parent521a28fd446a64c4fa5895e1aa768512249652f6 (diff)
downloadipsilon-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/login/authldap.py')
-rw-r--r--ipsilon/login/authldap.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/ipsilon/login/authldap.py b/ipsilon/login/authldap.py
index db58360..595d6be 100644
--- a/ipsilon/login/authldap.py
+++ b/ipsilon/login/authldap.py
@@ -190,6 +190,8 @@ class Installer(LoginManagerInstaller):
help='LDAP Server Url')
group.add_argument('--ldap-bind-dn-template', action='store',
help='LDAP Bind DN Template')
+ group.add_argument('--ldap-tls-level', action='store', default=None,
+ help='LDAP TLS level')
group.add_argument('--ldap-base-dn', action='store',
help='LDAP Base DN')
@@ -208,7 +210,10 @@ class Installer(LoginManagerInstaller):
config['server url'] = opts['ldap_server_url']
if 'ldap_bind_dn_template' in opts:
config['bind dn template'] = opts['ldap_bind_dn_template']
- config['tls'] = 'Demand'
+ if 'ldap_tls_level' in opts and opts['ldap_tls_level'] is not None:
+ config['tls'] = opts['ldap_tls_level']
+ else:
+ config['tls'] = 'Demand'
if 'ldap_base_dn' in opts and opts['ldap_base_dn'] is not None:
config['base dn'] = opts['ldap_base_dn']
po.save_plugin_config(config)