The branch, v4-1-test has been updated via 538f62e selftest: Fix selftest where pid is used uninitialized. from 6ccee19 Merge tag 'samba-4.1.12' into v4-1-test
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-1-test - Log ----------------------------------------------------------------- commit 538f62edb2cc4c17204620d8a9b3075c7453422b Author: Andreas Schneider <a...@samba.org> Date: Thu Sep 4 12:55:53 2014 +0200 selftest: Fix selftest where pid is used uninitialized. On my system this gets evaluated to 0 so in the end we detect samba to be running cause $childpid is set to 0. BUG: https://bugzilla.samba.org/show_bug.cgi?id=10793 Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org> Autobuild-Date(master): Thu Sep 4 17:09:17 CEST 2014 on sn-devel-104 (cherry picked from commit 6d2f56dbaf84203b351f33179cc3feaf557e0683) Signed-off-by: Andreas Schneider <a...@samba.org> Autobuild-User(v4-1-test): Karolin Seeger <ksee...@samba.org> Autobuild-Date(v4-1-test): Mon Sep 8 23:19:29 CEST 2014 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: selftest/target/Samba.pm | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm index ab3851f..b0817fd 100644 --- a/selftest/target/Samba.pm +++ b/selftest/target/Samba.pm @@ -188,7 +188,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", -- Samba Shared Repository