diff options
| author | Alexander Bokovoy <ab@samba.org> | 2012-09-10 14:34:09 +0300 |
|---|---|---|
| committer | Alexander Bokovoy <ab@samba.org> | 2012-09-10 16:14:50 +0200 |
| commit | d709748070e361b14d4e09042e05cb396174631b (patch) | |
| tree | 543200b8e6ae0746320c5ce773a4b497b99cd179 /source3/wscript_build | |
| parent | 54f1ce4c797aacc71423a0b30ead89936b0d591d (diff) | |
| download | samba-d709748070e361b14d4e09042e05cb396174631b.tar.gz samba-d709748070e361b14d4e09042e05cb396174631b.tar.bz2 samba-d709748070e361b14d4e09042e05cb396174631b.zip | |
s3-passdb: update abi_match and ignore more statically linked functions
Autobuild-User(master): Alexander Bokovoy <ab@samba.org>
Autobuild-Date(master): Mon Sep 10 16:14:50 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3/wscript_build')
| -rwxr-xr-x | source3/wscript_build | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/source3/wscript_build b/source3/wscript_build index 048875d66f..2903594f06 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -693,14 +693,28 @@ bld.SAMBA3_SUBSYSTEM('TLDAP', source=TLDAP_SRC, deps='asn1util LIBTSOCKET') -static_pdb_modules = ['tdbsam', 'ldap', 'smbpasswd', 'wbc_sam'] -static_pdb_match = filter(lambda x: bld.SAMBA3_IS_STATIC_MODULE('pdb_%s' % x), static_pdb_modules) +# libpdb.so should not expose internal symbols that are only usable +# to the statically linked modules that are merged into libpdb. +# Note that we always filter these symbols out in libpdb, even +# when modules are not linked statically. In the latter case +# symbols will not be present in the libpdb anyway so no hurt is +# done to the version script. +static_pdb_match = ['tdbsam', 'smbpasswd', 'wbc_sam'] private_pdb_match = [] -if bld.SAMBA3_IS_STATIC_MODULE('pdb_samba_dsdb') and bld.AD_DC_BUILD_IS_ENABLED(): - static_pdb_match.append('samba_dsdb') - private_pdb_match.append('!idmap_init') - private_pdb_match.append('!idmap_sids_to_xids') - private_pdb_match.append('!idmap_xids_to_sids') + +# AD DC module when linked statically will pull in few source4/winbind +# dependencies which are not used outside AD DC module +static_pdb_match.append('samba_dsdb') +private_pdb_match.append('!idmap_init') +private_pdb_match.append('!idmap_sids_to_xids') +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*'] +private_pdb_match.append('!pdb_nds_*') +private_pdb_match.append('!pdb_init_ldapsam') +private_pdb_match = private_pdb_match + ldapsam_pdb_match private_pdb_match = private_pdb_match + map(lambda x: '!pdb_%s_init' % x, static_pdb_match) |