sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-07 20:23:50 +03:00
Code Activity

gpo: During restore clobber GPT.INI with a blank version

Browse Source 
Generally speaking, there is not much value to keeping this file. The
display name does not ever seem to be used and the version only applies
to the original domain or DC it was on. The command line option to
revert this behaviour is mostly for the tests or for having a straight
1:1 backup-restore for pure restoration.

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

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Garming Sam
2019-02-26 17:01:19 +13:00
committed by Andrew Bartlett
parent 75cf728398
commit 52e0160116
2 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
python/samba/tests/samba_tool/gpo.py
View File

@@ -169,7 +169,8 @@ class GpoCmdTestCase(SambaToolCmdTest):
temp_path, "--entities",
self.entity_file, "-U%s%%%s" %
(os.environ["USERNAME"],
os.environ["PASSWORD"]))
os.environ["PASSWORD"]),
"--restore-metadata")
gpo_guid = "{%s}" % out.split("{")[1].split("}")[0]
@@ -222,7 +223,8 @@ class GpoCmdTestCase(SambaToolCmdTest):
temp_path, "--entities",
self.entity_file, "-U%s%%%s" %
(os.environ["USERNAME"],
os.environ["PASSWORD"]))
os.environ["PASSWORD"]),
"--restore-metadata")
gpo_guid = "{%s}" % out.split("{")[1].split("}")[0]
gpo_guid1 = gpo_guid
@@ -243,7 +245,8 @@ class GpoCmdTestCase(SambaToolCmdTest):
os.environ["SERVER"], "--tmpdir",
temp_path, "-U%s%%%s" %
(os.environ["USERNAME"],
os.environ["PASSWORD"]))
os.environ["PASSWORD"]),
"--restore-metadata")
gpo_guid = "{%s}" % out.split("{")[1].split("}")[0]
gpo_guid2 = gpo_guid
@@ -305,7 +308,8 @@ class GpoCmdTestCase(SambaToolCmdTest):
temp_path, "--entities",
self.entity_file, "-U%s%%%s" %
(os.environ["USERNAME"],
os.environ["PASSWORD"]))
os.environ["PASSWORD"]),
"--restore-metadata")
gpo_guid = "{%s}" % out.split("{")[1].split("}")[0]
gpo_guid1 = gpo_guid
@@ -324,7 +328,8 @@ class GpoCmdTestCase(SambaToolCmdTest):
temp_path, "--entities",
self.entity_file, "-U%s%%%s" %
(os.environ["USERNAME"],
os.environ["PASSWORD"]))
os.environ["PASSWORD"]),
"--restore-metadata")
gpo_guid = "{%s}" % out.split("{")[1].split("}")[0]
gpo_guid2 = gpo_guid
@@ -404,7 +409,8 @@ class GpoCmdTestCase(SambaToolCmdTest):
temp_path, "--entities",
alt_entity_file, "-U%s%%%s" %
(os.environ["USERNAME"],
os.environ["PASSWORD"]))
os.environ["PASSWORD"]),
"--restore-metadata")
self.assertCmdSuccess(result, out, err, "Ensuring gpo restored successfully")
@@ -484,7 +490,8 @@ class GpoCmdTestCase(SambaToolCmdTest):
os.environ["SERVER"], "--tmpdir",
self.tempdir, "-U%s%%%s" %
(os.environ["USERNAME"],
os.environ["PASSWORD"]))
os.environ["PASSWORD"]),
"--restore-metadata")
self.assertCmdSuccess(result, out, err, "Ensuring gpo restored successfully")