diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2013-01-29 12:01:36 -0500 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-03-01 16:59:46 +0100 |
| commit | 1ee66ffe03a0616c65215bc751a7ef6e674780ef (patch) | |
| tree | 8f9dc76aff6ef848dcc89b3a04b10d8dcdfb7ea2 /ipaserver/ipaldap.py | |
| parent | f9f6cd6e3a907f3bb205f5121727f4f94acfeaef (diff) | |
| download | freeipa.git-1ee66ffe03a0616c65215bc751a7ef6e674780ef.tar.gz freeipa.git-1ee66ffe03a0616c65215bc751a7ef6e674780ef.tar.xz freeipa.git-1ee66ffe03a0616c65215bc751a7ef6e674780ef.zip | |
Remove IPAdmin.sasl_interactive_bind_s
Also, rename remaining uses of SASL_AUTH to SASL_GSSAPI to better
reflect what it is.
Part of the work for: https://fedorahosted.org/freeipa/ticket/2660
Diffstat (limited to 'ipaserver/ipaldap.py')
| -rw-r--r-- | ipaserver/ipaldap.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/ipaserver/ipaldap.py b/ipaserver/ipaldap.py index 5fed6f3a..7010ee5e 100644 --- a/ipaserver/ipaldap.py +++ b/ipaserver/ipaldap.py @@ -41,7 +41,7 @@ from ipapython.ipa_log_manager import log_mgr from ipapython.dn import DN, RDN # Global variable to define SASL auth -SASL_AUTH = ldap.sasl.sasl({}, 'GSSAPI') +SASL_GSSAPI = ldap.sasl.sasl({}, 'GSSAPI') DEFAULT_TIMEOUT = 10 DN_SYNTAX_OID = '1.3.6.1.4.1.1466.115.121.1.12' @@ -1617,12 +1617,12 @@ class IPAdmin(LDAPClient): def do_sasl_gssapi_bind(self, timeout=DEFAULT_TIMEOUT): self.__bind_with_wait( - self.sasl_interactive_bind_s, timeout, None, SASL_AUTH) + self.conn.sasl_interactive_bind_s, timeout, None, SASL_GSSAPI) def do_external_bind(self, user_name=None, timeout=DEFAULT_TIMEOUT): auth_tokens = ldap.sasl.external(user_name) self.__bind_with_wait( - self.sasl_interactive_bind_s, timeout, None, auth_tokens) + self.conn.sasl_interactive_bind_s, timeout, None, auth_tokens) def updateEntry(self,dn,oldentry,newentry): # FIXME: for backwards compatibility only @@ -1712,10 +1712,6 @@ class IPAdmin(LDAPClient): # FIXME: for backwards compatibility only return self.conn.set_option(*args, **kwargs) - def sasl_interactive_bind_s(self, *args, **kwargs): - # FIXME: for backwards compatibility only - return self.conn.sasl_interactive_bind_s(*args, **kwargs) - def encode(self, *args, **kwargs): # FIXME: for backwards compatibility only return self.conn.encode(*args, **kwargs) |