pgreco / rpms / ipa

Forked from forks/areguera/rpms/ipa 4 years ago
Clone

Blame SOURCES/0060-Remove-redundant-option-check-for-cert-files.patch

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