mirror of
https://gitlab.com/shorewall/code.git
synced 2024-12-23 14:48:51 +01:00
Fix GATEWAY handling for pptpserverz
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1645 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
f847ec5263
commit
38d54e3fe3
@ -1257,11 +1257,11 @@ setup_tunnels() # $1 = name of tunnels file
|
||||
echo " PPTP tunnel to $1 defined."
|
||||
}
|
||||
|
||||
setup_pptp_server()
|
||||
setup_pptp_server() # $1 = gateway
|
||||
{
|
||||
addrule $inchain -p 47 -j ACCEPT
|
||||
addrule $outchain -p 47 -j ACCEPT
|
||||
addrule $inchain -p tcp --dport 1723 -j ACCEPT
|
||||
addrule $inchain -p 47 -s $1 -j ACCEPT
|
||||
addrule $outchain -p 47 -d $1 -j ACCEPT
|
||||
addrule $inchain -p tcp --dport 1723 -s $1 -j ACCEPT
|
||||
|
||||
echo " PPTP server defined."
|
||||
}
|
||||
@ -1329,6 +1329,7 @@ setup_tunnels() # $1 = name of tunnels file
|
||||
if validate_zone $z; then
|
||||
inchain=${z}2${FW}
|
||||
outchain=${FW}2${z}
|
||||
gateway=${gateway:-0.0.0.0/0}
|
||||
case $kind in
|
||||
ipsec|IPSEC)
|
||||
setup_one_ipsec $gateway ipsec $z1
|
||||
@ -1349,7 +1350,7 @@ setup_tunnels() # $1 = name of tunnels file
|
||||
setup_pptp_client $gateway
|
||||
;;
|
||||
pptpserver|PPTPSERVER)
|
||||
setup_pptp_server
|
||||
setup_pptp_server $gateway
|
||||
;;
|
||||
openvpn|OPENVPN|openvpn:*|OPENVPN:*)
|
||||
setup_one_openvpn $gateway $kind
|
||||
|
@ -1601,8 +1601,8 @@ setup_tunnels() # $1 = name of tunnels file
|
||||
pptpclient|PPTPCLIENT)
|
||||
setup_pptp_client $gateway
|
||||
;;
|
||||
pptpserver|PPTPSERVER) $gateway
|
||||
setup_pptp_server
|
||||
pptpserver|PPTPSERVER)
|
||||
setup_pptp_server $gateway
|
||||
;;
|
||||
openvpn|OPENVPN|openvpn:*|OPENVPN:*)
|
||||
setup_one_openvpn $gateway $kind
|
||||
|
@ -1694,8 +1694,8 @@ setup_tunnels() # $1 = name of tunnels file
|
||||
pptpclient|PPTPCLIENT)
|
||||
setup_pptp_client $gateway
|
||||
;;
|
||||
pptpserver|PPTPSERVER) $gateway
|
||||
setup_pptp_server
|
||||
pptpserver|PPTPSERVER)
|
||||
setup_pptp_server $gateway
|
||||
;;
|
||||
openvpn|OPENVPN|openvpn:*|OPENVPN:*)
|
||||
setup_one_openvpn $gateway $kind
|
||||
|
Loading…
Reference in New Issue
Block a user