diff options
| author | Stefan Metzmacher <metze@samba.org> | 2019-04-29 11:59:50 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2019-08-08 07:32:20 +0000 |
| commit | 4fd604b1657503a9d3d494f50f40a566314c08e6 (patch) | |
| tree | 5e38ec493cda8da686640dfc86ee5514f1321102 /python | |
| parent | 9af7a1ccb3307f3f07df8200e95209c96cb1c978 (diff) | |
| download | samba-4fd604b1657503a9d3d494f50f40a566314c08e6.tar.gz | |
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 <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
(cherry picked from commit 2ef79a4c1d695a3e498b142810a1317d85b9b6da)
Diffstat (limited to 'python')
| -rw-r--r-- | python/samba/dbchecker.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py index bd43667b99f..d9939a92933 100644 --- a/python/samba/dbchecker.py +++ b/python/samba/dbchecker.py @@ -199,7 +199,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 = [] |