Fix output to display ip:port

Author: David Maloney

modules/auxiliary/scanner/winrm/winrm_auth_methods.rb

@@ -52,9 +52,9 @@ def run_host(ip)
 				:name  => 'winrm',
 				:info  => desc
 			)
-			print_good "Negotiate protocol supported" if methods.include? "Negotiate"
-			print_good "Kerberos protocol supported" if methods.include? "Kerberos"
-			print_good "Basic protocol supported" if methods.include? "Basic"
+			print_good "#{ip}:#{rport}: Negotiate protocol supported" if methods.include? "Negotiate"
+			print_good "#{ip}:#{rport}: Kerberos protocol supported" if methods.include? "Kerberos"
+			print_good "#{ip}:#{rport}: Basic protocol supported" if methods.include? "Basic"
 		else
 			print_error "#{ip}:#{rport} Does not appear to be a WinRM server"
 		end

modules/auxiliary/scanner/winrm/winrm_login.rb

@@ -49,7 +49,7 @@ def run_host(ip)
 		each_user_pass do |user, pass|
 			resp,c = send_request_ntlm(test_request)
 			if resp.nil?
-				print_error "Got no reply from the server, connection may have timed out"
+				print_error "#{ip}:#{rport}:  Got no reply from the server, connection may have timed out"
 				return
 			elsif  resp.code == 200
 				cred_hash = {
@@ -62,9 +62,9 @@ def run_host(ip)
 					:active            => true
 				}
 				report_auth_info(cred_hash)
-				print_good "Valid credential found: #{user}:#{pass}"
+				print_good "#{ip}:#{rport}:  Valid credential found: #{user}:#{pass}"
 			elsif resp.code == 401
-				print_error "Login failed: #{user}:#{pass}"
+				print_error "#{ip}:#{rport}:  Login failed: #{user}:#{pass}"
 			else
 				print_error "Recieved unexpected Response Code: #{resp.code}"
 			end