aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rpkid/rpki/irdb/models.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/rpkid/rpki/irdb/models.py b/rpkid/rpki/irdb/models.py
index c6a776d7..3aaebdcf 100644
--- a/rpkid/rpki/irdb/models.py
+++ b/rpkid/rpki/irdb/models.py
@@ -327,7 +327,10 @@ class ServerCA(CA):
@property
def subject_name(self):
- return rpki.x509.X501DN("%s BPKI server CA" % socket.gethostname())
+ if self.certificate is not None:
+ return self.certificate.getSubject()
+ else:
+ return rpki.x509.X501DN("%s BPKI server CA" % socket.gethostname())
class ResourceHolderCA(CA):
handle = HandleField(unique = True)
@@ -338,7 +341,10 @@ class ResourceHolderCA(CA):
@property
def subject_name(self):
- return rpki.x509.X501DN("%s BPKI resource CA" % self.handle)
+ if self.certificate is not None:
+ return self.certificate.getSubject()
+ else:
+ return rpki.x509.X501DN("%s BPKI resource CA" % self.handle)
class Certificate(django.db.models.Model):