diff options
| author | Martin Basti <mbasti@redhat.com> | 2016-03-02 13:44:22 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-04-13 17:44:56 +0200 |
| commit | 40e3a0bf63c766fc281517c9d192907376c2d353 (patch) | |
| tree | dd30d158ebb95f415ca1eef4af0f4fcc62a9415e /ipalib | |
| parent | 280f1ed85f40a0d123fc891f9ad02a4fff4a363b (diff) | |
| download | freeipa-40e3a0bf63c766fc281517c9d192907376c2d353.tar.gz freeipa-40e3a0bf63c766fc281517c9d192907376c2d353.tar.xz freeipa-40e3a0bf63c766fc281517c9d192907376c2d353.zip | |
host_del: fix removal of host records
Originally only the first A/AAAA record is removed, and one other record. This commit fixes it
and all records are removed.
https://fedorahosted.org/freeipa/ticket/5675
Reviewed-By: Petr Spacek <pspacek@redhat.com>
Diffstat (limited to 'ipalib')
| -rw-r--r-- | ipalib/plugins/host.py | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/ipalib/plugins/host.py b/ipalib/plugins/host.py index 6ff751ca8..97c9e1588 100644 --- a/ipalib/plugins/host.py +++ b/ipalib/plugins/host.py @@ -35,7 +35,7 @@ from ipalib.plugins.service import (split_principal, validate_certificate, set_certificate_attrs, ticket_flags_params, update_krbticketflags, set_kerberos_attrs, rename_ipaallowedtoperform_from_ldap, rename_ipaallowedtoperform_to_ldap, revoke_certs) -from ipalib.plugins.dns import (dns_container_exists, _record_types, +from ipalib.plugins.dns import (dns_container_exists, _record_attributes, add_records_for_host_validation, add_records_for_host, get_reverse_zone) from ipalib import _, ngettext @@ -772,26 +772,15 @@ class host_del(LDAPDelete): # Get all forward resources for this host records = api.Command['dnsrecord_find'](domain, idnsname=parts[0])['result'] for record in records: - if 'arecord' in record: - remove_fwd_ptr(record['arecord'][0], parts[0], - domain, 'arecord') - if 'aaaarecord' in record: - remove_fwd_ptr(record['aaaarecord'][0], parts[0], - domain, 'aaaarecord') - else: - # Try to delete all other record types too - _attribute_types = [str('%srecord' % t.lower()) - for t in _record_types] - for attr in _attribute_types: - if attr not in ['arecord', 'aaaarecord'] and attr in record: - for val in record[attr]: - if (val.endswith(parts[0]) or - val.endswith(fqdn + '.')): - delkw = {unicode(attr): val} - api.Command['dnsrecord_del'](domain, - record['idnsname'][0], - **delkw) - break + for attr in _record_attributes: + for val in record.get(attr, []): + if attr in ('arecord', 'aaaarecord'): + remove_fwd_ptr(val, parts[0], domain, attr) + elif (val.endswith(parts[0]) or + val.endswith(fqdn + '.')): + delkw = {unicode(attr): val} + api.Command['dnsrecord_del']( + domain, record['idnsname'][0], **delkw) if self.api.Command.ca_is_enabled()['result']: try: |