diff options
author | Rob Crittenden <rcritten@redhat.com> | 2012-02-22 16:40:29 -0500 |
---|---|---|
committer | Martin Kosek <mkosek@redhat.com> | 2012-02-27 14:48:26 +0100 |
commit | de9a22b3f3725156a74c55bfadd1f978e98f453c (patch) | |
tree | ac3e7e38e630ef5d912cdb5cfc4035ce2b5533dd /install/tools/ipa-upgradeconfig | |
parent | 5c7cd8ee2f513c49ddb3738811cbe75d9a01c806 (diff) | |
download | freeipa-de9a22b3f3725156a74c55bfadd1f978e98f453c.tar.gz freeipa-de9a22b3f3725156a74c55bfadd1f978e98f453c.tar.xz freeipa-de9a22b3f3725156a74c55bfadd1f978e98f453c.zip |
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
Diffstat (limited to 'install/tools/ipa-upgradeconfig')
-rw-r--r-- | install/tools/ipa-upgradeconfig | 14 |
1 files changed, 14 insertions, 0 deletions
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()) |