Author: tgoettlicher Date: Mon Nov 28 16:09:24 2011 New Revision: 66966 URL: http://svn.opensuse.org/viewcvs/yast?rev=66966&view=rev Log: - backported fix for parsing options from xinetd (bnc#597842) - 2.17.7 Modified: branches/SuSE-Code-11-SP2-Branch/ftp-server/VERSION branches/SuSE-Code-11-SP2-Branch/ftp-server/package/yast2-ftp-server.changes branches/SuSE-Code-11-SP2-Branch/ftp-server/src/write_load.ycp Modified: branches/SuSE-Code-11-SP2-Branch/ftp-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ftp-server/VERSION?rev=66966&r1=66965&r2=66966&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ftp-server/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/ftp-server/VERSION Mon Nov 28 16:09:24 2011 @@ -1 +1 @@ -2.17.6 +2.17.7 Modified: branches/SuSE-Code-11-SP2-Branch/ftp-server/package/yast2-ftp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ftp-server/package/yast2-ftp-server.changes?rev=66966&r1=66965&r2=66966&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ftp-server/package/yast2-ftp-server.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/ftp-server/package/yast2-ftp-server.changes Mon Nov 28 16:09:24 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Nov 28 15:37:02 CET 2011 - tgoettlicher@suse.de + +- backported fix for parsing options from xinetd (bnc#597842) +- 2.17.7 + +------------------------------------------------------------------- Tue Feb 15 11:18:37 CET 2011 - jsrain@suse.cz - fixed command line interface - not polling UI while reading the Modified: branches/SuSE-Code-11-SP2-Branch/ftp-server/src/write_load.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ftp-server/src/write_load.ycp?rev=66966&r1=66965&r2=66966&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ftp-server/src/write_load.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/ftp-server/src/write_load.ycp Mon Nov 28 16:09:24 2011 @@ -53,7 +53,14 @@ string option = ""; y2milestone("---------------boolean SettingsXinetdPure (list <string> server_args)-----------------"); y2milestone("----------------------------------------------------"); - + + //bnc#597842 Yast2-ftp-server module losses the chroot everyone (chroot-local-user) setting + if ((FtpServer::vsftpd_edit) || (size(pure_ftpd_xinet_conf) == 0)) + { + y2milestone("skip SettingsXinetdPure() -> vsftpd is used or pure_ftpd_xinet_conf is empty"); + return true; + } + //ChrootEnable option = find(string opt, pure_ftpd_xinet_conf, ``(opt == "-A")); if (option != nil) @@ -1147,4 +1154,4 @@ } -} \ No newline at end of file +} -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org