diff options
| author | Rob Austein <sra@hactrn.net> | 2007-11-19 08:07:00 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2007-11-19 08:07:00 +0000 |
| commit | 8ad3e4f7768ffb0defae8cdea241a4f4f27d8f37 (patch) | |
| tree | 096c7b47e49698e470356bb78bfc682543f22956 /scripts/rpki/sql.py | |
| parent | 91dc432c04482d32f887cfdc03a67ab09823e53a (diff) | |
Still more method cleanup, including access control the absence of
which had been lost in the SQL noise.
svn path=/scripts/README; revision=1324
Diffstat (limited to 'scripts/rpki/sql.py')
| -rw-r--r-- | scripts/rpki/sql.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/rpki/sql.py b/scripts/rpki/sql.py index e34673e8..055e4476 100644 --- a/scripts/rpki/sql.py +++ b/scripts/rpki/sql.py @@ -220,7 +220,7 @@ class ca_obj(sql_persistant): return ca_detail_obj.sql_fetch_where(gctx, "ca_id = %s" % self.ca_id) def fetch_active(self, gctx): - """Return the active ca_detail for this CA, if any.""" + """Fetch the active ca_detail for this CA, if any.""" return ca_detail_obj.sql_fetch_where1(gctx, "ca_id = %s AND state = 'active'" % self.ca_id) def construct_sia_uri(self, gctx, parent, rc): @@ -252,7 +252,7 @@ class ca_obj(sql_persistant): rc_resources = rc.to_resource_bag() cert_map = dict((c.cert.get_SKI(), c) for c in rc.certs) - for ca_detail in ca_detail_obj.sql_fetch_where(gctx, "ca_id = %s AND latest_ca_cert IS NOT NULL AND state != 'revoked'" % self.ca_id): + for ca_detail in ca_detail_obj.sql_fetch_where(gctx, "ca_id = %s AND latest_ca_cert IS NOT NULL" % self.ca_id): ski = ca_detail.latest_ca_cert.get_SKI() if ca_detail.state != "deprecated": current_resources = ca_detail.latest_ca_cert.get_3779resources() |