Land #5627, more cmd_exec fixes

modules/post/linux/gather/enum_configs.rb

@@ -52,7 +52,7 @@ class Metasploit3 < Msf::Post
     when /meterpreter/
       host = sysinfo["Computer"]
     when /shell/
-      host = session.shell_command_token("hostname").chomp
+      host = cmd_exec("hostname").chomp
     end
 
     return host

modules/post/linux/gather/enum_network.rb

@@ -89,7 +89,7 @@ class Metasploit3 < Msf::Post
     when /meterpreter/
       host = sysinfo["Computer"]
     when /shell/
-      host = session.shell_command_token("hostname").chomp
+      host = cmd_exec("hostname").chomp
     end
 
     print_status("Running module against #{host}")

modules/post/linux/gather/enum_protections.rb

@@ -51,7 +51,7 @@ class Metasploit3 < Msf::Post
     when /meterpreter/
       host = sysinfo["Computer"]
     when /shell/
-      host = session.shell_command_token("hostname").chomp
+      host = cmd_exec("hostname").chomp
     end
 
     return host

modules/post/linux/gather/enum_system.rb

@@ -79,31 +79,12 @@ class Metasploit3 < Msf::Post
     print_status("#{msg} stored in #{loot}")
   end
 
-  def get_host
-    case session.type
-    when /meterpreter/
-      host = sysinfo["Computer"]
-    when /shell/
-      host = session.shell_command_token("hostname").chomp
-    end
-
-    print_status("Running module against #{host}")
-
-    host
-  end
-
   def execute(cmd)
     vprint_status("Execute: #{cmd}")
     output = cmd_exec(cmd)
     output
   end
 
-  def cat_file(filename)
-    vprint_status("Download: #{filename}")
-    output = read_file(filename)
-    output
-  end
-
   def get_packages(distro)
     packages_installed = ""
     case distro

modules/post/linux/gather/enum_users_history.rb

@@ -66,17 +66,6 @@ class Metasploit3 < Msf::Post
     print_status("#{msg} stored in #{loot.to_s}")
   end
 
-  def get_host
-    case session.type
-    when /meterpreter/
-      host = sysinfo['Computer']
-    when /shell/
-      host = session.shell_command_token('hostname').chomp
-    end
-    print_status("Running module against #{host}")
-    host
-  end
-
   def execute(cmd)
     vprint_status("Execute: #{cmd}")
     output = cmd_exec(cmd)