adtrustinstance: Properly handle uninstall of AD trust instance

The uninstall method of the AD trust instance was not called upon
at all in the ipa-server-install --uninstall phase.

This patch makes sure that AD trust instance is unconfigured when
the server is uninstalled.

The following steps are undertaken:
  * Remove /var/run/samba/krb5cc_samba
  * Remove our keys from /etc/samba/samba.keytab using ipa-rmkeytab
  * Remove /var/lib/samba/*.tdb files

Additionally, we make sure winbind service is stopped from within the
stop() method.

Part of: https://fedorahosted.org/freeipa/ticket/3479
This commit is contained in:
Tomas Babej authored and Martin Kosek committed 2013-10-14 11:11:17 +02:00
1 parent 45e310ecc4
commit d769b124b0
3 files changed
+42 -16

No files matched your search

+3 -2
View File
@@ -276,8 +276,9 @@ def main():
sys.exit("Aborting installation.")
elif os.path.exists('/etc/samba/smb.conf'):
print("WARNING: The smb.conf already exists. Running ipa-adtrust-install
"will break your existing samba configuration.\n\n")
print("WARNING: The smb.conf already exists. Running "
"ipa-adtrust-install will break your existing samba "
"configuration.\n\n")
if not options.unattended:
if not ipautil.user_input("Do you wish to continue?",
default = False,
+2
View File
@@ -40,6 +40,7 @@ import pwd
import textwrap
from optparse import OptionGroup, OptionValueError
from ipaserver.install import adtrustinstance
from ipaserver.install import dsinstance
from ipaserver.install import krbinstance
from ipaserver.install import bindinstance
@@ -492,6 +493,7 @@ def uninstall():
httpinstance.HTTPInstance(fstore).uninstall()
krbinstance.KrbInstance(fstore).uninstall()
dsinstance.DsInstance(fstore=fstore).uninstall()
adtrustinstance.ADTRUSTInstance(fstore).uninstall()
memcacheinstance.MemcacheInstance().uninstall()
otpdinstance.OtpdInstance().uninstall()
ipaservices.restore_network_configuration(fstore, sstore)