Add tentative fixes

Author: wvu

lib/msf/core/auxiliary/auth_brute.rb

@@ -22,7 +22,7 @@ def initialize(info = {})
 			OptBool.new('VERBOSE', [ true, "Whether to print output for all attempts", true]),
 			OptBool.new('BLANK_PASSWORDS', [ false, "Try blank passwords for all users", true]),
 			OptBool.new('USER_AS_PASS', [ false, "Try the username as the password for all users", true]),
-			OptBool.new('DB_USERPASS', [false,"Try each user/password couple stored in the current database",true]),
+			OptBool.new('DB_ALL_CREDS', [false,"Try each user/password couple stored in the current database",true]),
 			OptBool.new('DB_ALL_USERS', [false,"Add all users in the current database to the list",false]),
 			OptBool.new('DB_ALL_PASS', [false,"Add all passwords in the current database to the list",false]),
 			OptBool.new('STOP_ON_SUCCESS', [ true, "Stop guessing when a credential works for a host", false]),
@@ -180,32 +180,30 @@ def build_credentials_array
 		return credentials if datastore['USERPASS_FILE'] =~ /^memory:/
 		users = load_user_vars(credentials)
 		passwords = load_password_vars(credentials)
-
-		if datastore['DB_ALL_USERS']
-			myworkspace.creds.each do |o|
-				users << o.user
-			end
-		end
-		if datastore['DB_ALL_PASS']
-			myworkspace.creds.each do |o|
-				passwords << o.pass unless o.ptype =~ /hash/
-			end
-		end
-
 		cleanup_files()
 		if datastore['USER_AS_PASS']
 			credentials = gen_user_as_password(users, credentials)
 		end
 		if datastore['BLANK_PASSWORDS']
 			credentials = gen_blank_passwords(users, credentials)
 		end
-		if datastore['DB_USERPASS']
-			myworkspace.creds.each do |o|
-				credentials << [o.user, o.pass] unless o.ptype =~ /hash/
+		if framework.db.active
+			if datastore['DB_ALL_CREDS']
+				myworkspace.creds.each do |o|
+					credentials << [o.user, o.pass] if o.ptype =~ /password/
+				end
+			end
+			if datastore['DB_ALL_USERS']
+				myworkspace.creds.each do |o|
+					users << o.user
+				end
+			end
+			if datastore['DB_ALL_PASS']
+				myworkspace.creds.each do |o|
+					passwords << o.pass if o.ptype =~ /password/
+				end
 			end
 		end
-		
-
 		credentials.concat(combine_users_and_passwords(users, passwords))
 		credentials.uniq!
 		credentials = just_uniq_users(credentials) if @strip_passwords