Author: juhliarik Date: Mon Jul 30 17:04:26 2007 New Revision: 39799 URL: http://svn.opensuse.org/viewcvs/yast?rev=39799&view=rev Log: add corrections for parsing xinetd options and others Modified: trunk/ftp-server/src/FtpServer.ycp trunk/ftp-server/src/complex.ycp trunk/ftp-server/src/write_load.ycp Modified: trunk/ftp-server/src/FtpServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/FtpServer.ycp?rev=39799&r1=39798&r2=39799&view=diff ============================================================================== --- trunk/ftp-server/src/FtpServer.ycp (original) +++ trunk/ftp-server/src/FtpServer.ycp Mon Jul 30 17:04:26 2007 @@ -196,8 +196,8 @@ "Umask" : "", "UmaskAnon" : "", "UmaskLocal" : "", - "PasMinPort" : "0", - "PasMaxPort" : "0", + "PasMinPort" : "40000", + "PasMaxPort" : "40500", "MaxIdleTime" : "15", "MaxClientsPerIP" : "3", "MaxClientsNumber" : "10", Modified: trunk/ftp-server/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/complex.ycp?rev=39799&r1=39798&r2=39799&view=diff ============================================================================== --- trunk/ftp-server/src/complex.ycp (original) +++ trunk/ftp-server/src/complex.ycp Mon Jul 30 17:04:26 2007 @@ -52,6 +52,10 @@ integer vsftpd_init_count = 0; integer pureftpd_init_count = 0; any ret = nil; + boolean vs_package_available = false; + boolean pure_package_available = false; + + if (Package::Installed("vsftpd")) { vsftpd_init_count = vsftpd_init_count + 1; FtpServer::vsftpd_installed = true; @@ -62,8 +66,17 @@ FtpServer::pureftpd_installed = true; } + if ((vsftpd_init_count == 0) && (pureftpd_init_count == 0)) { - //Popup::Error("There isn't installed ftp daemon (vsftpd/pure-ftpd)!" ); + vs_package_available = Package::Available("vsftpd"); + pure_package_available = Package::Available("pure-ftpd"); + if ((!vs_package_available)&&(!pure_package_available)) { + Popup::Error("Packages for vsftpd and pure-ftpd are not available."); + y2error("[ftp-server] (ReadFTPService ()) Packages for vsftpd and pure-ftpd are not available."); + return false; + } + + UI::OpenDialog( `RadioButtonGroup(`id("IntstallFTPd"), `VBox( @@ -79,6 +92,15 @@ ) // end of `VBox( ) //end of `RadioButtonGroup(`id("IntstallFTPd") ); // end of UI::OpenDialog( + if (!vs_package_available) { + UI::ChangeWidget(`id(0),`Enabled, false); + UI::ChangeWidget(`id(1),`Value, true); + } + + if (!pure_package_available) { + UI::ChangeWidget(`id(1),`Enabled, false); + UI::ChangeWidget(`id(0),`Value, true); + } integer install = 0; while (true) { ret = UI::UserInput(); @@ -99,11 +121,13 @@ if (install == 0) { daemon = "vsftpd"; daemon_list = add(daemon_list, daemon); + result = vs_package_available; } else { daemon = "pure-ftpd"; daemon_list = add(daemon_list, daemon); + result = pure_package_available; } - result = Package::Available(daemon); + //result = Package::Available(daemon); if (result == true) { result = Package::DoInstall(daemon_list); if (result == false) { Modified: trunk/ftp-server/src/write_load.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/write_load.ycp?rev=39799&r1=39798&r2=39799&view=diff ============================================================================== --- trunk/ftp-server/src/write_load.ycp (original) +++ trunk/ftp-server/src/write_load.ycp Mon Jul 30 17:04:26 2007 @@ -151,11 +151,13 @@ //PasMinPort and PasMaxPort option = find(string opt, pure_ftpd_xinet_conf, ``(issubstring(opt,"-p"))); - if (option != nil) + if (option != nil) { option = substring(tostring(option),2); + option = filterchars(option,"0123456789:"); + } if (option != nil) { list <string> ports = []; - ports = splitstring(option," "); + ports = splitstring(option,":"); if (size(ports)==2) { FtpServer::EDIT_SETTINGS["PasMinPort"] = ports[0]:""; FtpServer::EDIT_SETTINGS["PasMaxPort"] = ports[1]:""; @@ -999,7 +1001,9 @@ Service::Disable("pure-ftpd"); if (FtpServer::vsftpd_edit) { FtpServer::VS_SETTINGS["listen"]=nil; - } + } else { + FtpServer::PURE_SETTINGS["Daemonize"]="NO"; + } } else { if (FtpServer::EDIT_SETTINGS["StartDaemon"]:nil == "1") { if (FtpServer::vsftpd_edit) { @@ -1012,13 +1016,17 @@ } if (FtpServer::vsftpd_edit) { FtpServer::VS_SETTINGS["listen"]="YES"; - } + } else { + FtpServer::PURE_SETTINGS["Daemonize"]="YES"; + } } else { Service::Disable("vsftpd"); Service::Disable("pure-ftpd"); if (FtpServer::vsftpd_edit) { FtpServer::VS_SETTINGS["listen"]="YES"; - } + } else { + FtpServer::PURE_SETTINGS["Daemonize"]="YES"; + } } FtpServer::start_xinetd = false; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org