svnserve

git-svn-id: file:///home/svn/framework3/trunk@4265 4d416f70-5f16-0410-b530-b9f4589650da

documentation/metasploit2/exploits.txt

@@ -25,7 +25,6 @@ Unfinished modules
 	solaris_kcms_readfile
 	solaris_snmpxdmid
 	sphpblog_file_upload
-	svnserve_date
 	sybase_easerver
 	sygate_policy_manager
 	uow_imap4_copy
@@ -146,6 +145,7 @@ Completed modules
 	solaris_sadmind_exec exploit/solaris/sunrpc/solaris_sadmind_exec
 	solaris_ttyprompt exploit/solaris/telnet/ttyprompt
 	squid_ntlm_authenticate exploit/linux/proxy/squid_ntlm_authenticate
+	svnserve_date exploit/multi/svn/svnserve_date
 	tftpd32_long_filename exploit/windows/tftp/tftpd32_long_filename
 	trackercam_phparg_overflow exploit/windows/http/trackercam_phparg_overflow
 	ultravnc_client exploit/windows/vnc/ultravnc_client

lib/msf/core/exploit/brute.rb

@@ -120,8 +120,8 @@ module Exploit::Brute
 					# If this item has hit a stop address, add it to the stopped 
 					# hash and move it no further
 					if (stop[k])
-						if ((direction[k] == 1 and next_addr >= stop[k]) or
-						    (direction[k] == -1 and next_addr < stop[k]))
+						if ((direction[k] == 1 and curr[k] + next_addr >= stop[k]) or
+						    (direction[k] == -1 and curr[k] + next_addr < stop[k]))
 							stopped << k
 							next
 						end

lib/msf/core/module.rb

@@ -375,6 +375,14 @@ class Module
 		self.options.validate(self.datastore)
 	end
 
+	#
+	# Returns true if this module is being debugged.  The debug flag is set
+	# by setting datastore['DEBUG'] to 1|true|yes
+	#
+	def debugging?
+		(datastore['DEBUG'] || '') =~ /^(1|t|y)/i
+	end
+
 	##
 	#
 	# Just some handy quick checks