diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2013-01-30 09:51:08 -0500 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-03-01 16:59:46 +0100 |
| commit | 982b78277755a301e3baa1d4f2bd7e1663fb88a5 (patch) | |
| tree | 1fc9a5c53663f98dd62ec759cc9d16a76ce2fd2b /ipaserver/install/krbinstance.py | |
| parent | 29a02a3530214d2e72667e98c5ecc25ebf5fad48 (diff) | |
| download | freeipa-982b78277755a301e3baa1d4f2bd7e1663fb88a5.tar.gz freeipa-982b78277755a301e3baa1d4f2bd7e1663fb88a5.tar.xz freeipa-982b78277755a301e3baa1d4f2bd7e1663fb88a5.zip | |
Remove some uses of raw python-ldap
Part of the work for: https://fedorahosted.org/freeipa/ticket/2660
Diffstat (limited to 'ipaserver/install/krbinstance.py')
| -rw-r--r-- | ipaserver/install/krbinstance.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ipaserver/install/krbinstance.py b/ipaserver/install/krbinstance.py index 4d91dd6ff..51c542734 100644 --- a/ipaserver/install/krbinstance.py +++ b/ipaserver/install/krbinstance.py @@ -37,8 +37,6 @@ from ipapython.dn import DN from ipaserver.install import replication from ipaserver.install import dsinstance -import ldap - import pyasn1.codec.ber.decoder import struct @@ -260,7 +258,7 @@ class KrbInstance(service.Service): try: res = self.admin_conn.get_entries( DN(('cn', 'mapping'), ('cn', 'sasl'), ('cn', 'config')), - ldap.SCOPE_ONELEVEL, + self.admin_conn.SCOPE_ONELEVEL, "(objectclass=nsSaslMapping)") for r in res: try: @@ -360,8 +358,8 @@ class KrbInstance(service.Service): def __write_stash_from_ds(self): try: - entries = self.admin_conn.get_entries(self.get_realm_suffix(), - ldap.SCOPE_SUBTREE) + entries = self.admin_conn.get_entries( + self.get_realm_suffix(), self.admin_conn.SCOPE_SUBTREE) # TODO: Ensure we got only one entry entry = entries[0] except errors.NotFound, e: |