diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2014-10-13 14:30:15 +0200 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2014-10-17 12:53:11 +0200 |
| commit | 608851d3f86a9082b394c30fe0c7a7b33d43f363 (patch) | |
| tree | 4e1e34c392d56672d22c7d8d00c0794163048119 /install/tools/ipa-ca-install | |
| parent | 6227ebb0cd2d8661d9233e26adb5e0bff7fe4c0d (diff) | |
| download | freeipa-608851d3f86a9082b394c30fe0c7a7b33d43f363.tar.gz freeipa-608851d3f86a9082b394c30fe0c7a7b33d43f363.tar.xz freeipa-608851d3f86a9082b394c30fe0c7a7b33d43f363.zip | |
Check LDAP instead of local configuration to see if IPA CA is enabled
The check is done using a new hidden command ca_is_enabled.
https://fedorahosted.org/freeipa/ticket/4621
Reviewed-By: David Kupka <dkupka@redhat.com>
Diffstat (limited to 'install/tools/ipa-ca-install')
| -rwxr-xr-x | install/tools/ipa-ca-install | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/install/tools/ipa-ca-install b/install/tools/ipa-ca-install index 0ea8cf24d..3934b0372 100755 --- a/install/tools/ipa-ca-install +++ b/install/tools/ipa-ca-install @@ -234,9 +234,6 @@ def install_master(safe_options, options): api.bootstrap(in_server=True) api.finalize() - if api.env.enable_ra: - sys.exit("CA is already installed.\n") - dm_password = options.password if not dm_password: if options.unattended: @@ -251,6 +248,9 @@ def install_master(safe_options, options): api.Backend.ldap2.connect(bind_dn=DN(('cn', 'Directory Manager')), bind_pw=dm_password) + if api.Command.ca_is_enabled()['result']: + sys.exit("CA is already installed.\n") + config = api.Command['config_show']()['result'] subject_base = config['ipacertificatesubjectbase'][0] |