diff options
author | Jan Cholasta <jcholast@redhat.com> | 2014-04-08 13:12:47 +0200 |
---|---|---|
committer | Martin Kosek <mkosek@redhat.com> | 2014-04-08 14:04:40 +0200 |
commit | 915cd6942c0acb00688ba7a8b0d2519be9a47fb3 (patch) | |
tree | 0f6718a172da68dda2f4343151afede6623f7b82 | |
parent | 0e659983a6454370021a748d7534cad9febd6cc1 (diff) | |
download | freeipa-915cd6942c0acb00688ba7a8b0d2519be9a47fb3.tar.gz freeipa-915cd6942c0acb00688ba7a8b0d2519be9a47fb3.tar.xz freeipa-915cd6942c0acb00688ba7a8b0d2519be9a47fb3.zip |
Fix upload of CA certificate to LDAP in CA-less install.
https://fedorahosted.org/freeipa/ticket/4300
Reviewed-By: Martin Kosek <mkosek@redhat.com>
-rw-r--r-- | ipaserver/install/dsinstance.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index be8c5c4ba..9256c1244 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -233,6 +233,7 @@ class DsInstance(service.Service): self.domain = domain_name self.serverid = None self.pkcs12_info = None + self.cacert_name = None self.ca_is_configured = True self.dercert = None self.idstart = None @@ -642,6 +643,8 @@ class DsInstance(service.Service): nickname, self.fqdn, cadb) dsdb.create_pin_file() + self.cacert_name = dsdb.cacert_name + if self.ca_is_configured: dsdb.track_server_cert( nickname, self.principal, dsdb.passwd_fname, @@ -685,7 +688,7 @@ class DsInstance(service.Service): certdb = certs.CertDB(self.realm, nssdir=dirname, subject_base=self.subject_base) - dercert = certdb.get_cert_from_db(certdb.cacert_name, pem=False) + dercert = certdb.get_cert_from_db(self.cacert_name, pem=False) conn = ipaldap.IPAdmin(self.fqdn) conn.do_simple_bind(DN(('cn', 'directory manager')), self.dm_password) |