summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2013-06-25 08:31:56 +0000
committerPetr Viktorin <pviktori@redhat.com>2013-06-26 11:00:20 +0200
commit76dc2176f9e53fc7da760a516359f7cb2eb62035 (patch)
tree22fc83c99d11f90c67b60430e4a61c68db4dc62e
parentac2263d64c18832de34ad71e37e07ba26929d6a7 (diff)
downloadfreeipa-76dc2176f9e53fc7da760a516359f7cb2eb62035.zip
freeipa-76dc2176f9e53fc7da760a516359f7cb2eb62035.tar.gz
freeipa-76dc2176f9e53fc7da760a516359f7cb2eb62035.tar.xz
Fix CA-less check in ipa-replica-install and ipa-ca-install.
https://fedorahosted.org/freeipa/ticket/3750
-rwxr-xr-xinstall/tools/ipa-ca-install2
-rwxr-xr-xinstall/tools/ipa-replica-install2
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)