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

samba-tool: Fix for gpo restore not working without --tmpdir

Browse Source 
cmd_restore depends on cmd_create but the later cleans up
required temp files for cmd_restore to function.

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

RN: Fix for gpo restore not working without --tmpdir

Signed-off-by: Kacper Boström <kacper@kacper.se>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: David Mulder <dmulder@samba.org>

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Fri Sep 29 03:15:18 UTC 2023 on atb-devel-224
This commit is contained in:
Kacper
2023-08-30 14:33:49 +02:00
committed by Andrew Bartlett
parent 5ff8046597
commit 90ba53eee4
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
python/samba/netcmd/gpo.py
View File

@ -1664,6 +1664,11 @@ class cmd_restore(cmd_create):
credopts, versionopts)
try:
if tmpdir is None:
# Create GPT
self.tmpdir, gpodir = self.construct_tmpdir(tmpdir, self.gpo_name)
self.gpodir = gpodir
# Iterate over backup files and restore with DTD
self.restore_from_backup_to_local_dir(backup, self.gpodir,
dtd_header)
@ -1692,6 +1697,10 @@ class cmd_restore(cmd_create):
self.samdb.modify(m)
if tmpdir is None:
# Without --tmpdir, we created one in /tmp/. It must go.
shutil.rmtree(self.tmpdir)
except Exception as e:
import traceback
traceback.print_exc()