diff options
| -rw-r--r-- | freeipa.spec.in | 2 | ||||
| -rwxr-xr-x | ipa-client/ipa-install/ipa-client-install | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/freeipa.spec.in b/freeipa.spec.in index 9448a4b4..bf53a3de 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -655,7 +655,6 @@ fi %dir %{_usr}/share/ipa/ui/images %{_usr}/share/ipa/ui/images/*.png %{_usr}/share/ipa/ui/images/*.gif -%dir %{_sysconfdir}/ipa %dir %{_sysconfdir}/ipa/html %config(noreplace) %{_sysconfdir}/ipa/html/ffconfig.js %config(noreplace) %{_sysconfdir}/ipa/html/ffconfig_page.js @@ -790,6 +789,7 @@ fi %{python_sitelib}/ipapython-*.egg-info %{python_sitelib}/freeipa-*.egg-info %{python_sitearch}/python_default_encoding-*.egg-info +%dir %attr(0755,root,apache) %config(noreplace) %{_sysconfdir}/ipa/ %ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/default.conf %ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/ca.crt diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install index 126611a8..29adc93f 100755 --- a/ipa-client/ipa-install/ipa-client-install +++ b/ipa-client/ipa-install/ipa-client-install @@ -1608,6 +1608,9 @@ def get_ca_cert(fstore, options, server, basedn): url = file_url() try: get_ca_cert_from_file(url) + except errors.FileError, e: + root_logger.debug(e) + raise except Exception, e: root_logger.debug(e) raise errors.NoCertificateError(entry=url) @@ -1658,6 +1661,9 @@ def get_ca_cert(fstore, options, server, basedn): except Exception, e: os.unlink(ca_file) raise + except errors.FileError, e: + root_logger.debug(e) + raise except (errors.NoCertificateError, errors.LDAPError), e: root_logger.debug(str(e)) url = http_url() @@ -2106,6 +2112,9 @@ def install(options, env, fstore, statestore): os.environ['KRB5_CONFIG'] = env['KRB5_CONFIG'] get_ca_cert(fstore, options, cli_server[0], cli_basedn) del os.environ['KRB5_CONFIG'] + except errors.FileError, e: + root_logger.error(e) + return CLIENT_INSTALL_ERROR except Exception, e: root_logger.error("Cannot obtain CA certificate\n%s", e) return CLIENT_INSTALL_ERROR |