summaryrefslogtreecommitdiffstats
path: root/ipaserver/ipaldap.py
diff options
context:
space:
mode:
Diffstat (limited to 'ipaserver/ipaldap.py')
-rw-r--r--ipaserver/ipaldap.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/ipaserver/ipaldap.py b/ipaserver/ipaldap.py
index 9e1266bf..5fed6f3a 100644
--- a/ipaserver/ipaldap.py
+++ b/ipaserver/ipaldap.py
@@ -1561,7 +1561,8 @@ class IPAdmin(LDAPClient):
return 'ldap'
def __init__(self, host='', port=389, cacert=None, debug=None, ldapi=False,
- realm=None, protocol=None, force_schema_updates=True):
+ realm=None, protocol=None, force_schema_updates=True,
+ start_tls=False):
self.conn = None
log_mgr.get_logger(self, True)
if debug and debug.lower() == "on":
@@ -1582,6 +1583,9 @@ class IPAdmin(LDAPClient):
self.conn = IPASimpleLDAPObject(ldap_uri, force_schema_updates=True)
+ if start_tls:
+ self.conn.start_tls_s()
+
def __str__(self):
return self.host + ":" + str(self.port)
@@ -1724,10 +1728,6 @@ class IPAdmin(LDAPClient):
# FIXME: for backwards compatibility only
return self.conn.unbind(*args, **kwargs)
- def start_tls_s(self, *args, **kwargs):
- # FIXME: for backwards compatibility only
- return self.conn.start_tls_s(*args, **kwargs)
-
# FIXME: Some installer tools depend on ipaldap importing plugins.ldap2.
# The proper plugins should rather be imported explicitly.