Fix session validation when smb sessions are disabled

lib/msf/core/optional_session.rb

@@ -20,4 +20,9 @@ def initialize(info = {})
       )
     end
   end
+
+  def session
+    return nil unless framework.features.enabled?(Msf::FeatureManager::SMB_SESSION_TYPE)
+    super
+  end
 end

lib/msf/core/session_compatibility.rb

@@ -79,7 +79,6 @@ def cleanup; end
     # @return [nil] if the id provided in the datastore does not
     #   correspond to a session
     def session
-      return nil unless framework.features.enabled?(Msf::FeatureManager::SMB_SESSION_TYPE)
       # Try the cached one
       return @session if @session && !session_changed?
 
@@ -96,6 +95,8 @@ def session_display_info
       "Session: #{session.sid} (#{session.session_host})"
     end
 
+    alias :client :session
+
     #
     # Can be overridden by individual modules to add new commands
     #