From b707e21887f0dbb188e9b2028912aaac8acb7961 Mon Sep 17 00:00:00 2001
From: Bob Gilligan <gilligan@sydney.vyatta.com>
Date: Wed, 19 Dec 2007 15:08:24 -0800
Subject: Change firewall operational commands so that they work correctly with
 admin level users and "users" level users.

---
 templates/clear/firewall/name/node.tag/counters/node.def       | 2 +-
 templates/show/firewall/node.def                               | 2 +-
 templates/show/firewall/node.tag/detail/node.def               | 2 +-
 templates/show/firewall/node.tag/detail/rule/node.tag/node.def | 2 +-
 templates/show/firewall/node.tag/node.def                      | 4 ++--
 templates/show/firewall/node.tag/rule/node.tag/node.def        | 2 +-
 templates/show/firewall/node.tag/statistics/node.def           | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'templates')

diff --git a/templates/clear/firewall/name/node.tag/counters/node.def b/templates/clear/firewall/name/node.tag/counters/node.def
index 7db183a..0f42391 100644
--- a/templates/clear/firewall/name/node.tag/counters/node.def
+++ b/templates/clear/firewall/name/node.tag/counters/node.def
@@ -1,3 +1,3 @@
 help: Clear firewall counters
-run: iptables -Z $4
+run: sudo /sbin/iptables -Z $4
 
diff --git a/templates/show/firewall/node.def b/templates/show/firewall/node.def
index a56e847..c27582d 100644
--- a/templates/show/firewall/node.def
+++ b/templates/show/firewall/node.def
@@ -1,3 +1,3 @@
 help: Show firewall information
-run: ${vyatta_sbindir}/vyatta-show-firewall.pl -all /opt/vyatta/share/xsl/show_firewall.xsl
+run: sudo ${vyatta_bindir}/sudo-users/vyatta-show-firewall.pl -all /opt/vyatta/share/xsl/show_firewall.xsl
 
diff --git a/templates/show/firewall/node.tag/detail/node.def b/templates/show/firewall/node.tag/detail/node.def
index 2812bcd..f5295dd 100644
--- a/templates/show/firewall/node.tag/detail/node.def
+++ b/templates/show/firewall/node.tag/detail/node.def
@@ -1,3 +1,3 @@
 help: Show firewall rules (detail output)
-run: ${vyatta_sbindir}/vyatta-show-firewall.pl $3 /opt/vyatta/share/xsl/show_firewall_detail.xsl
+run: sudo ${vyatta_bindir}/sudo-users/vyatta-show-firewall.pl $3 /opt/vyatta/share/xsl/show_firewall_detail.xsl
 
diff --git a/templates/show/firewall/node.tag/detail/rule/node.tag/node.def b/templates/show/firewall/node.tag/detail/rule/node.tag/node.def
index 2d5d2ee..f3af458 100644
--- a/templates/show/firewall/node.tag/detail/rule/node.tag/node.def
+++ b/templates/show/firewall/node.tag/detail/rule/node.tag/node.def
@@ -1,4 +1,4 @@
 help: Show detailed information about one firewall rule
 allowed: echo -n "<NUMBER>"
-run: ${vyatta_sbindir}/vyatta-show-firewall.pl $3 /opt/vyatta/share/xsl/show_firewall_detail.xsl $6
+run: sudo ${vyatta_bindir}/sudo-users/vyatta-show-firewall.pl $3 /opt/vyatta/share/xsl/show_firewall_detail.xsl $6
 
diff --git a/templates/show/firewall/node.tag/node.def b/templates/show/firewall/node.tag/node.def
index abc66d4..134ad7d 100644
--- a/templates/show/firewall/node.tag/node.def
+++ b/templates/show/firewall/node.tag/node.def
@@ -1,4 +1,4 @@
 help: Show firewall rules for given chain
-allowed: iptables --list -n | grep ^Chain | awk '{ print $2 }'
-run: ${vyatta_sbindir}/vyatta-show-firewall.pl $3 /opt/vyatta/share/xsl/show_firewall.xsl
+allowed: sudo ${vyatta_bindir}/sudo-users/iptables --list -n | /bin/grep ^Chain | /usr/bin/awk '{ print $2 }'
+run: sudo ${vyatta_bindir}/sudo-users/vyatta-show-firewall.pl $3 /opt/vyatta/share/xsl/show_firewall.xsl
 
diff --git a/templates/show/firewall/node.tag/rule/node.tag/node.def b/templates/show/firewall/node.tag/rule/node.tag/node.def
index ba37eb7..cf252ed 100644
--- a/templates/show/firewall/node.tag/rule/node.tag/node.def
+++ b/templates/show/firewall/node.tag/rule/node.tag/node.def
@@ -1,4 +1,4 @@
 help: Show firewall rules (summary output)
 allowed: echo -n "<NUMBER>"
-run: ${vyatta_sbindir}/vyatta-show-firewall.pl $3 /opt/vyatta/share/xsl/show_firewall.xsl $5
+run: sudo ${vyatta_bindir}/sudo-users/vyatta-show-firewall.pl $3 /opt/vyatta/share/xsl/show_firewall.xsl $5
 
diff --git a/templates/show/firewall/node.tag/statistics/node.def b/templates/show/firewall/node.tag/statistics/node.def
index be7a8a1..fcbdddc 100644
--- a/templates/show/firewall/node.tag/statistics/node.def
+++ b/templates/show/firewall/node.tag/statistics/node.def
@@ -1,3 +1,3 @@
 help: Show firewall counter information
-run: ${vyatta_sbindir}/vyatta-show-firewall.pl $3 /opt/vyatta/share/xsl/show_firewall_statistics.xsl
+run: sudo ${vyatta_bindir}/sudo-users/vyatta-show-firewall.pl $3 /opt/vyatta/share/xsl/show_firewall_statistics.xsl
 
-- 
cgit v1.2.3