From dbb7b91bf052bc4d5a4f545044e8949b67b511db Mon Sep 17 00:00:00 2001 From: Petr Spacek Date: Sun, 20 Dec 2015 19:35:55 +0100 Subject: [PATCH] DNSSEC: ipa-dnskeysyncd: call ods-signer ldap-cleanup on zone removal Command "ldap-cleanup " is called to remove all key metadata from LDAP. This command is now called when disabling DNSSEC on a DNS zone. The stale metadata were causing problems when re-enabling DNSSEC on the same zone. https://fedorahosted.org/freeipa/ticket/5348 Reviewed-By: Martin Basti Reviewed-By: Martin Basti --- ipapython/dnssec/odsmgr.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ipapython/dnssec/odsmgr.py b/ipapython/dnssec/odsmgr.py index efbe16cc6ebf050d9cf347ed97b2b2e4b37c8a6e..44d94ac3ab9e68feba067e8f14530894bda22855 100644 --- a/ipapython/dnssec/odsmgr.py +++ b/ipapython/dnssec/odsmgr.py @@ -152,12 +152,18 @@ class ODSMgr(object): output = self.ksmutil(cmd) self.log.info(output) self.notify_enforcer() + self.cleanup_signer(name) def notify_enforcer(self): cmd = ['notify'] output = self.ksmutil(cmd) self.log.info(output) + def cleanup_signer(self, zone_name): + cmd = ['ods-signer', 'ldap-cleanup', str(zone_name)] + output = ipautil.run(cmd, capture_output=True) + self.log.info(output) + def ldap_event(self, op, uuid, attrs): """Record single LDAP event - zone addition or deletion. -- 2.4.3