diff options
author | Ana Krivokapic <akrivoka@redhat.com> | 2013-04-02 19:48:38 +0200 |
---|---|---|
committer | Martin Kosek <mkosek@redhat.com> | 2013-04-04 12:50:18 +0200 |
commit | b5e4039119a82cec104679133ad09d897c463279 (patch) | |
tree | fada96037d3b7d2b17ca428a6f184425292943ca | |
parent | 3f6b3397ed5414be2d43832a63b00b56f43f3ae0 (diff) | |
download | freeipa.git-b5e4039119a82cec104679133ad09d897c463279.tar.gz freeipa.git-b5e4039119a82cec104679133ad09d897c463279.tar.xz freeipa.git-b5e4039119a82cec104679133ad09d897c463279.zip |
Remove CA cert on client uninstall
The CA cert (/etc/ipa/ca.crt) was not being removed
on client uninstall, causing failure on subsequent client
installation in some cases.
https://fedorahosted.org/freeipa/ticket/3537
-rwxr-xr-x | ipa-client/ipa-install/ipa-client-install | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install index 2852dba3..d5edddfe 100755 --- a/ipa-client/ipa-install/ipa-client-install +++ b/ipa-client/ipa-install/ipa-client-install @@ -644,6 +644,15 @@ def uninstall(options, env): root_logger.warning('Please remove /etc/ipa/default.conf manually, ' 'as it can cause subsequent installation to fail.') + # Remove the CA cert + try: + os.remove(CACERT) + except OSError, e: + root_logger.warning('%s could not be removed: %s', CACERT, str(e)) + root_logger.warning('Please remove %s manually, ' + 'as it can cause subsequent ' + 'installation to fail.', CACERT) + root_logger.info("Client uninstall complete.") # The next block of code prompts for reboot, therefore all uninstall |