The branch, master has been updated via e9b638c autobuild: cover the Gentoo case with python disabled all down the stack via 95c117f Make ldb configuration --disable-python work as intended via 4c354cd torture: Give extra information on WINBINDD_SHOW_SEQUENCE failure from a9084dc s3:utils: Remove double error check
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit e9b638c43f006bd48158f21fc9b598c61d615499 Author: Andrew Bartlett <abart...@samba.org> Date: Thu May 10 09:09:56 2018 +1200 autobuild: cover the Gentoo case with python disabled all down the stack 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 May 25 13:07:47 CEST 2018 on sn-devel-144 commit 95c117ff1114122aad367adab6c738b835a7c3d3 Author: Timur I. Bakeyev <ti...@ixsystems.com> Date: Fri May 18 10:10:50 2018 +0800 Make ldb configuration --disable-python work as intended Signed-off-by: Timur I. Bakeyev <ti...@ixsystems.com> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> commit 4c354cd551715e98b9d016be6f1c6bc02a931192 Author: Andrew Bartlett <abart...@samba.org> Date: Thu May 24 13:49:11 2018 +1200 torture: Give extra information on WINBINDD_SHOW_SEQUENCE failure Signed-off-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> ----------------------------------------------------------------------- Summary of changes: lib/ldb/wscript | 13 ++++++------- script/autobuild.py | 32 ++++++++++++++++++++++++++++---- source4/torture/winbind/struct_based.c | 22 +++++++++++++++++++++- 3 files changed, 55 insertions(+), 12 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/ldb/wscript b/lib/ldb/wscript index dfca1bc..412bd4f 100644 --- a/lib/ldb/wscript +++ b/lib/ldb/wscript @@ -201,9 +201,15 @@ def build(bld): bld.RECURSE('lib/tdb') if bld.env.standalone_ldb: + if not 'PACKAGE_VERSION' in bld.env: + bld.env.PACKAGE_VERSION = VERSION + bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' private_library = False else: private_library = True + # we're not currently linking against the ldap libs, but ldb.pc.in + # has @LDAP_LIBS@ + bld.env.LDAP_LIBS = '' LDB_MAP_SRC = bld.SUBDIR('ldb_map', 'ldb_map.c ldb_map_inbound.c ldb_map_outbound.c') @@ -224,13 +230,6 @@ def build(bld): if bld.PYTHON_BUILD_IS_ENABLED(): if not bld.CONFIG_SET('USING_SYSTEM_PYLDB_UTIL'): for env in bld.gen_python_environments(['PKGCONFIGDIR']): - # we're not currently linking against the ldap libs, but ldb.pc.in - # has @LDAP_LIBS@ - bld.env.LDAP_LIBS = '' - - if not 'PACKAGE_VERSION' in bld.env: - bld.env.PACKAGE_VERSION = VERSION - bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' name = bld.pyembed_libname('pyldb-util') bld.SAMBA_LIBRARY(name, diff --git a/script/autobuild.py b/script/autobuild.py index 2d71b5e..429d644 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -80,9 +80,10 @@ samba_configure_params = " --picky-developer ${PREFIX} ${EXTRA_PYTHON} --with-pr samba_libs_envvars = "PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH" samba_libs_envvars += " PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig" samba_libs_envvars += " ADDITIONAL_CFLAGS='-Wmissing-prototypes'" -samba_libs_configure_base = samba_libs_envvars + " ./configure --abi-check --enable-debug --picky-developer -C ${PREFIX} ${EXTRA_PYTHON}" -samba_libs_configure_libs = samba_libs_configure_base + " --bundled-libraries=cmocka,NONE" -samba_libs_configure_samba = samba_libs_configure_base + " --bundled-libraries=!talloc,!pytalloc-util,!tdb,!pytdb,!ldb,!pyldb,!pyldb-util,!tevent,!pytevent" +samba_libs_configure_base = samba_libs_envvars + " ./configure --abi-check --enable-debug --picky-developer -C ${PREFIX}" +samba_libs_configure_libs = samba_libs_configure_base + " --bundled-libraries=cmocka,NONE ${EXTRA_PYTHON}" +samba_libs_configure_bundled_libs = " --bundled-libraries=!talloc,!pytalloc-util,!tdb,!pytdb,!ldb,!pyldb,!pyldb-util,!tevent,!pytevent" +samba_libs_configure_samba = samba_libs_configure_base + samba_libs_configure_bundled_libs + " ${EXTRA_PYTHON}" if os.environ.get("AUTOBUILD_NO_EXTRA_PYTHON", "0") == "1": extra_python = "" @@ -274,7 +275,30 @@ tasks = { ("make", "make -j", "text/plain"), ("install", "make install", "text/plain"), ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"), - ("clean", "make clean", "text/plain") + ("clean", "make clean", "text/plain"), + + ("talloc-configure", "cd lib/talloc && " + samba_libs_configure_base + " --bundled-libraries=cmocka,NONE --disable-python", "text/plain"), + ("talloc-make", "cd lib/talloc && make", "text/plain"), + ("talloc-install", "cd lib/talloc && make install", "text/plain"), + + ("tdb-configure", "cd lib/tdb && " + samba_libs_configure_base + " --bundled-libraries=cmocka,NONE --disable-python", "text/plain"), + ("tdb-make", "cd lib/tdb && make", "text/plain"), + ("tdb-install", "cd lib/tdb && make install", "text/plain"), + + ("tevent-configure", "cd lib/tevent && " + samba_libs_configure_base + " --bundled-libraries=cmocka,NONE --disable-python", "text/plain"), + ("tevent-make", "cd lib/tevent && make", "text/plain"), + ("tevent-install", "cd lib/tevent && make install", "text/plain"), + + ("ldb-configure", "cd lib/ldb && " + samba_libs_configure_base + " --bundled-libraries=cmocka,NONE --disable-python", "text/plain"), + ("ldb-make", "cd lib/ldb && make", "text/plain"), + ("ldb-install", "cd lib/ldb && make install", "text/plain"), + + # retry against installed library packages + ("libs-configure", samba_libs_configure_base + samba_libs_configure_bundled_libs + " --disable-python --without-ad-dc", "text/plain"), + ("libs-make", "make -j", "text/plain"), + ("libs-install", "make install", "text/plain"), + ("libs-check-clean-tree", "script/clean-source-tree.sh", "text/plain"), + ("libs-clean", "make clean", "text/plain") ], diff --git a/source4/torture/winbind/struct_based.c b/source4/torture/winbind/struct_based.c index 9cf0102..7ea5aa7 100644 --- a/source4/torture/winbind/struct_based.c +++ b/source4/torture/winbind/struct_based.c @@ -805,7 +805,27 @@ static bool torture_winbind_struct_show_sequence(struct torture_context *torture ZERO_STRUCT(rep); fstrcpy(req.domain_name, domlist[i].netbios_name); - DO_STRUCT_REQ_REP(WINBINDD_SHOW_SEQUENCE, &req, &rep); + ok = true; + DO_STRUCT_REQ_REP_EXT(WINBINDD_SHOW_SEQUENCE, &req, &rep, + NSS_STATUS_SUCCESS, + false, ok = false, + "WINBINDD_SHOW_SEQUENCE"); + if (ok == false) { + torture_warning(torture, + "WINBINDD_SHOW_SEQUENCE on " + "domain %s failed\n", + req.domain_name); + + torture_comment(torture, + "Trust list for " + "WINBINDD_SHOW_SEQUENCE was:\n"); + for (i=0; domlist[i].netbios_name; i++) { + torture_comment(torture, "%s\n", + domlist[i].netbios_name); + } + + return false; + } seq = rep.data.sequence_number; -- Samba Shared Repository