diff options
Diffstat (limited to 'ipaserver/install/dsinstance.py')
| -rw-r--r-- | ipaserver/install/dsinstance.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index af7d6fae6..a7e5e0787 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -672,22 +672,17 @@ class DsInstance(service.Service): dsdb = certs.NSSDatabase(nssdir=dirname) dsdb.export_pem_cert(nickname, location) - def upload_ca_cert(self, cacert_name=None): + def upload_ca_cert(self): """ Upload the CA certificate from the NSS database to the LDAP directory. """ dirname = config_dirname(self.serverid) - certdb = certs.CertDB(self.realm, nssdir=dirname, subject_base=self.subject_base) + certdb = certs.CertDB(self.realm, nssdir=dirname, + subject_base=self.subject_base) - if cacert_name is None: - cacert_name = certdb.cacert_name - dercert = certdb.get_cert_from_db(cacert_name, pem=False) - self.upload_ca_dercert(dercert) + dercert = certdb.get_cert_from_db(certdb.cacert_name, pem=False) - def upload_ca_dercert(self, dercert): - """Upload the CA DER certificate to the LDAP directory - """ conn = ipaldap.IPAdmin(self.fqdn) conn.do_simple_bind(DN(('cn', 'directory manager')), self.dm_password) |