forked from extern/shorewall_code
Some tunnel changes
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@8207 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
ccca3e8d7c
commit
4e67f4206e
@ -127,77 +127,7 @@ fi
|
||||
%attr(0644,root,root) /usr/share/shorewall/lib.cli
|
||||
%attr(0644,root,root) /usr/share/shorewall/lib.config
|
||||
%attr(0644,root,root) /usr/share/shorewall/lib.dynamiczones
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.AllowICMPs
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.Amanda
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.Auth
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.BitTorrent
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.CVS
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.Distcc
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.DNS
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.Drop
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.DropDNSrep
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.DropUPnP
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.Edonkey
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.Finger
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.FTP
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.Gnutella
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.GRE
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.HTTP
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.HTTPS
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.ICQ
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.IMAP
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.IMAPS
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.IPIP
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.IPP
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.IPPserver
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.IPsec
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.IPsecah
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.IPsecnat
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.Jabberd
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.JabberPlain
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.JabberSecure
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.Jetdirect
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.L2TP
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.LDAP
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.LDAPS
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.MySQL
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.NNTP
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.NNTPS
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.NTP
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.NTPbrd
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.PCA
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.Ping
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.POP3
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.POP3S
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.PostgreSQL
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.Printer
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.RDP
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.Rdate
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.Reject
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.Rsync
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.SixXS
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.SMB
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.SMBBI
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.SMBswat
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.SMTP
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.SMTPS
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.SNMP
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.SPAMD
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.SSH
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.Submission
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.SVN
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.Syslog
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.TFTP
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.Telnet
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.Telnets
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.Time
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.template
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.Trcrt
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.VNC
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.VNCL
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.Web
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.Webmin
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.Whois
|
||||
%attr(0644,root,root) /usr/share/shorewall/macro.*
|
||||
%attr(0644,root,root) /usr/share/shorewall/modules
|
||||
%attr(0644,root,root) /usr/share/shorewall/rfc1918
|
||||
%attr(0644,root,root) /usr/share/shorewall/configpath
|
||||
|
@ -50,7 +50,7 @@ sub setup_tunnels() {
|
||||
|
||||
my $noah = 1;
|
||||
|
||||
fatal_error "Invalid IPSEC modified ($qualifier:$remainder)" if defined $remainder;
|
||||
fatal_error "Invalid IPSEC modifier ($qualifier:$remainder)" if defined $remainder;
|
||||
|
||||
if ( defined $qualifier ) {
|
||||
if ( $qualifier eq 'ah' ) {
|
||||
@ -229,7 +229,7 @@ sub setup_tunnels() {
|
||||
|
||||
my $zonetype = zone_type( $zone );
|
||||
|
||||
fatal_error "Invalid zone ($zone) for tunnel ZONE" if $zonetype eq 'firewall' || $zonetype eq 'bport4';
|
||||
fatal_error "Invalid tunnel ZONE ($zone)" if $zonetype eq 'firewall' || $zonetype eq 'bport4';
|
||||
|
||||
my $inchainref = ensure_filter_chain "${zone}2${fw}", 1;
|
||||
my $outchainref = ensure_filter_chain "${fw}2${zone}", 1;
|
||||
|
Loading…
Reference in New Issue
Block a user