summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--python/samba/dbchecker.py2
-rwxr-xr-xtestprogs/blackbox/dbcheck.sh5
2 files changed, 6 insertions, 1 deletions
diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py
index e96062e475b..c65861087f7 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 c1e8aafd36f..66628b05190 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