Set a limit to how many times we can retry

modules/post/osx/gather/enum_adium.rb

@@ -224,14 +224,21 @@ class Metasploit3 < Msf::Post
 	# and retry under certain conditions.
 	#
 	def exec(cmd)
+		tries = 0
 		begin
 			out = cmd_exec(cmd).chomp
 		rescue ::Timeout::Error => e
-			vprint_error("#{@peer} - #{e.message} - retrying...")
+			tries += 1
-			retry
+			if tries < 3
+				vprint_error("#{@peer} - #{e.message} - retrying...")
+				retry 
+			end
 		rescue EOFError => e
-			vprint_error("#{@peer} - #{e.message} - retrying...")
+			tries += 1
-			retry
+			if tries < 3
+				vprint_error("#{@peer} - #{e.message} - retrying...")
+				retry
+			end
 		end
 	end
 

modules/post/osx/gather/enum_airport.rb

@@ -28,14 +28,21 @@ class Metasploit3 < Msf::Post
 	end
 
 	def exec(cmd)
+		tries = 0
 		begin
 			out = cmd_exec(cmd).chomp
 		rescue ::Timeout::Error => e
-			vprint_error("#{@peer} - #{e.message} - retrying...")
+			tries += 1
-			retry
+			if tries < 3
+				vprint_error("#{@peer} - #{e.message} - retrying...")
+				retry
+			end
 		rescue EOFError => e
-			vprint_error("#{@peer} - #{e.message} - retrying...")
+			tries += 1
-			retry
+			if tries < 3
+				vprint_error("#{@peer} - #{e.message} - retrying...")
+				retry
+			end
 		end
 	end
 

modules/post/osx/gather/enum_chicken_vnc_profile.rb

@@ -40,14 +40,21 @@ class Metasploit3 < Msf::Post
 	# and retry under certain conditions.
 	#
 	def exec(cmd)
+		tries = 0
 		begin
 			out = cmd_exec(cmd).chomp
 		rescue ::Timeout::Error => e
-			vprint_error("#{@peer} - #{e.message} - retrying...")
+			tries += 1
-			retry
+			if tries < 3
+				vprint_error("#{@peer} - #{e.message} - retrying...")
+				retry
+			end
 		rescue EOFError => e
-			vprint_error("#{@peer} - #{e.message} - retrying...")
+			tries += 1
-			retry
+			if tries < 3
+				vprint_error("#{@peer} - #{e.message} - retrying...")
+				retry
+			end
 		end
 	end
 

modules/post/osx/gather/enum_colloquy.rb

@@ -127,14 +127,21 @@ class Metasploit3 < Msf::Post
 	end
 
 	def exec(cmd)
+		tries = 0
 		begin
 			out = cmd_exec(cmd).chomp
 		rescue ::Timeout::Error => e
-			vprint_error("#{@peer} - #{e.message} - retrying...")
+			tries += 1
-			retry
+			if tries < 3
+				vprint_error("#{@peer} - #{e.message} - retrying...")
+				retry
+			end
 		rescue EOFError => e
-			vprint_error("#{@peer} - #{e.message} - retrying...")
+			tries += 1
-			retry
+			if tries < 3
+				vprint_error("#{@peer} - #{e.message} - retrying...")
+				retry
+			end
 		end
 	end