Version 1.3.5b

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@167 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2002-07-30 02:18:34 +00:00
parent 3ef27280d3
commit ad46d94bbb

View File

@ -536,19 +536,21 @@ validate_hosts_file() {
r="$z $hosts $options"
validate_zone $z || startup_error "Invalid zone ($z) in record \"$r\""
interface=${hosts%:*}
for host in `separate_list $hosts`; do
interface=${host%:*}
list_search $interface $all_interfaces || \
startup_error "Unknown interface ($interface) in record \"$r\""
list_search $interface $all_interfaces || \
startup_error "Unknown interface ($interface) in record \"$r\""
for option in `separate_list $options`; do
case $option in
routestopped|-)
;;
*)
error_message "Warning: Invalid option ($option) in record \"$r\""
;;
esac
for option in `separate_list $options`; do
case $option in
routestopped|-)
;;
*)
error_message "Warning: Invalid option ($option) in record \"$r\""
;;
esac
done
done
done < $TMP_DIR/hosts
}
@ -2588,7 +2590,7 @@ verify_os_version() {
################################################################################
# Add IP Aliases #
################################################################################
add_ip_aliases() # $* = addresses and devices
add_ip_aliases()
{
do_one()
{
@ -2620,6 +2622,8 @@ add_ip_aliases() # $* = addresses and devices
echo " IP Address $external added to interface $interface"
}
set -- $aliases_to_add
while [ $# -gt 0 ]; do
external=$1
interface=$2
@ -3199,7 +3203,7 @@ define_firewall() # $1 = Command (Start or Restart)
[ -n "$aliases_to_add" ] && \
echo "Adding IP Addresses..." && \
add_ip_aliases $aliases_to_add
add_ip_aliases
run_user_exit start
@ -3484,6 +3488,8 @@ nolock=
[ $# -ne 1 ] && usage
trap "my_mutex_off; exit 2" 1 2 3 4 5 6 9
command="$1"
case "$command" in