License information displayed by info

git-svn-id: file:///home/svn/incoming/trunk@3428 4d416f70-5f16-0410-b530-b9f4589650da

lib/msf/base/serializer/readable_text.rb

@@ -84,6 +84,7 @@ class ReadableText
 		output += "    Version: #{mod.version}\n"
 		output += "   Platform: #{mod.platform_to_s}\n"
 		output += " Privileged: " + (mod.privileged? ? "Yes" : "No") + "\n"
+		output += "    License: #{mod.license}\n"
 		output += "\n"
 
 		# Authors

lib/msf/core/module.rb

@@ -128,6 +128,7 @@ class Module
 		end
 
 		self.privileged = module_info['Privileged'] || false
+		self.license = module_info['License'] || MSF_LICENSE
 	end
 
 
@@ -420,7 +421,10 @@ class Module
 	# Whether or not this module requires privileged access.
 	#
 	attr_reader   :privileged
-
+	#
+	# The license under which this module is provided.
+	#
+	attr_reader   :license
 protected
 
 	#
@@ -671,6 +675,7 @@ protected
 	attr_accessor :module_info # :nodoc:
 	attr_writer   :author, :arch, :platform, :references, :datastore, :options # :nodoc:
 	attr_writer   :privileged # :nodoc:
+	attr_writer   :license # :nodoc:
 
 end
 

modules/exploits/windows/smb/ms04_007_killbill.rb

@@ -32,8 +32,7 @@ class Exploits::Windows::Smb::MS04_007_ASN1_KILLBILL < Msf::Exploit::Remote
 					
 			},
 			'Author'         => [ 'Solar Eclipse <solareclipse@phreedom.org>' ],
-			'License'        => MSF_LICENSE,
-			'License'        => [ 'gplv2' ],
+			'License'        => GPL_LICENSE,
 			'Version'        => '$Revision$',
 			'References'     =>
 				[