sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

wafsamba.abi: Fix abi_match with both excludes and includes.

Browse Source 
This fixes a regression introduced by 9c3e294400
which caused internal symbols in libldb to be exposed.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=9357

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stephen Gallagher <sgallagh@redhat.com>
This commit is contained in:
Jelmer Vernooij 2012-11-05 19:36:30 +01:00 committed by Andrew Bartlett
parent d02c8ba122
commit ec3cbb6c47
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buildtools/wafsamba/samba_abi.py
View File

@ -191,12 +191,12 @@ def abi_write_vscript(f, libname, current_version, versions, symmap, abi_match):
f.write("\t\t%s;\n" % x)
else:
f.write("\t\t*;\n")
if len(local_abi) > 0:
if abi_match != ["*"]:
f.write("\tlocal:\n")
for x in local_abi:
f.write("\t\t%s;\n" % x[1:])
elif abi_match != ["*"]:
f.write("\tlocal: *;\n")
if len(global_abi) > 0:
f.write("\t\t*;\n")
f.write("};\n")

17
buildtools/wafsamba/tests/test_abi.py
View File

@ -100,4 +100,21 @@ MYLIB_0.1 {
\tlocal:
\t\texc_*;
};
""")
def test_excludes_and_includes(self):
f = StringIO()
abi_write_vscript(f, "MYLIB", "1.0", [], {
"pub_foo": "1.0",
"exc_bar": "1.0",
"other": "1.0"
}, ["pub_*", "!exc_*"])
self.assertEquals(f.getvalue(), """\
1.0 {
\tglobal:
\t\tpub_*;
\tlocal:
\t\texc_*;
\t\t*;
};
""")