From 0f782a3d09d5831d84216482af9eb8bbc25fbfe1 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 29 Apr 2019 11:59:50 +0200 Subject: [PATCH] dbcheck: fallback to the default tombstoneLifetime of 180 days 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 Reviewed-by: Ralph Boehme Autobuild-User(master): Stefan Metzmacher Autobuild-Date(master): Tue May 28 08:32:10 UTC 2019 on sn-devel-184 (cherry picked from commit 2ef79a4c1d695a3e498b142810a1317d85b9b6da) --- python/samba/dbchecker.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py index e7ec426de54..3677564fea0 100644 --- a/python/samba/dbchecker.py +++ b/python/samba/dbchecker.py @@ -218,7 +218,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 = [] -- 2.17.1