From 2d8f7f3286dd7697aafc664b07be7b93cfb6939e Mon Sep 17 00:00:00 2001
From: Stig Thormodsrud <stig@io.vyatta.com>
Date: Wed, 21 Jan 2009 15:31:08 -0800
Subject: Fix 4054: "show firewall" doesn't match configurationZ

---
 src/xsl/show_firewall.xsl            | 4 ++--
 src/xsl/show_firewall_detail.xsl     | 4 ++--
 src/xsl/show_firewall_statistics.xsl | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/xsl')

diff --git a/src/xsl/show_firewall.xsl b/src/xsl/show_firewall.xsl
index 158d970..58ed045 100644
--- a/src/xsl/show_firewall.xsl
+++ b/src/xsl/show_firewall.xsl
@@ -68,7 +68,7 @@
       <xsl:value-of select="substring($pad20,1,$pad20_len - string-length(src_addr))"/>
     </xsl:when>
     
-    <xsl:when test="src_net!='' and src_addr!='0.0.0.0/0'">
+    <xsl:when test="src_net!='' and src_net!='0.0.0.0/0'">
       <xsl:value-of select="src_net"/>
       <xsl:value-of select="substring($pad20,1,$pad20_len - string-length(src_net))"/>
     </xsl:when>
@@ -89,7 +89,7 @@
       <xsl:value-of select="substring($pad20,1,$pad20_len - string-length(dst_addr))"/>
     </xsl:when>
     
-    <xsl:when test="dst_net!='' and dst_addr!='0.0.0.0/0'">
+    <xsl:when test="dst_net!='' and dst_net!='0.0.0.0/0'">
       <xsl:value-of select="dst_net"/>
       <xsl:value-of select="substring($pad20,1,$pad20_len - string-length(dst_net))"/>
     </xsl:when>
diff --git a/src/xsl/show_firewall_detail.xsl b/src/xsl/show_firewall_detail.xsl
index bd817c8..206803c 100644
--- a/src/xsl/show_firewall_detail.xsl
+++ b/src/xsl/show_firewall_detail.xsl
@@ -117,7 +117,7 @@
       <xsl:value-of select="src_addr"/>
     </xsl:when>
 
-    <xsl:when test="src_net!='' and src_addr!='0.0.0.0/0'">
+    <xsl:when test="src_net!='' and src_net!='0.0.0.0/0'">
       <xsl:value-of select="src_net"/>
     </xsl:when>
 
@@ -153,7 +153,7 @@
       <xsl:value-of select="dst_addr"/>
     </xsl:when>
 
-    <xsl:when test="dst_net!='' and dst_addr!='0.0.0.0/0'">
+    <xsl:when test="dst_net!='' and dst_net!='0.0.0.0/0'">
       <xsl:value-of select="dst_net"/>
     </xsl:when>
 
diff --git a/src/xsl/show_firewall_statistics.xsl b/src/xsl/show_firewall_statistics.xsl
index 3c91dbe..611fcea 100644
--- a/src/xsl/show_firewall_statistics.xsl
+++ b/src/xsl/show_firewall_statistics.xsl
@@ -69,7 +69,7 @@
       <xsl:value-of select="src_addr"/>
       <xsl:value-of select="substring($pad20,1,$pad20_len - string-length(src_addr))"/>
     </xsl:when>
-    <xsl:when test="src_net!='' and src_addr!='0.0.0.0/0'">
+    <xsl:when test="src_net!='' and src_net!='0.0.0.0/0'">
       <xsl:value-of select="src_net"/>
       <xsl:value-of select="substring($pad20,1,$pad20_len - string-length(src_net))"/>
     </xsl:when>
@@ -87,7 +87,7 @@
       <xsl:value-of select="dst_addr"/>
       <xsl:value-of select="substring($pad20,1,$pad20_len - string-length(dst_addr))"/>
     </xsl:when>
-    <xsl:when test="dst_net!='' and dst_addr!='0.0.0.0/0'">
+    <xsl:when test="dst_net!='' and dst_net!='0.0.0.0/0'">
       <xsl:value-of select="dst_net"/>
       <xsl:value-of select="substring($pad20,1,$pad20_len - string-length(dst_net))"/>
     </xsl:when>
-- 
cgit v1.2.3