From 3d1abb93280fbfe01ed899fa4685290ce3960ed8 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 22 Jan 2013 09:55:02 +0100 Subject: [PATCH] waf: Fix pdb_ldap which cannot be built as a module. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The module has two init functions, pdb_ldap_init() and pdb_ldapsam_init(). As a shared module only one can be found until we create a symlink. Reviewed-by: Günther Deschner Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Wed Jan 23 10:51:59 CET 2013 on sn-devel-104 --- source3/passdb/wscript_build | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/source3/passdb/wscript_build b/source3/passdb/wscript_build index 03a0df4174bf..03c8b56f7e65 100644 --- a/source3/passdb/wscript_build +++ b/source3/passdb/wscript_build @@ -13,13 +13,15 @@ bld.SAMBA3_MODULE('pdb_tdbsam', internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_tdbsam'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_tdbsam')) +# This cannot be built as a shared module cause it has two init functions. The +# code needs to be cleaned up and split to allow this. bld.SAMBA3_MODULE('pdb_ldap', subsystem='pdb', deps='smbldap smbldaphelper', source=PDB_LDAP_SRC, init_function='', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_ldap'), - enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_ldap') and bld.CONFIG_SET('HAVE_LDAP')) + internal_module=True, + enabled=bld.CONFIG_SET('HAVE_LDAP')) bld.SAMBA3_MODULE('pdb_smbpasswd', subsystem='pdb', -- 2.34.1