diff --git a/Shorewall/COPYING b/Shorewall/COPYING index 2ba72d57f..f28fabe9e 100644 --- a/Shorewall/COPYING +++ b/Shorewall/COPYING @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 59 Temple Place, Suite 3.2, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 59 Temple Place, Suite 3.2, Boston, MA 02111-1307 USA Also add information on how to contact you by electronic and paper mail. diff --git a/Shorewall/INSTALL b/Shorewall/INSTALL index 42f16a65d..9e257bc53 100644 --- a/Shorewall/INSTALL +++ b/Shorewall/INSTALL @@ -1,4 +1,4 @@ -Shoreline Firewall (Shorewall) Version 3.0 +Shoreline Firewall (Shorewall) Version 3.2 ----- ---- ----------------------------------------------------------------------------- diff --git a/Shorewall/Limit b/Shorewall/Limit index 3e7e68d60..ac322a7b2 100644 --- a/Shorewall/Limit +++ b/Shorewall/Limit @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 -- Extension Script to create Limit action. +# Shorewall version 3.2 -- Extension Script to create Limit action. # # /usr/share/shorewall/Limit ############################################################################## diff --git a/Shorewall/README.txt b/Shorewall/README.txt index 1424f0ac0..582dd47d1 100644 --- a/Shorewall/README.txt +++ b/Shorewall/README.txt @@ -1 +1 @@ -This is the Shorewall stable 3.0 branch of CVS. +This is the Shorewall Development 3.2 branch of CVS. diff --git a/Shorewall/accounting b/Shorewall/accounting index aa4d5612c..ad62063d0 100755 --- a/Shorewall/accounting +++ b/Shorewall/accounting @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Accounting File +# Shorewall version 3.2 - Accounting File # # /etc/shorewall/accounting # diff --git a/Shorewall/action.Drop b/Shorewall/action.Drop index ea54b651d..5270f263d 100644 --- a/Shorewall/action.Drop +++ b/Shorewall/action.Drop @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Drop Action +# Shorewall version 3.2 - Drop Action # # /usr/share/shorewall/action.Drop # diff --git a/Shorewall/action.Limit b/Shorewall/action.Limit index 251985021..350a27999 100644 --- a/Shorewall/action.Limit +++ b/Shorewall/action.Limit @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Limit Action +# Shorewall version 3.2 - Limit Action # # /usr/share/shorewall/action.Limit # diff --git a/Shorewall/action.Reject b/Shorewall/action.Reject index f62435419..117eb531e 100644 --- a/Shorewall/action.Reject +++ b/Shorewall/action.Reject @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Reject Action +# Shorewall version 3.2 - Reject Action # # /usr/share/shorewall/action.Reject # diff --git a/Shorewall/action.template b/Shorewall/action.template index 33114806e..ad637fda4 100644 --- a/Shorewall/action.template +++ b/Shorewall/action.template @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Action Template +# Shorewall version 3.2 - Action Template # # /etc/shorewall/action.template # diff --git a/Shorewall/actions b/Shorewall/actions index 7f41c34d8..322f80ade 100644 --- a/Shorewall/actions +++ b/Shorewall/actions @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Actions File +# Shorewall version 3.2 - Actions File # # /etc/shorewall/actions # diff --git a/Shorewall/actions.std b/Shorewall/actions.std index f3e666895..1f895bcd9 100644 --- a/Shorewall/actions.std +++ b/Shorewall/actions.std @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Actions.std File +# Shorewall version 3.2 - Actions.std File # # /usr/share/shorewall/actions.std # diff --git a/Shorewall/blacklist b/Shorewall/blacklist index a729df5c8..83f337e2b 100755 --- a/Shorewall/blacklist +++ b/Shorewall/blacklist @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Blacklist File +# Shorewall version 3.2 - Blacklist File # # /etc/shorewall/blacklist # diff --git a/Shorewall/configpath b/Shorewall/configpath index 42aeef374..d438a2732 100644 --- a/Shorewall/configpath +++ b/Shorewall/configpath @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Default Config Path +# Shorewall version 3.2 - Default Config Path # # /usr/share/shorewall/configpath # diff --git a/Shorewall/continue b/Shorewall/continue index dedb6b0c3..eb09c0d52 100644 --- a/Shorewall/continue +++ b/Shorewall/continue @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Continue File +# Shorewall version 3.2 - Continue File # # /etc/shorewall/continue # diff --git a/Shorewall/ecn b/Shorewall/ecn index b0525aa99..4db81d8f8 100644 --- a/Shorewall/ecn +++ b/Shorewall/ecn @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Ecn File +# Shorewall version 3.2 - Ecn File # # /etc/shorewall/ecn # diff --git a/Shorewall/firewall b/Shorewall/firewall index be60c98f2..f8e0232db 100755 --- a/Shorewall/firewall +++ b/Shorewall/firewall @@ -1,6 +1,6 @@ #!/bin/sh # -# The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V3.0 +# The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V3.2 # # This program is under GPL [http://www.gnu.org/copyleft/gpl.htm] # @@ -1685,7 +1685,7 @@ validate_hosts_file() { # # Format a match by the passed MAC address # The passed address begins with "~" and uses "-" as a separator between bytes -# Example: ~01-02-03-04-05-06 +# Example: ~01-02-03.24-05-06 # mac_match() # $1 = MAC address formated as described above { diff --git a/Shorewall/functions b/Shorewall/functions index 6cba9e79a..d6ea53bc3 100755 --- a/Shorewall/functions +++ b/Shorewall/functions @@ -1,6 +1,6 @@ #!/bin/sh # -# Shorewall 3.0 -- /usr/share/shorewall/functions +# Shorewall 3.2 -- /usr/share/shorewall/functions # # Message to stderr diff --git a/Shorewall/help b/Shorewall/help index 666cbe025..6c345d528 100755 --- a/Shorewall/help +++ b/Shorewall/help @@ -1,6 +1,6 @@ #!/bin/sh # -# Shorewall help subsystem - V3.0 +# Shorewall help subsystem - V3.2 # # # This program is under GPL [http://www.gnu.org/copyleft/gpl.htm] diff --git a/Shorewall/hosts b/Shorewall/hosts index a59448fdb..6b69a0bce 100644 --- a/Shorewall/hosts +++ b/Shorewall/hosts @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Hosts file +# Shorewall version 3.2 - Hosts file # # /etc/shorewall/hosts # diff --git a/Shorewall/init b/Shorewall/init index 93d0ba792..abf2e4f68 100644 --- a/Shorewall/init +++ b/Shorewall/init @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Init File +# Shorewall version 3.2 - Init File # # /etc/shorewall/init # diff --git a/Shorewall/init.sh b/Shorewall/init.sh index c38d16622..64c3ecdb5 100644 --- a/Shorewall/init.sh +++ b/Shorewall/init.sh @@ -1,7 +1,7 @@ #!/bin/sh RCDLINKS="2,S41 3,S41 6,K41" # -# The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V3.0 +# The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V3.2 # # This program is under GPL [http://www.gnu.org/copyleft/gpl.htm] # diff --git a/Shorewall/initdone b/Shorewall/initdone index e06dec95b..9907c16e3 100755 --- a/Shorewall/initdone +++ b/Shorewall/initdone @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Initdone File +# Shorewall version 3.2 - Initdone File # # /etc/shorewall/initdone # diff --git a/Shorewall/interfaces b/Shorewall/interfaces index 43e36e4fc..d2af7a43f 100644 --- a/Shorewall/interfaces +++ b/Shorewall/interfaces @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Interfaces File +# Shorewall version 3.2 - Interfaces File # # /etc/shorewall/interfaces # diff --git a/Shorewall/maclist b/Shorewall/maclist index 7f5e255eb..4d57106c0 100644 --- a/Shorewall/maclist +++ b/Shorewall/maclist @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Maclist file +# Shorewall version 3.2 - Maclist file # # /etc/shorewall/maclist # diff --git a/Shorewall/macro.AllowICMPs b/Shorewall/macro.AllowICMPs index 7a54deb19..96b39af28 100644 --- a/Shorewall/macro.AllowICMPs +++ b/Shorewall/macro.AllowICMPs @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - AllowICMPs Macro +# Shorewall version 3.2 - AllowICMPs Macro # # /usr/share/shorewall/macro.AllowICMPs # diff --git a/Shorewall/macro.Amanda b/Shorewall/macro.Amanda index 213895d31..ffc19d54f 100644 --- a/Shorewall/macro.Amanda +++ b/Shorewall/macro.Amanda @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Amanda Macro +# Shorewall version 3.2 - Amanda Macro # # /usr/share/shorewall/macro.Amanda # diff --git a/Shorewall/macro.Auth b/Shorewall/macro.Auth index ca6f22369..2183273d4 100644 --- a/Shorewall/macro.Auth +++ b/Shorewall/macro.Auth @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Auth Macro +# Shorewall version 3.2 - Auth Macro # # /usr/share/shorewall/macro.Auth # diff --git a/Shorewall/macro.BitTorrent b/Shorewall/macro.BitTorrent index 62b28d98f..bef164831 100644 --- a/Shorewall/macro.BitTorrent +++ b/Shorewall/macro.BitTorrent @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - BitTorrent Macro +# Shorewall version 3.2 - BitTorrent Macro # # /usr/share/shorewall/macro.BitTorrent # diff --git a/Shorewall/macro.CVS b/Shorewall/macro.CVS index 8130fd501..60c18992a 100644 --- a/Shorewall/macro.CVS +++ b/Shorewall/macro.CVS @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - CVS Macro +# Shorewall version 3.2 - CVS Macro # # /usr/share/shorewall/macro.CVS # diff --git a/Shorewall/macro.DNS b/Shorewall/macro.DNS index 5bef6baad..9a3d55da9 100644 --- a/Shorewall/macro.DNS +++ b/Shorewall/macro.DNS @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - DNS Macro +# Shorewall version 3.2 - DNS Macro # # /usr/share/shorewall/macro.DNS # diff --git a/Shorewall/macro.Distcc b/Shorewall/macro.Distcc index 808c63568..88078f248 100644 --- a/Shorewall/macro.Distcc +++ b/Shorewall/macro.Distcc @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Distcc Macro +# Shorewall version 3.2 - Distcc Macro # # /usr/share/shorewall/macro.Distcc # diff --git a/Shorewall/macro.DropDNSrep b/Shorewall/macro.DropDNSrep index e9b315124..5ff1ed55d 100644 --- a/Shorewall/macro.DropDNSrep +++ b/Shorewall/macro.DropDNSrep @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - DropDNSrep Macro +# Shorewall version 3.2 - DropDNSrep Macro # # /usr/share/shorewall/macro.DropDNSrep # diff --git a/Shorewall/macro.DropUPnP b/Shorewall/macro.DropUPnP index 3b5de5c68..1e55d0998 100644 --- a/Shorewall/macro.DropUPnP +++ b/Shorewall/macro.DropUPnP @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - DropUPnP Macro +# Shorewall version 3.2 - DropUPnP Macro # # /usr/share/shorewall/macro.DropUPnP # diff --git a/Shorewall/macro.Edonkey b/Shorewall/macro.Edonkey index 380a22a77..1639a5c2e 100644 --- a/Shorewall/macro.Edonkey +++ b/Shorewall/macro.Edonkey @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Edonkey Macro +# Shorewall version 3.2 - Edonkey Macro # # /usr/share/shorewall/macro.Edonkey # diff --git a/Shorewall/macro.FTP b/Shorewall/macro.FTP index 45d57909f..d8f0954dd 100644 --- a/Shorewall/macro.FTP +++ b/Shorewall/macro.FTP @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - FTP Macro +# Shorewall version 3.2 - FTP Macro # # /usr/share/shorewall/macro.FTP # diff --git a/Shorewall/macro.Gnutella b/Shorewall/macro.Gnutella index bfe65346d..9bb298b19 100644 --- a/Shorewall/macro.Gnutella +++ b/Shorewall/macro.Gnutella @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Gnutella Macro +# Shorewall version 3.2 - Gnutella Macro # # /usr/share/shorewall/macro.Gnutella # diff --git a/Shorewall/macro.ICQ b/Shorewall/macro.ICQ index f9452e5da..302d08c3a 100644 --- a/Shorewall/macro.ICQ +++ b/Shorewall/macro.ICQ @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - ICQ Macro +# Shorewall version 3.2 - ICQ Macro # # /usr/share/shorewall/macro.ICQ # diff --git a/Shorewall/macro.IMAP b/Shorewall/macro.IMAP index 8e9515f7c..8d676bc71 100644 --- a/Shorewall/macro.IMAP +++ b/Shorewall/macro.IMAP @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - IMAP Macro +# Shorewall version 3.2 - IMAP Macro # # /usr/share/shorewall/macro.IMAP # diff --git a/Shorewall/macro.LDAP b/Shorewall/macro.LDAP index 94244609f..b38068720 100644 --- a/Shorewall/macro.LDAP +++ b/Shorewall/macro.LDAP @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - LDAP Macro +# Shorewall version 3.2 - LDAP Macro # # /usr/share/shorewall/macro.LDAP # diff --git a/Shorewall/macro.MySQL b/Shorewall/macro.MySQL index 556d1c687..a51eac33e 100644 --- a/Shorewall/macro.MySQL +++ b/Shorewall/macro.MySQL @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - MySQL Macro +# Shorewall version 3.2 - MySQL Macro # # /usr/share/shorewall/macro.MySQL # @@ -8,5 +8,5 @@ ############################################################################### #ACTION SOURCE DEST PROTO DEST SOURCE ORIGINAL RATE USER/ # PORT PORT(S) DEST LIMIT GROUP -PARAM - - tcp 3306 +PARAM - - tcp 3.26 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE diff --git a/Shorewall/macro.NNTP b/Shorewall/macro.NNTP index a5f5f3385..a1069685e 100644 --- a/Shorewall/macro.NNTP +++ b/Shorewall/macro.NNTP @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 NNTP Macro +# Shorewall version 3.2 NNTP Macro # # /usr/share/shorewall/macro.NNTP # diff --git a/Shorewall/macro.NTP b/Shorewall/macro.NTP index 9f0eeee6e..a1c9438dd 100644 --- a/Shorewall/macro.NTP +++ b/Shorewall/macro.NTP @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - NTP Macro +# Shorewall version 3.2 - NTP Macro # # /usr/share/shorewall/macro.NTP # diff --git a/Shorewall/macro.NTPbrd b/Shorewall/macro.NTPbrd index 24a351220..d16a6fbe9 100644 --- a/Shorewall/macro.NTPbrd +++ b/Shorewall/macro.NTPbrd @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - NTPbrd Macro +# Shorewall version 3.2 - NTPbrd Macro # # /usr/share/shorewall/macro.NTPbrd # diff --git a/Shorewall/macro.PCA b/Shorewall/macro.PCA index b591e102b..8af9b30cd 100644 --- a/Shorewall/macro.PCA +++ b/Shorewall/macro.PCA @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - PCA Macro +# Shorewall version 3.2 - PCA Macro # # /usr/share/shorewall/macro.PCA # diff --git a/Shorewall/macro.POP3 b/Shorewall/macro.POP3 index ace6127d0..c446596ec 100644 --- a/Shorewall/macro.POP3 +++ b/Shorewall/macro.POP3 @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - POP3 Macro +# Shorewall version 3.2 - POP3 Macro # # /usr/share/shorewall/macro.POP3 # diff --git a/Shorewall/macro.Ping b/Shorewall/macro.Ping index 745453ce8..82a55c9e8 100644 --- a/Shorewall/macro.Ping +++ b/Shorewall/macro.Ping @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Ping Macro +# Shorewall version 3.2 - Ping Macro # # /usr/share/shorewall/macro.Ping # diff --git a/Shorewall/macro.PostgreSQL b/Shorewall/macro.PostgreSQL index 4c71bf741..2640bf27f 100644 --- a/Shorewall/macro.PostgreSQL +++ b/Shorewall/macro.PostgreSQL @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - PostgreSQL Macro +# Shorewall version 3.2 - PostgreSQL Macro # # /usr/share/shorewall/macro.PostgreSQL # diff --git a/Shorewall/macro.Rdate b/Shorewall/macro.Rdate index 0ee3760e1..600ed5570 100644 --- a/Shorewall/macro.Rdate +++ b/Shorewall/macro.Rdate @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Rdate Macro +# Shorewall version 3.2 - Rdate Macro # # /usr/share/shorewall/macro.Rdate # diff --git a/Shorewall/macro.Rsync b/Shorewall/macro.Rsync index db5fafab5..f599b5d53 100644 --- a/Shorewall/macro.Rsync +++ b/Shorewall/macro.Rsync @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Rsync Macro +# Shorewall version 3.2 - Rsync Macro # # /usr/share/shorewall/macro.Rsync # diff --git a/Shorewall/macro.SMB b/Shorewall/macro.SMB index 46162be54..772cfb55b 100644 --- a/Shorewall/macro.SMB +++ b/Shorewall/macro.SMB @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - SMB Macro +# Shorewall version 3.2 - SMB Macro # # /usr/share/shorewall/macro.SMB # diff --git a/Shorewall/macro.SMBswat b/Shorewall/macro.SMBswat index 24fad475b..89acb0a7c 100644 --- a/Shorewall/macro.SMBswat +++ b/Shorewall/macro.SMBswat @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - SMBswat Macro +# Shorewall version 3.2 - SMBswat Macro # # /usr/share/shorewall/macro.SMBswat # diff --git a/Shorewall/macro.SMTP b/Shorewall/macro.SMTP index 43bd88766..819d04c79 100644 --- a/Shorewall/macro.SMTP +++ b/Shorewall/macro.SMTP @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - SMTP Macro +# Shorewall version 3.2 - SMTP Macro # # /usr/share/shorewall/macro.SMTP # diff --git a/Shorewall/macro.SNMP b/Shorewall/macro.SNMP index efe4c5a02..b943f1311 100644 --- a/Shorewall/macro.SNMP +++ b/Shorewall/macro.SNMP @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - SNMP Macro +# Shorewall version 3.2 - SNMP Macro # # /usr/share/shorewall/macro.SNMP # diff --git a/Shorewall/macro.SPAMD b/Shorewall/macro.SPAMD index 45f69f530..6f1f2d0e8 100644 --- a/Shorewall/macro.SPAMD +++ b/Shorewall/macro.SPAMD @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - SPAMD Macro +# Shorewall version 3.2 - SPAMD Macro # # /usr/share/shorewall/macro.SPAMD # diff --git a/Shorewall/macro.SSH b/Shorewall/macro.SSH index 0d040ddbe..f52389003 100644 --- a/Shorewall/macro.SSH +++ b/Shorewall/macro.SSH @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - SSH Macro +# Shorewall version 3.2 - SSH Macro # # /usr/share/shorewall/macro.SSH # diff --git a/Shorewall/macro.SVN b/Shorewall/macro.SVN index 524a69935..cd681327a 100644 --- a/Shorewall/macro.SVN +++ b/Shorewall/macro.SVN @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - SVN Macro +# Shorewall version 3.2 - SVN Macro # # /usr/share/shorewall/macro.SVN # diff --git a/Shorewall/macro.Submission b/Shorewall/macro.Submission index 9ae3e0038..d2cecdd22 100644 --- a/Shorewall/macro.Submission +++ b/Shorewall/macro.Submission @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Submission Macro +# Shorewall version 3.2 - Submission Macro # # /usr/share/shorewall/macro.Submission # diff --git a/Shorewall/macro.Syslog b/Shorewall/macro.Syslog index e9ea84a89..4f651af9e 100644 --- a/Shorewall/macro.Syslog +++ b/Shorewall/macro.Syslog @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Syslog Macro +# Shorewall version 3.2 - Syslog Macro # # /usr/share/shorewall/macro.Syslog # diff --git a/Shorewall/macro.Telnet b/Shorewall/macro.Telnet index 86494b5e3..612b6e12a 100644 --- a/Shorewall/macro.Telnet +++ b/Shorewall/macro.Telnet @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Telnet Macro +# Shorewall version 3.2 - Telnet Macro # # /usr/share/shorewall/macro.Telnet # diff --git a/Shorewall/macro.Trcrt b/Shorewall/macro.Trcrt index 7ac217979..28d8f57a2 100644 --- a/Shorewall/macro.Trcrt +++ b/Shorewall/macro.Trcrt @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 -Trcrt Macro +# Shorewall version 3.2 -Trcrt Macro # # /usr/share/shorewall/macro.Trcrt # diff --git a/Shorewall/macro.VNC b/Shorewall/macro.VNC index c5b98f5b2..31357991c 100644 --- a/Shorewall/macro.VNC +++ b/Shorewall/macro.VNC @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - VNC Macro +# Shorewall version 3.2 - VNC Macro # # /usr/share/shorewall/macro.VNC # diff --git a/Shorewall/macro.VNCL b/Shorewall/macro.VNCL index b4d3c97b0..3bceef870 100644 --- a/Shorewall/macro.VNCL +++ b/Shorewall/macro.VNCL @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 -VNCL Macro +# Shorewall version 3.2 -VNCL Macro # # /usr/share/shorewall/macro.VNCL # diff --git a/Shorewall/macro.Web b/Shorewall/macro.Web index b1264b11f..773dc1210 100644 --- a/Shorewall/macro.Web +++ b/Shorewall/macro.Web @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Web Macro +# Shorewall version 3.2 - Web Macro # # /usr/share/shorewall/macro.Web # diff --git a/Shorewall/macro.Webmin b/Shorewall/macro.Webmin index e4d170838..6e0098c2e 100644 --- a/Shorewall/macro.Webmin +++ b/Shorewall/macro.Webmin @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Webmin Macro +# Shorewall version 3.2 - Webmin Macro # # /usr/share/shorewall/macro.Webmin # diff --git a/Shorewall/macro.template b/Shorewall/macro.template index 3a3e75f8c..b7bed5c44 100644 --- a/Shorewall/macro.template +++ b/Shorewall/macro.template @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Macro Template +# Shorewall version 3.2 - Macro Template # # /usr/share/shorewall/macro.template # diff --git a/Shorewall/masq b/Shorewall/masq index 92582f43c..b409b50ea 100755 --- a/Shorewall/masq +++ b/Shorewall/masq @@ -1,11 +1,15 @@ # -# Shorewall version 3.0 - Masq file +# Shorewall version 3.2 - Masq file # # /etc/shorewall/masq # # Use this file to define dynamic NAT (Masquerading) and to define # Source NAT (SNAT). # +# WARNING: The entries in this file are order-sensitive. The first +# entry that matches a particular connection will be the one that +# is used. +# # WARNING: If you have more than one ISP, adding entries to this # file will *not* force connections to go out through a particular # ISP. You must use PREROUTING entries in /etc/shorewall/tcrules diff --git a/Shorewall/modules b/Shorewall/modules index 90dfe2c24..9fe8e4ebd 100644 --- a/Shorewall/modules +++ b/Shorewall/modules @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Modules File +# Shorewall version 3.2 - Modules File # # /etc/shorewall/modules # diff --git a/Shorewall/nat b/Shorewall/nat index ed4872763..dcba71179 100755 --- a/Shorewall/nat +++ b/Shorewall/nat @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Nat File +# Shorewall version 3.2 - Nat File # # /etc/shorewall/nat # diff --git a/Shorewall/netmap b/Shorewall/netmap index a95683533..15c0101b7 100644 --- a/Shorewall/netmap +++ b/Shorewall/netmap @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Netmap File +# Shorewall version 3.2 - Netmap File # # /etc/shorewall/netmap # diff --git a/Shorewall/params b/Shorewall/params index 19aa84108..163c7ea81 100644 --- a/Shorewall/params +++ b/Shorewall/params @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Params File +# Shorewall version 3.2 - Params File # # /etc/shorewall/params # diff --git a/Shorewall/policy b/Shorewall/policy index 103fc2fa8..220e7fd4a 100644 --- a/Shorewall/policy +++ b/Shorewall/policy @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Policy File +# Shorewall version 3.2 - Policy File # # /etc/shorewall/policy # diff --git a/Shorewall/providers b/Shorewall/providers index 4cd99b4e9..f52b63f44 100755 --- a/Shorewall/providers +++ b/Shorewall/providers @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Providers File +# Shorewall version 3.2 - Providers File # # /etc/shorewall/providers # diff --git a/Shorewall/proxyarp b/Shorewall/proxyarp index ece7a486a..304ead1db 100644 --- a/Shorewall/proxyarp +++ b/Shorewall/proxyarp @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Proxyarp File +# Shorewall version 3.2 - Proxyarp File # # /etc/shorewall/proxyarp # diff --git a/Shorewall/rfc1918 b/Shorewall/rfc1918 index 5ee80d591..f78aa9275 100644 --- a/Shorewall/rfc1918 +++ b/Shorewall/rfc1918 @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Rfc1918 File +# Shorewall version 3.2 - Rfc1918 File # # /etc/shorewall/rfc1918 # diff --git a/Shorewall/routestopped b/Shorewall/routestopped index 990196f86..ec9cdfa48 100644 --- a/Shorewall/routestopped +++ b/Shorewall/routestopped @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Routestopped File +# Shorewall version 3.2 - Routestopped File # # /etc/shorewall/routestopped # diff --git a/Shorewall/rules b/Shorewall/rules index cc5272fb8..cd20c6589 100755 --- a/Shorewall/rules +++ b/Shorewall/rules @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Rules File +# Shorewall version 3.2 - Rules File # # /etc/shorewall/rules # diff --git a/Shorewall/shorewall b/Shorewall/shorewall index 9adb9c3aa..6a9ea5605 100755 --- a/Shorewall/shorewall +++ b/Shorewall/shorewall @@ -1,6 +1,6 @@ #!/bin/sh # -# Shorewall Packet Filtering Firewall Control Program - V3.0 +# Shorewall Packet Filtering Firewall Control Program - V3.2 # # This program is under GPL [http://www.gnu.org/copyleft/gpl.htm] # diff --git a/Shorewall/start b/Shorewall/start index 9d4636028..0622d4a1c 100644 --- a/Shorewall/start +++ b/Shorewall/start @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Start File +# Shorewall version 3.2 - Start File # # /etc/shorewall/start # diff --git a/Shorewall/started b/Shorewall/started index 07d4deec1..31f8d5398 100644 --- a/Shorewall/started +++ b/Shorewall/started @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Started File +# Shorewall version 3.2 - Started File # # /etc/shorewall/started # diff --git a/Shorewall/stop b/Shorewall/stop index 09e84302c..116d8a68f 100644 --- a/Shorewall/stop +++ b/Shorewall/stop @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Stop File +# Shorewall version 3.2 - Stop File # # /etc/shorewall/stop # diff --git a/Shorewall/stopped b/Shorewall/stopped index d9ccd5ea7..d6a00f467 100644 --- a/Shorewall/stopped +++ b/Shorewall/stopped @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Stopped File +# Shorewall version 3.2 - Stopped File # # /etc/shorewall/stopped # diff --git a/Shorewall/tcclasses b/Shorewall/tcclasses index b6035e8fe..a79e7e0a0 100644 --- a/Shorewall/tcclasses +++ b/Shorewall/tcclasses @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Tcclasses File +# Shorewall version 3.2 - Tcclasses File # # Based on tc4shorewall version 0.5 by Arne Bernin # diff --git a/Shorewall/tcdevices b/Shorewall/tcdevices index d805583a9..59b22bfe7 100644 --- a/Shorewall/tcdevices +++ b/Shorewall/tcdevices @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Tcdevices File +# Shorewall version 3.2 - Tcdevices File # # Based on tc4shorewall version 0.5 by Arne Bernin # diff --git a/Shorewall/tcrules b/Shorewall/tcrules index 899010bc7..320953e9e 100755 --- a/Shorewall/tcrules +++ b/Shorewall/tcrules @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Tcrules File +# Shorewall version 3.2 - Tcrules File # # /etc/shorewall/tcrules # diff --git a/Shorewall/tos b/Shorewall/tos index 3e3fa39c2..9746130ae 100755 --- a/Shorewall/tos +++ b/Shorewall/tos @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Tos File +# Shorewall version 3.2 - Tos File # # /etc/shorewall/tos # diff --git a/Shorewall/tunnel b/Shorewall/tunnel index adb19e92a..074af76f4 100755 --- a/Shorewall/tunnel +++ b/Shorewall/tunnel @@ -2,7 +2,7 @@ RCDLINKS="2,S45 3,S45 6,K45" ################################################################################ -# Script to create a gre or ipip tunnel -- Shorewall 3.0 +# Script to create a gre or ipip tunnel -- Shorewall 3.2 # # Modified - Steve Cowles 5/9/2000 # Incorporated init {start|stop} syntax and iproute2 usage diff --git a/Shorewall/tunnels b/Shorewall/tunnels index 7630022f4..38029d903 100644 --- a/Shorewall/tunnels +++ b/Shorewall/tunnels @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Tunnels File +# Shorewall version 3.2 - Tunnels File # # /etc/shorewall/tunnels # diff --git a/Shorewall/zones b/Shorewall/zones index 2a28ec379..eddc5cd42 100644 --- a/Shorewall/zones +++ b/Shorewall/zones @@ -1,5 +1,5 @@ # -# Shorewall version 3.0 - Zones File +# Shorewall version 3.2 - Zones File # # /etc/shorewall/zones #