summaryrefslogtreecommitdiffstats
path: root/source3/wscript_build
diff options
context:
space:
mode:
authorGarming Sam <garming@catalyst.net.nz>2014-11-25 14:56:45 +1300
committerGarming Sam <garming@samba.org>2014-12-03 04:21:09 +0100
commit3b76b705f03b8f639ece2308afdc0962d230c42a (patch)
tree2c8e6f33b9f4c81fc011018e0b8ebb4c8591c2f9 /source3/wscript_build
parent58b343be4742b3ba1f447701a8254453c21af413 (diff)
downloadsamba-3b76b705f03b8f639ece2308afdc0962d230c42a.tar.gz
samba-3b76b705f03b8f639ece2308afdc0962d230c42a.tar.xz
samba-3b76b705f03b8f639ece2308afdc0962d230c42a.zip
pdb: Increase version number to fix ABI
In the process, we can also rename pdb to avoid conflicts with libpdb. We don't depend directly on pdb to avoid duplicate symbols. BUG: https://bugzilla.samba.org/show_bug.cgi?id=10355 Change-Id: I4df6ba2f4ce35d3718dc4198b527cca46a139efe Pair-programmed-with: Andrew Bartlett <abartlet@samba.org> Signed-off-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/wscript_build')
-rwxr-xr-xsource3/wscript_build30
1 files changed, 17 insertions, 13 deletions
diff --git a/source3/wscript_build b/source3/wscript_build
index 0371336327..7b5130d110 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -144,7 +144,21 @@ 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)
-bld.SAMBA3_LIBRARY('pdb',
+bld.SAMBA3_LIBRARY('samba-passdb',
+ source='',
+ deps='pdb',
+ private_library=False,
+ pc_files=[],
+ public_headers_install=True,
+ public_headers='''
+ include/passdb.h
+ passdb/machine_sid.h
+ passdb/lookup_sid.h''',
+ abi_match=private_pdb_match,
+ abi_directory='passdb/ABI',
+ vnum='0.2.0')
+
+bld.SAMBA3_SUBSYSTEM('pdb',
source='''passdb/pdb_get_set.c
passdb/passdb.c
lib/util_wellknown.c
@@ -162,17 +176,7 @@ bld.SAMBA3_LIBRARY('pdb',
passdb/pdb_interface.c
passdb/pdb_secrets.c
passdb/pdb_unixid.c''',
- deps='secrets3 GROUPDB SERVER_MUTEX wbclient LIBCLI_AUTH flag_mapping samba-credentials',
- private_library=False,
- pc_files=[],
- public_headers_install=True,
- public_headers='''
- include/passdb.h
- passdb/machine_sid.h
- passdb/lookup_sid.h''',
- abi_match=private_pdb_match,
- abi_directory='passdb/ABI',
- vnum='0.1.2')
+ deps='secrets3 GROUPDB SERVER_MUTEX wbclient LIBCLI_AUTH flag_mapping samba-credentials')
bld.SAMBA3_LIBRARY('smbldaphelper',
source='passdb/pdb_ldap_schema.c passdb/pdb_ldap_util.c',
@@ -756,7 +760,7 @@ bld.SAMBA3_SUBSYSTEM('DCUTIL',
bld.SAMBA3_LIBRARY('trusts_util',
source='libsmb/trusts_util.c',
- deps='libcli_netlogon3 msrpc3 pdb',
+ deps='libcli_netlogon3 msrpc3 samba-passdb',
private_library=True)
bld.SAMBA3_SUBSYSTEM('tdb-wrap3',