From 4d21c75a7e6cd347d31afbae293b827df8d1b585 Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 15 Jul 2013 12:22:53 +0000
Subject: [PATCH]  sort policy table before checking entries

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@16977 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/perl/xCAT/xcatd.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/lib/perl/xCAT/xcatd.pm b/xCAT-server/lib/perl/xCAT/xcatd.pm
index 33f6412ca..23cfc5eb3 100644
--- a/xCAT-server/lib/perl/xCAT/xcatd.pm
+++ b/xCAT-server/lib/perl/xCAT/xcatd.pm
@@ -69,15 +69,18 @@ sub validate {
   $policytable->close;
   my $rule;
   my $peerstatus="untrusted";
+  # This sorts the policy table  rows based on the level of the priority field in the row.
+  # note the lower the number in the policy table the higher the priority
+  my @sortedpolicies = sort { $a->{priority} <=> $b->{priority} } (@$policies);
   # check to see if peerhost is trusted
-  foreach $rule (@$policies) {
+  foreach $rule (@sortedpolicies) {
      
     if (($rule->{name} and (($rule->{name} eq $peerhost) || ($rule->{name} eq $peerhostorg)))  && ($rule->{rule}=~ /trusted/i)) {
      $peerstatus="Trusted";
      last;
     }
   }
-  RULE: foreach $rule (@$policies) {
+  RULE: foreach $rule (@sortedpolicies) {
     if ($rule->{name} and $rule->{name} ne '*') {
       #TODO: more complex matching (lists, wildcards)
       next unless ($peername and $peername eq $rule->{name});