From 89fa9fad6a2043f21c6206acadbab417f40dad51 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 1 Apr 2010 20:36:59 +0000
Subject: [PATCH] -Fix problem in previous checkin where audit changes
 precluded getdestiny from working

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5649 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 e86726834..8df625990 100755
--- a/xCAT-server/sbin/xcatd
+++ b/xCAT-server/sbin/xcatd
@@ -1656,7 +1656,6 @@ sub validate {
     # too many of them
     #print Dumper($request);
     if ($rule->{rule}) {
-     if (($request->{command}->[0] ne "getdestiny") && ($request->{command}->[0] ne "getbladecons") && ($request->{command}->[0] ne "getipmicons")) {
       my $logst;
       my $rc;
       my $status;
@@ -1669,6 +1668,7 @@ sub validate {
          $status = "Denied";
          $rc=0;
       }
+     if (($request->{command}->[0] ne "getdestiny") && ($request->{command}->[0] ne "getbladecons") && ($request->{command}->[0] ne "getipmicons")) {
       # set username authenticated to run command
       # if from Trusted host, use input username,  else set from creds
       if (($request->{username}) && defined($request->{username}->[0])) {
@@ -1735,8 +1735,8 @@ sub validate {
       } else { # getpostscript or getcredentials, just syslog
           xCAT::MsgUtils->message("S",$logst);
       }
-      return $rc;
      } # end getbladecons,etc check
+      return $rc;
     } else { #Shouldn't be possible....
        xCAT::MsgUtils->message("S","Impossible line in xcatd reached");
       return 0;