Rebased from master

1 files changed, 8 insertions, 7 deletions

diff --git a/lib/oxidized/input/ftp.rb b/lib/oxidized/input/ftp.rb
index 80de257..ebe50ef 100644
--- a/lib/oxidized/input/ftp.rb
+++ b/lib/oxidized/input/ftp.rb
@@ -6,20 +6,22 @@ module Oxidized
   class FTP < Input
     RescueFail = {
       :debug => [
-        #Net::SSH::Disconnect,
+        # Net::SSH::Disconnect,
       ],
       :warn => [
-        #RuntimeError,
-        #Net::SSH::AuthenticationFailed,
+        # RuntimeError,
+        # Net::SSH::AuthenticationFailed,
       ],
     }
     include Input::CLI
 
     def connect node
-      @node       = node
+      @node = node
       @node.model.cfg['ftp'].each { |cb| instance_exec(&cb) }
       @log = File.open(Oxidized::Config::Log + "/#{@node.ip}-ftp", 'w') if Oxidized.config.input.debug?
-      @ftp = Net::FTP.new @node.ip, @node.auth[:username], @node.auth[:password]
+      @ftp = Net::FTP.new(@node.ip)
+      @ftp.passive = Oxidized.config.input.ftp.passive
+      @ftp.login @node.auth[:username], @node.auth[:password]
       connected?
     end
 
@@ -45,10 +47,9 @@ module Oxidized
 
     def disconnect
       @ftp.close
-    #rescue Errno::ECONNRESET, IOError
+    # rescue Errno::ECONNRESET, IOError
     ensure
       @log.close if Oxidized.config.input.debug?
     end
-
   end
 end