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