|
 |
483b06 |
From abb400e3fbb7c607b6ec40cfd155aa14175d35d7 Mon Sep 17 00:00:00 2001
|
|
|
483b06 |
From: Stanislav Laznicka <slaznick@redhat.com>
|
|
|
483b06 |
Date: Wed, 29 Mar 2017 09:00:09 +0200
|
|
|
483b06 |
Subject: [PATCH] Remove redundant option check for cert files
|
|
|
483b06 |
|
|
|
483b06 |
There was a redundant check for CA-less install certificate files
|
|
|
483b06 |
for replicas but the same check is done for all installers before
|
|
|
483b06 |
that.
|
|
|
483b06 |
|
|
|
483b06 |
https://pagure.io/freeipa/issue/6801
|
|
|
483b06 |
|
|
|
483b06 |
Reviewed-By: Martin Basti <mbasti@redhat.com>
|
|
|
483b06 |
---
|
|
|
483b06 |
ipaserver/install/server/__init__.py | 10 +---------
|
|
|
483b06 |
1 file changed, 1 insertion(+), 9 deletions(-)
|
|
|
483b06 |
|
|
|
483b06 |
diff --git a/ipaserver/install/server/__init__.py b/ipaserver/install/server/__init__.py
|
|
|
483b06 |
index 096cb0142fc7fe70fdc3d2ad1e5caedf0f65b643..89444f21fefc902931b7ecfaba861a18ecc28dbe 100644
|
|
|
483b06 |
--- a/ipaserver/install/server/__init__.py
|
|
|
483b06 |
+++ b/ipaserver/install/server/__init__.py
|
|
|
483b06 |
@@ -470,16 +470,8 @@ class ServerInstallInterface(ServerCertificateInstallInterface,
|
|
|
483b06 |
"idmax (%s) cannot be smaller than idstart (%s)" %
|
|
|
483b06 |
(self.idmax, self.idstart))
|
|
|
483b06 |
else:
|
|
|
483b06 |
- cert_file_req = (self.dirsrv_cert_files, self.http_cert_files)
|
|
|
483b06 |
- cert_file_opt = (self.pkinit_cert_files,)
|
|
|
483b06 |
-
|
|
|
483b06 |
+ # replica installers
|
|
|
483b06 |
if self.replica_file is None:
|
|
|
483b06 |
- # If any of the PKCS#12 options are selected, all are required.
|
|
|
483b06 |
- if any(cert_file_req + cert_file_opt) and not all(cert_file_req):
|
|
|
483b06 |
- raise RuntimeError(
|
|
|
483b06 |
- "--dirsrv-cert-file and --http-cert-file are required "
|
|
|
483b06 |
- "if any PKCS#12 options are used")
|
|
|
483b06 |
-
|
|
|
483b06 |
if self.servers and not self.domain_name:
|
|
|
483b06 |
raise RuntimeError(
|
|
|
483b06 |
"The --server option cannot be used without providing "
|
|
|
483b06 |
--
|
|
|
483b06 |
2.12.2
|
|
|
483b06 |
|