Merge branch '4.5.13'

Shorewall/Perl/Shorewall/Config.pm

@@ -2213,7 +2213,9 @@ sub evaluate_expression( $$$ ) {
 
     print "EXPR=> $expression\n" if $debug;
 
-    unless ( $expression =~ /^\d+$/ ) {
+    if ( $expression =~ /^\d+$/ ) {
+	$val = $expression
+    } else {
 	#
 	# Not a simple one-term expression -- compile it
 	#

docs/Shorewall-Lite.xml

@@ -221,6 +221,13 @@
                   on the firewall system is
                   "/etc/shorewall-lite:/usr/share/shorewall-lite".</para>
                 </listitem>
+
+                <listitem>
+                  <para>The export directory should contain a
+                  <filename>params</filename> file, even if it is empty.
+                  Otherwise, <filename>/sbin/shorewall</filename> will attempt
+                  to read<filename> /etc/shorewall/params</filename>.</para>
+                </listitem>
               </itemizedlist>
             </listitem>