Merge branch '4.5.13'

Conflicts: Shorewall/lib.cli-std
2013-02-20 14:41:30 -08:00 · 2013-02-20 14:41:30 -08:00 · e14fe242bd
commit e14fe242bd
parent 01fdfc4375 d2a221a9cd
1 changed files with 1 additions and 1 deletions
--- a/Shorewall/lib.cli-std
+++ b/Shorewall/lib.cli-std
@ -1432,7 +1432,7 @@ reload_command() # $* = original arguments less the command.
    fi

    if [ -z "$getcaps" ]; then
-	[ -f $directory/capabilities ] || getcaps=Yes
+	[ -f $g_directory/capabilities ] || getcaps=Yes
    fi

    if [ -f $g_directory/${g_program}.conf ]; then