diff options
| author | Alexander Bokovoy <ab@samba.org> | 2012-09-13 20:29:25 +0300 |
|---|---|---|
| committer | Alexander Bokovoy <ab@samba.org> | 2012-09-14 01:02:21 +0200 |
| commit | 86a4ca28649141f77556208b833db2e076c0125d (patch) | |
| tree | 2e4c48d3badfa0a4afb48a2f9bcbccee25ded2e3 /source3/wscript_build | |
| parent | 56b752512597acaffa94a979ef9140760e0f5cf3 (diff) | |
| download | samba-86a4ca28649141f77556208b833db2e076c0125d.tar.gz samba-86a4ca28649141f77556208b833db2e076c0125d.tar.bz2 samba-86a4ca28649141f77556208b833db2e076c0125d.zip | |
s3: make smbldaphelper subsystem an internal library
Break pdb_ldap -> smbldaphelper -> pdb -> pdb_ldap loop by
making smbldaphelp intentionally underlinked internal library.
It means that libsmbldaphelp is not usable unless its user is
also linked to libpdb (that is the case for both its users,
idmap_ldap and pdb_ldap, already) but gives us a break of
the circular dependency in case pdb_ldap statically linked
into pdb (default).
This should solve case when idmap_ldap and pdb_ldap are dynamically
loaded modules
Autobuild-User(master): Alexander Bokovoy <ab@samba.org>
Autobuild-Date(master): Fri Sep 14 01:02:21 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3/wscript_build')
| -rwxr-xr-x | source3/wscript_build | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source3/wscript_build b/source3/wscript_build index c534ae6f76..60965ef1ae 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -710,7 +710,11 @@ private_pdb_match.append('!idmap_xids_to_sids') # ldap module is actually three modules merged together: ldapsam, ipa, and nds static_pdb_match = static_pdb_match + ['ldap', 'ipa', 'nds'] -ldapsam_pdb_match = ['!priv2ld', '!smbldap_search_domain_info', '!ldapsam_*', '!groupmap_attr_list*', '!get_userattr_list'] +ldapsam_pdb_match = ['!priv2ld', '!smbldap_search_domain_info', + '!ldapsam_*', '!groupmap_attr_list*', '!get_userattr_list', + '!dominfo_attr_list', '!get_attr_key2string', + '!sidmap_attr_list', '!attrib_map_*', '!idpool_attr_list', + '!get_attr_list'] private_pdb_match.append('!pdb_nds_*') private_pdb_match.append('!pdb_init_ldapsam') private_pdb_match = private_pdb_match + ldapsam_pdb_match @@ -732,9 +736,11 @@ bld.SAMBA3_LIBRARY('pdb', vnum='0', vars=locals()) -bld.SAMBA3_SUBSYSTEM('smbldaphelper', +bld.SAMBA3_LIBRARY('smbldaphelper', source='passdb/pdb_ldap_schema.c passdb/pdb_ldap_util.c', - deps='smbldap secrets3 pdb') + deps='smbldap secrets3', + allow_undefined_symbols=True, + private_library=True) bld.SAMBA3_SUBSYSTEM('SERVER_MUTEX', source=SERVER_MUTEX_SRC, |