Load IPv6 libraries when processing /etc/shorewall6/params

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

Shorewall/Perl/Shorewall/Config.pm

@@ -2941,7 +2941,7 @@ sub get_params() {
     if ( -f $fn ) {
 	progress_message2 "Processing $fn ...";
 
-	my $command = "$FindBin::Bin/getparams $fn " . join( ':', @config_path );
+	my $command = "$FindBin::Bin/getparams $fn " . join( ':', @config_path ) . " $family";
 	#
 	# getparams silently sources the params file under 'set -a', then executes 'export -p'
 	#

Shorewall/Perl/getparams

@@ -21,8 +21,13 @@
 #	along with this program; if not, write to the Free Software
 #	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-. /usr/share/shorewall/lib.base
-. /usr/share/shorewall/lib.cli
+if [ "$3" = 6 ]; then
+    . /usr/share/shorewall6/lib.base
+    . /usr/share/shorewall6/lib.cli
+else
+    . /usr/share/shorewall/lib.base
+    . /usr/share/shorewall/lib.cli
+fi
 
 CONFIG_PATH="$2"
 

Shorewall/changelog.txt

@@ -6,6 +6,8 @@ Changes in Shorewall 4.4.20 RC 1
 
 3)  Don't place negative numbers in IPMARK masks.
 
+4)  Fix IPv6 getparams
+
 Changes in Shorewall 4.4.20 Beta 5
 
 1)  Rename Auditing Macros

Shorewall/releasenotes.txt

@@ -77,6 +77,11 @@ VI.   PROBLEMS CORRECTED AND NEW FEATURES IN PRIOR RELEASES
     are specified for IPMARK mask values. Shorewall now converts such
     numbers to their 32-bit hex equivalent.
 
+5)  Previously, before /etc/shorewall6/params was processed, the
+    IPv4 Shorewall libraries (/usr/share/shorewall/lib.*) were
+    loaded rather that the IPv6 versions (/usr/share/shorewall6/lib.*).
+    Now, the correct libraries are loaded. 
+
 ----------------------------------------------------------------------------
            I I.  K N O W N   P R O B L E M S   R E M A I N I N G
 ----------------------------------------------------------------------------