summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-10-18 15:25:15 +0000
committerThierry Vignaud <tv@mageia.org>2012-10-18 15:25:15 +0000
commit625a773a843defb39ce44cfab2ac26fe153c95f3 (patch)
treec3ddf3fd0c085edebe4aa3fc6939f52f0e7a3aca
parentc713029d4c001ff5f0657f8fabaa865d3aec6b4f (diff)
downloaddrakwizard-625a773a843defb39ce44cfab2ac26fe153c95f3.tar
drakwizard-625a773a843defb39ce44cfab2ac26fe153c95f3.tar.gz
drakwizard-625a773a843defb39ce44cfab2ac26fe153c95f3.tar.bz2
drakwizard-625a773a843defb39ce44cfab2ac26fe153c95f3.tar.xz
drakwizard-625a773a843defb39ce44cfab2ac26fe153c95f3.zip
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"
-rw-r--r--NEWS3
-rwxr-xr-xftp_wizard/Proftpd.pm2
2 files changed, 4 insertions, 1 deletions
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' },