Change sudo usage to be more consistent.

10 files changed, 17 insertions, 17 deletions

diff --git a/lib/Vyatta/IpTables/IpSet.pm b/lib/Vyatta/IpTables/IpSet.pm
index eaa629b..a806f20 100755
--- a/lib/Vyatta/IpTables/IpSet.pm
+++ b/lib/Vyatta/IpTables/IpSet.pm
@@ -74,7 +74,7 @@ sub exists {
     return 0 if ! defined $self->{_name};
     my $func = (caller(0))[3];
     my $cmd = "ipset -L $self->{_name}";
-    my $rc = system("sudo $cmd > /dev/null &>2");
+    my $rc = system("$cmd > /dev/null &>2");
     system("$logger [$func] [$cmd] = [$rc]") if defined $self->{_debug};
     return $rc ? 0 : 1;
 }
@@ -84,7 +84,7 @@ sub get_type {
 
     return $self->{_type} if defined $self->{_type};
     return if ! $self->exists();
-    my @lines = `sudo ipset -L $self->{_name}`;
+    my @lines = `ipset -L $self->{_name}`;
     my $type;
     foreach my $line (@lines) {
 	if ($line =~ /^Type:\s+(\w+)$/) {
@@ -118,7 +118,7 @@ sub create {
     
     my $func = (caller(0))[3];
     my $cmd = "ipset -N $self->{_name} $ipset_param";
-    my $rc = system("sudo $cmd");
+    my $rc = system("$cmd");
     system("$logger [$func] [$cmd] = [$rc]") if defined $self->{_debug};
     return "Error: call to ipset failed [$rc]" if $rc;
     return; # undef
@@ -128,7 +128,7 @@ sub references {
     my ($self) = @_;
 
     return 0 if ! $self->exists();
-    my @lines = `sudo ipset -L $self->{_name}`;
+    my @lines = `ipset -L $self->{_name}`;
     foreach my $line (@lines) {
 	if ($line =~ /^References:\s+(\d+)$/) {
 	    return $1;
@@ -148,7 +148,7 @@ sub delete {
 
     my $func = (caller(0))[3];
     my $cmd = "ipset -X $self->{_name}";
-    my $rc = system("sudo $cmd");
+    my $rc = system("$cmd");
     system("$logger [$func] [$cmd] = [$rc]") if defined $self->{_debug};
     return "Error: call to ipset failed [$rc]" if $rc;
     return; # undef
@@ -203,7 +203,7 @@ sub member_exists {
     
     my $func = (caller(0))[3];
     my $cmd = "ipset -T $self->{_name} $member -q";
-    my $rc = system("sudo $cmd");
+    my $rc = system("$cmd");
     system("$logger [$func] [$cmd] = [$rc]") if defined $self->{_debug};
     return $rc ? 0 : 1;    
 }
@@ -219,7 +219,7 @@ sub add_member {
     }
     my $func = (caller(0))[3];
     my $cmd = "ipset -A $self->{_name} $member";
-    my $rc = system("sudo $cmd");
+    my $rc = system("$cmd");
     system("$logger [$func] [$cmd] = [$rc]") if defined $self->{_debug};
     return "Error: call to ipset failed [$rc]" if $rc;
     return; # undef
@@ -236,7 +236,7 @@ sub delete_member {
     }
     my $func = (caller(0))[3];
     my $cmd = "ipset -D $self->{_name} $member";
-    my $rc = system("sudo $cmd");
+    my $rc = system("$cmd");
     system("$logger [$func] [$cmd] = [$rc]") if defined $self->{_debug};
     return "Error: call to ipset failed [$rc]" if $rc;
     return; # undef
diff --git a/templates/firewall/group/address-group/node.tag/address/node.def b/templates/firewall/group/address-group/node.tag/address/node.def
index e0f8026..bcaa497 100644
--- a/templates/firewall/group/address-group/node.tag/address/node.def
+++ b/templates/firewall/group/address-group/node.tag/address/node.def
@@ -2,7 +2,7 @@ multi:
 type: ipv4
 help: Set a address-group member
 
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-ipset.pl \
+syntax:expression: exec "sudo /opt/vyatta/sbin/vyatta-ipset.pl \
                            --action=check-member          \
                            --set-name=$VAR(../@)          \
                            --set-type=address             \
diff --git a/templates/firewall/group/network-group/node.tag/network/node.def b/templates/firewall/group/network-group/node.tag/network/node.def
index 1f33ba9..cd3a6a6 100644
--- a/templates/firewall/group/network-group/node.tag/network/node.def
+++ b/templates/firewall/group/network-group/node.tag/network/node.def
@@ -2,7 +2,7 @@ multi:
 type: ipv4net
 help: Set a network-group member
 
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-ipset.pl \
+syntax:expression: exec "sudo /opt/vyatta/sbin/vyatta-ipset.pl \
                            --action=check-member          \
                            --set-name=$VAR(../@)          \
                            --set-type=network             \
diff --git a/templates/firewall/group/port-group/node.tag/port/node.def b/templates/firewall/group/port-group/node.tag/port/node.def
index 3f9c530..92bce9c 100644
--- a/templates/firewall/group/port-group/node.tag/port/node.def
+++ b/templates/firewall/group/port-group/node.tag/port/node.def
@@ -2,7 +2,7 @@ multi:
 type: txt
 help: Set a port-group member
 
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-ipset.pl \
+syntax:expression: exec "sudo /opt/vyatta/sbin/vyatta-ipset.pl \
                            --action=check-member          \
                            --set-name=$VAR(../@)          \
                            --set-type=port                \
diff --git a/templates/firewall/name/node.tag/rule/node.tag/destination/group/address-group/node.def b/templates/firewall/name/node.tag/rule/node.tag/destination/group/address-group/node.def
index 76e040b..6fd918f 100644
--- a/templates/firewall/name/node.tag/rule/node.tag/destination/group/address-group/node.def
+++ b/templates/firewall/name/node.tag/rule/node.tag/destination/group/address-group/node.def
@@ -1,7 +1,7 @@
 type: txt
 help: Set group of addresses
 
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-ipset.pl \
+syntax:expression: exec "sudo /opt/vyatta/sbin/vyatta-ipset.pl \
                            --action=check-set-type        \
                            --set-name=$VAR(@)             \
                            --set-type=address;"
diff --git a/templates/firewall/name/node.tag/rule/node.tag/destination/group/network-group/node.def b/templates/firewall/name/node.tag/rule/node.tag/destination/group/network-group/node.def
index 8c53752..023acbf 100644
--- a/templates/firewall/name/node.tag/rule/node.tag/destination/group/network-group/node.def
+++ b/templates/firewall/name/node.tag/rule/node.tag/destination/group/network-group/node.def
@@ -1,7 +1,7 @@
 type: txt
 help: Set group of networks
 
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-ipset.pl \
+syntax:expression: exec "sudo /opt/vyatta/sbin/vyatta-ipset.pl \
                            --action=check-set-type        \
                            --set-name=$VAR(@)             \
                            --set-type=network;"
diff --git a/templates/firewall/name/node.tag/rule/node.tag/destination/group/port-group/node.def b/templates/firewall/name/node.tag/rule/node.tag/destination/group/port-group/node.def
index 3b42a07..f77d45a 100644
--- a/templates/firewall/name/node.tag/rule/node.tag/destination/group/port-group/node.def
+++ b/templates/firewall/name/node.tag/rule/node.tag/destination/group/port-group/node.def
@@ -1,7 +1,7 @@
 type: txt
 help: Set group of ports
 
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-ipset.pl \
+syntax:expression: exec "sudo /opt/vyatta/sbin/vyatta-ipset.pl \
                            --action=check-set-type        \
                            --set-name=$VAR(@)             \
                            --set-type=port;"
diff --git a/templates/firewall/name/node.tag/rule/node.tag/source/group/address-group/node.def b/templates/firewall/name/node.tag/rule/node.tag/source/group/address-group/node.def
index 76e040b..6fd918f 100644
--- a/templates/firewall/name/node.tag/rule/node.tag/source/group/address-group/node.def
+++ b/templates/firewall/name/node.tag/rule/node.tag/source/group/address-group/node.def
@@ -1,7 +1,7 @@
 type: txt
 help: Set group of addresses
 
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-ipset.pl \
+syntax:expression: exec "sudo /opt/vyatta/sbin/vyatta-ipset.pl \
                            --action=check-set-type        \
                            --set-name=$VAR(@)             \
                            --set-type=address;"
diff --git a/templates/firewall/name/node.tag/rule/node.tag/source/group/network-group/node.def b/templates/firewall/name/node.tag/rule/node.tag/source/group/network-group/node.def
index 8c53752..023acbf 100644
--- a/templates/firewall/name/node.tag/rule/node.tag/source/group/network-group/node.def
+++ b/templates/firewall/name/node.tag/rule/node.tag/source/group/network-group/node.def
@@ -1,7 +1,7 @@
 type: txt
 help: Set group of networks
 
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-ipset.pl \
+syntax:expression: exec "sudo /opt/vyatta/sbin/vyatta-ipset.pl \
                            --action=check-set-type        \
                            --set-name=$VAR(@)             \
                            --set-type=network;"
diff --git a/templates/firewall/name/node.tag/rule/node.tag/source/group/port-group/node.def b/templates/firewall/name/node.tag/rule/node.tag/source/group/port-group/node.def
index 3b42a07..f77d45a 100644
--- a/templates/firewall/name/node.tag/rule/node.tag/source/group/port-group/node.def
+++ b/templates/firewall/name/node.tag/rule/node.tag/source/group/port-group/node.def
@@ -1,7 +1,7 @@
 type: txt
 help: Set group of ports
 
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-ipset.pl \
+syntax:expression: exec "sudo /opt/vyatta/sbin/vyatta-ipset.pl \
                            --action=check-set-type        \
                            --set-name=$VAR(@)             \
                            --set-type=port;"