diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2013-02-04 09:47:00 +0100 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-03-01 16:59:47 +0100 |
| commit | a09c50671ecc53af63765afca13edd27ee598081 (patch) | |
| tree | 07f8c21e0be27b92dfe73ab505ea5bae63fd39cc /ipaserver | |
| parent | 3aa39547df18bc77ba49720f8a3a1a0052907859 (diff) | |
| download | freeipa-a09c50671ecc53af63765afca13edd27ee598081.tar.gz freeipa-a09c50671ecc53af63765afca13edd27ee598081.tar.xz freeipa-a09c50671ecc53af63765afca13edd27ee598081.zip | |
Use full DNs in plugin code.
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/plugins/ldap2.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ipaserver/plugins/ldap2.py b/ipaserver/plugins/ldap2.py index 9483611bd..93d546500 100644 --- a/ipaserver/plugins/ldap2.py +++ b/ipaserver/plugins/ldap2.py @@ -199,10 +199,8 @@ class ldap2(LDAPClient, CrudBackend): def get_ipa_config(self, attrs_list=None): """Returns the IPA configuration entry (dn, entry_attrs).""" - odn = api.Object.config.get_dn() - assert isinstance(odn, DN) - assert isinstance(api.env.basedn, DN) - cdn = DN(odn, api.env.basedn) + dn = api.Object.config.get_dn() + assert isinstance(dn, DN) try: config_entry = getattr(context, 'config_entry') @@ -213,14 +211,14 @@ class ldap2(LDAPClient, CrudBackend): pass try: (entry, truncated) = self.find_entries( - None, attrs_list, base_dn=cdn, scope=self.SCOPE_BASE, + None, attrs_list, base_dn=dn, scope=self.SCOPE_BASE, time_limit=2, size_limit=10 ) if truncated: raise errors.LimitsExceeded() config_entry = entry[0] except errors.NotFound: - config_entry = self.make_entry(cdn) + config_entry = self.make_entry(dn) for a in self.config_defaults: if a not in config_entry: config_entry[a] = self.config_defaults[a] |