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

More fixes for 'generate'

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3242 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-01-07 05:34:24 +00:00
parent d86854301d
commit b1f25a1a4f
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Shorewall/firewall
View File

@ -8815,6 +8815,9 @@ define_firewall() # $1 = Command (Start or Restart)
# #
generate_firewall() # $1 = File Name generate_firewall() # $1 = File Name
{ {
#
# We overload a number of functions when compiling.
#
ensure_and_save_command() ensure_and_save_command()
{ {
echo "$@" >> $RESTOREBASE echo "$@" >> $RESTOREBASE
@ -8865,6 +8868,10 @@ generate_firewall() # $1 = File Name
} }
run_iptables2()){
run_iptables $(fix_bang $@)
}
run_ip() { run_ip() {
if ! ip $@ ; then if ! ip $@ ; then
error_message "ERROR: Command \"ip $@\" Failed" error_message "ERROR: Command \"ip $@\" Failed"
@ -8885,7 +8892,9 @@ generate_firewall() # $1 = File Name
{ {
save_command "qt $IPTABLES -L $1 -n && qt $IPTABLES -F $1 && qt $IPTABLES -X $1" save_command "qt $IPTABLES -L $1 -n && qt $IPTABLES -F $1 && qt $IPTABLES -X $1"
} }
#
# END OVERLOADED FUNCTIONS
#
verify_os_version verify_os_version
verify_ip verify_ip
@ -9008,9 +9017,20 @@ generate_firewall() # $1 = File Name
run_user_exit started run_user_exit started
mv -f $RESTOREBASE /var/lib/shorewall/$1 case $1 in
.*|/*)
file=$1
;;
*)
file=/var/lib/shorewall/$1
;;
esac
chmod 700 /var/lib/shorewall/$1 mv -f $RESTOREBASE $file
chmod 700 $file
echo "Shorewall configuration compiled to $file"
rm -rf $TMP_DIR rm -rf $TMP_DIR
} }
@ -9371,6 +9391,7 @@ do_initialize() {
BRIDGING=$(added_param_value_no BRIDGING $BRIDGING) BRIDGING=$(added_param_value_no BRIDGING $BRIDGING)
STARTUP_ENABLED=$(added_param_value_yes STARTUP_ENABLED $STARTUP_ENABLED) STARTUP_ENABLED=$(added_param_value_yes STARTUP_ENABLED $STARTUP_ENABLED)
RETAIN_ALIASES=$(added_param_value_no RETAIN_ALIASES $RETAIN_ALIASES) RETAIN_ALIASES=$(added_param_value_no RETAIN_ALIASES $RETAIN_ALIASES)
[ -n "${ADD_IP_ALIASES}${ADD_SNAT_ALIASES}" ] || RETAIN_ALIASES=
DELAYBLACKLISTLOAD=$(added_param_value_no DELAYBLACKLISTLOAD $DELAYBLACKLISTLOAD) DELAYBLACKLISTLOAD=$(added_param_value_no DELAYBLACKLISTLOAD $DELAYBLACKLISTLOAD)
LOGTAGONLY=$(added_param_value_no LOGTAGONLY $LOGTAGONLY) LOGTAGONLY=$(added_param_value_no LOGTAGONLY $LOGTAGONLY)
RFC1918_STRICT=$(added_param_value_no RFC1918_STRICT $RFC1918_STRICT) RFC1918_STRICT=$(added_param_value_no RFC1918_STRICT $RFC1918_STRICT)