Skip to content

Commit

Permalink
Merge pull request pfsense#366 from bcyrill/patch-5
Browse files Browse the repository at this point in the history
Correct IP family mix-up.
  • Loading branch information
jim-p committed Feb 1, 2013
2 parents 3d54aa1 + 60037e0 commit c5e4852
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions usr/local/www/system_gateways_edit.php
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
$parent_ip = get_interface_ip($_POST['interface']);
$parent_sn = get_interface_subnet($_POST['interface']);
if(empty($parent_ip) || empty($parent_sn)) {
$input_errors[] = gettext("You can not use a IPv6 Gateway Address on a IPv4 only interface.");
$input_errors[] = gettext("You can not use a IPv4 Gateway Address on a IPv6 only interface.");
} else {
$subnet = gen_subnet($parent_ip, $parent_sn) . "/" . $parent_sn;
if(!ip_in_subnet($_POST['gateway'], $subnet))
Expand All @@ -130,7 +130,7 @@
$parent_ip = get_interface_ipv6($_POST['interface']);
$parent_sn = get_interface_subnetv6($_POST['interface']);
if(empty($parent_ip) || empty($parent_sn)) {
$input_errors[] = gettext("You can not use a IPv4 Gateway Address on a IPv6 only interface.");
$input_errors[] = gettext("You can not use a IPv6 Gateway Address on a IPv4 only interface.");
} else {
$subnet = gen_subnetv6($parent_ip, $parent_sn) . "/" . $parent_sn;
if(!ip_in_subnet($_POST['gateway'], $subnet))
Expand Down Expand Up @@ -637,4 +637,4 @@ function monitor_change() {
monitor_change();
</script>
</body>
</html>
</html>

0 comments on commit c5e4852

Please sign in to comment.