extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-04-15 14:58:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Changes for Shorewall4

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5658 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-03-24 16:21:00 +00:00
parent 1900bfb5cd
commit 5f74e8cf66
4 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Shorewall/compiler
View File

@ -5668,13 +5668,13 @@ case "$COMMAND" in
check) check)
[ $# -ne 1 ] && usage [ $# -ne 1 ] && usage
do_initialize do_initialize
[ -n "$EXPERIMENTAL" ] && exec perl $debug $(find_file compiler.pl) || compile_firewall [ -n "$SHOREWALL4" ] && exec perl $debug /usr/share/shorewall4/compiler.pl || compile_firewall
;; ;;
compile) compile)
[ $# -ne 2 ] && usage [ $# -ne 2 ] && usage
do_initialize do_initialize
[ -n "$EXPERIMENTAL" ] && exec perl $debug $(find_file compiler.pl) $2 || compile_firewall $2 [ -n "$SHOREWALL4" ] && exec perl $debug /usr/share/shorewall4/compiler.pl $2 || compile_firewall $2
;; ;;
call) call)

2
Shorewall/lib.base
View File

@ -339,7 +339,7 @@ lib_load() # $1 = Name of the Library, $2 = Error Message heading if the library
eval loaded=\$LIB_${1}_LOADED eval loaded=\$LIB_${1}_LOADED
if [ -z "$loaded" ]; then if [ -z "$loaded" ]; then
if [ -n "$EXPERIMENTAL" ]; then if [ -n "$SHOREWALL4" ]; then
eval LIB_${1}_LOADED=Yes eval LIB_${1}_LOADED=Yes
return return
fi fi

8
Shorewall/lib.config
View File

@ -1787,11 +1787,11 @@ do_initialize() {
[ -f $VERSION_FILE ] && VERSION=$(cat $VERSION_FILE) [ -f $VERSION_FILE ] && VERSION=$(cat $VERSION_FILE)
[ -n "$EXPERIMENTAL" ] && set -a; [ -d /usr/share/shorewall4 ] && set -a;
run_user_exit params run_user_exit params
[ -n "$EXPERIMENTAL" ] && set +a && EXPERIMENTAL= [ -d /usr/share/shorewall4 ] && set +a
config=$(find_file shorewall.conf) config=$(find_file shorewall.conf)
@ -1962,7 +1962,7 @@ do_initialize() {
TC_EXPERT=$(added_param_value_no TC_EXPERT $TC_EXPERT) TC_EXPERT=$(added_param_value_no TC_EXPERT $TC_EXPERT)
USE_ACTIONS=$(added_param_value_yes USE_ACTIONS $USE_ACTIONS) USE_ACTIONS=$(added_param_value_yes USE_ACTIONS $USE_ACTIONS)
EXPORTPARAMS=$(added_param_value_yes EXPORTPARAMS $EXPORTPARAMS) EXPORTPARAMS=$(added_param_value_yes EXPORTPARAMS $EXPORTPARAMS)
EXPERIMENTAL=$(added_param_value_no EXPERIMENTAL $EXPERIMENTAL) SHOREWALL4=$(added_param_value_no SHOREWALL4 $SHOREWALL4)
[ -n "$USE_ACTIONS" ] && lib_load actions "USE_ACTIONS=Yes" [ -n "$USE_ACTIONS" ] && lib_load actions "USE_ACTIONS=Yes"
@ -2108,7 +2108,7 @@ do_initialize() {
strip_file_and_lib_load tcrules tcrules strip_file_and_lib_load tcrules tcrules
strip_file tos strip_file tos
strip_file_and_lib_load tunnels tunnels strip_file_and_lib_load tunnels tunnels
if [ -n $EXPERIMENTAL ]; then if [ -n "$SHOREWALL4" ]; then
report_capabilities1 > $TMP_DIR/capabilities report_capabilities1 > $TMP_DIR/capabilities
export TMP_DIR export TMP_DIR
export CONFIG_PATH export CONFIG_PATH

10
Shorewall/shorewall
View File

@ -214,16 +214,6 @@ get_config() {
[ -n "${HOSTNAME:=$(hostname)}" ] [ -n "${HOSTNAME:=$(hostname)}" ]
case "$EXPERIMENTAL" in
yes|Yes)
;;
*)
EXPERIMENTAL=
;;
esac
export EXPERIMENTAL;
} }
# #