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

Backout my start for a fix for Togan's patch

Browse Source
This commit is contained in:
Tom Eastep 2011-04-17 09:06:13 -07:00
parent 97b7856380
commit aca5b33858
2 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Shorewall/shorewall
View File

@ -1140,7 +1140,7 @@ reload_command() # $* = original arguments less the command.
local root
root=root
local libexec
libexec=/usr/share
libexec=share
litedir=/var/lib/shorewall-lite
@ -1199,20 +1199,11 @@ reload_command() # $* = original arguments less the command.
temp=$(rsh_command /sbin/shorewall-lite show config 2> /dev/null | grep ^LITEDIR | sed 's/LITEDIR is //')
[ -n "$temp" ] && litedir=$temp
[ -n "$temp" ] && litedir="$temp"
temp=$(rsh_command /sbin/shorewall-lite show config 2> /dev/null | grep ^LIBEXEC | sed 's/LIBEXEC is //')
if [ -n "$temp" ]; then
case $temp in
/*)
libexec=$temp
;;
*)
libexec=/usr/$temp
;;
esac
fi
[ -n "$temp" ] && libexec="$temp"
if [ -z "$getcaps" ]; then
SHOREWALL_DIR=$(resolve_file $directory)
@ -1230,7 +1221,7 @@ reload_command() # $* = original arguments less the command.
[ -n "$DONT_LOAD" ] && DONT_LOAD="$(echo $DONT_LOAD | tr ',' ' ')"
progress_message "Getting Capabilities on system $system..."
if ! rsh_command "MODULESDIR=$MODULESDIR MODULE_SUFFIX=\"$MODULE_SUFFIX\" IPTABLES=$IPTABLES DONT_LOAD=\"$DONT_LOAD\" $libexec/shorewall-lite/shorecap" > $directory/capabilities; then
if ! rsh_command "MODULESDIR=$MODULESDIR MODULE_SUFFIX=\"$MODULE_SUFFIX\" IPTABLES=$IPTABLES DONT_LOAD=\"$DONT_LOAD\" /usr/$libexec/shorewall-lite/shorecap" > $directory/capabilities; then
fatal_error "ERROR: Capturing capabilities on system $system failed"
fi
fi

15
Shorewall6/shorewall6
View File

@ -1073,7 +1073,7 @@ reload_command() # $* = original arguments less the command.
local compiler
compiler=
local libexec
libexec=/usr/share
libexec=share
litedir=/var/lib/shorewall6-lite
@ -1136,16 +1136,7 @@ reload_command() # $* = original arguments less the command.
temp=$(rsh_command /sbin/shorewall6-lite show config 2> /dev/null | grep ^LIBEXEC | sed 's/LIBEXEC is //')
if [ -n "$temp" ]; then
case $temp in
/*)
libexec=$temp
;;
*)
libexec=/usr/$temp
;;
esac
fi
[ -n "$temp" ] && libexec=$temp
if [ -z "$getcaps" ]; then
SHOREWALL_DIR=$(resolve_file $directory)
@ -1161,7 +1152,7 @@ reload_command() # $* = original arguments less the command.
fi
progress_message "Getting Capabilities on system $system..."
if ! rsh_command "MODULESDIR=$MODULESDIR MODULE_SUFFIX=\"$MODULE_SUFFIX\" IP6TABLES=$IP6TABLES $libexec/shorewall6-lite/shorecap" > $directory/capabilities; then
if ! rsh_command "MODULESDIR=$MODULESDIR MODULE_SUFFIX=\"$MODULE_SUFFIX\" IP6TABLES=$IP6TABLES /usr/$libexec/shorewall6-lite/shorecap" > $directory/capabilities; then
fatal_error "ERROR: Capturing capabilities on system $system failed"
fi
fi