extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-05-18 23:20:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update some error messages

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1659 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2004-10-03 23:39:46 +00:00
parent ce9fa5ae75
commit 29a93b2bae
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Shorewall2/firewall
View File

@ -977,7 +977,7 @@ validate_hosts_file() {
;; ;;
ipsec) ipsec)
[ -n "$POLICY_MATCH" ] || \ [ -n "$POLICY_MATCH" ] || \
startup_error "Your kernel and/or iptables does not not support policy match: ipsec" startup_error "Your kernel and/or iptables does not support policy match: ipsec"
eval ${z}_ipsec_hosts=\"\$${z}_ipsec_hosts $interface:$host\" eval ${z}_ipsec_hosts=\"\$${z}_ipsec_hosts $interface:$host\"
eval ${z}_is_complex=Yes eval ${z}_is_complex=Yes
;; ;;
@ -1590,7 +1590,7 @@ setup_tunnels() # $1 = name of tunnels file
addrule ${z}2${FW} -p udp --dport 4500 $options addrule ${z}2${FW} -p udp --dport 4500 $options
fi fi
else else
fatal_error ": Invalid gateway zone ($z) -- Tunnel \"$tunnel\"" fatal_error "Invalid gateway zone ($z) -- Tunnel \"$tunnel\""
fi fi
done done
@ -1924,14 +1924,6 @@ setup_mac_lists() {
# Be sure that they are all ethernet interfaces # Be sure that they are all ethernet interfaces
# #
for interface in $maclist_interfaces; do for interface in $maclist_interfaces; do
case $interface in
eth*|wlan*|br[0-9]|ath[0-9])
;;
*)
fatal_error "MAC verification is only supported on ethernet and 802.11b devices: $interface"
;;
esac
createchain $(mac_chain $interface) no createchain $(mac_chain $interface) no
done done
# #
@ -3257,7 +3249,7 @@ process_actions1() {
case $xaction in case $xaction in
*:*) *:*)
temp=${xaction#*:} temp=${xaction#*:}
[ ${#temp} -le 11 ] || fatal_error "Action Name Longer than 11 Characters: $temp" [ ${#temp} -le 30 ] || fatal_error "Action Name Longer than 30 Characters: $temp"
xaction=${xaction%:*} xaction=${xaction%:*}
case $temp in case $temp in
ACCEPT|REJECT|DROP) ACCEPT|REJECT|DROP)

4
Shorewall2/shorewall
View File

@ -1131,7 +1131,7 @@ case "$1" in
else else
case $RESTOREFILE in case $RESTOREFILE in
save|restore-base) save|restore-base)
echo " ERROR: Reserved file name: save" echo " ERROR: Reserved file name: $RESTOREFILE"
;; ;;
*) *)
if iptables -L dynamic -n > /var/lib/shorewall/save; then if iptables -L dynamic -n > /var/lib/shorewall/save; then
@ -1182,7 +1182,7 @@ case "$1" in
rm -f $RESTOREPATH rm -f $RESTOREPATH
echo " $RESTOREPATH removed" echo " $RESTOREPATH removed"
elif [ -f $RESTOREPATH ]; then elif [ -f $RESTOREPATH ]; then
echo " ERROR: $RESTOREPATH is not a restore script" echo " $RESTOREPATH exists and is not a saved Shorewall configuration"
fi fi
;; ;;
ipcalc) ipcalc)