From fe3bb7e3449ad67bcc6af750cdb06463a3fa308f Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 7 Jul 2010 16:22:27 +0000
Subject: [PATCH] fix for defect 3023413 xcatd putting out error message when
 hierarchical commands like xdsh run on service node when there are service
 node pools defined

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6665 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/sbin/xcatd | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd
index e40d29d67..85a454e36 100755
--- a/xCAT-server/sbin/xcatd
+++ b/xCAT-server/sbin/xcatd
@@ -1194,9 +1194,11 @@ sub dispatch_request {
             last;
         }
      }
-     if ($numdests > 1 and not $request_satisfied) {
+     if (!(xCAT::Utils->isServiceNode()))  {  # not on a service node
+       if ($numdests > 1 and not $request_satisfied) {
 	    xCAT::MsgUtils->message("S","Error dispatching a request to all possible service nodes for request");
         dispatch_callback({error=>["Failed to dispatch command to any of the following service nodes: ".join(",",@xcatdests)],errorcode=>[1]}); 
+       }
      }
 
      xexit;