sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-03 01:18:10 +03:00
Code

dbcheck: Ensure dbcheck can operate with --attrs set

Browse Source 
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>
This commit is contained in:
Andrew Bartlett 2014-02-27 15:17:35 +13:00 committed by Stefan Metzmacher
parent 5277fc4d03
commit f596dc94e1
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/samba/dbchecker.py
View File

@ -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

5
testprogs/blackbox/dbcheck.sh
View File

@ -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