From db535a1c39140b8c884a896b578814866fbb0b09 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Fri, 5 Oct 2012 18:12:30 +0000
Subject: Correctly build the sainfo to avoid errors

---
 etc/inc/vpn.inc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'etc')

diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index 8a60422..a5e179a 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -707,19 +707,19 @@ EOD;
 								log_error("Invalid IPsec Phase 2 \"{$ph2ent['descr']}\" - {$ph2ent['localid']['type']} has no subnet.");
 								continue;
 							}
-							$localid_spec = $localid_type." ".$localid_data." any";
+							$localid_spec = "{$localid_type} {$localid_data} any";
 							if (!empty($ph2ent['natlocalid'])) {
-								$localid_spec .= " nat ";
+								$natlocalid_spec = " nat ";
 								if ($ph2ent['natlocalid']['type'] != "address")
-									$localid_spec .= "subnet ";
+									$natlocalid_spec .= "subnet ";
 								else
-									$localid_spec .= "address ";
+									$natlocalid_spec .= "address ";
 								$natlocalid_data =  ipsec_idinfo_to_cidr($ph2ent['natlocalid']);
 								if (!is_ipaddr($natlocalid_data) && !is_subnet($natlocalid_data)) {
 									log_error("Invalid IPsec Phase 2(NAT) \"{$ph2ent['descr']}\" - {$ph2ent['natlocalid']['type']} has no subnet.");
 									continue;
 								}
-								$localid_spec .= "{$natlocalid_data} any";
+								$localid_spec .= "{$natlocalid_spec} {$natlocalid_data} any";
 							}
 						}
 
-- 
cgit v1.1