From 6a52aae59a9612a561e7041843449efcffb4bd26 Mon Sep 17 00:00:00 2001
From: Matt Miller <mmiller@hick.org>
Date: Wed, 8 Feb 2006 01:07:47 +0000
Subject: [PATCH] switch to use a service specific user/pass datastore option
 to avoid payload conflicts

git-svn-id: file:///home/svn/incoming/trunk@3519 4d416f70-5f16-0410-b530-b9f4589650da
---
 lib/msf/core/exploit/ftp.rb  | 12 ++++++------
 lib/msf/core/exploit/imap.rb |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/msf/core/exploit/ftp.rb b/lib/msf/core/exploit/ftp.rb
index b397f15bed..0135d1be26 100644
--- a/lib/msf/core/exploit/ftp.rb
+++ b/lib/msf/core/exploit/ftp.rb
@@ -23,8 +23,8 @@ module Exploit::Remote::Ftp
 			[
 				Opt::RHOST,
 				Opt::RPORT(21),
-				OptString.new('USER', [ false, 'The username to authenticate as', 'anonymous']),
-				OptString.new('PASS', [ false, 'The password for the specified username', 'mozilla@example.com'])
+				OptString.new('FTPUSER', [ false, 'The username to authenticate as', 'anonymous']),
+				OptString.new('FTPPASS', [ false, 'The password for the specified username', 'mozilla@example.com'])
 			], Msf::Exploit::Remote::Ftp)
 	end
 
@@ -130,17 +130,17 @@ module Exploit::Remote::Ftp
 	##
 
 	#
-	# Returns the user string from the 'USER' option.
+	# Returns the user string from the 'FTPUSER' option.
 	#
 	def user
-		datastore['USER']
+		datastore['FTPUSER']
 	end
 
 	#
-	# Returns the user string from the 'PASS' option.
+	# Returns the user string from the 'FTPPASS' option.
 	#
 	def pass
-		datastore['PASS']
+		datastore['FTPPASS']
 	end
 
 protected
diff --git a/lib/msf/core/exploit/imap.rb b/lib/msf/core/exploit/imap.rb
index 0d1bd9be71..d1a25b5281 100644
--- a/lib/msf/core/exploit/imap.rb
+++ b/lib/msf/core/exploit/imap.rb
@@ -23,8 +23,8 @@ module Exploit::Remote::Imap
 			[
 				Opt::RHOST,
 				Opt::RPORT(143),
-				OptString.new('USER', [ false, 'The username to authenticate as']),
-				OptString.new('PASS', [ false, 'The password for the specified username'])
+				OptString.new('IMAPUSER', [ false, 'The username to authenticate as']),
+				OptString.new('IMAPPASS', [ false, 'The password for the specified username'])
 			], Msf::Exploit::Remote::Ftp)
 	end
 
@@ -89,10 +89,10 @@ module Exploit::Remote::Imap
 	##
 
 	#
-	# Returns the user string from the 'USER' option.
+	# Returns the user string from the 'IMAPUSER' option.
 	#
 	def user
-		datastore['USER']
+		datastore['IMAPUSER']
 	end
 
 	#