more conversions

Author: busterb

lib/msf/base/serializer/readable_text.rb

@@ -634,7 +634,6 @@ def self.dump_sessions_verbose(framework, opts={})
       sess_via     = session.via_exploit.to_s
       sess_type    = session.type.to_s
       sess_uuid    = session.payload_uuid.to_s
-      sess_puid    = session.payload_uuid.respond_to?(:puid_hex) ? session.payload_uuid.puid_hex : nil
       sess_luri    = session.exploit_datastore['LURI'] || "" if session.exploit_datastore
       sess_enc     = false
       if session.respond_to?(:tlv_enc_key) && session.tlv_enc_key && session.tlv_enc_key[:key]

lib/msf/core/handler.rb

@@ -224,7 +224,7 @@ def create_session(conn, opts={})
       # Pass along any associated payload uuid if specified
       if opts[:payload_uuid]
         s.payload_uuid = opts[:payload_uuid]
-        if s.payload_uuid.respond_to?(:puid_hex) && (uuid_info = framework.uuid_db[sess_puid])
+        if s.payload_uuid.respond_to?(:puid_hex) && (uuid_info = framework.uuid_db[session.payload_uuid.puid_hex])
           s.payload_uuid.registered = true
           s.payload_uuid.name = uuid_info['name']
           s.payload_uuid.timestamp = uuid_info['timestamp']