From db882ae8d6eba768e08be9317e386f8ab3c8fcf7 Mon Sep 17 00:00:00 2001 From: Martin Babinsky Date: Wed, 8 Jun 2016 18:22:57 +0200 Subject: delegate removal of master DNS record and replica keys to separate functions https://fedorahosted.org/freeipa/ticket/5588 Reviewed-By: Martin Basti --- ipaserver/install/bindinstance.py | 6 ++++++ ipaserver/install/dnskeysyncinstance.py | 6 ++++++ 2 files changed, 12 insertions(+) (limited to 'ipaserver') diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py index 188f3dc0e..08c32f483 100644 --- a/ipaserver/install/bindinstance.py +++ b/ipaserver/install/bindinstance.py @@ -538,6 +538,12 @@ def check_forwarders(dns_forwarders, logger): return forwarders_dnssec_valid +def remove_master_dns_records(hostname, realm): + bind = BindInstance() + bind.remove_master_dns_records(hostname, realm, realm.lower()) + bind.remove_server_ns_records(hostname) + + class DnsBackup(object): def __init__(self, service): self.service = service diff --git a/ipaserver/install/dnskeysyncinstance.py b/ipaserver/install/dnskeysyncinstance.py index 4888d83f8..fadaf216e 100644 --- a/ipaserver/install/dnskeysyncinstance.py +++ b/ipaserver/install/dnskeysyncinstance.py @@ -56,6 +56,12 @@ def dnssec_container_exists(fqdn, suffix, dm_password=None, ldapi=False, return ret + +def remove_replica_public_keys(hostname): + keysyncd = DNSKeySyncInstance() + keysyncd.remove_replica_public_keys(hostname) + + class DNSKeySyncInstance(service.Service): def __init__(self, fstore=None, dm_password=None, logger=root_logger, ldapi=False, start_tls=False): -- cgit