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>
(cherry picked from commit 575b093dac3c509b1bfaab0b4ad29b9b4214e487)

diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index 8ceb9ad6f2b816c35fdbb6c5fdfeba89afc0463d..381ff44a669d737a7fe5b841ea8ab2c6e7d6e44f 100644 (file)
--- 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 e1964a3293b8de9f2e6028af9447663f77fa9571..eadf832451a15c7d6715a379f6ec4876f24853d1 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -55,13 +55,6 @@ bld.SAMBA3_LIBRARY('netapi',
                     pc_files='libnet/netapi.pc',
                     vnum='0')
 
-bld.SAMBA3_LIBRARY('nss_wins',
-                  source='../nsswitch/wins.c',
-                  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',