The branch, master has been updated via 474c02a s3-waf: add dependency on talloc or it won't build if talloc.h is not in the default include path via 05036fa s3-winbindd: set the can_do_validation6 also for trusted domain from 389bb4f s3:smbd/oplock_linux: don't overwrite private_data
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 474c02acac3d5c286acda7290b359db91e66d6ef Author: Matthieu Patou <m...@matws.net> Date: Tue Feb 7 10:46:43 2012 -0800 s3-waf: add dependency on talloc or it won't build if talloc.h is not in the default include path The problem occurs only if talloc, tdb and ldb are used as system libraries and talloc is not installed in a default. Autobuild-User: Matthieu Patou <m...@samba.org> Autobuild-Date: Fri Feb 10 23:27:29 CET 2012 on sn-devel-104 commit 05036fab0a9847219c73c0abd931a39fba0bccfd Author: Matthieu Patou <m...@matws.net> Date: Fri Feb 10 11:45:21 2012 -0800 s3-winbindd: set the can_do_validation6 also for trusted domain The flag can_do_validation6 was only set for the domain to which winbindd is the member. Setting this flag in other domains (trusted domain) if it's active directory domain is a good idea as it allow to do level 6 validation also when winbindd is querying them directly. ----------------------------------------------------------------------- Summary of changes: source3/rpc_server/wscript_build | 3 ++- source3/winbindd/winbindd_cm.c | 2 ++ source3/wscript_build | 12 ++++++++---- source4/ntvfs/unixuid/wscript_build | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build index a0829fe..57c76a2 100755 --- a/source3/rpc_server/wscript_build +++ b/source3/rpc_server/wscript_build @@ -26,7 +26,8 @@ bld.SAMBA3_SUBSYSTEM('rpc', vars=locals()) bld.SAMBA3_SUBSYSTEM('RPC_CONFIG', - source='rpc_config.c') + source='rpc_config.c', + deps='talloc') bld.SAMBA3_SUBSYSTEM('RPC_NCACN_NP', source='rpc_ncacn_np.c rpc_handles.c rpc_contexts.c', diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c index 39ac284..3373d96 100644 --- a/source3/winbindd/winbindd_cm.c +++ b/source3/winbindd/winbindd_cm.c @@ -1882,6 +1882,8 @@ static bool set_dc_type_and_flags_trustinfo( struct winbindd_domain *domain ) "running active directory.\n", domain->name, domain->active_directory ? "" : "NOT ")); + domain->can_do_ncacn_ip_tcp = domain->active_directory; + domain->can_do_validation6 = domain->active_directory; domain->initialized = True; diff --git a/source3/wscript_build b/source3/wscript_build index cb16ef2..1e41953 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -734,14 +734,16 @@ bld.SAMBA3_LIBRARY('pdb', vars=locals()) bld.SAMBA3_SUBSYSTEM('SERVER_MUTEX', - source=SERVER_MUTEX_SRC) + source=SERVER_MUTEX_SRC, + deps='talloc') bld.SAMBA3_SUBSYSTEM('PARAM_UTIL', - source=PARAM_UTIL_SRC) + source=PARAM_UTIL_SRC, + deps='talloc') bld.SAMBA3_SUBSYSTEM('LOADPARM_CTX', source='param/loadparm_ctx.c', - deps='''s3_param_h param''', + deps='''talloc s3_param_h param''', vars=locals()) bld.SAMBA_GENERATOR('param/param_global_h', @@ -837,7 +839,8 @@ bld.SAMBA3_SUBSYSTEM('samba3core', vars=locals()) bld.SAMBA3_LIBRARY('smbd_shim', - source='''lib/smbd_shim.c''', + source='''lib/smbd_shim.c''', + deps='talloc', private_library=True) bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP', @@ -1084,6 +1087,7 @@ bld.SAMBA3_LIBRARY('trusts_util', bld.SAMBA3_SUBSYSTEM('tdb-wrap3', source='lib/util_tdb.c', + deps='talloc', vars=locals()) bld.SAMBA3_LIBRARY('dbwrap', diff --git a/source4/ntvfs/unixuid/wscript_build b/source4/ntvfs/unixuid/wscript_build index 3a75709..56fd42d 100644 --- a/source4/ntvfs/unixuid/wscript_build +++ b/source4/ntvfs/unixuid/wscript_build @@ -4,6 +4,6 @@ bld.SAMBA_MODULE('ntvfs_unixuid', source='vfs_unixuid.c', subsystem='ntvfs', init_function='ntvfs_unixuid_init', - deps='auth_unix_token' + deps='auth_unix_token talloc' ) -- Samba Shared Repository