Hi Martin, Thanks for your code review. I improved trunk and the sle11sp2 branchand submitted a new package.
Cheers, Thomas On Monday 28 November 2011 16:51:43 Martin Vidner wrote: > On Mon, Nov 28, 2011 at 03:09:24PM -0000, [email protected] wrote: > > 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/ft > > p-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.cha > > nges URL: > > http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ft > > p-server/package/yast2-ftp-server.changes?rev=66966&r1=66965&r2=66966&vie > > w=diff > > ======================================================================== > > ====== --- > > branches/SuSE-Code-11-SP2-Branch/ftp-server/package/yast2-ftp-server.cha > > nges (original) +++ > > branches/SuSE-Code-11-SP2-Branch/ftp-server/package/yast2-ftp-server.cha > > nges Mon Nov 28 16:09:24 2011 @@ -1,4 +1,10 @@ > > > > ------------------------------------------------------------------- > > > > +Mon Nov 28 15:37:02 CET 2011 - [email protected] > > + > > +- backported fix for parsing options from xinetd (bnc#597842) > > +- 2.17.7 > > The bug actually reported was bnc#733039. Please mention both. > > > + > > +------------------------------------------------------------------- > > > > Tue Feb 15 11:18:37 CET 2011 - [email protected] > > > > - 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/ft > > p-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; > > + } > > + > > The logic of the fix is quite nonobvious. > It's a backport, so oh well... > I have commented at least in the bug: > > the problem appears to be that after vsftpd settings are parsed, > the correct values are overwritten by parsing the (meaningless) > settings for pure-ftpd. > > > //ChrootEnable > > option = find(string opt, pure_ftpd_xinet_conf, ``(opt == "-A")); > > if (option != nil) > > > > @@ -1147,4 +1154,4 @@ > > > > } > > > > -} > > \ No newline at end of file > > +} -- Thomas Goettlicher SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) Maxfeldstraße 5 90409 Nürnberg Germany -- To unsubscribe, e-mail: [email protected] To contact the owner, e-mail: [email protected]
