Author: jsrain Date: Thu Nov 18 09:28:36 2010 New Revision: 62863 URL: http://svn.opensuse.org/viewcvs/yast?rev=62863&view=rev Log: remove listen_ipv6 from vsftp.conf - it was preventing from running in standalone mode (bnc#632543) Modified: trunk/ftp-server/package/yast2-ftp-server.changes trunk/ftp-server/src/wid_functions.ycp trunk/ftp-server/src/write_load.ycp 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=62863&r1=62862&r2=62863&view=diff ============================================================================== --- trunk/ftp-server/package/yast2-ftp-server.changes (original) +++ trunk/ftp-server/package/yast2-ftp-server.changes Thu Nov 18 09:28:36 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Nov 18 09:30:14 CEST 2010 - jsrain@suse.cz + +- remove listen_ipv6 from vsftp.conf - it was preventing from + running in standalone mode (bnc#632543) + +------------------------------------------------------------------- Fri Apr 23 16:30:14 CEST 2010 - juhliarik@suse.cz - added fix for parsing options from xinetd (bnc#597842) Modified: trunk/ftp-server/src/wid_functions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/wid_functions.ycp?rev=62863&r1=62862&r2=62863&view=diff ============================================================================== --- trunk/ftp-server/src/wid_functions.ycp (original) +++ trunk/ftp-server/src/wid_functions.ycp Thu Nov 18 09:28:36 2010 @@ -159,6 +159,7 @@ if ((FtpServer::EDIT_SETTINGS["StartDaemon"]:nil == "2") && (Service::Status("pure-ftpd") != 0)) { SCR::Write(add(.vsftpd, "listen"), nil); + SCR::Write(add(.vsftpd, "listen_ipv6"), nil); SCR::Write(.vsftpd, nil); FtpServer::stop_daemon_xinetd = false; result = AskStartXinetd (); @@ -180,6 +181,7 @@ } else { SCR::Write(add(.vsftpd, "listen"), "YES"); + SCR::Write(add(.vsftpd, "listen_ipv6"), nil); SCR::Write(.vsftpd, nil); string command = "rcvsftpd start"; map options = (map)SCR::Execute (.target.bash_output, command); @@ -1434,4 +1436,4 @@ } } -} \ No newline at end of file +} Modified: trunk/ftp-server/src/write_load.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/write_load.ycp?rev=62863&r1=62862&r2=62863&view=diff ============================================================================== --- trunk/ftp-server/src/write_load.ycp (original) +++ trunk/ftp-server/src/write_load.ycp Thu Nov 18 09:28:36 2010 @@ -1096,6 +1096,7 @@ Service::Disable("pure-ftpd"); if (FtpServer::vsftpd_edit) { FtpServer::VS_SETTINGS["listen"]=nil; + FtpServer::VS_SETTINGS["listen_ipv6"]=nil; } else { FtpServer::PURE_SETTINGS["Daemonize"]="NO"; } @@ -1112,6 +1113,7 @@ } if (FtpServer::vsftpd_edit) { FtpServer::VS_SETTINGS["listen"]="YES"; + FtpServer::VS_SETTINGS["listen_ipv6"]=nil; } else { FtpServer::PURE_SETTINGS["Daemonize"]="YES"; } @@ -1120,6 +1122,7 @@ Service::Disable("pure-ftpd"); if (FtpServer::vsftpd_edit) { FtpServer::VS_SETTINGS["listen"]="YES"; + FtpServer::VS_SETTINGS["listen_ipv6"]=nil; } else { FtpServer::PURE_SETTINGS["Daemonize"]="YES"; } @@ -1154,4 +1157,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