diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2017-02-02 16:27:35 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2017-02-13 03:39:23 +0100 |
| commit | 35bfc62a31c9ad73449594ddd48f76f50e0abade (patch) | |
| tree | ad4ec4af58e7018086214426f1356ab014dc3fce /testprogs | |
| parent | 77b37e937299224eb0750be1f4b1cb487c6c0070 (diff) | |
| download | samba-35bfc62a31c9ad73449594ddd48f76f50e0abade.tar.gz | |
dbcheck: Do not regard old one-way-links as errors
Samba does not maintain one way links when the target is deleted or renamed
so do not fail dbcheck because of such links, but allow them to be updated.
This matters because administrators and make test expect that normal Samba
operation do NOT cause the database to become corrupt, and any error from
dbcheck tends to trigger alarms (or test failures).
If an object pointed at by a one way link is renamed or deleted in normal
operations (such as intersiteTopologyGenerator pointing at a demoted DC),
or make test, then this could trigger.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12577
Diffstat (limited to 'testprogs')
| -rwxr-xr-x | testprogs/blackbox/renamedc.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/testprogs/blackbox/renamedc.sh b/testprogs/blackbox/renamedc.sh index 3eb5817c418..7767d9d68ef 100755 --- a/testprogs/blackbox/renamedc.sh +++ b/testprogs/blackbox/renamedc.sh @@ -65,8 +65,10 @@ testrenamedc2() { } dbcheck_fix() { + # Unlike most calls to dbcheck --fix, this will not trigger an error, as + # we do not flag an error count for this old DN string case. $BINDIR/samba-tool dbcheck --cross-ncs -s $PREFIX/renamedc_test/etc/smb.conf --fix \ - --quiet --yes fix_all_string_dn_component_mismatch \ + --quiet --yes fix_all_old_dn_string_component_mismatch \ --attrs="fsmoRoleOwner interSiteTopologyGenerator msDS-NC-Replica-Locations" } @@ -83,7 +85,7 @@ testit "confirmrenamedc_sAMAccountName" confirmrenamedc_sAMAccountName || failed testit "confirmrenamedc_dNSHostName" confirmrenamedc_dNSHostName || failed=`expr $failed + 1` testit "confirmrenamedc_rootdse_dnsHostName" confirmrenamedc_rootdse_dnsHostName || failed=`expr $failed + 1` testit "confirmrenamedc_rootdse_dsServiceName" confirmrenamedc_rootdse_dsServiceName || failed=`expr $failed + 1` -testit_expect_failure "dbcheck_fix" dbcheck_fix || failed=`expr $failed + 1` +testit "dbcheck_fix" dbcheck_fix || failed=`expr $failed + 1` testit "dbcheck" dbcheck || failed=`expr $failed + 1` testit "renamedc2" testrenamedc2 || failed=`expr $failed + 1` |