From 069a50e1b806bb840b0ed95038477f508a3f9f95 Mon Sep 17 00:00:00 2001 From: Tyler Bennett Date: Mon, 7 Dec 2015 09:41:46 -0500 Subject: [PATCH] Revert "fixed ddns_creds import issue, by using rhost and commenting why it needs to be used" Reverting to hopefully force a fix for issue #3968 --- modules/auxiliary/scanner/misc/dahua_dvr_auth_bypass.rb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/modules/auxiliary/scanner/misc/dahua_dvr_auth_bypass.rb b/modules/auxiliary/scanner/misc/dahua_dvr_auth_bypass.rb index 0a7d96ebfe..6837243ba5 100644 --- a/modules/auxiliary/scanner/misc/dahua_dvr_auth_bypass.rb +++ b/modules/auxiliary/scanner/misc/dahua_dvr_auth_bypass.rb @@ -143,7 +143,7 @@ class Metasploit3 < Msf::Auxiliary ddns_table << ["#{ddns_service}", "#{ddns_server}", "#{ddns_port}", "#{ddns_domain}", "#{ddns_user}", "#{ddns_pass}"] ddns_table.print unless ddns_server.blank? && ddns_port.blank? && ddns_user.blank? && ddns_pass.blank? - report_ddns_cred(rhost, ddns_port, ddns_user, ddns_pass) + report_ddns_cred(ddns_server, ddns_port, ddns_user, ddns_pass) end end end @@ -319,12 +319,9 @@ class Metasploit3 < Msf::Auxiliary create_credential_login(login_data) end - def report_ddns_cred(rhost, ddns_port, ddns_user, ddns_pass) + def report_ddns_cred(ddns_server, ddns_port, ddns_user, ddns_pass) service_data = { - # if a system returns a domain name for ddns_server this will fail to - # input into the db because the creds api expects an inet record. This has to be set to RHOST until issue #3968 is - # sorted in msf framework. - address: rhost, + address: ddns_server, port: ddns_port, service_name: 'ddns settings', protocol: 'tcp',