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