Remove ancient restriction that rootd operator's handle must match the

handle field in rpki.conf.

svn path=/trunk/; revision=5721

1 files changed, 3 insertions, 1 deletions

diff --git a/rpkid/rpki/irdb/zookeeper.py b/rpkid/rpki/irdb/zookeeper.py
index 1c2d2d16..2bae0e8b 100644
--- a/rpkid/rpki/irdb/zookeeper.py
+++ b/rpkid/rpki/irdb/zookeeper.py
@@ -409,7 +409,7 @@ class Zookeeper(object):
 
     if self.run_rootd:
       try:
-        rootd = rpki.irdb.ResourceHolderCA.objects.get(handle = self.cfg.get("handle", section = myrpki_section)).rootd
+        rootd = rpki.irdb.ResourceHolderCA.objects.get(handle = self.handle).rootd
         writer(self.cfg.get("bpki-ta",         section = rootd_section), self.server_ca.certificate)
         writer(self.cfg.get("rootd-bpki-crl",  section = rootd_section), self.server_ca.latest_crl)
         writer(self.cfg.get("rootd-bpki-key",  section = rootd_section), rootd.private_key)
@@ -417,6 +417,8 @@ class Zookeeper(object):
         writer(self.cfg.get("child-bpki-cert", section = rootd_section), rootd.issuer.certificate)
       except rpki.irdb.ResourceHolderCA.DoesNotExist:
         self.log("rootd enabled but resource holding entity not yet configured, skipping rootd setup")
+      except rpki.irdb.Rootd.DoesNotExist:
+        self.log("rootd enabled but not yet configured, skipping rootd setup")
 
 
   @django.db.transaction.commit_on_success