From e84ee76c7dffe3394e84aa8f6be4acd188a3168f Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Thu, 9 Aug 2012 10:32:34 -0700 Subject: [PATCH] Add helpers to macros Signed-off-by: Tom Eastep --- Shorewall/Macros/macro.Amanda | 1 + Shorewall/Macros/macro.FTP | 2 +- Shorewall/Macros/macro.IRC | 1 + Shorewall/Macros/macro.PPtP | 1 + Shorewall/Macros/macro.SANE | 1 + Shorewall/Macros/macro.SIP | 1 + Shorewall/Macros/macro.SMB | 1 + Shorewall/Macros/macro.SMBBI | 1 + Shorewall/Macros/macro.SNMP | 1 + Shorewall/Macros/macro.TFTP | 1 + 10 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Shorewall/Macros/macro.Amanda b/Shorewall/Macros/macro.Amanda index 974f20560..7d9197813 100644 --- a/Shorewall/Macros/macro.Amanda +++ b/Shorewall/Macros/macro.Amanda @@ -8,6 +8,7 @@ # files from those nodes. # ############################################################################### +FORMAT 2 #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP diff --git a/Shorewall/Macros/macro.FTP b/Shorewall/Macros/macro.FTP index 378c1357e..40ac654d5 100644 --- a/Shorewall/Macros/macro.FTP +++ b/Shorewall/Macros/macro.FTP @@ -6,9 +6,9 @@ # This macro handles FTP traffic. # ############################################################################### +FORMAT 2 #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP - ?IF ( __CT_TARGET && $HELPERS && __FTP_HELPER ) PARAM - - tcp 21 ; helper=ftp ?ELSE diff --git a/Shorewall/Macros/macro.IRC b/Shorewall/Macros/macro.IRC index f45a7cf9a..07cd26dec 100644 --- a/Shorewall/Macros/macro.IRC +++ b/Shorewall/Macros/macro.IRC @@ -6,6 +6,7 @@ # This macro handles IRC traffic (Internet Relay Chat). # ############################################################################### +FORMAT 2 #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP diff --git a/Shorewall/Macros/macro.PPtP b/Shorewall/Macros/macro.PPtP index 670f28979..330f2e128 100644 --- a/Shorewall/Macros/macro.PPtP +++ b/Shorewall/Macros/macro.PPtP @@ -6,6 +6,7 @@ # This macro handles PPTP traffic. # ############################################################################### +?FORMAT 2 #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - 47 diff --git a/Shorewall/Macros/macro.SANE b/Shorewall/Macros/macro.SANE index 3a6241dec..4013737f8 100644 --- a/Shorewall/Macros/macro.SANE +++ b/Shorewall/Macros/macro.SANE @@ -6,6 +6,7 @@ # This macro handles SANE network scanning. # ############################################################################### +FORMAT 2 #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP diff --git a/Shorewall/Macros/macro.SIP b/Shorewall/Macros/macro.SIP index 8e0524940..318217df7 100644 --- a/Shorewall/Macros/macro.SIP +++ b/Shorewall/Macros/macro.SIP @@ -6,6 +6,7 @@ # This macro handles SIP traffic. # ############################################################################### +FORMAT 2 #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP diff --git a/Shorewall/Macros/macro.SMB b/Shorewall/Macros/macro.SMB index 28d59b23e..12a954846 100644 --- a/Shorewall/Macros/macro.SMB +++ b/Shorewall/Macros/macro.SMB @@ -10,6 +10,7 @@ # between hosts you fully trust. # ############################################################################### +FORMAT 2 #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - udp 135,445 diff --git a/Shorewall/Macros/macro.SMBBI b/Shorewall/Macros/macro.SMBBI index 3a0125b7c..09d833cf7 100644 --- a/Shorewall/Macros/macro.SMBBI +++ b/Shorewall/Macros/macro.SMBBI @@ -10,6 +10,7 @@ # allow SMB traffic between hosts you fully trust. # ############################################################################### +FORMAT 2 #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - udp 135,445 diff --git a/Shorewall/Macros/macro.SNMP b/Shorewall/Macros/macro.SNMP index 4a14c31bc..d1e26b598 100644 --- a/Shorewall/Macros/macro.SNMP +++ b/Shorewall/Macros/macro.SNMP @@ -6,6 +6,7 @@ # This macro handles SNMP traffic (including traps). # ############################################################################### +FORMAT 2 #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP diff --git a/Shorewall/Macros/macro.TFTP b/Shorewall/Macros/macro.TFTP index 3db988a18..bd303f322 100644 --- a/Shorewall/Macros/macro.TFTP +++ b/Shorewall/Macros/macro.TFTP @@ -8,6 +8,7 @@ # Internet. # ############################################################################### +FORMAT 2 #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP