IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

trusts: Always stop and disable smb service on uninstall

Browse Source 
https://fedorahosted.org/freeipa/ticket/4042
This commit is contained in:
Tomas Babej 2013-11-21 15:25:27 +01:00 committed by Petr Viktorin
parent 76c7f24919
commit d361e12ae5
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ipaserver/install/adtrustinstance.py
View File

@ -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()