|
 |
483b06 |
From fabf804e7351b546310cc1f50164785099ff1811 Mon Sep 17 00:00:00 2001
|
|
|
483b06 |
From: Stanislav Laznicka <slaznick@redhat.com>
|
|
|
483b06 |
Date: Tue, 18 Apr 2017 17:14:27 +0200
|
|
|
483b06 |
Subject: [PATCH] server-install: No double Kerberos install
|
|
|
483b06 |
|
|
|
483b06 |
When we're installing server with an external CA, the installation
|
|
|
483b06 |
would have failed in the second step where it's passed the required
|
|
|
483b06 |
CA cert file because it would have tried to perform the Kerberos
|
|
|
483b06 |
installation for the second time.
|
|
|
483b06 |
|
|
|
483b06 |
https://pagure.io/freeipa/issue/6757
|
|
|
483b06 |
|
|
|
483b06 |
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
|
|
|
483b06 |
---
|
|
|
483b06 |
ipaserver/install/server/install.py | 11 ++++++-----
|
|
|
483b06 |
1 file changed, 6 insertions(+), 5 deletions(-)
|
|
|
483b06 |
|
|
|
483b06 |
diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py
|
|
|
483b06 |
index b899b4be4028e6cdfd95bb9868fba8be25a07b65..b360e0532ce1b9b729be1cc2398cb2b46620901c 100644
|
|
|
483b06 |
--- a/ipaserver/install/server/install.py
|
|
|
483b06 |
+++ b/ipaserver/install/server/install.py
|
|
|
483b06 |
@@ -762,11 +762,12 @@ def install(installer):
|
|
|
483b06 |
options.subject_base, options.ca_subject, 1101, 1100, None)
|
|
|
483b06 |
|
|
|
483b06 |
krb = krbinstance.KrbInstance(fstore)
|
|
|
483b06 |
- krb.create_instance(realm_name, host_name, domain_name,
|
|
|
483b06 |
- dm_password, master_password,
|
|
|
483b06 |
- setup_pkinit=not options.no_pkinit,
|
|
|
483b06 |
- pkcs12_info=pkinit_pkcs12_info,
|
|
|
483b06 |
- subject_base=options.subject_base)
|
|
|
483b06 |
+ if not options.external_cert_files:
|
|
|
483b06 |
+ krb.create_instance(realm_name, host_name, domain_name,
|
|
|
483b06 |
+ dm_password, master_password,
|
|
|
483b06 |
+ setup_pkinit=not options.no_pkinit,
|
|
|
483b06 |
+ pkcs12_info=pkinit_pkcs12_info,
|
|
|
483b06 |
+ subject_base=options.subject_base)
|
|
|
483b06 |
|
|
|
483b06 |
if setup_ca:
|
|
|
483b06 |
if not options.external_cert_files and options.external_ca:
|
|
|
483b06 |
--
|
|
|
483b06 |
2.12.2
|
|
|
483b06 |
|