Serialize service.info, handle all 3 forms of possible serialized data (marshal, yaml, and string)

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

lib/msf/core/model/activerecord_patches.rb

@@ -9,7 +9,7 @@ class ActiveRecord::Base
 		begin
 			Marshal.load(string.unpack("m")[0])
 		rescue ::Exception => e
-			YAML.load(string)
+			YAML.load(string) rescue string
 		end
 	end
 end

lib/msf/core/model/service.rb

@@ -6,7 +6,10 @@ class Service < ActiveRecord::Base
 	has_many :vulns, :dependent => :destroy
 	has_many :notes, :dependent => :destroy
 	belongs_to :host
+
+	serialize :info
 end
 
 end
 end
+