The branch, master has been updated via bea7a25 build: Assert that auth_domain, auth_builtin, auth_sam, auth_winbind are builtin via 7786919 BUG #9295: Build standard auth modules as internal modules. from 64886e3 Warn when setting UID/GID without idmap_ldb:use rfc2307 = Yes
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit bea7a251781c65a87af6c6e1568cb71a5aef3f7f Author: Andrew Bartlett <abart...@samba.org> Date: Thu Oct 18 19:58:04 2012 +1100 build: Assert that auth_domain, auth_builtin, auth_sam, auth_winbind are builtin These modules are used by default and for various reasons cannot be compiled into a .so The code setting up these lists is generic, so it is easier to just assert early, for this non-default configuration. Andrew Bartlett Signed-off-by: Andreas Schneider <a...@samba.org> Address bug #9295 - Can't find guest.so module if auth_builtin is built as module. Autobuild-User(master): Karolin Seeger <ksee...@samba.org> Autobuild-Date(master): Thu Oct 18 13:14:38 CEST 2012 on sn-devel-104 commit 7786919428527f8e3b75806f5058ddd2a6ad4fab Author: Andreas Schneider <a...@samba.org> Date: Wed Oct 17 16:30:57 2012 +0200 BUG #9295: Build standard auth modules as internal modules. Signed-off-by: Andreas Schneider <a...@samba.org> ----------------------------------------------------------------------- Summary of changes: source3/auth/wscript_build | 12 ++++-------- source3/wscript | 6 ++++++ 2 files changed, 10 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/auth/wscript_build b/source3/auth/wscript_build index 8a535cb..e518de9 100644 --- a/source3/auth/wscript_build +++ b/source3/auth/wscript_build @@ -40,8 +40,7 @@ bld.SAMBA3_MODULE('auth_sam', source=AUTH_SAM_SRC, deps='samba-util', init_function='', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_sam'), - enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_sam')) + internal_module=True) bld.SAMBA3_MODULE('auth_unix', subsystem='auth', @@ -56,8 +55,7 @@ bld.SAMBA3_MODULE('auth_winbind', source=AUTH_WINBIND_SRC, deps='samba-util', init_function='', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_winbind'), - enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_winbind')) + internal_module=True) bld.SAMBA3_MODULE('auth_wbc', subsystem='auth', @@ -72,16 +70,14 @@ bld.SAMBA3_MODULE('auth_domain', source=AUTH_DOMAIN_SRC, deps='RPC_CLIENT_SCHANNEL trusts_util', init_function='', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_domain'), - enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_domain')) + internal_module=True) bld.SAMBA3_MODULE('auth_builtin', subsystem='auth', source=AUTH_BUILTIN_SRC, deps='samba-util', init_function='', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_builtin'), - enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_builtin')) + internal_module=True) bld.SAMBA3_MODULE('auth_script', subsystem='auth', diff --git a/source3/wscript b/source3/wscript index 11ef767..3874df5 100644 --- a/source3/wscript +++ b/source3/wscript @@ -1617,6 +1617,12 @@ main() { final_static_modules.remove(m) final_shared_modules.append(m) + if ("auth_domain" not in final_static_modules) or \ + ("auth_builtin" not in final_static_modules) or \ + ("auth_sam" not in final_static_modules) or \ + ("auth_winbind" not in final_static_modules): + raise Utils.WafError('These auth modules MUST be configured as static modules: auth_domain, auth_builtin, auth_sam, auth_winbind') + conf.env['static_modules'] = final_static_modules conf.env['shared_modules'] = final_shared_modules -- Samba Shared Repository