From e944e7fd2206ff39e9e5015471629e1b2cabeb73 Mon Sep 17 00:00:00 2001
From: immarvin <yangsbj@cn.ibm.com>
Date: Mon, 13 Mar 2017 23:08:39 -0400
Subject: [PATCH] fix issue xcat command returns 0 when cmd fails due
 authorization #2636

---
 xCAT-server/lib/xcat/plugins/nodestat.pm | 9 +++++++--
 xCAT-server/sbin/xcatd                   | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/nodestat.pm b/xCAT-server/lib/xcat/plugins/nodestat.pm
index 14d33f507..94c2969f2 100644
--- a/xCAT-server/lib/xcat/plugins/nodestat.pm
+++ b/xCAT-server/lib/xcat/plugins/nodestat.pm
@@ -152,7 +152,7 @@ sub preprocess_request
                 'h|help'      => \$::HELP,
                 'v|version'   => \$::VERSION))
         {
-            &usage($cb);
+            &usage($cb,1);
             return (1);
         }
         if ($::HELP) {
@@ -169,7 +169,7 @@ sub preprocess_request
         my $nodes = $req->{node};
         if (!$nodes)
         {
-            &usage($cb);
+            &usage($cb,1);
             return (1);
         }
 
@@ -914,6 +914,7 @@ sub process_request {
     }
 
 
+
     if ($command eq "nodestat_internal") {
 
         #if ( -x '/usr/bin/nmap' ) {
@@ -1210,10 +1211,14 @@ sub process_request {
 sub usage
 {
     my $cb  = shift;
+    my $retcode=shift;
     my $rsp = {};
     $rsp->{data}->[0] = "Usage:";
     $rsp->{data}->[1] = "  nodestat [noderange] [-m|--usemon] [-p|powerstat] [-u|--updatedb]";
     $rsp->{data}->[2] = "  nodestat [-h|--help|-v|--version]";
+    if($retcode){
+       $rsp->{errorcode}->[0]=$retcode;
+    }
     xCAT::MsgUtils->message("I", $rsp, $cb);
 }
 
diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd
index 4b21cd981..2bc097027 100755
--- a/xCAT-server/sbin/xcatd
+++ b/xCAT-server/sbin/xcatd
@@ -2843,6 +2843,7 @@ sub service_connection {
                     }
                 } else {
                     my %resp = (error => "Permission denied for request");
+                    $resp{errorcode}=1;
                     $resp{serverdone} = [undef];
                     if ($req->{transid}) {
                         $resp{transid} = $req->{transid}->[0];