From 625a773a843defb39ce44cfab2ac26fe153c95f3 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Thu, 18 Oct 2012 15:25:15 +0000
Subject: fix being able to set a port other than 21

it was broken since commit r236976 by aginies on Jun 21 2006:
"fix ftp default port to 21"
---
 NEWS                  | 3 +++
 ftp_wizard/Proftpd.pm | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index c2e8854e..ddc99760 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- FTP:
+  o fix being able to set a port other than 21
+
 Version 3.8 - 27 May 2011, by Thierry Vignaud
 
 - fix apache package name (mga#2640)
diff --git a/ftp_wizard/Proftpd.pm b/ftp_wizard/Proftpd.pm
index 90354a45..d322aace 100755
--- a/ftp_wizard/Proftpd.pm
+++ b/ftp_wizard/Proftpd.pm
@@ -124,7 +124,7 @@ $o->{pages} = {
 				   $o->{var}{wiz_default_root} ||= 1;
 				   $o->{var}{wiz_ftp_resume} ||= 1;
 				   $o->{var}{wiz_ftp_fxp} ||= 0;
-				   $o->{var}{wiz_port} = -e $ftp_port ? $ftp_port : "21";
+				   $o->{var}{wiz_port} = $ftp_port || "21";
 				 },
 				 data => [
 					  { label => N("FTP Port:"), val => \$o->{var}{wiz_port}, help => 'Default port is 21 for an FTP server' },
-- 
cgit v1.2.1