Incorporating a few more cleanup items from jvazquez

Author: webstersprodigy

modules/auxiliary/admin/smb/psexec_command.rb

@@ -55,7 +55,6 @@ def initialize(info = {})
       OptString.new('FILEPREFIX', [false, 'Add a custom prefix to the temporary files','']),
       OptInt.new('DELAY', [true, 'Wait this many seconds before reading output and cleaning up', 0]),
       OptInt.new('RETRY', [true, 'Retry this many times to check if the process is complete', 0]),
-      OptPath.new('LOGDIR', [false, 'File to log output', nil]),
     ], self.class)
 
     deregister_options('RHOST')
@@ -126,9 +125,6 @@ def get_output(file)
       return
     end
 
-    log_dir = ::File.join(Msf::Config.log_directory,'scripts', 'psexec_command')
-    ::FileUtils.mkdir_p(log_dir)
-
     # Report output
     print_good("#{peer} - Command completed successfuly!")
     if datastore['VERBOSE']
@@ -137,7 +133,8 @@ def get_output(file)
     end
 
     report_note(
-      :host => datastore['RHOSTS'], 
+      :rhost => datastore['RHOSTS'], 
+      :rport => datastore['RPORT'], 
       :type => "psexec_command",
       :name => datastore['COMMAND'], 
       :data => output