holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Allow spaces in the argument to the iprange command.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-12-06 06:44:15 -08:00
parent d4957696d1
commit e762998f1e
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Shorewall-lite/shorewall-lite
View File

@ -827,14 +827,20 @@ case "$COMMAND" in
;;
iprange)
[ -n "$debugging" ] && set -x
case $2 in
[ -n "$g_debugging" ] && set -x
range=''
while [ $# -gt 0 ]; do
shift
range="${range}${1}"
done
case $range in
*.*.*.*-*.*.*.*)
for address in ${2%-*} ${2#*-}; do
for address in ${range%-*} ${range#*-}; do
valid_address $address || fatal_error "Invalid IP address: $address"
done
ip_range $2
ip_range $range
;;
*)
usage 1

12
Shorewall/shorewall
View File

@ -2118,13 +2118,19 @@ case "$COMMAND" in
iprange)
[ -n "$g_debugging" ] && set -x
case $2 in
range=''
while [ $# -gt 0 ]; do
shift
range="${range}${1}"
done
case $range in
*.*.*.*-*.*.*.*)
for address in ${2%-*} ${2#*-}; do
for address in ${range%-*} ${range#*-}; do
valid_address $address || fatal_error "Invalid IP address: $address"
done
ip_range $2
ip_range $range
;;
*)
usage 1