summaryrefslogtreecommitdiffstats
path: root/ipapython
diff options
context:
space:
mode:
authorTomas Krizek <tkrizek@redhat.com>2016-10-06 08:51:10 +0200
committerMartin Basti <mbasti@redhat.com>2016-11-07 11:34:03 +0100
commit4f1a6a177666c475156f496d3f7719b37e66a7b0 (patch)
tree7701a20d5ce9a314107aa42dd90dcad0946be58a /ipapython
parent60e38ecc7ff6b983f4f3af0a66c08eb3a3fda22d (diff)
downloadfreeipa-4f1a6a177666c475156f496d3f7719b37e66a7b0.tar.gz
freeipa-4f1a6a177666c475156f496d3f7719b37e66a7b0.tar.xz
freeipa-4f1a6a177666c475156f496d3f7719b37e66a7b0.zip
ipaldap: merge gssapi_bind to LDAPClient
* Rename do_sasl_gssapi_bind to gssapi_bind https://fedorahosted.org/freeipa/ticket/6461 Reviewed-By: Martin Basti <mbasti@redhat.com> Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipapython')
-rw-r--r--ipapython/ipaldap.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/ipapython/ipaldap.py b/ipapython/ipaldap.py
index 4016a657d..a3e1b8776 100644
--- a/ipapython/ipaldap.py
+++ b/ipapython/ipaldap.py
@@ -1631,9 +1631,6 @@ class IPAdmin(LDAPClient):
def __str__(self):
return self.host + ":" + str(self.port)
- def do_sasl_gssapi_bind(self):
- self.gssapi_bind()
-
def do_bind(self, dm_password="", autobind=AUTOBIND_AUTO):
if dm_password:
self.simple_bind(bind_dn=DIRMAN_DN, bind_password=dm_password)
@@ -1650,7 +1647,7 @@ class IPAdmin(LDAPClient):
raise
#fall back
- self.do_sasl_gssapi_bind()
+ self.gssapi_bind()
def modify_s(self, dn, modlist):
# FIXME: for backwards compatibility only