summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Plugins/Ldap.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Ldap.py')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Ldap.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Ldap.py b/src/lib/Bcfg2/Server/Plugins/Ldap.py
index 0b66f7777..a51f47dae 100644
--- a/src/lib/Bcfg2/Server/Plugins/Ldap.py
+++ b/src/lib/Bcfg2/Server/Plugins/Ldap.py
@@ -169,8 +169,8 @@ class Ldap(Bcfg2.Server.Plugin.Plugin,
class LdapConnection(Debuggable):
""" Connection to an LDAP server. """
- def __init__(self, host="localhost", port=389, uri=None, binddn=None,
- bindpw=None):
+ def __init__(self, host="localhost", port=389, uri=None, options=None,
+ binddn=None, bindpw=None):
Debuggable.__init__(self)
if HAS_LDAP:
@@ -181,6 +181,7 @@ class LdapConnection(Debuggable):
self.host = host
self.port = port
self.uri = uri
+ self.options = options
self.binddn = binddn
self.bindpw = bindpw
self.conn = None
@@ -207,6 +208,10 @@ class LdapConnection(Debuggable):
self.disconnect()
self.conn = ldap.initialize(self.get_uri())
+ if self.options is not None:
+ for (option, value) in self.options.items():
+ self.conn.set_option(option, value)
+
if self.binddn is not None and self.bindpw is not None:
self.conn.simple_bind_s(self.binddn, self.bindpw)