Firewall/ outbound nat, alias target defunct. for #2194

AdSchellevis · AdSchellevis · commit b5149928aa30 · 2018-02-13T09:38:15.000+01:00
diff --git a/src/opnsense/mvc/app/library/OPNsense/Firewall/SNatRule.php b/src/opnsense/mvc/app/library/OPNsense/Firewall/SNatRule.php
@@ -92,6 +92,8 @@ private function parseNatRules()
                 }
             } elseif ($rule['target'] == "other-subnet") {
                 $rule['target'] = $rule['targetip'] . '/' . $rule['targetip_subnet'];
+            } elseif (!empty($rule['target']) && Util::isAlias($rule['target'])) {
+                $rule['target'] = "$".$rule['target'];
             }
             foreach (array("sourceport", "dstport", "natport") as $fieldname) {
                 if (!empty($rule[$fieldname]) && Util::isAlias($rule[$fieldname])) {

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,8 @@ private function parseNatRules()`
`92`	`92`	`}`
`93`	`93`	`} elseif ($rule['target'] == "other-subnet") {`
`94`	`94`	`$rule['target'] = $rule['targetip'] . '/' . $rule['targetip_subnet'];`
	`95`	`+ } elseif (!empty($rule['target']) && Util::isAlias($rule['target'])) {`
	`96`	`+ $rule['target'] = "$".$rule['target'];`
`95`	`97`	`}`
`96`	`98`	`foreach (array("sourceport", "dstport", "natport") as $fieldname) {`
`97`	`99`	`if (!empty($rule[$fieldname]) && Util::isAlias($rule[$fieldname])) {`