sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

upgradedns: ensure lmdb lock files linked

Browse Source 
Ensure that the '-lock' files for the dns partitions as well as the data
files are linked when running
  samba_dnsupgrade --dns-backend=BIND9_DLZ
failure to create these links can cause corruption of the corresponding
data file.

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

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Gary Lockyer 2019-12-19 16:31:46 +13:00 committed by Andrew Bartlett
parent f0cebbe4dd
commit 0bd479140c
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
python/samba/provision/sambadns.py
View File

@ -850,9 +850,19 @@ def create_samdb_copy(samdb, logger, paths, names, domainsid, domainguid):
os.path.join(dns_samldb_dir, metadata_file))
os.link(os.path.join(private_dir, domainzone_file),
os.path.join(dns_dir, domainzone_file))
if backend_store == "mdb":
# If the file is an lmdb data file need to link the
# lock file as well
os.link(os.path.join(private_dir, domainzone_file + "-lock"),
os.path.join(dns_dir, domainzone_file + "-lock"))
if forestzone_file:
os.link(os.path.join(private_dir, forestzone_file),
os.path.join(dns_dir, forestzone_file))
if backend_store == "mdb":
# If the database file is an lmdb data file need to link the
# lock file as well
os.link(os.path.join(private_dir, forestzone_file + "-lock"),
os.path.join(dns_dir, forestzone_file + "-lock"))
except OSError:
logger.error(
"Failed to setup database for BIND, AD based DNS cannot be used")

1
selftest/knownfail.d/bug-14199
View File

@ -1 +0,0 @@
^samba.tests.samba_upgradedns_lmdb.samba.tests.samba_upgradedns_lmdb.