extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-08-19 13:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't export SHOREWALL_DIR

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5074 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep
2006-12-10 01:03:03 +00:00
parent fb6aec7f07
commit 12ac2a0ab6
3 changed files with 28 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Shorewall/lib.base
View File

@@ -835,7 +835,7 @@ ensure_config_path() {
}
#
# Find a File -- For relative file name, look in ${SHOREWALL_DIR} then each ${CONFIG_PATH} then ${CONFDIR}
# Find a File -- For relative file name, look in each ${CONFIG_PATH} then ${CONFDIR}
#
find_file()
{
@@ -846,18 +846,14 @@ find_file()
echo $1
;;
*)
if [ -n "$SHOREWALL_DIR" -a -f $SHOREWALL_DIR/$1 ]; then
echo $SHOREWALL_DIR/$1
else
for directory in $(split $CONFIG_PATH); do
if [ -f $directory/$1 ]; then
echo $directory/$1
return
fi
done
for directory in $(split $CONFIG_PATH); do
if [ -f $directory/$1 ]; then
echo $directory/$1
return
fi
done
echo ${CONFDIR}/$1
fi
echo ${CONFDIR}/$1
;;
esac
}