summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2013-01-22 09:55:02 +0100
committerAndreas Schneider <asn@cryptomilk.org>2013-01-23 10:51:59 +0100
commit3d1abb93280fbfe01ed899fa4685290ce3960ed8 (patch)
tree5286317a4a3ea0ef07282eab4e1ab8af16911e7c /source3
parent38a52f71255541fd5d57e6e4fbc1acbe780a10cb (diff)
downloadsamba-3d1abb93280fbfe01ed899fa4685290ce3960ed8.tar.gz
samba-3d1abb93280fbfe01ed899fa4685290ce3960ed8.tar.bz2
samba-3d1abb93280fbfe01ed899fa4685290ce3960ed8.zip
waf: Fix pdb_ldap which cannot be built as a module.
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 <gd@samba.org> Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org> Autobuild-Date(master): Wed Jan 23 10:51:59 CET 2013 on sn-devel-104
Diffstat (limited to 'source3')
-rw-r--r--source3/passdb/wscript_build6
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/passdb/wscript_build b/source3/passdb/wscript_build
index 03a0df4174..03c8b56f7e 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',