diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2014-02-27 15:17:35 +1300 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2014-03-21 08:03:07 +0100 |
| commit | f596dc94e1ab839f13e2a9edbcec774635b5c211 (patch) | |
| tree | f911e2af0ea7ea249d9a638e1d5dbf161e317a24 | |
| parent | 5277fc4d0393ffe2e415ad26610b36d2986c62d7 (diff) | |
| download | samba-f596dc94e1ab839f13e2a9edbcec774635b5c211.tar.gz samba-f596dc94e1ab839f13e2a9edbcec774635b5c211.tar.xz samba-f596dc94e1ab839f13e2a9edbcec774635b5c211.zip | |
dbcheck: Ensure dbcheck can operate with --attrs set
This also includes a test to ensure we do not regress on this point.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
| -rw-r--r-- | python/samba/dbchecker.py | 2 | ||||
| -rwxr-xr-x | testprogs/blackbox/dbcheck.sh | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py index 4281e6bcbc..e6f26c3753 100644 --- a/python/samba/dbchecker.py +++ b/python/samba/dbchecker.py @@ -1142,7 +1142,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) self.fix_metadata(dn, att) if self.is_fsmo_role(dn): - if "fSMORoleOwner" not in obj: + if "fSMORoleOwner" not in obj and ("*" in attrs or "fsmoroleowner" in map(str.lower, attrs)): self.err_no_fsmoRoleOwner(obj) error_count += 1 diff --git a/testprogs/blackbox/dbcheck.sh b/testprogs/blackbox/dbcheck.sh index c1e8aafd36..66628b0519 100755 --- a/testprogs/blackbox/dbcheck.sh +++ b/testprogs/blackbox/dbcheck.sh @@ -26,12 +26,17 @@ reindex() { $BINDIR/samba-tool dbcheck --reindex } +fixed_attrs() { + $BINDIR/samba-tool dbcheck --attrs=cn +} + force_modules() { $BINDIR/samba-tool dbcheck --force-modules } testit "dbcheck" dbcheck testit "reindex" reindex +testit "fixed_attrs" fixed_attrs testit "force_modules" force_modules exit $failed |