From 004393bdc2f3df5d85da88819bf47d72a883f7bb Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Mon, 21 Mar 2016 02:39:08 +0000 Subject: Rework rpkic setuid handling to something a bit more robust. svn path=/branches/tk705/; revision=6322 --- rpki/irdb/zookeeper.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'rpki/irdb/zookeeper.py') diff --git a/rpki/irdb/zookeeper.py b/rpki/irdb/zookeeper.py index e7d9965c..9d40263c 100644 --- a/rpki/irdb/zookeeper.py +++ b/rpki/irdb/zookeeper.py @@ -382,15 +382,10 @@ class Zookeeper(object): configure_rootd() because that's easier for the GUI. """ - try: - self.resource_ca.repositories.get(handle = self.handle) - return None - - except rpki.irdb.models.Repository.DoesNotExist: - e = Element(tag_oob_publisher_request, nsmap = oob_nsmap, version = oob_version, - publisher_handle = self.handle) - B64Element(e, tag_oob_publisher_bpki_ta, self.resource_ca.certificate) - return etree_wrapper(e, msg = 'This is the "repository offer" file for you to use if you want to publish in your own repository') + e = Element(tag_oob_publisher_request, nsmap = oob_nsmap, version = oob_version, + publisher_handle = self.handle) + B64Element(e, tag_oob_publisher_bpki_ta, self.resource_ca.certificate) + return etree_wrapper(e, msg = 'This is the "repository offer" file for you to use if you want to publish in your own repository') def write_bpki_files(self): -- cgit v1.2.3