[PATCHES] fix soname of linux nss_*.so.2 modules

Stefan (metze) Metzmacher metze at samba.org
Thu Dec 18 03:15:11 MST 2014


Hi Andreas,

as discussed yesterday, here're better fixes for
https://bugzilla.samba.org/show_bug.cgi?id=9299

Please review and push.

Thanks!
metze
-------------- next part --------------
From 18c2e7a8f13ecb2d00dedc95e6fa280e7aca54de Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze at samba.org>
Date: Thu, 18 Dec 2014 10:21:30 +0100
Subject: [PATCH 1/2] wafsamba: add optional keep_underscore=True to
 SAMBA_LIBRARY()

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

Signed-off-by: Stefan Metzmacher <metze at samba.org>
---
 buildtools/wafsamba/wafsamba.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 020516b..bd2ca89 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -110,6 +110,7 @@ def SAMBA_LIBRARY(bld, libname, source,
                   ldflags='',
                   external_library=False,
                   realname=None,
+                  keep_underscore=False,
                   autoproto=None,
                   autoproto_extra_source='',
                   group='main',
@@ -212,7 +213,10 @@ def SAMBA_LIBRARY(bld, libname, source,
                        libname)
 
     if target_type == 'PYTHON' or realname or not private_library:
-        bundled_name = libname.replace('_', '-')
+        if keep_underscore:
+            bundled_name = libname
+        else:
+            bundled_name = libname.replace('_', '-')
     else:
         bundled_name = PRIVATE_NAME(bld, libname, bundled_extension,
             private_library)
-- 
1.9.1


From 5321ac7c5358f141c2decaa9d20a9c96e7a682f1 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze at samba.org>
Date: Thu, 18 Dec 2014 10:33:34 +0100
Subject: [PATCH 2/2] 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 at samba.org>
---
 nsswitch/wscript_build | 16 ++++++++++++++--
 source3/wscript_build  |  7 -------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index 8ceb9ad..1d7ca2c 100644
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -31,11 +31,23 @@ bld.SAMBA_LIBRARY('nss_wrapper_winbind',
 
 if (Utils.unversioned_sys_platform() == 'linux' or (host_os.rfind('gnu') > -1)):
 	bld.SAMBA_LIBRARY('nss_winbind',
+			  keep_underscore=True,
 			  source='winbind_nss_linux.c',
 			  deps='winbind-client',
-			  realname='libnss_winbind.so.2',
-			  soname='libnss_winbind.so',
+			  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='../nsswitch/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 a57fcf0..dc6b196 100755
--- 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',
-- 
1.9.1
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: OpenPGP digital signature
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20141218/64f34745/attachment.pgp>


More information about the samba-technical mailing list