diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2014-06-12 11:16:14 +0200 |
|---|---|---|
| committer | Petr Viktorin <pviktori@redhat.com> | 2014-07-30 16:04:21 +0200 |
| commit | feecdb4cdcc237af02d2469b6c7d66e40320394c (patch) | |
| tree | 26cd0aaa387424c4759db856f037831d0892f9ff /ipaserver | |
| parent | 5f29a71bd752e2504ae4c653315ff6f436d0aac2 (diff) | |
| download | freeipa-feecdb4cdcc237af02d2469b6c7d66e40320394c.tar.gz freeipa-feecdb4cdcc237af02d2469b6c7d66e40320394c.tar.xz freeipa-feecdb4cdcc237af02d2469b6c7d66e40320394c.zip | |
Rename CertDB method add_cert to import_cert.
Part of https://fedorahosted.org/freeipa/ticket/3259
Part of https://fedorahosted.org/freeipa/ticket/3520
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/install/certs.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ipaserver/install/certs.py b/ipaserver/install/certs.py index d28f7a3c8..3779551fb 100644 --- a/ipaserver/install/certs.py +++ b/ipaserver/install/certs.py @@ -594,7 +594,7 @@ class CertDB(object): subject=DN(('CN', hostname), self.subject_base) self.request_cert(subject) cdb.issue_server_cert(self.certreq_fname, self.certder_fname) - self.add_cert(self.certder_fname, nickname) + self.import_cert(self.certder_fname, nickname) fd = open(self.certder_fname, "r") dercert = fd.read() fd.close() @@ -612,7 +612,7 @@ class CertDB(object): subject=DN(('CN', hostname), self.subject_base) self.request_cert(subject) cdb.issue_signing_cert(self.certreq_fname, self.certder_fname) - self.add_cert(self.certder_fname, nickname) + self.import_cert(self.certder_fname, nickname) os.unlink(self.certreq_fname) os.unlink(self.certder_fname) @@ -737,7 +737,7 @@ class CertDB(object): f.write(cert) f.close() - def add_cert(self, cert_fname, nickname): + def import_cert(self, cert_fname, nickname): """ Load a certificate from a PEM file and add minimal trust. """ |