Author: juhliarik Date: Mon Nov 30 10:27:36 2009 New Revision: 59853 URL: http://svn.opensuse.org/viewcvs/yast?rev=59853&view=rev Log: added fixes for typo and parsing port range in pure-ftpd Modified: branches/SuSE-Code-11-SP1-Branch/ftp-server/VERSION branches/SuSE-Code-11-SP1-Branch/ftp-server/package/yast2-ftp-server.changes branches/SuSE-Code-11-SP1-Branch/ftp-server/src/ftp-server.ycp branches/SuSE-Code-11-SP1-Branch/ftp-server/src/write_load.ycp Modified: branches/SuSE-Code-11-SP1-Branch/ftp-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ftp-server/VERSION?rev=59853&r1=59852&r2=59853&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ftp-server/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/ftp-server/VERSION Mon Nov 30 10:27:36 2009 @@ -1 +1 @@ -2.17.4 +2.17.5 Modified: branches/SuSE-Code-11-SP1-Branch/ftp-server/package/yast2-ftp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ftp-server/package/yast2-ftp-server.changes?rev=59853&r1=59852&r2=59853&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ftp-server/package/yast2-ftp-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/ftp-server/package/yast2-ftp-server.changes Mon Nov 30 10:27:36 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Nov 30 10:26:55 CET 2009 - juhliarik@suse.cz + +- added fix for typo (bnc#525007) +- added fir parsing port range in pure-ftpd (bnc#541557) +- 2.17.5 + +------------------------------------------------------------------- Tue Feb 03 14:34:18 CEST 2008 - juhliarik@suse.cz - selected text for translation (bnc #446659) Modified: branches/SuSE-Code-11-SP1-Branch/ftp-server/src/ftp-server.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ftp-server/src/ftp-server.ycp?rev=59853&r1=59852&r2=59853&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ftp-server/src/ftp-server.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/ftp-server/src/ftp-server.ycp Mon Nov 30 10:27:36 2009 @@ -383,7 +383,7 @@ FtpServer::EDIT_SETTINGS["FtpDirAnon"] = value; } else { CommandLine::Error(_("Option is empty.")); - CommandLine::Print(_("Example of correct imput set_anon_dir=/srv/ftp")); + CommandLine::Print(_("Example of correct input set_anon_dir=/srv/ftp")); CommandLine::Print(""); } } @@ -408,7 +408,7 @@ FtpServer::EDIT_SETTINGS["FtpDirLocal"] = value; } else { CommandLine::Error(_("Option is empty.")); - CommandLine::Print(_("Example of correct imput set_authen_dir=/srv/ftp")); + CommandLine::Print(_("Example of correct input set_authen_dir=/srv/ftp")); CommandLine::Print(""); } } Modified: branches/SuSE-Code-11-SP1-Branch/ftp-server/src/write_load.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ftp-server/src/write_load.ycp?rev=59853&r1=59852&r2=59853&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ftp-server/src/write_load.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/ftp-server/src/write_load.ycp Mon Nov 30 10:27:36 2009 @@ -509,7 +509,7 @@ ports = add(ports, FtpServer::EDIT_SETTINGS["PasMaxPort"]:nil); if (size(ports) == 2) { string val = ports[0]:nil; - val = val+" "; + val = val+":"; val = val+ports[1]:nil; FtpServer::PURE_SETTINGS["PassivePortRange"] = val; } @@ -519,7 +519,7 @@ } else { if (haskey(FtpServer::PURE_SETTINGS, "PassivePortRange")) { - ports = splitstring(FtpServer::PURE_SETTINGS["PassivePortRange"]:nil," "); + ports = splitstring(FtpServer::PURE_SETTINGS["PassivePortRange"]:nil,":"); if (size(ports)==2) return ports[0]:""; } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org