Skip to content
Permalink
Browse files

fixes from testing

  • Loading branch information...
jreidinger committed Feb 8, 2018
1 parent e9a8599 commit 85d7521f7d9cda3ebd13c66554c3cb0534c3b11e
Showing with 3 additions and 39 deletions.
  1. +1 −38 src/clients/ftp-server.rb
  2. +0 −1 src/include/ftp-server/dialogs.rb
  3. +2 −0 src/modules/FtpServer.rb
@@ -222,7 +222,7 @@ def main
"help" => _(
"Start FTP daemon via systemd socket."
)
}
},
"manual" => {
# TRANSLATORS: CommandLine help
"help" => _(
@@ -249,13 +249,6 @@ def main
"Directory for anonymous users"
)
},
"set_authen_dir" => {
"type" => "string",
# TRANSLATORS: CommandLine help
"help" => _(
"Directory for authenticated users"
)
},
"set_min_port" => {
"type" => "integer",
# TRANSLATORS: CommandLine help
@@ -354,7 +347,6 @@ def main
"chroot" => ["enable", "disable"],
"umask" => ["set_umask"],
"anon_dir" => ["set_anon_dir"],
"authen_dir" => ["set_authen_dir"],
"port_range" => ["set_min_port", "set_max_port"],
"idle_time" => ["set_idle_time"],
"max_clients_ip" => ["set_max_clients"],
@@ -724,35 +716,6 @@ def FTPdCMDAnonDir(options)
nil
end

def FTPdCMDAuthenDir(options)
options = deep_copy(options)
CommandLine.Print(String.UnderlinedHeader(_("Authenticated users:"), 0))
CommandLine.Print("")
if Builtins.size(options) == 1
if Ops.get(options, "set_authen_dir") != nil
value = Ops.get_string(options, "set_authen_dir")
if value != nil
CommandLine.PrintNoCR(_("Authenticated directory:"))
CommandLine.Print(value)
CommandLine.Print("")
Ops.set(FtpServer.EDIT_SETTINGS, "FtpDirLocal", value)
else
CommandLine.Error(_("Option is empty."))
CommandLine.Print(
_("Example of correct input set_authen_dir=/srv/ftp")
)
CommandLine.Print("")
end
end
else
# TRANSLATORS: CommandLine error message
CommandLine.Error(_("Only one parameter is allowed."))
CommandLine.Print("")
end

nil
end

def FTPdCMDPassPorts(options)
options = deep_copy(options)
CommandLine.Print(String.UnderlinedHeader(_("Port range:"), 0))
@@ -33,7 +33,6 @@ def initialize_ftp_server_dialogs(include_target)
@wid_handling_vsftpd = {
"StartMode" => CWMServiceStart.CreateAutoStartWidget(StartMode()),
"StartStop" => CWMServiceStart.CreateStartStopWidget(StartStop()),
"RBVsPureFTPd" => RBVsftpdPureftpd(),
"StartStopRestart" => StartStopRestart(),
"Banner" => Banner(),
"ChrootEnable" => ChrootEnable(),
@@ -2,6 +2,8 @@

require "yast"

require "y2firewall/firewalld"

module Yast
# Configure vsftpd: https://security.appspot.com/vsftpd.html
class FtpServerClass < Module

0 comments on commit 85d7521

Please sign in to comment.
You can’t perform that action at this time.