Browse Source

Fix issue with erasing variables in service setup

tags/2.1
Brielle Bruns 4 years ago
parent
commit
ddffbcd998
2 changed files with 6 additions and 3 deletions
  1. +3
    -0
      CHANGELOG
  2. +3
    -3
      lib/iptables.inc

+ 3
- 0
CHANGELOG View File

@@ -1,3 +1,6 @@
2.1 Alpha 3 - 04/25.2016
- Fix issue with erasing variables in services setup

2.1 Alpha 2 - 03/15/2015
- Unset variables in loops to make sure theres no leakage of
variables into the next run of the loop


+ 3
- 3
lib/iptables.inc View File

@@ -514,10 +514,10 @@ function enable_services {
${debug} ${DebugColor} "${FUNCNAME}:${DEFAULT_COLOR} loading"
if [ -e "${FWCONFIGDIR}/ipv${IPVER}/services.conf" ]; then
${debug} ${DebugColor} "${FUNCNAME}:${DEFAULT_COLOR} read ${FWCONFIGDIR}/ipv${IPVER}/services.conf successful"
use_conntrack="no"
([[ ${IP_VERSION} == "ipv4" ]] && [[ ${Enablev4ConnectionTracking} == "yes" ]]) && conntrack_state="${M_STATE} ${C_STATE} NEW"
([[ ${IP_VERSION} == "ipv6" ]] && [[ ${Enablev6ConnectionTracking} == "yes" ]]) && conntrack_state="${M_STATE} ${C_STATE} NEW"
while read -r service protocol interface address srcaddress; do
use_conntrack="no"
([[ ${IP_VERSION} == "ipv4" ]] && [[ ${Enablev4ConnectionTracking} == "yes" ]]) && conntrack_state="${M_STATE} ${C_STATE} NEW"
([[ ${IP_VERSION} == "ipv6" ]] && [[ ${Enablev6ConnectionTracking} == "yes" ]]) && conntrack_state="${M_STATE} ${C_STATE} NEW"
multiport="no"
[[ ${service} = \#* ]] && continue
[[ -z ${service} ]] && continue


Loading…
Cancel
Save