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

Don't pass TMP_DIR to Perl compiler

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5788 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-04-01 17:05:57 +00:00
parent 56741f6152
commit 57a7bbff8e
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Shorewall/lib.config
View File

@ -1817,6 +1817,14 @@ do_initialize() {
# #
PKTTYPE=$(added_param_value_no PKTTYPE $PKTTYPE) PKTTYPE=$(added_param_value_no PKTTYPE $PKTTYPE)
case "${SHOREWALL_COMPILER:=shell}" in
shell|perl)
;;
*)
startup_error "Invalid value ($SHOREWALL_COMPILER) for SHOREWALL_COMPILER"
;;
esac
[ -n "${MODULE_SUFFIX:=o gz ko o.gz ko.gz}" ] [ -n "${MODULE_SUFFIX:=o gz ko o.gz ko.gz}" ]
if [ -z "$EXPORT" -a $(id -u) -eq 0 ]; then if [ -z "$EXPORT" -a $(id -u) -eq 0 ]; then
@ -1829,12 +1837,13 @@ do_initialize() {
else else
[ -e "$IPTABLES" ] || startup_error "\$IPTABLES=$IPTABLES does not exist or is not executable" [ -e "$IPTABLES" ] || startup_error "\$IPTABLES=$IPTABLES does not exist or is not executable"
fi fi
f=$(find_file capabilities)
[ -f $f ] && . $f || determine_capabilities if $PROGRAM != compiler || $SHOREWALL_COMPILER = shell ; then
f=$(find_file capabilities)
else [ -f $f ] && . $f || determine_capabilities
fi
elif $PROGRAM != compiler || $SHOREWALL_COMPILER = shell ; then
f=$(find_file capabilities) f=$(find_file capabilities)
[ -f $f ] && . $f || startup_error "The -e flag requires a capabilities file" [ -f $f ] && . $f || startup_error "The -e flag requires a capabilities file"
fi fi
@ -1963,14 +1972,6 @@ do_initialize() {
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)
case "${SHOREWALL_COMPILER:=shell}" in
shell|perl)
;;
*)
startup_error "Invalid value ($SHOREWALL_COMPILER) for SHOREWALL_COMPILER"
;;
esac
[ -n "$USE_ACTIONS" ] && lib_load actions "USE_ACTIONS=Yes" [ -n "$USE_ACTIONS" ] && lib_load actions "USE_ACTIONS=Yes"
[ -n "$XCONNMARK_MATCH" ] || XCONNMARK= [ -n "$XCONNMARK_MATCH" ] || XCONNMARK=
@ -2081,10 +2082,12 @@ do_initialize() {
;; ;;
esac esac
strip_file zones if [ $PROGRAM != compiler -o $SHOREWALL_COMPILER = shell ]; then
strip_file routestopped strip_file zones
strip_file interfaces strip_file routestopped
strip_file hosts strip_file interfaces
strip_file hosts
fi
if [ $PROGRAM = compiler ]; then if [ $PROGRAM = compiler ]; then
if [ $SHOREWALL_COMPILER = 'shell' ]; then if [ $SHOREWALL_COMPILER = 'shell' ]; then
@ -2118,8 +2121,7 @@ do_initialize() {
strip_file_and_lib_load tunnels tunnels strip_file_and_lib_load tunnels tunnels
FW= FW=
else else
report_capabilities1 > $TMP_DIR/capabilities rm -rf $TMP_DIR
export TMP_DIR
export CONFIG_PATH export CONFIG_PATH
export VERSION export VERSION
export FW export FW