summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2013-01-25 04:33:45 -0500
committerMartin Kosek <mkosek@redhat.com>2013-03-01 16:59:46 +0100
commitd7bf70902b4285c40e33e426b9e16fbbbdbf8f8c (patch)
tree431b5e5e004851eb7707410592ee1bea8df60793
parentfdd416912427e02dfa5709788fa7db06d216226d (diff)
downloadfreeipa-d7bf70902b4285c40e33e426b9e16fbbbdbf8f8c.tar.gz
freeipa-d7bf70902b4285c40e33e426b9e16fbbbdbf8f8c.tar.xz
freeipa-d7bf70902b4285c40e33e426b9e16fbbbdbf8f8c.zip
Proxy LDAP methods explicitly rather than using __getattr__
Part of the work for: https://fedorahosted.org/freeipa/ticket/2660
-rw-r--r--ipaserver/ipaldap.py41
1 files changed, 38 insertions, 3 deletions
diff --git a/ipaserver/ipaldap.py b/ipaserver/ipaldap.py
index 3c272d838..1f943ff28 100644
--- a/ipaserver/ipaldap.py
+++ b/ipaserver/ipaldap.py
@@ -1696,10 +1696,45 @@ class IPAdmin(LDAPClient):
return modlist
- def __getattr__(self, attrname):
- # This makes IPAdmin classes look like IPASimpleLDAPObjects
+ def modify_s(self, *args, **kwargs):
# FIXME: for backwards compatibility only
- return getattr(self.conn, attrname)
+ return self.conn.modify_s(*args, **kwargs)
+
+ def unbind_s(self, *args, **kwargs):
+ # FIXME: for backwards compatibility only
+ return self.conn.unbind_s(*args, **kwargs)
+
+ def search_s(self, *args, **kwargs):
+ # FIXME: for backwards compatibility only
+ return self.conn.search_s(*args, **kwargs)
+
+ def set_option(self, *args, **kwargs):
+ # 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)
+
+ def simple_bind_s(self, *args, **kwargs):
+ # FIXME: for backwards compatibility only
+ return self.conn.simple_bind_s(*args, **kwargs)
+
+ def unbind(self, *args, **kwargs):
+ # FIXME: for backwards compatibility only
+ return self.conn.unbind(*args, **kwargs)
+
+ def start_tls_s(self, *args, **kwargs):
+ # FIXME: for backwards compatibility only
+ return self.conn.start_tls_s(*args, **kwargs)
+
+ def search_ext_s(self, *args, **kwargs):
+ # FIXME: for backwards compatibility only
+ return self.conn.search_ext_s(*args, **kwargs)
# FIXME: Some installer tools depend on ipaldap importing plugins.ldap2.