Hi,

the attached patch fixes <https://fedorahosted.org/freeipa/ticket/3750>.

Honza

--
Jan Cholasta
>From f6fbd4a2ef1db3fa543f37e87c10722379e21108 Mon Sep 17 00:00:00 2001
From: Jan Cholasta <jchol...@redhat.com>
Date: Tue, 25 Jun 2013 08:31:56 +0000
Subject: [PATCH] Fix CA-less check in ipa-replica-install and ipa-ca-install.

https://fedorahosted.org/freeipa/ticket/3750
---
 install/tools/ipa-ca-install      | 2 +-
 install/tools/ipa-replica-install | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/tools/ipa-ca-install b/install/tools/ipa-ca-install
index 060cc66..1fd59ec 100755
--- a/install/tools/ipa-ca-install
+++ b/install/tools/ipa-ca-install
@@ -160,7 +160,7 @@ def main():
     config.dir = dir
     config.setup_ca = True
 
-    if ipautil.file_exists(config.dir + "/dscert.p12"):
+    if not ipautil.file_exists(config.dir + "/cacert.p12"):
         print 'CA cannot be installed in CA-less setup.'
         sys.exit(1)
 
diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install
index 5b3a88f..1ea0f92 100755
--- a/install/tools/ipa-replica-install
+++ b/install/tools/ipa-replica-install
@@ -513,7 +513,7 @@ def main():
     config.dir = dir
     config.setup_ca = options.setup_ca
 
-    if config.setup_ca and ipautil.file_exists(config.dir + "/dscert.p12"):
+    if config.setup_ca and not ipautil.file_exists(config.dir + "/cacert.p12"):
         print 'CA cannot be installed in CA-less setup.'
         sys.exit(1)
 
-- 
1.8.2.1

_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

Reply via email to