From a8a44c1c714714d89ee5ac9b54611278de982d52 Mon Sep 17 00:00:00 2001 From: Jan Cholasta Date: Thu, 12 Jun 2014 17:54:40 +0200 Subject: [PATCH] Remove certificate "External CA cert" from /etc/pki/nssdb on client uninstall. This is a no longer used nickname for CA certificate on CA-less server installs. Reviewed-By: Rob Crittenden --- ipa-client/ipa-install/ipa-client-install | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install index 617db26f4..20ff8e12f 100755 --- a/ipa-client/ipa-install/ipa-client-install +++ b/ipa-client/ipa-install/ipa-client-install @@ -483,12 +483,16 @@ def uninstall(options, env): client_nss_nickname = client_nss_nickname_format % hostname # Remove our host cert and CA cert - if nickname_exists("IPA CA"): + for nickname in ('IPA CA', 'External CA cert'): + if not nickname_exists(nickname): + continue try: - run([paths.CERTUTIL, "-D", "-d", paths.NSS_DB_DIR, "-n", "IPA CA"]) + run([paths.CERTUTIL, "-D", + "-d", paths.NSS_DB_DIR, + "-n", nickname]) except Exception, e: root_logger.error( - "Failed to remove IPA CA from /etc/pki/nssdb: %s", str(e)) + "Failed to remove %s from /etc/pki/nssdb: %s", nickname, e) # Always start certmonger. We can't untrack something if it isn't # running