shorewall6/Makefile: fix to use reload instead of restart

Signed-off-by: Tuomo Soini <tis@foobar.fi>

Shorewall-core/lib.cli

@@ -3879,13 +3879,6 @@ usage() # $1 = exit status
     ecko "   refresh [ -d ] [ -n ] [ -T ] [ -D <directory> ] [ <chain>... ]"
     echo "   reject <address> ..."
     ecko "   reload [ -s ] [ -c ] [ -r <root user> ] [ -T ] [ -i ] [ <directory> ] <system>"
-
-    if [ -z "$g_lite" ]; then
-	echo "   remote-reload [ -s ] [ -c ] [ -r <root-name> ] [ -T ] [ -i ] [ <directory> ] <system>"
-	echo "   remote-restart [ -s ] [ -c ] [ -r <root-name> ] [ -T ] [ -i ] [ <directory> ] <system>"
-	echo "   remote-start [ -s ] [ -c ] [ -r <root-name> ] [ -T ] [ -i ] [ <directory> ] <system>"
-    fi
-
     echo "   reset [ <chain> ... ]"
 
     if [ -n "$g_lite" ]; then

Shorewall-init/shorewall-init.service.214.debian

@@ -2,7 +2,6 @@
 #     The Shoreline Firewall (Shorewall) Packet Filtering Firewall
 #
 #     Copyright 2011 Jonathan Underwood <jonathan.underwood@gmail.com>
-#     Copyright 2015 Tom Eastep <teastep@shorewall.net>
 #
 [Unit]
 Description=Shorewall firewall (bootup security)

Shorewall-init/shorewall-init.service.debian

@@ -2,7 +2,6 @@
 #     The Shoreline Firewall (Shorewall) Packet Filtering Firewall
 #
 #     Copyright 2011 Jonathan Underwood <jonathan.underwood@gmail.com>
-#     Copyright 2015 Tom Eastep <teastep@shorewall.net>
 #
 [Unit]
 Description=Shorewall firewall (bootup security)

Shorewall-lite/shorewall-lite.service.debian

@@ -2,7 +2,6 @@
 #     The Shoreline Firewall (Shorewall) Packet Filtering Firewall
 #
 #     Copyright 2011 Jonathan Underwood <jonathan.underwood@gmail.com>
-#     Copyright 2015 Tom Eastep <teastep@shorewall.net>
 #
 [Unit]
 Description=Shorewall IPv4 firewall (lite)

Shorewall/Perl/Shorewall/Config.pm

