From 22eff119c483dd47ee6d90ba3d50e36936f8fcee Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 17 May 2012 14:03:04 +0000
Subject: [PATCH] Fix problem where a memory address could inadvertently end up
being an argument to sleep by
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12764 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
xCAT-server/sbin/xcatd | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd
index a22a86315..11253f2da 100755
--- a/xCAT-server/sbin/xcatd
+++ b/xCAT-server/sbin/xcatd
@@ -1432,7 +1432,7 @@ sub dispatch_request {
}
if ($onlyone and not ($_->{'_xcatdest'} and xCAT::Utils->thishostisnot($_->{'_xcatdest'}))) {
$SIG{CHLD}='DEFAULT';
- if ($_->{'_xcatdelay'}) { sleep $_->{'_xcatdelay'}; }
+ if ($_->{'_xcatdelay'} and not ref $_->{'_xcatdelay'}) { sleep $_->{'_xcatdelay'}; }
${"xCAT_plugin::".$modname."::"}{process_request}->($_,$dispatch_cb,\&do_request);
return;
}
@@ -1462,7 +1462,7 @@ sub dispatch_request {
$dispatch_parentfd = $parfd;
my @prexcatdests=();
my @xcatdests=();
- if ($_->{'_xcatdelay'}) { sleep $_->{'_xcatdelay'}; }
+ if ($_->{'_xcatdelay'} and not ref $_->{'_xcatdelay'}) { sleep $_->{'_xcatdelay'}; }
if (ref($_->{'_xcatdest'}) eq 'ARRAY') { #If array, consider it an 'anycast' operation, broadcast done through dupe
#requests, or an alternative join '&' maybe?
@prexcatdests=@{$_->{'_xcatdest'}};