From 75bc8528054ba70d12b4378c457b21b3fef28873 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@foo-projects.org>
Date: Mon, 10 Mar 2008 22:38:23 +0000
Subject: [PATCH] pass $name,$value to format_option()

git-svn-id: svn+ssh://foo-projects.org/var/svn/ferm/trunk@1171 887c3e53-ddf1-0310-8e39-e0d3fab4ed34
---
 src/ferm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/ferm b/src/ferm
index 01e5b58..08b4e8a 100755
--- a/src/ferm
+++ b/src/ferm
@@ -1220,9 +1220,8 @@ sub shell_format_option($$) {
     return $cmd;
 }
 
-sub format_option($$) {
-    my ($domain, $option) = @_;
-    my ($name, $value) = @$option;
+sub format_option($$$) {
+    my ($domain, $name, $value) = @_;
     $value = 'icmpv6' if $domain eq 'ip6' and $name eq 'protocol'
       and $value eq 'icmp';
     return shell_format_option($name, $value);
@@ -1231,7 +1230,7 @@ sub format_option($$) {
 sub printrule($$$) {
     my ($domain, $chain_rules, $rule) = @_;
 
-    my $cmd = join('', map { format_option($domain, $_) }
+    my $cmd = join('', map { format_option($domain, $_->[0], $_->[1]) }
                      @{$rule->{options}});
     push @$chain_rules, { rule => $cmd,
                           script => $rule->{script},
-- 
2.11.4.GIT