Skip to content

samba-tool: Give better error information when the 'domain backup restore'...

Andrew Bartlett requested to merge samba-team/devel/samba:abartlet/sid-restore-better-failure into master

Give better error information when the 'domain backup restore' fails with a duplicate SID

This is much better than a traceback and horrible warning from LDB (including base64-encoded SID).

Manually tested (but can't be worse than the old traceback) by editing the @SAMBA_DSDB record of a backup file.

Checklist

  • Commits have Signed-off-by: with name/author being identical to the commit author
  • (optional) This MR is just one part towards a larger feature.
  • (optional, if backport required) Bugzilla bug filed and BUG: tag added
  • Test suite updated with functionality tests
  • Test suite updated with negative tests
  • Documentation updated
  • CI timeout is 3h or higher (see Settings/CICD/General pipelines/ Timeout)

Reviewer's checklist:

  • There is a test suite reasonably covering new functionality or modifications
  • Function naming, parameters, return values, types, etc., are consistent and according to README.Coding.md
  • This feature/change has adequate documentation added
  • No obvious mistakes in the code

Merge request reports