-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
On 10/26/2016 02:35 PM, Tom Eastep wrote:
> On 10/26/2016 01:19 PM, Steven Jan Springl wrote:
>> Tom
>
>> Issuing a "shorewall update" command converts the following masq
>> file entry
>
>> +br1::!192.168.23.0/27 10.1.2.0/24!10.1.2.1,10.1.1.4-10.1.1.8 -
>> icmp 4/3,8,12
>
>> to snat file entry:
>
>> MASQUERADE+ 10.1.2.0/24!10.1.2.1,10.1.1.4-10.1.1.8
>> br1::!192.168.23.0/27 icmp 4/3,8,12
>
>> Which produces the following messages:
>
>> Converting /etc/shorewall200/masq...
>
>> Converted /etc/shorewall200/masq to /etc/shorewall200/snat
>
>> /etc/shorewall200/masq renamed /etc/shorewall200/masq.bak Use of
>> uninitialized value $actiontype in bitwise and (&) at
>> /usr/share/shorewall/Shorewall/Rules.pm line 5387,
>> <$currentfile>
>
>> line 15. ERROR: Invalid ACTION (MASQUERADE+)
>> /etc/shorewall200/snat (line 15)
>
>
> The attached patch seems to resolve the issue for me.
>
Here is an additional patch.
- -Tom
- --
Tom Eastep \ When I die, I want to go like my Grandfather who
Shoreline, \ died peacefully in his sleep. Not screaming like
Washington, USA \ all of the passengers in his car
http://shorewall.net \________________________________________________
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
Comment: GPGTools - http://gpgtools.org
iQIcBAEBCAAGBQJYESKwAAoJEJbms/JCOk0Qkk4P/1dVj8riN0T7qRn3D5WPHr6d
wGE87ND208NOM4RjoeiYqprLmVTEpKxDYpB4qQMQaI3A69bBzK1qUDHq6EB7qIxW
DwuO9y/TntDCwM6XvWG9NoRTkYv/G/77iZoURV6sBMfViwYpa60n2MXpkfyN0nEz
4GS3eApg5KVL8BBr+KngLVpy3EbQNerIlW1bwkD/nvjWskHjLcLAQhbVa4/ZhCWK
vCFvrNDptraXB2rsPb9+sWoPJo2hb+a4DCrAfo0rbeV0Q7jjzQ7VlKu0uQOwamNl
SW1pk9n9zvOOrH0B9BRpsWFX1LLjFoRpjrTlzEKjSAu5GRpAYVw30aQGpYP5Tkrn
yAd/MEHqKyOueU+rDf87QhvkXEThX5uiva1Gt0oBDTEsSQC2h793E7SNnxqghCjb
A5rQKXxiFigDVtc9+QTO1qRJDjwzvACqoDvGoAt9kgRhaEUqGWplAmURLyZHLM7b
cmQWig8x1CmcuWkdQQXZ2SykFPdkvgS/XJAw+qYhg4nNi3Fa5cdFlA8fU+FVCTDs
ft0r+Kly+/0rlCkp5RBGRWxtauLZs48wnUkDSvqiTlt9R4pa7HRURL3QKTiO1Mbf
dlXqEp6vFbCRyQfYfA7/B3UiFfxsQe/anU/ZVPwfJg3mdaddKJ7BziSaF/JiIR3u
NzxE2Tgx99/IUbgJIAPO
=SnQ2
-----END PGP SIGNATURE-----
diff --git a/Shorewall/Perl/Shorewall/Rules.pm b/Shorewall/Perl/Shorewall/Rules.pm
index 7c849d9..f5dda3b 100644
--- a/Shorewall/Perl/Shorewall/Rules.pm
+++ b/Shorewall/Perl/Shorewall/Rules.pm
@@ -5357,7 +5357,7 @@ sub process_snat1( $$$$$$$$$$$$ ) {
my $interfaces;
my $normalized_action;
- if ( $action =~ /^MASQUERADE(\+)?(\((.+)\))?$/ ) {
+ if ( $action =~ /^MASQUERADE(\+)?(?:\((.+)\))?$/ ) {
$target = 'MASQUERADE';
$actiontype = $builtin_target{$action = $target};
$pre_nat = $1;
------------------------------------------------------------------------------
The Command Line: Reinvented for Modern Developers
Did the resurgence of CLI tooling catch you by surprise?
Reconnect with the command line and become more productive.
Learn the new .NET and ASP.NET CLI. Get your free copy!
http://sdm.link/telerik
_______________________________________________
Shorewall-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/shorewall-devel
