The branch, master has been updated via 27fc062d7ea heimdal-build: avoid hard-coded /usr/include/heimdal in asn1_compile-generated code. via 7c4341c736c Split winbindd into library and binary from cddc229a468 selftest: Test partial parse behaviour in ndrdump
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 27fc062d7ea2207242d5a2c9933f3de5fa206488 Author: Uri Simchoni <u...@samba.org> Date: Sun Oct 20 21:36:11 2019 +0300 heimdal-build: avoid hard-coded /usr/include/heimdal in asn1_compile-generated code. This fixes a cross-compilation issue, as cross-compilers (rightly) complain if host include directories are in the include path. The fix is taken from buildroot (https://github.com/buildroot/buildroot/blob/8b11b96f41a6ffa76556c9bf03a863955871ee57/package/samba4/0006-heimdal_build-wscript_build-do-not-add-host-include-.patch) where it was applied by Bernd Kuhls <bernd.ku...@t-online.de>. This reverts some of 3fe2bfddda6149f6bf7402720226e9285f479fef, but building Samba's bundled Heimdal with a system roken is not supported anyway. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13856 Signed-off-by: Uri Simchoni <u...@samba.org> Reviewed-by: Andrew Bartlett <abart...@samba.org> Autobuild-User(master): Andrew Bartlett <abart...@samba.org> Autobuild-Date(master): Sun Dec 1 10:22:01 UTC 2019 on sn-devel-184 commit 7c4341c736c875d048ca622217f762b895a945ba Author: Michael Hanselmann <pub...@hansmi.ch> Date: Wed Nov 27 23:25:52 2019 +0000 Split winbindd into library and binary The winbindd program was built in a single target with many source file, making reuse of parts elsewhere impossible. With this change the majority of the code is built as a subsystem and included in the binary as a dependency. Signed-off-by: Michael Hanselmann <pub...@hansmi.ch> Reviewed-by: Volker Lendecke <v...@samba.org> Reviewed-by: Andrew Bartlett <abart...@samba.org> ----------------------------------------------------------------------- Summary of changes: source3/winbindd/wscript_build | 220 +++++++++++++++++++----------------- source4/heimdal_build/wscript_build | 2 +- 2 files changed, 115 insertions(+), 107 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build index a23c44566ed..b31926bf3ce 100644 --- a/source3/winbindd/wscript_build +++ b/source3/winbindd/wscript_build @@ -171,114 +171,122 @@ bld.SAMBA3_MODULE('idmap_script', internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_script'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_script')) +bld.SAMBA3_SUBSYSTEM('winbindd-lib', + source=''' + winbindd_group.c + winbindd_util.c + winbindd_cache.c + winbindd_pam.c + winbindd_misc.c + winbindd_cm.c + winbindd_wins_byip.c + winbindd_wins_byname.c + winbindd_msrpc.c + winbindd_rpc.c + winbindd_reconnect.c + winbindd_reconnect_ads.c + winbindd_ads.c + winbindd_samr.c + winbindd_dual.c + winbindd_dual_ndr.c + winbindd_dual_srv.c + winbindd_async.c + winbindd_creds.c + winbindd_cred_cache.c + winbindd_ccache_access.c + winbindd_domain.c + winbindd_idmap.c + winbindd_locator.c + winbindd_ndr.c + wb_lookupsid.c + wb_lookupsids.c + wb_lookupname.c + wb_sids2xids.c + wb_xids2sids.c + wb_queryuser.c + wb_lookupuseraliases.c + wb_lookupusergroups.c + wb_getpwsid.c + wb_gettoken.c + wb_seqnum.c + wb_seqnums.c + wb_group_members.c + wb_getgrsid.c + wb_query_user_list.c + wb_query_group_list.c + wb_next_pwent.c + wb_next_grent.c + wb_dsgetdcname.c + winbindd_lookupsid.c + winbindd_lookupsids.c + winbindd_lookupname.c + winbindd_sids_to_xids.c + winbindd_xids_to_sids.c + winbindd_allocate_uid.c + winbindd_allocate_gid.c + winbindd_getpwsid.c + winbindd_getpwnam.c + winbindd_getpwuid.c + winbindd_getsidaliases.c + winbindd_getuserdomgroups.c + winbindd_getgroups.c + winbindd_show_sequence.c + winbindd_getgrgid.c + winbindd_getgrnam.c + winbindd_getusersids.c + winbindd_lookuprids.c + winbindd_setpwent.c + winbindd_getpwent.c + winbindd_endpwent.c + winbindd_setgrent.c + winbindd_getgrent.c + winbindd_endgrent.c + winbindd_dsgetdcname.c + winbindd_getdcname.c + winbindd_list_users.c + winbindd_list_groups.c + winbindd_check_machine_acct.c + winbindd_change_machine_acct.c + winbindd_irpc.c + winbindd_ping_dc.c + winbindd_domain_info.c + winbindd_pam_auth.c + winbindd_pam_logoff.c + winbindd_pam_chauthtok.c + winbindd_pam_auth_crap.c + winbindd_pam_chng_pswd_auth_crap.c + winbindd_gpupdate.c''', + deps=''' + talloc + tevent + pdb + popt_samba3 + idmap + ads + msrpc3 + nss_info + LIBAFS + LIBADS_SERVER + LIBCLI_SAMR + SLCACHE + RPC_NDR_DSSETUP + RPC_NDR_WINBIND + SRV_NDR_WINBIND + RPC_SAMR + RPC_LSARPC + RPC_SERVER + WB_REQTRANS + TDB_VALIDATE + MESSAGING + LIBLSA + ''') + bld.SAMBA3_BINARY('winbindd', - source='''winbindd.c - winbindd_group.c - winbindd_util.c - winbindd_cache.c - winbindd_pam.c - winbindd_misc.c - winbindd_cm.c - winbindd_wins_byip.c - winbindd_wins_byname.c - winbindd_msrpc.c - winbindd_rpc.c - winbindd_reconnect.c - winbindd_reconnect_ads.c - winbindd_ads.c - winbindd_samr.c - winbindd_dual.c - winbindd_dual_ndr.c - winbindd_dual_srv.c - winbindd_async.c - winbindd_creds.c - winbindd_cred_cache.c - winbindd_ccache_access.c - winbindd_domain.c - winbindd_idmap.c - winbindd_locator.c - winbindd_ndr.c - wb_lookupsid.c - wb_lookupsids.c - wb_lookupname.c - wb_sids2xids.c - wb_xids2sids.c - wb_queryuser.c - wb_lookupuseraliases.c - wb_lookupusergroups.c - wb_getpwsid.c - wb_gettoken.c - wb_seqnum.c - wb_seqnums.c - wb_group_members.c - wb_getgrsid.c - wb_query_user_list.c - wb_query_group_list.c - wb_next_pwent.c - wb_next_grent.c - wb_dsgetdcname.c - winbindd_lookupsid.c - winbindd_lookupsids.c - winbindd_lookupname.c - winbindd_sids_to_xids.c - winbindd_xids_to_sids.c - winbindd_allocate_uid.c - winbindd_allocate_gid.c - winbindd_getpwsid.c - winbindd_getpwnam.c - winbindd_getpwuid.c - winbindd_getsidaliases.c - winbindd_getuserdomgroups.c - winbindd_getgroups.c - winbindd_show_sequence.c - winbindd_getgrgid.c - winbindd_getgrnam.c - winbindd_getusersids.c - winbindd_lookuprids.c - winbindd_setpwent.c - winbindd_getpwent.c - winbindd_endpwent.c - winbindd_setgrent.c - winbindd_getgrent.c - winbindd_endgrent.c - winbindd_dsgetdcname.c - winbindd_getdcname.c - winbindd_list_users.c - winbindd_list_groups.c - winbindd_check_machine_acct.c - winbindd_change_machine_acct.c - winbindd_irpc.c - winbindd_ping_dc.c - winbindd_domain_info.c - winbindd_pam_auth.c - winbindd_pam_logoff.c - winbindd_pam_chauthtok.c - winbindd_pam_auth_crap.c - winbindd_pam_chng_pswd_auth_crap.c - winbindd_gpupdate.c''', + source=''' + winbindd.c + ''', deps=''' - talloc - tevent - pdb - popt_samba3 - idmap - ads - msrpc3 - nss_info - LIBAFS - LIBADS_SERVER - LIBCLI_SAMR - SLCACHE - RPC_NDR_DSSETUP - RPC_NDR_WINBIND - SRV_NDR_WINBIND - RPC_SAMR - RPC_LSARPC - RPC_SERVER - WB_REQTRANS - TDB_VALIDATE - MESSAGING - LIBLSA + winbindd-lib ''', enabled=bld.env.build_winbind, install_path='${SBINDIR}') diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build index c9a974ca0fb..194defb5680 100644 --- a/source4/heimdal_build/wscript_build +++ b/source4/heimdal_build/wscript_build @@ -140,7 +140,7 @@ def HEIMDAL_ASN1(name, source, samba_cflags = CURRENT_CFLAGS(bld, name, ''), depends_on = '', samba_deps = to_list('roken replace'), - samba_includes = includes + ["/usr/include/heimdal"], + samba_includes = includes, local_include = True) -- Samba Shared Repository