diff --git a/Samples/one-interface/shorewall.conf b/Samples/one-interface/shorewall.conf index 319d660ba..5d4c5ee86 100644 --- a/Samples/one-interface/shorewall.conf +++ b/Samples/one-interface/shorewall.conf @@ -201,4 +201,3 @@ MACLIST_DISPOSITION=REJECT TCP_FLAGS_DISPOSITION=DROP -#LAST LINE -- DO NOT REMOVE diff --git a/Samples/three-interfaces/shorewall.conf b/Samples/three-interfaces/shorewall.conf index 5e21ff35b..7b6d2925c 100644 --- a/Samples/three-interfaces/shorewall.conf +++ b/Samples/three-interfaces/shorewall.conf @@ -201,4 +201,3 @@ MACLIST_DISPOSITION=REJECT TCP_FLAGS_DISPOSITION=DROP -#LAST LINE -- DO NOT REMOVE diff --git a/Samples/two-interfaces/shorewall.conf b/Samples/two-interfaces/shorewall.conf index f6eb947d6..e7c495712 100644 --- a/Samples/two-interfaces/shorewall.conf +++ b/Samples/two-interfaces/shorewall.conf @@ -208,4 +208,3 @@ MACLIST_DISPOSITION=REJECT TCP_FLAGS_DISPOSITION=DROP -#LAST LINE -- DO NOT REMOVE diff --git a/Samples6/one-interface/rules b/Samples6/one-interface/rules index 46d81b2a1..006bf4ddf 100644 --- a/Samples6/one-interface/rules +++ b/Samples6/one-interface/rules @@ -22,4 +22,3 @@ Ping/DROP net $FW ACCEPT $FW net ipv6-icmp -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Samples6/one-interface/shorewall6.conf b/Samples6/one-interface/shorewall6.conf index 3b81dae77..bd2787539 100644 --- a/Samples6/one-interface/shorewall6.conf +++ b/Samples6/one-interface/shorewall6.conf @@ -147,4 +147,3 @@ BLACKLIST_DISPOSITION=DROP TCP_FLAGS_DISPOSITION=DROP -#LAST LINE -- DO NOT REMOVE diff --git a/Samples6/three-interfaces/shorewall6.conf b/Samples6/three-interfaces/shorewall6.conf index df0faa3c6..c7488893a 100644 --- a/Samples6/three-interfaces/shorewall6.conf +++ b/Samples6/three-interfaces/shorewall6.conf @@ -147,4 +147,3 @@ BLACKLIST_DISPOSITION=DROP TCP_FLAGS_DISPOSITION=DROP -#LAST LINE -- DO NOT REMOVE diff --git a/Samples6/two-interfaces/shorewall6.conf b/Samples6/two-interfaces/shorewall6.conf index 84ce2d06a..b6e881333 100644 --- a/Samples6/two-interfaces/shorewall6.conf +++ b/Samples6/two-interfaces/shorewall6.conf @@ -147,4 +147,3 @@ BLACKLIST_DISPOSITION=DROP TCP_FLAGS_DISPOSITION=DROP -#LAST LINE -- DO NOT REMOVE diff --git a/Shorewall-lite/shorewall-lite.conf b/Shorewall-lite/shorewall-lite.conf index df37ce7b9..0b896b703 100644 --- a/Shorewall-lite/shorewall-lite.conf +++ b/Shorewall-lite/shorewall-lite.conf @@ -46,4 +46,3 @@ SUBSYSLOCK= RESTOREFILE= -#LAST LINE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.AllowICMPs b/Shorewall/Macros/macro.AllowICMPs index 81a9729dd..355c6d3dd 100644 --- a/Shorewall/Macros/macro.AllowICMPs +++ b/Shorewall/Macros/macro.AllowICMPs @@ -13,4 +13,3 @@ COMMENT Needed ICMP types ACCEPT - - icmp fragmentation-needed ACCEPT - - icmp time-exceeded -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.Amanda b/Shorewall/Macros/macro.Amanda index 8a79c6067..ae3c2ea6d 100644 --- a/Shorewall/Macros/macro.Amanda +++ b/Shorewall/Macros/macro.Amanda @@ -18,4 +18,3 @@ PARAM - - udp 10080 # systems which need to pass AMANDA traffic through netfilter. #PARAM - - tcp 50000:50100 # -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.Auth b/Shorewall/Macros/macro.Auth index b633d63c0..359a32165 100644 --- a/Shorewall/Macros/macro.Auth +++ b/Shorewall/Macros/macro.Auth @@ -9,4 +9,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 113 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.BGP b/Shorewall/Macros/macro.BGP index a1fd38ec0..d45020987 100644 --- a/Shorewall/Macros/macro.BGP +++ b/Shorewall/Macros/macro.BGP @@ -9,4 +9,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 179 # BGP4 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.BitTorrent b/Shorewall/Macros/macro.BitTorrent index d81b7f544..50a356adb 100644 --- a/Shorewall/Macros/macro.BitTorrent +++ b/Shorewall/Macros/macro.BitTorrent @@ -16,4 +16,3 @@ PARAM - - tcp 6881:6889 # PARAM - - udp 6881 # -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.BitTorrent32 b/Shorewall/Macros/macro.BitTorrent32 index 074d78c5b..864916139 100644 --- a/Shorewall/Macros/macro.BitTorrent32 +++ b/Shorewall/Macros/macro.BitTorrent32 @@ -14,4 +14,3 @@ PARAM - - tcp 6881:6999 # PARAM - - udp 6881 # -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.CVS b/Shorewall/Macros/macro.CVS index 386c8c39b..df3463cdd 100644 --- a/Shorewall/Macros/macro.CVS +++ b/Shorewall/Macros/macro.CVS @@ -9,4 +9,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 2401 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.Citrix b/Shorewall/Macros/macro.Citrix index 64bd7b0bb..7d77a322f 100644 --- a/Shorewall/Macros/macro.Citrix +++ b/Shorewall/Macros/macro.Citrix @@ -11,4 +11,3 @@ PARAM - - tcp 1494 # ICA PARAM - - udp 1604 # ICA Browser PARAM - - tcp 2598 # CGP Session Reliabilty -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.DAAP b/Shorewall/Macros/macro.DAAP index cafb8fab1..c0e663d8c 100644 --- a/Shorewall/Macros/macro.DAAP +++ b/Shorewall/Macros/macro.DAAP @@ -11,4 +11,3 @@ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 3689 PARAM - - udp 3689 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.DCC b/Shorewall/Macros/macro.DCC index dc4027d18..aa9683b0b 100644 --- a/Shorewall/Macros/macro.DCC +++ b/Shorewall/Macros/macro.DCC @@ -10,4 +10,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 6277 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.DNS b/Shorewall/Macros/macro.DNS index 584481e84..ef0cdbf50 100644 --- a/Shorewall/Macros/macro.DNS +++ b/Shorewall/Macros/macro.DNS @@ -10,4 +10,3 @@ # 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/Macros/macro.Distcc b/Shorewall/Macros/macro.Distcc index 95ac70615..5c13b869a 100644 --- a/Shorewall/Macros/macro.Distcc +++ b/Shorewall/Macros/macro.Distcc @@ -9,4 +9,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 3632 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.Drop b/Shorewall/Macros/macro.Drop index 8a6520ef9..44714a5d1 100644 --- a/Shorewall/Macros/macro.Drop +++ b/Shorewall/Macros/macro.Drop @@ -50,4 +50,3 @@ dropNotSyn # the log. # DROP - - udp - 53 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.DropDNSrep b/Shorewall/Macros/macro.DropDNSrep index 2828ec307..497ea9f1a 100644 --- a/Shorewall/Macros/macro.DropDNSrep +++ b/Shorewall/Macros/macro.DropDNSrep @@ -12,4 +12,3 @@ COMMENT Late DNS Replies DROP - - udp - 53 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.DropUPnP b/Shorewall/Macros/macro.DropUPnP index 9ad8a04a9..c74da0152 100644 --- a/Shorewall/Macros/macro.DropUPnP +++ b/Shorewall/Macros/macro.DropUPnP @@ -12,4 +12,3 @@ COMMENT UPnP DROP - - udp 1900 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.Edonkey b/Shorewall/Macros/macro.Edonkey index 9d7264f57..3a672c62d 100644 --- a/Shorewall/Macros/macro.Edonkey +++ b/Shorewall/Macros/macro.Edonkey @@ -32,4 +32,3 @@ # 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/Macros/macro.FTP b/Shorewall/Macros/macro.FTP index 997b78615..431407ddc 100644 --- a/Shorewall/Macros/macro.FTP +++ b/Shorewall/Macros/macro.FTP @@ -9,4 +9,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 21 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.Finger b/Shorewall/Macros/macro.Finger index f180ecfb2..8a873d40a 100644 --- a/Shorewall/Macros/macro.Finger +++ b/Shorewall/Macros/macro.Finger @@ -10,4 +10,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 79 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.GNUnet b/Shorewall/Macros/macro.GNUnet index 1a2615b64..04597fcee 100644 --- a/Shorewall/Macros/macro.GNUnet +++ b/Shorewall/Macros/macro.GNUnet @@ -12,4 +12,3 @@ PARAM - - tcp 2086 PARAM - - udp 2086 PARAM - - tcp 1080 PARAM - - udp 1080 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.GRE b/Shorewall/Macros/macro.GRE index 3f0f6b2f6..35797131b 100644 --- a/Shorewall/Macros/macro.GRE +++ b/Shorewall/Macros/macro.GRE @@ -11,4 +11,3 @@ # 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/Macros/macro.Git b/Shorewall/Macros/macro.Git index a7e5c125a..7b06913ea 100644 --- a/Shorewall/Macros/macro.Git +++ b/Shorewall/Macros/macro.Git @@ -9,4 +9,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 9418 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.Gnutella b/Shorewall/Macros/macro.Gnutella index 4ec5718af..5e375438a 100644 --- a/Shorewall/Macros/macro.Gnutella +++ b/Shorewall/Macros/macro.Gnutella @@ -10,4 +10,3 @@ # 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/Macros/macro.HTTP b/Shorewall/Macros/macro.HTTP index 798b6bc94..18a7b2652 100644 --- a/Shorewall/Macros/macro.HTTP +++ b/Shorewall/Macros/macro.HTTP @@ -9,4 +9,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 80 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.HTTPS b/Shorewall/Macros/macro.HTTPS index af75c782f..444f945ae 100644 --- a/Shorewall/Macros/macro.HTTPS +++ b/Shorewall/Macros/macro.HTTPS @@ -9,4 +9,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 443 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.ICQ b/Shorewall/Macros/macro.ICQ index 65d69748e..ff9502d3b 100644 --- a/Shorewall/Macros/macro.ICQ +++ b/Shorewall/Macros/macro.ICQ @@ -9,4 +9,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 5190 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.IMAP b/Shorewall/Macros/macro.IMAP index f9da86963..6cd53d0de 100644 --- a/Shorewall/Macros/macro.IMAP +++ b/Shorewall/Macros/macro.IMAP @@ -10,4 +10,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 143 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.IMAPS b/Shorewall/Macros/macro.IMAPS index f3f1f14eb..9e3df9dbc 100644 --- a/Shorewall/Macros/macro.IMAPS +++ b/Shorewall/Macros/macro.IMAPS @@ -10,4 +10,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 993 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.IPIP b/Shorewall/Macros/macro.IPIP index 3f1caf089..771bcc60f 100644 --- a/Shorewall/Macros/macro.IPIP +++ b/Shorewall/Macros/macro.IPIP @@ -10,4 +10,3 @@ # 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/Macros/macro.IPP b/Shorewall/Macros/macro.IPP index 9486ac824..88c62f8b0 100644 --- a/Shorewall/Macros/macro.IPP +++ b/Shorewall/Macros/macro.IPP @@ -9,4 +9,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 631 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.IPPbrd b/Shorewall/Macros/macro.IPPbrd index 643b5cb96..024d11cd9 100644 --- a/Shorewall/Macros/macro.IPPbrd +++ b/Shorewall/Macros/macro.IPPbrd @@ -10,4 +10,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - udp 631 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.IPPserver b/Shorewall/Macros/macro.IPPserver index b768dd140..6f83c789c 100644 --- a/Shorewall/Macros/macro.IPPserver +++ b/Shorewall/Macros/macro.IPPserver @@ -27,4 +27,3 @@ # 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/Macros/macro.IPsec b/Shorewall/Macros/macro.IPsec index 2819d7e74..aa34ecf6e 100644 --- a/Shorewall/Macros/macro.IPsec +++ b/Shorewall/Macros/macro.IPsec @@ -12,4 +12,3 @@ PARAM - - udp 500 500 # IKE PARAM - - 50 # ESP PARAM DEST SOURCE udp 500 500 # IKE PARAM DEST SOURCE 50 # ESP -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.IPsecah b/Shorewall/Macros/macro.IPsecah index a6ca61523..45e826367 100644 --- a/Shorewall/Macros/macro.IPsecah +++ b/Shorewall/Macros/macro.IPsecah @@ -13,4 +13,3 @@ PARAM - - udp 500 500 # IKE PARAM - - 51 # AH PARAM DEST SOURCE udp 500 500 # IKE PARAM DEST SOURCE 51 # AH -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.IPsecnat b/Shorewall/Macros/macro.IPsecnat index 9212d97c5..a3f0f30f3 100644 --- a/Shorewall/Macros/macro.IPsecnat +++ b/Shorewall/Macros/macro.IPsecnat @@ -14,4 +14,3 @@ PARAM - - 50 # ESP PARAM DEST SOURCE udp 500 # IKE PARAM DEST SOURCE udp 4500 # NAT-T PARAM DEST SOURCE 50 # ESP -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.IRC b/Shorewall/Macros/macro.IRC index faaadc099..a2576058d 100644 --- a/Shorewall/Macros/macro.IRC +++ b/Shorewall/Macros/macro.IRC @@ -9,4 +9,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 6667 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.JAP b/Shorewall/Macros/macro.JAP index 793c8c4ba..86b98488f 100644 --- a/Shorewall/Macros/macro.JAP +++ b/Shorewall/Macros/macro.JAP @@ -15,4 +15,3 @@ PARAM - - tcp 6544 # HTTP port PARAM - - tcp 6543 # InfoService port HTTPS/PARAM SSH/PARAM -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.JabberPlain b/Shorewall/Macros/macro.JabberPlain index c7a5ce5d7..72324501b 100644 --- a/Shorewall/Macros/macro.JabberPlain +++ b/Shorewall/Macros/macro.JabberPlain @@ -9,4 +9,3 @@ #TARGET SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 5222 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.JabberSecure b/Shorewall/Macros/macro.JabberSecure index 7e10c0abf..f16f42a24 100644 --- a/Shorewall/Macros/macro.JabberSecure +++ b/Shorewall/Macros/macro.JabberSecure @@ -9,4 +9,3 @@ #TARGET SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 5223 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.Jabberd b/Shorewall/Macros/macro.Jabberd index 0be954292..056cff065 100644 --- a/Shorewall/Macros/macro.Jabberd +++ b/Shorewall/Macros/macro.Jabberd @@ -9,4 +9,3 @@ #TARGET SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 5269 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.Jetdirect b/Shorewall/Macros/macro.Jetdirect index c505b262f..88a0fa29f 100644 --- a/Shorewall/Macros/macro.Jetdirect +++ b/Shorewall/Macros/macro.Jetdirect @@ -9,4 +9,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 9100 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.L2TP b/Shorewall/Macros/macro.L2TP index 64afee142..e31eaff7e 100644 --- a/Shorewall/Macros/macro.L2TP +++ b/Shorewall/Macros/macro.L2TP @@ -11,4 +11,3 @@ # 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/Macros/macro.LDAP b/Shorewall/Macros/macro.LDAP index ba5710172..08c7a4a3e 100644 --- a/Shorewall/Macros/macro.LDAP +++ b/Shorewall/Macros/macro.LDAP @@ -14,4 +14,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 389 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.LDAPS b/Shorewall/Macros/macro.LDAPS index bcaf2de91..b61468ca5 100644 --- a/Shorewall/Macros/macro.LDAPS +++ b/Shorewall/Macros/macro.LDAPS @@ -14,4 +14,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 636 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.MySQL b/Shorewall/Macros/macro.MySQL index 1e438d97c..798e79c07 100644 --- a/Shorewall/Macros/macro.MySQL +++ b/Shorewall/Macros/macro.MySQL @@ -9,4 +9,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 3306 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.NNTP b/Shorewall/Macros/macro.NNTP index 3bfc76283..27325bb79 100644 --- a/Shorewall/Macros/macro.NNTP +++ b/Shorewall/Macros/macro.NNTP @@ -10,4 +10,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 119 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.NNTPS b/Shorewall/Macros/macro.NNTPS index 25fef49d8..a2f4ba046 100644 --- a/Shorewall/Macros/macro.NNTPS +++ b/Shorewall/Macros/macro.NNTPS @@ -10,4 +10,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 563 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.NTP b/Shorewall/Macros/macro.NTP index 6ff0a350e..0a8de3dd2 100644 --- a/Shorewall/Macros/macro.NTP +++ b/Shorewall/Macros/macro.NTP @@ -10,4 +10,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - udp 123 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.NTPbi b/Shorewall/Macros/macro.NTPbi index 8536f0fd4..a2e3954c4 100644 --- a/Shorewall/Macros/macro.NTPbi +++ b/Shorewall/Macros/macro.NTPbi @@ -10,4 +10,3 @@ # PORT(S) PORT(S) LIMIT GROUP PARAM - - udp 123 PARAM DEST SOURCE udp 123 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.NTPbrd b/Shorewall/Macros/macro.NTPbrd index 63b110add..baf12a7e5 100644 --- a/Shorewall/Macros/macro.NTPbrd +++ b/Shorewall/Macros/macro.NTPbrd @@ -15,4 +15,3 @@ # 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/Macros/macro.OSPF b/Shorewall/Macros/macro.OSPF index 84e2fdbbf..677c379ba 100644 --- a/Shorewall/Macros/macro.OSPF +++ b/Shorewall/Macros/macro.OSPF @@ -9,4 +9,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE ORIGINAL RATE USER/ ORIGINAL # PORT(S) PORT(S) DEST LIMIT GROUP DEST PARAM - - 89 - # OSPF -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.OpenVPN b/Shorewall/Macros/macro.OpenVPN index 6a827603f..539951058 100644 --- a/Shorewall/Macros/macro.OpenVPN +++ b/Shorewall/Macros/macro.OpenVPN @@ -9,4 +9,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - udp 1194 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.PCA b/Shorewall/Macros/macro.PCA index 1518af059..545e884c9 100644 --- a/Shorewall/Macros/macro.PCA +++ b/Shorewall/Macros/macro.PCA @@ -10,4 +10,3 @@ # 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/Macros/macro.POP3 b/Shorewall/Macros/macro.POP3 index b0acab21d..96d309ce8 100644 --- a/Shorewall/Macros/macro.POP3 +++ b/Shorewall/Macros/macro.POP3 @@ -10,4 +10,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 110 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.POP3S b/Shorewall/Macros/macro.POP3S index fd9c26097..5709086e4 100644 --- a/Shorewall/Macros/macro.POP3S +++ b/Shorewall/Macros/macro.POP3S @@ -10,4 +10,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # 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/Macros/macro.PPtP b/Shorewall/Macros/macro.PPtP index ac3823e56..aa9f4b73c 100644 --- a/Shorewall/Macros/macro.PPtP +++ b/Shorewall/Macros/macro.PPtP @@ -11,4 +11,3 @@ PARAM - - 47 PARAM DEST SOURCE 47 PARAM - - tcp 1723 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.Ping b/Shorewall/Macros/macro.Ping index dad8b3a9a..a4a81484e 100644 --- a/Shorewall/Macros/macro.Ping +++ b/Shorewall/Macros/macro.Ping @@ -9,4 +9,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - icmp 8 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.PostgreSQL b/Shorewall/Macros/macro.PostgreSQL index 2c4a4cab1..cd360ecaf 100644 --- a/Shorewall/Macros/macro.PostgreSQL +++ b/Shorewall/Macros/macro.PostgreSQL @@ -9,4 +9,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 5432 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.Printer b/Shorewall/Macros/macro.Printer index 8c28ed8df..e11c43cfc 100644 --- a/Shorewall/Macros/macro.Printer +++ b/Shorewall/Macros/macro.Printer @@ -9,4 +9,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 515 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.RDP b/Shorewall/Macros/macro.RDP index fbbd8254e..2a5ed5d49 100644 --- a/Shorewall/Macros/macro.RDP +++ b/Shorewall/Macros/macro.RDP @@ -9,4 +9,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 3389 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.RIPbi b/Shorewall/Macros/macro.RIPbi index fbfde033d..91273053d 100644 --- a/Shorewall/Macros/macro.RIPbi +++ b/Shorewall/Macros/macro.RIPbi @@ -10,5 +10,4 @@ # PORT(S) PORT(S) LIMIT GROUP PARAM - - udp 520 PARAM DEST SOURCE udp 520 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.RNDC b/Shorewall/Macros/macro.RNDC index 63ccc5afc..6e5894888 100644 --- a/Shorewall/Macros/macro.RNDC +++ b/Shorewall/Macros/macro.RNDC @@ -9,4 +9,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 953 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.Razor b/Shorewall/Macros/macro.Razor index 6c8fa2981..e3022ad63 100644 --- a/Shorewall/Macros/macro.Razor +++ b/Shorewall/Macros/macro.Razor @@ -9,4 +9,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP ACCEPT - - tcp 2703 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.Rdate b/Shorewall/Macros/macro.Rdate index 500873ed0..97e23ce76 100644 --- a/Shorewall/Macros/macro.Rdate +++ b/Shorewall/Macros/macro.Rdate @@ -13,4 +13,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 37 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.Reject b/Shorewall/Macros/macro.Reject index f44ed506b..492904f95 100644 --- a/Shorewall/Macros/macro.Reject +++ b/Shorewall/Macros/macro.Reject @@ -51,4 +51,3 @@ dropNotSyn # the log. # DROP - - udp - 53 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.Rfc1918 b/Shorewall/Macros/macro.Rfc1918 index 5cb8992f8..e07e5aa54 100644 --- a/Shorewall/Macros/macro.Rfc1918 +++ b/Shorewall/Macros/macro.Rfc1918 @@ -11,4 +11,3 @@ FORMAT 2 PARAM SOURCE:10.0.0.0/8,172.16.0.0/12,192.168.0.0/16 \ DEST - - - - - - PARAM SOURCE DEST - - - 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.Rsync b/Shorewall/Macros/macro.Rsync index 530358b96..5c8adce51 100644 --- a/Shorewall/Macros/macro.Rsync +++ b/Shorewall/Macros/macro.Rsync @@ -9,4 +9,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 873 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.SANE b/Shorewall/Macros/macro.SANE index 19312256e..5fa2f198f 100644 --- a/Shorewall/Macros/macro.SANE +++ b/Shorewall/Macros/macro.SANE @@ -20,4 +20,3 @@ PARAM - - tcp 6566 #PARAM - - tcp 32768:61000 # This is generic rule for any os running saned. #PARAM - - tcp 1024: -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.SMB b/Shorewall/Macros/macro.SMB index e4166c351..56bb8222a 100644 --- a/Shorewall/Macros/macro.SMB +++ b/Shorewall/Macros/macro.SMB @@ -16,4 +16,3 @@ PARAM - - udp 135,445 PARAM - - udp 137:139 PARAM - - udp 1024: 137 PARAM - - tcp 135,139,445 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.SMBBI b/Shorewall/Macros/macro.SMBBI index 04e91e7c9..99351e6a8 100644 --- a/Shorewall/Macros/macro.SMBBI +++ b/Shorewall/Macros/macro.SMBBI @@ -20,4 +20,3 @@ PARAM DEST SOURCE udp 135,445 PARAM DEST SOURCE udp 137:139 PARAM DEST SOURCE udp 1024: 137 PARAM DEST SOURCE tcp 135,139,445 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.SMBswat b/Shorewall/Macros/macro.SMBswat index d63805518..3a661ca6d 100644 --- a/Shorewall/Macros/macro.SMBswat +++ b/Shorewall/Macros/macro.SMBswat @@ -10,4 +10,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 901 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.SMTP b/Shorewall/Macros/macro.SMTP index b8782315d..33b546069 100644 --- a/Shorewall/Macros/macro.SMTP +++ b/Shorewall/Macros/macro.SMTP @@ -17,4 +17,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 25 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.SMTPS b/Shorewall/Macros/macro.SMTPS index e2f188243..c45c13bbf 100644 --- a/Shorewall/Macros/macro.SMTPS +++ b/Shorewall/Macros/macro.SMTPS @@ -14,4 +14,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 465 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.SNMP b/Shorewall/Macros/macro.SNMP index 0959e4fbb..221a22921 100644 --- a/Shorewall/Macros/macro.SNMP +++ b/Shorewall/Macros/macro.SNMP @@ -10,4 +10,3 @@ # 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/Macros/macro.SPAMD b/Shorewall/Macros/macro.SPAMD index 258c6d14c..d2225a2ad 100644 --- a/Shorewall/Macros/macro.SPAMD +++ b/Shorewall/Macros/macro.SPAMD @@ -9,4 +9,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 783 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.SSH b/Shorewall/Macros/macro.SSH index 2bde98249..65e2a4982 100644 --- a/Shorewall/Macros/macro.SSH +++ b/Shorewall/Macros/macro.SSH @@ -9,4 +9,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 22 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.SVN b/Shorewall/Macros/macro.SVN index aa5e52a00..b6181bd8c 100644 --- a/Shorewall/Macros/macro.SVN +++ b/Shorewall/Macros/macro.SVN @@ -10,4 +10,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 3690 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.SixXS b/Shorewall/Macros/macro.SixXS index 657e75f43..5f86683f6 100644 --- a/Shorewall/Macros/macro.SixXS +++ b/Shorewall/Macros/macro.SixXS @@ -22,4 +22,3 @@ PARAM - - 41 # Used for tunneling IPv6 over IPv4 (AYIYA # tunnels)(5072 is official port, 8374 is used in the beta) PARAM - - udp 5072,8374 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.Submission b/Shorewall/Macros/macro.Submission index 4f9e1e2ce..ac95b7fee 100644 --- a/Shorewall/Macros/macro.Submission +++ b/Shorewall/Macros/macro.Submission @@ -9,4 +9,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 587 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.Syslog b/Shorewall/Macros/macro.Syslog index 9efc6443e..a5fa73dfe 100644 --- a/Shorewall/Macros/macro.Syslog +++ b/Shorewall/Macros/macro.Syslog @@ -9,4 +9,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - udp 514 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.TFTP b/Shorewall/Macros/macro.TFTP index 70f2c0980..0e630428b 100644 --- a/Shorewall/Macros/macro.TFTP +++ b/Shorewall/Macros/macro.TFTP @@ -11,4 +11,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - udp 69 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.Telnet b/Shorewall/Macros/macro.Telnet index da87b2001..c2d98edc3 100644 --- a/Shorewall/Macros/macro.Telnet +++ b/Shorewall/Macros/macro.Telnet @@ -10,4 +10,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 23 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.Telnets b/Shorewall/Macros/macro.Telnets index 158e9b280..c498bae67 100644 --- a/Shorewall/Macros/macro.Telnets +++ b/Shorewall/Macros/macro.Telnets @@ -10,4 +10,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 992 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.Time b/Shorewall/Macros/macro.Time index 4bc33d184..ca0b7c1e6 100644 --- a/Shorewall/Macros/macro.Time +++ b/Shorewall/Macros/macro.Time @@ -11,4 +11,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 37 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.Trcrt b/Shorewall/Macros/macro.Trcrt index 2d84d1eed..5d6f17122 100644 --- a/Shorewall/Macros/macro.Trcrt +++ b/Shorewall/Macros/macro.Trcrt @@ -10,4 +10,3 @@ # 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/Macros/macro.VNC b/Shorewall/Macros/macro.VNC index 92102db5c..79a2dc994 100644 --- a/Shorewall/Macros/macro.VNC +++ b/Shorewall/Macros/macro.VNC @@ -9,4 +9,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # 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/Macros/macro.VNCL b/Shorewall/Macros/macro.VNCL index 52b1ffa21..e8bc6e83e 100644 --- a/Shorewall/Macros/macro.VNCL +++ b/Shorewall/Macros/macro.VNCL @@ -10,4 +10,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 5500 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.Web b/Shorewall/Macros/macro.Web index 3d54f800f..349f7e6b0 100644 --- a/Shorewall/Macros/macro.Web +++ b/Shorewall/Macros/macro.Web @@ -12,4 +12,3 @@ # 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/Macros/macro.Webcache b/Shorewall/Macros/macro.Webcache index 498a6f8d6..5b0ced5ed 100644 --- a/Shorewall/Macros/macro.Webcache +++ b/Shorewall/Macros/macro.Webcache @@ -9,5 +9,4 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 8080 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.Webmin b/Shorewall/Macros/macro.Webmin index 8ac6d213a..90b261693 100644 --- a/Shorewall/Macros/macro.Webmin +++ b/Shorewall/Macros/macro.Webmin @@ -9,4 +9,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 10000 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.Whois b/Shorewall/Macros/macro.Whois index 5bc2a0509..d0c43ce63 100644 --- a/Shorewall/Macros/macro.Whois +++ b/Shorewall/Macros/macro.Whois @@ -9,4 +9,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - tcp 43 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.mDNS b/Shorewall/Macros/macro.mDNS index 5a6bc81ff..c13cf5ed2 100644 --- a/Shorewall/Macros/macro.mDNS +++ b/Shorewall/Macros/macro.mDNS @@ -10,4 +10,3 @@ # PORT(S) PORT(S) LIMIT GROUP PARAM - - udp 5353 PARAM DEST SOURCE udp 5353 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/Macros/macro.template b/Shorewall/Macros/macro.template index ae357d1bd..130517212 100644 --- a/Shorewall/Macros/macro.template +++ b/Shorewall/Macros/macro.template @@ -365,4 +365,3 @@ FORMAT 2 ####################################################################################################### #ACTION SOURCE DEST PROTO DEST SOURCE ORIGINAL RATE USER/ ORIGINAL # PORT(S) PORT(S) DEST LIMIT GROUP DEST -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/action.Drop b/Shorewall/action.Drop index 75cca876b..ff50bed5b 100644 --- a/Shorewall/action.Drop +++ b/Shorewall/action.Drop @@ -54,4 +54,3 @@ dropNotSyn - - tcp # the log. # DropDNSrep -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/action.Reject b/Shorewall/action.Reject index b59dfb4a2..18413cdc0 100644 --- a/Shorewall/action.Reject +++ b/Shorewall/action.Reject @@ -52,4 +52,3 @@ dropNotSyn - - tcp # the log. # DropDNSrep -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/action.template b/Shorewall/action.template index 03fdec63e..205d48b99 100644 --- a/Shorewall/action.template +++ b/Shorewall/action.template @@ -197,4 +197,3 @@ ############################################################################### #TARGET SOURCE DEST PROTO DEST SOURCE ORIGINAL RATE USER/ # PORT PORT(S) DEST LIMIT GROUP -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/actions.std b/Shorewall/actions.std index 8cc596c21..e98c2ed94 100644 --- a/Shorewall/actions.std +++ b/Shorewall/actions.std @@ -32,4 +32,3 @@ #ACTION Drop # Default Action for DROP policy Reject # Default Action for REJECT policy -#LAST LINE - ADD YOUR ENTRIES ABOVE THIS ONE - DO NOT REMOVE diff --git a/Shorewall/configfiles/shorewall.conf b/Shorewall/configfiles/shorewall.conf index c099f008d..6d1161bf1 100644 --- a/Shorewall/configfiles/shorewall.conf +++ b/Shorewall/configfiles/shorewall.conf @@ -199,4 +199,3 @@ MACLIST_DISPOSITION=REJECT TCP_FLAGS_DISPOSITION=DROP -#LAST LINE -- DO NOT REMOVE diff --git a/Shorewall/modules b/Shorewall/modules index 1552ec74c..2f7614a74 100644 --- a/Shorewall/modules +++ b/Shorewall/modules @@ -176,4 +176,3 @@ loadmodule ipt_TOS loadmodule ipt_ttl loadmodule ipt_TTL loadmodule ipt_ULOG -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall6-lite/shorewall6-lite.conf b/Shorewall6-lite/shorewall6-lite.conf index 28645c05f..32b3a86a9 100644 --- a/Shorewall6-lite/shorewall6-lite.conf +++ b/Shorewall6-lite/shorewall6-lite.conf @@ -46,4 +46,3 @@ SUBSYSLOCK= RESTOREFILE= -#LAST LINE -- DO NOT REMOVE diff --git a/Shorewall6/accounting b/Shorewall6/accounting index 432053a06..5c931fda0 100644 --- a/Shorewall6/accounting +++ b/Shorewall6/accounting @@ -9,4 +9,3 @@ ##################################################################################### #ACTION CHAIN SOURCE DESTINATION PROTO DEST SOURCE USER/ MARK # PORT(S) PORT(S) GROUP -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall6/action.AllowICMPs b/Shorewall6/action.AllowICMPs index 4da1eb741..0f6827400 100644 --- a/Shorewall6/action.AllowICMPs +++ b/Shorewall6/action.AllowICMPs @@ -38,4 +38,3 @@ ACCEPT - - ipv6-icmp 149 # Certificate path advertisement ACCEPT fe80::/10 - ipv6-icmp 151 # Multicast router advertisement ACCEPT fe80::/10 - ipv6-icmp 152 # Multicast router solicitation ACCEPT fe80::/10 - ipv6-icmp 153 # Multicast router termination -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall6/action.Drop b/Shorewall6/action.Drop index fb1b4e624..0eb31dd3f 100644 --- a/Shorewall6/action.Drop +++ b/Shorewall6/action.Drop @@ -45,4 +45,3 @@ dropNotSyn - - tcp # the log. # DropDNSrep -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall6/action.Reject b/Shorewall6/action.Reject index e52be297a..94590c412 100644 --- a/Shorewall6/action.Reject +++ b/Shorewall6/action.Reject @@ -42,4 +42,3 @@ dropNotSyn - - tcp # the log. # DropDNSrep -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall6/action.template b/Shorewall6/action.template index 659f87c08..f421e81b6 100644 --- a/Shorewall6/action.template +++ b/Shorewall6/action.template @@ -170,4 +170,3 @@ ############################################################################### #TARGET SOURCE DEST PROTO DEST SOURCE ORIGINAL RATE USER/ # PORT PORT(S) DEST LIMIT GROUP -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall6/actions b/Shorewall6/actions index 7934d8c8d..24d878337 100644 --- a/Shorewall6/actions +++ b/Shorewall6/actions @@ -10,4 +10,3 @@ ############################################################################### #ACTION COMMENT (place '# ' below the 'C' in comment followed by # v a comment describing the action) -#LAST LINE - ADD YOUR ENTRIES ABOVE THIS ONE - DO NOT REMOVE diff --git a/Shorewall6/actions.std b/Shorewall6/actions.std index 1fdb2378f..ff318e4e6 100644 --- a/Shorewall6/actions.std +++ b/Shorewall6/actions.std @@ -22,4 +22,3 @@ AllowICMPs # Accept needed ICMP6 types Drop # Default Action for DROP policy Reject # Default Action for REJECT policy -#LAST LINE - ADD YOUR ENTRIES ABOVE THIS ONE - DO NOT REMOVE diff --git a/Shorewall6/hosts b/Shorewall6/hosts index 2fe63328b..a171681ed 100644 --- a/Shorewall6/hosts +++ b/Shorewall6/hosts @@ -8,4 +8,3 @@ # ############################################################################### #ZONE HOST(S) OPTIONS -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS LINE -- DO NOT REMOVE diff --git a/Shorewall6/init b/Shorewall6/init index 215078b8b..127366787 100644 --- a/Shorewall6/init +++ b/Shorewall6/init @@ -10,4 +10,3 @@ # http://shorewall.net/shorewall_extension_scripts.htm # ############################################################################### -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall6/macro.Ping b/Shorewall6/macro.Ping index e6b3fd18a..0ebfbddc0 100644 --- a/Shorewall6/macro.Ping +++ b/Shorewall6/macro.Ping @@ -9,4 +9,3 @@ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - ipv6-icmp 128 -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall6/macro.Trcrt b/Shorewall6/macro.Trcrt index 361e60c66..4a43b3e7e 100644 --- a/Shorewall6/macro.Trcrt +++ b/Shorewall6/macro.Trcrt @@ -10,4 +10,3 @@ # PORT(S) PORT(S) LIMIT GROUP PARAM - - udp 33434:33524 # UDP Traceroute PARAM - - ipv6-icmp 128 # ICMP Traceroute -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall6/modules b/Shorewall6/modules index 05d0c4ea9..4bffa5a4b 100644 --- a/Shorewall6/modules +++ b/Shorewall6/modules @@ -90,4 +90,3 @@ loadmodule act_police # Extensions # loadmodule ip6_queue -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall6/params b/Shorewall6/params index 714d1c07d..10a66663f 100644 --- a/Shorewall6/params +++ b/Shorewall6/params @@ -23,4 +23,3 @@ # net eth0 - dhcp,nosmurfs # ############################################################################### -#LAST LINE - ADD YOUR ENTRIES ABOVE THIS ONE - DO NOT REMOVE diff --git a/Shorewall6/routestopped b/Shorewall6/routestopped index 77b5a75ec..d81110bcc 100644 --- a/Shorewall6/routestopped +++ b/Shorewall6/routestopped @@ -11,4 +11,3 @@ # ############################################################################### #INTERFACE HOST(S) OPTIONS -#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall6/shorewall6.conf b/Shorewall6/shorewall6.conf index 19b00b3b3..67bf49286 100644 --- a/Shorewall6/shorewall6.conf +++ b/Shorewall6/shorewall6.conf @@ -152,5 +152,3 @@ WIDE_TC_MARKS=No BLACKLIST_DISPOSITION=DROP TCP_FLAGS_DISPOSITION=DROP - -#LAST LINE -- DO NOT REMOVE diff --git a/docs/FAQ.xml b/docs/FAQ.xml old mode 100644 new mode 100755 index 18e1f2bcf..20cab9509 --- a/docs/FAQ.xml +++ b/docs/FAQ.xml @@ -2282,6 +2282,24 @@ rmmod nf_conntrack_sipThen change the DONT_LOAD specification +
+ IPv6 + +
+ (FAQ 40) I have an interface that gets its IPv6 configuration + from radvd. When I start Shorewall6, I immediately loose my default + route. Why? + + Answer: You have configured + forwarding on the interface which disables autoconfiguration of the + interface. To retain autoconfiguration on the interface when Shorewall6 + starts, specify forwarding=0 in the + OPTIONS column on the interface's entry in shorewall6-interfaces + (5). +
+
+
Miscellaneous