From a7c3d6a335be0214b9e9e4325581a275af4eec3d Mon Sep 17 00:00:00 2001 From: teastep Date: Fri, 22 Jun 2007 20:52:53 +0000 Subject: [PATCH] Don't allow 4.0 values for IP_FORWARDING git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6649 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall-shell/compiler | 4 ++-- Shorewall-shell/diff-3.4-compiler | 18 ++++++++++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Shorewall-shell/compiler b/Shorewall-shell/compiler index 76dd6f5b7..26f04e6ce 100755 --- a/Shorewall-shell/compiler +++ b/Shorewall-shell/compiler @@ -673,11 +673,11 @@ setup_forwarding() { progress_message2 "Compiling IP Forwarding..." case "$IP_FORWARDING" in - On|on) + On|on|ON|Yes|yes|YES) save_progress_message "IP Forwarding Enabled" save_command "echo 1 > /proc/sys/net/ipv4/ip_forward" ;; - Off|off) + Off|off|OFF|No|no|NO) save_progress_message "IP Forwarding Disabled!" save_command "echo 0 > /proc/sys/net/ipv4/ip_forward" ;; diff --git a/Shorewall-shell/diff-3.4-compiler b/Shorewall-shell/diff-3.4-compiler index b7a1f35f4..f8f0dcbd8 100644 --- a/Shorewall-shell/diff-3.4-compiler +++ b/Shorewall-shell/diff-3.4-compiler @@ -1,5 +1,19 @@ ---- /home/teastep/shorewall/branches/3.4/Shorewall/compiler 2007-06-16 07:39:45.000000000 -0700 -+++ Shorewall-shell/compiler 2007-06-16 07:39:31.000000000 -0700 +--- /home/teastep/shorewall/branches/3.4/Shorewall/compiler 2007-06-18 10:11:02.000000000 -0700 ++++ compiler 2007-06-22 13:51:59.000000000 -0700 +@@ -673,11 +673,11 @@ + progress_message2 "Compiling IP Forwarding..." + + case "$IP_FORWARDING" in +- On|on) ++ On|on|ON|Yes|yes|YES) + save_progress_message "IP Forwarding Enabled" + save_command "echo 1 > /proc/sys/net/ipv4/ip_forward" + ;; +- Off|off) ++ Off|off|OFF|No|no|NO) + save_progress_message "IP Forwarding Disabled!" + save_command "echo 0 > /proc/sys/net/ipv4/ip_forward" + ;; @@ -3767,7 +3767,7 @@ save_progress_message "Setting up Route Filtering..."