mirror of
https://gitlab.com/shorewall/code.git
synced 2025-02-17 02:00:57 +01:00
Clarify requirements for /etc/shorewall/ipsec; fix PKTTYPE Handling
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2104 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
911746db04
commit
cb64f41c6e
@ -1,3 +1,7 @@
|
|||||||
|
Changes in 2.2.5
|
||||||
|
|
||||||
|
1) Correct behavior of PKTTYPE=No
|
||||||
|
|
||||||
Changes in 2.2.4
|
Changes in 2.2.4
|
||||||
|
|
||||||
1) Added support for UPnP
|
1) Added support for UPnP
|
||||||
|
@ -7461,6 +7461,8 @@ do_initialize() {
|
|||||||
[ -e "$IPTABLES" ] || startup_error "\$IPTABLES=$IPTABLES does not exist or is not executable"
|
[ -e "$IPTABLES" ] || startup_error "\$IPTABLES=$IPTABLES does not exist or is not executable"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
PKTTYPE=$(added_param_value_no PKTTYPE $PKTTYPE) # Used in determine_capabilities
|
||||||
|
|
||||||
determine_capabilities
|
determine_capabilities
|
||||||
|
|
||||||
[ -z "${STATEDIR}" ] && STATEDIR=/var/state/shorewall
|
[ -z "${STATEDIR}" ] && STATEDIR=/var/state/shorewall
|
||||||
@ -7580,7 +7582,6 @@ do_initialize() {
|
|||||||
DISABLE_IPV6=$(added_param_value_no DISABLE_IPV6 $DISABLE_IPV6)
|
DISABLE_IPV6=$(added_param_value_no DISABLE_IPV6 $DISABLE_IPV6)
|
||||||
BRIDGING=$(added_param_value_no BRIDGING $BRIDGING)
|
BRIDGING=$(added_param_value_no BRIDGING $BRIDGING)
|
||||||
DYNAMIC_ZONES=$(added_param_value_no DYNAMIC_ZONES $DYNAMIC_ZONES)
|
DYNAMIC_ZONES=$(added_param_value_no DYNAMIC_ZONES $DYNAMIC_ZONES)
|
||||||
PKTTYPE=$(added_param_value_no PKTTYPE $PKTTYPE)
|
|
||||||
STARTUP_ENABLED=$(added_param_value_yes STARTUP_ENABLED $STARTUP_ENABLED)
|
STARTUP_ENABLED=$(added_param_value_yes STARTUP_ENABLED $STARTUP_ENABLED)
|
||||||
RETAIN_ALIASES=$(added_param_value_no RETAIN_ALIASES $RETAIN_ALIASES)
|
RETAIN_ALIASES=$(added_param_value_no RETAIN_ALIASES $RETAIN_ALIASES)
|
||||||
DELAYBLACKLISTLOAD=$(added_param_value_no DELAYBLACKLISTLOAD $DELAYBLACKLISTLOAD)
|
DELAYBLACKLISTLOAD=$(added_param_value_no DELAYBLACKLISTLOAD $DELAYBLACKLISTLOAD)
|
||||||
|
@ -2,8 +2,9 @@
|
|||||||
# Shorewall 2.2 - /etc/shorewall/ipsec
|
# Shorewall 2.2 - /etc/shorewall/ipsec
|
||||||
#
|
#
|
||||||
# This file defines the attributes of zones with respect to
|
# This file defines the attributes of zones with respect to
|
||||||
# IPSEC. To use this file, you must be running a 2.6 kernel and
|
# IPSEC. To use this file for any purpose except for setting mss,
|
||||||
# both your kernel and iptables must include Policy Match Support.
|
# you must be running a 2.6 kernel and both your kernel and iptables
|
||||||
|
# must include Policy Match Support.
|
||||||
#
|
#
|
||||||
# The columns are:
|
# The columns are:
|
||||||
#
|
#
|
||||||
@ -26,7 +27,7 @@
|
|||||||
#
|
#
|
||||||
# proto=ah|esp|ipcomp
|
# proto=ah|esp|ipcomp
|
||||||
#
|
#
|
||||||
# mss=<number> (sets the MSS field in TCP packets)
|
# mss=<number> (sets the MSS field in TCP packets)
|
||||||
#
|
#
|
||||||
# mode=transport|tunnel
|
# mode=transport|tunnel
|
||||||
#
|
#
|
||||||
|
@ -1,4 +1,10 @@
|
|||||||
Shorewall 2.2.4
|
Shorewall 2.2.5
|
||||||
|
|
||||||
|
-----------------------------------------------------------------------
|
||||||
|
Problems corrected in version 2.2.5
|
||||||
|
|
||||||
|
1) Previously, if PKTTYPE=No in shorewall.conf then pkttype match would
|
||||||
|
still be used if the kernel supported it.
|
||||||
|
|
||||||
-----------------------------------------------------------------------
|
-----------------------------------------------------------------------
|
||||||
Problems corrected in version 2.2.4
|
Problems corrected in version 2.2.4
|
||||||
|
Loading…
Reference in New Issue
Block a user