From 0421f15d829232117d0d45c5b9879e45d1610ad0 Mon Sep 17 00:00:00 2001 From: teastep Date: Thu, 29 Nov 2007 17:46:13 +0000 Subject: [PATCH] apply macro changes to trunk git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7795 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall-common/macro.AllowICMPs | 2 +- Shorewall-common/macro.Amanda | 2 +- Shorewall-common/macro.Auth | 2 +- Shorewall-common/macro.BitTorrent | 2 +- Shorewall-common/macro.CVS | 2 +- Shorewall-common/macro.DNS | 2 +- Shorewall-common/macro.Distcc | 2 +- Shorewall-common/macro.Drop | 2 +- Shorewall-common/macro.DropDNSrep | 2 +- Shorewall-common/macro.DropUPnP | 2 +- Shorewall-common/macro.Edonkey | 2 +- Shorewall-common/macro.FTP | 2 +- Shorewall-common/macro.Finger | 2 +- Shorewall-common/macro.GRE | 2 +- Shorewall-common/macro.Gnutella | 2 +- Shorewall-common/macro.HTTP | 2 +- Shorewall-common/macro.HTTPS | 2 +- Shorewall-common/macro.ICQ | 2 +- Shorewall-common/macro.IMAP | 2 +- Shorewall-common/macro.IMAPS | 2 +- Shorewall-common/macro.IPIP | 2 +- Shorewall-common/macro.IPP | 2 +- Shorewall-common/macro.IPPserver | 2 +- Shorewall-common/macro.IPsec | 2 +- Shorewall-common/macro.IPsecah | 2 +- Shorewall-common/macro.IPsecnat | 2 +- Shorewall-common/macro.JabberPlain | 2 +- Shorewall-common/macro.JabberSecure | 2 +- Shorewall-common/macro.Jabberd | 2 +- Shorewall-common/macro.Jetdirect | 2 +- Shorewall-common/macro.L2TP | 2 +- Shorewall-common/macro.LDAP | 2 +- Shorewall-common/macro.LDAPS | 2 +- Shorewall-common/macro.MySQL | 2 +- Shorewall-common/macro.NNTP | 2 +- Shorewall-common/macro.NNTPS | 2 +- Shorewall-common/macro.NTP | 2 +- Shorewall-common/macro.NTPbrd | 2 +- Shorewall-common/macro.PCA | 2 +- Shorewall-common/macro.POP3 | 2 +- Shorewall-common/macro.POP3S | 2 +- Shorewall-common/macro.Ping | 2 +- Shorewall-common/macro.PostgreSQL | 2 +- Shorewall-common/macro.Printer | 2 +- Shorewall-common/macro.RDP | 2 +- Shorewall-common/macro.Rdate | 2 +- Shorewall-common/macro.Reject | 2 +- Shorewall-common/macro.Rsync | 2 +- Shorewall-common/macro.SMB | 2 +- Shorewall-common/macro.SMBBI | 2 +- Shorewall-common/macro.SMBswat | 2 +- Shorewall-common/macro.SMTP | 2 +- Shorewall-common/macro.SMTPS | 2 +- Shorewall-common/macro.SNMP | 2 +- Shorewall-common/macro.SPAMD | 2 +- Shorewall-common/macro.SSH | 2 +- Shorewall-common/macro.SVN | 2 +- Shorewall-common/macro.SixXS | 2 +- Shorewall-common/macro.Submission | 2 +- Shorewall-common/macro.Syslog | 2 +- Shorewall-common/macro.TFTP | 2 +- Shorewall-common/macro.Telnet | 2 +- Shorewall-common/macro.Telnets | 2 +- Shorewall-common/macro.Time | 2 +- Shorewall-common/macro.Trcrt | 2 +- Shorewall-common/macro.VNC | 2 +- Shorewall-common/macro.VNCL | 2 +- Shorewall-common/macro.Web | 2 +- Shorewall-common/macro.Webmin | 2 +- Shorewall-common/macro.Whois | 2 +- Shorewall-common/macro.template | 14 +++++++------- 71 files changed, 77 insertions(+), 77 deletions(-) diff --git a/Shorewall-common/macro.AllowICMPs b/Shorewall-common/macro.AllowICMPs index c587c9c4a..a94e56527 100644 --- a/Shorewall-common/macro.AllowICMPs +++ b/Shorewall-common/macro.AllowICMPs @@ -7,7 +7,7 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP ACCEPT - - icmp fragmentation-needed ACCEPT - - icmp time-exceeded #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.Amanda b/Shorewall-common/macro.Amanda index 28472ed03..991e33686 100644 --- a/Shorewall-common/macro.Amanda +++ b/Shorewall-common/macro.Amanda @@ -9,7 +9,7 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - udp 10080 # # You may also need this rule. With AMANDA 2.4.4 on Linux kernel 2.6, diff --git a/Shorewall-common/macro.Auth b/Shorewall-common/macro.Auth index 5043506a7..99e6546ed 100644 --- a/Shorewall-common/macro.Auth +++ b/Shorewall-common/macro.Auth @@ -7,6 +7,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 113 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.BitTorrent b/Shorewall-common/macro.BitTorrent index b05ae69c4..7e71f4034 100644 --- a/Shorewall-common/macro.BitTorrent +++ b/Shorewall-common/macro.BitTorrent @@ -7,7 +7,7 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 6881:6889 # # It may also be necessary to allow UDP traffic: diff --git a/Shorewall-common/macro.CVS b/Shorewall-common/macro.CVS index c4e02647f..8edfda173 100644 --- a/Shorewall-common/macro.CVS +++ b/Shorewall-common/macro.CVS @@ -7,6 +7,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 2401 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.DNS b/Shorewall-common/macro.DNS index a1e444443..4b2a0220c 100644 --- a/Shorewall-common/macro.DNS +++ b/Shorewall-common/macro.DNS @@ -7,7 +7,7 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - udp 53 PARAM - - tcp 53 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.Distcc b/Shorewall-common/macro.Distcc index c9fce42e9..7bfe9c219 100644 --- a/Shorewall-common/macro.Distcc +++ b/Shorewall-common/macro.Distcc @@ -7,6 +7,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 3632 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.Drop b/Shorewall-common/macro.Drop index 4eb343b8a..a234ebf97 100644 --- a/Shorewall-common/macro.Drop +++ b/Shorewall-common/macro.Drop @@ -12,7 +12,7 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP # # Don't log 'auth' REJECT # diff --git a/Shorewall-common/macro.DropDNSrep b/Shorewall-common/macro.DropDNSrep index 19365dfea..f19a79c49 100644 --- a/Shorewall-common/macro.DropDNSrep +++ b/Shorewall-common/macro.DropDNSrep @@ -7,6 +7,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP DROP - - udp - 53 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.DropUPnP b/Shorewall-common/macro.DropUPnP index 989a3f386..9dc099675 100644 --- a/Shorewall-common/macro.DropUPnP +++ b/Shorewall-common/macro.DropUPnP @@ -7,6 +7,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP DROP - - udp 1900 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.Edonkey b/Shorewall-common/macro.Edonkey index 77b5203a6..9a85a0fee 100644 --- a/Shorewall-common/macro.Edonkey +++ b/Shorewall-common/macro.Edonkey @@ -29,7 +29,7 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 4662 PARAM - - udp 4665 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.FTP b/Shorewall-common/macro.FTP index dd24dd4ad..821297b75 100644 --- a/Shorewall-common/macro.FTP +++ b/Shorewall-common/macro.FTP @@ -7,6 +7,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 21 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.Finger b/Shorewall-common/macro.Finger index 2fc1742a9..15c0d5190 100644 --- a/Shorewall-common/macro.Finger +++ b/Shorewall-common/macro.Finger @@ -8,6 +8,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 79 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.GRE b/Shorewall-common/macro.GRE index acb032af9..7eb1139f0 100644 --- a/Shorewall-common/macro.GRE +++ b/Shorewall-common/macro.GRE @@ -7,7 +7,7 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - 47 # GRE PARAM DEST SOURCE 47 # GRE #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.Gnutella b/Shorewall-common/macro.Gnutella index 2097ee1eb..0a9db469a 100644 --- a/Shorewall-common/macro.Gnutella +++ b/Shorewall-common/macro.Gnutella @@ -7,7 +7,7 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 6346 PARAM - - udp 6346 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.HTTP b/Shorewall-common/macro.HTTP index 85f3231b5..29acbf096 100644 --- a/Shorewall-common/macro.HTTP +++ b/Shorewall-common/macro.HTTP @@ -7,6 +7,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 80 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.HTTPS b/Shorewall-common/macro.HTTPS index 0e07331d4..b3dedec92 100644 --- a/Shorewall-common/macro.HTTPS +++ b/Shorewall-common/macro.HTTPS @@ -7,6 +7,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 443 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.ICQ b/Shorewall-common/macro.ICQ index 53ded83ab..f02be980a 100644 --- a/Shorewall-common/macro.ICQ +++ b/Shorewall-common/macro.ICQ @@ -7,6 +7,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 5190 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.IMAP b/Shorewall-common/macro.IMAP index 11783c6eb..183567b7a 100644 --- a/Shorewall-common/macro.IMAP +++ b/Shorewall-common/macro.IMAP @@ -8,6 +8,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 143 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.IMAPS b/Shorewall-common/macro.IMAPS index cf2328c03..0082ea9e5 100644 --- a/Shorewall-common/macro.IMAPS +++ b/Shorewall-common/macro.IMAPS @@ -8,6 +8,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 993 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.IPIP b/Shorewall-common/macro.IPIP index 7fac8b68f..9a6bcde78 100644 --- a/Shorewall-common/macro.IPIP +++ b/Shorewall-common/macro.IPIP @@ -7,7 +7,7 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - 94 # IPIP PARAM DEST SOURCE 94 # IPIP #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.IPP b/Shorewall-common/macro.IPP index ad78b9ac7..2baaec1e8 100644 --- a/Shorewall-common/macro.IPP +++ b/Shorewall-common/macro.IPP @@ -7,6 +7,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 631 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.IPPserver b/Shorewall-common/macro.IPPserver index 8948345d9..7551853e3 100644 --- a/Shorewall-common/macro.IPPserver +++ b/Shorewall-common/macro.IPPserver @@ -24,7 +24,7 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM SOURCE DEST tcp 631 PARAM DEST SOURCE udp 631 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.IPsec b/Shorewall-common/macro.IPsec index fd02f8b04..47dddeceb 100644 --- a/Shorewall-common/macro.IPsec +++ b/Shorewall-common/macro.IPsec @@ -7,7 +7,7 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - udp 500 500 # IKE PARAM - - 50 # ESP PARAM DEST SOURCE udp 500 500 # IKE diff --git a/Shorewall-common/macro.IPsecah b/Shorewall-common/macro.IPsecah index b51f93e04..685d59af1 100644 --- a/Shorewall-common/macro.IPsecah +++ b/Shorewall-common/macro.IPsecah @@ -8,7 +8,7 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - udp 500 500 # IKE PARAM - - 51 # AH PARAM DEST SOURCE udp 500 500 # IKE diff --git a/Shorewall-common/macro.IPsecnat b/Shorewall-common/macro.IPsecnat index 266dc1811..bae10ff08 100644 --- a/Shorewall-common/macro.IPsecnat +++ b/Shorewall-common/macro.IPsecnat @@ -7,7 +7,7 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - udp 500 # IKE PARAM - - udp 4500 # NAT-T PARAM - - 50 # ESP diff --git a/Shorewall-common/macro.JabberPlain b/Shorewall-common/macro.JabberPlain index c5f33eba6..f9c215788 100644 --- a/Shorewall-common/macro.JabberPlain +++ b/Shorewall-common/macro.JabberPlain @@ -7,6 +7,6 @@ # ############################################################################### #TARGET SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 5269 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.JabberSecure b/Shorewall-common/macro.JabberSecure index acc81de73..f6eb3006b 100644 --- a/Shorewall-common/macro.JabberSecure +++ b/Shorewall-common/macro.JabberSecure @@ -7,6 +7,6 @@ # ############################################################################### #TARGET SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 5222 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.Jabberd b/Shorewall-common/macro.Jabberd index f5bb958e7..4882c3244 100644 --- a/Shorewall-common/macro.Jabberd +++ b/Shorewall-common/macro.Jabberd @@ -7,6 +7,6 @@ # ############################################################################### #TARGET SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 5223 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.Jetdirect b/Shorewall-common/macro.Jetdirect index bf79ddb6b..6096fbd9f 100644 --- a/Shorewall-common/macro.Jetdirect +++ b/Shorewall-common/macro.Jetdirect @@ -7,6 +7,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 9100 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.L2TP b/Shorewall-common/macro.L2TP index 8a3417e97..aa751b101 100644 --- a/Shorewall-common/macro.L2TP +++ b/Shorewall-common/macro.L2TP @@ -7,7 +7,7 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - udp 1701 # L2TP PARAM DEST SOURCE udp 1701 # L2TP #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.LDAP b/Shorewall-common/macro.LDAP index 903770e0b..0f3a1874d 100644 --- a/Shorewall-common/macro.LDAP +++ b/Shorewall-common/macro.LDAP @@ -12,6 +12,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 389 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.LDAPS b/Shorewall-common/macro.LDAPS index e88d273b5..0189710ee 100644 --- a/Shorewall-common/macro.LDAPS +++ b/Shorewall-common/macro.LDAPS @@ -12,6 +12,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 636 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.MySQL b/Shorewall-common/macro.MySQL index 392d35d1b..136001b65 100644 --- a/Shorewall-common/macro.MySQL +++ b/Shorewall-common/macro.MySQL @@ -7,6 +7,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 3306 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.NNTP b/Shorewall-common/macro.NNTP index 70f8486a7..fb54307f6 100644 --- a/Shorewall-common/macro.NNTP +++ b/Shorewall-common/macro.NNTP @@ -8,6 +8,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 119 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.NNTPS b/Shorewall-common/macro.NNTPS index c918dda80..dac3c12b9 100644 --- a/Shorewall-common/macro.NNTPS +++ b/Shorewall-common/macro.NNTPS @@ -8,6 +8,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 563 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.NTP b/Shorewall-common/macro.NTP index 1d0dd2caf..70f673178 100644 --- a/Shorewall-common/macro.NTP +++ b/Shorewall-common/macro.NTP @@ -8,6 +8,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - udp 123 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.NTPbrd b/Shorewall-common/macro.NTPbrd index 2874cfe2f..093920fdc 100644 --- a/Shorewall-common/macro.NTPbrd +++ b/Shorewall-common/macro.NTPbrd @@ -12,7 +12,7 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - udp 123 PARAM - - udp 1024: 123 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.PCA b/Shorewall-common/macro.PCA index 20cce1f19..8cdeadd2e 100644 --- a/Shorewall-common/macro.PCA +++ b/Shorewall-common/macro.PCA @@ -7,7 +7,7 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - udp 5632 PARAM - - tcp 5631 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.POP3 b/Shorewall-common/macro.POP3 index 04a7cbcdb..3bcdb5a7b 100644 --- a/Shorewall-common/macro.POP3 +++ b/Shorewall-common/macro.POP3 @@ -8,6 +8,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 110 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.POP3S b/Shorewall-common/macro.POP3S index d99928fb9..01f2efad6 100644 --- a/Shorewall-common/macro.POP3S +++ b/Shorewall-common/macro.POP3S @@ -8,6 +8,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 995 # Secure POP3 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.Ping b/Shorewall-common/macro.Ping index ef44016da..cc4ac7bba 100644 --- a/Shorewall-common/macro.Ping +++ b/Shorewall-common/macro.Ping @@ -7,6 +7,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - icmp 8 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.PostgreSQL b/Shorewall-common/macro.PostgreSQL index 7353ea23b..5cc56f002 100644 --- a/Shorewall-common/macro.PostgreSQL +++ b/Shorewall-common/macro.PostgreSQL @@ -7,6 +7,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 5432 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.Printer b/Shorewall-common/macro.Printer index 2881eac46..349265d4d 100644 --- a/Shorewall-common/macro.Printer +++ b/Shorewall-common/macro.Printer @@ -7,6 +7,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 515 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.RDP b/Shorewall-common/macro.RDP index 04eba5dc5..59aad3dce 100644 --- a/Shorewall-common/macro.RDP +++ b/Shorewall-common/macro.RDP @@ -7,6 +7,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 3389 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.Rdate b/Shorewall-common/macro.Rdate index 80a5b6de3..8ccc8a2b5 100644 --- a/Shorewall-common/macro.Rdate +++ b/Shorewall-common/macro.Rdate @@ -11,6 +11,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 37 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.Reject b/Shorewall-common/macro.Reject index 3fff4f90d..78efe9cfa 100644 --- a/Shorewall-common/macro.Reject +++ b/Shorewall-common/macro.Reject @@ -13,7 +13,7 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP # # Don't log 'auth' REJECT # diff --git a/Shorewall-common/macro.Rsync b/Shorewall-common/macro.Rsync index 04c24677e..1d732ad0b 100644 --- a/Shorewall-common/macro.Rsync +++ b/Shorewall-common/macro.Rsync @@ -7,6 +7,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 873 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.SMB b/Shorewall-common/macro.SMB index 28b0e7f15..1b79aba29 100644 --- a/Shorewall-common/macro.SMB +++ b/Shorewall-common/macro.SMB @@ -11,7 +11,7 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - udp 135,445 PARAM - - udp 137:139 PARAM - - udp 1024: 137 diff --git a/Shorewall-common/macro.SMBBI b/Shorewall-common/macro.SMBBI index c982b5ef8..8f1ee71bb 100644 --- a/Shorewall-common/macro.SMBBI +++ b/Shorewall-common/macro.SMBBI @@ -11,7 +11,7 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - udp 135,445 PARAM - - udp 137:139 PARAM - - udp 1024: 137 diff --git a/Shorewall-common/macro.SMBswat b/Shorewall-common/macro.SMBswat index 9009d92f7..76109b35f 100644 --- a/Shorewall-common/macro.SMBswat +++ b/Shorewall-common/macro.SMBswat @@ -8,6 +8,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 901 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.SMTP b/Shorewall-common/macro.SMTP index a72ce6c00..107ab6494 100644 --- a/Shorewall-common/macro.SMTP +++ b/Shorewall-common/macro.SMTP @@ -15,6 +15,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 25 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.SMTPS b/Shorewall-common/macro.SMTPS index 2d013f038..5320e1596 100644 --- a/Shorewall-common/macro.SMTPS +++ b/Shorewall-common/macro.SMTPS @@ -12,6 +12,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 465 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.SNMP b/Shorewall-common/macro.SNMP index 6c9a153f8..7d0c741ad 100644 --- a/Shorewall-common/macro.SNMP +++ b/Shorewall-common/macro.SNMP @@ -7,7 +7,7 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - udp 161:162 PARAM - - tcp 161 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.SPAMD b/Shorewall-common/macro.SPAMD index 43133c1fe..0653fff57 100644 --- a/Shorewall-common/macro.SPAMD +++ b/Shorewall-common/macro.SPAMD @@ -7,6 +7,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 783 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.SSH b/Shorewall-common/macro.SSH index 32dc0e265..137b1e4eb 100644 --- a/Shorewall-common/macro.SSH +++ b/Shorewall-common/macro.SSH @@ -7,6 +7,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 22 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.SVN b/Shorewall-common/macro.SVN index 5aeb3061b..003d51d20 100644 --- a/Shorewall-common/macro.SVN +++ b/Shorewall-common/macro.SVN @@ -8,6 +8,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 3690 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.SixXS b/Shorewall-common/macro.SixXS index 2274b0e48..82ae64759 100644 --- a/Shorewall-common/macro.SixXS +++ b/Shorewall-common/macro.SixXS @@ -7,7 +7,7 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 3874 # Used for retrieving the tunnel information (eg by AICCU) PARAM - - udp 3740 # Used for signaling where the current IPv4 endpoint # of the tunnel is and that it is alive diff --git a/Shorewall-common/macro.Submission b/Shorewall-common/macro.Submission index c824ac7db..f2a7e6652 100644 --- a/Shorewall-common/macro.Submission +++ b/Shorewall-common/macro.Submission @@ -7,6 +7,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 587 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.Syslog b/Shorewall-common/macro.Syslog index 19966ad67..28bbe3184 100644 --- a/Shorewall-common/macro.Syslog +++ b/Shorewall-common/macro.Syslog @@ -7,6 +7,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - udp 514 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.TFTP b/Shorewall-common/macro.TFTP index 168a25c78..11db15416 100644 --- a/Shorewall-common/macro.TFTP +++ b/Shorewall-common/macro.TFTP @@ -9,6 +9,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - udp 69 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.Telnet b/Shorewall-common/macro.Telnet index 5e75447e7..4de7ebb51 100644 --- a/Shorewall-common/macro.Telnet +++ b/Shorewall-common/macro.Telnet @@ -8,6 +8,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 23 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.Telnets b/Shorewall-common/macro.Telnets index 472e1230d..fd704c640 100644 --- a/Shorewall-common/macro.Telnets +++ b/Shorewall-common/macro.Telnets @@ -8,6 +8,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 992 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.Time b/Shorewall-common/macro.Time index bb8ca7f88..ba3988140 100644 --- a/Shorewall-common/macro.Time +++ b/Shorewall-common/macro.Time @@ -9,6 +9,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 37 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.Trcrt b/Shorewall-common/macro.Trcrt index 586dfab59..bfc3a938c 100644 --- a/Shorewall-common/macro.Trcrt +++ b/Shorewall-common/macro.Trcrt @@ -7,7 +7,7 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - udp 33434:33524 # UDP Traceroute PARAM - - icmp 8 # ICMP Traceroute #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.VNC b/Shorewall-common/macro.VNC index 154b7f81a..963bc6741 100644 --- a/Shorewall-common/macro.VNC +++ b/Shorewall-common/macro.VNC @@ -7,6 +7,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 5900:5909 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.VNCL b/Shorewall-common/macro.VNCL index 81f561124..4050ebf08 100644 --- a/Shorewall-common/macro.VNCL +++ b/Shorewall-common/macro.VNCL @@ -8,6 +8,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 5500 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.Web b/Shorewall-common/macro.Web index 2176b5b1c..ddc8fcbd8 100644 --- a/Shorewall-common/macro.Web +++ b/Shorewall-common/macro.Web @@ -9,7 +9,7 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 80 # HTTP (plaintext) PARAM - - tcp 443 # HTTPS (over SSL) #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.Webmin b/Shorewall-common/macro.Webmin index 9a35055d8..a41f4ea09 100644 --- a/Shorewall-common/macro.Webmin +++ b/Shorewall-common/macro.Webmin @@ -7,6 +7,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 10000 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.Whois b/Shorewall-common/macro.Whois index 6e9c8bd67..e001ff781 100644 --- a/Shorewall-common/macro.Whois +++ b/Shorewall-common/macro.Whois @@ -7,6 +7,6 @@ # ############################################################################### #ACTION SOURCE PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 43 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall-common/macro.template b/Shorewall-common/macro.template index b2a70dec1..729087b46 100644 --- a/Shorewall-common/macro.template +++ b/Shorewall-common/macro.template @@ -15,7 +15,7 @@ # - All entries in a macro undergo substitution when the macro is # invoked in the rules file. # -# - Macros may not invoke other macros. +# - Macros used in action bodies may not invoke other macros. # # The columns in the file are the same as those in the action.template file but # have different restrictions: @@ -247,7 +247,7 @@ # Otherwise, a separate rule will be generated for each # port. # -# CLIENT PORT(S) (Optional) Port(s) used by the client. If omitted, +# SOURCE PORT(S) (Optional) Port(s) used by the client. If omitted, # any source port is acceptable. Specified as a comma- # separated list of port names, port numbers or port # ranges. @@ -305,19 +305,19 @@ # /etc/shorewall/macro.FwdFTP: # # #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ -# # PORT PORT(S) LIMIT GROUP +# # PORT(S) PORT(S) LIMIT GROUP # DNAT - - tcp 21 # # /etc/shorewall/rules: # # #ACTION SOURCE DEST PROTO DEST SOURCE ORIGINAL RATE USER/ -# # PORT PORT(S) DEST LIMIT GROUP +# # PORT(S) PORT(S) DEST LIMIT GROUP # FwdFTP net loc:192.168.1.5 # # The result is equivalent to: # # #ACTION SOURCE DEST PROTO DEST SOURCE ORIGINAL RATE USER/ -# # PORT PORT(S) DEST LIMIT GROUP +# # PORT(S) PORT(S) DEST LIMIT GROUP # DNAT net loc:192.168.1.5 tcp 21 # # The substitution rules are as follows: @@ -348,7 +348,7 @@ # # Example: ############################################### # #ACTION SOURCE DEST PROTO DEST -# # PORT +# # PORT(S) # macro.FTP File PARAM net loc tcp 21 # rules File FTP/DNAT - 192.168.1.5 # Result DNAT net loc:192.168.1.5 tcp 21 @@ -359,5 +359,5 @@ # ############################################################################### #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ -# PORT PORT(S) LIMIT GROUP +# PORT(S) PORT(S) LIMIT GROUP #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE