From 1716852ac3f818dc9fb22f3e4f7eb4301296a3c0 Mon Sep 17 00:00:00 2001
From: Stephen Beaver <sbeaver@netgate.com>
Date: Wed, 13 Jan 2016 12:53:17 -0500
Subject: Fixed #3887

---
 src/usr/local/www/firewall_nat_1to1.php      | 3 +++
 src/usr/local/www/firewall_nat_1to1_edit.php | 9 +++++++++
 2 files changed, 12 insertions(+)

(limited to 'src/usr')

diff --git a/src/usr/local/www/firewall_nat_1to1.php b/src/usr/local/www/firewall_nat_1to1.php
index 4875f1f..071e27d 100644
--- a/src/usr/local/www/firewall_nat_1to1.php
+++ b/src/usr/local/www/firewall_nat_1to1.php
@@ -209,6 +209,9 @@ display_top_tabs($tab_array);
 						<td>
 							<a href="?act=toggle&amp;id=<?=$i?>">
 								<i class="fa <?= ($iconfn == "pass") ? "fa-check":"fa-times"?>" title="<?=gettext("click to toggle enabled/disabled status")?>"></i>
+<?php 				if (isset($natent['nobinat'])) { ?>
+								&nbsp;<i class="fa fa-hand-paper-o text-danger" title="<?=gettext("Negated: This rule excludes a NAT from a later rule")?>"></i>
+<?php 				} ?>
 							</a>
 						</td>
 						<td>
diff --git a/src/usr/local/www/firewall_nat_1to1_edit.php b/src/usr/local/www/firewall_nat_1to1_edit.php
index 7e76b35..e747e15 100644
--- a/src/usr/local/www/firewall_nat_1to1_edit.php
+++ b/src/usr/local/www/firewall_nat_1to1_edit.php
@@ -103,6 +103,7 @@ if (isset($_GET['dup'])) {
 }
 
 if (isset($id) && $a_1to1[$id]) {
+	$pconfig['nobinat'] = isset($a_1to1[$id]['nobinat']);
 	$pconfig['disabled'] = isset($a_1to1[$id]['disabled']);
 
 	address_to_pconfig($a_1to1[$id]['source'], $pconfig['src'],
@@ -236,6 +237,7 @@ if ($_POST) {
 	if (!$input_errors) {
 		$natent = array();
 
+		$natent['nobinat'] = isset($_POST['nobinat']) ? true:false;
 		$natent['disabled'] = isset($_POST['disabled']) ? true:false;
 		$natent['external'] = $_POST['external'];
 		$natent['descr'] = $_POST['descr'];
@@ -393,6 +395,13 @@ $form = new Form(new Form_Button(
 $section = new Form_Section('Edit NAT 1 to 1 entry');
 
 $section->addInput(new Form_Checkbox(
+	'nobinat',
+	'Negate',
+	'This rule will be excluded from the NAT',
+	$pconfig['nobinat']
+))->setHelp('Use this to exclude addresses from from a rule that follows this one');
+
+$section->addInput(new Form_Checkbox(
 	'nordr',
 	'No RDR (NOT)',
 	'Disable redirection for traffic matching this rule',
-- 
cgit v1.1