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

samba-tool: Give better error information when the 'domain backup restore' fails with a duplicate SID

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14575

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>

Autobuild-User(master): Gary Lockyer <gary@samba.org>
Autobuild-Date(master): Thu Nov 26 21:15:40 UTC 2020 on sn-devel-184
This commit is contained in:
Andrew Bartlett
2020-11-13 15:26:07 +13:00
committed by Gary Lockyer
parent 1a86474912
commit 8ad82ae661
1 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,7 @@ import tdb
import samba.getopt as options
from samba.samdb import SamDB, get_default_backend_store
import ldb
from ldb import LdbError
from samba.samba3 import libsmb_samba_internal as libsmb
from samba.samba3 import param as s3param
from samba.ntacls import backup_online, backup_restore, backup_offline
@@ -584,7 +585,49 @@ class cmd_domain_backup_restore(cmd_fsmo_seize):
attrs=['sidForRestore'])
sid = res[0].get('sidForRestore')[0]
logger.info('Creating account with SID: ' + str(sid))
ctx.join_add_objects(specified_sid=dom_sid(str(sid)))
try:
ctx.join_add_objects(specified_sid=dom_sid(str(sid)))
except LdbError as e:
(enum, emsg) = e.args
if enum != ldb.ERR_CONSTRAINT_VIOLATION:
raise
dup_res = []
try:
dup_res = samdb.search(base=ldb.Dn(samdb, "<SID=%s>" % sid),
scope=ldb.SCOPE_BASE,
attrs=['objectGUID'],
controls=["show_deleted:0",
"show_recycled:0"])
except LdbError as dup_e:
if enum != ldb.ERR_NO_SUCH_OBJECT:
raise e
if (len(dup_res) != 1):
raise e
objectguid = samdb.schema_format_value("objectGUID",
dup_res[0]["objectGUID"][0])
objectguid = objectguid.decode('utf-8')
logger.error("The RID Pool on the source DC for the backup in %s "
"may be corrupt "
"or in conflict with SIDs already allocated "
"in the domain. " % backup_file)
logger.error("Running 'samba-tool dbcheck' on the source "
"DC (and obtaining a new backup) may correct the issue.")
logger.error("Alternatively please obtain a new backup "
"against a different DC.")
logger.error("The SID we wish to use (%s) is recorded in "
"@SAMBA_DSDB as the sidForRestore attribute."
% sid)
raise CommandError("Domain restore failed because there "
"is already an existing object (%s) "
"with SID %s and objectGUID %s. "
"This conflicts with "
"the new DC account we want to add "
"for the restored domain. " % (
dup_res[0].dn, sid, objectguid))
m = ldb.Message()
m.dn = ldb.Dn(samdb, '@ROOTDSE')