sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-23 09:57:40 +03:00
Code

netcmd: Fix opening SamDB database for offline backup

Browse Source 
When opening the backed-up SamDB database, open the top-level database
without loading any modules so the backend database files aren't
unnecessarily opened. The domain SID is now fetched from the original
database rather than from the backup.

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

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Samuel Cabrero <scabrero@samba.org>
This commit is contained in:
Joseph Sutton 2021-03-22 11:06:30 +13:00 committed by Andrew Bartlett
parent bb3dcd403c
commit d7c111514a
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
python/samba/netcmd/domain_backup.py
View File

@ -1156,21 +1156,31 @@ class cmd_domain_backup_offline(samba.netcmd.Command):
# Backup secrets, sam.ldb and their downstream files
self.backup_secrets(paths.private_dir, lp, logger)
self.backup_smb_dbs(paths.private_dir, samdb, lp, logger)
# Get the domain SID so we can later place it in the backup
dom_sid_str = samdb.get_domain_sid()
dom_sid = security.dom_sid(dom_sid_str)
# Close the original samdb
samdb = None
# Open the new backed up samdb, flag it as backed up, and write
# the next SID so the restore tool can add objects.
# the next SID so the restore tool can add objects. We use
# options=["modules:"] here to prevent any modules from loading.
# WARNING: Don't change this code unless you know what you're doing.
# Writing to a .bak file only works because the DN being
# written to happens to be top level.
samdb = SamDB(url=paths.samdb + self.backup_ext,
samdb = Ldb(url=paths.samdb + self.backup_ext,
session_info=system_session(), lp=lp,
flags=ldb.FLG_DONT_CREATE_DB)
options=["modules:"], flags=ldb.FLG_DONT_CREATE_DB)
time_str = get_timestamp()
add_backup_marker(samdb, "backupDate", time_str)
add_backup_marker(samdb, "sidForRestore", sid)
add_backup_marker(samdb, "backupType", "offline")
# Close the backed up samdb
samdb = None
# Now handle all the LDB and TDB files that are not linked to
# anything else. Use transactions for LDBs.
for path in all_files:
@ -1196,7 +1206,7 @@ class cmd_domain_backup_offline(samba.netcmd.Command):
logger.info('running offline ntacl backup of sysvol')
sysvol_tar_fn = 'sysvol.tar.gz'
sysvol_tar = os.path.join(temp_tar_dir, sysvol_tar_fn)
backup_offline(paths.sysvol, sysvol_tar, samdb, paths.smbconf)
backup_offline(paths.sysvol, sysvol_tar, paths.smbconf, dom_sid)
tar.add(sysvol_tar, sysvol_tar_fn)
os.remove(sysvol_tar)

5
python/samba/ntacls.py
View File

@ -551,7 +551,7 @@ def backup_online(smb_conn, dest_tarfile_path, dom_sid):
shutil.rmtree(localdir)
def backup_offline(src_service_path, dest_tarfile_path, samdb_conn, smb_conf_path):
def backup_offline(src_service_path, dest_tarfile_path, smb_conf_path, dom_sid):
"""
Backup files and ntacls to a tarfile for a service
"""
@ -559,9 +559,6 @@ def backup_offline(src_service_path, dest_tarfile_path, samdb_conn, smb_conf_pat
tempdir = tempfile.mkdtemp()
session_info = system_session_unix()
dom_sid_str = samdb_conn.get_domain_sid()
dom_sid = security.dom_sid(dom_sid_str)
ntacls_helper = NtaclsHelper(service, smb_conf_path, dom_sid)
for dirpath, dirnames, filenames in os.walk(src_service_path):

2
python/samba/tests/ntacls_backup.py
View File

@ -184,7 +184,7 @@ class NtaclsBackupRestoreTests(SmbdBaseTests):
"""
ntacls.backup_offline(
self.service_root, self.tarfile_path,
self.samdb_conn, self.smb_conf_path)
self.smb_conf_path, self.dom_sid)
self._check_tarfile()
self.smb_helper.delete_tree()