IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename CertDB method add_cert to import_cert.

Browse Source 
Part of https://fedorahosted.org/freeipa/ticket/3259
Part of https://fedorahosted.org/freeipa/ticket/3520

Reviewed-By: Rob Crittenden <rcritten@redhat.com>
This commit is contained in:
Jan Cholasta 2014-06-12 11:16:14 +02:00 committed by Petr Viktorin
parent 5f29a71bd7
commit feecdb4cdc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ipaserver/install/certs.py
View File

@ -594,7 +594,7 @@ class CertDB(object):
subject=DN(('CN', hostname), self.subject_base) subject=DN(('CN', hostname), self.subject_base)
self.request_cert(subject) self.request_cert(subject)
cdb.issue_server_cert(self.certreq_fname, self.certder_fname) 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") fd = open(self.certder_fname, "r")
dercert = fd.read() dercert = fd.read()
fd.close() fd.close()
@ -612,7 +612,7 @@ class CertDB(object):
subject=DN(('CN', hostname), self.subject_base) subject=DN(('CN', hostname), self.subject_base)
self.request_cert(subject) self.request_cert(subject)
cdb.issue_signing_cert(self.certreq_fname, self.certder_fname) 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.certreq_fname)
os.unlink(self.certder_fname) os.unlink(self.certder_fname)
@ -737,7 +737,7 @@ class CertDB(object):
f.write(cert) f.write(cert)
f.close() 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. Load a certificate from a PEM file and add minimal trust.
""" """