IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-24 16:10:02 -06:00
Code Issues Packages Projects Releases Wiki Activity

host_del: replace dns-record find command with show

Browse Source 
Due the configuration of dnsrecord_find, it works as dnsrecord-show,
thus it can be replaced.

https://fedorahosted.org/freeipa/ticket/5675

Reviewed-By: Petr Spacek <pspacek@redhat.com>
This commit is contained in:
Martin Basti 2016-03-02 15:53:27 +01:00
parent 40e3a0bf63
commit 9a0f92be0d
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ipalib/plugins/host.py
View File

@ -769,18 +769,23 @@ class host_del(LDAPDelete):
domain = result['idnsname'][0]
except errors.NotFound:
self.obj.handle_not_found(*keys)
# Get all forward resources for this host
records = api.Command['dnsrecord_find'](domain, idnsname=parts[0])['result']
for record in records:
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)
else:
# Get all forward resources for this host
try:
record = api.Command['dnsrecord_show'](
domain, parts[0])['result']
except errors.NotFound:
pass
else:
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: