mirror of
https://gitlab.com/shorewall/code.git
synced 2024-11-17 21:23:15 +01:00
4574fa075b
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6803 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
104 lines
3.1 KiB
Plaintext
104 lines
3.1 KiB
Plaintext
--- /home/teastep/shorewall/branches/3.4/Shorewall/compiler 2007-07-04 08:07:46.000000000 -0700
|
|
+++ compiler 2007-07-08 07:18:45.000000000 -0700
|
|
@@ -35,6 +35,12 @@
|
|
# SHOREWALL_DIR A directory name was passed to /sbin/shorewall
|
|
# VERBOSE Standard Shorewall verbosity control.
|
|
|
|
+BASE_VERSION=40000
|
|
+BASE_VERSION_PRINTABLE=4.0.0
|
|
+CONFIG_VERSION=40000
|
|
+CONFIG_VERSION_PRINTABLE=4.0.0
|
|
+
|
|
+
|
|
#
|
|
# Fatal error -- stops the compiler after issuing the error message
|
|
#
|
|
@@ -673,11 +679,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 +3773,7 @@
|
|
|
|
save_progress_message "Setting up Route Filtering..."
|
|
|
|
- if [ -z "$ROUTE_FILTER" ]; then
|
|
+ if [ "$ROUTE_FILTER" = no ]; then
|
|
indent >&3 << __EOF__
|
|
|
|
for f in /proc/sys/net/ipv4/conf/*; do
|
|
@@ -3791,8 +3797,10 @@
|
|
|
|
save_command "echo 1 > /proc/sys/net/ipv4/conf/all/rp_filter"
|
|
|
|
- if [ -n "$ROUTE_FILTER" ]; then
|
|
+ if [ "$ROUTE_FILTER" = yes ]; then
|
|
save_command "echo 1 > /proc/sys/net/ipv4/conf/default/rp_filter"
|
|
+ elif [ "$ROUTE_FILTER" = no ]; then
|
|
+ save_command "echo 0 > /proc/sys/net/ipv4/conf/default/rp_filter"
|
|
fi
|
|
|
|
save_command "[ -n \"\$NOROUTES\" ] || ip route flush cache"
|
|
@@ -3808,7 +3816,7 @@
|
|
|
|
save_progress_message "Setting up Martian Logging..."
|
|
|
|
- if [ -z "$LOG_MARTIANS" ]; then
|
|
+ if [ "$LOG_MARTIANS" = no ]; then
|
|
indent >&3 << __EOF__
|
|
|
|
for f in /proc/sys/net/ipv4/conf/*; do
|
|
@@ -3831,9 +3839,12 @@
|
|
__EOF__
|
|
done
|
|
|
|
- if [ -n "$LOG_MARTIANS" ]; then
|
|
+ if [ "$LOG_MARTIANS" = yes ]; then
|
|
save_command "echo 1 > /proc/sys/net/ipv4/conf/all/log_martians"
|
|
save_command "echo 1 > /proc/sys/net/ipv4/conf/default/log_martians"
|
|
+ elif [ "$LOG_MARTIANS" = no ]; then
|
|
+ save_command "echo 0 > /proc/sys/net/ipv4/conf/all/log_martians"
|
|
+ save_command "echo 0 > /proc/sys/net/ipv4/conf/default/log_martians"
|
|
fi
|
|
|
|
fi
|
|
@@ -4890,7 +4901,7 @@
|
|
;;
|
|
esac
|
|
|
|
- run_iptables -A FORWARD -p tcp --tcp-flags SYN,RST SYN ${match}-j TCPMSS $option
|
|
+ run_iptables -A FORWARD -p tcp --tcp-flags SYN,RST SYN -j TCPMSS $option
|
|
}
|
|
|
|
progress_message2 "Initializing..."
|
|
@@ -4930,7 +4941,7 @@
|
|
|
|
cat >&3 << __EOF__
|
|
#
|
|
-# Compiled firewall script generated by Shorewall $VERSION - $(date)"
|
|
+# Compiled firewall script generated by Shorewall-shell $VERSION - $(date)"
|
|
#
|
|
__EOF__
|
|
|
|
@@ -5732,6 +5743,11 @@
|
|
fi
|
|
done
|
|
|
|
+VERSION=$(cat $SHELLSHAREDIR/version)
|
|
+
|
|
+[ "$SHOREWALL_LIBVERSION" -eq $BASE_VERSION ] || fatal_error "Shorewall-shell $VERSION requires Shorewall-common lib.base version $BASE_VERSION_PRINTABLE"
|
|
+[ "$SHOREWALL_CONFIGVERSION" -eq $CONFIG_VERSION ] || fatal_error "Shorewall-shell $VERSION requires Shorewall-common lib.config version $CONFIG_VERSION_PRINTABLE"
|
|
+
|
|
PROGRAM=compiler
|
|
|
|
COMMAND="$1"
|