Author: juhliarik Date: Fri Apr 23 16:34:00 2010 New Revision: 61849 URL: http://svn.opensuse.org/viewcvs/yast?rev=61849&view=rev Log: added fix for parsing xinetd options for ftp-server bnc#597842 Modified: trunk/ftp-server/VERSION trunk/ftp-server/package/yast2-ftp-server.changes trunk/ftp-server/src/write_load.ycp Modified: trunk/ftp-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/VERSION?rev=61849&r1=61848&r2=61849&view=diff ============================================================================== --- trunk/ftp-server/VERSION (original) +++ trunk/ftp-server/VERSION Fri Apr 23 16:34:00 2010 @@ -1 +1 @@ -2.18.1 +2.19.0 Modified: trunk/ftp-server/package/yast2-ftp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/package/yast2-ftp-server.changes?rev=61849&r1=61848&r2=61849&view=diff ============================================================================== --- trunk/ftp-server/package/yast2-ftp-server.changes (original) +++ trunk/ftp-server/package/yast2-ftp-server.changes Fri Apr 23 16:34:00 2010 @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 23 16:30:14 CEST 2010 - juhliarik@suse.cz + +- added fix for parsing options from xinetd (bnc#597842) +- 2.19.0 + ------------------------------------------------------------------ Wed Jan 13 18:56:03 CET 2010 - kmachalkova@suse.cz Modified: trunk/ftp-server/src/write_load.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/write_load.ycp?rev=61849&r1=61848&r2=61849&view=diff ============================================================================== --- trunk/ftp-server/src/write_load.ycp (original) +++ trunk/ftp-server/src/write_load.ycp Fri Apr 23 16:34:00 2010 @@ -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) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org