selftest: use shared/libnss_wrapper_winbind.so.2

This library is always available in make test.
nss-wrapper strictly requires the linux nss api.

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>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(similar to commit 4eb24fa545234be506eb1330ccbbfd5c2b9e0d82)

diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm
index b0817fd3d2a076aefbb322f36702aa7753610f27..217511a8d04b0dd1303013e79879f5da705e0160 100644 (file)
--- a/selftest/target/Samba.pm
+++ b/selftest/target/Samba.pm
@@ -68,7 +68,7 @@ sub nss_wrapper_winbind_so_path($) {
         my ($object) = @_;
        my $ret = $ENV{NSS_WRAPPER_WINBIND_SO_PATH};
         if (not defined($ret)) {
-           $ret = bindir_path($object, "default/nsswitch/libnss-winbind.so");
+           $ret = bindir_path($object, "shared/libnss_wrapper_winbind.so.2");
        }
        return $ret;
 }

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index e738d1d97d9667f8427fa6268e07cf843131555f..9c7a41c9886b4bdfc8b71d5b74fbbfa2b61a4810 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -382,7 +382,7 @@ for env in ["plugin_s4_dc", "dc", "s4member"]:
 nsstest4 = binpath("nsstest")
 for env in ["plugin_s4_dc", "dc", "s4member", "s3dc", "s3member", "member"]:
     if os.path.exists(nsstest4):
-        plantestsuite("samba4.nss.test using winbind(%s)" % env, env, [os.path.join(bbdir, "nsstest.sh"), nsstest4, os.path.join(samba4bindir, "default/nsswitch/libnss-winbind.so")])
+        plantestsuite("samba4.nss.test using winbind(%s)" % env, env, [os.path.join(bbdir, "nsstest.sh"), nsstest4, os.path.join(samba4bindir, "shared/libnss_wrapper_winbind.so.2")])
     else:
         skiptestsuite("samba4.nss.test using winbind(%s)" % env, "nsstest not available")