diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-12-18 10:33:34 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2015-01-11 16:15:06 +0100 |
| commit | 65f891a3021aedf832d61a7d0006c48320d5fd84 (patch) | |
| tree | d55437b2e3bfc4b333c982bf49ff35f46e505926 | |
| parent | 5636a4839a8f3be3c4bd3bb48010fa6349cdde5f (diff) | |
| download | samba-65f891a3021aedf832d61a7d0006c48320d5fd84.tar.gz | |
nsswitch: fix soname of linux nss_*.so.2 modules
Bug: https://bugzilla.samba.org/show_bug.cgi?id=9299
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(similar to commit 575b093dac3c509b1bfaab0b4ad29b9b4214e487)
Autobuild-User(v4-1-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-1-test): Sun Jan 11 16:15:06 CET 2015 on sn-devel-104
| -rw-r--r-- | nsswitch/wscript_build | 24 | ||||
| -rwxr-xr-x | source3/wscript_build | 7 |
2 files changed, 18 insertions, 13 deletions
diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build index 55ba776e5d..0e3373070e 100644 --- a/nsswitch/wscript_build +++ b/nsswitch/wscript_build @@ -30,12 +30,24 @@ bld.SAMBA_LIBRARY('nss_wrapper_winbind', # the search for .rfind('gnu') covers gnu* and *-gnu is that too broad? if (Utils.unversioned_sys_platform() == 'linux' or (host_os.rfind('gnu') > -1)): - bld.SAMBA_LIBRARY('nss_winbind', - source='winbind_nss_linux.c', - deps='winbind-client', - realname='libnss_winbind.so.2', - soname='libnss_winbind.so', - vnum='2') + bld.SAMBA_LIBRARY('nss_winbind', + keep_underscore=True, + source='winbind_nss_linux.c', + deps='winbind-client', + public_headers=[], + public_headers_install=False, + pc_files=[], + vnum='2') + + # for nss_wins is linux only + bld.SAMBA3_LIBRARY('nss_wins', + keep_underscore=True, + source='wins.c', + deps='''param libsmb LIBTSOCKET''', + public_headers=[], + public_headers_install=False, + pc_files=[], + vnum='2') elif (host_os.rfind('freebsd') > -1): # FreeBSD winbind client is implemented as a wrapper around # the Linux version. diff --git a/source3/wscript_build b/source3/wscript_build index c849604c6c..061cc0d4f8 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -655,13 +655,6 @@ bld.SAMBA3_LIBRARY('smbsharemodes', vnum='0', vars=locals()) -bld.SAMBA3_LIBRARY('nss_wins', - source=WINBIND_WINS_NSS_SRC, - deps='''param libsmb LIBTSOCKET''', - realname='libnss_wins.so.2', - soname='libnss_wins.so', - vnum='2') - bld.SAMBA3_LIBRARY('gse', source='librpc/crypto/gse_krb5.c librpc/crypto/gse.c', deps='krb5samba gensec param KRBCLIENT secrets3', |