From 7f128e8c29466441667d43d16dea7c6992f3fe78 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Mon, 9 Mar 2015 12:27:34 -0400
Subject: Remove broken IPv6 setting from ftp proxy.

---
 config/ftpproxy/ftpproxy.inc | 6 ------
 config/ftpproxy/ftpproxy.xml | 7 -------
 2 files changed, 13 deletions(-)

diff --git a/config/ftpproxy/ftpproxy.inc b/config/ftpproxy/ftpproxy.inc
index 7f65e646..84a6e7cd 100644
--- a/config/ftpproxy/ftpproxy.inc
+++ b/config/ftpproxy/ftpproxy.inc
@@ -21,9 +21,6 @@ function sync_package_ftpproxy() {
 	$start = "/usr/bin/killall -9 ftp-proxy\n";
 	$start .= "\t/usr/sbin/ftp-proxy ";
 
-	if ($cf["ipv6_enable"] == "on") {
-		$start .= " -6 ";
-	}
 	if ($cf["anononly"] == "on") {
 		$start .= " -A ";
 	}
@@ -121,9 +118,6 @@ function ftpproxy_generate_rules($type) {
 					continue;
 				}
 				$rules .= "rdr pass on {$interface} inet proto tcp from any to any port 21 -> 127.0.0.1 port " . ftpproxy_get_port() . "\n";
-				if ($cf["ipv6_enable"] == "on") {
-					$rules .= "rdr pass on {$interface} inet6 proto tcp from any to any port 21 -> ::1 port " . ftpproxy_get_port() . "\n";
-				}
 			}
 			break;
 		case "filter":
diff --git a/config/ftpproxy/ftpproxy.xml b/config/ftpproxy/ftpproxy.xml
index ca83f911..cb5c6f51 100644
--- a/config/ftpproxy/ftpproxy.xml
+++ b/config/ftpproxy/ftpproxy.xml
@@ -42,13 +42,6 @@
 			<required/>
 			<multiple/>
 		</field>
-		<field>
-			<fielddescr>IPv6 Support</fielddescr>
-			<fieldname>ipv6_enable</fieldname>
-			<description>Support IPv6 FTP connections, otherwise only IPv4 connections are allowed.</description>
-			<type>checkbox</type>
-			<default_value>off</default_value>
-		</field>
 		<field>
 			<fielddescr>Anonymous Only</fielddescr>
 			<fieldname>anononly</fieldname>
-- 
cgit v1.2.3