IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-25 08:21:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add class variable to indicate whether SSL is required or not.

Browse Source 
Older python-ldap versions will crash if you call ldap.get_option()
on a value that has not been set.
This commit is contained in:
Rob Crittenden 2009-07-07 22:54:07 -04:00
parent f59cab1ccd
commit 45a40635bb
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ipaserver/plugins/ldap2.py
View File

@ -168,14 +168,14 @@ class ldap2(CrudBackend, Encoder):
self._host = api.env.ldap_host self._host = api.env.ldap_host
self._port = api.env.ldap_port self._port = api.env.ldap_port
self._schema = _schema self._schema = _schema
self._ssl = False
CrudBackend.__init__(self) CrudBackend.__init__(self)
def __del__(self): def __del__(self):
self.disconnect() self.disconnect()
def __str__(self): def __str__(self):
using_cacert = bool(_ldap.get_option(_ldap.OPT_X_TLS_CACERTFILE)) return _get_url(self._host, self._port, self._ssl)
return _get_url(self._host, self._port, using_cacert)
@encode_args(3, 4, 'bind_dn', 'bind_pw') @encode_args(3, 4, 'bind_dn', 'bind_pw')
def create_connection(self, host=None, port=None, ccache=None, def create_connection(self, host=None, port=None, ccache=None,
@ -208,8 +208,10 @@ class ldap2(CrudBackend, Encoder):
if tls_cacertfile is not None: if tls_cacertfile is not None:
_ldap.set_option(_ldap.OPT_X_TLS_CACERTFILE, tls_cacertfile) _ldap.set_option(_ldap.OPT_X_TLS_CACERTFILE, tls_cacertfile)
self._ssl = True
if tls_certfile is not None: if tls_certfile is not None:
_ldap.set_option(_ldap.OPT_X_TLS_CERTFILE, tls_certfile) _ldap.set_option(_ldap.OPT_X_TLS_CERTFILE, tls_certfile)
self._ssl = True
if tls_keyfile is not None: if tls_keyfile is not None:
_ldap.set_option(_ldap.OPT_X_TLS_KEYFILE, tls_keyfile) _ldap.set_option(_ldap.OPT_X_TLS_KEYFILE, tls_keyfile)