Add -c to the start command

Signed-off-by: Tom Eastep <teastep@shorewall.net>

Shorewall/Perl/Shorewall/Chains.pm

@@ -1599,7 +1599,10 @@ sub initialize_chain_table()
 	}
     }
 
-    dont_delete ensure_filter_chain 'AUDIT', 0 if $config{FAKE_AUDIT};
+    #
+    # Create these chains early in case they are needed by Policy actions
+    #
+    dont_delete new_standard_chain 'AUDIT', 0 if $config{FAKE_AUDIT};
     dont_move   new_standard_chain 'reject';
 }
 

Shorewall/releasenotes.txt

@@ -158,8 +158,8 @@ VI.   PROBLEMS CORRECTED AND NEW FEATURES IN PRIOR RELEASES
     LEGACY_FASTSTART=No, 'start -f' and 'restart -f' compare with
     /var/lib/shorewall[6]/firewall.
 
-7)  A '-c' (compile) option has been added to the 'restart'
+7)  A '-c' (compile) option has been added to the 'start' and 'restart'
-    command in both Shorewall and Shorewall6. It overrides the setting
+    commands in both Shorewall and Shorewall6. It overrides the setting
     of AUTOMAKE and unconditionally forces a recompilation of the
     configuration.
 

Shorewall/shorewall

@@ -464,6 +464,10 @@ start_command() {
 			    g_purge=Yes
 			    option=${option%p}
 			    ;;
+			c*)
+			    AUTOMAKE=
+			    option=${option#c}
+			    ;;			    
 			*)
 			    usage 1
 			    ;;
@@ -1412,7 +1416,7 @@ usage() # $1 = exit status
     echo "   show tc [ device ]"
     echo "   show vardir"
     echo "   show zones"
-    echo "   start [ -f ] [ -n ] [ -p ] [ <directory> ]"
+    echo "   start [ -f ] [ -n ] [ -p ] [ -c ] [ <directory> ]"
     echo "   stop"
     echo "   status"
     echo "   try <directory> [ <timeout> ]"

Shorewall6/shorewall6

@@ -465,6 +465,10 @@ start_command() {
 			    g_purge=Yes
 			    option=${option%p}
 			    ;;
+			c*)
+			    AUTOMAKE=
+			    option=${option#c}
+			    ;;			    
 			*)
 			    usage 1
 			    ;;
@@ -1407,7 +1411,7 @@ usage() # $1 = exit status
     echo "   show tc [ device ]"
     echo "   show vardir"
     echo "   show zones"
-    echo "   start [ -f ] [ -n ] [ -p ] [ <directory> ]"
+    echo "   start [ -f ] [ -n ] [ -p ] [ -c ] [ <directory> ]"
     echo "   stop"
     echo "   status"
     echo "   try <directory> [ <timeout> ]"

manpages/shorewall.xml

@@ -573,6 +573,8 @@
 
       <arg><option>-p</option></arg>
 
+      <arg><option>-c</option></arg>
+
       <arg><replaceable>directory</replaceable></arg>
     </cmdsynopsis>
 
@@ -1127,7 +1129,9 @@
           <para>The <option>-c</option> option was added in Shorewall 4.4.20
           and performs the compilation step unconditionally, overriding the
           AUTOMAKE setting in <ulink
-          url="shorewall.conf.html">shorewall.conf</ulink>(5).</para>
+          url="shorewall.conf.html">shorewall.conf</ulink>(5). When both
+          <option>-f</option> and <option>-c</option>are present, the result
+          is determined by the option that appears last.</para>
         </listitem>
       </varlistentry>
 
@@ -1439,6 +1443,13 @@
           <para>The <option>-p</option> option causes the connection tracking
           table to be flushed; the <command>conntrack</command> utility must
           be installed to use this option.</para>
+
+          <para>The <option>-c</option> option was added in Shorewall 4.4.20
+          and performs the compilation step unconditionally, overriding the
+          AUTOMAKE setting in <ulink
+          url="shorewall.conf.html">shorewall.conf</ulink>(5). When both
+          <option>-f</option> and <option>-c</option>are present, the result
+          is determined by the option that appears last.</para>
         </listitem>
       </varlistentry>
 

manpages6/shorewall6.xml

@@ -302,6 +302,8 @@
 
       <arg><option>-f</option></arg>
 
+      <arg><option>-c</option></arg>
+
       <arg><replaceable>directory</replaceable></arg>
     </cmdsynopsis>
 
@@ -457,7 +459,7 @@
 
       <arg><option>-n</option></arg>
 
-      <arg><option>-f</option></arg>
+      <arg><option>-f</option><arg><option>-c</option></arg></arg>
 
       <arg><replaceable>directory</replaceable></arg>
     </cmdsynopsis>
@@ -1201,6 +1203,13 @@
 
           <para>The <option>-n</option> option causes Shorewall6 to avoid
           updating the routing table(s).</para>
+
+          <para>The <option>-c</option> option was added in Shorewall 4.4.20
+          and performs the compilation step unconditionally, overriding the
+          AUTOMAKE setting in <ulink
+          url="shorewall6.conf.html">shorewall6.conf</ulink>(5). When both
+          <option>-f</option> and <option>-c </option>are present, the result
+          is determined by the option that appears last.</para>
         </listitem>
       </varlistentry>