diff options
| author | Alexander Bokovoy <abokovoy@redhat.com> | 2014-02-25 20:11:50 +0200 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2014-02-28 09:50:14 +0100 |
| commit | e99fa380af7f257a319cbe6f8867bf258ab04e41 (patch) | |
| tree | ea06b5011727015483497deffb1d49a875e80c4c /ipaserver/install/adtrustinstance.py | |
| parent | 3a7ba6013ffe43176bcff2c716b33552853847ff (diff) | |
| download | freeipa-e99fa380af7f257a319cbe6f8867bf258ab04e41.tar.gz freeipa-e99fa380af7f257a319cbe6f8867bf258ab04e41.tar.xz freeipa-e99fa380af7f257a319cbe6f8867bf258ab04e41.zip | |
adtrustinstance: make sure to stop and disable winbind in uninstall()
Reviewed-By: Martin Kosek <mkosek@redhat.com>
Diffstat (limited to 'ipaserver/install/adtrustinstance.py')
| -rw-r--r-- | ipaserver/install/adtrustinstance.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ipaserver/install/adtrustinstance.py b/ipaserver/install/adtrustinstance.py index 6c74418ce..f44765a08 100644 --- a/ipaserver/install/adtrustinstance.py +++ b/ipaserver/install/adtrustinstance.py @@ -889,12 +889,15 @@ class ADTRUSTInstance(service.Service): self.restore_state("running") self.restore_state("enabled") + winbind = ipaservices.service("winbind") # Always try to stop and disable smb service, since we do not leave # working configuration after uninstall try: self.stop() self.disable() - except: + winbind.stop() + winbind.disable() + except Exception: pass # Since we do not guarantee restoring back to working samba state, @@ -907,7 +910,7 @@ class ADTRUSTInstance(service.Service): try: ipautil.run(["/usr/sbin/setsebool", "-P", var, sebool_state]) - except: + except Exception: self.print_msg(SELINUX_WARNING % dict(var=var)) # Remove samba's credentials cache |