From de83684c753b09f72c047fe7adce74dfa730b953 Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: Aug 26 2011 00:49:23 +0000
Subject: Remove more 389-ds files/directories on uninstallation.


We were orphaning a few files/directories when uninstalling 389-instances
both for IPA and dogtag. This should remove everything but the logs.

ticket https://fedorahosted.org/freeipa/ticket/1700

---

diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
index 2ad692d..008aee3 100644
--- a/ipaserver/install/dsinstance.py
+++ b/ipaserver/install/dsinstance.py
@@ -90,6 +90,18 @@ def erase_ds_instance_data(serverid):
         os.unlink("/var/run/slapd-%s.socket" % serverid)
     except:
         pass
+    try:
+        shutil.rmtree("/var/lib/dirsrv/scripts-%s" % serverid)
+    except:
+        pass
+    try:
+        os.unlink("/etc/dirsrv/ds.keytab")
+    except:
+        pass
+    try:
+        os.unlink("/etc/sysconfig/dirsrv-%s" % serverid)
+    except:
+        pass
 #    try:
 #        shutil.rmtree("/var/log/dirsrv/slapd-%s" % serverid)
 #    except:
@@ -661,6 +673,11 @@ class DsInstance(service.Service):
         user_exists = self.restore_state("user_exists")
 
         if user_exists == False:
+            pent = pwd.getpwnam(DS_USER)
+            try:
+                os.unlink("/var/tmp/ldap_%d" % pent.pw_uid)
+            except:
+                pass
             try:
                 ipautil.run(["/usr/sbin/userdel", DS_USER])
             except ipautil.CalledProcessError, e: