selftest: use shared/libnss_wrapper_winbind.so.2

[obnox/samba/samba-obnox.git] / selftest / target / Samba.pm

diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm
index ab3851f67e01cd04ad79b32ff955589a8ce1aa23..ccc63f3713de7a52d6dfcaaf887ec9efee370b6d 100644 (file)
--- a/selftest/target/Samba.pm
+++ b/selftest/target/Samba.pm
@@ -9,6 +9,7 @@ use strict;
 use target::Samba3;
 use target::Samba4;
 use POSIX;
+use Cwd qw(abs_path);
 
 sub new($$$$$) {
        my ($classname, $bindir, $binary_mapping,$ldap, $srcdir, $server_maxtime) = @_;
@@ -68,7 +69,8 @@ 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;
 }
@@ -188,7 +190,12 @@ sub get_interface($)
 sub cleanup_child($$)
 {
     my ($pid, $name) = @_;
-    my $childpid = waitpid($pid, WNOHANG);
+    my $childpid = -1;
+
+    if (defined($pid)) {
+        $childpid = waitpid($pid, WNOHANG);
+    }
+
     if ($childpid == 0) {
     } elsif ($childpid < 0) {
        printf STDERR "%s child process %d isn't here any more\n",