3 files changed, 2 insertions, 10 deletions
diff --git a/ipaserver/plugins/dogtag.py b/ipaserver/plugins/dogtag.py
index 45c3c197..8563848b 100644
--- a/ipaserver/plugins/dogtag.py
+++ b/ipaserver/plugins/dogtag.py
@@ -1519,9 +1519,7 @@ class ra(rabase.rabase):
         """
         self.debug('%s.revoke_certificate()', self.fullname)
         if type(revocation_reason) is not int:
-            raise TYPE_ERROR('revocation_reason', int, revocation_reason,
-                type(revocation_reason)
-            )
+            raise TypeError(TYPE_ERROR % ('revocation_reason', int, revocation_reason, type(revocation_reason)))
 
         # Convert serial number to integral type from string to properly handle
         # radix issues. Note: the int object constructor will properly handle large
diff --git a/ipaserver/plugins/ldap2.py b/ipaserver/plugins/ldap2.py
index 86ea3f88..c920d21f 100644
--- a/ipaserver/plugins/ldap2.py
+++ b/ipaserver/plugins/ldap2.py
@@ -308,7 +308,7 @@ class ldap2(CrudBackend, Encoder):
             _ldap.set_option(_ldap.OPT_X_TLS_KEYFILE, tls_keyfile)
 
         if debug_level:
-            _ldap.set_option(_ldap.OPT_X_DEBUG_LEVEL, debug_level)
+            _ldap.set_option(_ldap.OPT_DEBUG_LEVEL, debug_level)
 
         try:
             conn = _ldap.initialize(self.ldap_uri)
diff --git a/ipaserver/plugins/ldapapi.py b/ipaserver/plugins/ldapapi.py
index 847e2d2b..1ef84579 100644
--- a/ipaserver/plugins/ldapapi.py
+++ b/ipaserver/plugins/ldapapi.py
@@ -25,7 +25,6 @@ This wraps the python-ldap bindings.
 """
 
 import ldap as _ldap
-import ldap.dn
 from ipalib import api
 from ipalib import errors
 from ipalib.crud import CrudBackend
@@ -443,9 +442,4 @@ class ldap(CrudBackend):
 
         return results
 
-    def get_effective_rights(self, dn, attrs=None):
-        binddn = self.find_entry_dn("krbprincipalname", self.conn.principal, "posixAccount")
-
-        return servercore.get_effective_rights(binddn, dn, attrs)
-
 api.register(ldap)