From f0a36343a1c30c94f0cfcb4e0ac7729df1b377bd Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Wed, 2 Apr 2008 02:37:14 +0000 Subject: Start cleaning up messy global context stuff svn path=/rpkid/rootd.py; revision=1571 --- rpkid/rootd.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'rpkid/rootd.py') diff --git a/rpkid/rootd.py b/rpkid/rootd.py index feae6e91..8f113938 100755 --- a/rpkid/rootd.py +++ b/rpkid/rootd.py @@ -66,12 +66,12 @@ def compose_response(r_msg): rc.certs[0].cert = rpki_subject class list_pdu(rpki.up_down.list_pdu): - def serve_pdu(self, xxx1, q_msg, r_msg, xxx2): + def serve_pdu(self, q_msg, r_msg, ignored): r_msg.payload = rpki.up_down.list_response_pdu() compose_response(r_msg) class issue_pdu(rpki.up_down.issue_pdu): - def serve_pdu(self, xxx1, q_msg, r_msg, xxx2): + def serve_pdu(self, q_msg, r_msg, ignored): stash_subject_pkcs10(self.pkcs10) self.pkcs10.check_valid_rpki() r_msg.payload = rpki.up_down.issue_response_pdu() @@ -104,7 +104,7 @@ class issue_pdu(rpki.up_down.issue_pdu): compose_response(r_msg) class revoke_pdu(rpki.up_down.revoke_pdu): - def serve_pdu(self, xxx1, q_msg, r_msg, xxx2): + def serve_pdu(self, q_msg, r_msg, ignored): rpki_subject = get_subject_cert() if rpki_subject is None or rpki_subject.gSKI() != self.ski: raise rpki.exceptions.NotInDatabase @@ -137,7 +137,7 @@ def up_down_handler(query, path): rpki.log.error(traceback.format_exc()) return 400, "Could not process PDU: %s" % data try: - r_msg = q_msg.serve_top_level(None, None) + r_msg = q_msg.serve_top_level(None) r_elt = r_msg.toXML() try: rpki.relaxng.up_down.assertValid(r_elt) -- cgit v1.2.3