From 27353d62cabab26550589e7d56b7ceadf9a2ff87 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 2 Apr 2015 16:21:43 +0500 Subject: [PATCH] Discard local changes to non relevant files --- lib/msf/core/auxiliary/report.rb | 2 +- lib/msf/core/exploit/tcp_server.rb | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/msf/core/auxiliary/report.rb b/lib/msf/core/auxiliary/report.rb index 56e95a8c9b..1e715dc659 100644 --- a/lib/msf/core/auxiliary/report.rb +++ b/lib/msf/core/auxiliary/report.rb @@ -61,7 +61,7 @@ module Auxiliary::Report # This method safely get the workspace ID. It handles if the db is not active # # @return [NilClass] if there is no DB connection - # @return [Fixnum] the ID of the current {::Mdm::Workspace} + # @return [Fixnum] the ID of the current {Mdm::Workspace} def myworkspace_id if framework.db.active myworkspace.id diff --git a/lib/msf/core/exploit/tcp_server.rb b/lib/msf/core/exploit/tcp_server.rb index 11c25e5a23..771a1bad6b 100644 --- a/lib/msf/core/exploit/tcp_server.rb +++ b/lib/msf/core/exploit/tcp_server.rb @@ -22,7 +22,6 @@ module Exploit::Remote::TcpServer # OptEnum.new('SSLVersion', [ false, 'Specify the version of SSL that should be used', 'TLS1', ['SSL2', 'SSL3', 'TLS1']]), OptPath.new('SSLCert', [ false, 'Path to a custom SSL certificate (default is randomly generated)']), OptAddress.new('SRVHOST', [ true, "The local host to listen on. This must be an address on the local machine or 0.0.0.0", '0.0.0.0' ]), - #OptAddress.new('SRVHOST', [ true, "The local host to listen on. This must be an address on the local machine or 0.0.0.0", "#{Rex::Socket.source_address}" ]), OptPort.new('SRVPORT', [ true, "The local port to listen on.", 8080 ]), ], Msf::Exploit::Remote::TcpServer)