From cb961066aa1244b38ce8c98c82287e41896b033a Mon Sep 17 00:00:00 2001 From: Tomas Babej Date: Tue, 28 Aug 2012 07:43:20 -0400 Subject: [PATCH] Improves deletion of PTR records in ipa host-del Command ipa host-del with --updatedns now can deal both with hosts which zones are in FQDN form with or without a trailing dot. https://fedorahosted.org/freeipa/ticket/2809 --- ipalib/plugins/host.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ipalib/plugins/host.py b/ipalib/plugins/host.py index 319bdf720..8f6b5262b 100644 --- a/ipalib/plugins/host.py +++ b/ipalib/plugins/host.py @@ -108,7 +108,12 @@ def remove_fwd_ptr(ipaddr, host, domain, recordtype): api.log.debug('deleting ipaddr %s' % ipaddr) try: revzone, revname = get_reverse_zone(ipaddr) - delkw = { 'ptrrecord' : "%s.%s." % (host, domain) } + + # in case domain is in FQDN form with a trailing dot, we needn't add + # another one, in case it has no trailing dot, dnsrecord-del will + # normalize the entry + delkw = { 'ptrrecord' : "%s.%s" % (host, domain) } + api.Command['dnsrecord_del'](revzone, revname, **delkw) except errors.NotFound: pass