diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-12-18 20:13:44 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2014-12-19 13:15:12 +0100 |
| commit | 4eb24fa545234be506eb1330ccbbfd5c2b9e0d82 (patch) | |
| tree | c90f8d7a531c4691ec05bf3ad6709839186e2ba7 | |
| parent | 82e583b04b04e560c121163850d70c52d2fce78d (diff) | |
| download | samba-4eb24fa545234be506eb1330ccbbfd5c2b9e0d82.tar.gz | |
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>
| -rw-r--r-- | selftest/target/Samba.pm | 2 | ||||
| -rwxr-xr-x | source4/selftest/tests.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm index 2bd90ae6f99..ccc63f3713d 100644 --- a/selftest/target/Samba.pm +++ b/selftest/target/Samba.pm @@ -69,7 +69,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"); $ret = abs_path($ret); } return $ret; diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 7362b64c23e..7c4f88820a7 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -421,7 +421,7 @@ for env in ["s3dc", "member", "plugin_s4_dc", "dc", "s3member", "s4member"]: nsstest4 = binpath("nsstest") for env in ["plugin_s4_dc", "dc", "s4member", "s3dc", "s3member", "member"]: if os.path.exists(nsstest4): - plantestsuite("samba.nss.test using winbind(%s)" % env, env, [os.path.join(bbdir, "nsstest.sh"), nsstest4, os.path.join(samba4bindir, "default/nsswitch/libnss-winbind.so")]) + plantestsuite("samba.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("samba.nss.test using winbind(%s)" % env, "nsstest not available") |