summaryrefslogtreecommitdiff
path: root/lib/custodian/protocol-tests/ftp.rb
diff options
context:
space:
mode:
authorSteve Kemp <steve@steve.org.uk>2012-11-19 16:24:30 +0000
committerSteve Kemp <steve@steve.org.uk>2012-11-19 16:24:30 +0000
commit56c7a4e9b58bd7c944db1880a27ee435bbce5866 (patch)
tree82e5b0ff0be8f61690e68a7db99f3e6a836278e6 /lib/custodian/protocol-tests/ftp.rb
parent6066abd440c42333106e9394cb392b3dfafeac2d (diff)
Updated to ensure we read a banner from the remote server - before we test against it.
Diffstat (limited to 'lib/custodian/protocol-tests/ftp.rb')
-rwxr-xr-xlib/custodian/protocol-tests/ftp.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/custodian/protocol-tests/ftp.rb b/lib/custodian/protocol-tests/ftp.rb
index 2d0700a..1ecd68a 100755
--- a/lib/custodian/protocol-tests/ftp.rb
+++ b/lib/custodian/protocol-tests/ftp.rb
@@ -81,11 +81,11 @@ class FTPTest
socket.puts( "QUIT")
banner = socket.gets(nil)
- banner = banner[0,20]
+ banner = banner[0,20] unless( banner.nil? )
socket.close()
- if ( banner =~ /^220/ )
+ if ( ( !banner.nil? ) && ( banner =~ /^220/ ) )
return true
else
@error = "Banner didn't report OK: #{banner}"