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

replica install: respect --pkinit-cert-file

Browse Source 
When --pkinit-cert-file is used, make sure the certificate and key is
actually passed to `KrbInstance`.

https://pagure.io/freeipa/issue/6831

Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
This commit is contained in:
Jan Cholasta 2017-05-11 07:40:40 +00:00 committed by Martin Basti
parent 3b5dbf7cdb
commit b3855704f4
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ipaserver/install/server/replicainstall.py
View File

@ -113,10 +113,11 @@ def install_replica_ds(config, options, ca_is_configured, remote_api,
return ds return ds
def install_krb(config, setup_pkinit=False, promote=False): def install_krb(config, setup_pkinit=False, pkcs12_info=None, promote=False):
krb = krbinstance.KrbInstance() krb = krbinstance.KrbInstance()
# pkinit files # pkinit files
if pkcs12_info is None:
pkcs12_info = make_pkcs12_info(config.dir, "pkinitcert.p12", pkcs12_info = make_pkcs12_info(config.dir, "pkinitcert.p12",
"pkinit_pin.txt") "pkinit_pin.txt")
@ -1350,6 +1351,7 @@ def install(installer):
cafile = installer._ca_file cafile = installer._ca_file
dirsrv_pkcs12_info = installer._dirsrv_pkcs12_info dirsrv_pkcs12_info = installer._dirsrv_pkcs12_info
http_pkcs12_info = installer._http_pkcs12_info http_pkcs12_info = installer._http_pkcs12_info
pkinit_pkcs12_info = installer._pkinit_pkcs12_info
remote_api = installer._remote_api remote_api = installer._remote_api
conn = remote_api.Backend.ldap2 conn = remote_api.Backend.ldap2
@ -1430,6 +1432,7 @@ def install(installer):
krb = install_krb( krb = install_krb(
config, config,
setup_pkinit=not options.no_pkinit, setup_pkinit=not options.no_pkinit,
pkcs12_info=pkinit_pkcs12_info,
promote=promote) promote=promote)
# we now need to enable ssl on the ds # we now need to enable ssl on the ds