diff options
| author | Rob Austein <sra@hactrn.net> | 2008-05-17 08:21:50 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2008-05-17 08:21:50 +0000 |
| commit | e7da2a679978ef03dfbe6590bdcfc7b35a0a445a (patch) | |
| tree | 2b7bff69f2fab278c17daae1d9fdd9bf9039e10b /rpkid/rpki/sql.py | |
| parent | 37c89ceee19d1d404e678a9b22e13f8bda6d09c6 (diff) | |
"as" will be a reserved word in Python 2.6, stop using it as an
identifier.
svn path=/rpkid/irdbd.py; revision=1798
Diffstat (limited to 'rpkid/rpki/sql.py')
| -rw-r--r-- | rpkid/rpki/sql.py | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/rpkid/rpki/sql.py b/rpkid/rpki/sql.py index 791bc7d8..35cdeb05 100644 --- a/rpkid/rpki/sql.py +++ b/rpkid/rpki/sql.py @@ -368,17 +368,10 @@ class ca_obj(sql_persistant): return self.last_crl_sn def rekey(self): - """Initiate a rekey operation for this ca. - - Tasks: - - - Generate a new keypair. - - - Request cert from parent using new keypair. - - - Mark result as our active ca_detail. - - - Reissue all child certs issued by this ca using the new ca_detail. + """Initiate a rekey operation for this ca. Generate a new + keypair. Request cert from parent using new keypair. Mark result + as our active ca_detail. Reissue all child certs issued by this + ca using the new ca_detail. """ rpki.log.trace() @@ -596,7 +589,7 @@ class ca_detail_obj(sql_persistant): """Generate a new manifest certificate for this ca_detail.""" resources = rpki.resource_set.resource_bag( - as = rpki.resource_set.resource_set_as("<inherit>"), + asn = rpki.resource_set.resource_set_as("<inherit>"), v4 = rpki.resource_set.resource_set_ipv4("<inherit>"), v6 = rpki.resource_set.resource_set_ipv6("<inherit>")) |