diff options
author | Andreas Schneider <asn@samba.org> | 2013-01-28 16:16:42 +0100 |
---|---|---|
committer | Alexander Bokovoy <ab@samba.org> | 2013-02-06 11:51:11 +0100 |
commit | 1b582c4bf8ad46034eb30c758b085dc210e8096a (patch) | |
tree | cf6bd37435776af4bb59d21f56bf33fc67f1bea0 /source3/passdb/wscript_build | |
parent | 6ba7ab5c14801aecae96373d5a9db7ab82957526 (diff) | |
download | samba-1b582c4bf8ad46034eb30c758b085dc210e8096a.tar.gz samba-1b582c4bf8ad46034eb30c758b085dc210e8096a.tar.bz2 samba-1b582c4bf8ad46034eb30c758b085dc210e8096a.zip |
Rename pdb_ldap to pdb_ldapsam
This patch moves pdb_ldap to pdb_ldapsam unconditionally
and makes possible to load ldapsam.so dynamically
Reviewed-by: Alexander Bokovoy <ab@samba.org>
Diffstat (limited to 'source3/passdb/wscript_build')
-rw-r--r-- | source3/passdb/wscript_build | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source3/passdb/wscript_build b/source3/passdb/wscript_build index 03c8b56f7e..a6620cd7f4 100644 --- a/source3/passdb/wscript_build +++ b/source3/passdb/wscript_build @@ -13,15 +13,13 @@ 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', +bld.SAMBA3_MODULE('pdb_ldapsam', subsystem='pdb', deps='smbldap smbldaphelper', source=PDB_LDAP_SRC, init_function='', - internal_module=True, - enabled=bld.CONFIG_SET('HAVE_LDAP')) + internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_ldapsam'), + enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_ldapsam') and bld.CONFIG_SET('HAVE_LDAP')) bld.SAMBA3_MODULE('pdb_smbpasswd', subsystem='pdb', |