dbcheck: fallback to the default tombstoneLifetime of 180 days
authorStefan Metzmacher <metze@samba.org>
Mon, 29 Apr 2019 09:59:50 +0000 (11:59 +0200)
committerStefan Metzmacher <metze@samba.org>
Tue, 28 May 2019 08:32:09 +0000 (08:32 +0000)
If a domain was provisioned by Windows 2000 this value is missing in the
database.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13967

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Tue May 28 08:32:10 UTC 2019 on sn-devel-184

python/samba/dbchecker.py

index a0500c6c578cece582cb7e106d292f5a02130f02..04304b0b0dc5f72f700492929dad06ea216cd099 100644 (file)
@@ -220,7 +220,10 @@ class dbcheck(object):
                            scope=ldb.SCOPE_BASE,
                            expression="(objectClass=nTDSService)",
                            attrs=["tombstoneLifetime"])
-        self.tombstoneLifetime = int(res[0]["tombstoneLifetime"][0])
+        if "tombstoneLifetime" in res[0]:
+            self.tombstoneLifetime = int(res[0]["tombstoneLifetime"][0])
+        else:
+            self.tombstoneLifetime = 180
 
         self.compatibleFeatures = []
         self.requiredFeatures = []