diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2013-02-04 11:48:58 +0100 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-03-01 16:59:47 +0100 |
| commit | 5b2e0e2ba5808d6300de1cac743c96db0607121c (patch) | |
| tree | 3165cccfbd01e5d76e74ae4df612cf64675fc046 /ipalib/plugins/dns.py | |
| parent | a09c50671ecc53af63765afca13edd27ee598081 (diff) | |
| download | freeipa-5b2e0e2ba5808d6300de1cac743c96db0607121c.tar.gz freeipa-5b2e0e2ba5808d6300de1cac743c96db0607121c.tar.xz freeipa-5b2e0e2ba5808d6300de1cac743c96db0607121c.zip | |
Remove DN normalization from the baseldap plugin.
Diffstat (limited to 'ipalib/plugins/dns.py')
| -rw-r--r-- | ipalib/plugins/dns.py | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/ipalib/plugins/dns.py b/ipalib/plugins/dns.py index e0a5a151..a23d1b82 100644 --- a/ipalib/plugins/dns.py +++ b/ipalib/plugins/dns.py @@ -2431,9 +2431,7 @@ class dnsrecord_add(LDAPCreate): # We always want to retrieve all DNS record attributes to test for # record type collisions (#2601) try: - (dn_, old_entry) = ldap.get_entry( - dn, _record_attributes, - normalize=self.obj.normalize_dn) + (dn_, old_entry) = ldap.get_entry(dn, _record_attributes) except errors.NotFound: pass else: @@ -2527,8 +2525,7 @@ class dnsrecord_mod(LDAPUpdate): # current entry is needed in case of per-dns-record-part updates and # for record type collision check try: - (dn_, old_entry) = ldap.get_entry(dn, _record_attributes, - normalize=self.obj.normalize_dn) + (dn_, old_entry) = ldap.get_entry(dn, _record_attributes) except errors.NotFound: self.obj.handle_not_found(*keys) @@ -2563,9 +2560,7 @@ class dnsrecord_mod(LDAPUpdate): keys = keys[:-1] + (rename,) dn = self.obj.get_dn(*keys, **options) ldap = self.obj.backend - (dn_, old_entry) = ldap.get_entry( - dn, _record_attributes, - normalize=self.obj.normalize_dn) + (dn_, old_entry) = ldap.get_entry(dn, _record_attributes) del_all = True for attr in old_entry.keys(): @@ -2680,9 +2675,7 @@ class dnsrecord_del(LDAPUpdate): def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options): assert isinstance(dn, DN) try: - (dn_, old_entry) = ldap.get_entry( - dn, _record_attributes, - normalize=self.obj.normalize_dn) + (dn_, old_entry) = ldap.get_entry(dn, _record_attributes) except errors.NotFound: self.obj.handle_not_found(*keys) @@ -2957,8 +2950,7 @@ class dnsconfig(LDAPObject): return DN(api.env.container_dns, api.env.basedn) def get_dnsconfig(self, ldap): - (dn, entry) = ldap.get_entry(self.get_dn(), None, - normalize=self.normalize_dn) + (dn, entry) = ldap.get_entry(self.get_dn(), None) return entry |