The branch, master has been updated via efad13a build: Exclude source4/selftest/provisions/release-4-1-0rc3 from the tarball via f596dc9 dbcheck: Ensure dbcheck can operate with --attrs set from 5277fc4 s3-rpc_server: Fix handling of fragmented rpc requests.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit efad13addca918e18e3df341cc38405a93028940 Author: Andrew Bartlett <abart...@samba.org> Date: Mon Mar 3 14:26:36 2014 +1300 build: Exclude source4/selftest/provisions/release-4-1-0rc3 from the tarball Change-Id: Id4ddaabb91363174d2fbef09e823f53b13912a51 Signed-off-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> Autobuild-User(master): Stefan Metzmacher <me...@samba.org> Autobuild-Date(master): Fri Mar 21 10:06:04 CET 2014 on sn-devel-104 commit f596dc94e1ab839f13e2a9edbcec774635b5c211 Author: Andrew Bartlett <abart...@samba.org> Date: Thu Feb 27 15:17:35 2014 +1300 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 <abart...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> ----------------------------------------------------------------------- Summary of changes: python/samba/dbchecker.py | 2 +- testprogs/blackbox/dbcheck.sh | 5 +++++ wscript | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py index 4281e6b..e6f26c3 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 c1e8aaf..66628b0 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 diff --git a/wscript b/wscript index 26431a4..5007834 100644 --- a/wscript +++ b/wscript @@ -12,7 +12,7 @@ import wafsamba, Options, samba_dist, Scripting, Utils, samba_version samba_dist.DIST_DIRS('.') -samba_dist.DIST_BLACKLIST('.gitignore .bzrignore source4/selftest/provisions/alpha13 source4/selftest/provisions/release-4-0-0/') +samba_dist.DIST_BLACKLIST('.gitignore .bzrignore source4/selftest/provisions/alpha13 source4/selftest/provisions/release-4-0-0/ source4/selftest/provisions/release-4-1-0rc3/') # install in /usr/local/samba by default Options.default_prefix = '/usr/local/samba' -- Samba Shared Repository