DEBUG/HACKS python/samba/dbchecker.py

diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py
index a0500c6c578cece582cb7e106d292f5a02130f02..a94e07c301e2f4f400f83b7df600bd3b5657c8af 100644 (file)
--- a/python/samba/dbchecker.py
+++ b/python/samba/dbchecker.py
@@ -567,13 +567,13 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
     def err_deleted_dn(self, dn, attrname, val, dsdb_dn, correct_dn, remove_plausible=False):
         """handle a DN pointing to a deleted object"""
         if not remove_plausible:
-            self.report("ERROR: target DN is deleted for %s in object %s - %s" % (attrname, dn, val))
+            self.report("ERROR: METZE3 target DN is deleted for %s in object %s - %s" % (attrname, dn, val))
             self.report("Target GUID points at deleted DN %r" % str(correct_dn))
             if not self.confirm_all('Remove DN link?', 'remove_implausible_deleted_DN_links'):
                 self.report("Not removing")
                 return
         else:
-            self.report("WARNING: target DN is deleted for %s in object %s - %s" % (attrname, dn, val))
+            self.report("WARNING: METZE4 target DN is deleted for %s in object %s - %s" % (attrname, dn, val))
             self.report("Target GUID points at deleted DN %r" % str(correct_dn))
             if not self.confirm_all('Remove stale DN link?', 'remove_plausible_deleted_DN_links'):
                 self.report("Not removing")
@@ -636,17 +636,24 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
             #
             # We don't bump the error count as Samba produces these
             # in normal operation
-            self.report("WARNING: no target object found for GUID "
+            self.report("WARNING: METZE1 no target object found for GUID "
                         "component for DN value %s in object "
                         "%s - %s" % (attrname, dn, val))
+            self.report("METZE: str(dsdb_dn)=[%s]" % str(dsdb_dn))
+            self.report("METZE: str(dsdb_dn)=[%s]" % str(dsdb_dn))
+            assert False
             self.err_deleted_dn(dn, attrname, val,
                                 dsdb_dn, dsdb_dn, True)
             return 0
 
+        self.report("METZE: str(dsdb_dn)=[%s]" % str(dsdb_dn))
+        self.report("METZE: str(dn)=[%s]" % str(dn))
+        self.report("METZE: linkID=[%s]" % linkID)
         # We bump the error count here, as we should have deleted this
-        self.report("ERROR: no target object found for GUID "
+        self.report("ERROR: METZE2 no target object found for GUID "
                     "component for link %s in object "
                     "%s - %s" % (attrname, dn, val))
+        assert False
         self.err_deleted_dn(dn, attrname, val, dsdb_dn, dsdb_dn, False)
         return 1