diff options
author | Andrew Bartlett <abartlet@samba.org> | 2014-02-27 15:17:35 +1300 |
---|---|---|
committer | Karolin Seeger <kseeger@samba.org> | 2014-07-15 12:46:16 +0200 |
commit | 38c5f5b49e1abcdf3e4d9ef2160de3f9069497f1 (patch) | |
tree | 78cf151d7928b87a37b00ada8ac3e0b627dd7d07 | |
parent | e4bf67aed49b16610f517f871576bb644312c9c1 (diff) | |
download | samba-38c5f5b49e1abcdf3e4d9ef2160de3f9069497f1.tar.gz |
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>
(cherry picked from commit f596dc94e1ab839f13e2a9edbcec774635b5c211)
-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 e96062e475..c65861087f 100644 --- a/python/samba/dbchecker.py +++ b/python/samba/dbchecker.py @@ -1268,7 +1268,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 |