Merge 'stop' fix from 3.2

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4292 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-08-02 20:18:17 +00:00
parent 109affced3
commit 70c7dbd486
2 changed files with 4 additions and 2 deletions

View File

@ -7844,6 +7844,8 @@ __EOF__
qt arp -i \$external -d \$address pub qt arp -i \$external -d \$address pub
[ -z "\${haveroute}\${NOROUTES}" ] && qt ip route del \$address dev \$interface [ -z "\${haveroute}\${NOROUTES}" ] && qt ip route del \$address dev \$interface
done < \${VARDIR}/proxyarp done < \${VARDIR}/proxyarp
rm -f \${VARDIR}/proxyarp
fi fi
for f in /proc/sys/net/ipv4/conf/*; do for f in /proc/sys/net/ipv4/conf/*; do

View File

@ -1269,7 +1269,7 @@ delete_proxy_arp() {
rm -f ${VARDIR}/proxyarp rm -f ${VARDIR}/proxyarp
fi fi
[ -d $STATEDIR ] && touch $STATEDIR/proxyarp [ -d ${VARDIR} ] && touch ${VARDIR}/proxyarp
case $COMMAND in case $COMMAND in
stop|clear) stop|clear)
@ -1306,7 +1306,7 @@ delete_nat() {
rm -f ${VARDIR}/nat rm -f ${VARDIR}/nat
fi fi
[ -d $STATEDIR ] && touch $STATEDIR/nat [ -d ${VARDIR} ] && touch ${VARDIR}/nat
} }
# #