From 52e18315852ca6dbd2c5efdc6a882986f1f0689c Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 8 Jun 2011 17:56:23 +0000
Subject: [PATCH] Eliminate two calls to site table and provide ability to skip
 syslogging for non-auditlog calls

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

diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd
index d6c814a2f..334ca5927 100755
--- a/xCAT-server/sbin/xcatd
+++ b/xCAT-server/sbin/xcatd
@@ -769,12 +769,8 @@ until ($quit) {
     } else {
       $peername=undef;
     }
-    $sitetab=xCAT::Table->new('site');
-    my ($tmp) = $sitetab->getAttribs({'key'=>'domain'},'value');
-    if (defined $tmp->{value}) {
-        $domain = $tmp->{value};
-    }
-    $sitetab->close;
+    populate_site_hash();
+    $domain = $::XCATSITEVALS{domain};
 
 if ($inet6support) {
     $peerhost = gethostbyaddr($connection->peeraddr,AF_INET6);
@@ -1489,7 +1485,6 @@ sub service_connection {
   my $peerfqdn = shift;
   my $peerport = $sock->peerport;
   my %tables=();
-  populate_site_hash();
   #some paranoid measures could reduce a third party abusing stage3 image to attempting to get USER/PASS for BMCs:
   # -Well, minimally, ignore requests if requesting node is not in spconfig mode (stage3)
   # -Option to generate a random password per 'getipmi' request.  This reduces the exposure to a D.O.S. hopefully
@@ -1852,7 +1847,7 @@ sub validate {
 
       # read site.auditskipcmds attribute,
       # if set skip commands else audit all cmds.
-      my @skipcmds=xCAT::Utils->get_site_attribute('auditskipcmds');
+      my @skipcmds=($::XCATSITEVALS{auditskipcmds}); #xCAT::Utils->get_site_attribute('auditskipcmds');
       # if not "ALL" and not a command from site.auditskipcmds 
       # and not getcredentials and not getcredentials ,
       # put in syslog and  auditlog
@@ -1895,7 +1890,7 @@ sub validate {
         $rsp->{status} -> [0] = $status;
         xCAT::MsgUtils->message("SA",$rsp);
       } else { # getpostscript or getcredentials, just syslog
-          xCAT::MsgUtils->message("S",$logst);
+          unless ($::XCATSITEVALS{skipvalidatelog}) { xCAT::MsgUtils->message("S",$logst); }
       }
      } # end getbladecons,etc check
       return $rc;