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: remove unneeded dnszone-show command call

Browse Source 
This command has no effect in that block of code, dnsrecord_show is
enough for detection if records exists.

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

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

30
ipalib/plugins/host.py
View File

@ -764,28 +764,22 @@ class host_del(LDAPDelete):
# Remove DNS entries
parts = fqdn.split('.')
domain = unicode('.'.join(parts[1:]))
# Get all forward resources for this host
try:
result = api.Command['dnszone_show'](domain)['result']
domain = result['idnsname'][0]
record = api.Command['dnsrecord_show'](
domain, parts[0])['result']
except errors.NotFound:
self.obj.handle_not_found(*keys)
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)
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: