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

Remove indentation kludge in setup_providers()

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3510 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-02-21 02:27:43 +00:00
parent adfbc8434c
commit 19b0fd864e
1 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Shorewall/compiler
View File

@ -96,7 +96,7 @@ progress_message_and_save()
} }
# #
# Append a file in /var/lib/shorewall to $OUTPUT # Append a file to the compiler's output
# #
append_file() # $1 = File Name append_file() # $1 = File Name
{ {
@ -1042,7 +1042,6 @@ validate_interfaces_file() {
;; ;;
norfc1918) norfc1918)
cat >&3 << __EOF__ cat >&3 << __EOF__
${INDENT}addr=\$(ip -f inet addr show $interface 2> /dev/null | grep inet | head -n1) ${INDENT}addr=\$(ip -f inet addr show $interface 2> /dev/null | grep inet | head -n1)
${INDENT}if [ -n "\$addr" ]; then ${INDENT}if [ -n "\$addr" ]; then
${INDENT} addr=\$(echo \$addr | sed 's/inet //;s/\/.*//;s/ peer.*//') ${INDENT} addr=\$(echo \$addr | sed 's/inet //;s/\/.*//;s/ peer.*//')
@ -1052,7 +1051,6 @@ ${INDENT} startup_error "The 'norfc1918' option has been specified on
${INDENT} fi ${INDENT} fi
${INDENT} done ${INDENT} done
${INDENT}fi ${INDENT}fi
__EOF__ __EOF__
;; ;;
arp_ignore=*) arp_ignore=*)
@ -1103,7 +1101,7 @@ verify_mark() # $1 = value to test
# #
setup_providers() setup_providers()
{ {
local table number mark duplicate interface gateway options provider address copy route loose addresses rulenum pref echobin=$(mywhich echo) balance local table number mark duplicate interface gateway options provider address copy route loose addresses rulenum pref echobin=$(mywhich echo) balance save_indent="$INDENT"
copy_table() { copy_table() {
cat >&3 << __EOF__ cat >&3 << __EOF__
@ -1263,6 +1261,7 @@ __EOF__
progress_message2 "$DOING $1..." progress_message2 "$DOING $1..."
save_progress_message "Adding Providers..." save_progress_message "Adding Providers..."
save_command "if [ -z \"\$NOROUTES\" ]; then" save_command "if [ -z \"\$NOROUTES\" ]; then"
INDENT="$INDENT "
save_command "DEFAULT_ROUTE=" save_command "DEFAULT_ROUTE="
while read table number mark duplicate interface gateway options copy; do while read table number mark duplicate interface gateway options copy; do
@ -1302,6 +1301,7 @@ __EOF__
fi fi
save_command "run_ip route flush cache" save_command "run_ip route flush cache"
INDENT="$save_indent"
save_command "fi" save_command "fi"
save_command "" save_command ""
fi fi