@@ -300,7 +300,7 @@ our %renamed = ( AUTO_COMMENT => 'AUTOCOMMENT', BLACKLIST_LOGLEVEL => 'BLACKLIST
 #
 # Config options and global settings that are to be copied to output script
 #
-our @propagateconfig = qw/ DISABLE_IPV6 MODULESDIR MODULE_SUFFIX LOAD_HELPERS_ONLY LOCKFILE SUBSYSLOCK LOG_VERBOSITY RESTART/;
+our @propagateconfig = qw/ DISABLE_IPV6 MODULESDIR MODULE_SUFFIX LOAD_HELPERS_ONLY LOCKFILE SUBSYSLOCK LOG_VERBOSITY/;
 #
 # From parsing the capabilities file or detecting capabilities
 #
@@ -601,13 +601,11 @@ our %validlevels;            # Valid log levels.
 # Deprecated options with their default values
 #
 our %deprecated = (
-		   LEGACY_RESTART => 'no'
 		  );
 #
 # Deprecated options that are eliminated via update
 #
 our %converted = (
-		  LEGACY_RESTART => 1
 		 );
 #
 # Eliminated options
@@ -713,7 +711,7 @@ sub initialize( $;$$) {
 		    TC_SCRIPT               => '',
 		    EXPORT                  => 0,
 		    KLUDGEFREE              => '',
-		    VERSION                 => "5.0.1",
+		    VERSION                 => "4.5.19-Beta1",
 		    CAPVERSION              => 40609 ,
 		    BLACKLIST_LOG_TAG       => '',
 		    RELATED_LOG_TAG         => '',
@@ -860,7 +858,6 @@ sub initialize( $;$$) {
 	  BASIC_FILTERS => undef,
 	  WORKAROUNDS => undef ,
 	  LEGACY_RESTART => undef ,
-	  RESTART => undef ,
 	  #
 	  # Packet Disposition
 	  #
@@ -4835,7 +4832,7 @@ sub update_config_file( $ ) {
     unless ( supplied $config{LOGLIMIT} ) {
 	if ( $config{LOGRATE} || $config{LOGBURST} ) {
 	    my $limit;
-
+	    
 	    if ( supplied $config{LOGRATE} ) {
 		fatal_error"Invalid LOGRATE ($config{LOGRATE})" unless $config{LOGRATE}  =~ /^\d+\/(second|minute)$/;
 		$limit = $config{LOGRATE};
@@ -4866,7 +4863,6 @@ sub update_config_file( $ ) {
 
     update_default( 'USE_DEFAULT_RT', 'No' );
     update_default( 'EXPORTMODULES',  'No' );
-    update_default( 'RESTART',        'reload' );
 
     my $fn;
 
@@ -5568,7 +5564,7 @@ sub get_configuration( $$$$ ) {
 
 		$limit .= "--$match $1 --hashlimit-burst $5 --hashlimit-name lograte --hashlimit-mode ";
 		$units = $4;
-	    } elsif ( $rate =~ /^[sd]:((\d+)(\/(sec|min|second|minute|hour|day))?)$/ ) {
+	    } elsif ( $rate =~ /^[sd]:((\d+)(\/(sec|min|hour|day))?)$/ ) {
 		fatal_error "Invalid rate ($1)" unless $2;
 		$limit .= "--$match $1 --hashlimit-name lograte --hashlimit-mode ";
 		$units = $4;
@@ -5592,7 +5588,7 @@ sub get_configuration( $$$$ ) {
 	    fatal_error "Invalid rate ($1)" unless $2;
 	    fatal_error "Invalid burst value ($5)" unless $5;
 	    $limit = "-m limit --limit $1 --limit-burst $5 ";
-	} elsif ( $rate =~ /^(\d+)(\/(sec|min|second|minute|hour|day))?$/ )  {
+	} elsif ( $rate =~ /^(\d+)(\/(sec|min|hour|day))?$/ )  {
 	    fatal_error "Invalid rate (${1}${2})" unless $1;
 	    $limit = "-m limit --limit $rate ";
 	} else {
@@ -5763,15 +5759,7 @@ sub get_configuration( $$$$ ) {
     default_yes_no 'INLINE_MATCHES'             , '';
     default_yes_no 'BASIC_FILTERS'              , '';
     default_yes_no 'WORKAROUNDS'                , 'Yes';
-
-    if ( supplied( $val = $config{RESTART} ) ) {
-	fatal_error "Invalid value for RESTART ($val)" unless $val =~ /^(restart|reload)$/;
-    } elsif (supplied $config{LEGACY_RESTART} ) {
-	default_yes_no 'LEGACY_RESTART'             , 'Yes';
-	$config{RESTART} = $config{LEGACY_RESTART} ? 'reload' : 'restart';
-    } else {
-	$config{RESTART} = 'reload';
-    }
+    default_yes_no 'LEGACY_RESTART'             , '';
 
     require_capability( 'BASIC_EMATCH', 'BASIC_FILTERS=Yes', 's' ) if $config{BASIC_FILTERS};
 
@@ -6314,7 +6302,7 @@ sub generate_aux_config() {
 
     emit "#\n# Shorewall auxiliary configuration file created by Shorewall version $globals{VERSION} - $date\n#";
 
-    for my $option ( qw(VERBOSITY LOGFILE LOGFORMAT ARPTABLES IPTABLES IP6TABLES IP TC IPSET PATH SHOREWALL_SHELL SUBSYSLOCK LOCKFILE RESTOREFILE WORKAROUNDS RESTART) ) {
+    for my $option ( qw(VERBOSITY LOGFILE LOGFORMAT ARPTABLES IPTABLES IP6TABLES IP TC IPSET PATH SHOREWALL_SHELL SUBSYSLOCK LOCKFILE RESTOREFILE WORKAROUNDS LEGACY_RESTART) ) {
 	conditionally_add_option $option;
     }
 

Shorewall/Perl/Shorewall/Providers.pm

@@ -60,6 +60,7 @@ our @routemarked_providers;
 our %routemarked_interfaces;
 our @routemarked_interfaces;
 our %provider_interfaces;
+our @load_providers;
 our @load_interfaces;
 
 our $balancing;
@@ -97,6 +98,7 @@ sub initialize( $ ) {
     %routemarked_interfaces = ();
     @routemarked_interfaces = ();
     %provider_interfaces    = ();
+    @load_providers         = ();
     @load_interfaces        = ();
     $balancing              = 0;
     $fallback               = 0;
@@ -695,7 +697,7 @@ sub process_a_provider( $ ) {
     if ( $track ) {
 	if ( $routemarked_interfaces{$interface} ) {
 	    fatal_error "Interface $interface is tracked through an earlier provider" if $routemarked_interfaces{$interface} == ROUTEMARKED_UNSHARED;
-	    fatal_error "Multiple providers through the same interface must have their IP address specified in the INTERFACES column" unless $shared;
+	    fatal_error "Multiple providers through the same interface must their IP address specified in the INTERFACES" unless $shared;
 	} else {
 	    $routemarked_interfaces{$interface} = $shared ? ROUTEMARKED_SHARED : ROUTEMARKED_UNSHARED;
 	    push @routemarked_interfaces, $interface;
@@ -844,12 +846,12 @@ CEOF
 
 	if ( $hostroute ) {
 	    if ( $family == F_IPV4 ) {
-		emit qq(run_ip route replace $gateway src $address dev $physical ${mtu});
-		emit qq(run_ip route replace $gateway src $address dev $physical ${mtu}table $id $realm);
+		emit "run_ip route replace $gateway src $address dev $physical ${mtu}";
+		emit "run_ip route replace $gateway src $address dev $physical ${mtu}table $id $realm";
 	    } else {
-		emit qq(qt \$IP -6 route add $gateway src $address dev $physical ${mtu});
-		emit qq(qt \$IP -6 route del $gateway src $address dev $physical ${mtu}table $id $realm);
-		emit qq(run_ip route add $gateway src $address dev $physical ${mtu}table $id $realm);
+		emit "qt \$IP -6 route add $gateway src $address dev $physical ${mtu}";
+		emit "qt \$IP -6 route del $gateway src $address dev $physical ${mtu}table $id $realm";
+		emit "run_ip route add $gateway src $address dev $physical ${mtu}table $id $realm";
 	    }
 	}
 
@@ -1378,32 +1380,15 @@ sub finish_providers() {
 	emit(   'fi',
 		'' );
     } else {
-	if ( ( $fallback || @load_interfaces ) && $config{USE_DEFAULT_RT} ) {
-	    emit  ( q(#),
-		    q(# Delete any default routes in the 'main' table),
-		    q(#),
-		    "while qt \$IP -$family route del default table $main; do",
-		    '    true',
-		    'done',
-		    ''
-		  );
-	} else {
-	    emit ( q(#),
-		   q(# We don't have any 'balance'. 'load='  or 'fallback=' providers so we restore any default route that we've saved),
-		   q(#),
-		   qq(restore_default_route $config{USE_DEFAULT_RT}),
-		   ''
-		 );
-	}
-
 	emit ( '#',
-	       '# Delete any routes in the \'balance\' table',
+	       '# We don\'t have any \'balance\' providers so we restore any default route that we\'ve saved',
 	       '#',
-	       "while qt \$IP -$family route del default table $balance; do",
-	       '    true',
-	       'done',
-	       ''
-	     );
+	       "restore_default_route $config{USE_DEFAULT_RT}" ,
+	       '#',
+	       '# And delete any routes in the \'balance\' table',
+	       '#',
+	       "qt \$IP -$family route del default table $balance",
+	       '' );
     }
 
     if ( $fallback ) {

Shorewall/Perl/prog.footer

@@ -310,7 +310,7 @@ case "$COMMAND" in
     restart)
 	[ $# -ne 1 ] && usage 2
 
-	if [ "$RESTART" = restart ]; then
+	if [ -z "$LEGACY_RESTART" ]; then
 	    COMMAND=stop stop_command && COMMAND=start start_command
 	else
 	    COMMAND=reload

Shorewall/Samples/Universal/shorewall.conf

@@ -176,6 +176,8 @@ KEEP_RT_TABLES=No
 
 LOAD_HELPERS_ONLY=Yes
 
+LEGACY_RESTART=Yes
+
 MACLIST_TABLE=filter
 
 MACLIST_TTL=
@@ -202,8 +204,6 @@ REJECT_ACTION=
 
 REQUIRE_INTERFACE=Yes
 
-RESTART=restart
-
 RESTORE_DEFAULT_ROUTE=Yes
 
 RESTORE_ROUTEMARKS=Yes

Shorewall/Samples/one-interface/interfaces

@@ -1,5 +1,5 @@
 #
-# Shorewall - Sample Interfaces File for one-interface configuration.
+# Shorewall version 5.0 - Sample Interfaces File for one-interface configuration.
 # Copyright (C) 2006-2015 by the Shorewall Team
 #
 # This library is free software; you can redistribute it and/or

Shorewall/Samples/one-interface/policy

@@ -1,5 +1,5 @@
 #
-# Shorewall - Sample Policy File for one-interface configuration.
+# Shorewall version 5.0 - Sample Policy File for one-interface configuration.
 # Copyright (C) 2006-2015 by the Shorewall Team
 #
 # This library is free software; you can redistribute it and/or

Shorewall/Samples/one-interface/rules

@@ -1,5 +1,5 @@
 #
-# Shorewall - Sample Rules File for one-interface configuration.
+# Shorewall version 5.0 - Sample Rules File for one-interface configuration.
 # Copyright (C) 2006-2014 by the Shorewall Team
 #
 # This library is free software; you can redistribute it and/or

Shorewall/Samples/one-interface/shorewall.conf

@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Shorewall - Sample shorewall.conf for one-interface
+# Shorewall version 5.0 - Sample shorewall.conf for one-interface
 #                         configuration.
 # Copyright (C) 2006-2015 by the Shorewall Team
 #
@@ -187,6 +187,8 @@ KEEP_RT_TABLES=No
 
 LOAD_HELPERS_ONLY=Yes
 
+LEGACY_RESTART=Yes
+
 MACLIST_TABLE=filter
 
 MACLIST_TTL=
@@ -213,8 +215,6 @@ REJECT_ACTION=
 
 REQUIRE_INTERFACE=No
 
-RESTART=restart
-
 RESTORE_DEFAULT_ROUTE=Yes
 
 RESTORE_ROUTEMARKS=Yes

Shorewall/Samples/one-interface/zones

@@ -1,5 +1,5 @@
 #
-# Shorewall - Sample Zones File for one-interface configuration.
+# Shorewall version 5.0 - Sample Zones File for one-interface configuration.
 # Copyright (C) 2006-2015 by the Shorewall Team
 #
 # This library is free software; you can redistribute it and/or

Shorewall/Samples/three-interfaces/interfaces

@@ -1,5 +1,5 @@
 #
-# Shorewall - Sample Interfaces File for three-interface configuration.
+# Shorewall version 5.0 - Sample Interfaces File for three-interface configuration.
 # Copyright (C) 2006-2015 by the Shorewall Team
 #
 # This library is free software; you can redistribute it and/or

Shorewall/Samples/three-interfaces/masq

@@ -1,5 +1,5 @@
 #
-# Shorewall - Sample Masq file for three-interface configuration.
+# Shorewall version 5.0 - Sample Masq file for three-interface configuration.
 # Copyright (C) 2006-2015 by the Shorewall Team
 #
 # This library is free software; you can redistribute it and/or

Shorewall/Samples/three-interfaces/policy

@@ -1,5 +1,5 @@
 #
-# Shorewall - Sample Policy File for three-interface configuration.
+# Shorewall version 5.0 - Sample Policy File for three-interface configuration.
 # Copyright (C) 2006-2015 by the Shorewall Team
 #
 # This library is free software; you can redistribute it and/or

Shorewall/Samples/three-interfaces/rules

@@ -1,5 +1,5 @@
 #
-# Shorewall - Sample Rules File for three-interface configuration.
+# Shorewall version 5.0 - Sample Rules File for three-interface configuration.
 # Copyright (C) 2006-2015 by the Shorewall Team
 #
 # This library is free software; you can redistribute it and/or

Shorewall/Samples/three-interfaces/shorewall.conf

@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Shorewall - Sample shorewall.conf for three-interface
+# Shorewall version 5.0 - Sample shorewall.conf for three-interface
 #                         configuration.
 # Copyright (C) 2006-2015 by the Shorewall Team
 #
@@ -184,6 +184,8 @@ KEEP_RT_TABLES=No
 
 LOAD_HELPERS_ONLY=Yes
 
+LEGACY_RESTART=Yes
+
 MACLIST_TABLE=filter
 
 MACLIST_TTL=
@@ -210,8 +212,6 @@ REJECT_ACTION=
 
 REQUIRE_INTERFACE=No
 
-RESTART=restart
-
 RESTORE_DEFAULT_ROUTE=Yes
 
 RESTORE_ROUTEMARKS=Yes

Shorewall/Samples/three-interfaces/stoppedrules

@@ -1,5 +1,5 @@
 #
-# Shorewall - Sample Stoppedrules File for three-interface configuration.
+# Shorewall version 5.0 - Sample Stoppedrules File for three-interface configuration.
 # Copyright (C) 2012-2015 by the Shorewall Team
 #
 # This library is free software; you can redistribute it and/or

Shorewall/Samples/three-interfaces/zones

@@ -1,5 +1,5 @@
 #
-# Shorewall - Sample Zones File for three-interface configuration.
+# Shorewall version 5.0 - Sample Zones File for three-interface configuration.
 # Copyright (C) 2006-2015 by the Shorewall Team
 #
 # This library is free software; you can redistribute it and/or

Shorewall/Samples/two-interfaces/interfaces

@@ -1,5 +1,5 @@
 #
-# Shorewall - Sample Interfaces File for two-interface configuration.
+# Shorewall version 5.0 - Sample Interfaces File for two-interface configuration.
 # Copyright (C) 2006-2015 by the Shorewall Team
 #
 # This library is free software; you can redistribute it and/or

Shorewall/Samples/two-interfaces/masq

@@ -1,5 +1,5 @@
 #
-# Shorewall - Sample Masq file for two-interface configuration.
+# Shorewall version 5.0 - Sample Masq file for two-interface configuration.
 # Copyright (C) 2006-2015 by the Shorewall Team
 #
 # This library is free software; you can redistribute it and/or

Shorewall/Samples/two-interfaces/policy

@@ -1,5 +1,5 @@
 #
-# Shorewall - Sample Policy File for two-interface configuration.
+# Shorewall version 5.0 - Sample Policy File for two-interface configuration.
 # Copyright (C) 2006-2015 by the Shorewall Team
 #
 # This library is free software; you can redistribute it and/or

Shorewall/Samples/two-interfaces/rules

@@ -1,5 +1,5 @@
 #
-# Shorewall - Sample Rules File for two-interface configuration.
+# Shorewall version 5.0 - Sample Rules File for two-interface configuration.
 # Copyright (C) 2006-2015 by the Shorewall Team
 #
 # This library is free software; you can redistribute it and/or

Shorewall/Samples/two-interfaces/shorewall.conf

@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Shorewall - Sample shorewall.conf for two-interface
+# Shorewall version 5.0 - Sample shorewall.conf for two-interface
 #                         configuration.
 # Copyright (C) 2006-2014 by the Shorewall Team
 #
@@ -187,6 +187,8 @@ KEEP_RT_TABLES=No
 
 LOAD_HELPERS_ONLY=Yes
 
+LEGACY_RESTART=Yes
+
 MACLIST_TABLE=filter
 
 MACLIST_TTL=
@@ -213,8 +215,6 @@ REJECT_ACTION=
 
 REQUIRE_INTERFACE=No
 
-RESTART=restart
-
 RESTORE_DEFAULT_ROUTE=Yes
 
 RESTORE_ROUTEMARKS=Yes

Shorewall/Samples/two-interfaces/stoppedrules

@@ -1,5 +1,5 @@
 #
-# Shorewall - Sample Stoppedrules File for two-interface configuration.
+# Shorewall version 5.0 - Sample Stoppedrules File for two-interface configuration.
 # Copyright (C) 2012-2015 by the Shorewall Team
 #
 # This library is free software; you can redistribute it and/or

Shorewall/Samples/two-interfaces/zones

@@ -1,5 +1,5 @@
 #
-# Shorewall - Sample Zones File for two-interface configuration.
+# Shorewall version 5.0 - Sample Zones File for two-interface configuration.
 # Copyright (C) 2006-2014 by the Shorewall Team
 #
 # This library is free software; you can redistribute it and/or

Shorewall/configfiles/accounting

@@ -1,5 +1,5 @@
 #
-# Shorewall - Accounting File
+# Shorewall version 5 - Accounting File
 #
 # For information about entries in this file, type "man shorewall-accounting"
 #

Shorewall/configfiles/actions

@@ -1,5 +1,5 @@
 #
-# Shorewall - Actions File
+# Shorewall version 5 - Actions File
 #
 # /etc/shorewall/actions
 #

Shorewall/configfiles/arprules

@@ -1,5 +1,5 @@
 #
-# Shorewall - arprules File
+# Shorewall version 5 - arprules File
 #
 # For information about entries in this file, type "man shorewall-arprules"
 #

Shorewall/configfiles/blrules

@@ -1,5 +1,5 @@
 #
-# Shorewall - Blacklist Rules File
+# Shorewall version 5 - Blacklist Rules File
 #
 # For information about entries in this file, type "man shorewall-blrules"
 #

Shorewall/configfiles/clear

@@ -1,5 +1,5 @@
 #
-# Shorewall - clear File
+# Shorewall version 5 - clear File
 #
 # /etc/shorewall/clear
 #

Shorewall/configfiles/conntrack

@@ -1,5 +1,5 @@
 #
-# Shorewall - conntrack File
+# Shorewall version 5 - conntrack File
 #
 # For information about entries in this file, type "man shorewall-conntrack"
 #

Shorewall/configfiles/ecn

@@ -1,5 +1,5 @@
 #
-# Shorewall - Ecn File
+# Shorewall version 5 - Ecn File
 #
 # For information about entries in this file, type "man shorewall-ecn"
 #

Shorewall/configfiles/findgw

@@ -1,5 +1,5 @@
 #
-# Shorewall - Findgw File
+# Shorewall version 5 - Findgw File
 #
 # /etc/shorewall/findgw
 #

Shorewall/configfiles/hosts

@@ -1,5 +1,5 @@
 #
-# Shorewall - Hosts file
+# Shorewall version 5 - Hosts file
 #
 # For information about entries in this file, type "man shorewall-hosts"
 #

Shorewall/configfiles/init

@@ -1,5 +1,5 @@
 #
-# Shorewall - Init File
+# Shorewall version 5 - Init File
 #
 # /etc/shorewall/init
 #

Shorewall/configfiles/initdone

@@ -1,5 +1,5 @@
 #
-# Shorewall - Initdone File
+# Shorewall version 5 - Initdone File
 #
 # /etc/shorewall/initdone
 #

Shorewall/configfiles/interfaces

@@ -1,5 +1,5 @@
 #
-# Shorewall - Interfaces File
+# Shorewall version 5 - Interfaces File
 #
 # For information about entries in this file, type "man shorewall-interfaces"
 #

Shorewall/configfiles/isusable

@@ -1,5 +1,5 @@
 #
-# Shorewall - isusable File
+# Shorewall version 5 - isusable File
 #
 # /etc/shorewall/isusable
 #

Shorewall/configfiles/lib.private

@@ -1,5 +1,5 @@
 #
-# Shorewall - lib.private File
+# Shorewall version 5 - lib.private File
 #
 # /etc/shorewall/lib.private
 #

Shorewall/configfiles/maclist

@@ -1,5 +1,5 @@
 #
-# Shorewall - Maclist file
+# Shorewall version 5 - Maclist file
 #
 # For information about entries in this file, type "man shorewall-maclist"
 #

Shorewall/configfiles/mangle

@@ -1,5 +1,5 @@
 #
-# Shorewall - Mangle File
+# Shorewall version 5 - Mangle File
 #
 # For information about entries in this file, type "man shorewall-mangle"
 #

Shorewall/configfiles/masq

@@ -1,5 +1,5 @@
 #
-# Shorewall - Masq file
+# Shorewall version 5 - Masq file
 #
 # For information about entries in this file, type "man shorewall-masq"
 #

Shorewall/configfiles/nat

@@ -1,5 +1,5 @@
 #
-# Shorewall - Nat File
+# Shorewall version 5 - Nat File
 #
 # For information about entries in this file, type "man shorewall-nat"
 #

Shorewall/configfiles/netmap

@@ -1,5 +1,5 @@
 #
-# Shorewall	 - Netmap File
+# Shorewall version 5	 - Netmap File
 #
 # For information about entries in this file, type "man shorewall-netmap"
 #

Shorewall/configfiles/params

@@ -1,5 +1,5 @@
 #
-# Shorewall - Params File
+# Shorewall version 5 - Params File
 #
 # /etc/shorewall/params
 #

Shorewall/configfiles/policy

@@ -1,5 +1,5 @@
 #
-# Shorewall - Policy File
+# Shorewall version 5 - Policy File
 #
 # For information about entries in this file, type "man shorewall-policy"
 #

Shorewall/configfiles/providers

@@ -1,5 +1,5 @@
 #
-# Shorewall - Providers File
+# Shorewall version 5 - Providers File
 #
 # For information about entries in this file, type "man shorewall-providers"
 #

Shorewall/configfiles/proxyarp

@@ -1,5 +1,5 @@
 #
-# Shorewall - Proxyarp File
+# Shorewall version 5 - Proxyarp File
 #
 # For information about entries in this file, type "man shorewall-proxyarp"
 #

Shorewall/configfiles/refresh

@@ -1,5 +1,5 @@
 #
-# Shorewall - refresh File
+# Shorewall version 5 - refresh File
 #
 # /etc/shorewall/refresh
 #

Shorewall/configfiles/refreshed

@@ -1,5 +1,5 @@
 #
-# Shorewall - refreshed File
+# Shorewall version 5 - refreshed File
 #
 # /etc/shorewall/refreshed
 #

Shorewall/configfiles/restored

@@ -1,5 +1,5 @@
 #
-# Shorewall - Restored File
+# Shorewall version 5 - Restored File
 #
 # /etc/shorewall/restored
 #

Shorewall/configfiles/routes

@@ -1,5 +1,5 @@
 #
-# Shorewall - routes File
+# Shorewall version 5 - routes File
 #
 # For information about entries in this file, type "man shorewall-routes"
 #

Shorewall/configfiles/routestopped

@@ -1,5 +1,5 @@
 #
-# Shorewall - Routestopped File
+# Shorewall version 5 - Routestopped File
 #
 # This file is deprecated in favor of the stoppedrules file
 #

Shorewall/configfiles/rtrules

@@ -1,5 +1,5 @@
 #
-# Shorewall - route rules File
+# Shorewall version 5 - route rules File
 #
 # For information about entries in this file, type "man shorewall-rtrules"
 #

Shorewall/configfiles/rules

@@ -1,5 +1,5 @@
 #
-# Shorewall - Rules File
+# Shorewall version 5 - Rules File
 #
 # For information on the settings in this file, type "man shorewall-rules"
 #

Shorewall/configfiles/scfilter

@@ -1,5 +1,5 @@
 #
-# Shorewall - Show Connections Filter
+# Shorewall version 5 - Show Connections Filter
 #
 # /etc/shorewall/scfilter
 #

Shorewall/configfiles/secmarks

@@ -1,5 +1,5 @@
 #
-# Shorewall - Secmarks File
+# Shorewall version 5 - Secmarks File
 #
 # For information about entries in this file, type "man shorewall-secmarks"
 #

Shorewall/configfiles/shorewall.conf

@@ -174,6 +174,8 @@ IP_FORWARDING=On
 
 KEEP_RT_TABLES=No
 
+LEGACY_RESTART=Yes
+
 LOAD_HELPERS_ONLY=Yes
 
 MACLIST_TABLE=filter
@@ -202,8 +204,6 @@ REJECT_ACTION=
 
 REQUIRE_INTERFACE=No
 
-RESTART=restart
-
 RESTORE_DEFAULT_ROUTE=Yes
 
 RESTORE_ROUTEMARKS=Yes

Shorewall/configfiles/start

@@ -1,5 +1,5 @@
 #
-# Shorewall - Start File
+# Shorewall version 5 - Start File
 #
 # /etc/shorewall/start
 #

Shorewall/configfiles/started

@@ -1,5 +1,5 @@
 #
-# Shorewall - Started File
+# Shorewall version 5 - Started File
 #
 # /etc/shorewall/started
 #

Shorewall/configfiles/stop

@@ -1,5 +1,5 @@
 #
-# Shorewall - Stop File
+# Shorewall version 5 - Stop File
 #
 # /etc/shorewall/stop
 #

Shorewall/configfiles/stopped

@@ -1,5 +1,5 @@
 #
-# Shorewall - Stopped File
+# Shorewall version 5 - Stopped File
 #
 # /etc/shorewall/stopped
 #

Shorewall/configfiles/stoppedrules

@@ -1,5 +1,5 @@
 #
-# Shorewall - Stopped Rules File
+# Shorewall version 5 - Stopped Rules File
 #
 # For information about entries in this file, type "man shorewall-stoppedrules"
 #

Shorewall/configfiles/tcclasses

@@ -1,5 +1,5 @@
 #
-# Shorewall - Tcclasses File
+# Shorewall version 5 - Tcclasses File
 #
 # For information about entries in this file, type "man shorewall-tcclasses"
 #

Shorewall/configfiles/tcclear

@@ -1,5 +1,5 @@
 #
-# Shorewall - tcclear File
+# Shorewall version 5 - tcclear File
 #
 # /etc/shorewall/tcclear
 #

Shorewall/configfiles/tcdevices

@@ -1,5 +1,5 @@
 #
-# Shorewall - Tcdevices File
+# Shorewall version 5 - Tcdevices File
 #
 # For information about entries in this file, type "man shorewall-tcdevices"
 #

Shorewall/configfiles/tcfilters

@@ -1,5 +1,5 @@
 #
-# Shorewall - Tcfilters File
+# Shorewall version 5 - Tcfilters File
 #
 # For information about entries in this file, type "man shorewall-tcfilters"
 #

Shorewall/configfiles/tcinterfaces

@@ -1,5 +1,5 @@
 #
-# Shorewall - Tcinterfaces File
+# Shorewall version 5 - Tcinterfaces File
 #
 # For information about entries in this file, type "man shorewall-tcinterfaces"
 #

Shorewall/configfiles/tcpri

@@ -1,5 +1,5 @@
 #
-# Shorewall - Tcpri File
+# Shorewall version 5 - Tcpri File
 #
 # For information about entries in this file, type "man shorewall-tcpri"
 #

Shorewall/configfiles/tunnels

@@ -1,5 +1,5 @@
 #
-# Shorewall - Tunnels File
+# Shorewall version 5 - Tunnels File
 #
 # For information about entries in this file, type "man shorewall-tunnels"
 #

Shorewall/configfiles/zones

@@ -1,5 +1,5 @@
 #
-# Shorewall - Zones File
+# Shorewall version 5 - Zones File
 #
 # For information about this file, type "man shorewall-zones"
 #

Shorewall/lib.cli-std

@@ -1645,7 +1645,7 @@ compiler_command() {
 	    shift
 	    update_command $@
 	    ;;
-	remote-start|remote-reload|remote-restart)
+	remote-start|remote-reload-reload|remote-restart)
 	    shift
 	    remote_reload_command $@
 	    ;;

Shorewall/manpages/shorewall.conf.xml

@@ -89,7 +89,7 @@
     colon (":") and a <firstterm>log tag</firstterm>. The log tag normally
     follows the packet disposition in Shorewall-generated Netfilter log
     messages, separated from the disposition by a colon (e.g, "DROP:mytag").
-    See LOGTAGONLY below for additional information.</para>
+    See LOGTAGONLY below for additional information. </para>
 
     <para>Beginning with Shorewall 4.4.22, LOGMARK is also a valid level which
     logs the packet's mark value along with the other usual information. The
@@ -1146,6 +1146,25 @@ net     all  DROP   info</programlisting>then the chain name is 'net-all'
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><emphasis role="bold">LEGACY_RESTART=</emphasis>{<emphasis
+        role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term>
+
+        <listitem>
+          <para>Added in Shorewall 5.0.0. In that release, the <emphasis
+          role="bold">reload</emphasis> command was redefined to do what
+          <emphasis role="bold">restart</emphasis> had done in earlier
+          releases and <emphasis role="bold">restart</emphasis> became a true
+          restart (equivalent to <emphasis role="bold">stop</emphasis>
+          followed by <emphasis role="bold">start</emphasis>). When
+          LEGACY_RESTART=Yes, the <emphasis role="bold">restart</emphasis>
+          command performs the same operation as the <emphasis
+          role="bold">reload</emphasis> command making it compatible with
+          earlier releases. If not specified, LEGACY_RESTART=No is
+          assumed.</para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><emphasis role="bold">LOAD_HELPERS_ONLY=</emphasis>{<emphasis
         role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term>
@@ -2150,27 +2169,6 @@ INLINE          -       -       -       ; -j REJECT
         </listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><emphasis role="bold">RESTART=</emphasis>[<emphasis
-        role="bold">restart</emphasis>|<emphasis
-        role="bold">reload</emphasis>]</term>
-
-        <listitem>
-          <para>Added in Shorewall 5.0.1 to replace LEGACY_RESTART which was
-          added in Shorewall 5.0.0. In that release, the <emphasis
-          role="bold">reload</emphasis> command was redefined to do what
-          <emphasis role="bold">restart</emphasis> had done in earlier
-          releases and <emphasis role="bold">restart</emphasis> became a true
-          restart (equivalent to <emphasis role="bold">stop</emphasis>
-          followed by <emphasis role="bold">start</emphasis>). When
-          RESTART=reload, the <emphasis role="bold">restart</emphasis> command
-          performs the same operation as the <emphasis
-          role="bold">reload</emphasis> command making it compatible with
-          earlier releases. If not specified, RESTART=reload is
-          assumed.</para>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term><emphasis
         role="bold">RESTORE_DEFAULT_ROUTE=</emphasis>[<emphasis
@@ -2481,8 +2479,7 @@ INLINE          -       -       -       ; -j REJECT
         role="bold">Yes</emphasis>|<emphasis
         role="bold">No</emphasis>|<emphasis
         role="bold">Internal</emphasis>|<emphasis
-        role="bold">Simple</emphasis>|<emphasis
-        role="bold">Shared</emphasis>]</term>
+        role="bold">Simple</emphasis>|Shared]</term>
 
         <listitem>
           <para>If you say <emphasis role="bold">Yes</emphasis> or <emphasis

Shorewall/manpages/shorewall.xml

@@ -424,7 +424,7 @@
 
       <arg>-<replaceable>options</replaceable></arg>
 
-      <arg choice="plain"><option>remote-start</option></arg>
+      <arg choice="plain"><option>remote_start</option></arg>
 
       <arg><option>-s</option></arg>
 
@@ -448,7 +448,7 @@
 
       <arg>-<replaceable>options</replaceable></arg>
 
-      <arg choice="plain"><option>remote-reload</option></arg>
+      <arg choice="plain"><option>remote_reload</option></arg>
 
       <arg><option>-s</option></arg>
 
@@ -472,7 +472,7 @@
 
       <arg>-<replaceable>options</replaceable></arg>
 
-      <arg choice="plain"><option>remote-restart</option></arg>
+      <arg choice="plain"><option>remote_restart</option></arg>
 
       <arg><option>-s</option></arg>
 
@@ -1522,7 +1522,7 @@
         <listitem>
           <para>This command was re-implemented in Shorewall 5.0.0. The
           pre-5.0.0 <command>reload</command> command is now called
-          <command>remote-restart</command> (see below).</para>
+          <command>remote_restart</command> (see below).</para>
 
           <para>Reload is similar to <emphasis role="bold">shorewall
           start</emphasis> except that it assumes that the firewall is already
@@ -1575,7 +1575,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis role="bold">remote-start</emphasis>
+        <term><emphasis role="bold">remote_start</emphasis>
         [-<option>s</option>] [-<option>c</option>] [-<option>r</option>
         <replaceable>root-user-name</replaceable>] [-<option>T</option>]
         [-<option>i</option>] [ <replaceable>directory</replaceable> ]
@@ -1637,7 +1637,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis role="bold">remote-reload
+        <term><emphasis role="bold">remote_reload
         </emphasis>[-<option>s</option>] [-<option>c</option>]
         [-<option>r</option> <replaceable>root-user-name</replaceable>]
         [-<option>T</option>] [-<option>i</option>] [
@@ -1699,7 +1699,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis role="bold">remote-restart
+        <term><emphasis role="bold">remote_restart
         </emphasis>[-<option>s</option>] [-<option>c</option>]
         [-<option>r</option> <replaceable>root-user-name</replaceable>]
         [-<option>T</option>] [-<option>i</option>] [

Shorewall/shorewall.service.debian

@@ -2,7 +2,6 @@
 #     The Shoreline Firewall (Shorewall) Packet Filtering Firewall
 #
 #     Copyright 2011 Jonathan Underwood <jonathan.underwood@gmail.com>
-#     Copyright 2015 Tom Eastep <teastep@shorewall.net>
 #
 [Unit]
 Description=Shorewall IPv4 firewall

Shorewall6/Macros/macro.Ping

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - Ping Macro
+# Shorewall6 version 5 - Ping Macro
 #
 # /usr/share/shorewall6/macro.Ping
 #

Shorewall6/Macros/macro.Trcrt

@@ -1,7 +1,7 @@
 #
-# Shorewall6 - Trcrt Macro
+# Shorewall version 5 -Trcrt Macro
 #
-# /usr/share/shorewall6/macro.Trcrt
+# /usr/share/shorewall/macro.Trcrt
 #
 #	This macro handles Traceroute (for up to 30 hops).
 #

Shorewall6/Macros/macro.mDNS

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - Multicast DNS Macro
+# Shorewall version 5 - Multicast DNS Macro
 #
 # /usr/share/shorewall6/macro.mDNS
 #

Shorewall6/Makefile

@@ -8,11 +8,11 @@ all: $(VARDIR)/$(RESTOREFILE)
 $(VARDIR)/$(RESTOREFILE): $(CONFDIR)/*
 	@/sbin/shorewall6 -q save >/dev/null; \
 	if \
-	    /sbin/shorewall6 -q restart >/dev/null 2>&1; \
+	    /sbin/shorewall6 -q reload >/dev/null 2>&1; \
 	then \
 	    /sbin/shorewall6 -q save >/dev/null; \
 	else \
-	    /sbin/shorewall6 -q restart 2>&1 | tail >&2; exit 1; \
+	    /sbin/shorewall6 -q reload 2>&1 | tail >&2; exit 1; \
 	fi
 
 clean:

Shorewall6/Samples6/Universal/shorewall6.conf

@@ -163,6 +163,8 @@ IP_FORWARDING=Off
 
 KEEP_RT_TABLES=Yes
 
+LEGACY_RESTART=Yes
+
 LOAD_HELPERS_ONLY=Yes
 
 MACLIST_TABLE=filter
@@ -185,8 +187,6 @@ REJECT_ACTION=
 
 REQUIRE_INTERFACE=Yes
 
-RESTART=restart
-
 RESTORE_ROUTEMARKS=Yes
 
 SAVE_IPSETS=No
@@ -248,5 +248,3 @@ PROVIDER_OFFSET=
 MASK_BITS=
 
 ZONE_BITS=0
-
-#LAST LINE -- DO NOT REMOVE

Shorewall6/Samples6/one-interface/shorewall6.conf

@@ -164,6 +164,8 @@ IP_FORWARDING=Off
 
 KEEP_RT_TABLES=Yes
 
+LEGACY_RESTART=Yes
+
 LOAD_HELPERS_ONLY=Yes
 
 MACLIST_TABLE=filter
@@ -186,8 +188,6 @@ REJECT_ACTION=
 
 REQUIRE_INTERFACE=No
 
-RESTART=restart
-
 RESTORE_ROUTEMARKS=Yes
 
 SAVE_IPSETS=No
@@ -249,5 +249,3 @@ PROVIDER_OFFSET=
 MASK_BITS=
 
 ZONE_BITS=0
-
-#LAST LINE -- DO NOT REMOVE

Shorewall6/Samples6/three-interfaces/shorewall6.conf

@@ -163,6 +163,8 @@ IP_FORWARDING=On
 
 KEEP_RT_TABLES=Yes
 
+LEGACY_RESTART=Yes
+
 LOAD_HELPERS_ONLY=Yes
 
 MACLIST_TABLE=filter
@@ -185,8 +187,6 @@ REJECT_ACTION=
 
 REQUIRE_INTERFACE=No
 
-RESTART=restart
-
 RESTORE_ROUTEMARKS=Yes
 
 SAVE_IPSETS=No
@@ -248,5 +248,3 @@ PROVIDER_OFFSET=
 MASK_BITS=
 
 ZONE_BITS=0
-
-#LAST LINE -- DO NOT REMOVE

Shorewall6/Samples6/two-interfaces/shorewall6.conf

@@ -163,6 +163,8 @@ IP_FORWARDING=On
 
 KEEP_RT_TABLES=Yes
 
+LEGACY_RESTART=Yes
+
 LOAD_HELPERS_ONLY=Yes
 
 MACLIST_TABLE=filter
@@ -185,8 +187,6 @@ REJECT_ACTION=
 
 REQUIRE_INTERFACE=No
 
-RESTART=restart
-
 RESTORE_ROUTEMARKS=Yes
 
 SAVE_IPSETS=No
@@ -248,5 +248,3 @@ PROVIDER_OFFSET=
 MASK_BITS=
 
 ZONE_BITS=0
-
-#LAST LINE -- DO NOT REMOVE

Shorewall6/configfiles/accounting

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - Accounting File
+# Shorewall6 version 5 - Accounting File
 #
 # For information about entries in this file, type "man shorewall6-accounting"
 #

Shorewall6/configfiles/actions

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - Actions File
+# Shorewall6 version 5 - Actions File
 #
 # /etc/shorewall6/actions
 #

Shorewall6/configfiles/blrules

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - Blacklist File
+# Shorewall6 version 5 - Blacklist File
 #
 # For information about entries in this file, type "man shorewall6-blrules"
 #

Shorewall6/configfiles/clear

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - clear File
+# Shorewall6 version 5 - clear File
 #
 # /etc/shorewall6/clear
 #

Shorewall6/configfiles/conntrack

@@ -1,5 +1,5 @@
 #
-# Shorewall - conntrack File
+# Shorewall version 5 - conntrack File
 #
 # For information about entries in this file, type "man shorewal6-conntrack"
 #

Shorewall6/configfiles/findgw

@@ -1,5 +1,5 @@
 #
-# Shorewall - Findgw File
+# Shorewall version 5 - Findgw File
 #
 # /etc/shorewall6/findgw
 #

Shorewall6/configfiles/hosts

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - Hosts file
+# Shorewall6 version 5 - Hosts file
 #
 # For information about entries in this file, type "man shorewall6-hosts"
 #

Shorewall6/configfiles/init

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - Init File
+# Shorewall6 version 5 - Init File
 #
 # /etc/shorewall6/init
 #

Shorewall6/configfiles/interfaces

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - Interfaces File
+# Shorewall6 version 5 - Interfaces File
 #
 # For information about entries in this file, type "man shorewall6-interfaces"
 #

Shorewall6/configfiles/isusable

@@ -1,10 +1,10 @@
 #
-# Shorewall6 - isusable File
+# Shorewall6 version 5 - isusable File
 #
 # /etc/shorewall6/isusable
 #
 #	This script is called when Shorewall6 is attempting to determine
-#	if an interface named in /etc/shorewall6/providers is usable.
+#	if an interface named in /etc/shorewall/providers is usable.
 #
 #	The script is invoked inside a function that accepts an interface
 #	name as a single argument. The file below is designed to work with

Shorewall6/configfiles/lib.private

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - lib.private File
+# Shorewall6 version 5 - lib.private File
 #
 # /etc/shorewall6/lib.private
 #

Shorewall6/configfiles/maclist

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - Maclist file
+# Shorewall6 version 5 - Maclist file
 #
 # For information about entries in this file, type "man shorewall6-maclist"
 #

Shorewall6/configfiles/mangle

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - Mangle File
+# Shorewall6 version 5 - Mangle File
 #
 # For information about entries in this file, type "man shorewall6-mangle"
 #

Shorewall6/configfiles/masq

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - MASQUERADE/SNAT file
+# Shorewall6 version 5 - MASQUERADE/SNAT file
 #
 # For information about entries in this file, type "man shorewall6-masq"
 #

Shorewall6/configfiles/nat

@@ -1,5 +1,5 @@
 #
-# Shorewall6 - Nat File
+# Shorewall6 version 5 - Nat File
 #
 # For information about entries in this file, type "man shorewall6-nat"
 #