The branch, master has been updated via 63c2784 selftest/flapping: samba4.nss.test is also flakey for s3member via 333cee7 s3:autoconf: add -Iautoconf -Iautoconf/source3 at configure stage via a146f07 s3:Makefile.in: remove pidl generated files with 'make realdistclean' via 9cbea1f s3:Makefile.in: fix 'make realdistclean' after moving generated files to autoconf/ via 071dfb4 s3:Makefile.in: fix 'make clean' after moving generated files to autoconf/ via 9522e85 s3:autogen.sh: fix autoconf/lib/param/param_proto.h location via da76cda lib/param: add missing prototype of lpcfg_parm_long() from d4912ed s3:autoconf-build: build the idmap backends tdb2, rid, and hash by default (shared)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 63c2784076b651c7ad43d672e724ed6aeae49ffb Author: Stefan Metzmacher <me...@samba.org> Date: Mon Jun 18 15:25:25 2012 +0200 selftest/flapping: samba4.nss.test is also flakey for s3member [1426/1518 in 1h24m58s] samba4.nss.test using winbind(s3member) UNEXPECTED(failure): samba4.nss.test using winbind(s3member).run nsstest(s3member) REASON: _StringException: _StringException: ERROR setpwent: NSS_STATUS=-1 1 (nss_errno=0) ERROR getpwent: NSS_STATUS=-1 1 (nss_errno=0) ERROR endpwent: NSS_STATUS=-1 1 (nss_errno=0) ERROR setgrent: NSS_STATUS=-1 1 (nss_errno=0) ERROR getgrent: NSS_STATUS=-1 1 (nss_errno=0) ERROR endgrent: NSS_STATUS=-1 1 (nss_errno=0) ERROR Non existent user gave error -1 ERROR Non existent uid gave error -1 ERROR Non existent group gave error -1 ERROR Non existent gid gave error -1 total_errors=10 metze Autobuild-User(master): Stefan Metzmacher <me...@samba.org> Autobuild-Date(master): Mon Jun 18 17:59:25 CEST 2012 on sn-devel-104 commit 333cee7484c0c597824b44c9b6726046fbb89c2a Author: Stefan Metzmacher <me...@samba.org> Date: Mon Jun 18 09:14:55 2012 +0200 s3:autoconf: add -Iautoconf -Iautoconf/source3 at configure stage There're some configure tests which require this. metze commit a146f0708e9eb784c376bfa49a0e3435409bf98d Author: Stefan Metzmacher <me...@samba.org> Date: Mon Jun 18 09:33:48 2012 +0200 s3:Makefile.in: remove pidl generated files with 'make realdistclean' metze commit 9cbea1f6ed977b3e66846741555bd0751521fcdc Author: Stefan Metzmacher <me...@samba.org> Date: Mon Jun 18 09:32:17 2012 +0200 s3:Makefile.in: fix 'make realdistclean' after moving generated files to autoconf/ metze commit 071dfb42f2e020dc4b87bd5bbde7d7e17af2fd83 Author: Stefan Metzmacher <me...@samba.org> Date: Mon Jun 18 09:32:17 2012 +0200 s3:Makefile.in: fix 'make clean' after moving generated files to autoconf/ metze commit 9522e853c291bed51e289f4c2ff8ad2fb1ad1a8f Author: Stefan Metzmacher <me...@samba.org> Date: Mon Jun 18 10:31:09 2012 +0200 s3:autogen.sh: fix autoconf/lib/param/param_proto.h location metze commit da76cda93f3a1d0538a00f64f76a3af6a04e22f6 Author: Stefan Metzmacher <me...@samba.org> Date: Mon Jun 18 10:02:47 2012 +0200 lib/param: add missing prototype of lpcfg_parm_long() metze ----------------------------------------------------------------------- Summary of changes: lib/param/param.h | 3 +++ selftest/flapping | 2 +- source3/Makefile.in | 16 +++++++--------- source3/autogen.sh | 2 +- source3/configure.in | 3 ++- 5 files changed, 14 insertions(+), 12 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/param/param.h b/lib/param/param.h index d821fa3..e20a10c 100644 --- a/lib/param/param.h +++ b/lib/param/param.h @@ -93,6 +93,9 @@ int lpcfg_parm_bytes(struct loadparm_context *lp_ctx, unsigned long lpcfg_parm_ulong(struct loadparm_context *lp_ctx, struct loadparm_service *service, const char *type, const char *option, unsigned long default_v); +long lpcfg_parm_long(struct loadparm_context *lp_ctx, + struct loadparm_service *service, const char *type, + const char *option, long default_v); double lpcfg_parm_double(struct loadparm_context *lp_ctx, struct loadparm_service *service, const char *type, const char *option, double default_v); diff --git a/selftest/flapping b/selftest/flapping index d8e8ba8..4f6c055 100644 --- a/selftest/flapping +++ b/selftest/flapping @@ -23,4 +23,4 @@ ^samba3.raw.acls.inheritance\(plugin_s4_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16 ^samba3.raw.samba3checkfsp.samba3checkfsp\(plugin_s4_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16 ^samba3.raw.samba3closeerr.samba3closeerr\(plugin_s4_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16 -^samba4.nss.test.*using.*winbind\(s3dc\).run.*nsstest # fails sometimes on sn-devel +^samba4.nss.test.*using.*winbind\(s3.*\).run.*nsstest # fails sometimes on sn-devel diff --git a/source3/Makefile.in b/source3/Makefile.in index e7a0a7d..e4c2f71 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -170,8 +170,6 @@ FLAGS = -I. \ $(ISA) \ -I$(srcdir)/lib \ -I.. \ - -Iautoconf \ - -Iautoconf/source3 \ -I./../lib/ldb/include \ -D_SAMBA_BUILD_=3 @@ -3199,12 +3197,11 @@ cleanlibs:: clean:: cleanlibs -rm -f include/build_env.h -rm -f smbd/build_options.c - -rm -f param/param_local.h - -rm -f param/param_global.h - -rm -f ../lib/param/param_local.h - -rm -f ../lib/param/param_global.h - -rm -f ../lib/param/param_proto.h - -rm -f ../lib/param/s3_param.h + -rm -f autoconf/lib/param/param_local.h + -rm -f autoconf/lib/param/param_global.h + -rm -f autoconf/lib/param/param_proto.h + -rm -f autoconf/lib/param/s3_param.h + -rm -f autoconf/source3/param/param_global.h -rm -f $(PRECOMPILED_HEADER) -rm -f core */*~ *~ \ */*.o */*/*.o */*/*/*.o */*/*/*/*.o \ @@ -3245,7 +3242,8 @@ distclean:: realclean realdistclean:: distclean -rm -f include/autoconf/config.h.in - -rm -f include/version.h + -rm -f include/autoconf/version.h + -rm -f autoconf/librpc/gen_ndr/*.[ch] -rm -f configure # when configure.in is updated, reconfigure diff --git a/source3/autogen.sh b/source3/autogen.sh index bd0d99d..2238efb 100755 --- a/source3/autogen.sh +++ b/source3/autogen.sh @@ -98,7 +98,7 @@ fi perl ../script/mkparamdefs.pl ../lib/param/param_functions.c --file autoconf/lib/param/param_local.h --generate-scope=LOCAL perl ../script/mkparamdefs.pl ../lib/param/loadparm.c ../lib/param/param_functions.c --file autoconf/lib/param/param_global.h --generate-scope=GLOBAL perl ../script/mkparamdefs.pl param/loadparm.c ../lib/param/param_functions.c --file autoconf/source3/param/param_global.h --generate-scope=GLOBAL -perl ../source4/script/mkproto.pl ../lib/param/loadparm.c ../lib/param/param_functions.c --public autoconf/lib/param/param_proto.h --private ../lib/param/param_proto.h +perl ../source4/script/mkproto.pl ../lib/param/loadparm.c ../lib/param/param_functions.c --public autoconf/lib/param/param_proto.h --private autoconf/lib/param/param_proto.h perl ../script/mks3param.pl ../lib/param/loadparm.c ../lib/param/param_functions.c --file autoconf/lib/param/s3_param.h echo "Now run ./configure (or ./configure.developer) and then make." diff --git a/source3/configure.in b/source3/configure.in index e6b1a73..6705a27 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -35,7 +35,8 @@ done AC_SUBST(LIBTEVENT_OBJ0) LIBS="${LIBS} ${TEVENT_LIBS}" -SAMBA_CPPFLAGS="-Iinclude/autoconf -Iinclude -I${srcdir-.}/include -I. -I${srcdir-.}" +SAMBA_CPPFLAGS="-Iinclude/autoconf -Iautoconf -Iautoconf/source3" +SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -Iinclude -I${srcdir-.}/include -I. -I${srcdir-.}" SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/replace" SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TEVENT_CFLAGS}" SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${CCAN_CFLAGS}" -- Samba Shared Repository