From 5d3bb04ac01c1db0b13e5d11ef43daa574a511ab Mon Sep 17 00:00:00 2001
From: Carlos Perez <carlos_perez@darkoperator.com>
Date: Mon, 20 Jun 2011 23:27:57 +0000
Subject: [PATCH] Change Post Mixin for Linux platform in its own separate
 class

git-svn-id: file:///home/svn/framework3/trunk@12985 4d416f70-5f16-0410-b530-b9f4589650da
---
 lib/msf/core/post/linux/priv.rb            | 3 ++-
 lib/msf/core/post/linux/system.rb          | 3 ++-
 modules/post/linux/gather/checkvm.rb       | 4 ++--
 modules/post/linux/gather/enum_cron.rb     | 2 +-
 modules/post/linux/gather/enum_linux.rb    | 2 +-
 modules/post/linux/gather/enum_packages.rb | 2 +-
 modules/post/linux/gather/enum_services.rb | 2 +-
 modules/post/linux/gather/hashdump.rb      | 2 +-
 8 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/msf/core/post/linux/priv.rb b/lib/msf/core/post/linux/priv.rb
index a85e5024de..affff90659 100644
--- a/lib/msf/core/post/linux/priv.rb
+++ b/lib/msf/core/post/linux/priv.rb
@@ -2,7 +2,7 @@ require 'msf/core/post/common'
 
 module Msf
 class Post
-
+module Linux
 module Priv
 	include ::Msf::Post::Common
 
@@ -21,5 +21,6 @@ module Priv
 		end
 
 end # Priv
+end # Linux
 end # Post
 end # Msf
diff --git a/lib/msf/core/post/linux/system.rb b/lib/msf/core/post/linux/system.rb
index 9bf550cb29..62cc981e05 100644
--- a/lib/msf/core/post/linux/system.rb
+++ b/lib/msf/core/post/linux/system.rb
@@ -3,7 +3,7 @@ require 'msf/core/post/file'
 
 module Msf
 class Post
-
+module Linux
 module System
 	include ::Msf::Post::Common
 		include ::Msf::Post::File
@@ -148,5 +148,6 @@ module System
 
 
 end # System
+end #Linux
 end # Post
 end # Msf
diff --git a/modules/post/linux/gather/checkvm.rb b/modules/post/linux/gather/checkvm.rb
index 19b3fc2414..ce6199575d 100644
--- a/modules/post/linux/gather/checkvm.rb
+++ b/modules/post/linux/gather/checkvm.rb
@@ -19,8 +19,8 @@ class Metasploit3 < Msf::Post
 
 	include Msf::Post::Common
 	include Msf::Post::File
-	include Msf::Post::Priv
-	include Msf::Post::System
+	include Msf::Post::Linux::Priv
+	include Msf::Post::Linux::System
 
 
 	def initialize(info={})
diff --git a/modules/post/linux/gather/enum_cron.rb b/modules/post/linux/gather/enum_cron.rb
index 23517b0b3c..5284e2c3cd 100644
--- a/modules/post/linux/gather/enum_cron.rb
+++ b/modules/post/linux/gather/enum_cron.rb
@@ -19,7 +19,7 @@ class Metasploit3 < Msf::Post
 
 	include Msf::Post::Common
 	include Msf::Post::File
-	include Msf::Post::Priv
+	include Msf::Post::Linux::Priv
 	include Msf::Auxiliary::Report
 
 	def initialize(info={})
diff --git a/modules/post/linux/gather/enum_linux.rb b/modules/post/linux/gather/enum_linux.rb
index f6098a7896..b9567d8084 100644
--- a/modules/post/linux/gather/enum_linux.rb
+++ b/modules/post/linux/gather/enum_linux.rb
@@ -19,7 +19,7 @@ class Metasploit3 < Msf::Post
 
 	include Msf::Post::Common
 	include Msf::Post::File
-	include Msf::Post::System
+	include Msf::Post::Linux::System
 	include Msf::Auxiliary::Report
 
 	def initialize(info={})
diff --git a/modules/post/linux/gather/enum_packages.rb b/modules/post/linux/gather/enum_packages.rb
index 12965b534f..a1fb5fc7e4 100644
--- a/modules/post/linux/gather/enum_packages.rb
+++ b/modules/post/linux/gather/enum_packages.rb
@@ -18,7 +18,7 @@ class Metasploit3 < Msf::Post
 
 	include Msf::Post::Common
 	include Msf::Post::File
-	include Msf::Post::System
+	include Msf::Post::Linux::System
 
 
 	def initialize(info={})
diff --git a/modules/post/linux/gather/enum_services.rb b/modules/post/linux/gather/enum_services.rb
index 28f32aba18..7610399e9f 100644
--- a/modules/post/linux/gather/enum_services.rb
+++ b/modules/post/linux/gather/enum_services.rb
@@ -19,7 +19,7 @@ class Metasploit3 < Msf::Post
 
 	include Msf::Post::Common
 	include Msf::Post::File
-	include Msf::Post::System
+	include Msf::Post::Linux::System
 
 	def initialize(info={})
 		super( update_info( info,
diff --git a/modules/post/linux/gather/hashdump.rb b/modules/post/linux/gather/hashdump.rb
index 27eca22092..6613ddf223 100644
--- a/modules/post/linux/gather/hashdump.rb
+++ b/modules/post/linux/gather/hashdump.rb
@@ -19,7 +19,7 @@ class Metasploit3 < Msf::Post
 
 	include Msf::Post::Common
 	include Msf::Post::File
-	include Msf::Post::Priv
+	include Msf::Post::Linux::Priv
 
 	def initialize(info={})
 		super( update_info( info,