extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-23 14:48:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix GATEWAY handling for pptpserverz

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1645 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2004-09-24 17:35:18 +00:00
parent f847ec5263
commit 38d54e3fe3
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
STABLE/firewall
View File

@ -1257,11 +1257,11 @@ setup_tunnels() # $1 = name of tunnels file
echo " PPTP tunnel to $1 defined." echo " PPTP tunnel to $1 defined."
} }
setup_pptp_server() setup_pptp_server() # $1 = gateway
{ {
addrule $inchain -p 47 -j ACCEPT addrule $inchain -p 47 -s $1 -j ACCEPT
addrule $outchain -p 47 -j ACCEPT addrule $outchain -p 47 -d $1 -j ACCEPT
addrule $inchain -p tcp --dport 1723 -j ACCEPT addrule $inchain -p tcp --dport 1723 -s $1 -j ACCEPT
echo " PPTP server defined." echo " PPTP server defined."
} }
@ -1329,6 +1329,7 @@ setup_tunnels() # $1 = name of tunnels file
if validate_zone $z; then if validate_zone $z; then
inchain=${z}2${FW} inchain=${z}2${FW}
outchain=${FW}2${z} outchain=${FW}2${z}
gateway=${gateway:-0.0.0.0/0}
case $kind in case $kind in
ipsec|IPSEC) ipsec|IPSEC)
setup_one_ipsec $gateway ipsec $z1 setup_one_ipsec $gateway ipsec $z1
@ -1349,7 +1350,7 @@ setup_tunnels() # $1 = name of tunnels file
setup_pptp_client $gateway setup_pptp_client $gateway
;; ;;
pptpserver|PPTPSERVER) pptpserver|PPTPSERVER)
setup_pptp_server setup_pptp_server $gateway
;; ;;
openvpn|OPENVPN|openvpn:*|OPENVPN:*) openvpn|OPENVPN|openvpn:*|OPENVPN:*)
setup_one_openvpn $gateway $kind setup_one_openvpn $gateway $kind

4
STABLE2/firewall
View File

@ -1601,8 +1601,8 @@ setup_tunnels() # $1 = name of tunnels file
pptpclient|PPTPCLIENT) pptpclient|PPTPCLIENT)
setup_pptp_client $gateway setup_pptp_client $gateway
;; ;;
pptpserver|PPTPSERVER) $gateway pptpserver|PPTPSERVER)
setup_pptp_server setup_pptp_server $gateway
;; ;;
openvpn|OPENVPN|openvpn:*|OPENVPN:*) openvpn|OPENVPN|openvpn:*|OPENVPN:*)
setup_one_openvpn $gateway $kind setup_one_openvpn $gateway $kind

4
Shorewall2/firewall
View File

@ -1694,8 +1694,8 @@ setup_tunnels() # $1 = name of tunnels file
pptpclient|PPTPCLIENT) pptpclient|PPTPCLIENT)
setup_pptp_client $gateway setup_pptp_client $gateway
;; ;;
pptpserver|PPTPSERVER) $gateway pptpserver|PPTPSERVER)
setup_pptp_server setup_pptp_server $gateway
;; ;;
openvpn|OPENVPN|openvpn:*|OPENVPN:*) openvpn|OPENVPN|openvpn:*|OPENVPN:*)
setup_one_openvpn $gateway $kind setup_one_openvpn $gateway $kind