Whitespace fixing.
authorMark Wooding <mdw@distorted.org.uk>
Sun, 22 May 2011 21:12:01 +0000 (22:12 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Sun, 22 May 2011 22:19:06 +0000 (23:19 +0100)
base.m4
functions.m4
local.m4
metalzone.m4

diff --git a/base.m4 b/base.m4
index 5ae9d48..a27ea00 100644 (file)
--- a/base.m4
+++ b/base.m4
@@ -36,16 +36,16 @@ m4_changecom(<:##:>)
 ### 30 Initialization.                                         [bookends]
 ### 30   Clear existing rules.                                 [bookends]
 ### 32   Set safe IP options.                                  [bookends]
-### 34   Error chains.                                         [bookends]
+### 34   Error chains.                                         [bookends]
 ### 36   Give loopback traffic a free pass.                    [bookends]
-### 40 Address classification.                                 [classify]
+### 40 Address classification.                                 [classify]
 ### 42   Definition of address class policies.                 [local]
 ### 44   Definition of interfaces and addresses.               [local]
 ### 46   Handling of default interface.                        [classify]
-### 50 ICMP filtering.                                         [icmp]
-### 52           Local configuration.                                  [local]
-### 58    Finally accept ICMP, hook onto INPUT and FORWARD.    [icmp]
-### 60 Local configuration.                                    [local]
+### 50 ICMP filtering.                                         [icmp]
+### 52   Local configuration.                                  [local]
+### 58   Finally accept ICMP, hook onto INPUT and FORWARD.     [icmp]
+### 60 Local configuration.                                    [local]
 ### 90 Finishing touches.                                      [bookends]
 ### 94   Set final policies.                                   [bookends]
 ### 99 File footer: do-not-edit warning.                       [base]
index 85afc10..680df6d 100644 (file)
@@ -151,20 +151,20 @@ allowservices () {
   for svc; do
     case $svc in
       *:*)
-        n=2
+       n=2
        left=${svc%:*} right=${svc#*:}
        case $left in *[!0-9]*) eval left=\$port_$left ;; esac
        case $right in *[!0-9]*) eval right=\$port_$right ;; esac
        svc=$left:$right
        ;;
       *)
-        n=1
+       n=1
        case $svc in *[!0-9]*) eval svc=\$port_$svc ;; esac
        ;;
     esac
     case $svc in
       *: | :* | "" | *[!0-9:]*)
-        echo >&2 "Bad service name"
+       echo >&2 "Bad service name"
        exit 1
        ;;
     esac
@@ -183,7 +183,7 @@ allowservices () {
       run iptables -A $chain -p $proto -m multiport -j ACCEPT \
              --destination-ports ${list#,}
       ;;
-    *) 
+    *)
       run iptables -A $chain -p $proto -j ACCEPT \
              --destination-port ${list#,}
       ;;
@@ -291,7 +291,7 @@ defnetclass () {
        from=$(( $from + $bit ))
       done
       to=$(( ($netclassindex << $BIT_TO) + \
-            (0xf << $BIT_FROM) + \
+            (0xf << $BIT_FROM) + \
             (1 << ($netclassindex + $BIT_MASK)) ))
       trace "from $name --> set $(printf %x $from)"
       trace "  to $name --> and $(printf %x $from)"
index 0d38497..27caa44 100644 (file)
--- a/local.m4
+++ b/local.m4
@@ -66,7 +66,7 @@ run iptables -A FORWARD -j ACCEPT \
 
 ## Allow SSH from safe/noloop to untrusted networks.
 run iptables -A FORWARD -j ACCEPT \
-       -p tcp ! -f --destination-port $port_ssh \
+       -p tcp ! -f --destination-port $port_ssh \
        -m mark --mark $to_untrusted/$MASK_TO
 run iptables -A FORWARD -j ACCEPT \
        -p tcp ! -f --source-port $port_ssh \
index 3d6129a..ac1844f 100644 (file)
@@ -48,7 +48,7 @@ allowservices inbound tcp \
        rsync \
        imaps \
        http https \
-       git     
+       git
 allowservices inbound udp \
        tripe \
        gnutella_svc