diff options
author | Jason Gerard DeRose <jderose@redhat.com> | 2009-01-28 16:12:49 -0700 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2009-02-03 15:29:04 -0500 |
commit | a0aebd46a11d7cf9563489520ae4a540e2a63827 (patch) | |
tree | 07d5056b9281ea770e89329eb1612155538db978 /ipaserver/plugins | |
parent | 231f0bd65aec9cc0767bd6a76d5aa5b27dd37168 (diff) | |
download | freeipa-a0aebd46a11d7cf9563489520ae4a540e2a63827.tar.gz freeipa-a0aebd46a11d7cf9563489520ae4a540e2a63827.tar.xz freeipa-a0aebd46a11d7cf9563489520ae4a540e2a63827.zip |
Got new ldap connection working using Connectible.connect()
Diffstat (limited to 'ipaserver/plugins')
-rw-r--r-- | ipaserver/plugins/b_ldap.py | 15 | ||||
-rw-r--r-- | ipaserver/plugins/b_ra.py | 2 |
2 files changed, 11 insertions, 6 deletions
diff --git a/ipaserver/plugins/b_ldap.py b/ipaserver/plugins/b_ldap.py index 350870392..1160bf9e7 100644 --- a/ipaserver/plugins/b_ldap.py +++ b/ipaserver/plugins/b_ldap.py @@ -28,8 +28,8 @@ import ldap as _ldap from ipalib import api from ipalib import errors from ipalib.crud import CrudBackend -from ipaserver import servercore -from ipaserver import ipaldap +from ipaserver import servercore, ipaldap +import krbV class ldap(CrudBackend): @@ -41,11 +41,16 @@ class ldap(CrudBackend): self.dn = _ldap.dn super(ldap, self).__init__() - def create_connection(self, ccache=None): - return 'The LDAP connection.' + def create_connection(self, ccache): + conn = ipaldap.IPAdmin(self.env.ldap_host, self.env.ldap_port) + principle = krbV.CCache( + name=ccache, context=krbV.default_context() + ).principal().name + conn.set_krbccache(ccache, principle) + return conn def destroy_connection(self): - pass + self.conn.unbind_s() def make_user_dn(self, uid): """ diff --git a/ipaserver/plugins/b_ra.py b/ipaserver/plugins/b_ra.py index e6a9b63f4..f0363bf15 100644 --- a/ipaserver/plugins/b_ra.py +++ b/ipaserver/plugins/b_ra.py @@ -338,7 +338,7 @@ class ra(Backend): def __get_ca_chain(self): headers = {"Content-type": "application/x-www-form-urlencoded"} - conn = httplib.HTTPConnection(self.ca_host+":"+self.ca_port) + conn = httplib.HTTPConnection(self.ca_host, self.ca_port) conn.request("POST", "/ca/ee/ca/getCertChain", None, headers) response = conn.getresponse() api.log.debug("IPA-RA: response.status: %d response.reason: '%s'" % (response.status, response.reason)) |