diff options
| author | Tomas Babej <tbabej@redhat.com> | 2012-08-28 07:43:20 -0400 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2012-08-28 16:38:03 +0200 |
| commit | cb961066aa1244b38ce8c98c82287e41896b033a (patch) | |
| tree | f4a10c4c69f4d4228ceb0ab9d1df5fbfdd0ddad0 /ipalib | |
| parent | a5c8dcd996f5b3e39b9b1306453e2a8de4c3a8c0 (diff) | |
| download | freeipa-cb961066aa1244b38ce8c98c82287e41896b033a.tar.gz freeipa-cb961066aa1244b38ce8c98c82287e41896b033a.tar.xz freeipa-cb961066aa1244b38ce8c98c82287e41896b033a.zip | |
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
Diffstat (limited to 'ipalib')
| -rw-r--r-- | ipalib/plugins/host.py | 7 |
1 files changed, 6 insertions, 1 deletions
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 |