From 330bd2ef5b2fa6863f52f13a8926871e357c091d Mon Sep 17 00:00:00 2001
From: kris <>
Date: Thu, 30 Oct 2008 00:52:38 +0000
Subject: [PATCH] Update some of my aux modules that require a successful login
 to not continue running without it

git-svn-id: file:///home/svn/framework3/trunk@5802 4d416f70-5f16-0410-b530-b9f4589650da
---
 modules/auxiliary/dos/ftp/guildftp_cwdlist.rb       | 4 ++--
 modules/auxiliary/dos/ftp/titan626_site.rb          | 4 ++--
 modules/auxiliary/dos/ftp/xmeasy560_nlst.rb         | 4 ++--
 modules/auxiliary/dos/windows/ftp/winftp230_nlst.rb | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/auxiliary/dos/ftp/guildftp_cwdlist.rb b/modules/auxiliary/dos/ftp/guildftp_cwdlist.rb
index 82dc9dcb84..8f5f422984 100644
--- a/modules/auxiliary/dos/ftp/guildftp_cwdlist.rb
+++ b/modules/auxiliary/dos/ftp/guildftp_cwdlist.rb
@@ -27,7 +27,7 @@ class Metasploit3 < Msf::Auxiliary
 	end
 
 	def run
-		connect_login
+		return unless connect_login
 
 		print_status("Sending commands...")
 
@@ -37,4 +37,4 @@ class Metasploit3 < Msf::Auxiliary
 
 		disconnect
 	end
-end
\ No newline at end of file
+end
diff --git a/modules/auxiliary/dos/ftp/titan626_site.rb b/modules/auxiliary/dos/ftp/titan626_site.rb
index 1db0a49ede..85f895a5d1 100644
--- a/modules/auxiliary/dos/ftp/titan626_site.rb
+++ b/modules/auxiliary/dos/ftp/titan626_site.rb
@@ -27,10 +27,10 @@ class Metasploit3 < Msf::Auxiliary
 	end
 
 	def run
-		connect_login
+		return unless connect_login
 		print_status("Sending command...")
 		raw_send("SITE WHO\r\n")
 		sleep 1
 		disconnect
 	end
-end
\ No newline at end of file
+end
diff --git a/modules/auxiliary/dos/ftp/xmeasy560_nlst.rb b/modules/auxiliary/dos/ftp/xmeasy560_nlst.rb
index 4ae650223e..6b51a1daf8 100644
--- a/modules/auxiliary/dos/ftp/xmeasy560_nlst.rb
+++ b/modules/auxiliary/dos/ftp/xmeasy560_nlst.rb
@@ -27,7 +27,7 @@ class Metasploit3 < Msf::Auxiliary
 	end
 
 	def run
-		connect_login
+		return unless connect_login
 
 		raw_send("NLST -1\r\n")
 
@@ -35,4 +35,4 @@ class Metasploit3 < Msf::Auxiliary
 
 		print_status("OK, server may still be technically listening, but it won't respond")
 	end
-end
\ No newline at end of file
+end
diff --git a/modules/auxiliary/dos/windows/ftp/winftp230_nlst.rb b/modules/auxiliary/dos/windows/ftp/winftp230_nlst.rb
index d11639ea13..bebe3af533 100644
--- a/modules/auxiliary/dos/windows/ftp/winftp230_nlst.rb
+++ b/modules/auxiliary/dos/windows/ftp/winftp230_nlst.rb
@@ -21,7 +21,7 @@ class Metasploit3 < Msf::Auxiliary
 	end
 
 	def run
-		connect_login
+		return unless connect_login
 
 		raw_send_recv("PASV\r\n") # NLST has to follow a PORT or PASV
 
@@ -31,4 +31,4 @@ class Metasploit3 < Msf::Auxiliary
 
 		disconnect
 	end
-end
\ No newline at end of file
+end