Merge branch '4.5.13'

This commit is contained in:
Tom Eastep 2013-02-20 14:34:57 -08:00
commit 01fdfc4375

View File

@ -1432,10 +1432,7 @@ reload_command() # $* = original arguments less the command.
fi
if [ -z "$getcaps" ]; then
g_shorewalldir=$(resolve_file $g_directory)
ensure_config_path
capabilities=$(find_file capabilities)
[ -f $capabilities ] || getcaps=Yes
[ -f $directory/capabilities ] || getcaps=Yes
fi
if [ -f $g_directory/${g_program}.conf ]; then