From de9a22b3f3725156a74c55bfadd1f978e98f453c Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Wed, 22 Feb 2012 16:40:29 -0500 Subject: Remove unused kpasswd.keytab and ldappwd files if they exist. These were used by ipa_kpasswd and krb5-server-ldap respectivily. https://fedorahosted.org/freeipa/ticket/2397 --- install/tools/ipa-upgradeconfig | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'install/tools') diff --git a/install/tools/ipa-upgradeconfig b/install/tools/ipa-upgradeconfig index 725a9d106..535628a72 100644 --- a/install/tools/ipa-upgradeconfig +++ b/install/tools/ipa-upgradeconfig @@ -220,6 +220,19 @@ def update_dbmodules(realm, filename="/etc/krb5.conf"): fd.write("".join(newfile)) fd.close() +def cleanup_kdc(): + """ + Clean up old KDC files if they exist. We need to remove the actual + file and any references in the uninstall configuration. + """ + fstore = sysrestore.FileStore('/var/lib/ipa/sysrestore') + + for file in ['kpasswd.keytab', 'ldappwd']: + filename = '/var/kerberos/krb5kdc/%s' % file + installutils.remove_file(filename) + if fstore.has_file(filename): + fstore.untrack_file(filename) + def main(): """ Get some basics about the system. If getting those basics fail then @@ -266,6 +279,7 @@ def main(): except (ldap.ALREADY_EXISTS, ipalib.errors.DuplicateEntry): pass + cleanup_kdc() try: if __name__ == "__main__": sys.exit(main()) -- cgit