diff options
| author | Rob Austein <sra@hactrn.net> | 2014-02-25 20:46:05 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2014-02-25 20:46:05 +0000 |
| commit | de95fb9525bf5f1ced2fb90924b31b78494e1e87 (patch) | |
| tree | 7c529a242b334e38a0d78761a0dfad12c452bfcf /rpkid/rpki/old_irdbd.py | |
| parent | bf0b63854ec52df692a503eb78e270363f31ebfd (diff) | |
Something broke MySQLdb on my laptop during a recent upgrade, and I
have better things to do than shaving that particular yak today. So
I'm committing untested changes (to a development branch that nobody
but me is using) so I can test them on a working development platform.
svn path=/branches/tk671/; revision=5682
Diffstat (limited to 'rpkid/rpki/old_irdbd.py')
| -rw-r--r-- | rpkid/rpki/old_irdbd.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/rpkid/rpki/old_irdbd.py b/rpkid/rpki/old_irdbd.py index 25ceb656..41060344 100644 --- a/rpkid/rpki/old_irdbd.py +++ b/rpkid/rpki/old_irdbd.py @@ -170,13 +170,13 @@ class main(object): self.cur.execute( """ - SELECT ee_certificate_id, pkcs10, gski, router_id, valid_until + SELECT ee_certificate_id, pkcs10, gski, cn, sn, eku, valid_until FROM ee_certificate WHERE self_handle = %s """, (q_pdu.self_handle,)) - for ee_certificate_id, pkcs10, gski, router_id, valid_until in self.cur.fetchall(): + for ee_certificate_id, pkcs10, gski, cn, sn, eku, valid_until in self.cur.fetchall(): r_pdu = rpki.left_right.list_ee_certificate_requests_elt() r_pdu.tag = q_pdu.tag @@ -184,7 +184,9 @@ class main(object): r_pdu.valid_until = valid_until.strftime("%Y-%m-%dT%H:%M:%SZ") r_pdu.pkcs10 = rpki.x509.PKCS10(DER = pkcs10) r_pdu.gski = gski - r_pdu.router_id = router_id + r_pdu.cn = cn + r_pdu.sn = sn + r_pdu.eku = eku r_pdu.asn = rpki.resource_set.resource_set_as.from_sql( self.cur, |