forked from extern/shorewall_code
Correct Old Defect in ipsec match generation
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
parent
9e81a5101f
commit
e5d3ce582a
@ -2559,7 +2559,7 @@ sub match_ipsec_in( $$ ) {
|
|||||||
unless ( $optionsref->{super} || $zoneref->{type} == VSERVER ) {
|
unless ( $optionsref->{super} || $zoneref->{type} == VSERVER ) {
|
||||||
$match = '-m policy --dir in --pol ';
|
$match = '-m policy --dir in --pol ';
|
||||||
|
|
||||||
if ( $zoneref->{type} eq 'ipsec' ) {
|
if ( $zoneref->{type} == IPSEC ) {
|
||||||
$match .= "ipsec $optionsref->{in_out}{ipsec}$optionsref->{in}{ipsec}";
|
$match .= "ipsec $optionsref->{in_out}{ipsec}$optionsref->{in}{ipsec}";
|
||||||
} elsif ( have_ipsec ) {
|
} elsif ( have_ipsec ) {
|
||||||
$match .= "$hostref->{ipsec} $optionsref->{in_out}{ipsec}$optionsref->{in}{ipsec}";
|
$match .= "$hostref->{ipsec} $optionsref->{in_out}{ipsec}$optionsref->{in}{ipsec}";
|
||||||
@ -2583,7 +2583,7 @@ sub match_ipsec_out( $$ ) {
|
|||||||
unless ( $optionsref->{super} || $zoneref->{type} == VSERVER ) {
|
unless ( $optionsref->{super} || $zoneref->{type} == VSERVER ) {
|
||||||
$match = '-m policy --dir out --pol ';
|
$match = '-m policy --dir out --pol ';
|
||||||
|
|
||||||
if ( $zoneref->{type} eq 'ipsec' ) {
|
if ( $zoneref->{type} == IPSEC ) {
|
||||||
$match .= "ipsec $optionsref->{in_out}{ipsec}$optionsref->{out}{ipsec}";
|
$match .= "ipsec $optionsref->{in_out}{ipsec}$optionsref->{out}{ipsec}";
|
||||||
} elsif ( have_ipsec ) {
|
} elsif ( have_ipsec ) {
|
||||||
$match .= "$hostref->{ipsec} $optionsref->{in_out}{ipsec}$optionsref->{out}{ipsec}"
|
$match .= "$hostref->{ipsec} $optionsref->{in_out}{ipsec}$optionsref->{out}{ipsec}"
|
||||||
|
Loading…
Reference in New Issue
Block a user