summaryrefslogtreecommitdiffstats
path: root/ipaserver
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2013-01-23 04:45:13 -0500
committerMartin Kosek <mkosek@redhat.com>2013-03-01 16:59:45 +0100
commitaaa41b21457ed1ea593845ac05f1e72cfe83ab7f (patch)
treef550f01228e15b64c214cc4a26d899346ba56188 /ipaserver
parenta173957865ecbbf85260ecee99a3c86f7b9fde0c (diff)
downloadfreeipa-aaa41b21457ed1ea593845ac05f1e72cfe83ab7f.tar.gz
freeipa-aaa41b21457ed1ea593845ac05f1e72cfe83ab7f.tar.xz
freeipa-aaa41b21457ed1ea593845ac05f1e72cfe83ab7f.zip
Rename LDAPConnection to LDAPClient
It does more than just connecting, so it should have more suitable name. Part of the work for: https://fedorahosted.org/freeipa/ticket/2660
Diffstat (limited to 'ipaserver')
-rw-r--r--ipaserver/ipaldap.py8
-rw-r--r--ipaserver/plugins/ldap2.py6
2 files changed, 7 insertions, 7 deletions
diff --git a/ipaserver/ipaldap.py b/ipaserver/ipaldap.py
index 052058088..c5ae6eee7 100644
--- a/ipaserver/ipaldap.py
+++ b/ipaserver/ipaldap.py
@@ -740,7 +740,7 @@ class LDAPEntry(dict):
return result
-class LDAPConnection(object):
+class LDAPClient(object):
"""LDAP backend class
This class abstracts a LDAP connection, providing methods that work with
@@ -887,7 +887,7 @@ class LDAPConnection(object):
return obj and obj.single_value
def normalize_dn(self, dn):
- """Override to normalize all DNs passed to LDAPConnection methods"""
+ """Override to normalize all DNs passed to LDAPClient methods"""
assert isinstance(dn, DN)
return dn
@@ -1528,7 +1528,7 @@ class LDAPConnection(object):
self.conn.delete_s(dn)
-class IPAdmin(LDAPConnection):
+class IPAdmin(LDAPClient):
def __get_ldap_uri(self, protocol):
if protocol == 'ldaps':
@@ -1579,7 +1579,7 @@ class IPAdmin(LDAPConnection):
ldap_uri = self.__get_ldap_uri(protocol or self.__guess_protocol())
- LDAPConnection.__init__(self, ldap_uri)
+ LDAPClient.__init__(self, ldap_uri)
self.conn = IPASimpleLDAPObject(ldap_uri, force_schema_updates=True)
diff --git a/ipaserver/plugins/ldap2.py b/ipaserver/plugins/ldap2.py
index 85e4787d0..c095dc62e 100644
--- a/ipaserver/plugins/ldap2.py
+++ b/ipaserver/plugins/ldap2.py
@@ -36,7 +36,7 @@ import krbV
import ldap as _ldap
from ipapython.dn import DN
-from ipaserver.ipaldap import SASL_AUTH, IPASimpleLDAPObject, LDAPConnection
+from ipaserver.ipaldap import SASL_AUTH, IPASimpleLDAPObject, LDAPClient
try:
@@ -58,7 +58,7 @@ from ipalib.crud import CrudBackend
from ipalib.request import context
-class ldap2(LDAPConnection, CrudBackend):
+class ldap2(LDAPClient, CrudBackend):
"""
LDAP Backend Take 2.
"""
@@ -71,7 +71,7 @@ class ldap2(LDAPConnection, CrudBackend):
ldap_uri = 'ldap://example.com'
CrudBackend.__init__(self, shared_instance=shared_instance)
- LDAPConnection.__init__(self, ldap_uri)
+ LDAPClient.__init__(self, ldap_uri)
try:
if base_dn is not None: