diff options
| author | Tomas Babej <tomasbabej@gmail.com> | 2013-11-21 15:25:27 +0100 |
|---|---|---|
| committer | Petr Viktorin <pviktori@redhat.com> | 2013-11-26 15:24:07 +0100 |
| commit | 6680572ad5c1419f094335c9f82a0e3763bf883e (patch) | |
| tree | abd4304f1f5b7b93aa9f7bd962aad9b66149c041 | |
| parent | 3a11044664341257a3929da2db1c493659515eec (diff) | |
| download | freeipa.git-6680572ad5c1419f094335c9f82a0e3763bf883e.tar.gz freeipa.git-6680572ad5c1419f094335c9f82a0e3763bf883e.tar.xz freeipa.git-6680572ad5c1419f094335c9f82a0e3763bf883e.zip | |
trusts: Always stop and disable smb service on uninstall
https://fedorahosted.org/freeipa/ticket/4042
| -rw-r--r-- | ipaserver/install/adtrustinstance.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/ipaserver/install/adtrustinstance.py b/ipaserver/install/adtrustinstance.py index 6a1ede0d..4aa8322e 100644 --- a/ipaserver/install/adtrustinstance.py +++ b/ipaserver/install/adtrustinstance.py @@ -881,11 +881,16 @@ class ADTRUSTInstance(service.Service): if self.is_configured(): self.print_msg("Unconfiguring %s" % self.service_name) - running = self.restore_state("running") - enabled = self.restore_state("enabled") + # Call restore_state so that we do not leave mess in the statestore + # Otherwise this does nothing + self.restore_state("running") + self.restore_state("enabled") + # Always try to stop and disable smb service, since we do not leave + # working configuration after uninstall try: self.stop() + self.disable() except: pass @@ -917,9 +922,3 @@ class ADTRUSTInstance(service.Service): # Remove our keys from samba's keytab self.clean_samba_keytab() - - if not enabled is None and not enabled: - self.disable() - - if not running is None and running: - self.start() |