The branch, v4-14-test has been updated via 1cf726dd52f build: Notice if flex is missing at configure time via b74a079a202 s3-iremotewinspool: set the per-request memory context from 12bfc430063 build: Only add -Wl,--as-needed when supported
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-14-test - Log ----------------------------------------------------------------- commit 1cf726dd52fe0ba383a67e7292f642090e8931cf Author: Andrew Bartlett <abart...@samba.org> Date: Fri Mar 26 21:48:45 2021 +1300 build: Notice if flex is missing at configure time This may also fix the coverage build by ensuring --noline is always specified to flex. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14586 Signed-off-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Gary Lockyer <g...@catalyst.net.nz> Autobuild-User(master): Andrew Bartlett <abart...@samba.org> Autobuild-Date(master): Mon Mar 29 02:12:23 UTC 2021 on sn-devel-184 (cherry picked from commit 942c0d2128cb8e64a9354dde6bdae82a1c1c3d88) Autobuild-User(v4-14-test): Karolin Seeger <ksee...@samba.org> Autobuild-Date(v4-14-test): Tue Apr 20 07:39:05 UTC 2021 on sn-devel-184 commit b74a079a202089644090094dac06d327ff31aeec Author: Samuel Cabrero <scabr...@samba.org> Date: Thu Apr 8 18:45:38 2021 +0200 s3-iremotewinspool: set the per-request memory context The iremotewinspool service is not using the pidl autogenerated code. Set the per-request memory context following the changes made is commit 5a7e9ade9a4cdfa68900c6a64b639f53c0da47ad. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14675 CI: https://gitlab.com/samba-team/samba/-/merge_requests/1890 Signed-off-by: Samuel Cabrero <scabr...@samba.org> Reviewed-by: Ralph Boehme <s...@samba.org> Autobuild-User(master): Ralph Böhme <s...@samba.org> Autobuild-Date(master): Fri Apr 9 15:20:02 UTC 2021 on sn-devel-184 (cherry picked from commit 1efa9ffd7ae77ebf22b28c12dd642a89991b75d2) ----------------------------------------------------------------------- Summary of changes: source3/rpc_server/spoolss/srv_iremotewinspool.c | 2 ++ source3/wscript | 9 --------- wscript | 16 +++++++++++++--- wscript_configure_embedded_heimdal | 3 +++ 4 files changed, 18 insertions(+), 12 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/rpc_server/spoolss/srv_iremotewinspool.c b/source3/rpc_server/spoolss/srv_iremotewinspool.c index 26b225818f8..d6a983c722a 100644 --- a/source3/rpc_server/spoolss/srv_iremotewinspool.c +++ b/source3/rpc_server/spoolss/srv_iremotewinspool.c @@ -100,6 +100,7 @@ static NTSTATUS iremotewinspool__op_dispatch_internal(struct dcesrv_call_state * /* Update pipes struct opnum */ p->opnum = opnum; p->dce_call = dce_call; + p->mem_ctx = mem_ctx; /* Update pipes struct session info */ pipe_session_info = p->session_info; p->session_info = dce_call->auth_state->session_info; @@ -1238,6 +1239,7 @@ fail: } p->dce_call = NULL; + p->mem_ctx = NULL; /* Restore session info */ p->session_info = pipe_session_info; p->auth.auth_type = 0; diff --git a/source3/wscript b/source3/wscript index ba02a3586b9..adc31ce57b8 100644 --- a/source3/wscript +++ b/source3/wscript @@ -1838,15 +1838,6 @@ main() { define=None, on_target=False) - Logs.info("Checking for flex") - conf.find_program('flex', var='FLEX') - if conf.env['FLEX']: - conf.env.FLEXFLAGS = ['-t'] - conf.CHECK_COMMAND('%s --version' % conf.env.FLEX[0], - msg='Using flex version', - define=None, - on_target=False) - with_spotlight_tracker_backend = ( conf.CONFIG_SET('HAVE_TRACKER') and conf.CONFIG_SET('HAVE_GLIB') diff --git a/wscript b/wscript index 172d05c052b..83d94211338 100644 --- a/wscript +++ b/wscript @@ -240,6 +240,19 @@ def configure(conf): if not (Options.options.without_ad_dc): conf.DEFINE('AD_DC_BUILD_IS_ENABLED', 1) + # Check for flex before doing the embedded heimdal checks so we can bail if we don't have it. + Logs.info("Checking for flex") + conf.find_program('flex', var='FLEX') + if conf.env['FLEX']: + conf.CHECK_COMMAND('%s --version' % conf.env.FLEX[0], + msg='Using flex version', + define=None, + on_target=False) + conf.env.FLEXFLAGS = ['-t'] + + # #line statements in these generated files cause issues for lcov + conf.env.FLEXFLAGS += ["--noline"] + if Options.options.with_system_mitkrb5: if not Options.options.with_experimental_mit_ad_dc and \ not Options.options.without_ad_dc: @@ -372,9 +385,6 @@ def configure(conf): msg="Checking compiler for full RELRO support"): conf.env['ENABLE_RELRO'] = True - # #line statements in these generated files cause issues for lcov - conf.env.FLEXFLAGS += ["--noline"] - conf.SAMBA_CONFIG_H('include/config.h') def etags(ctx): diff --git a/wscript_configure_embedded_heimdal b/wscript_configure_embedded_heimdal index 8c55ae2a938..92a29f71bf8 100644 --- a/wscript_configure_embedded_heimdal +++ b/wscript_configure_embedded_heimdal @@ -1 +1,4 @@ +if not conf.env['FLEX']: + conf.fatal("Embedded Heimdal build requires flex but it was not found. Install flex or use --with-system-mitkrb5 or --with-system-heimdalkrb5") + conf.RECURSE('source4/heimdal_build') -- Samba Shared Repository