[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-613-g1ef2065

[Stefan Metzmacher]

The branch, master has been updated
       via  1ef206524de589efeeef0544afbf7bfb37d99c15 (commit)
      from  3a6133d70202ef80ead4203740c000be5e93b288 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1ef206524de589efeeef0544afbf7bfb37d99c15
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Mar 20 14:25:15 2009 +0100

    selftest/Samba3: use the same sequence of signals to shutdown samba3 as with the shell scripts
    
    When we kill the timelimit process with SIGKILL, it can't kill its
    children...
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 selftest/target/Samba3.pm |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index e1bea16..2b96226 100644
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -41,6 +41,9 @@ sub teardown_env($$)
 	$self->stop_sig_term($smbdpid);
 	$self->stop_sig_term($nmbdpid);
 	$self->stop_sig_term($winbinddpid);
+
+	sleep(2);
+
 	$self->stop_sig_kill($smbdpid);
 	$self->stop_sig_kill($nmbdpid);
 	$self->stop_sig_kill($winbinddpid);
@@ -187,7 +190,7 @@ sub stop_sig_term($$) {
 
 sub stop_sig_kill($$) {
 	my ($self, $pid) = @_;
-	kill("KILL", $pid) or warn("Unable to kill $pid: $!");
+	kill("ALRM", $pid) or warn("Unable to kill $pid: $!");
 }
 
 sub write_pid($$$)


-- 
Samba Shared Repository