summaryrefslogtreecommitdiffstats
path: root/ipa-server/ipaserver
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2008-05-13 16:29:01 -0400
committerRob Crittenden <rcritten@redhat.com>2008-05-14 09:57:33 -0400
commit272ada7cedd7ffad2390fe480d0e8d54aff65073 (patch)
treee61c6fafd175847656caead3bca757d07830c9b4 /ipa-server/ipaserver
parent07603b45e7812db7cda6d328f362d96856b394e5 (diff)
downloadfreeipa-272ada7cedd7ffad2390fe480d0e8d54aff65073.tar.gz
freeipa-272ada7cedd7ffad2390fe480d0e8d54aff65073.tar.xz
freeipa-272ada7cedd7ffad2390fe480d0e8d54aff65073.zip
Make sure all services are stopped during uninstall.
We were just shutting down the KDC if it had been started prior to IPA installation. We need to stop it in all cases. And we should restart nscd as it may have made an LDAP connection. 440322
Diffstat (limited to 'ipa-server/ipaserver')
-rw-r--r--ipa-server/ipaserver/krbinstance.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/ipa-server/ipaserver/krbinstance.py b/ipa-server/ipaserver/krbinstance.py
index 79dbf49a..50250f63 100644
--- a/ipa-server/ipaserver/krbinstance.py
+++ b/ipa-server/ipaserver/krbinstance.py
@@ -394,8 +394,10 @@ class KrbInstance(service.Service):
running = self.restore_state("running")
enabled = self.restore_state("enabled")
- if not running is None:
+ try:
self.stop()
+ except:
+ pass
for f in ["/var/kerberos/krb5kdc/ldappwd", "/var/kerberos/krb5kdc/kdc.conf", "/etc/krb5.conf"]:
try: